synth-ai 0.1.0.dev13__py3-none-any.whl → 0.1.0.dev15__py3-none-any.whl

synth_ai/zyk/lms/structured_outputs/inject.py

@@ -1,5 +1,17 @@
 import json
-from typing import Any, Dict, List, Optional, Tuple, Type, get_type_hints, get_args, get_origin, Union
+from typing import (
+    Any,
+    Dict,
+    List,
+    Optional,
+    Tuple,
+    Type,
+    get_type_hints,
+    get_args,
+    get_origin,
+    Union,
+    Literal,
+)
 from pydantic import BaseModel
 import warnings
 
@@ -29,13 +41,16 @@ def generate_type_map() -> Dict[Any, str]:
                 # Handle generic Dict type
                 type_map[Dict] = "Dict[Any,Any]"
                 # Provide both key and value types for Dict
-                type_map[Dict[base_type, base_type]] = f"{collection_name}[{name},{name}]"
+                type_map[Dict[base_type, base_type]] = (
+                    f"{collection_name}[{name},{name}]"
+                )
                 # Handle Dict[Any, Any] explicitly
                 type_map[Dict[Any, Any]] = "Dict[Any,Any]"
             else:
                 type_map[collection[base_type]] = f"{collection_name}[{name}]"
     return type_map
 
+
 def generate_example_dict() -> Dict[str, Any]:
     example_values = {
         "str": "<Your type-str response here>",
@@ -54,12 +69,13 @@ def generate_example_dict() -> Dict[str, Any]:
             example_dict[f"Dict[str,{key.split('[')[1]}"] = {value: value}
         elif key.startswith("Dict"):
             example_dict[key] = {value: value}
-    
+
     # Add example for Dict[Any,Any]
     example_dict["Dict[Any,Any]"] = {"<key>": "<value>"}
-    
+
     return example_dict
 
+
 base_type_examples = {
     int: ("int", 42),
     float: ("float", 3.14),
@@ -68,13 +84,23 @@ base_type_examples = {
     Any: ("Any", "<Any value>"),
 }
 
+
 def get_type_string(type_hint):
     origin = get_origin(type_hint)
     args = get_args(type_hint)
 
     if origin is None:
         if isinstance(type_hint, type) and issubclass(type_hint, BaseModel):
-            return type_hint.__name__
+            # For Pydantic models, create a dictionary of field types
+            field_types = {}
+            for field_name, field_info in type_hint.model_fields.items():
+                field_type = get_type_string(field_info.annotation)
+                # Check for Literal type by looking at the origin
+                if get_origin(field_info.annotation) is Literal:
+                    literal_args = get_args(field_info.annotation)
+                    field_type = f"Literal[{repr(literal_args[0])}]"
+                field_types[field_name] = field_type
+            return f"{type_hint.__name__}({', '.join(f'{k}: {v}' for k, v in field_types.items())})"
         else:
             return base_type_examples.get(type_hint, ("Unknown", "unknown"))[0]
     elif origin in (list, List):
@@ -89,40 +115,118 @@ def get_type_string(type_hint):
         if len(non_none_types) == 1:
             return f"Optional[{get_type_string(non_none_types[0])}]"
         else:
-            union_types = ", ".join(get_type_string(t) for t in non_none_types)
-            return f"Union[{union_types}]"
+            # For unions of Pydantic models (like tool calls), show each variant
+            union_types = []
+            for t in non_none_types:
+                if isinstance(t, type) and issubclass(t, BaseModel):
+                    # Include discriminator field if present
+                    discriminator = None
+                    for field_name, field_info in t.model_fields.items():
+                        if get_origin(field_info.annotation) is Literal:
+                            literal_args = get_args(field_info.annotation)
+                            discriminator = f"{field_name}={repr(literal_args[0])}"
+                            break
+                    type_str = t.__name__
+                    if discriminator:
+                        type_str += f"({discriminator})"
+                    union_types.append(type_str)
+                else:
+                    union_types.append(get_type_string(t))
+            return f"Union[{', '.join(union_types)}]"
+    elif origin is Literal:
+        # Handle Literal type directly
+        return f"Literal[{repr(args[0])}]"
     else:
         return "Any"
 
+
 def get_example_value(type_hint):
     origin = get_origin(type_hint)
     args = get_args(type_hint)
-    
+
     if origin is None:
         if isinstance(type_hint, type) and issubclass(type_hint, BaseModel):
             example = {}
+            union_docs = []
             for field_name, field_info in type_hint.model_fields.items():
-                # Updated attribute from type_ to annotation
-                example[field_name] = get_example_value(field_info.annotation)
-            return example
+                field_value, field_docs = get_example_value(field_info.annotation)
+                if field_docs:
+                    union_docs.extend(field_docs)
+
+                # Handle literal fields by checking origin
+                if get_origin(field_info.annotation) is Literal:
+                    literal_args = get_args(field_info.annotation)
+                    field_value = literal_args[0]
+
+                # Include field description if available
+                if field_info.description:
+                    example[field_name] = {
+                        "value": field_value,
+                        "description": field_info.description,
+                    }
+                else:
+                    example[field_name] = field_value
+            return example, union_docs
         else:
-            return base_type_examples.get(type_hint, ("Unknown", "unknown"))[1]
+            return base_type_examples.get(type_hint, ("Unknown", "unknown"))[1], []
     elif origin in (list, List):
-        return [get_example_value(args[0])]
+        value, docs = get_example_value(args[0])
+        return [value], docs
     elif origin in (dict, Dict):
         if not args or len(args) < 2:
             warnings.warn(
                 f"Dictionary type hint {type_hint} missing type arguments. "
                 "Defaulting to Dict[str, Any].",
-                UserWarning
+                UserWarning,
             )
-            return {"example_key": "<Any value>"}  # Default for Dict[str, Any]
-        return {get_example_value(args[0]): get_example_value(args[1])}
+            return {"example_key": "<Any value>"}, []  # Default for Dict[str, Any]
+        key_value, key_docs = get_example_value(args[0])
+        value_value, value_docs = get_example_value(args[1])
+        return {key_value: value_value}, key_docs + value_docs
     elif origin is Union:
         non_none_types = [t for t in args if t is not type(None)]
-        return get_example_value(non_none_types[0])
+        # For unions of tool calls, use the first one but preserve the discriminator
+        first_type = non_none_types[0]
+        union_docs = []
+
+        if all(
+            isinstance(t, type) and issubclass(t, BaseModel) for t in non_none_types
+        ):
+            # Generate examples for all union variants
+            for t in non_none_types:
+                example = {}
+                for field_name, field_info in t.model_fields.items():
+                    field_value, _ = get_example_value(field_info.annotation)
+                    if get_origin(field_info.annotation) is Literal:
+                        literal_args = get_args(field_info.annotation)
+                        field_value = literal_args[0]
+                    example[field_name] = field_value
+                union_docs.append(f"\nExample {t.__name__}:")
+                union_docs.append(json.dumps(example, indent=2))
+
+        # Return first type as main example
+        if isinstance(first_type, type) and issubclass(first_type, BaseModel):
+            example, _ = get_example_value(first_type)
+            # Ensure tool_type or other discriminator is preserved
+            for field_name, field_info in first_type.model_fields.items():
+                if get_origin(field_info.annotation) is Literal:
+                    literal_args = get_args(field_info.annotation)
+                    if (
+                        isinstance(example[field_name], dict)
+                        and "value" in example[field_name]
+                    ):
+                        example[field_name]["value"] = literal_args[0]
+                    else:
+                        example[field_name] = literal_args[0]
+            return example, union_docs
+        main_example, docs = get_example_value(first_type)
+        return main_example, docs + union_docs
+    elif origin is Literal:
+        # Handle Literal type directly
+        return args[0], []
     else:
-        return "<Unknown>"
+        return "<Unknown>", []
+
 
 def add_json_instructions_to_messages(
     system_message,
@@ -132,31 +236,53 @@ def add_json_instructions_to_messages(
 ) -> Tuple[str, str]:
     if response_model:
         type_hints = get_type_hints(response_model)
+        # print("Type hints", type_hints)
         stringified_fields = {}
+        union_docs = []
         for key, type_hint in type_hints.items():
-            example_value = get_example_value(type_hint)
+            # print("Key", key, "Type hint", type_hint)
+            example_value, docs = get_example_value(type_hint)
+            union_docs.extend(docs)
             field = response_model.model_fields[key]  # Updated for Pydantic v2
-            
+
             # Adjusted for Pydantic v2
-            field_description = field.description if hasattr(field, 'description') else None
-            
+            field_description = (
+                field.description if hasattr(field, "description") else None
+            )
+
             if field_description:
                 stringified_fields[key] = (example_value, field_description)
             else:
                 stringified_fields[key] = example_value
         example_json = json.dumps(
-            {k: v[0] if isinstance(v, tuple) else v for k, v in stringified_fields.items()},
-            indent=4
+            {
+                k: v[0] if isinstance(v, tuple) else v
+                for k, v in stringified_fields.items()
+            },
+            indent=4,
         )
         description_comments = "\n".join(
-            f'// {k}: {v[1]}' for k, v in stringified_fields.items() if isinstance(v, tuple)
+            f"// {k}: {v[1]}"
+            for k, v in stringified_fields.items()
+            if isinstance(v, tuple)
         )
+
+        # print("Example JSON", example_json)
+        # print("Description comments", description_comments)
+        # print("Union documentation", "\n".join(union_docs))
+        # raise Exception("Stop here")
+
         system_message += f"""\n\n
 Please deliver your response in the following JSON format:
 ```json
 {example_json}
 ```
 {description_comments}
+"""
+    if len(union_docs) != 0:
+        system_message += f"""\n\n
+NOTE - the above example included a union type. Here are some additional examples for that union type:
+{chr(10).join(union_docs)}
 """
     if len(previously_failed_error_messages) != 0:
         system_message += f"""\n\n
@@ -178,7 +304,10 @@ def inject_structured_output_instructions(
     prev_system_message_content = messages[0]["content"]
     prev_user_message_content = messages[1]["content"]
     system_message, user_message = add_json_instructions_to_messages(
-        prev_system_message_content, prev_user_message_content, response_model, previously_failed_error_messages
+        prev_system_message_content,
+        prev_user_message_content,
+        response_model,
+        previously_failed_error_messages,
     )
     messages[0]["content"] = system_message
     messages[1]["content"] = user_message

synth_ai/zyk/lms/vendors/openai_standard.py

@@ -9,11 +9,14 @@ from synth_ai.zyk.lms.caching.initialize import (
 from synth_ai.zyk.lms.vendors.base import VendorBase
 from synth_ai.zyk.lms.vendors.constants import SPECIAL_BASE_TEMPS
 from synth_ai.zyk.lms.vendors.retries import BACKOFF_TOLERANCE, backoff
-
+import groq
 DEFAULT_EXCEPTIONS_TO_RETRY = (
     pydantic_core._pydantic_core.ValidationError,
     openai.APIConnectionError,
     openai.APITimeoutError,
+    groq.InternalServerError,
+    groq.APITimeoutError,
+    groq.APIConnectionError,
 )
 
 

{synth_ai-0.1.0.dev13.dist-info → synth_ai-0.1.0.dev15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: synth-ai
-Version: 0.1.0.dev13
+Version: 0.1.0.dev15
 Summary: Software for aiding the best and multiplying the will.
 Home-page: https://github.com/synth-laboratories/synth-ai
 Author: Josh Purtell

{synth_ai-0.1.0.dev13.dist-info → synth_ai-0.1.0.dev15.dist-info}/RECORD

@@ -25,12 +25,12 @@ synth_ai/zyk/lms/cost/monitor.py,sha256=cSKIvw6WdPZIRubADWxQoh1MdB40T8-jjgfNUeUH
 synth_ai/zyk/lms/cost/statefulness.py,sha256=TOsuXL8IjtKOYJ2aJQF8TwJVqn_wQ7AIwJJmdhMye7U,36
 synth_ai/zyk/lms/structured_outputs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synth_ai/zyk/lms/structured_outputs/handler.py,sha256=2TixVuVs2w3Q3VB8n2DvNtJcJvUmQzAR1WfXn3FaX7M,13804
-synth_ai/zyk/lms/structured_outputs/inject.py,sha256=U3I4-f-9RFn5Pc6wOxqBtJCUOcf_qI5MJGzpxcjhnGI,6732
+synth_ai/zyk/lms/structured_outputs/inject.py,sha256=Fy-zDeleRxOZ8ZRM6IuZ6CP2XZnMe4K2PEn4Q9c_KPY,11777
 synth_ai/zyk/lms/structured_outputs/rehabilitate.py,sha256=_QOfnI1rJxIE9-zUMhC0PedCOr6y5m6WuGScDb5gcUo,7787
 synth_ai/zyk/lms/vendors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synth_ai/zyk/lms/vendors/base.py,sha256=bs27mNfrCjQ5NsmxWnKfxZmpoAa9mTNAFr9AnGVwqLk,552
 synth_ai/zyk/lms/vendors/constants.py,sha256=zqCOyXZqo297wboR9EKVSkvpq6JCMSJyeso8HdZPKa4,102
-synth_ai/zyk/lms/vendors/openai_standard.py,sha256=nTBrI7grru1RjWHluguVU24xt__apXrOnWaq61S71nA,4796
+synth_ai/zyk/lms/vendors/openai_standard.py,sha256=q-gyWs55IzaN91jERD8aPnuxLnG04ErEpNiL-6fqi1s,4892
 synth_ai/zyk/lms/vendors/retries.py,sha256=m-WvAiPix9ovnO2S-m53Td5VZDWBVBFuHuSK9--OVxw,38
 synth_ai/zyk/lms/vendors/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synth_ai/zyk/lms/vendors/core/anthropic_api.py,sha256=fcb0uVlInADl50MNYMT-IimM9mzO19D8_mSg9Gqp92Q,6986
@@ -47,8 +47,8 @@ synth_ai/zyk/lms/vendors/supported/together.py,sha256=Ni_jBqqGPN0PkkY-Ew64s3gNKk
 tests/test_agent.py,sha256=CjPPWuMWC_TzX1DkDald-bbAxgjXE-HPQvFhq2B--5k,22363
 tests/test_recursive_structured_outputs.py,sha256=Ne-9XwnOxN7eSpGbNHOpegR-sRj589I84T6y8Z_4QnA,5781
 tests/test_structured_outputs.py,sha256=J7sfbGZ7OeB5ONIKpcCTymyayNyAdFfGokC1bcUrSx0,3651
-synth_ai-0.1.0.dev13.dist-info/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
-synth_ai-0.1.0.dev13.dist-info/METADATA,sha256=YKGmgRd5dk-ZgxnWGC8jV7dvc-3rIzHCuc1gKnQSMZM,2773
-synth_ai-0.1.0.dev13.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-synth_ai-0.1.0.dev13.dist-info/top_level.txt,sha256=5GzJO9j-KbJ_4ppxhmCUa_qdhHM4-9cHHNU76yAI8do,42
-synth_ai-0.1.0.dev13.dist-info/RECORD,,
+synth_ai-0.1.0.dev15.dist-info/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
+synth_ai-0.1.0.dev15.dist-info/METADATA,sha256=4xPOHW4BWRROwbCDJxprZddjA7Xj9957cluvuAF6gFs,2773
+synth_ai-0.1.0.dev15.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+synth_ai-0.1.0.dev15.dist-info/top_level.txt,sha256=5GzJO9j-KbJ_4ppxhmCUa_qdhHM4-9cHHNU76yAI8do,42
+synth_ai-0.1.0.dev15.dist-info/RECORD,,

{synth_ai-0.1.0.dev13.dist-info → synth_ai-0.1.0.dev15.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any