PikoAi 0.1.24__tar.gz → 0.1.26__tar.gz

{pikoai-0.1.24 → pikoai-0.1.26}/PKG-INFO

@@ -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 → pikoai-0.1.26}/Src/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?"
     }
 }
 ```"""},

{pikoai-0.1.24 → pikoai-0.1.26}/Src/PikoAi.egg-info/PKG-INFO

@@ -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 → pikoai-0.1.26}/Src/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"
         }
     },
     {

{pikoai-0.1.24 → pikoai-0.1.26}/Src/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}")
 
 
 

pikoai-0.1.26/Src/Tools/userinp.py

@@ -0,0 +1,12 @@
+def get_user_input(prompt="Enter input: "):
+    """
+    Get text input from the user.
+    
+    Args:
+        prompt (str): The message to display to the user
+    
+    Returns:
+        The user's input as a string
+    """
+    user_input = input(prompt)
+    return user_input

{pikoai-0.1.24 → pikoai-0.1.26}/Src/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 → pikoai-0.1.26}/setup.py

@@ -3,7 +3,7 @@ from pathlib import Path
 
 setup(
     name="PikoAi",
-    version="0.1.24",
+    version="0.1.26",
     packages=find_packages(where="Src"),
     py_modules=["cli", "OpenCopilot"],
     package_dir={"": "Src"},

pikoai-0.1.24/Src/Tools/userinp.py

@@ -1,26 +0,0 @@
-def get_user_input(prompt="Enter input: ", input_type="text"):
-    """
-    Get input from the user with optional type validation.
-    
-    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
-    """
-    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