synth-ai 0.1.0.dev31__py3-none-any.whl → 0.1.0.dev33__py3-none-any.whl

public_tests/test_tools.py

@@ -147,6 +147,25 @@ def test_weather_tool_anthropic_lm():
     assert "location" in arguments
     assert "Paris" in arguments
 
+def test_weather_tool_anthropic_35():
+    lm = LM(
+        model_name="claude-3-5-sonnet-latest",
+        formatting_model_name="claude-3-5-sonnet-20241022",
+        temperature=0,
+    )
+
+    response = lm.respond_sync(
+        system_message="You are a helpful assistant that uses tools when appropriate.",
+        user_message="What's the weather in Paris? Use the tools and explain your reasoning. Units local to the country, please!",
+        tools=[weather_tool],
+    )
+
+    assert response.tool_calls is not None
+    assert len(response.tool_calls) > 0
+    assert response.tool_calls[0]["function"]["name"] == "get_weather"
+    assert "arguments" in response.tool_calls[0]["function"]
+    arguments = response.tool_calls[0]["function"]["arguments"]
+    assert isinstance(arguments, str)
 
 # Gemini Tests
 def test_weather_tool_gemini_direct():

synth_ai/zyk/lms/structured_outputs/handler.py

@@ -174,24 +174,24 @@ class StringifiedJSONHandler(StructuredHandlerBase):
                 type(raw_text_response_or_cached_hit) in [str, BaseLMResponse]
             ), f"Expected str or BaseLMResponse, got {type(raw_text_response_or_cached_hit)}"
             if type(raw_text_response_or_cached_hit) == BaseLMResponse:
-                print("Got cached hit, returning directly")
+                #print("Got cached hit, returning directly")
                 raw_text_response = raw_text_response_or_cached_hit.raw_response
             else:
                 raw_text_response = raw_text_response_or_cached_hit
             logger.debug(f"Raw response from model:\n{raw_text_response}")
 
-            print("Trying to parse structured output")
+            #print("Trying to parse structured output")
             try:
                 structured_output = pull_out_structured_output(
                     raw_text_response, response_model
                 )
 
-                print("Successfully parsed structured output on first attempt")
+                #print("Successfully parsed structured output on first attempt")
                 break
             except Exception as e:
                 logger.warning(f"Failed to parse structured output: {str(e)}")
                 try:
-                    print("Attempting to fix with forced JSON parser")
+                    #print("Attempting to fix with forced JSON parser")
                     structured_output = await fix_errant_forced_async(
                         messages_with_json_formatting_instructions,
                         raw_text_response,
@@ -200,7 +200,7 @@ class StringifiedJSONHandler(StructuredHandlerBase):
                     )
                     assert isinstance(structured_output, BaseModel), "Structured output must be a Pydantic model"
                     assert not isinstance(structured_output, BaseLMResponse), "Got BaseLMResponse instead of Pydantic model"
-                    print("Successfully fixed and parsed structured output")
+                    #print("Successfully fixed and parsed structured output")
                     break
                 except Exception as e:
                     logger.error(f"Failed to fix structured output: {str(e)}")
@@ -215,8 +215,8 @@ class StringifiedJSONHandler(StructuredHandlerBase):
             raise StructuredOutputCoercionFailureException(
                 "Failed to get structured output"
             )
-        print("Successfully parsed structured output")
-        print(structured_output)
+        #print("Successfully parsed structured output")
+        #print(structured_output)
         assert isinstance(structured_output, BaseModel), "Structured output must be a Pydantic model"
         assert not isinstance(structured_output, BaseLMResponse),"Got BaseLMResponse instead of Pydantic model" 
         return BaseLMResponse(
@@ -277,16 +277,16 @@ class StringifiedJSONHandler(StructuredHandlerBase):
                 structured_output = pull_out_structured_output(
                     raw_text_response, response_model
                 )
-                print("Successfully parsed structured output on first attempt")
+                #print("Successfully parsed structured output on first attempt")
                 break
             except Exception as e:
                 logger.warning(f"Failed to parse structured output: {str(e)}")
                 try:
-                    print("Attempting to fix with forced JSON parser")
+                    #print("Attempting to fix with forced JSON parser")
                     structured_output = fix_errant_forced_sync(
                         raw_text_response, response_model, "gpt-4o-mini"
                     )
-                    print("Successfully fixed and parsed structured output")
+                    #print("Successfully fixed and parsed structured output")
                     break
                 except Exception as e:
                     logger.error(f"Failed to fix structured output: {str(e)}")

synth_ai/zyk/lms/vendors/core/anthropic_api.py

@@ -82,7 +82,12 @@ class AnthropicAPI(VendorBase):
 
         # Add tools if provided
         if tools:
-            api_params["tools"] = [tool.to_anthropic_tool() for tool in tools]
+            api_params["tools"] = []
+            for tool in tools:
+                if isinstance(tool, BaseTool):
+                    api_params["tools"].append(tool.to_anthropic_tool())
+                else:
+                    api_params["tools"].append(tool)
 
         # Only try to add thinking if supported by the SDK
         try:
@@ -175,7 +180,12 @@ class AnthropicAPI(VendorBase):
 
         # Add tools if provided
         if tools:
-            api_params["tools"] = [tool.to_anthropic_tool() for tool in tools]
+            api_params["tools"] = []
+            for tool in tools:
+                if isinstance(tool, BaseTool):
+                    api_params["tools"].append(tool.to_anthropic_tool())
+                else:
+                    api_params["tools"].append(tool)
 
         # Only try to add thinking if supported by the SDK
         try:

synth_ai/zyk/lms/vendors/openai_standard.py

@@ -100,7 +100,12 @@ class OpenAIStandard(VendorBase):
 
         # Add tools if provided
         if tools:
-            api_params["tools"] = [tool.to_openai_tool() for tool in tools]
+            api_params["tools"] = []
+            for tool in tools:
+                if isinstance(tool, BaseTool):
+                    api_params["tools"].append(tool.to_openai_tool())
+                else:
+                    api_params["tools"].append(tool)
 
         # Only add temperature for non o1/o3 models
         if not any(prefix in model for prefix in ["o1-", "o3-"]):
@@ -178,7 +183,12 @@ class OpenAIStandard(VendorBase):
 
         # Add tools if provided
         if tools:
-            api_params["tools"] = [tool.to_openai_tool() for tool in tools]
+            api_params["tools"] = []
+            for tool in tools:
+                if isinstance(tool, BaseTool):
+                    api_params["tools"].append(tool.to_openai_tool())
+                else:
+                    api_params["tools"].append(tool)
 
         # Only add temperature for non o1/o3 models
         if not any(prefix in model for prefix in ["o1-", "o3-"]):
@@ -246,7 +256,12 @@ class OpenAIStandard(VendorBase):
 
         # Add tools if provided
         if tools:
-            api_params["tools"] = [tool.to_openai_tool() for tool in tools]
+            api_params["tools"] = []
+            for tool in tools:
+                if isinstance(tool, BaseTool):
+                    api_params["tools"].append(tool.to_openai_tool())
+                else:
+                    api_params["tools"].append(tool)
 
         # Only add temperature for non o1/o3 models
         if not any(prefix in model for prefix in ["o1-", "o3-"]):
@@ -302,7 +317,12 @@ class OpenAIStandard(VendorBase):
 
         # Add tools if provided
         if tools:
-            api_params["tools"] = [tool.to_openai_tool() for tool in tools]
+            api_params["tools"] = []
+            for tool in tools:
+                if isinstance(tool, BaseTool):
+                    api_params["tools"].append(tool.to_openai_tool())
+                else:
+                    api_params["tools"].append(tool)
 
         # Only add temperature for non o1/o3 models
         if not any(prefix in model for prefix in ["o1-", "o3-"]):

{synth_ai-0.1.0.dev31.dist-info → synth_ai-0.1.0.dev33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: synth-ai
-Version: 0.1.0.dev31
+Version: 0.1.0.dev33
 Summary: Software for aiding the best and multiplying the will.
 Author: Josh Purtell
 Author-email: Josh Purtell <josh@usesynth.ai>

{synth_ai-0.1.0.dev31.dist-info → synth_ai-0.1.0.dev33.dist-info}/RECORD

@@ -14,7 +14,7 @@ public_tests/test_structured.py,sha256=rftVwvYgMSHkRZM1WUJzga5Uvl9hmc5OpXzBshEXN
 public_tests/test_structured_outputs.py,sha256=9SFpH4RQ6nRcphBVmELRNSvhRjYaJBu_z-r6xqKAYpg,4213
 public_tests/test_synth_sdk.py,sha256=jqJHKpvBn9qj21P76z9onXfPg88jyUmBTKmdvCsQMk8,14885
 public_tests/test_text.py,sha256=UyPZ0ci-XBjK35tAeV0kN1X8Njf-0pHfEPZhsWDZ0-c,4072
-public_tests/test_tools.py,sha256=LXR78QWYssjtIQwUIJAn5O747tUDWbbPTGpf0VyojS8,10111
+public_tests/test_tools.py,sha256=QBwJ70dmPCm27BEwbNaZXXAf8DJxObsfwFX1rlBcYME,10904
 synth_ai/__init__.py,sha256=tX_fcK8u64BoPEboRa3dIKK_WpLy5KAxL2Ucl-l0xVg,147
 synth_ai/zyk/__init__.py,sha256=kGMD-drlBVdsyT-QFODMwaZUtxPCJ9mg58GKQUvFqo0,134
 synth_ai/zyk/lms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,17 +35,17 @@ synth_ai/zyk/lms/cost/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 synth_ai/zyk/lms/cost/monitor.py,sha256=cSKIvw6WdPZIRubADWxQoh1MdB40T8-jjgfNUeUHIn0,5
 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=gh3KtmZCyUima5BunpjaeKcanmRWJvCy8Ly8gUgDf_M,16915
+synth_ai/zyk/lms/structured_outputs/handler.py,sha256=BQ0T4HBFXC9qesF8v0lG8MuiOecWm2YEF75nUt1mB_s,16925
 synth_ai/zyk/lms/structured_outputs/inject.py,sha256=Fy-zDeleRxOZ8ZRM6IuZ6CP2XZnMe4K2PEn4Q9c_KPY,11777
 synth_ai/zyk/lms/structured_outputs/rehabilitate.py,sha256=GuIhzsb7rTvwgn7f9I9omNnXBz5Me_qrtNYcTWzw5_U,7909
 synth_ai/zyk/lms/tools/base.py,sha256=j7wYb1xAvaAm3qVrINphgUhGS-UjZmRpbouseQYgh7A,3228
 synth_ai/zyk/lms/vendors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 synth_ai/zyk/lms/vendors/base.py,sha256=aK4PEtkMLt_o3qD22kW-x3HJUEKdIk06zlH4kX0VkAE,760
 synth_ai/zyk/lms/vendors/constants.py,sha256=zqCOyXZqo297wboR9EKVSkvpq6JCMSJyeso8HdZPKa4,102
-synth_ai/zyk/lms/vendors/openai_standard.py,sha256=Th_0QjmrJ7gemxsKnWmij46lIz4QWZOi7Du5OOiLUcc,11413
+synth_ai/zyk/lms/vendors/openai_standard.py,sha256=BoLfzd2d6TqFw1CyukJfbUzrqIxQT1A-F0otb1ybNVU,12149
 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=QM4xuaigdVOjBuzkPyT-RSOtvT2wiKxAiHRfI77GYn8,13461
+synth_ai/zyk/lms/vendors/core/anthropic_api.py,sha256=vxANYEcU46n6flRJ4y5j4VrSA1ky4EXo8nWgYPLi3HU,13829
 synth_ai/zyk/lms/vendors/core/gemini_api.py,sha256=I1goLy5R8eBLrun2jpnD4o87NlmzWgPrfYaeu9RZN8M,11008
 synth_ai/zyk/lms/vendors/core/mistral_api.py,sha256=-EMPBEIoYxxDMxukmcmKL8AGAHPNYe4w-76gsPtmrhk,11860
 synth_ai/zyk/lms/vendors/core/openai_api.py,sha256=QkQqba851EEGf9n5H31-pJ6WexhTZkdPWQap0oGy2Ho,6713
@@ -56,11 +56,11 @@ synth_ai/zyk/lms/vendors/supported/deepseek.py,sha256=BElW0NGpkSA62wOqzzMtDw8XR3
 synth_ai/zyk/lms/vendors/supported/groq.py,sha256=Fbi7QvhdLx0F-VHO5PY-uIQlPR0bo3C9h1MvIOx8nz0,388
 synth_ai/zyk/lms/vendors/supported/ollama.py,sha256=K30VBFRTd7NYyPmyBVRZS2sm0UB651AHp9i3wd55W64,469
 synth_ai/zyk/lms/vendors/supported/together.py,sha256=Ni_jBqqGPN0PkkY-Ew64s3gNKk51k3FCpLSwlNhKbf0,342
-synth_ai-0.1.0.dev31.dist-info/licenses/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
+synth_ai-0.1.0.dev33.dist-info/licenses/LICENSE,sha256=ynhjRQUfqA_RdGRATApfFA_fBAy9cno04sLtLUqxVFM,1069
 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.dev31.dist-info/METADATA,sha256=2_iOE8RJoBGSLhzESPdzowRaUwb_D9_5o1dDckh0UoE,2702
-synth_ai-0.1.0.dev31.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-synth_ai-0.1.0.dev31.dist-info/top_level.txt,sha256=5GzJO9j-KbJ_4ppxhmCUa_qdhHM4-9cHHNU76yAI8do,42
-synth_ai-0.1.0.dev31.dist-info/RECORD,,
+synth_ai-0.1.0.dev33.dist-info/METADATA,sha256=dft68cr1vKV74EF4tB03XmXxX7WMmmTuCinGG_5Cmxk,2702
+synth_ai-0.1.0.dev33.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+synth_ai-0.1.0.dev33.dist-info/top_level.txt,sha256=5GzJO9j-KbJ_4ppxhmCUa_qdhHM4-9cHHNU76yAI8do,42
+synth_ai-0.1.0.dev33.dist-info/RECORD,,