unique_toolkit 0.8.3__tar.gz → 0.8.4__tar.gz

{unique_toolkit-0.8.3 → unique_toolkit-0.8.4}/CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.4] - 2025-08-06
+- Make unique settings compatible with legacy environment variables
+
 ## [0.8.3] - 2025-08-05
 - Expose threshold field for search.
 

{unique_toolkit-0.8.3 → unique_toolkit-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.8.3
+Version: 0.8.4
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -113,6 +113,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.4] - 2025-08-06
+- Make unique settings compatible with legacy environment variables
+
 ## [0.8.3] - 2025-08-05
 - Expose threshold field for search.
 

{unique_toolkit-0.8.3 → unique_toolkit-0.8.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "0.8.3"
+version = "0.8.4"
 description = ""
 authors = [
     "Martin Fadler <martin.fadler@unique.ch>",

{unique_toolkit-0.8.3 → unique_toolkit-0.8.4}/unique_toolkit/app/unique_settings.py

@@ -3,7 +3,7 @@ from pathlib import Path
 from typing import Self, TypeVar
 from urllib.parse import urlparse, urlunparse
 
-from pydantic import Field, SecretStr, model_validator
+from pydantic import AliasChoices, Field, SecretStr, model_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 
 logger = getLogger(__name__)
@@ -13,18 +13,34 @@ T = TypeVar("T", bound=BaseSettings)
 
 def warn_about_defaults(instance: T) -> T:
     """Log warnings for fields that are using default values."""
-    for field_name, model_field in instance.model_fields.items():
+    for field_name, model_field in instance.__class__.model_fields.items():
         field_value = getattr(instance, field_name)
-        if field_value == model_field.default:
-            logger.warning(
-                f"Using default value for '{field_name}': {model_field.default}"
-            )
+        default_value = model_field.default
+
+        # Handle SecretStr comparison by comparing the secret values
+        if isinstance(field_value, SecretStr) and isinstance(default_value, SecretStr):
+            if field_value.get_secret_value() == default_value.get_secret_value():
+                logger.warning(
+                    f"Using default value for '{field_name}': {default_value.get_secret_value()}"
+                )
+        elif field_value == default_value:
+            logger.warning(f"Using default value for '{field_name}': {default_value}")
     return instance
 
 
 class UniqueApp(BaseSettings):
-    id: SecretStr = Field(default=SecretStr("dummy_id"))
-    key: SecretStr = Field(default=SecretStr("dummy_key"))
+    id: SecretStr = Field(
+        default=SecretStr("dummy_id"),
+        validation_alias=AliasChoices(
+            "unique_app_id", "app_id", "UNIQUE_APP_ID", "APP_ID"
+        ),
+    )
+    key: SecretStr = Field(
+        default=SecretStr("dummy_key"),
+        validation_alias=AliasChoices(
+            "unique_app_key", "key", "UNIQUE_APP_KEY", "KEY", "API_KEY", "api_key"
+        ),
+    )
     base_url: str = Field(
         default="http://localhost:8092/",
         deprecated="Use UniqueApi.base_url instead",
@@ -48,8 +64,16 @@ class UniqueApi(BaseSettings):
     base_url: str = Field(
         default="http://localhost:8092/",
         description="The base URL of the Unique API. Ask your admin to provide you with the correct URL.",
+        validation_alias=AliasChoices(
+            "unique_api_base_url", "base_url", "UNIQUE_API_BASE_URL", "BASE_URL"
+        ),
+    )
+    version: str = Field(
+        default="2023-12-06",
+        validation_alias=AliasChoices(
+            "unique_api_version", "version", "UNIQUE_API_VERSION", "VERSION"
+        ),
     )
-    version: str = Field(default="2023-12-06")
 
     model_config = SettingsConfigDict(
         env_prefix="unique_api_",
@@ -82,14 +106,29 @@ class UniqueApi(BaseSettings):
 
     def openai_proxy_url(self) -> str:
         parsed = urlparse(self.base_url)
-        return urlunparse(
-            parsed._replace(path="/public/openai-proxy/", query=None, fragment=None)
-        )
+        path = "/public/chat/openai-proxy/"
+        if parsed.hostname and "qa.unique" in parsed.hostname:
+            path = "/public/chat-gen2/openai-proxy/"
+
+        return urlunparse(parsed._replace(path=path, query=None, fragment=None))
 
 
 class UniqueAuth(BaseSettings):
-    company_id: SecretStr = Field(default=SecretStr("dummy_company_id"))
-    user_id: SecretStr = Field(default=SecretStr("dummy_user_id"))
+    company_id: SecretStr = Field(
+        default=SecretStr("dummy_company_id"),
+        validation_alias=AliasChoices(
+            "unique_auth_company_id",
+            "company_id",
+            "UNIQUE_AUTH_COMPANY_ID",
+            "COMPANY_ID",
+        ),
+    )
+    user_id: SecretStr = Field(
+        default=SecretStr("dummy_user_id"),
+        validation_alias=AliasChoices(
+            "unique_auth_user_id", "user_id", "UNIQUE_AUTH_USER_ID", "USER_ID"
+        ),
+    )
 
     model_config = SettingsConfigDict(
         env_prefix="unique_auth_",
@@ -128,7 +167,7 @@ class UniqueSettings:
 
         # Initialize settings with environment file if provided
         env_file_str = str(env_file) if env_file else None
-        auth = UniqueAuth(_env_file=env_file_str)
-        app = UniqueApp(_env_file=env_file_str)
-        api = UniqueApi(_env_file=env_file_str)
+        auth = UniqueAuth(_env_file=env_file_str)  # type: ignore[call-arg]
+        app = UniqueApp(_env_file=env_file_str)  # type: ignore[call-arg]
+        api = UniqueApi(_env_file=env_file_str)  # type: ignore[call-arg]
         return cls(auth=auth, app=app, api=api)

{unique_toolkit-0.8.3 → unique_toolkit-0.8.4}/unique_toolkit/framework_utilities/langchain/history.py

@@ -10,9 +10,9 @@ def unique_history_to_langchain_history(
     history = []
     for m in unique_history:
         if m.role == UniqueRole.ASSISTANT:
-            history.append(AIMessage(content=m.content))
+            history.append(AIMessage(content=m.content or ""))
         elif m.role == UniqueRole.USER:
-            history.append(HumanMessage(content=m.content))
+            history.append(HumanMessage(content=m.content or ""))
         else:
             raise Exception("Unknown message role.")
 

{unique_toolkit-0.8.3 → unique_toolkit-0.8.4}/unique_toolkit/framework_utilities/openai/client.py

@@ -37,7 +37,7 @@ def get_openai_client(unique_settings: UniqueSettings) -> OpenAI:
     default_headers = get_default_headers(unique_settings.app, unique_settings.auth)
 
     return OpenAI(
-        api_key=unique_settings.app.key.get_secret_value(),
+        api_key="dummy_key",
         base_url=unique_settings.api.openai_proxy_url(),
         default_headers=default_headers,
     )