npcsh 0.3.31__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):
@@ -579,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(
@@ -613,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}")
@@ -657,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 = (
@@ -718,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/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