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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: unique-web-search
-Version: 1.8.1
+Version: 1.8.3
 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.1 → unique_web_search-1.8.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_web_search"
-version = "1.8.1"
+version = "1.8.3"
 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.1 → unique_web_search-1.8.3}/src/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-1.8.1 → unique_web_search-1.8.3}/src/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-1.8.1 → unique_web_search-1.8.3}/src/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-1.8.1 → unique_web_search-1.8.3}/src/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.1 → unique_web_search-1.8.3}/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.1 → unique_web_search-1.8.3}/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: