Merge pull request #97 from cagostino/chris/calc_tool_bug

cagostino · web-flow · commit 4ef9197f0f4d · 2025-02-23T16:17:35.000-05:00
Chris/calc tool bug
diff --git a/npcsh/llm_funcs.py b/npcsh/llm_funcs.py
@@ -956,6 +956,8 @@ def handle_tool_call(
     retrieved_docs=None,
     n_docs: int = 5,
     stream=False,
+    n_attempts=3,
+    attempt=0,
 ) -> Union[str, Dict[str, Any]]:
     """
     Function Description:
@@ -1000,9 +1002,12 @@ def handle_tool_call(
     The user wants to use the tool '{tool_name}' with the following request:
     '{command}'
     Here is the tool file:
-    {tool}
+    ```
+    {tool.to_dict()}
+    ```
 
     Please extract the required inputs for the tool as a JSON object.
+    They must be exactly as they are named in the tool.
     Return only the JSON object without any markdown formatting.
     """
     if npc and hasattr(npc, "shared_context"):
@@ -1015,6 +1020,7 @@ def handle_tool_call(
 
     # print(f"Tool prompt: {prompt}")
 
+    # print(prompt)
     response = get_llm_response(
         prompt,
         format="json",
@@ -1048,8 +1054,30 @@ def handle_tool_call(
             if inp not in input_values:
                 missing_inputs.append(inp)
     if len(missing_inputs) > 0:
-        print(f"Missing required inputs for tool '{tool_name}': {missing_inputs}")
-        return f"Missing inputs for tool '{tool_name}': {missing_inputs}"
+        # print(f"Missing required inputs for tool '{tool_name}': {missing_inputs}")
+        if attempt < n_attempts:
+            print(f"attempt {attempt+1} to generate inputs failed, trying again")
+            print("missing inputs", missing_inputs)
+            print("llm response", response)
+            print("input values", input_values)
+            return handle_tool_call(
+                command,
+                tool_name,
+                command_history,
+                model=model,
+                provider=provider,
+                messages=messages,
+                npc=npc,
+                retrieved_docs=retrieved_docs,
+                n_docs=n_docs,
+                stream=stream,
+                attempt=attempt + 1,
+                n_attempts=n_attempts,
+            )
+        return {
+            "output": f"Missing inputs for tool '{tool_name}': {missing_inputs}",
+            "messages": messages,
+        }
 
     # try:
     tool_output = tool.execute(
diff --git a/npcsh/npc_compiler.py b/npcsh/npc_compiler.py
@@ -323,8 +323,9 @@ def __init__(
         self.model = model
         self.db_conn = db_conn
         self.tables = self.db_conn.execute(
-            "SELECT name FROM sqlite_master WHERE type='table';"
+            "SELECT name, sql FROM sqlite_master WHERE type='table';"
         ).fetchall()
+
         self.provider = provider
         self.api_url = api_url
         self.all_tools = all_tools or []
diff --git a/npcsh/npc_team/tools/calculator.tool b/npcsh/npc_team/tools/calculator.tool
@@ -1,8 +1,8 @@
 tool_name: "calculator"
 description: "A tool to simplify and evaluate mathematical expressions"
 inputs:
-  - "expression"
+  - expression
 steps:
   - engine: python
     code: |
-      output = eval(inputs['expression'])
+      output = eval('{{ expression }}')
diff --git a/npcsh/npc_team/tools/image_generation.tool b/npcsh/npc_team/tools/image_generation.tool
@@ -7,7 +7,7 @@ steps:
   - engine: "python"
     code: |
       # Clean and prepare the prompt
-      image_prompt = inputs['prompt'].strip()
+      image_prompt = '{{prompt}}'.strip()
       #print(f"Prompt: {image_prompt}")
 
       # Generate the image
diff --git a/npcsh/npc_team/tools/screen_cap.tool b/npcsh/npc_team/tools/screen_cap.tool
@@ -15,7 +15,7 @@ steps:
 
       out = capture_screenshot(npc = npc, full = True)
 
-      llm_response = analyze_image_base(    inputs['prompt'] + "\n\nAttached is a screenshot of my screen currently. Please use this to evaluate the situation. If the user asked for you to explain what's on their screen or something similar, they are referring to the details contained within the attached image. You do not need to actually view their screen. You do not need to mention that you cannot view or interpret images directly. You only need to answer the user's request based on the attached screenshot!",
+      llm_response = analyze_image_base( '{{prompt}}' + "\n\nAttached is a screenshot of my screen currently. Please use this to evaluate the situation. If the user asked for you to explain what's on their screen or something similar, they are referring to the details contained within the attached image. You do not need to actually view their screen. You do not need to mention that you cannot view or interpret images directly. You only need to answer the user's request based on the attached screenshot!",
                                         out['file_path'],
                                         out['filename'],
                                         npc=npc,
diff --git a/npcsh/npc_team/tools/sql_executor.tool b/npcsh/npc_team/tools/sql_executor.tool
@@ -2,18 +2,23 @@ tool_name: sql_executor
 description: Execute SQL queries on the ~/npcsh_history.db and display the result. The database contains only information about conversations and other user-provided data. It does not store any information about individual files.
 inputs:
   - sql_query
-  - interpret: "false"  # Note that this is not a boolean, but a string
+  - interpret: false  # Note that this is not a boolean, but a string
 
 steps:
   - engine: python
     code: |
       import pandas as pd
-      df = pd.read_sql_query(inputs['sql_query'], npc.db_conn)
+      try:
+        df = pd.read_sql_query('{{sql_query}}', npc.db_conn)
+      except pandas.errors.DatabaseError as e:
+        df = pd.DataFrame({'Error': [str(e)]})
+
+
       output = df.to_string()
 
   - engine: natural
     code: |
-      {% if inputs['interpret'] == "true" %}
+      {% if interpret %}
       Here is the result of the SQL query:
       ```
       {{ df.to_string() }}  # Convert DataFrame to string for a nicer display
diff --git a/npcsh/npc_team/tools/stats_calculator.tool b/npcsh/npc_team/tools/stats_calculator.tool
diff --git a/npcsh/shell_helpers.py b/npcsh/shell_helpers.py
@@ -1659,10 +1659,11 @@ def parse_piped_command(current_command):
 
     try:
         command_parts = shlex.split(current_command)
+        # print(command_parts)
     except ValueError:
         # Fallback if quote parsing fails
         command_parts = current_command.split()
-
+        # print(command_parts)
     # Base command is the first part
     base_command = command_parts[0]
 
@@ -1725,13 +1726,16 @@ def execute_command(
     output = ""
     location = os.getcwd()
     db_conn = sqlite3.connect(db_path)
+    # print(f"Executing command: {command}")
     if len(command.strip()) == 0:
         return {"messages": messages, "output": output}
+
     if messages is None:
         messages = []
 
     # Split commands by pipe, preserving the original parsing logic
     commands = command.split("|")
+    # print(commands)
     available_models = get_available_models()
 
     # Track piped output between commands
@@ -1801,21 +1805,22 @@ def execute_command(
             subcommands = result.get("subcommands", [])
 
         else:
+            # print(single_command)
             try:
                 command_parts = shlex.split(single_command)
+                # print(command_parts)
             except ValueError as e:
                 if "No closing quotation" in str(e):
                     # Attempt to close unclosed quotes
-                    single_command += '"'
+                    if single_command.count('"') % 2 == 1:
+                        single_command += '"'
+                    elif single_command.count("'") % 2 == 1:
+                        single_command += "'"
                     try:
                         command_parts = shlex.split(single_command)
                     except ValueError:
-                        return {
-                            "messages": messages,
-                            "output": "Error: Unmatched quotation in command",
-                        }
-                else:
-                    return {"messages": messages, "output": f"Error: {str(e)}"}
+                        # fall back to regular split
+                        command_parts = single_command.split()
 
             # ALL EXISTING COMMAND HANDLING LOGIC REMAINS UNCHANGED
             if command_parts[0] in interactive_commands:
@@ -1912,6 +1917,8 @@ def execute_command(
                         output = colored(f"Error executing command: {e}", "red")
 
             else:
+                # print("LLM command")
+                # print(single_command)
                 # LLM command processing with existing logic
                 output = check_llm_command(
                     single_command,
diff --git a/setup.py b/setup.py
@@ -57,7 +57,7 @@ def get_setup_message():
 
 setup(
     name="npcsh",
-    version="0.3.7",
+    version="0.3.8",
     packages=find_packages(exclude=["tests*"]),
     install_requires=[
         "redis",
