janito 2.17.0__py3-none-any.whl → 2.17.1__py3-none-any.whl

janito/tools/adapters/local/read_files.py

@@ -52,4 +52,4 @@ class ReadFilesTool(ToolBase):
                 results.append(
                     f"--- File: {disp_path} (error) ---\nError reading file: {e}\n"
                 )
-        return "\n".join(results)
+        return "\n".join(results)

janito/tools/path_security.py

@@ -135,6 +135,7 @@ def _extract_path_keys_from_schema(schema: Mapping[str, Any]) -> set[str]:
     path_keys: set[str] = set()
     if schema is not None:
         for k, v in schema.get("properties", {}).items():
+            # Handle direct path strings
             if v.get("format") == "path" or (
                 v.get("type") == "string"
                 and (
@@ -144,6 +145,19 @@ def _extract_path_keys_from_schema(schema: Mapping[str, Any]) -> set[str]:
                 )
             ):
                 path_keys.add(k)
+            # Handle arrays of path strings
+            elif v.get("type") == "array" and "items" in v:
+                items = v["items"]
+                if items.get("format") == "path" or (
+                    items.get("type") == "string"
+                    and (
+                        "path" in items.get("description", "").lower()
+                        or "path" in v.get("description", "").lower()
+                        or k.endswith("paths")
+                        or k == "paths"
+                    )
+                ):
+                    path_keys.add(k)
     return path_keys
 
 

janito/tools/tools_adapter.py

@@ -131,9 +131,15 @@ class ToolsAdapterBase:
 
         if arguments is None:
             arguments = {}
-        # Ensure the input is a dict to avoid breaking the inspect-based logic
+        # If arguments are provided as a non-dict (e.g. a list or a scalar)
+        # we skip signature *keyword* validation completely and defer the
+        # decision to Python's own call mechanics when the function is
+        # eventually invoked.  This allows positional / variadic arguments to
+        # be supplied by callers that intentionally bypass the structured
+        # JSON-schema style interface.
         if not isinstance(arguments, dict):
-            return "Tool arguments should be provided as an object / mapping"
+            # Nothing to validate at this stage – treat as OK.
+            return None
 
         sig = inspect.signature(func)
         params = sig.parameters
@@ -193,30 +199,32 @@ class ToolsAdapterBase:
             )
 
             schema = getattr(tool, "schema", None)
-            try:
-                validate_paths_in_arguments(arguments, workdir, schema=schema)
-            except PathSecurityError as sec_err:
-                # Publish both a ToolCallError and a user-facing ReportEvent for path security errors
-                self._publish_tool_call_error(
-                    tool_name, request_id, str(sec_err), arguments
-                )
-                if self._event_bus:
-                    from janito.report_events import (
-                        ReportEvent,
-                        ReportSubtype,
-                        ReportAction,
+            # Only validate paths for dictionary-style arguments
+            if isinstance(arguments, dict):
+                try:
+                    validate_paths_in_arguments(arguments, workdir, schema=schema)
+                except PathSecurityError as sec_err:
+                    # Publish both a ToolCallError and a user-facing ReportEvent for path security errors
+                    self._publish_tool_call_error(
+                        tool_name, request_id, str(sec_err), arguments
                     )
+                    if self._event_bus:
+                        from janito.report_events import (
+                            ReportEvent,
+                            ReportSubtype,
+                            ReportAction,
+                        )
 
-                    self._event_bus.publish(
-                        ReportEvent(
-                            subtype=ReportSubtype.ERROR,
-                            message=f"[SECURITY] Path access denied: {sec_err}",
-                            action=ReportAction.EXECUTE,
-                            tool=tool_name,
-                            context={"arguments": arguments, "request_id": request_id},
+                        self._event_bus.publish(
+                            ReportEvent(
+                                subtype=ReportSubtype.ERROR,
+                                message=f"[SECURITY] Path access denied: {sec_err}",
+                                action=ReportAction.EXECUTE,
+                                tool=tool_name,
+                                context={"arguments": arguments, "request_id": request_id},
+                            )
                         )
-                    )
-                return f"Security error: {sec_err}"
+                    return f"Security error: {sec_err}"
         # --- END SECURITY ---
 
         self._publish_tool_call_started(tool_name, request_id, arguments)
@@ -224,7 +232,18 @@ class ToolsAdapterBase:
             f"[tools-adapter] Executing tool: {tool_name} with arguments: {arguments}"
         )
         try:
-            result = self.execute(tool, **(arguments or {}), **kwargs)
+            # Normalize arguments to ensure proper type handling
+            normalized_args = self._normalize_arguments(arguments, tool, func)
+            
+            if isinstance(normalized_args, (list, tuple)):
+                # Positional arguments supplied as an array → expand as *args
+                result = self.execute(tool, *normalized_args, **kwargs)
+            elif isinstance(normalized_args, dict) or normalized_args is None:
+                # Keyword-style arguments (the default) – pass as **kwargs
+                result = self.execute(tool, **(normalized_args or {}), **kwargs)
+            else:
+                # Single positional argument (scalar/str/int/…)
+                result = self.execute(tool, normalized_args, **kwargs)
         except Exception as e:
             self._handle_execution_error(tool_name, request_id, e, arguments)
         self._print_verbose(
@@ -281,6 +300,65 @@ class ToolsAdapterBase:
         if self.verbose_tools:
             print(message)
 
+    def _normalize_arguments(self, arguments, tool, func):
+        """
+        Normalize arguments to ensure proper type handling at the adapter level.
+        
+        This handles cases where:
+        1. String is passed instead of list for array parameters
+        2. JSON string parsing issues
+        3. Other type mismatches that can be automatically resolved
+        """
+        import inspect
+        import json
+        
+        # If arguments is already a dict or None, return as-is
+        if isinstance(arguments, dict) or arguments is None:
+            return arguments
+            
+        # If arguments is a list/tuple, return as-is (positional args)
+        if isinstance(arguments, (list, tuple)):
+            return arguments
+            
+        # Handle string arguments
+        if isinstance(arguments, str):
+            # Try to parse as JSON if it looks like JSON
+            stripped = arguments.strip()
+            if (stripped.startswith('{') and stripped.endswith('}')) or \
+               (stripped.startswith('[') and stripped.endswith(']')):
+                try:
+                    parsed = json.loads(arguments)
+                    return parsed
+                except json.JSONDecodeError:
+                    # If it looks like JSON but failed, try to handle common issues
+                    pass
+            
+            # Check if the function expects a list parameter
+            try:
+                sig = inspect.signature(func)
+                params = list(sig.parameters.values())
+                
+                # Skip 'self' parameter for methods
+                if len(params) > 0 and params[0].name == 'self':
+                    params = params[1:]
+                
+                # If there's exactly one parameter that expects a list, wrap string in list
+                if len(params) == 1:
+                    param = params[0]
+                    annotation = param.annotation
+                    
+                    # Check if annotation is list[str] or similar
+                    if hasattr(annotation, '__origin__') and annotation.__origin__ is list:
+                        return [arguments]
+                    elif str(annotation).startswith('list[') or str(annotation) == 'list':
+                        return [arguments]
+                        
+            except (ValueError, TypeError):
+                pass
+                
+        # Return original arguments for other cases
+        return arguments
+
     def execute_function_call_message_part(self, function_call_message_part):
         """
         Execute a FunctionCallMessagePart by extracting the tool name and arguments and dispatching to execute_by_name.
@@ -298,9 +376,23 @@ class ToolsAdapterBase:
         # Parse arguments if they are a JSON string
         if isinstance(arguments, str):
             try:
+                # Try to parse as JSON first
                 arguments = json.loads(arguments)
-            except Exception:
-                pass  # Leave as string if not JSON
+            except json.JSONDecodeError:
+                # Handle single quotes in JSON strings
+                try:
+                    # Replace single quotes with double quotes for JSON compatibility
+                    fixed_json = arguments.replace("'", '"')
+                    arguments = json.loads(fixed_json)
+                except (json.JSONDecodeError, ValueError):
+                    # If it's a string that looks like it might be a single path parameter,
+                    # try to handle it gracefully
+                    if arguments.startswith("{") and arguments.endswith("}"):
+                        # Looks like JSON but failed to parse - this is likely an error
+                        pass
+                    else:
+                        # Single string argument - let the normalization handle it
+                        pass
         if self.verbose_tools:
             print(
                 f"[tools-adapter] Executing FunctionCallMessagePart: tool={tool_name}, arguments={arguments}, tool_call_id={tool_call_id}"

{janito-2.17.0.dist-info → janito-2.17.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: janito
-Version: 2.17.0
+Version: 2.17.1
 Summary: A new Python package called janito.
 Author-email: João Pinto <janito@ikignosis.org>
 Project-URL: Homepage, https://github.com/ikignosis/janito

{janito-2.17.0.dist-info → janito-2.17.1.dist-info}/RECORD

@@ -162,7 +162,7 @@ janito/tools/__init__.py,sha256=W1B39PztC2UF7PS2WyLH6el32MFOETMlN1-LurOROCg,1171
 janito/tools/disabled_tools.py,sha256=Tx__16wtMWZ9z34cYLdH1gukwot5MCL-9kLjd5MPX6Y,2110
 janito/tools/inspect_registry.py,sha256=Jo7PrMPRKLuR-j_mBAk9PBcTzeJf1eQrS1ChGofgQk0,538
 janito/tools/outline_file.bak.zip,sha256=EeI2cBXCwTdWVgJDNiroxKeYlkjwo6NLKeXz3J-2iZI,15607
-janito/tools/path_security.py,sha256=dCE8pPCtMElVm1jatpYmXkc8lK9CHCK_4K0JIhqn1f4,7584
+janito/tools/path_security.py,sha256=40b0hV0X3449Dht93A04Q3c9AYSsBQsBFy2BjzM83lA,8214
 janito/tools/permissions.py,sha256=_viTVXyetZC01HjI2s5c3klIJ8-RkWB1ShdOaV__loY,1508
 janito/tools/permissions_parse.py,sha256=LHadt0bWglm9Q2BbbVVbKePg4oa7QLeRQ-ChQZsE_dI,384
 janito/tools/tool_base.py,sha256=TSrXDknqIqOtY3xzuvtsxZ3qwbvmGzUruBiqVzzICfc,3689
@@ -170,7 +170,7 @@ janito/tools/tool_events.py,sha256=czRtC2TYakAySBZvfHS_Q6_NY_7_krxzAzAL1ggRFWA,1
 janito/tools/tool_run_exception.py,sha256=43yWgTaGBGEtRteo6FvTrane6fEVGo9FU1uOdjMRWJE,525
 janito/tools/tool_use_tracker.py,sha256=IaEmA22D6RuL1xMUCScOMGv0crLPwEJVGmj49cydIaM,2662
 janito/tools/tool_utils.py,sha256=alPm9DvtXSw_zPRKvP5GjbebPRf_nfvmWk2TNlL5Cws,1219
-janito/tools/tools_adapter.py,sha256=wLtsdiyRFNDp5xFWN_h5yN4b-eFfYP6rEVQa_JNbFVA,14108
+janito/tools/tools_adapter.py,sha256=aPzyJnm1pNwsEKNcXs-gKFurlOaZqzxkiktHOjITp_8,18724
 janito/tools/tools_schema.py,sha256=rGrKrmpPNR07VXHAJ_haGBRRO-YGLOF51BlYRep9AAQ,4415
 janito/tools/adapters/__init__.py,sha256=XKixOKtUJs1R-rGwGDXSLVLg5-Kp090gvWbsseWT4LI,92
 janito/tools/adapters/local/__init__.py,sha256=_nxMg2uPX18DHNtyHR6SDwYMZvDLpy6gyaCt-75unao,2172
@@ -188,7 +188,7 @@ janito/tools/adapters/local/open_url.py,sha256=WHOJ2TaUVye2iUnrcdu93A_xKBx2lYcK0
 janito/tools/adapters/local/python_code_run.py,sha256=UrQ_rv_qVjY1vNdpACDAma5eFbAj_WhvgQjghRpv9hg,6681
 janito/tools/adapters/local/python_command_run.py,sha256=M-TxoGND45zKSMrYPjD6juSo0UhfsilXEBiyQdzQkiI,6621
 janito/tools/adapters/local/python_file_run.py,sha256=OsHc9rpyGWUjLE7Zin9Gl7YOLf9QVe8NoXXcdTkpJyE,6466
-janito/tools/adapters/local/read_files.py,sha256=lz17lK5R1NlmCfLdikhFKGzBC4b2TedyIKrM-aM9m5c,2094
+janito/tools/adapters/local/read_files.py,sha256=2wYo60G6FCzpcpiBFv9-XBqSD6j4oO2AUe3v7Gm90kQ,2092
 janito/tools/adapters/local/remove_directory.py,sha256=g1wkHcWNgtv3mfuZ4GfvqtKU3th-Du_058FMcNmc1TA,1830
 janito/tools/adapters/local/remove_file.py,sha256=cSs7EIhEqblnLmwjUKrUq2M8axyT2oTXJqZs5waOAFw,2090
 janito/tools/adapters/local/replace_text_in_file.py,sha256=zFGWORuaw50ZlEFf3q_s7K25Tt0QXu8yOXDeodY6kcE,10791
@@ -217,9 +217,9 @@ janito/tools/adapters/local/validate_file_syntax/ps1_validator.py,sha256=TeIkPt0
 janito/tools/adapters/local/validate_file_syntax/python_validator.py,sha256=BfCO_K18qy92m-2ZVvHsbEU5e11OPo1pO9Vz4G4616E,130
 janito/tools/adapters/local/validate_file_syntax/xml_validator.py,sha256=AijlsP_PgNuC8ZbGsC5vOTt3Jur76otQzkd_7qR0QFY,284
 janito/tools/adapters/local/validate_file_syntax/yaml_validator.py,sha256=TgyI0HRL6ug_gBcWEm5TGJJuA4E34ZXcIzMpAbv3oJs,155
-janito-2.17.0.dist-info/licenses/LICENSE,sha256=GSAKapQH5ZIGWlpQTA7v5YrfECyaxaohUb1vJX-qepw,1090
-janito-2.17.0.dist-info/METADATA,sha256=wGS9j3rhoYjuytmRjw6BMuENPJ4CuU_izGosAtiWeE0,16365
-janito-2.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-janito-2.17.0.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
-janito-2.17.0.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
-janito-2.17.0.dist-info/RECORD,,
+janito-2.17.1.dist-info/licenses/LICENSE,sha256=GSAKapQH5ZIGWlpQTA7v5YrfECyaxaohUb1vJX-qepw,1090
+janito-2.17.1.dist-info/METADATA,sha256=-5Gl5IbWdd_Fi-ecNEpqQgWNe5O_e_ZuKPKeZimz-zg,16365
+janito-2.17.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+janito-2.17.1.dist-info/entry_points.txt,sha256=wIo5zZxbmu4fC-ZMrsKD0T0vq7IqkOOLYhrqRGypkx4,48
+janito-2.17.1.dist-info/top_level.txt,sha256=m0NaVCq0-ivxbazE2-ND0EA9Hmuijj_OGkmCbnBcCig,7
+janito-2.17.1.dist-info/RECORD,,