unique-web-search 1.8.0__py3-none-any.whl → 1.8.2__py3-none-any.whl

unique_web_search/config.py

@@ -1,7 +1,7 @@
 from logging import getLogger
-from typing import Annotated
+from typing import Annotated, Literal
 
-from pydantic import BaseModel, Field, model_validator
+from pydantic import BaseModel, Field, field_validator, model_validator
 from pydantic.json_schema import SkipJsonSchema
 from unique_toolkit._common.chunk_relevancy_sorter.config import (
     ChunkRelevancySortConfig,
@@ -109,7 +109,7 @@ class WebSearchConfig(BaseToolConfig):
     web_search_mode_config_v2: WebSearchV2Config = Field(
         default_factory=WebSearchV2Config,
         description="Web Search Mode Configuration V2",
-        title="Web Search Mode Configuration V2 (Beta)",
+        title="Web Search Mode Configuration V2",
     )
 
     search_engine_config: ActivatedSearchEngine = Field(  # type: ignore (This type is computed at runtime so pyright is not able to infer it)
@@ -188,3 +188,10 @@ class WebSearchConfig(BaseToolConfig):
             if self.web_search_active_mode == WebSearchMode.V1
             else self.web_search_mode_config_v2
         )
+
+    @field_validator("web_search_active_mode", mode="before")
+    @classmethod
+    def validate_web_search_active_mode(cls, v: str) -> Literal["v1", "v2"]:
+        if "v2" in v.lower():  # Make sure to handle "v2 (beta)" as well
+            return "v2"
+        return "v1"

unique_web_search/services/executors/configs/__init__.py

@@ -19,9 +19,7 @@ def get_default_web_search_mode_config() -> WebSearchMode:
         case "v2":
             return WebSearchMode.V2
         case _:
-            raise ValueError(
-                f"Invalid web search mode: {env_settings.default_web_search_mode}"
-            )
+            raise ValueError(f"Invalid web search mode: {env_settings.web_search_mode}")
 
 
 __all__ = [

unique_web_search/services/executors/configs/v2_config.py

@@ -1,6 +1,6 @@
 from typing import Annotated, Literal
 
-from pydantic import Field
+from pydantic import Field, field_validator
 from pydantic.json_schema import SkipJsonSchema
 from unique_toolkit._common.pydantic.rjsf_tags import RJSFMetaTag
 from unique_toolkit.agentic.tools.config import get_configuration_dict
@@ -13,12 +13,12 @@ from unique_web_search.services.executors.configs.prompts import (
     DEFAULT_TOOL_DESCRIPTION,
     DEFAULT_TOOL_DESCRIPTION_FOR_SYSTEM_PROMPT,
 )
-from unique_web_search.services.helpers import beta_model_title_generator
+from unique_web_search.services.helpers import clean_model_title_generator
 
 
 class WebSearchV2Config(BaseWebSearchModeConfig[WebSearchMode.V2]):
     model_config = get_configuration_dict(
-        model_title_generator=beta_model_title_generator
+        model_title_generator=clean_model_title_generator
     )
     mode: SkipJsonSchema[Literal[WebSearchMode.V2]] = WebSearchMode.V2
 
@@ -46,3 +46,10 @@ class WebSearchV2Config(BaseWebSearchModeConfig[WebSearchMode.V2]):
         default=DEFAULT_TOOL_DESCRIPTION_FOR_SYSTEM_PROMPT["v2"],
         description="Description of the tool's capabilities, intended for inclusion in system prompts to inform the language model what the tool can do.",
     )
+
+    @field_validator("mode", mode="before")
+    @classmethod
+    def validate_mode(cls, v: str) -> Literal["v2"]:
+        if "v2" in v.lower():  # Make sure to handle "v2 (beta)" as well
+            return "v2"
+        raise ValueError(f"Invalid mode: {v}")

unique_web_search/services/search_engine/__init__.py

@@ -50,8 +50,8 @@ SearchEngineTypes = (
     | BingSearch
     | BraveSearch
     | FireCrawlSearch
-    | VertexAIConfig
-    | CustomAPIConfig
+    | VertexAI
+    | CustomAPI
 )
 SearchEngineConfigTypes = (
     GoogleConfig

{unique_web_search-1.8.0.dist-info → unique_web_search-1.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-web-search
-Version: 1.8.0
+Version: 1.8.2
 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.0.dist-info → unique_web_search-1.8.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 unique_web_search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_web_search/client_settings.py,sha256=gGcD6ehgwv6mNzJw07naAGqYug2Rf25kYYQ4eeeqs_g,5879
-unique_web_search/config.py,sha256=Wn-GtMyYi_LbyBcsroaHmuf0P86TH_BW15vmTF2qm0Q,7085
+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
@@ -19,16 +19,16 @@ unique_web_search/services/crawlers/tavily.py,sha256=dFVyvS4VQ_Z8xbX-NY97KWYyx5c
 unique_web_search/services/executors/README.md,sha256=wTtvzuW5d3SQouwP6BpgsSD2xQc1ZL9RRasX23nNwTw,8896
 unique_web_search/services/executors/__init__.py,sha256=Dc4YyPJPz6vta7vf-Oudgz0NLzq9RF-6SAPD5EpTtVs,260
 unique_web_search/services/executors/base_executor.py,sha256=FD6TKTDq5qZtruQrMmb1AWLT6qG54BoUWj1HSX1raiE,6241
-unique_web_search/services/executors/configs/__init__.py,sha256=MFbvkgAZKxjoj8TmBpzCQ7MDzV2lK7DaIG4yvN0HvOc,933
+unique_web_search/services/executors/configs/__init__.py,sha256=yOy0O95Mlmi0rukAj1YlkFpF6QznxET-8s-JMXgkUro,895
 unique_web_search/services/executors/configs/base.py,sha256=TFHc3eKEN-3SHMiB100__y-g-aIfzUHLmgsCAllcwb4,833
 unique_web_search/services/executors/configs/prompts.py,sha256=z84UyRq48dCiKBQsmXd37lwDLtCYZHUQz3ZAWUzcbVg,9748
 unique_web_search/services/executors/configs/v1_config.py,sha256=GMlsP1CWer6WqGxTe9819CLtbtpwCFFLs9BO8yBsqBs,3732
-unique_web_search/services/executors/configs/v2_config.py,sha256=GcB7SR30OqD84aVVZ2YTGV1QhrJY170bXT9Nwc1ywSs,1882
+unique_web_search/services/executors/configs/v2_config.py,sha256=DZUV0DfZ9nemMsUO46rxnMXU-5dQK1IAqqkdsObtixo,2160
 unique_web_search/services/executors/web_search_v1_executor.py,sha256=LCcHjWlLh68MEr7w9TJanh34SBmH64U-RpXoAenpvmw,13343
 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=z3Q1F3gZ1ZgwbujJYYI1Gdf6kGCBWuUoMMqodOvwsrs,4108
+unique_web_search/services/search_engine/__init__.py,sha256=Wzq26mFLy43cZtr-kbauQfYvQfID80F04YFYqbVL1WA,4096
 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/brave.py,sha256=qJg7efQCuIU1l1kyb_H_0AvA-zboOg2Ip0QnnMhCpN0,3764
@@ -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=Yj8LqYzylqv3qA8yZ5XZSQ-CrTOOEx2O81Z3yk2cs-k,5795
 unique_web_search/utils.py,sha256=5yLyzKyqy1v-Ut_TEYb4fggpiUj-nPf84YsO7db75so,4069
-unique_web_search-1.8.0.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
-unique_web_search-1.8.0.dist-info/METADATA,sha256=mRfa0v0YIMgSqYxMbpBAwTCdnmzZ7jnrEHrsSjHTvCY,5565
-unique_web_search-1.8.0.dist-info/RECORD,,
+unique_web_search-1.8.2.dist-info/WHEEL,sha256=eh7sammvW2TypMMMGKgsM83HyA_3qQ5Lgg3ynoecH3M,79
+unique_web_search-1.8.2.dist-info/METADATA,sha256=nKvXFqfohz6PYfvXeYCftT34M4nvVewXWiiH6D6tWOA,5565
+unique_web_search-1.8.2.dist-info/RECORD,,