npcsh 1.1.3__py3-none-any.whl → 1.1.5__py3-none-any.whl

npcsh/npc_team/jinxs/utils/vixynt.jinx

@@ -0,0 +1,129 @@
+jinx_name: "vixynt"
+description: "Generates images from text descriptions or edits existing ones."
+inputs:
+  - prompt # Required, the text description for image generation or editing.
+  - output_file_base: "" # Optional string, e.g., './my_image', used as base for output file name.
+  - attachments: "" # Optional string, comma-separated image paths for editing existing images.
+  - n_images: 1 # Optional integer, number of images to generate.
+  - height: 1024 # Optional integer, height of the generated image.
+  - width: 1024 # Optional integer, width of the generated image.
+  - model: "" # Optional string, specific model to use for image generation. Defaults to NPC's model or 'runwayml/stable-diffusion-v1-5'.
+  - provider: "" # Optional string, specific provider for image generation. Defaults to NPC's provider or 'diffusers'.
+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 (Jinx execution environment passes them here)
+      image_prompt = context.get('prompt', '').strip()
+      output_file_base = context.get('output_file_base')
+      attachments_str = context.get('attachments')
+      n_images = int(context.get('n_images', 1)) # Ensure it's an integer
+      height = int(context.get('height', 1024)) # Ensure it's an integer
+      width = int(context.get('width', 1024)) # Ensure it's an integer
+      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 explicitly provided in jinx inputs
+      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 still not set
+      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'] = "Usage: /vixynt <prompt> [--output_file path] [--attachments path] [--n_images num]"
+          context['messages'] = output_messages
+          exit() # Exit the jinx execution early
+      
+      try:
+          # Generate image(s) or edit
+          images_list = 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
+          )
+          
+          saved_files = []
+          compressed_images = []
+          
+          if not isinstance(images_list, list):
+              images_list = [images_list] if images_list is not None else []
+
+          for i, image in enumerate(images_list):
+              if image is None:
+                  continue
+              
+              # Determine output filename
+              if output_file_base and output_file_base.strip():
+                  base_name, ext = os.path.splitext(os.path.expanduser(output_file_base))
+                  if not ext: # No extension provided, default to .png
+                      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)
+              
+              # Create compressed base64 image for HTML rendering
+              img_buffer = BytesIO()
+              img_copy = image.copy()
+              img_copy.thumbnail((800, 600), Image.Resampling.LANCZOS)
+              img_copy.save(img_buffer, format='PNG', optimize=True, quality=85)
+              img_buffer.seek(0)
+              
+              img_base64 = base64.b64encode(img_buffer.getvalue()).decode('utf-8')
+              compressed_images.append(f"data:image/png;base64,{img_base64}")
+          
+          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)}"
+              
+              html_images = ""
+              for img_b64 in compressed_images:
+                  html_images += f'<img src="{img_b64}" style="max-width: 400px; margin: 10px;" /><br/>'
+              
+              output += f"\n\nGenerated Images:\n{html_images}"
+          else:
+              output = "No images 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 # Store output in context
+      context['messages'] = output_messages # Ensure messages are returned
+      context['model'] = model
+      context['provider'] = provider

npcsh/npcsh.py

@@ -21,7 +21,6 @@ from npcpy.memory.knowledge_graph import (
     kg_evolve_incremental
 )
 
-from npcsh.routes import router
 try:
     import readline
 except:
@@ -46,10 +45,6 @@ from npcsh._state import (
 
 
 def print_welcome_message():
-    '''
-    function for printing npcsh graphic
-    '''
-
     print(
             """
 ___________________________________________          
@@ -75,8 +70,9 @@ Begin by asking a question, issuing a bash command, or typing '/help' for more i
         )
 
 
-def run_repl(command_history: CommandHistory, initial_state: ShellState):
+def run_repl(command_history: CommandHistory, initial_state: ShellState, router):
     state = initial_state
+        
     print_welcome_message()
 
     render_markdown(f'- Using {state.current_mode} mode. Use /agent, /cmd, or /chat to switch to other modes')
@@ -85,7 +81,7 @@ def run_repl(command_history: CommandHistory, initial_state: ShellState):
 
     is_windows = platform.system().lower().startswith("win")
     try:
-        completer = make_completer(state)
+        completer = make_completer(state, router)
         readline.set_completer(completer)
     except:
         pass
@@ -157,7 +153,7 @@ def run_repl(command_history: CommandHistory, initial_state: ShellState):
                 state.messages = [{"role": "system", "content": f"Session context: {compressed_state}"}]
 
             try:
-                completer = make_completer(state)
+                completer = make_completer(state, router)
                 readline.set_completer(completer)
             except:
                 pass
@@ -203,7 +199,7 @@ def run_repl(command_history: CommandHistory, initial_state: ShellState):
 
             state, output = execute_command(user_input, 
                                             state, 
-                                            review = True, 
+                                            review = False, 
                                             router=router, 
                                             command_history=command_history)
 
@@ -229,6 +225,8 @@ def run_repl(command_history: CommandHistory, initial_state: ShellState):
         
 
 def main() -> None:
+    from npcsh.routes import router
+    
     parser = argparse.ArgumentParser(description="npcsh - An NPC-powered shell.")
     parser.add_argument(
         "-v", "--version", action="version", version=f"npcsh version {VERSION}"
@@ -239,13 +237,17 @@ def main() -> None:
     args = parser.parse_args()
 
     command_history, team, default_npc = setup_shell()
+    
+    if team and hasattr(team, 'jinxs_dict'):
+        for jinx_name, jinx_obj in team.jinxs_dict.items():
+            router.register_jinx(jinx_obj)
 
     initial_state.npc = default_npc 
     initial_state.team = team    
     if args.command:
          state = initial_state
          state.current_path = os.getcwd()
-         final_state, output = execute_command(args.command, state)
+         final_state, output = execute_command(args.command, state, router=router, command_history=command_history)
          if final_state.stream_output:
               for chunk in output: 
                   print(str(chunk), end='')
@@ -253,7 +255,7 @@ def main() -> None:
          elif output is not None:
               print(output)
     else:
-        run_repl(command_history, initial_state)
-
+        run_repl(command_history, initial_state, router)
+        
 if __name__ == "__main__":
     main()