npcsh 1.1.10__tar.gz → 1.1.11__tar.gz

{npcsh-1.1.10 → npcsh-1.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.1.10
+Version: 1.1.11
 Summary: npcsh is a command-line toolkit for using AI agents in novel ways.
 Home-page: https://github.com/NPC-Worldwide/npcsh
 Author: Christopher Agostino

{npcsh-1.1.10 → npcsh-1.1.11}/npcsh/_state.py

@@ -2475,7 +2475,9 @@ def execute_command(
                     review=review,
                     router=router
                 )
-                
+                if isinstance(output, dict) and 'output' in output:
+                    output = output['output']
+
                 if is_last_command:
                     print(colored("✅ Pipeline complete", "green"))
                     return current_state, output
@@ -2821,7 +2823,6 @@ def process_memory_approvals(command_history, memory_queue):
                 approval['decision'], 
                 approval.get('final_memory')
             )
-
 def process_result(
     user_input: str,
     result_state: ShellState,
@@ -2854,10 +2855,17 @@ def process_result(
 
     final_output_str = None
     
+    # FIX: Handle dict output properly
     if isinstance(output, dict):
         output_content = output.get('output')
         model_for_stream = output.get('model', active_npc.model)
         provider_for_stream = output.get('provider', active_npc.provider)
+        
+        # If output_content is still a dict or None, convert to string
+        if isinstance(output_content, dict):
+            output_content = str(output_content)
+        elif output_content is None:
+            output_content = "Command completed with no output"
     else:
         output_content = output
         model_for_stream = active_npc.model
@@ -2870,15 +2878,21 @@ def process_result(
         else:
             render_markdown(str(output_content))
     elif result_state.stream_output:
-        final_output_str = print_and_process_stream_with_markdown(
-            output_content, 
-            model_for_stream, 
-            provider_for_stream, 
-            show=True
-        )
+        # FIX: Only stream if output_content is a generator, not a string
+        if isinstance(output_content, str):
+            final_output_str = output_content
+            render_markdown(final_output_str)
+        else:
+            final_output_str = print_and_process_stream_with_markdown(
+                output_content, 
+                model_for_stream, 
+                provider_for_stream, 
+                show=True
+            )
     elif output_content is not None:
         final_output_str = str(output_content)
         render_markdown(final_output_str)
+        
 
     if final_output_str:
         if result_state.messages:

npcsh-1.1.11/npcsh/npc_team/jinxs/code/sh.jinx

@@ -0,0 +1,38 @@
+jinx_name: sh
+description: Execute bash queries. Should be used to grep for file contents, list directories, explore information to answer user questions more practically.
+inputs:
+  - bash_command
+steps:
+  - name: execute_bash
+    engine: python
+    code: |
+      import subprocess
+      import sys # Import sys to explicitly write to stderr for visibility
+
+      # Force a simple print to see if anything comes out
+      print("--- Jinx 'sh' code started ---", file=sys.stderr) 
+
+      cmd = '{{ bash_command }}'
+      
+      # Initialize output to an empty string to ensure it always exists
+      output = "" 
+
+
+      process = subprocess.Popen(
+          cmd, 
+          shell=True, 
+          stdout=subprocess.PIPE, 
+          stderr=subprocess.PIPE
+      )
+      stdout, stderr = process.communicate()
+      
+      # Print raw stdout/stderr to sys.stderr for better visibility in some environments
+      print(f"Jinx 'sh' raw stdout: {stdout.decode('utf-8', errors='ignore')}", file=sys.stderr)
+      print(f"Jinx 'sh' raw stderr: {stderr.decode('utf-8', errors='ignore')}", file=sys.stderr)
+
+      if stderr:
+          output = f"Error: {stderr.decode('utf-8')}"
+      else:
+          output = stdout.decode('utf-8')
+
+

{npcsh-1.1.10 → npcsh-1.1.11}/npcsh/npc_team/jinxs/code/sql.jinx

@@ -1,4 +1,4 @@
-jinx_name: sql_executor
+jinx_name: sql
 description: Execute queries on the ~/npcsh_history.db to pull data. The database
   contains only information about conversations and other user-provided data. It does
   not store any information about individual files. Avoid using percent signs unless absolutely necessary.
@@ -13,4 +13,4 @@ steps:
         df = pd.read_sql_query(query, npc.db_conn)
       except Exception as e:
         df = pd.DataFrame({'Error': [str(e)]})
-      output = df.to_string()
+      output = df.to_string()

npcsh-1.1.11/npcsh/npc_team/jinxs/utils/agent.jinx

@@ -0,0 +1,17 @@
+jinx_name: agent
+description: Provides an LLM response with tool use enabled.
+inputs:
+  - query
+  - auto_process_tool_calls: True
+  - use_core_tools: True
+steps:
+  - name: get_agent_response
+    engine: python
+    code: |
+      response = npc.get_llm_response(
+          request=query,
+          messages=context.get('messages', []),
+          auto_process_tool_calls={{ auto_process_tool_calls | default(True) }},
+          use_core_tools={{ use_core_tools | default(True) }}
+      )
+      output = response.get('response', '')

npcsh-1.1.11/npcsh/npc_team/jinxs/utils/chat.jinx

@@ -0,0 +1,17 @@
+jinx_name: chat
+description: Provides a direct LLM response without tool use.
+inputs:
+  - query
+  - auto_process_tool_calls: False
+  - use_core_tools: False
+steps:
+  - name: get_chat_response
+    engine: python
+    code: |
+      response = npc.get_llm_response(
+          request=query,
+          messages=context.get('messages', []),
+          auto_process_tool_calls={{ auto_process_tool_calls | default(False) }},
+          use_core_tools={{ use_core_tools | default(False) }}
+      )
+      output = response.get('response', '')

npcsh-1.1.11/npcsh/npc_team/jinxs/utils/vixynt.jinx

@@ -0,0 +1,144 @@
+jinx_name: "vixynt"
+description: "Generates images from text descriptions or edits existing ones."
+inputs:
+  - prompt
+  - model: null
+  - provider: null
+  - output_name: null
+  - attachments: null
+  - n_images: null
+  - height: null
+  - width: null
+steps:
+  - name: "generate_or_edit_image"
+    engine: "python"
+    code: |
+      import os
+      import base64
+      from io import BytesIO
+      from datetime import datetime
+      from PIL import Image
+      from npcpy.llm_funcs import gen_image
+      
+      # Extract inputs from context with proper type conversion
+      image_prompt = str(context.get('prompt', '')).strip()
+      output_name = context.get('output_name')
+      attachments_str = context.get('attachments')
+      
+      # Handle integer inputs - they may come as strings or ints
+      try:
+          n_images = int(context.get('n_images', 1))
+      except (ValueError, TypeError):
+          n_images = 1
+      
+      try:
+          height = int(context.get('height', 1024))
+      except (ValueError, TypeError):
+          height = 1024
+      
+      try:
+          width = int(context.get('width', 1024))
+      except (ValueError, TypeError):
+          width = 1024
+      
+      # Get model and provider, prioritizing context, then NPC, then environment variables
+      model = context.get('model')
+      provider = context.get('provider')
+      
+      # Use NPC's model/provider as fallback
+      if not model and npc and hasattr(npc, 'model') and npc.model:
+          model = npc.model 
+      if not provider and npc and hasattr(npc, 'provider') and npc.provider:
+          provider = npc.provider
+      
+      # Fallback to environment variables
+      if not model:
+          model = os.getenv('NPCSH_IMAGE_GEN_MODEL')
+      if not provider:
+          provider = os.getenv('NPCSH_IMAGE_GEN_PROVIDER')
+
+      # Final hardcoded fallbacks if nothing else is set
+      if not model:
+          model = "runwayml/stable-diffusion-v1-5"
+      if not provider:
+          provider = "diffusers"
+      
+      # Parse attachments
+      input_images = []
+      if attachments_str and str(attachments_str).strip():
+          input_images = [p.strip() for p in str(attachments_str).split(',')]
+      
+      output_messages = context.get('messages', [])
+      
+      if not image_prompt:
+          output = "Error: No prompt provided for image generation."
+      else:
+          try:
+              # Generate image(s)
+              result = gen_image(
+                  prompt=image_prompt,
+                  model=model,
+                  provider=provider,
+                  npc=npc,
+                  height=height,
+                  width=width,
+                  n_images=n_images, 
+                  input_images=input_images if input_images else None
+              )
+              
+              # Ensure we have a list of images
+              if not isinstance(result, list):
+                  images_list = [result] if result is not None else []
+              else:
+                  images_list = result
+              
+              saved_files = []
+              html_image_tags = [] # This list will store the raw HTML <img> tags
+              
+              for i, image in enumerate(images_list):
+                  if image is None:
+                      continue
+                  
+                  # Determine output filename
+                  if output_name and str(output_name).strip():
+                      base_name, ext = os.path.splitext(os.path.expanduser(str(output_name)))
+                      if not ext:
+                          ext = ".png"
+                      current_output_file = f"{base_name}_{i}{ext}" if len(images_list) > 1 else f"{base_name}{ext}"
+                  else:
+                      os.makedirs(os.path.expanduser("~/.npcsh/images/"), exist_ok=True)
+                      current_output_file = (
+                          os.path.expanduser("~/.npcsh/images/")
+                          + f"image_{datetime.now().strftime('%Y%m%d_%H%M%S')}_{i}.png"
+                      )
+                  
+                  # Save image to file
+                  image.save(current_output_file)
+                  saved_files.append(current_output_file)
+
+                  # Convert image to base64 and create an HTML <img> tag
+                  with open(current_output_file, 'rb') as f:
+                      img_data = base64.b64encode(f.read()).decode()
+                      # Using raw HTML <img> tag with data URI
+                      html_image_tags.append(f'<img src="data:image/png;base64,{img_data}" alt="Generated Image {i+1}" style="max-width: 100%; display: block; margin-top: 10px;">')
+              
+              if saved_files:
+                  output_text_message = f"Image(s) generated and saved to: {', '.join(saved_files)}"
+                  if input_images:
+                      output_text_message = f"Image(s) edited and saved to: {', '.join(saved_files)}"
+                  
+                  output = output_text_message # Keep the text message clean
+                  output += f"\n\nThe image files have been saved and are ready to view."
+                  output += "\n\n" + "\n".join(html_image_tags) # Append all HTML <img> tags to the output
+              else:
+                  output = "No images were generated."
+                  
+          except Exception as e:
+              import traceback
+              traceback.print_exc()
+              output = f"Error {'editing' if input_images else 'generating'} image: {str(e)}"
+      
+      context['output'] = output
+      context['messages'] = output_messages
+      context['model'] = model
+      context['provider'] = provider

{npcsh-1.1.10 → npcsh-1.1.11}/npcsh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.1.10
+Version: 1.1.11
 Summary: npcsh is a command-line toolkit for using AI agents in novel ways.
 Home-page: https://github.com/NPC-Worldwide/npcsh
 Author: Christopher Agostino

{npcsh-1.1.10 → npcsh-1.1.11}/npcsh.egg-info/SOURCES.txt

@@ -56,6 +56,8 @@ npcsh/npc_team/jinxs/modes/spool.jinx
 npcsh/npc_team/jinxs/modes/wander.jinx
 npcsh/npc_team/jinxs/modes/yap.jinx
 npcsh/npc_team/jinxs/npc_studio/npc-studio.jinx
+npcsh/npc_team/jinxs/utils/agent.jinx
+npcsh/npc_team/jinxs/utils/chat.jinx
 npcsh/npc_team/jinxs/utils/compress.jinx
 npcsh/npc_team/jinxs/utils/edit_file.jinx
 npcsh/npc_team/jinxs/utils/load_file.jinx

{npcsh-1.1.10 → npcsh-1.1.11}/setup.py

@@ -78,7 +78,7 @@ extra_files = package_files("npcsh/npc_team/")
 
 setup(
     name="npcsh",
-    version="1.1.10",
+    version="1.1.11",
     packages=find_packages(exclude=["tests*"]),
     install_requires=base_requirements,  # Only install base requirements by default
     extras_require={

npcsh-1.1.10/npcsh/npc_team/jinxs/code/sh.jinx

@@ -1,19 +0,0 @@
-jinx_name: sh
-description: Execute bash queries. Should be used to grep for file contents, list directories, explore information to answer user questions more practically.
-inputs:
-- bash_command
-steps:
-  - engine: python
-    code: |
-      import subprocess
-      import os
-      cmd = '{{bash_command}}'
-      def run_command(cmd):
-        process = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        stdout, stderr = process.communicate()
-        if stderr:
-          print(f"Error: {stderr.decode('utf-8')}")
-          return stderr
-        return stdout
-      result = run_command(cmd)
-      output = result.decode('utf-8')

npcsh-1.1.10/npcsh/npc_team/jinxs/utils/vixynt.jinx

@@ -1,117 +0,0 @@
-jinx_name: "vixynt"
-description: "Generates images from text descriptions or edits existing ones."
-inputs:
-  - prompt
-  - model: ""
-  - provider: ""
-  - output_name: ""
-  - attachments: ""
-  - n_images: 1
-  - height: 1024
-  - width: 1024
-steps:
-  - name: "generate_or_edit_image"
-    engine: "python"
-    code: |
-      import os
-      import base64
-      from io import BytesIO
-      from datetime import datetime
-      from PIL import Image
-      from npcpy.llm_funcs import gen_image
-      
-      # Extract inputs from context
-      image_prompt = context.get('prompt', '').strip()
-      output_name = context.get('output_name')
-      attachments_str = context.get('attachments')
-      n_images = int(context.get('n_images', 1))
-      height = int(context.get('height', 1024))
-      width = int(context.get('width', 1024))
-      model = context.get('model')
-      provider = context.get('provider')
-
-      input_images = []
-      if attachments_str and attachments_str.strip():
-          input_images = [p.strip() for p in attachments_str.split(',')]
-
-      # Use NPC's model/provider as fallback
-      if not model and npc and npc.model:
-          model = npc.model 
-      if not provider and npc and npc.provider:
-          provider = npc.provider
-      
-      # Final fallbacks
-      if not model:
-          model = "runwayml/stable-diffusion-v1-5"
-      if not provider:
-          provider = "diffusers"
-      
-      output_messages = context.get('messages', [])
-      
-      if not image_prompt:
-          context['output'] = "Error: No prompt provided for image generation."
-          context['messages'] = output_messages
-          exit()
-      
-      try:
-          # Generate image(s)
-          result = gen_image(
-              prompt=image_prompt,
-              model=model,
-              provider=provider,
-              npc=npc,
-              height=height,
-              width=width,
-              n_images=n_images, 
-              input_images=input_images if input_images else None
-          )
-          
-          # Ensure we have a list of images
-          if not isinstance(result, list):
-              images_list = [result] if result is not None else []
-          else:
-              images_list = result
-          
-          saved_files = []
-          
-          for i, image in enumerate(images_list):
-              if image is None:
-                  continue
-              
-              # Determine output filename
-              if output_name and output_name.strip():
-                  base_name, ext = os.path.splitext(os.path.expanduser(output_name))
-                  if not ext:
-                      ext = ".png"
-                  current_output_file = f"{base_name}_{i}{ext}" if len(images_list) > 1 else f"{base_name}{ext}"
-              else:
-                  os.makedirs(os.path.expanduser("~/.npcsh/images/"), exist_ok=True)
-                  current_output_file = (
-                      os.path.expanduser("~/.npcsh/images/")
-                      + f"image_{datetime.now().strftime('%Y%m%d_%H%M%S')}_{i}.png"
-                  )
-              
-              # Save image to file
-              image.save(current_output_file)
-              saved_files.append(current_output_file)
-          
-          if saved_files:
-              if input_images:
-                  output = f"Image(s) edited and saved to: {', '.join(saved_files)}"
-              else:
-                  output = f"Image(s) generated and saved to: {', '.join(saved_files)}"
-              
-              # DO NOT include base64 data - just reference the file paths
-              output += f"\n\nThe image files have been saved and are ready to view."
-          else:
-              output = "No images were generated."
-              
-      except Exception as e:
-          import traceback
-          traceback.print_exc()
-          output = f"Error {'editing' if input_images else 'generating'} image: {str(e)}"
-      
-      context['output'] = output
-      context['messages'] = output_messages
-      context['model'] = model
-      context['provider'] = provider