PikoAi 0.1.24__py3-none-any.whl → 0.1.26__py3-none-any.whl

Agents/Executor/executor.py

@@ -50,7 +50,7 @@ class executor:
 {
     "tool_name": "get_user_input",
      "input": {
-        "query": "Hi,im your terminal assistant. How can I help you?"
+        "prompt": "Hi,im your terminal assistant. How can I help you?"
     }
 }
 ```"""},

Tools/tool_dir.json

@@ -67,8 +67,7 @@
         "name": "get_user_input",
         "summary": "Prompts the user for input and returns their response",
         "arguments": {
-            "prompt": "The message to display to the user",
-            "input_type": "Type of input to validate (text, number, optional, defaults to text)"
+            "prompt": "The message to display to the user"
         }
     },
     {

Tools/tool_manager.py

@@ -67,19 +67,47 @@ def execute_shell_command_tool(command: str) -> str:
         else:
             return f"Command Output:\n{result['output']}\nError: {result.get('error', 'Unknown error')}"
 
+def verify_tool_input(tool_name, tool_input):
+    """
+    Verifies that tool_input contains all required arguments for the tool as specified in tool_dir.json.
+    Raises ValueError if any required argument is missing or if unexpected arguments are provided.
+    """
+    tool_dir_path = os.path.join(os.path.dirname(__file__), 'tool_dir.json')
+    with open(tool_dir_path, 'r') as f:
+        tools = json.load(f)
+    tool_spec = next((tool for tool in tools if tool['name'] == tool_name), None)
+    if not tool_spec:
+        raise ValueError(f"Tool '{tool_name}' not found in tool_dir.json.")
+    required_args = set(tool_spec.get('arguments', {}).keys())
+    provided_args = set(tool_input.keys())
+    # Check for missing required arguments (ignore optional ones if specified in doc) 
+    missing_args = [
+        arg for arg in required_args
+        if arg not in provided_args and
+        not 'optional' in tool_spec.get('arguments', {}).get(arg, {})
+        
+    ]
+    if missing_args:
+        raise ValueError(f"Missing required arguments for tool '{tool_name}': {missing_args}")
+    # Optionally, check for unexpected arguments
+    unexpected_args = [arg for arg in provided_args if arg not in required_args]
+    if unexpected_args:
+        raise ValueError(f"Unexpected arguments for tool '{tool_name}': {unexpected_args}")
+    return True
+
 def call_tool(tool_name, tool_input):
     """
-    Calls the appropriate tool function with the given input.
-    
+    Calls the appropriate tool function with the given input after verifying input parameters.
     Args:
         tool_name (str): Name of the tool to call
         tool_input (dict): Input parameters for the tool
     """
-    
+    verify_tool_input(tool_name, tool_input)
     if tool_name in tools_function_map:
         # Pass the tool_input dictionary as kwargs to the tool function
         return tools_function_map[tool_name](**tool_input)
-    else: raise ValueError(f"This tool is invalid. Please check the tools available in the tool directory")
+    else:
+        raise ValueError(f"This tool is invalid. Please check the tools available in the tool directory")
     
         
 
@@ -99,10 +127,16 @@ tools_function_map = {
     "execute_shell_command": execute_shell_command_tool,
 }
 
-# print(call_tool("web_loader","https://www.toastmasters.org"))
-# print(call_tool("web_search","manus ai"))
-# print(call_tool("web_loader",{"url":"https://www.toastmasters.org"}))
-# print(call_tool("file_reader",{"file_path":"/Users/niharshettigar/Web Dev Projects/Jsprograms/Arrays.js"}))
+
+if __name__ == "__main__":
+    # Test file_writer without the optional 'append' argument
+    test_file_path = "test_output.txt"
+    test_content = "This is a test."
+    try:
+        result = call_tool("get_user_input", {"prompt":"hi user"})
+        print(f"file_writer result: {result}")
+    except Exception as e:
+        print(f"Error: {e}")
 
 
 

Tools/userinp.py

@@ -1,26 +1,12 @@
-def get_user_input(prompt="Enter input: ", input_type="text"):
+def get_user_input(prompt="Enter input: "):
     """
-    Get input from the user with optional type validation.
+    Get text input from the user.
     
     Args:
         prompt (str): The message to display to the user
-        input_type (str): Type of input to validate (text, number, boolean)
     
     Returns:
-        The user's input, converted to the appropriate type
+        The user's input as a string
     """
-    while True:
-        try:
-            user_input = input(prompt)
-            
-            if input_type == "text":
-                return user_input
-            elif input_type == "number":
-                return float(user_input)
-            
-            else:
-                raise ValueError(f"Invalid input type: {input_type}")
-                
-        except ValueError as e:
-            print(f"Invalid input. Please try again. ({str(e)})")
-            continue
+    user_input = input(prompt)
+    return user_input

Utils/ter_interface.py

@@ -92,15 +92,6 @@ class TerminalInterface:
 
             # Regular markdown content
             else:
-                # Check if we're transitioning from a tool call to regular content
-                # This handles cases where tool calls don't have proper closing backticks
-                if self.inside_tool_call and line_stripped and not line_stripped.startswith("```"):
-                    # We've moved to regular content, so close the tool call
-                    self._display_tool_call_content()
-                    self.console.print("[bold cyan]--------------------------------[/bold cyan]")
-                    self.inside_tool_call = False
-                    self.tool_call_buffer = ""
-                
                 self.console.print(Markdown(line))
 
     def _display_tool_call_content(self):

{pikoai-0.1.24.dist-info → pikoai-0.1.26.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PikoAi
-Version: 0.1.24
+Version: 0.1.26
 Summary: An AI-powered task automation tool
 Home-page: https://github.com/nihaaaar22/OS-Assistant
 Author: Nihar S

{pikoai-0.1.24.dist-info → pikoai-0.1.26.dist-info}/RECORD

@@ -2,7 +2,7 @@ OpenCopilot.py,sha256=WPorkGh0ffB4m47mXF6Tza47SVqPRCGcQCTeZQTfghY,12355
 cli.py,sha256=2UvmH74pcBFFezI0WHNyWTHMYasIM5NGnrUX6wsdveM,12945
 Agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Agents/Executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-Agents/Executor/executor.py,sha256=0mskJv5ol4yPEhQytCJX_7rHzdoJmwI6aIwrUr4blpI,9765
+Agents/Executor/executor.py,sha256=LaO8sx_n83YszSED9puDusnbJDzhhT2R64rmcRx5oCY,9766
 Agents/Executor/prompts.py,sha256=Q1b7WPdrUXYQZgj7l4M0Exz1Rr9b_SQUpRfV7uZRSkA,3447
 Env/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 Env/base_env.py,sha256=K4PoWwPXn3pKeu7_-JOlUuyNbyYQ9itMhQybFOm-3K4,1563
@@ -14,19 +14,19 @@ Env/tests/test_shell_executor.py,sha256=-RcCdSUMoRAXHISIh0IR5MCutco80fX2S3sQBcin
 Tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 Tools/file_task.py,sha256=Sqn8GWB7UHljUmUniYbkTiC_63LkVIVU4aXgudtLNTI,12566
 Tools/system_details.py,sha256=RScVnhTpUOlNG0g5bGnwmtNr5nSJzOec8HJSFpbicds,2651
-Tools/tool_dir.json,sha256=RTawcanxIkJaUys6Y3yftXAT5uxMH0xPZYTtD1ilJl0,3119
-Tools/tool_manager.py,sha256=l_ZEFlPAfnkuz31-pH_pXclgTnxZU3NvVDUT42tHH2A,4109
-Tools/userinp.py,sha256=SK69fMEdUvNQor9V3BVckeDMJcq71g6H6EHPmNfsZD4,834
+Tools/tool_dir.json,sha256=ENQS4lYT5DjfUPghBRpiA8QEgoNJ9MIAlyIi8k1_fDc,3021
+Tools/tool_manager.py,sha256=3Q5DftbP-f6_citNySFJasLwHgdcz9uvAroyUUVJnZI,5588
+Tools/userinp.py,sha256=AAkKXkLgcSndnm3tFfw-ottuFMEc9H1D9rG0VghgWSY,273
 Tools/web_loader.py,sha256=N2J_0kl-y-YHwqaoFr7EXppaa4AuhavsrbGvMcFFJNg,5060
 Tools/web_search.py,sha256=12_VhwJGXmn3oUNhTbQ5ENFG964t9DWkfCz3UtlxrbM,2261
 Utils/__init__.py,sha256=oukU0ufroPRd8_N8d2xiFes9CTxSaw4NA6p2nS1kkSg,16
 Utils/executor_utils.py,sha256=ikcgkXFlqM9pr7Jaq4eZj6_5XB48EE52A3b3kMK25ss,1005
-Utils/ter_interface.py,sha256=IrAj5z5aVz5TWPgEHBAe2XYzWKE4Pnl2GTktDYD7C44,6468
+Utils/ter_interface.py,sha256=vB_Gj1vXyTI6iWqUmojb7RBaGcvMJn5hB2vvij76bBY,5852
 llm_interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 llm_interface/llm.py,sha256=nnTfzW-wdWoRd_ZtGxCqv33qf5V2uni8nQpzXDN0A0Y,5112
-pikoai-0.1.24.dist-info/licenses/LICENSE,sha256=cELUVOboOAderKFp8bdtcM5VyJi61YH1oDbRhOuoQZw,1067
-pikoai-0.1.24.dist-info/METADATA,sha256=rG_Gm4pXc7Q2bmn--426XAp_vftk1bOF1m8H3a9alQw,2962
-pikoai-0.1.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pikoai-0.1.24.dist-info/entry_points.txt,sha256=xjZnheDymNDnQ0o84R0jZKEITrhNbzQWN-AhqfA_d6s,50
-pikoai-0.1.24.dist-info/top_level.txt,sha256=hWzBNE7UQsuNcENIOksGcJED08k3ZGRRn2X5jnStICU,53
-pikoai-0.1.24.dist-info/RECORD,,
+pikoai-0.1.26.dist-info/licenses/LICENSE,sha256=cELUVOboOAderKFp8bdtcM5VyJi61YH1oDbRhOuoQZw,1067
+pikoai-0.1.26.dist-info/METADATA,sha256=rt0VncL8EKB1NqlN9ouiYQY4lLCNQwbv8eXRBkwlUAA,2962
+pikoai-0.1.26.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pikoai-0.1.26.dist-info/entry_points.txt,sha256=xjZnheDymNDnQ0o84R0jZKEITrhNbzQWN-AhqfA_d6s,50
+pikoai-0.1.26.dist-info/top_level.txt,sha256=hWzBNE7UQsuNcENIOksGcJED08k3ZGRRn2X5jnStICU,53
+pikoai-0.1.26.dist-info/RECORD,,