unique-web-search 1.8.3__py3-none-any.whl → 1.9.1__py3-none-any.whl

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/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/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/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
 

{unique_web_search-1.8.3.dist-info → unique_web_search-1.9.1.dist-info}/METADATA

@@ -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.dist-info → unique_web_search-1.9.1.dist-info}/RECORD

@@ -3,7 +3,7 @@ unique_web_search/client_settings.py,sha256=gGcD6ehgwv6mNzJw07naAGqYug2Rf25kYYQ4
 unique_web_search/config.py,sha256=hshXhJdEzuddxHEgKYtdfZ8HcIgwLZWdpyp26xAYTUg,7378
 unique_web_search/prompts.py,sha256=lfwW-qxzcJ0wthZ962yRgtuGvIdiDZ_wZ-LqjXLaC9A,2186
 unique_web_search/schema.py,sha256=0Qivyo9RV1PmycXslOoQsa9-DnpHDav4wOsA1-BdYFw,1621
-unique_web_search/service.py,sha256=ntosE4gtijK4Gpp52Jer_UqBk0OiK57cWJEpPBCU7GQ,13104
+unique_web_search/service.py,sha256=U7DV3-lVi0f_EC-Rl_LnHbStOyJfCZHaeKbmt-diqWM,13071
 unique_web_search/services/client/proxy_config.py,sha256=R8o2jgg6sM-F9nZyegVqhZae8MDzzrsAOdRC1UwKJdI,3470
 unique_web_search/services/content_processing/__init__.py,sha256=8foGjXnQHUSbVXCWDfO1Nz_nE9u6rLMj2hmdolsVUv0,360
 unique_web_search/services/content_processing/config.py,sha256=pETpW_w4Rzwqz6NYHySng0oVNDRz7sEqpbjWAi0p2yY,3426
@@ -28,11 +28,11 @@ unique_web_search/services/executors/web_search_v1_executor.py,sha256=LCcHjWlLh6
 unique_web_search/services/executors/web_search_v2_executor.py,sha256=PLPS9hXFpyCzibDqQH3j5Vo5H4bcVXtrWZ3i-KvR6Og,11047
 unique_web_search/services/helpers.py,sha256=4Iv0oiGrgeW8cx85JZqQr96AHye1oGu4Aw2NW_-cEy4,562
 unique_web_search/services/search_engine/README.md,sha256=qBn85f7orZBrautIQBXT0BTf3tMndW8_3Cx3gck9KLo,19637
-unique_web_search/services/search_engine/__init__.py,sha256=Wzq26mFLy43cZtr-kbauQfYvQfID80F04YFYqbVL1WA,4096
+unique_web_search/services/search_engine/__init__.py,sha256=mtUGCE1E2WB7xuwq0YbV7WWN46NY52YEAyUITG7oTos,3998
 unique_web_search/services/search_engine/base.py,sha256=MBQWiozcIAnXvH7vuMpLo6EaWYlAgI30c-ROb91wZRU,2069
-unique_web_search/services/search_engine/bing.py,sha256=qBhQeeOOt9bxZK_5C3NeLcfHLgbFnMdhhwNAFjqrJEM,3743
+unique_web_search/services/search_engine/bing.py,sha256=xlNb66W9plWGqDrrLoMLM61ThEvNkJ6y7uiGf-2l_dU,4412
 unique_web_search/services/search_engine/brave.py,sha256=qJg7efQCuIU1l1kyb_H_0AvA-zboOg2Ip0QnnMhCpN0,3764
-unique_web_search/services/search_engine/custom_api.py,sha256=nW4a1ruIBiMHaF4kjJuVNImBM8rklTjSWFhkIN1DX0E,4968
+unique_web_search/services/search_engine/custom_api.py,sha256=-f6WTKifnDgTfzmoeOFoAU4v7ce7yDSdl1h8lnH4XQU,5149
 unique_web_search/services/search_engine/firecrawl.py,sha256=CEhnpyxYvr8LO10Xxl54hWpIElCLBRQBH-x8o_vMjPA,4611
 unique_web_search/services/search_engine/google.py,sha256=SKdj2uR6nwOT18ktCkAcOJLoQULq7GeHILDFFewG8dU,5423
 unique_web_search/services/search_engine/jina.py,sha256=1I4C18W-UnjoNe4NXK3K5jfeHe9-2u9RBMkWp9Rgo60,10009
@@ -52,6 +52,6 @@ unique_web_search/services/search_engine/utils/vertexai/response_handler.py,sha2
 unique_web_search/services/search_engine/vertexai.py,sha256=4AlNP7NHkSMD1lZROBFDcm61stjXDRTfzAkLBRfFy4A,4664
 unique_web_search/settings.py,sha256=EnMmQZGfn6S8_TFY6fCuz_DrL1dTabPuIOzRbQwAO-I,5901
 unique_web_search/utils.py,sha256=5yLyzKyqy1v-Ut_TEYb4fggpiUj-nPf84YsO7db75so,4069
-unique_web_search-1.8.3.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-unique_web_search-1.8.3.dist-info/METADATA,sha256=2VlbrJC86vSQ-I16zzWJGqg2R8CyulMMhxRNCNG8ViI,5565
-unique_web_search-1.8.3.dist-info/RECORD,,
+unique_web_search-1.9.1.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+unique_web_search-1.9.1.dist-info/METADATA,sha256=-nK6xJH2XcL1O01G4hd4B-2aW6kBdKhd3FFd0VzwOwM,5565
+unique_web_search-1.9.1.dist-info/RECORD,,