unique_toolkit 0.7.35__py3-none-any.whl → 0.7.37__py3-none-any.whl

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/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/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/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/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/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

{unique_toolkit-0.7.35.dist-info → unique_toolkit-0.7.37.dist-info}/METADATA

@@ -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.dist-info → unique_toolkit-0.7.37.dist-info}/RECORD

@@ -5,11 +5,14 @@ unique_toolkit/_common/exception.py,sha256=caQIE1btsQnpKCHqL2cgWUSbHup06enQu_Pt7
 unique_toolkit/_common/validate_required_values.py,sha256=Y_M1ub9gIKP9qZ45F6Zq3ZHtuIqhmOjl8Z2Vd3avg8w,588
 unique_toolkit/_common/validators.py,sha256=l7-hWyRTZ3aF_e73oTQFZdz93s06VhNWVpkERbg2a64,1569
 unique_toolkit/app/__init__.py,sha256=jgwWfu27U911kZE1yRq920ZULGLAQGycD3222YxUvsY,1182
+unique_toolkit/app/event_util.py,sha256=lfI64OcOXJZhh2GcVTmvE8AVc888jPWhi7l1vEzDsgs,535
 unique_toolkit/app/init_logging.py,sha256=Sh26SRxOj8i8dzobKhYha2lLrkrMTHfB1V4jR3h23gQ,678
 unique_toolkit/app/init_sdk.py,sha256=Nv4Now4pMfM0AgRhbtatLpm_39rKxn0WmRLwmPhRl-8,1285
 unique_toolkit/app/performance/async_tasks.py,sha256=H0l3OAcosLwNHZ8d2pd-Di4wHIXfclEvagi5kfqLFPA,1941
 unique_toolkit/app/performance/async_wrapper.py,sha256=yVVcRDkcdyfjsxro-N29SBvi-7773wnfDplef6-y8xw,1077
 unique_toolkit/app/schemas.py,sha256=f1WHnEqSMX2C_c9vtOOVNSdlSH--jK22GDbtRAKPVjc,5044
+unique_toolkit/app/sse_client.py,sha256=UrX41CIbw0DDBn8mOx_3rT1X8GCjqqYQcxhasoT0C-Q,611
+unique_toolkit/app/unique_settings.py,sha256=fi3V9Dru1G1YK7Pxju_KBGiNJHkHdx7JzpDglcvMZro,1820
 unique_toolkit/app/verification.py,sha256=GxFFwcJMy25fCA_Xe89wKW7bgqOu8PAs5y8QpHF0GSc,3861
 unique_toolkit/chat/__init__.py,sha256=LRs2G-JTVuci4lbtHTkVUiNcZcSR6uqqfnAyo7af6nY,619
 unique_toolkit/chat/constants.py,sha256=05kq6zjqUVB2d6_P7s-90nbljpB3ryxwCI-CAz0r2O4,83
@@ -44,13 +47,14 @@ unique_toolkit/evaluators/hallucination/service.py,sha256=k8qro5Lw4Ak58m4HYp3G4H
 unique_toolkit/evaluators/hallucination/utils.py,sha256=gO2AOzDQwVTev2_5vDKgJ9A6A9e0himJyAta_wglVG8,8326
 unique_toolkit/evaluators/output_parser.py,sha256=eI72qkzK1dZyUvnfP2SOAQCGBj_-PwX5wy_aLPMsJMY,883
 unique_toolkit/evaluators/schemas.py,sha256=Jaue6Uhx75X1CyHKWj8sT3RE1JZXTqoLtfLt2xQNCX8,2507
+unique_toolkit/framework_utilities/langchain/history.py,sha256=8ejA0utPUIlX4z8gtX9IkVFiooY-vOT1UcjI_MoJaAU,638
 unique_toolkit/language_model/__init__.py,sha256=lRQyLlbwHbNFf4-0foBU13UGb09lwEeodbVsfsSgaCk,1971
 unique_toolkit/language_model/builder.py,sha256=69WCcmkm2rMP2-YEH_EjHiEp6OzwjwCs8VbhjVJaCe0,3168
 unique_toolkit/language_model/constants.py,sha256=B-topqW0r83dkC_25DeQfnPk3n53qzIHUCBS7YJ0-1U,119
 unique_toolkit/language_model/functions.py,sha256=WhgHbJgz4Z2aZt9TLdOpI0PGyYWA5R90tdwkwdDeT8c,11987
 unique_toolkit/language_model/infos.py,sha256=w5__BVG-IiiEYKG1FwM838wzqNbYI3eCCEDocKezc0I,34801
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
-unique_toolkit/language_model/reference.py,sha256=jd-JPuqLwEJDs56im56o-AdiT73pdwNtSzcW38LZ53o,8565
+unique_toolkit/language_model/reference.py,sha256=nkX2VFz-IrUz8yqyc3G5jUMNwrNpxITBrMEKkbqqYoI,8583
 unique_toolkit/language_model/schemas.py,sha256=AeuDRJFblGzEYcEMyrlxpOPk12Di3J45I9rT2xZrhEU,14332
 unique_toolkit/language_model/service.py,sha256=VRkUk2XbijqGlnTTvqU7uCue6qtT7lpLd_Y8f3bWv1I,10486
 unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
@@ -59,10 +63,10 @@ unique_toolkit/short_term_memory/__init__.py,sha256=2mI3AUrffgH7Yt-xS57EGqnHf7jn
 unique_toolkit/short_term_memory/constants.py,sha256=698CL6-wjup2MvU19RxSmQk3gX7aqW_OOpZB7sbz_Xg,34
 unique_toolkit/short_term_memory/functions.py,sha256=3WiK-xatY5nh4Dr5zlDUye1k3E6kr41RiscwtTplw5k,4484
 unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJs8FEZXcgQTNenw,1406
-unique_toolkit/short_term_memory/service.py,sha256=cqpXA0nMbi4PhFweg-Cql3u0RvaTi5c8Xjv0uHMiSGc,8112
+unique_toolkit/short_term_memory/service.py,sha256=8sW7cFJRd4vcRfotJSWb0uHZYl-e5hQWp3G1SddL5Bg,8110
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=cxWjb2dxEI2HGsakKdVCkSNi7VK9mr08w5sDcFCQyWI,9553
-unique_toolkit-0.7.35.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.7.35.dist-info/METADATA,sha256=iwPmfbrhO_p3uKGwvUWGinbQVjqmq24_EJBPjSstFnQ,25014
-unique_toolkit-0.7.35.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.7.35.dist-info/RECORD,,
+unique_toolkit-0.7.37.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.7.37.dist-info/METADATA,sha256=Do_KkEttqekSmZCpzHCZGApVgYB-6ho6XegupsPtn6s,25195
+unique_toolkit-0.7.37.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.7.37.dist-info/RECORD,,