unique-web-search 1.8.3__tar.gz → 1.9.1__tar.gz

{unique_web_search-1.8.3 → unique_web_search-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-web-search
-Version: 1.8.3
+Version: 1.9.1
 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>

{unique_web_search-1.8.3 → unique_web_search-1.9.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_web_search"
-version = "1.8.3"
+version = "1.9.1"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12,<4.0"

{unique_web_search-1.8.3 → unique_web_search-1.9.1}/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.3 → unique_web_search-1.9.1}/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.3 → unique_web_search-1.9.1}/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.3 → unique_web_search-1.9.1}/src/unique_web_search/services/search_engine/custom_api.py

@@ -98,6 +98,11 @@ class CustomAPI(SearchEngine[CustomAPIConfig]):
                 json=body,
             )
 
+        if not response.is_success:
+            raise ValueError(
+                f"Search engine request failed with status {response.status_code}: {response.text}"
+            )
+
         validated_response = WebSearchResults.model_validate(response.json())
         return validated_response.results