npcsh 0.3.30__py3-none-any.whl → 0.3.32__py3-none-any.whl

npcsh/npc_compiler.py

@@ -19,7 +19,7 @@ from collections import defaultdict, deque
 import traceback
 
 # Importing functions
-from .llm_funcs import (
+from npcsh.llm_funcs import (
     get_llm_response,
     get_stream,
     process_data_output,
@@ -29,9 +29,9 @@ from .llm_funcs import (
     handle_tool_call,
     execute_llm_command,
 )
-from .helpers import get_npc_path
-from .search import search_web, rag_search
-from .image import capture_screenshot, analyze_image_base
+from npcsh.helpers import get_npc_path
+from npcsh.search import search_web, rag_search
+from npcsh.image import capture_screenshot, analyze_image_base
 
 
 def create_or_replace_table(db_path: str, table_name: str, data: pd.DataFrame):
@@ -501,6 +501,18 @@ class SilentUndefined(Undefined):
         return ""
 
 
+class Context:
+    def __init__(self, context=None, mcp_servers=None, databases=None, files=None):
+        self.context = context
+        self.mcp_servers = mcp_servers
+        self.databases = databases
+        self.files = files
+
+    def load_context_file(self, path):
+        with open(path, "r") as f:
+            self.context = yaml.safe_load(f)
+
+
 class Tool:
     def __init__(self, tool_data: dict):
         if not tool_data or not isinstance(tool_data, dict):
@@ -567,10 +579,14 @@ class Tool:
             if i == len(self.steps) - 1 and stream:  # this was causing the big issue X:
                 print("tool successful, passing output to stream")
                 return context
-        # Return the final output
+        print("CONTEXT AFTER TOOL CALLS, ", context)
         if context.get("output") is not None:
+            print("output from tool: ", context.get("output"))
+            if not isinstance(context.get("output"), str):
+                return str(context.get("output"))
             return context.get("output")
         elif context.get("llm_response") is not None:
+            print("output from tool: ", context.get("llm_response"))
             return context.get("llm_response")
 
     def execute_step(
@@ -601,6 +617,8 @@ class Tool:
         except:
             print("error rendering engine")
             rendered_engine = engine
+        print(f"proceeding with engine: {rendered_engine}")
+        print("rendered code: ", rendered_code)
         if rendered_engine == "natural":
             if len(rendered_code.strip()) > 0:
                 # print(f"Executing natural language step: {rendered_code}")
@@ -645,25 +663,27 @@ class Tool:
             }
             new_locals = {}
             exec_env = context.copy()
-            try:
-                exec(rendered_code, exec_globals, new_locals)
-                exec_env.update(new_locals)
-
-                context.update(exec_env)
-
-                exec_env.update(new_locals)
-                context.update(exec_env)
-
-                # Add this line to explicitly copy the output
-                if "output" in new_locals:
-                    context["output"] = new_locals["output"]
-
-                # Then your existing code
-                if "output" in exec_env:
-                    if exec_env["output"] is not None:
-                        context["results"] = exec_env["output"]
-                        print("result from code execution: ", exec_env["output"])
+            # try:
+            exec(rendered_code, exec_globals, new_locals)
+            exec_env.update(new_locals)
+
+            context.update(exec_env)
+
+            exec_env.update(new_locals)
+            context.update(exec_env)
+            # Add this line to explicitly copy the output
+            if "output" in new_locals:
+                context["output"] = new_locals["output"]
+
+            # Then your existing code
+            if "output" in exec_env:
+                if exec_env["output"] is not None:
+                    context["results"] = exec_env["output"]
+                    print("result from code execution: ", exec_env["output"])
+            # else:
+            #    context["output"] = str(exec_env)
 
+            """
             except NameError as e:
                 tb_lines = traceback.format_exc().splitlines()
                 limited_tb = (
@@ -706,6 +726,7 @@ class Tool:
                 return {
                     "output": f"Error executing Python code : {e} with traceback: {limited_tb}"
                 }
+            """
         return context
 
     def to_dict(self):

npcsh/npc_sysenv.py

@@ -374,6 +374,11 @@ NPCSH_IMAGE_GEN_MODEL = os.environ.get(
     "NPCSH_IMAGE_GEN_MODEL", "runwayml/stable-diffusion-v1-5"
 )
 NPCSH_IMAGE_GEN_PROVIDER = os.environ.get("NPCSH_IMAGE_GEN_PROVIDER", "diffusers")
+NPCSH_VIDEO_GEN_MODEL = os.environ.get(
+    "NPCSH_VIDEO_GEN_MODEL", "damo-vilab/text-to-video-ms-1.7b"
+)
+NPCSH_VIDEO_GEN_PROVIDER = os.environ.get("NPCSH_VIDEO_GEN_PROVIDER", "diffusers")
+
 NPCSH_EMBEDDING_MODEL = os.environ.get("NPCSH_EMBEDDING_MODEL", "nomic-embed-text")
 NPCSH_EMBEDDING_PROVIDER = os.environ.get("NPCSH_EMBEDDING_PROVIDER", "ollama")
 NPCSH_REASONING_MODEL = os.environ.get("NPCSH_REASONING_MODEL", "deepseek-r1")

npcsh/npc_team/npcsh.ctx

@@ -1,5 +1,11 @@
-text: |
+context: |
     The npcsh NPC team is devoted to providing a safe and helpful
     environment for users where they can work and be as successful as possible.
     npcsh is a command-line tool that makes it easy for users to harness
-    the power of LLMs from a command line shell.
+    the power of LLMs from a command line shell.
+databases:
+    - ~/npcsh_history.db
+mcp_servers:
+    - /path/to/mcp/server.py
+    - @npm for server
+

npcsh/npc_team/tools/generic_search.tool

@@ -2,13 +2,21 @@ tool_name: "internet_search"
 description: Searches the web for information based on a query in order to verify timiely details (e.g. current events) or to corroborate information in uncertain situations. Should be mainly only used when users specifically request a search, otherwise an LLMs basic knowledge should be sufficient.
 inputs:
   - query
+  - provider: ''
 steps:
   - engine: "python"
     code: |
       from npcsh.search import search_web
+      from npcsh.npc_sysenv import NPCSH_SEARCH_PROVIDER
       query = "{{ query }}"
+      provider = '{{ provider }}'
+      if provider.strip() != '':
+          results = search_web(query, num_results=5, provider = provider)
+      else:
+          results = search_web(query, num_results=5, provider = NPCSH_SEARCH_PROVIDER)
+
       print('QUERY in tool', query)
-      results = search_web(query, num_results=5)
+      results = search_web(query, num_results=5, provider = NPCSH_SEARCH_PROVIDER)
       print('RESULTS in tool', results)
   - engine: "natural"
     code: |

npcsh/plonk.py

@@ -6,8 +6,8 @@ try:
 except KeyError as e:
     print(f"Could not load pyautogui due to the following error: {e}")
 
-from .image import capture_screenshot
-from .llm_funcs import get_llm_response
+from npcsh.image import capture_screenshot
+from npcsh.llm_funcs import get_llm_response
 
 import subprocess
 import os