quantalogic 0.30.6__py3-none-any.whl → 0.30.8__py3-none-any.whl

quantalogic/agent.py

@@ -559,20 +559,24 @@ class Agent(BaseModel):
                 key: self._interpolate_variables(value) for key, value in arguments_with_values.items()
             }
             
-            # Convert arguments to correct types
-            try:
-                converted_args = self.tools._convert_kwargs_types(tool_name, **arguments_with_values_interpolated)
-            except ValueError as e:
-                logger.error(f"Type conversion failed: {str(e)}")
-                return "", f"Error: Type conversion failed for tool '{tool_name}': {str(e)}"
+            arguments_with_values_interpolated = arguments_with_values_interpolated
 
             # test if tool need variables in context 
             if tool.need_variables:
                 # Inject variables into the tool if needed
-                converted_args["variables"] = self.variable_store
+                arguments_with_values_interpolated["variables"] = self.variable_store
             if tool.need_caller_context_memory:
                 # Inject caller context into the tool if needed
-                converted_args["caller_context_memory"] = self.memory.memory
+                arguments_with_values_interpolated["caller_context_memory"] = self.memory.memory
+
+            try:
+                # Convert arguments to proper types
+                converted_args = self.tools.validate_and_convert_arguments(
+                    tool_name, 
+                    arguments_with_values_interpolated
+                )
+            except ValueError as e:
+                return "", f"Argument Error: {str(e)}"
 
             # Add injectable variables
             injectable_properties = tool.get_injectable_properties_in_execution()

quantalogic/tool_manager.py

@@ -67,49 +67,60 @@ class ToolManager(BaseModel):
             index += 1
         return markdown
 
-    def _convert_kwargs_types(self, tool_name: str, **kwargs) -> dict:
-        """Convert kwargs values to their expected types based on tool definition.
+
+
+    def validate_and_convert_arguments(self, tool_name: str, provided_args: dict) -> dict:
+        """Validates and converts arguments based on tool definition.
         
         Args:
-            tool_name: Name of the tool to get argument types from
-            **kwargs: Input arguments to convert
+            tool_name: Name of the tool to validate against
+            provided_args: Dictionary of arguments to validate
             
         Returns:
-            Dictionary of converted arguments
+            Dictionary of converted arguments with proper types
             
         Raises:
-            ValueError: If type conversion fails for a required argument
+            ValueError: For missing/invalid arguments or conversion errors
         """
-        tool = self.tools[tool_name]
-        converted = {}
-        
-        for arg_name, arg_value in kwargs.items():
-            # Find the corresponding argument definition
-            arg = next((a for a in tool.arguments if a.name == arg_name), None)
-            
-            if arg is None:
-                logger.warning(f"Argument '{arg_name}' not found in tool definition")
-                converted[arg_name] = arg_value
-                continue
-            
-            try:
-                if arg.arg_type == "int":
-                    converted[arg_name] = int(arg_value)
-                elif arg.arg_type == "float":
-                    converted[arg_name] = float(arg_value)
-                elif arg.arg_type == "boolean":
-                    val = str(arg_value).lower()
-                    converted[arg_name] = val in ("true", "1", "yes", "y")
-                else:  # string
-                    converted[arg_name] = str(arg_value)
-            except (ValueError, TypeError) as e:
-                if arg.required:
+        tool = self.get(tool_name)
+        converted_args = {}
+        type_conversion = {
+            "string": lambda x: str(x),
+            "int": lambda x: int(x),
+            "float": lambda x: float(x),
+            "bool": lambda x: str(x).lower() in ['true', '1', 'yes']
+        }
+
+        for arg_def in tool.arguments:
+            arg_name = arg_def.name
+            arg_type = arg_def.arg_type
+            required = arg_def.required
+            default = getattr(arg_def, 'default', None)
+
+            # Handle missing arguments
+            if arg_name not in provided_args:
+                if required:
+                    raise ValueError(f"Missing required argument: {arg_name}")
+                if default is None:
+                    continue  # Skip optional args with no default
+                provided_args[arg_name] = default
+
+            # Type conversion
+            value = provided_args[arg_name]
+            if arg_type in type_conversion:
+                try:
+                    converted = type_conversion[arg_type](value)
+                except (ValueError, TypeError) as e:
                     raise ValueError(
-                        f"Failed to convert required argument '{arg_name}' to {arg.arg_type}: {str(e)}"
+                        f"Invalid value '{value}' for {arg_name} ({arg_type}): {str(e)}"
                     )
-                logger.warning(f"Failed to convert optional argument '{arg_name}': {str(e)}")
-                converted[arg_name] = arg_value
-        
+                converted_args[arg_name] = converted
+            else:
+                converted_args[arg_name] = value  # Unknown type, pass through
 
-        
-        return converted
+        # Validate extra arguments
+        extra_args = set(provided_args.keys()) - {a.name for a in tool.arguments}
+        if extra_args:
+            raise ValueError(f"Unexpected arguments: {', '.join(extra_args)}")
+
+        return converted_args

{quantalogic-0.30.6.dist-info → quantalogic-0.30.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: quantalogic
-Version: 0.30.6
+Version: 0.30.8
 Summary: QuantaLogic ReAct Agents
 Author: Raphaël MANSUY
 Author-email: raphael.mansuy@gmail.com

{quantalogic-0.30.6.dist-info → quantalogic-0.30.8.dist-info}/RECORD

@@ -1,5 +1,5 @@
 quantalogic/__init__.py,sha256=kX0c_xmD9OslWnAE92YHMGuD7xZcTo8ZOF_5R64HKps,784
-quantalogic/agent.py,sha256=bmqHR0XzkzmUCDYVh0EklPMtvxRt8UpDdutArqKi4XA,31219
+quantalogic/agent.py,sha256=Ue8qV0jkD5i7ownIuYQJ1ljIqYYc-rQ2-3cv6Cuo9Y4,31309
 quantalogic/agent_config.py,sha256=9sjDnCPlAqVM45oguB_D509WSCaXZmuaVUtLcOvDlPg,7572
 quantalogic/agent_factory.py,sha256=ODVGuGtugSzmSdP6jiWlT8WyC5onANc6BIs83FC90Bg,3782
 quantalogic/coding_agent.py,sha256=Z7ik6LUvLKDnaW9Ax1iZGC7p1WMnlYEUIlE5lkBP414,4975
@@ -25,7 +25,7 @@ quantalogic/server/static/js/quantalogic.js,sha256=x7TrlZGR1Y0WLK2DWl1xY847BhEWM
 quantalogic/server/templates/index.html,sha256=nDnXJoQEm1vXbhXtgaYk0G5VXj0wwzE6KrqEDhHFpj4,7773
 quantalogic/task_file_reader.py,sha256=AMIJoeVY9Hhu0dBJ-C5EyaOFsXLkhn2oBhVs-WTnnLk,1460
 quantalogic/task_runner.py,sha256=FtxfZs2dxdsSZoiW92K3dpfegFe0dyKx9ZP5CCyEAzo,9965
-quantalogic/tool_manager.py,sha256=G-vXDKgU1todhM1I1GHUrOfdBqnHDZvRIcExwaU7RcY,4293
+quantalogic/tool_manager.py,sha256=LUdzKIQn2W8ieCDG5EX0LdjzcwCOvSuiHnsXgddukc4,4599
 quantalogic/tools/__init__.py,sha256=pTirT5UBynuTkAzFYebu7ttGAMP3_A0idFvDp6lGZJQ,2146
 quantalogic/tools/agent_tool.py,sha256=MXCXxWHRch7VK4UWhtRP1jeI8Np9Ne2CUGo8vm1oZiM,3064
 quantalogic/tools/dalle_e.py,sha256=nur2kl6DKjaWWaHcmF_y9vS5bvty2fW8hQfdgf5KWfs,10948
@@ -85,8 +85,8 @@ quantalogic/version_check.py,sha256=cttR1lR3OienGLl7NrK1Te1fhDkqSjCci7HC1vFUTSY,
 quantalogic/welcome_message.py,sha256=IXMhem8h7srzNUwvw8G_lmEkHU8PFfote021E_BXmVk,3039
 quantalogic/xml_parser.py,sha256=uMLQNHTRCg116FwcjRoquZmSwVtE4LEH-6V2E3RD-dA,11466
 quantalogic/xml_tool_parser.py,sha256=Vz4LEgDbelJynD1siLOVkJ3gLlfHsUk65_gCwbYJyGc,3784
-quantalogic-0.30.6.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-quantalogic-0.30.6.dist-info/METADATA,sha256=Hfc9KLBE3r0KUwXfpEb25KCN3zWI-Fb9D6gRnt5xDHU,21722
-quantalogic-0.30.6.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-quantalogic-0.30.6.dist-info/entry_points.txt,sha256=h74O_Q3qBRCrDR99qvwB4BpBGzASPUIjCfxHq6Qnups,183
-quantalogic-0.30.6.dist-info/RECORD,,
+quantalogic-0.30.8.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+quantalogic-0.30.8.dist-info/METADATA,sha256=IAlgxZjaFHCms34IQMC-mYWFbB4yh7pfJ0OMuxTQngE,21722
+quantalogic-0.30.8.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+quantalogic-0.30.8.dist-info/entry_points.txt,sha256=h74O_Q3qBRCrDR99qvwB4BpBGzASPUIjCfxHq6Qnups,183
+quantalogic-0.30.8.dist-info/RECORD,,