unique_toolkit 0.5.40__tar.gz → 0.5.42__tar.gz

{unique_toolkit-0.5.40 → unique_toolkit-0.5.42}/CHANGELOG.md

@@ -5,6 +5,12 @@ 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.5.42] - 2024-12-11
+- Update `LanguageModelTokenLimits` with fix avoiding floats for token
+
+## [0.5.41] - 2024-12-11
+- Update `LanguageModelTokenLimits` includes a fraction_input now to always have input/output token limits available.
+
 ## [0.5.40] - 2024-12-11
 - Add `other_options` to `LanguageModelService.complete`, `LanguageModelService.complete_async`, `LanguageModelService.stream_complete` and `LanguageModelService.stream_complete_async`
 

{unique_toolkit-0.5.40 → unique_toolkit-0.5.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.5.40
+Version: 0.5.42
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -100,6 +100,12 @@ 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.5.42] - 2024-12-11
+- Update `LanguageModelTokenLimits` with fix avoiding floats for token
+
+## [0.5.41] - 2024-12-11
+- Update `LanguageModelTokenLimits` includes a fraction_input now to always have input/output token limits available.
+
 ## [0.5.40] - 2024-12-11
 - Add `other_options` to `LanguageModelService.complete`, `LanguageModelService.complete_async`, `LanguageModelService.stream_complete` and `LanguageModelService.stream_complete_async`
 

{unique_toolkit-0.5.40 → unique_toolkit-0.5.42}/pyproject.toml

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

{unique_toolkit-0.5.40 → unique_toolkit-0.5.42}/unique_toolkit/language_model/schemas.py

@@ -1,4 +1,5 @@
 import json
+import math
 from enum import StrEnum
 from typing import Any, Optional, Self
 from uuid import uuid4
@@ -197,29 +198,30 @@ class LanguageModelTokenLimits(BaseModel):
     token_limit_input: Optional[int] = None
     token_limit_output: Optional[int] = None
 
+    fraction_input: float = Field(default=0.4, le=1, ge=0)
+
     @model_validator(mode="after")
-    def validate_model(self):
-        token_limit = self.token_limit
-        token_limit_input = self.token_limit_input
-        token_limit_output = self.token_limit_output
-
-        if (
-            token_limit is None
-            and token_limit_input is None
-            and token_limit_output is None
-        ):
-            raise ValueError(
-                "At least one of token_limit, token_limit_input or token_limit_output must be set"
+    def check_required_fields(self):
+        # Best case input and output is determined
+        if self.token_limit_input and self.token_limit_output:
+            self.token_limit = self.token_limit_input + self.token_limit_output
+            self.fraction_input = self.token_limit_input / self.token_limit
+            return self
+
+        # Deal with case where only token_limit and optional fraction_input is given
+        if self.token_limit:
+            if not self.fraction_input:
+                self.fraction_input = 0.4
+
+            self.token_limit_input = math.floor(self.fraction_input * self.token_limit)
+            self.token_limit_output = math.floor(
+                (1 - self.fraction_input) * self.token_limit
             )
+            return self
 
-        if (
-            token_limit is None
-            and token_limit_input is not None
-            and token_limit_output is not None
-        ):
-            self.token_limit = token_limit_input + token_limit_output
-
-        return self
+        raise ValueError(
+            'Either "token_limit_input" and "token_limit_output" must be provided together, or "token_limit" must be provided.'
+        )
 
 
 class LanguageModelToolParameterProperty(BaseModel):