unique-web-search 1.8.2__tar.gz → 1.9.0__tar.gz

{unique_web_search-1.8.2 → unique_web_search-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-web-search
-Version: 1.8.2
+Version: 1.9.0
 Summary: 
 Author: Andreas Hauri, Gustav Hartz, Rami Azouz
 Author-email: Andreas Hauri <andreas@unique.ch>, Gustav Hartz <gustav.hartz.ext@unique.ch>, Rami Azouz <rami.ext@unique.ch>
@@ -17,7 +17,7 @@ Requires-Dist: tavily-python>=0.7.11,<1
 Requires-Dist: unidecode>=1.4.0,<2
 Requires-Dist: azure-ai-projects>=1.0.0,<2
 Requires-Dist: azure-identity>=1.25.0,<2
-Requires-Dist: unique-toolkit>=1.42.9,<2
+Requires-Dist: unique-toolkit>=1.45.0,<2
 Requires-Dist: azure-core>=1.36.0,<2
 Requires-Dist: google-cloud-aiplatform>=1.128.0,<2
 Requires-Dist: google-auth>=2.43.0,<3

{unique_web_search-1.8.2 → unique_web_search-1.9.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_web_search"
-version = "1.8.2"
+version = "1.9.0"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12,<4.0"
@@ -23,7 +23,7 @@ dependencies = [
   "unidecode>=1.4.0,<2",
   "azure-ai-projects>=1.0.0,<2",
   "azure-identity>=1.25.0,<2",
-  "unique-toolkit>=1.42.9,<2",
+  "unique-toolkit>=1.45.0,<2",
   "azure-core>=1.36.0,<2",
   "google-cloud-aiplatform>=1.128.0,<2",
   "google-auth>=2.43.0,<3",
@@ -75,4 +75,3 @@ target-version = "py312"
 
 [tool.ruff.lint]
 extend-select = ["I"]
-

{unique_web_search-1.8.2 → unique_web_search-1.9.0}/src/unique_web_search/service.py

@@ -46,7 +46,6 @@ class WebSearchTool(Tool[WebSearchConfig]):
         self.search_engine_service = get_search_engine_service(
             self.config.search_engine_config,
             self.language_model_service,
-            self.language_model,
         )
         self.crawler_service = get_crawler_service(self.config.crawler_config)
         self.chunk_relevancy_sorter = ChunkRelevancySorter(self.event)

{unique_web_search-1.8.2 → unique_web_search-1.9.0}/src/unique_web_search/services/search_engine/__init__.py

@@ -3,7 +3,6 @@ from functools import reduce
 from typing import TypeAlias
 
 from unique_toolkit import LanguageModelService
-from unique_toolkit._common.validators import LMI
 
 from unique_web_search.services.search_engine.base import (
     BaseSearchEngineConfig,
@@ -79,7 +78,6 @@ ENGINE_NAME_TO_CONFIG = {
 def get_search_engine_service(
     search_engine_config: SearchEngineConfigTypes,
     language_model_service: LanguageModelService,
-    lmi: LMI,
 ):
     match search_engine_config.search_engine_name:
         case SearchEngineType.FIRECRAWL:
@@ -91,9 +89,9 @@ def get_search_engine_service(
         case SearchEngineType.TAVILY:
             return TavilySearch(search_engine_config)
         case SearchEngineType.BING:
-            return BingSearch(search_engine_config, language_model_service, lmi)
+            return BingSearch(search_engine_config, language_model_service)
         case SearchEngineType.BRAVE:
-            return BraveSearch(search_engine_config, language_model_service, lmi)
+            return BraveSearch(search_engine_config)
         case SearchEngineType.VERTEXAI:
             return VertexAI(search_engine_config)
         case SearchEngineType.CUSTOM_API:

{unique_web_search-1.8.2 → unique_web_search-1.9.0}/src/unique_web_search/services/search_engine/bing.py

@@ -2,11 +2,13 @@ import logging
 from typing import Literal
 
 from azure.ai.agents.models import ListSortOrder
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from unique_toolkit import LanguageModelService
-from unique_toolkit._common.validators import LMI
+from unique_toolkit._common.validators import LMI, get_LMI_default_field
 from unique_toolkit.agentic.tools.config import get_configuration_dict
 from unique_toolkit.language_model.builder import MessagesBuilder
+from unique_toolkit.language_model.default_language_model import DEFAULT_GPT_4o
+from unique_toolkit.language_model.infos import ModelCapabilities
 
 from unique_web_search.services.search_engine.base import (
     BaseSearchEngineConfig,
@@ -47,6 +49,17 @@ class BingSearchConfig(
     BaseSearchEngineConfig[SearchEngineType.BING], BingSearchOptionalQueryParams
 ):
     search_engine_name: Literal[SearchEngineType.BING] = SearchEngineType.BING
+    language_model: LMI = get_LMI_default_field(DEFAULT_GPT_4o)
+
+    @field_validator("language_model", mode="after")
+    @classmethod
+    def validate_language_model(cls, v: LMI) -> LMI:
+        if ModelCapabilities.STRUCTURED_OUTPUT not in v.capabilities:
+            raise ValueError(
+                f"Language model '{v.name}' does not support structured output. "
+                f"BingSearch requires a model with structured output capability."
+            )
+        return v
 
 
 class BingSearch(SearchEngine[BingSearchConfig]):
@@ -54,11 +67,10 @@ class BingSearch(SearchEngine[BingSearchConfig]):
         self,
         config: BingSearchConfig,
         language_model_service: LanguageModelService,
-        lmi: LMI,
     ):
         super().__init__(config)
         self.language_model_service = language_model_service
-        self.lmi = lmi
+        self.lmi = config.language_model
         self.credentials = get_crendentials()
         self.is_configured = credentials_are_valid(self.credentials)
 

{unique_web_search-1.8.2 → unique_web_search-1.9.0}/src/unique_web_search/services/search_engine/custom_api.py

@@ -1,5 +1,5 @@
 import json
-from typing import Literal, TypeVar
+from typing import Any, Literal, TypeVar
 
 from httpx import AsyncClient
 from pydantic import Field
@@ -86,7 +86,10 @@ class CustomAPI(SearchEngine[CustomAPIConfig]):
     async def search(self, query: str, **kwargs) -> list[WebSearchResult]:
         params, body = self._prepare_request_params_and_body(query)
 
-        async with AsyncClient(timeout=self.config.timeout) as client:
+        async_client_params = self._client_config | {
+            "timeout": self.config.timeout,
+        }
+        async with AsyncClient(**async_client_params) as client:
             response = await client.request(
                 method=self._request_method,
                 headers=self._headers,
@@ -118,6 +121,12 @@ class CustomAPI(SearchEngine[CustomAPIConfig]):
     def _additional_body_params(self) -> dict[str, str]:
         return json.loads(self.config.api_additional_body_params)
 
+    @property
+    def _client_config(self) -> dict[str, Any]:
+        if env_settings.custom_web_search_api_client_config is None:
+            return {}
+        return json.loads(env_settings.custom_web_search_api_client_config)
+
     def _prepare_request_params_and_body(self, query: str) -> tuple[dict, dict]:
         params = self._additional_query_params
         body = self._additional_body_params

{unique_web_search-1.8.2 → unique_web_search-1.9.0}/src/unique_web_search/settings.py

@@ -66,6 +66,7 @@ class Base(BaseSettings):
     custom_web_search_api_headers: str | None = None
     custom_web_search_api_additional_query_params: str | None = None
     custom_web_search_api_additional_body_params: str | None = None
+    custom_web_search_api_client_config: str | None = None
 
     # Proxy settings
     ## Shared settings
@@ -139,6 +140,7 @@ class Base(BaseSettings):
         "custom_web_search_api_headers",
         "custom_web_search_api_additional_query_params",
         "custom_web_search_api_additional_body_params",
+        "custom_web_search_api_client_config",
         mode="after",
     )
     def validate_json(cls, v: str | None, info: ValidationInfo) -> str | None: