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

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

@@ -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 → unique_web_search-1.8.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "unique_web_search"
-version = "1.8.0"
+version = "1.8.2"
 description = ""
 readme = "README.md"
 requires-python = ">=3.12,<4.0"
@@ -48,8 +48,20 @@ dev = [
   "pytest-mock>=3.14.0,<4",
   "ruff>=0.12.10,<0.13",
   "basedpyright>=1.35.0",
+  "poethepoet>=0.32.0",
 ]
 
+[tool.poe.tasks]
+lint = "ruff check ."
+lint-fix = "ruff check . --fix"
+format = "ruff format ."
+test = "pytest"
+typecheck = "basedpyright"
+depcheck = "deptry ."
+coverage = "pytest --cov=unique_web_search --cov-report=term-missing"
+ci-typecheck = { shell = "bash $(git rev-parse --show-toplevel)/.github/scripts/dev.sh typecheck" }
+ci-coverage = { shell = "bash $(git rev-parse --show-toplevel)/.github/scripts/dev.sh coverage" }
+
 [tool.deptry]
 known_first_party = ["unique_web_search"]
 

{unique_web_search-1.8.0 → unique_web_search-1.8.2}/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.0 → unique_web_search-1.8.2}/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.0 → unique_web_search-1.8.2}/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.0 → unique_web_search-1.8.2}/src/unique_web_search/services/search_engine/__init__.py

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