unique_toolkit 0.7.38__tar.gz → 0.7.40__tar.gz

{unique_toolkit-0.7.38 → unique_toolkit-0.7.40}/CHANGELOG.md

@@ -5,6 +5,13 @@ 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.40] - 2025-07-30
+- Remove `GEMINI_2_5_FLASH_PREVIEW_0417` model
+
+## [0.7.39] - 2025-07-28
+- Implement utitilites to work with openai client
+- Implement utitilites to work with langchain llm 
+
 ## [0.7.38] - 2025-07-25
 - Fix issues with secret strings in settings
 

{unique_toolkit-0.7.38 → unique_toolkit-0.7.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.7.38
+Version: 0.7.40
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -113,6 +113,13 @@ 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.40] - 2025-07-30
+- Remove `GEMINI_2_5_FLASH_PREVIEW_0417` model
+
+## [0.7.39] - 2025-07-28
+- Implement utitilites to work with openai client
+- Implement utitilites to work with langchain llm 
+
 ## [0.7.38] - 2025-07-25
 - Fix issues with secret strings in settings
 

{unique_toolkit-0.7.38 → unique_toolkit-0.7.40}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "0.7.38"
+version = "0.7.40"
 description = ""
 authors = [
     "Martin Fadler <martin.fadler@unique.ch>",
@@ -24,6 +24,20 @@ unique-sdk = "^0.9.40"
 pydantic-settings = "^2.10.1"
 sseclient = "^0.0.27"
 
+[tool.poetry.group.openai]
+optional = true
+
+[tool.poetry.group.openai.dependencies]
+openai = "^1.97.0"
+
+[tool.poetry.group.langchain]
+optional = true
+
+[tool.poetry.group.langchain.dependencies]
+openai = "^1.97.0"
+langchain = "^0.3.27"
+langchain-openai = "^0.3.28"
+
 [tool.poetry.group.dev.dependencies]
 ruff = "0.11.7"
 pytest = "^7.4.3"

unique_toolkit-0.7.40/unique_toolkit/framework_utilities/langchain/client.py

@@ -0,0 +1,45 @@
+import importlib.util
+import logging
+from pathlib import Path
+
+from unique_toolkit.app.unique_settings import UniqueSettings
+from unique_toolkit.framework_utilities.utils import get_default_headers
+
+logger = logging.getLogger("toolkit.framework_utilities.langchain")
+
+
+class LangchainNotInstalledError(ImportError):
+    """Raised when langchain-openai package is not installed but functionality requiring it is accessed."""
+
+    def __init__(self):
+        super().__init__(
+            "langchain-openai package is not installed. Install it with 'poetry install --with langchain'."
+        )
+
+
+if importlib.util.find_spec("langchain_openai") is not None:
+    from langchain_openai import ChatOpenAI
+else:
+    raise LangchainNotInstalledError()
+
+
+def get_client(env_file: Path | None = None) -> ChatOpenAI:
+    """Get a Langchain ChatOpenAI client instance.
+
+    Args:
+        env_file: Optional path to environment file
+
+    Returns:
+        ChatOpenAI client instance
+
+    Raises:
+        LangchainNotInstalledError: If langchain-openai package is not installed
+    """
+    settings = UniqueSettings.from_env(env_file=env_file)
+
+    return ChatOpenAI(
+        base_url=settings.app.base_url + "/openai-proxy/",
+        default_headers=get_default_headers(settings.app, settings.auth),
+        model="AZURE_GPT_4o_2024_0806",
+        api_key=settings.app.key,
+    )

unique_toolkit-0.7.40/unique_toolkit/framework_utilities/openai/client.py

@@ -0,0 +1,45 @@
+import importlib.util
+import logging
+from pathlib import Path
+
+from unique_toolkit.app.unique_settings import UniqueSettings
+from unique_toolkit.framework_utilities.utils import get_default_headers
+
+logger = logging.getLogger("toolkit.framework_utilities.openai")
+
+
+class OpenAINotInstalledError(ImportError):
+    """Raised when OpenAI package is not installed but functionality requiring it is accessed."""
+
+    def __init__(self):
+        super().__init__(
+            "OpenAI package is not installed. Install it with 'poetry install --with openai'."
+        )
+
+
+if importlib.util.find_spec("openai") is not None:
+    from openai import OpenAI
+else:
+    raise OpenAINotInstalledError()
+
+
+def get_openai_client(env_file: Path | None = None) -> OpenAI:
+    """Get an OpenAI client instance.
+
+    Args:
+        env_file: Optional path to environment file
+
+    Returns:
+        OpenAI client instance
+
+    Raises:
+        OpenAINotInstalledError: If OpenAI package is not installed
+    """
+    settings = UniqueSettings.from_env(env_file=env_file)
+    default_headers = get_default_headers(settings.app, settings.auth)
+
+    return OpenAI(
+        api_key=settings.app.key.get_secret_value(),
+        base_url=settings.app.base_url + "/openai-proxy/",
+        default_headers=default_headers,
+    )

unique_toolkit-0.7.40/unique_toolkit/framework_utilities/openai/message_builder.py

@@ -0,0 +1,133 @@
+from collections.abc import Iterable
+from typing import Self
+
+from openai.types.chat.chat_completion_assistant_message_param import (
+    ChatCompletionAssistantMessageParam,
+    ContentArrayOfContentPart,
+)
+from openai.types.chat.chat_completion_content_part_param import (
+    ChatCompletionContentPartParam,
+)
+from openai.types.chat.chat_completion_content_part_text_param import (
+    ChatCompletionContentPartTextParam,
+)
+from openai.types.chat.chat_completion_developer_message_param import (
+    ChatCompletionDeveloperMessageParam,
+)
+from openai.types.chat.chat_completion_function_message_param import (
+    ChatCompletionFunctionMessageParam,
+)
+from openai.types.chat.chat_completion_message_param import ChatCompletionMessageParam
+from openai.types.chat.chat_completion_system_message_param import (
+    ChatCompletionSystemMessageParam,
+)
+from openai.types.chat.chat_completion_tool_message_param import (
+    ChatCompletionToolMessageParam,
+)
+from openai.types.chat.chat_completion_user_message_param import (
+    ChatCompletionUserMessageParam,
+)
+
+
+class OpenAIMessageBuilder:
+    def __init__(
+        self,
+        messages: list[ChatCompletionMessageParam] | None = None,
+    ) -> None:
+        self._messages: list[ChatCompletionMessageParam] = []
+        if messages:
+            self._messages = messages
+
+    @classmethod
+    def from_messages(cls, messages: list[ChatCompletionMessageParam]) -> Self:
+        builder = cls()
+        builder._messages = messages.copy()
+        return builder
+
+    def append_system_message(
+        self,
+        content: str | Iterable[ChatCompletionContentPartTextParam],
+        name: str = "user",
+    ) -> Self:
+        self._messages.append(
+            ChatCompletionSystemMessageParam(
+                content=content,
+                role="system",
+                name=name,
+            ),
+        )
+        return self
+
+    def append_user_message(
+        self,
+        content: str | Iterable[ChatCompletionContentPartParam],
+        name: str = "user",
+    ) -> Self:
+        self._messages.append(
+            ChatCompletionUserMessageParam(
+                content=content,
+                role="user",
+                name=name,
+            ),
+        )
+        return self
+
+    def append_assistant_message(
+        self,
+        content: str | Iterable[ContentArrayOfContentPart],
+        name: str = "assistant",
+    ) -> Self:
+        self._messages.append(
+            ChatCompletionAssistantMessageParam(
+                content=content,
+                role="assistant",
+                name=name,
+            ),
+        )
+        return self
+
+    def append_developper_message(
+        self,
+        content: str | Iterable[ChatCompletionContentPartTextParam],
+        name: str = "developer",
+    ) -> Self:
+        self._messages.append(
+            ChatCompletionDeveloperMessageParam(
+                content=content,
+                role="developer",
+                name=name,
+            ),
+        )
+        return self
+
+    def append_function_message(
+        self,
+        content: str | None,
+        name: str = "function",
+    ) -> Self:
+        self._messages.append(
+            ChatCompletionFunctionMessageParam(
+                content=content,
+                role="function",
+                name=name,
+            ),
+        )
+        return self
+
+    def append_tool_message(
+        self,
+        content: str | Iterable[ChatCompletionContentPartTextParam],
+        tool_call_id: str,
+    ) -> Self:
+        self._messages.append(
+            ChatCompletionToolMessageParam(
+                content=content,
+                role="tool",
+                tool_call_id=tool_call_id,
+            ),
+        )
+        return self
+
+    @property
+    def messages(self) -> list[ChatCompletionMessageParam]:
+        return self._messages

unique_toolkit-0.7.40/unique_toolkit/framework_utilities/utils.py

@@ -0,0 +1,23 @@
+from unique_toolkit.app.unique_settings import UniqueApp, UniqueAuth
+
+
+def auth_headers(auth_settings: UniqueAuth) -> dict[str, str]:
+    return {
+        "x-user-id": auth_settings.user_id.get_secret_value(),
+        "x-company-id": auth_settings.company_id.get_secret_value(),
+    }
+
+
+def app_headers(app_settings: UniqueApp) -> dict[str, str]:
+    return {
+        "x-app-id": app_settings.id.get_secret_value(),
+        "Authorization": f"Bearer {app_settings.key.get_secret_value()}",
+    }
+
+
+def get_default_headers(app_settings: UniqueApp, auth_settings: UniqueAuth):
+    default_headers = {}
+    default_headers.update(app_headers(app_settings))
+    default_headers.update(auth_headers(auth_settings))
+    default_headers["x-api-version"] = "2023-12-06"
+    return default_headers

{unique_toolkit-0.7.38 → unique_toolkit-0.7.40}/unique_toolkit/language_model/infos.py

@@ -36,7 +36,6 @@ class LanguageModelName(StrEnum):
     GEMINI_2_0_FLASH = "litellm:gemini-2-0-flash"
     GEMINI_2_5_FLASH = "litellm:gemini-2-5-flash"
     GEMINI_2_5_FLASH_LITE_PREVIEW_0617 = "litellm:gemini-2-5-flash-lite-preview-06-17"
-    GEMINI_2_5_FLASH_PREVIEW_0417 = "litellm:gemini-2-5-flash-preview-04-17"
     GEMINI_2_5_FLASH_PREVIEW_0520 = "litellm:gemini-2-5-flash-preview-05-20"
     GEMINI_2_5_PRO = "litellm:gemini-2-5-pro"
     GEMINI_2_5_PRO_EXP_0325 = "litellm:gemini-2-5-pro-exp-03-25"
@@ -548,25 +547,6 @@ class LanguageModelInfo(BaseModel):
                     info_cutoff_at=date(2025, 1, day=1),
                     published_at=date(2025, 6, 17),
                 )
-            case LanguageModelName.GEMINI_2_5_FLASH_PREVIEW_0417:
-                return cls(
-                    name=model_name,
-                    capabilities=[
-                        ModelCapabilities.FUNCTION_CALLING,
-                        ModelCapabilities.STREAMING,
-                        ModelCapabilities.VISION,
-                        ModelCapabilities.STRUCTURED_OUTPUT,
-                        ModelCapabilities.REASONING,
-                    ],
-                    provider=LanguageModelProvider.LITELLM,
-                    version="gemini-2-5-flash-preview-04-17",
-                    encoder_name=EncoderName.O200K_BASE,  # TODO:Replace with LLM tokenizer
-                    token_limits=LanguageModelTokenLimits(
-                        token_limit_input=1_048_576, token_limit_output=65_536
-                    ),
-                    info_cutoff_at=date(2025, 1, day=1),
-                    published_at=date(2025, 4, 1),
-                )
             case LanguageModelName.GEMINI_2_5_FLASH_PREVIEW_0520:
                 return cls(
                     name=model_name,