chore: bump mc-mcp version from 0.1.6 to 0.1.7 in Cargo.toml and Cargo.lock, update logging to use the log crate for better error and info handling in the codebase.

kaihiroi · kaihiroi · commit 206fd223e283 · 2025-04-21T03:07:37.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mc-mcp"
-version = "0.1.6"
+version = "0.1.7"
 edition = "2021"
 authors = ["ea <ecdysis-xyz@proton.me>", "kai <kai.hiroi@pm.me>"]
 description = "A Model Context Protocol (MCP) server for metacontract smart contract development."
diff --git a/src/bin/build_index.rs b/src/bin/build_index.rs
@@ -21,7 +21,7 @@ fn main() -> anyhow::Result<()> {
     // 引数: 入力ディレクトリ, 出力ファイル
     let args: Vec<String> = env::args().collect();
     if args.len() != 3 {
-        eprintln!("Usage: build_index <input_docs_dir> <output_jsonl>");
+        log::error!("Usage: build_index <input_docs_dir> <output_jsonl>");
         std::process::exit(1);
     }
     let input_dir = PathBuf::from(&args[1]);
@@ -53,6 +53,6 @@ fn main() -> anyhow::Result<()> {
             total_chunks += 1;
         }
     }
-    println!("Wrote {} chunks to {:?}", total_chunks, output_path);
+    log::info!("Wrote {} chunks to {:?}", total_chunks, output_path);
     Ok(())
 }
diff --git a/src/infrastructure/file_system.rs b/src/infrastructure/file_system.rs
@@ -40,7 +40,7 @@ pub fn load_documents(docs_path: Option<PathBuf>) -> Result<SimpleDocumentIndex,
     let default_path = PathBuf::from("metacontract/mc/site/docs");
     let target_path = docs_path.unwrap_or(default_path);
 
-    println!("Loading documents from: {:?}", target_path);
+    log::info!("Loading documents from: {:?}", target_path);
 
     if !target_path.is_dir() {
         return Err(format!(
@@ -65,13 +65,13 @@ pub fn load_documents(docs_path: Option<PathBuf>) -> Result<SimpleDocumentIndex,
                 index.insert(path_str, (text, "mc-docs".to_string())); // sourceは現状固定
             }
             Err(e) => {
-                eprintln!("Failed to read file {}: {}", path_str, e);
+                log::error!("Failed to read file {}: {}", path_str, e);
             }
         }
     }
 
     if index.is_empty() {
-        println!(
+        log::warn!(
             "Warning: No markdown files found or loaded from {:?}",
             target_path
         );
@@ -162,7 +162,7 @@ pub fn load_documents_from_multiple_sources(
                     index.insert(path_str, (text, source.clone()));
                 }
                 Err(e) => {
-                    eprintln!("Failed to read file {}: {}", path_str, e);
+                    log::error!("Failed to read file {}: {}", path_str, e);
                 }
             }
         }
@@ -235,14 +235,14 @@ pub fn load_documents_from_source(dir_path: &PathBuf) -> Result<HashMap<String,
 /// 指定URLからprebuilt_index.jsonl(.gz)をダウンロード（既存ならスキップ）
 pub fn download_if_not_exists(url: &str, dest: &str) -> anyhow::Result<()> {
     if PathBuf::from(dest).exists() {
-        println!("Index file already exists: {}", dest);
+        log::info!("Index file already exists: {}", dest);
         return Ok(());
     }
-    println!("Downloading index from {} ...", url);
+    log::info!("Downloading index from {} ...", url);
     let mut resp = reqwest::blocking::get(url)?;
     let mut out = File::create(dest)?;
     copy(&mut resp, &mut out)?;
-    println!("Downloaded index to {}", dest);
+    log::info!("Downloaded index to {}", dest);
     Ok(())
 }
 
@@ -311,7 +311,7 @@ mod tests {
     fn test_load_documents_default_path_not_exists() {
         // Need to ensure the default path doesn't exist for this test
         if PathBuf::from("metacontract/mc/site/docs").exists() {
-            println!(
+            log::info!(
                 "Skipping test_load_documents_default_path_not_exists because default path exists."
             );
             return;
diff --git a/src/main.rs b/src/main.rs
@@ -49,7 +49,7 @@ const MC_TEMPLATE_REPO: &str = "metacontract/template";
 async fn main() -> Result<()> {
     // check if qdrant is running
     if let Err(e) = ensure_qdrant_via_docker() {
-        eprintln!("{e}");
+        log::error!("{e}");
         std::process::exit(1);
     }
     env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("trace"))
@@ -711,7 +711,7 @@ mod tests {
     impl ReferenceService for MockReferenceService {
         // index_sources implementation
         async fn index_sources(&self, sources: &[DocumentSource]) -> Result<()> {
-            println!(
+            log::info!(
                 "MockReferenceService: index_sources called with {} sources",
                 sources.len()
             );
@@ -727,7 +727,7 @@ mod tests {
             query: mc_mcp::domain::reference::SearchQuery,
             _score_threshold: Option<f32>,
         ) -> Result<Vec<SearchResult>> {
-            println!(
+            log::info!(
                 "MockReferenceService: search_documents called with query: {:?}",
                 query
             );
@@ -1158,34 +1158,34 @@ fi
 
 
         // --- Debug: Check if mock script file actually exists ---
-        println!("Checking existence of: {}", forge_script_on_mock_bin.display());
+        log::info!("Checking existence of: {}", forge_script_on_mock_bin.display());
         if forge_script_on_mock_bin.exists() {
-            println!("Mock script file FOUND.");
+            log::info!("Mock script file FOUND.");
 
             // --- Add execute permission ---
             #[cfg(unix)]
             {
                 use std::os::unix::fs::PermissionsExt;
-                println!("Setting execute permission on mock script...");
+                log::info!("Setting execute permission on mock script...");
                 let metadata = std::fs::metadata(&forge_script_on_mock_bin).expect("Failed to get metadata for mock script");
                 let mut perms = metadata.permissions();
                 if perms.mode() & 0o111 == 0 { // Check if execute bit is NOT set
                     perms.set_mode(perms.mode() | 0o111); // Add execute permission for user, group, others
                     std::fs::set_permissions(&forge_script_on_mock_bin, perms).expect("Failed to set permissions on mock script");
-                    println!("Execute permission set.");
+                    log::info!("Execute permission set.");
                 } else {
-                    println!("Execute permission already set.");
+                    log::info!("Execute permission already set.");
                 }
             }
             // --- End Add execute permission ---
 
         } else {
-            println!("Mock script file NOT FOUND!");
+            log::error!("Mock script file NOT FOUND!");
             // もし見つからなかったら、ls の結果も見てみる
             let ls_output = std::process::Command::new("ls").arg("-al").arg(mock_bin_path.display().to_string()).output();
             match ls_output {
-                Ok(out) => println!("ls -al {}:\n{}", mock_bin_path.display(), String::from_utf8_lossy(&out.stdout)),
-                Err(e) => println!("Failed to run ls: {}", e),
+                Ok(out) => log::error!("ls -al {}:\n{}", mock_bin_path.display(), String::from_utf8_lossy(&out.stdout)),
+                Err(e) => log::error!("Failed to run ls: {}", e),
             }
         }
         // --- End Debug ---
@@ -1197,23 +1197,23 @@ fi
         std::env::set_var("PATH", format!("{}:{}", mock_bin_abs_path_str, original_path));
 
         // --- Debugging: Check which forge is used and run mock script directly ---
-        println!("--- Debug Info: test_mc_deploy_broadcast_success ---");
+        log::info!("--- Debug Info: test_mc_deploy_broadcast_success ---");
         let which_output = std::process::Command::new("which").arg("forge").output().expect("Failed to run which forge");
-        println!("which forge stdout: {}", String::from_utf8_lossy(&which_output.stdout));
-        println!("which forge stderr: {}", String::from_utf8_lossy(&which_output.stderr));
-        println!("which forge status: {:?}", which_output.status.code());
+        log::info!("which forge stdout: {}", String::from_utf8_lossy(&which_output.stdout));
+        log::info!("which forge stderr: {}", String::from_utf8_lossy(&which_output.stderr));
+        log::info!("which forge status: {:?}", which_output.status.code());
 
-        println!("Executing mock script directly: {} script {} --broadcast", forge_script_path_mock_abs.display(), expected_script_path);
+        log::info!("Executing mock script directly: {} script {} --broadcast", forge_script_path_mock_abs.display(), expected_script_path);
         let mock_run_output = std::process::Command::new(forge_script_path_mock_abs)
             .arg("script")
             .arg(expected_script_path)
             .arg("--broadcast")
             .output()
             .expect("Failed to run mock forge script directly");
-        println!("Mock script stdout: {}", String::from_utf8_lossy(&mock_run_output.stdout));
-        println!("Mock script stderr: {}", String::from_utf8_lossy(&mock_run_output.stderr));
-        println!("Mock script status: {:?}", mock_run_output.status.code());
-        println!("--- End Debug Info ---");
+        log::info!("Mock script stdout: {}", String::from_utf8_lossy(&mock_run_output.stdout));
+        log::info!("Mock script stderr: {}", String::from_utf8_lossy(&mock_run_output.stderr));
+        log::info!("Mock script status: {:?}", mock_run_output.status.code());
+        log::info!("--- End Debug Info ---");
         // --- End Debugging ---
 
         let args = McDeployArgs {
@@ -1531,34 +1531,34 @@ fi
 
 
         // --- Debug: Check if mock script file actually exists ---
-        println!("Checking existence of: {}", forge_script_on_mock_bin.display());
+        log::info!("Checking existence of: {}", forge_script_on_mock_bin.display());
         if forge_script_on_mock_bin.exists() {
-            println!("Mock script file FOUND.");
+            log::info!("Mock script file FOUND.");
 
             // --- Add execute permission ---
             #[cfg(unix)]
             {
                 use std::os::unix::fs::PermissionsExt;
-                println!("Setting execute permission on mock script...");
+                log::info!("Setting execute permission on mock script...");
                 let metadata = std::fs::metadata(&forge_script_on_mock_bin).expect("Failed to get metadata for mock script");
                 let mut perms = metadata.permissions();
                 if perms.mode() & 0o111 == 0 { // Check if execute bit is NOT set
                     perms.set_mode(perms.mode() | 0o111); // Add execute permission for user, group, others
                     std::fs::set_permissions(&forge_script_on_mock_bin, perms).expect("Failed to set permissions on mock script");
-                    println!("Execute permission set.");
+                    log::info!("Execute permission set.");
                 } else {
-                    println!("Execute permission already set.");
+                    log::info!("Execute permission already set.");
                 }
             }
             // --- End Add execute permission ---
 
         } else {
-            println!("Mock script file NOT FOUND!");
+            log::error!("Mock script file NOT FOUND!");
             // もし見つからなかったら、ls の結果も見てみる
             let ls_output = std::process::Command::new("ls").arg("-al").arg(mock_bin_path.display().to_string()).output();
             match ls_output {
-                Ok(out) => println!("ls -al {}:\n{}", mock_bin_path.display(), String::from_utf8_lossy(&out.stdout)),
-                Err(e) => println!("Failed to run ls: {}", e),
+                Ok(out) => log::error!("ls -al {}:\n{}", mock_bin_path.display(), String::from_utf8_lossy(&out.stdout)),
+                Err(e) => log::error!("Failed to run ls: {}", e),
             }
         }
         // --- End Debug ---
@@ -1570,23 +1570,23 @@ fi
         std::env::set_var("PATH", format!("{}:{}", mock_bin_abs_path_str, original_path));
 
         // --- Debugging: Check which forge is used and run mock script directly ---
-        println!("--- Debug Info: test_mc_upgrade_broadcast_success ---");
+        log::info!("--- Debug Info: test_mc_upgrade_broadcast_success ---");
         let which_output = std::process::Command::new("which").arg("forge").output().expect("Failed to run which forge");
-        println!("which forge stdout: {}", String::from_utf8_lossy(&which_output.stdout));
-        println!("which forge stderr: {}", String::from_utf8_lossy(&which_output.stderr));
-        println!("which forge status: {:?}", which_output.status.code());
+        log::info!("which forge stdout: {}", String::from_utf8_lossy(&which_output.stdout));
+        log::info!("which forge stderr: {}", String::from_utf8_lossy(&which_output.stderr));
+        log::info!("which forge status: {:?}", which_output.status.code());
 
-        println!("Executing mock script directly: {} script {} --broadcast", forge_script_path_mock_abs.display(), expected_script_path);
+        log::info!("Executing mock script directly: {} script {} --broadcast", forge_script_path_mock_abs.display(), expected_script_path);
         let mock_run_output = std::process::Command::new(forge_script_path_mock_abs)
             .arg("script")
             .arg(expected_script_path)
             .arg("--broadcast")
             .output()
             .expect("Failed to run mock forge script directly");
-        println!("Mock script stdout: {}", String::from_utf8_lossy(&mock_run_output.stdout));
-        println!("Mock script stderr: {}", String::from_utf8_lossy(&mock_run_output.stderr));
-        println!("Mock script status: {:?}", mock_run_output.status.code());
-        println!("--- End Debug Info ---");
+        log::info!("Mock script stdout: {}", String::from_utf8_lossy(&mock_run_output.stdout));
+        log::info!("Mock script stderr: {}", String::from_utf8_lossy(&mock_run_output.stderr));
+        log::info!("Mock script status: {:?}", mock_run_output.status.code());
+        log::info!("--- End Debug Info ---");
         // --- End Debugging ---
 
         let args = McUpgradeArgs { broadcast: Some(true) };
@@ -1754,10 +1754,10 @@ fn ensure_qdrant_via_docker() -> Result<(), String> {
         .map_err(|e| format!("Failed to execute docker ps: {e}"))?;
     let ps_stdout = String::from_utf8_lossy(&ps.stdout);
     if ps_stdout.contains("qdrant") {
-        eprintln!("✅ Qdrant is already running in Docker.");
+        log::info!("✅ Qdrant is already running in Docker.");
     } else {
         // 3. Start Qdrant container
-        eprintln!("Qdrant container not found. Starting Qdrant in Docker...");
+        log::info!("Qdrant container not found. Starting Qdrant in Docker...");
         let run = std::process::Command::new("docker")
             .args([
                 "run",
@@ -1778,7 +1778,7 @@ fn ensure_qdrant_via_docker() -> Result<(), String> {
                 String::from_utf8_lossy(&run.stderr)
             ));
         }
-        eprintln!("Qdrant container started.");
+        log::info!("Qdrant container started.");
     }
 
     // 4. Health check (HTTP endpoint retry)
@@ -1789,12 +1789,12 @@ fn ensure_qdrant_via_docker() -> Result<(), String> {
             .call()
         {
             Ok(resp) if resp.status() == 200 => {
-                eprintln!("✅ Qdrant is running and connected!");
+                log::info!("✅ Qdrant is running and connected!");
                 return Ok(());
             }
             _ => {
-                eprintln!("Waiting for Qdrant to start... (Retry {i}/5)");
-                sleep(Duration::from_secs(2));
+                log::info!("Waiting for Qdrant to start... (Retry {i}/5)");
+                std::thread::sleep(std::time::Duration::from_secs(2));
             }
         }
     }
diff --git a/tests/vector_db_integration.rs b/tests/vector_db_integration.rs
@@ -52,7 +52,7 @@ async fn setup_qdrant() -> Result<(VectorDb, ContainerAsync<GenericImage>)> {
         if !error_string.contains("already exists") && !error_string.contains("already created") {
             return Err(e.into());
         }
-        println!(
+        log::warn!(
             "Collection {} already exists, likely due to race condition. Continuing.",
             collection_name
         );
@@ -100,7 +100,7 @@ async fn test_vector_db_upsert_and_search() -> Result<()> {
     tokio::time::sleep(Duration::from_millis(500)).await;
     let query_vector = vec![0.15, 0.25, 0.6];
     let results = vector_db.search(query_vector.clone(), 5, Some(0.5)).await?;
-    println!("Search Results: {:?}", results);
+    log::info!("Search Results: {:?}", results);
     assert!(!results.is_empty(), "Search should return results");
     assert_eq!(results.len(), 2, "Expected 2 results above threshold 0.5");
     let top_result = &results[0];

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ fn main() -> anyhow::Result<()> {`
`21`	`21`	`// 引数: 入力ディレクトリ, 出力ファイル`
`22`	`22`	`let args: Vec<String> = env::args().collect();`
`23`	`23`	`if args.len() != 3 {`
`24`		`- eprintln!("Usage: build_index <input_docs_dir> <output_jsonl>");`
	`24`	`+ log::error!("Usage: build_index <input_docs_dir> <output_jsonl>");`
`25`	`25`	`std::process::exit(1);`
`26`	`26`	`}`
`27`	`27`	`let input_dir = PathBuf::from(&args[1]);`
`@@ -53,6 +53,6 @@ fn main() -> anyhow::Result<()> {`
`53`	`53`	`total_chunks += 1;`
`54`	`54`	`}`
`55`	`55`	`}`
`56`		`- println!("Wrote {} chunks to {:?}", total_chunks, output_path);`
	`56`	`+ log::info!("Wrote {} chunks to {:?}", total_chunks, output_path);`
`57`	`57`	`Ok(())`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ pub fn load_documents(docs_path: Option<PathBuf>) -> Result<SimpleDocumentIndex,`
`40`	`40`	`let default_path = PathBuf::from("metacontract/mc/site/docs");`
`41`	`41`	`let target_path = docs_path.unwrap_or(default_path);`
`42`	`42`
`43`		`- println!("Loading documents from: {:?}", target_path);`
	`43`	`+ log::info!("Loading documents from: {:?}", target_path);`
`44`	`44`
`45`	`45`	`if !target_path.is_dir() {`
`46`	`46`	`return Err(format!(`
`@@ -65,13 +65,13 @@ pub fn load_documents(docs_path: Option<PathBuf>) -> Result<SimpleDocumentIndex,`
`65`	`65`	`index.insert(path_str, (text, "mc-docs".to_string())); // sourceは現状固定`
`66`	`66`	`}`
`67`	`67`	`Err(e) => {`
`68`		`- eprintln!("Failed to read file {}: {}", path_str, e);`
	`68`	`+ log::error!("Failed to read file {}: {}", path_str, e);`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`if index.is_empty() {`
`74`		`- println!(`
	`74`	`+ log::warn!(`
`75`	`75`	`"Warning: No markdown files found or loaded from {:?}",`
`76`	`76`	`target_path`
`77`	`77`	`);`
`@@ -162,7 +162,7 @@ pub fn load_documents_from_multiple_sources(`
`162`	`162`	`index.insert(path_str, (text, source.clone()));`
`163`	`163`	`}`
`164`	`164`	`Err(e) => {`
`165`		`- eprintln!("Failed to read file {}: {}", path_str, e);`
	`165`	`+ log::error!("Failed to read file {}: {}", path_str, e);`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`	`}`
`@@ -235,14 +235,14 @@ pub fn load_documents_from_source(dir_path: &PathBuf) -> Result<HashMap<String,`
`235`	`235`	`/// 指定URLからprebuilt_index.jsonl(.gz)をダウンロード（既存ならスキップ）`
`236`	`236`	`pub fn download_if_not_exists(url: &str, dest: &str) -> anyhow::Result<()> {`
`237`	`237`	`if PathBuf::from(dest).exists() {`
`238`		`- println!("Index file already exists: {}", dest);`
	`238`	`+ log::info!("Index file already exists: {}", dest);`
`239`	`239`	`return Ok(());`
`240`	`240`	`}`
`241`		`- println!("Downloading index from {} ...", url);`
	`241`	`+ log::info!("Downloading index from {} ...", url);`
`242`	`242`	`let mut resp = reqwest::blocking::get(url)?;`
`243`	`243`	`let mut out = File::create(dest)?;`
`244`	`244`	`copy(&mut resp, &mut out)?;`
`245`		`- println!("Downloaded index to {}", dest);`
	`245`	`+ log::info!("Downloaded index to {}", dest);`
`246`	`246`	`Ok(())`
`247`	`247`	`}`
`248`	`248`
`@@ -311,7 +311,7 @@ mod tests {`
`311`	`311`	`fn test_load_documents_default_path_not_exists() {`
`312`	`312`	`// Need to ensure the default path doesn't exist for this test`
`313`	`313`	`if PathBuf::from("metacontract/mc/site/docs").exists() {`
`314`		`- println!(`
	`314`	`+ log::info!(`
`315`	`315`	`"Skipping test_load_documents_default_path_not_exists because default path exists."`
`316`	`316`	`);`
`317`	`317`	`return;`