unique_toolkit 0.7.35__tar.gz → 0.7.37__tar.gz

{unique_toolkit-0.7.35 → unique_toolkit-0.7.37}/CHANGELOG.md

@@ -5,6 +5,10 @@ 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.7.36] - 2025-07-25
+- Fix issues with settings
+- Add testing to unique settings
+
 ## [0.7.35] - 2025-07-23
 - Bump version of SDK to have access to the latest features and fixes
 

{unique_toolkit-0.7.35 → unique_toolkit-0.7.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.7.35
+Version: 0.7.37
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -12,9 +12,11 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: numpy (>=1.26.4,<2.0.0)
 Requires-Dist: pydantic (>=2.8.2,<3.0.0)
+Requires-Dist: pydantic-settings (>=2.10.1,<3.0.0)
 Requires-Dist: pyhumps (>=3.8.0,<4.0.0)
 Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: regex (>=2024.5.15,<2025.0.0)
+Requires-Dist: sseclient (>=0.0.27,<0.0.28)
 Requires-Dist: tiktoken (>=0.7.0,<0.8.0)
 Requires-Dist: typing-extensions (>=4.9.0,<5.0.0)
 Requires-Dist: unique-sdk (>=0.9.40,<0.10.0)
@@ -111,6 +113,10 @@ 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.7.36] - 2025-07-25
+- Fix issues with settings
+- Add testing to unique settings
+
 ## [0.7.35] - 2025-07-23
 - Bump version of SDK to have access to the latest features and fixes
 

{unique_toolkit-0.7.35 → unique_toolkit-0.7.37}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "0.7.35"
+version = "0.7.37"
 description = ""
 authors = [
     "Martin Fadler <martin.fadler@unique.ch>",
@@ -21,6 +21,8 @@ python-dotenv = "^1.0.1"
 regex = "^2024.5.15"
 tiktoken = "^0.7.0"
 unique-sdk = "^0.9.40"
+pydantic-settings = "^2.10.1"
+sseclient = "^0.0.27"
 
 [tool.poetry.group.dev.dependencies]
 ruff = "0.11.7"

unique_toolkit-0.7.37/unique_toolkit/app/event_util.py

@@ -0,0 +1,24 @@
+import json
+from logging import getLogger
+from typing import Literal, overload
+
+from unique_toolkit.app import ChatEvent, EventName
+
+LOGGER = getLogger(__name__)
+
+
+@overload
+def load_and_filter_event(
+    event: dict,
+    event_type: Literal[EventName.EXTERNAL_MODULE_CHOSEN],
+) -> type[ChatEvent] | None: ...
+
+
+def load_and_filter_event(event: dict, event_type: EventName):
+    event = json.loads(event.data)
+
+    match event_type:
+        case EventName.EXTERNAL_MODULE_CHOSEN:
+            return ChatEvent(**event)
+
+    return None

unique_toolkit-0.7.37/unique_toolkit/app/sse_client.py

@@ -0,0 +1,20 @@
+from logging import getLogger
+
+from sseclient import SSEClient
+
+from unique_toolkit.app.unique_settings import UniqueSettings
+
+LOGGER = getLogger(__name__)
+
+
+def get_sse_client(
+    unique_settings: UniqueSettings,
+    subscriptions: list[str],
+) -> SSEClient:
+    url = f"{unique_settings.app.base_url}/public/event-socket/events/stream?subscriptions={','.join(subscriptions)}"
+    headers = {
+        "Authorization": f"Bearer {unique_settings.app.key}",
+        "x-app-id": unique_settings.app.id,
+        "x-company-id": unique_settings.auth.company_id,
+    }
+    return SSEClient(url=url, headers=headers)

unique_toolkit-0.7.37/unique_toolkit/app/unique_settings.py

@@ -0,0 +1,61 @@
+from pathlib import Path
+
+from pydantic import SecretStr
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
+
+class UniqueApp(BaseSettings):
+    id: SecretStr
+    key: SecretStr
+    base_url: str
+    endpoint: str
+    endpoint_secret: SecretStr
+
+    model_config = SettingsConfigDict(
+        env_prefix="unique_app_",
+        env_file_encoding="utf-8",
+        case_sensitive=False,
+        extra="ignore",
+    )
+
+
+class UniqueAuth(BaseSettings):
+    company_id: SecretStr
+    user_id: SecretStr
+
+    model_config = SettingsConfigDict(
+        env_prefix="unique_auth_",
+        env_file_encoding="utf-8",
+        case_sensitive=False,
+        extra="ignore",
+    )
+
+
+class UniqueSettings:
+    def __init__(self, auth: UniqueAuth, app: UniqueApp):
+        self.app = app
+        self.auth = auth
+
+    @classmethod
+    def from_env(cls, env_file: Path | None = None) -> "UniqueSettings":
+        """Initialize settings from environment variables and/or env file.
+
+        Args:
+            env_file: Optional path to environment file. If provided, will load variables from this file.
+
+        Returns:
+            UniqueSettings instance with values loaded from environment/env file.
+
+        Raises:
+            FileNotFoundError: If env_file is provided but does not exist.
+            ValidationError: If required environment variables are missing.
+        """
+        if env_file and not env_file.exists():
+            raise FileNotFoundError(f"Environment file not found: {env_file}")
+
+        # 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, _env_file_encoding="utf-8")
+        app = UniqueApp(_env_file=env_file_str, _env_file_encoding="utf-8")
+
+        return cls(auth=auth, app=app)

unique_toolkit-0.7.37/unique_toolkit/framework_utilities/langchain/history.py

@@ -0,0 +1,19 @@
+from langchain_core.messages import AIMessage, BaseMessage, HumanMessage
+
+from unique_toolkit.chat import ChatMessage as UniqueMessage
+from unique_toolkit.chat import ChatMessageRole as UniqueRole
+
+
+def unique_history_to_langchain_history(
+    unique_history: list[UniqueMessage],
+) -> list[BaseMessage]:
+    history = []
+    for m in unique_history:
+        if m.role == UniqueRole.ASSISTANT:
+            history.append(AIMessage(content=m.content))
+        elif m.role == UniqueRole.USER:
+            history.append(HumanMessage(content=m.content))
+        else:
+            raise Exception("Unknown message role.")
+
+    return history

{unique_toolkit-0.7.35 → unique_toolkit-0.7.37}/unique_toolkit/language_model/reference.py

@@ -114,6 +114,7 @@ def _preprocess_message(text: str) -> str:
     def replace_source_colon(match):
         numbers = re.findall(r"\d+", match.group(0))
         return "".join(f"[{n}]" for n in numbers)
+
     text = re.sub(r"\[source:\s*([\d,\s]+)\]", replace_source_colon, text)
 
     # Replace '[[A], [B], ...]', '[[A], B, C, ...]', and '[X, Y, Z]' with [A][B][C]... where A,B,C are numbers
@@ -122,7 +123,9 @@ def _preprocess_message(text: str) -> str:
         return "".join(f"[{n}]" for n in numbers)
 
     text = re.sub(
-        r"(?:\[\[(\d+)\](?:,\s*(?:\[)?\d+(?:\])?)*\]|\[([\d,\s]+)\])", replace_combined_brackets, text
+        r"(?:\[\[(\d+)\](?:,\s*(?:\[)?\d+(?:\])?)*\]|\[([\d,\s]+)\])",
+        replace_combined_brackets,
+        text,
     )
 
     return text

{unique_toolkit-0.7.35 → unique_toolkit-0.7.37}/unique_toolkit/short_term_memory/service.py

@@ -41,9 +41,9 @@ class ShortTermMemoryService:
                 self._message_id = event.payload.user_message.id
         else:
             [company_id, user_id] = validate_required_values([company_id, user_id])
-            assert (
-                chat_id or message_id
-            ), "Either chat_id or message_id must be provided"
+
+            if not (chat_id or message_id):
+                raise ValueError("Chat_id or message_id must be provided")
 
             self._company_id: str = company_id
             self._user_id: str = user_id