unique_toolkit 0.7.31__py3-none-any.whl → 0.7.33__py3-none-any.whl

unique_toolkit/language_model/reference.py

@@ -51,9 +51,9 @@ def _add_references(
     # Only reference a source once, even if it is mentioned multiple times in the text.
     with_footnotes = _add_footnotes_to_text(text=text, references=references)
 
-    # Gemini 2.5 flash model has tendency to add multiple references for the same fact
+    # Gemini 2.5 models have tendency to add multiple references for the same fact
     # This is a workaround to limit the number of references to 5
-    if model and model.startswith("litellm:gemini-2-5-flash"):
+    if model and model.startswith("litellm:gemini-2-5"):
         reduced_text = _limit_consecutive_source_references(with_footnotes)
 
         # Get the references that remain after reduction
@@ -92,8 +92,11 @@ def _preprocess_message(text: str) -> str:
     # Replace XML format '[<source XX>]', '[<sourceXX>]' and '[\<sourceXX>]' with [XX]
     text = re.sub(r"\[(\\)?<source[\s]?(\d+)>\]", r"[\2]", text)
 
-    # Replace format '[source XX]' and '[sourceXX]' with [XX]
-    text = re.sub(r"\[source[\s]?(\d+)\]", r"[\1]", text)
+    # Replace format 'source XX', 'source_X' and 'sourceXX' references with XX, where XX is a number
+    text = re.sub(r"source[\s_]?(\d+)", r"[\1]", text)
+
+    # Replace 'source_number="X"' with X, where X is a number
+    text = re.sub(r"source_number=\"(\d+)\"", r"[\1]", text)
 
     # Make all references non-bold
     text = re.sub(r"\[\*\*(\d+)\*\*\]", r"[\1]", text)
@@ -107,13 +110,19 @@ def _preprocess_message(text: str) -> str:
     # Replace '[<[XX]>]' and '[\<[XX]>]' with [XX]
     text = re.sub(r"\[(\\)?\[?<\[(\d+)\]?\]>\]", r"[\2]", text)
 
-    # Replace '[[A], [B], ...]' or '[[A], B, C, ...]' with [A][B][C]...
+    # Replace '[source: X, Y, Z]' with [X][Y][Z], where X,Y,Z are numbers
+    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
     def replace_combined_brackets(match):
         numbers = re.findall(r"\d+", match.group(0))
         return "".join(f"[{n}]" for n in numbers)
 
     text = re.sub(
-        r"\[\[(\d+)\](?:,\s*(?:\[)?\d+(?:\])?)*\]", replace_combined_brackets, text
+        r"(?:\[\[(\d+)\](?:,\s*(?:\[)?\d+(?:\])?)*\]|\[([\d,\s]+)\])", replace_combined_brackets, text
     )
 
     return text

unique_toolkit/language_model/schemas.py

@@ -243,6 +243,40 @@ class LanguageModelMessages(RootModel):
         | LanguageModelUserMessage
     ]
 
+    @classmethod
+    def load_messages_to_root(cls, data: list[dict] | dict) -> Self:
+        """Convert list of dictionaries to appropriate message objects based on role."""
+        # Handle case where data is already wrapped in root
+        if isinstance(data, dict) and "root" in data:
+            messages_list = data["root"]
+        elif isinstance(data, list):
+            messages_list = data
+        else:
+            raise ValueError("Invalid data type")
+
+        # Convert the messages list
+        converted_messages = []
+        for item in messages_list:
+            if isinstance(item, dict):
+                role = item.get("role", "").lower()
+
+                # Map dictionary to appropriate message class based on role
+                if role == "system":
+                    converted_messages.append(LanguageModelSystemMessage(**item))
+                elif role == "user":
+                    converted_messages.append(LanguageModelUserMessage(**item))
+                elif role == "assistant":
+                    converted_messages.append(LanguageModelAssistantMessage(**item))
+                elif role == "tool":
+                    converted_messages.append(LanguageModelToolMessage(**item))
+                else:
+                    # Fallback to base LanguageModelMessage
+                    converted_messages.append(LanguageModelMessage(**item))
+            else:
+                # If it's already a message object, keep it as is
+                converted_messages.append(item)
+        return cls(root=converted_messages)
+
     def __str__(self):
         return "\n\n".join([str(message) for message in self.root])
 

{unique_toolkit-0.7.31.dist-info → unique_toolkit-0.7.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 0.7.31
+Version: 0.7.33
 Summary: 
 License: Proprietary
 Author: Martin Fadler
@@ -17,7 +17,7 @@ Requires-Dist: python-dotenv (>=1.0.1,<2.0.0)
 Requires-Dist: regex (>=2024.5.15,<2025.0.0)
 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.33,<0.10.0)
+Requires-Dist: unique-sdk (>=0.9.36,<0.10.0)
 Description-Content-Type: text/markdown
 
 # Unique Toolkit
@@ -111,6 +111,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.7.33] - 2025-06-25
+- Update reference post-processing
+
+## [0.7.32] - 2025-06-24
+- Create `classmethod` for `LanguageModelMessages` to load raw messages to root
+
 ## [0.7.31] - 2025-06-19
 - Add typings to references in payload from `LanguageModelStreamResponseMessage` 
 - Add `original_index` to the base reference to reflect updated api

{unique_toolkit-0.7.31.dist-info → unique_toolkit-0.7.33.dist-info}/RECORD

@@ -50,8 +50,8 @@ unique_toolkit/language_model/constants.py,sha256=B-topqW0r83dkC_25DeQfnPk3n53qz
 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=ntoWdJ_hly8FntTgg1qpj0ta55SOCCVsC5L49VqOiAQ,8067
-unique_toolkit/language_model/schemas.py,sha256=_fJ9rckKaS082wd2x9DrJ9N6B7iTJ9ytFnq4eIFDNAQ,12781
+unique_toolkit/language_model/reference.py,sha256=jd-JPuqLwEJDs56im56o-AdiT73pdwNtSzcW38LZ53o,8565
+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
 unique_toolkit/protocols/support.py,sha256=V15WEIFKVMyF1QCnR8vIi4GrJy4dfTCB6d6JlqPZ58o,2341
@@ -62,7 +62,7 @@ unique_toolkit/short_term_memory/schemas.py,sha256=OhfcXyF6ACdwIXW45sKzjtZX_gkcJ
 unique_toolkit/short_term_memory/service.py,sha256=cqpXA0nMbi4PhFweg-Cql3u0RvaTi5c8Xjv0uHMiSGc,8112
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=cxWjb2dxEI2HGsakKdVCkSNi7VK9mr08w5sDcFCQyWI,9553
-unique_toolkit-0.7.31.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-0.7.31.dist-info/METADATA,sha256=aNS24gdydQe6icQg_M3EFprEMJ2o8qcR-95-lya8tj8,24607
-unique_toolkit-0.7.31.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-0.7.31.dist-info/RECORD,,
+unique_toolkit-0.7.33.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-0.7.33.dist-info/METADATA,sha256=iTa95C3sVeL6SR4HrO3jny6n2kmpoNunzUYeQNhdiNM,24774
+unique_toolkit-0.7.33.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-0.7.33.dist-info/RECORD,,