test build error fix

Author: Rutik7066

golem-web-search/Makefile.toml

@@ -144,6 +144,21 @@ args = [
     "-Dwarnings",
 ]
 
+
+[tasks.build-test-components]
+dependencies = ["build"]
+description = "Builds all test components with golem-cli"
+install_crate = "cargo-binstall"
+script = '''
+cargo-binstall golem-cli@1.2.2-dev.11 --locked --force --no-confirm
+cargo-binstall wac-cli --locked --force --no-confirm
+cd test
+golem-cli --version
+golem-cli app clean
+golem-cli app build -b google-debug
+'''
+
+
 [tasks.set-version]
 description = "Sets the version in all Cargo.toml files to the value of the VERSION environment variable"
 condition = { env_set = ["VERSION"] }

golem-web-search/test/Cargo.lock

@@ -32,10 +32,10 @@ path = "wit-generated"
 "golem:rpc/types@0.2.0" = "golem_rust::wasm_rpc::golem_rpc_0_2_x::types"
 
 [package.metadata.component.target.dependencies]
-"golem:web-search" = { path = "wit-generated/deps/golem-web-search" }
-"wasi:clocks" = { path = "wit-generated/deps/clocks" }
 "wasi:io" = { path = "wit-generated/deps/io" }
+"wasi:clocks" = { path = "wit-generated/deps/clocks" }
 "golem:rpc" = { path = "wit-generated/deps/golem-rpc" }
+"golem:web-search" = { path = "wit-generated/deps/golem-web-search" }
 "test:helper-client" = { path = "wit-generated/deps/test_helper-client" }
 "test:web-search-exports" = { path = "wit-generated/deps/test_web-search-exports" }
 

golem-web-search/test/components-rust/test-web-search/Cargo.toml

@@ -18,7 +18,7 @@ components:
               - ../../common-rust
             targets:
               - ../../target/wasm32-wasip1/debug/test_web_search.wasm
-          - command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_websearch_openai.wasm ../../target/wasm32-wasip1/debug/test_web_search.wasm -o ../../target/wasm32-wasip1/debug/test_google_plugged.wasm
+          - command: wac plug --plug ../../../../target/wasm32-wasip1/debug/golem_websearch_google.wasm ../../target/wasm32-wasip1/debug/test_web_search.wasm -o ../../target/wasm32-wasip1/debug/test_google_plugged.wasm
             sources:
               - ../../target/wasm32-wasip1/debug/test_web_search.wasm
               - ../../../../target/wasm32-wasip1/debug/test_web_search.wasm
@@ -58,6 +58,6 @@ components:
     defaultProfile: google-debug
 
 dependencies:
-  test:llm:
+  test:web-search:
     - target: test:helper
       type: wasm-rpc

golem-web-search/test/components-rust/test-web-search/golem.yaml

@@ -1,112 +1,133 @@
 #[allow(static_mut_refs)]
 mod bindings;
 
-use golem_rust::atomically;
 use crate::bindings::exports::test::web_search_exports::test_web_search_api::*;
 use crate::bindings::golem::web_search::web_search;
 use crate::bindings::test::helper_client::test_helper_client::TestHelperApi;
+use golem_rust::atomically;
 
 struct Component;
 
 impl Guest for Component {
     /// test1 demonstrates a simple web search query
     fn test1() -> String {
-        let config = web_search::Config {
-            provider: "google".to_string(),
-            provider_options: vec![],
+        let params = web_search::SearchParams {
+            query: "Rust programming language".to_string(),
+            safe_search: None,
+            language: None,
+            region: None,
+            max_results: Some(10),
+            time_range: None,
+            include_domains: None,
+            exclude_domains: None,
+            include_images: None,
+            include_html: None,
+            advanced_answer: None,
         };
 
         println!("Sending web search request...");
-        let response = web_search::search(
-            "Rust programming language",
-            &config,
-        );
+        let response = web_search::search_once(&params);
         println!("Response: {:?}", response);
 
         match response {
-            Ok(results) => {
+            Ok((results, metadata)) => {
                 format!(
-                    "Found {} results. First result: {}",
+                    "Found {} results.\nResults: {:?}\nMetadata: {:?}",
                     results.len(),
-                    results.first()
-                        .map(|r| format!("{} - {}", r.title, r.url))
-                        .unwrap_or("No results".to_string())
+                    results,
+                    metadata
                 )
             }
             Err(error) => {
-                format!(
-                    "ERROR: {}",
-                    error
-                )
+                format!("ERROR: {:?}", error)
             }
         }
     }
 
     /// test2 demonstrates a more complex web search query with multiple terms
     fn test2() -> String {
-        let config = web_search::Config {
-            provider: "google".to_string(),
-            provider_options: vec![],
+        let params = web_search::SearchParams {
+            query: "WebAssembly WASI components tutorial".to_string(),
+            safe_search: None,
+            language: None,
+            region: None,
+            max_results: Some(5),
+            time_range: None,
+            include_domains: None,
+            exclude_domains: None,
+            include_images: None,
+            include_html: None,
+            advanced_answer: None,
         };
 
         println!("Sending complex web search request...");
-        let response = web_search::search(
-            "WebAssembly WASI components tutorial",
-            &config,
-        );
+        let response = web_search::search_once(&params);
         println!("Response: {:?}", response);
 
         match response {
-            Ok(results) => {
-                let mut output = format!("Found {} results:\n", results.len());
-                for (i, result) in results.iter().take(3).enumerate() {
-                    output.push_str(&format!(
-                        "{}. {} - {} ({})\n",
-                        i + 1,
-                        result.title,
-                        result.url,
-                        result.snippet.as_deref().unwrap_or("No snippet")
-                    ));
-                }
-                output
+            Ok((results, metadata)) => {
+                format!(
+                    "Found {} results.\nResults: {:?}\nMetadata: {:?}",
+                    results.len(),
+                    results,
+                    metadata
+                )
             }
             Err(error) => {
-                format!("ERROR: {}", error)
+                format!("ERROR: {:?}", error)
             }
         }
     }
 
     /// test3 demonstrates error handling with an invalid search query
     fn test3() -> String {
-        let config = web_search::Config {
-            provider: "google".to_string(),
-            provider_options: vec![],
+        let params = web_search::SearchParams {
+            query: "".to_string(),
+            safe_search: None,
+            language: None,
+            region: None,
+            max_results: Some(10),
+            time_range: None,
+            include_domains: None,
+            exclude_domains: None,
+            include_images: None,
+            include_html: None,
+            advanced_answer: None,
         };
 
         println!("Sending empty web search request...");
-        let response = web_search::search("", &config);
+        let response = web_search::search_once(&params);
         println!("Response: {:?}", response);
 
         match response {
-            Ok(results) => {
+            Ok((results, _metadata)) => {
                 format!("Unexpected success with {} results", results.len())
             }
             Err(error) => {
-                format!("Expected error: {}", error)
+                format!("Expected error: {:?}", error)
             }
         }
     }
 
     /// test4 simulates a crash during a web search, but only first time.
     /// after the automatic recovery it will continue and finish the request successfully.
     fn test4() -> String {
-        let config = web_search::Config {
-            provider: "google".to_string(),
-            provider_options: vec![],
+        let params = web_search::SearchParams {
+            query: "Golem cloud WebAssembly components".to_string(),
+            safe_search: None,
+            language: None,
+            region: None,
+            max_results: Some(10),
+            time_range: None,
+            include_domains: None,
+            exclude_domains: None,
+            include_images: None,
+            include_html: None,
+            advanced_answer: None,
         };
 
         let name = std::env::var("GOLEM_WORKER_NAME").unwrap();
-        
+
         atomically(|| {
             let client = TestHelperApi::new(&name);
             let counter = client.blocking_inc_and_get();
@@ -116,27 +137,23 @@ impl Guest for Component {
         });
 
         println!("Sending web search request after recovery...");
-        let response = web_search::search(
-            "Golem cloud WebAssembly components",
-            &config,
-        );
+        let response = web_search::search_once(&params);
         println!("Response: {:?}", response);
 
         match response {
-            Ok(results) => {
+            Ok((results, metadata)) => {
                 format!(
-                    "Recovery successful! Found {} results. First: {}",
+                    "Found {} results.\nResults: {:?}\nMetadata: {:?}",
                     results.len(),
-                    results.first()
-                        .map(|r| format!("{} - {}", r.title, r.url))
-                        .unwrap_or("No results".to_string())
+                    results,
+                    metadata
                 )
             }
             Err(error) => {
-                format!("ERROR after recovery: {}", error)
+                format!("ERROR after recovery: {:?}", error)
             }
         }
     }
 }
 
-bindings::export!(Component with_types_in bindings);
+bindings::export!(Component with_types_in bindings);

golem-web-search/test/components-rust/test-web-search/src/lib.rs

@@ -115,3 +115,6 @@ impl Guest for GoogleWebSearchComponent {
         )
     }
 }
+
+
+golem_web_search::export_web_search!(GoogleWebSearchComponent with_types_in golem_web_search);