Hardening and CI improvements

.github/workflows/ci.yml

@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Rust
+        uses: dtolnay/rust-toolchain@stable
+      - name: Rust format
+        run: cargo fmt --all -- --check
+      - name: Cargo check
+        run: cargo check --workspace --all-targets
+      - name: Cargo test
+        run: cargo test --workspace --all-targets

src/llm.rs

@@ -126,7 +126,10 @@ impl Llm {
                 Err(e) => last = Some(e),
             }
             if self.verbose {
-                eprintln!("[retry {}/{}] {}", attempt + 1, self.retries, last.as_ref().unwrap());
+                match last.as_ref() {
+                    Some(error) => eprintln!("[retry {}/{}] {error}", attempt + 1, self.retries),
+                    None => eprintln!("[retry {}/{}] unknown retry error", attempt + 1, self.retries),
+                }
             }
         }
         Err(last.unwrap_or_else(|| anyhow!("알 수 없는 실패")))
@@ -149,7 +152,12 @@ impl Llm {
                 Err(e) => {
                     last = Some(e);
                     if self.verbose {
-                        eprintln!("[json retry {}] {}", attempt + 1, last.as_ref().unwrap());
+                        match last.as_ref() {
+                            Some(error) => eprintln!("[json retry {}/{}] {error}", attempt + 1, self.retries),
+                            None => {
+                                eprintln!("[json retry {}/{}] unknown json retry error", attempt + 1, self.retries);
+                            }
+                        }
                     }
                     continue;
                 }
@@ -159,7 +167,12 @@ impl Llm {
                 Err(e) => {
                     last = Some(e);
                     if self.verbose {
-                        eprintln!("[json retry {}] {}", attempt + 1, last.as_ref().unwrap());
+                        match last.as_ref() {
+                            Some(error) => eprintln!("[json retry {}] {error}", attempt + 1, self.retries),
+                            None => {
+                                eprintln!("[json retry {}] unknown json retry error", attempt + 1, self.retries);
+                            }
+                        }
                     }
                 }
             }

src/main.rs

@@ -430,19 +430,22 @@ where
     R: Send,
     F: Fn(T) -> Result<R> + Sync,
 {
-    let c = concurrency.max(1);
-    let mut out: Vec<R> = Vec::new();
-    let mut rest = items;
-    while !rest.is_empty() {
-        let take = c.min(rest.len());
-        let chunk: Vec<T> = rest.drain(..take).collect();
-        let results: Vec<Result<R>> = std::thread::scope(|s| {
-            let handles: Vec<_> = chunk.into_iter().map(|item| s.spawn(|| f(item))).collect();
-            handles.into_iter().map(|h| h.join().unwrap()).collect()
-        });
-        for r in results {
-            out.push(r?);
+        let c = concurrency.max(1);
+        let mut out: Vec<R> = Vec::new();
+        let mut rest = items;
+        while !rest.is_empty() {
+            let take = c.min(rest.len());
+            let chunk: Vec<T> = rest.drain(..take).collect();
+            let results: Vec<Result<R>> = std::thread::scope(|s| {
+                let handles: Vec<_> = chunk.into_iter().map(|item| s.spawn(|| f(item))).collect();
+                handles
+                    .into_iter()
+                    .map(|h| h.join().map_err(|_| anyhow!("worker thread panicked")))
+                    .collect()
+            });
+            for r in results {
+                out.push(r?);
+            }
         }
-    }
     Ok(out)
 }