fixed some npc serve --port bug. also fixed openaii dalle processing that had goteen removed when including gpt-image-1. added a test_bash_cli file with commands for testing various npc cli functionalities.

Author: cagostino

npcpy/gen/image_gen.py

@@ -51,6 +51,7 @@ def openai_image_gen(
     if attachments is not None:
         # Process the attachments into the format OpenAI expects
         processed_images = []
+    
         for attachment in attachments:
             if isinstance(attachment, str):
                 # Assume it's a file path
@@ -78,11 +79,18 @@ def openai_image_gen(
             n=n_images,
             size=f"{height}x{width}",
         )
-
-    image_base64 = result.data[0].b64_json
-    image_bytes = base64.b64decode(image_base64)
-    image = Image.open(io.BytesIO(image_bytes))
-    image.save('generated_image.png') 
+    if model =='gpt-image-1':
+        image_base64 = result.data[0].b64_json
+        image_bytes = base64.b64decode(image_base64)
+        image = Image.open(io.BytesIO(image_bytes))
+        image.save('generated_image.png') 
+    elif model == 'dall-e-2' or model == 'dall-e-3':
+        image_base64 = result.data[0].url
+        import requests
+        response = requests.get(image_base64)
+        image = Image.open(io.BytesIO(response.content))
+        image.save('generated_image.png')
+        
     return image
 
 

npcpy/modes/npc.py

@@ -76,27 +76,52 @@ def main():
 
     effective_model = args.model or NPCSH_CHAT_MODEL
     effective_provider = args.provider or NPCSH_CHAT_PROVIDER
+    #print(args)
+    #print("Debug - args dict:", vars(args))
+    #print("Debug - unknown_args:", unknown_args)
+    #print("Debug - command:", args.command)
+    #print("Debug - command_args:", args.command_args)
+
+    extras = {}
+
+    # After parsing arguments, add this code to handle the case where flags are split
+    if unknown_args and args.command_args:
+        i = 0
+        while i < len(unknown_args):
+            # Check if the unknown arg is a flag (--something)
+            if unknown_args[i].startswith('--'):
+                # Extract the parameter name without the -- prefix
+                param = unknown_args[i][2:]
+                
+                # Add it to extras with the corresponding value from command_args
+                if args.command_args:
+                    extras[param] = args.command_args[0]
+                    args.command_args.pop(0)  # Remove the used value
+                else:
+                    extras[param] = True
+            i += 1
 
     if args.command:
         handler = router.get_route(args.command)
         if not handler:
-            print(f"Error: Command '{args.command}' recognized but no handler found.", file=sys.stderr)
+            #print(f"Error: Command '{args.command}' recognized but no handler found.", file=sys.stderr)
             sys.exit(1)
 
         full_command_str = args.command
         command_args = []
-        extras = {}
 
         # Parse command args properly
-        print(args)
         if args.command_args:
             i = 0
             while i < len(args.command_args):
-                
                 arg = args.command_args[i]
                 if arg.startswith("--"):
                     param = arg[2:]  # Remove --
-                    if i + 1 < len(args.command_args) and not args.command_args[i+1].startswith("--"):
+                    if "=" in param:
+                        param_name, param_value = param.split("=", 1)
+                        extras[param_name] = param_value
+                        i += 1
+                    elif i + 1 < len(args.command_args) and not args.command_args[i+1].startswith("--"):
                         extras[param] = args.command_args[i+1]
                         i += 2
                     else:
@@ -110,7 +135,6 @@ def main():
             if prompt_parts:
                 full_command_str += " " + " ".join(prompt_parts)
 
-        print(full_command_str)
         handler_kwargs = {
             "model": effective_model,
             "provider": effective_provider,

npcpy/modes/serve.py

@@ -1512,8 +1512,8 @@ def start_flask_server(
             )
 
         # Run the Flask app on all interfaces
-        print("Starting Flask server on http://0.0.0.0:5337")
-        app.run(host="0.0.0.0", port=5337, debug=True)
+        print(f"Starting Flask server on http://0.0.0.0:{port}")
+        app.run(host="0.0.0.0", port=port, debug=True)
     except Exception as e:
         print(f"Error starting server: {str(e)}")
 

npcpy/routes.py

@@ -552,9 +552,11 @@ def search_handler(command: str, **kwargs):
 
 @router.route("serve", "Set configuration values")
 def serve_handler(command: str, **kwargs):
-
+    #print('calling serve handler')
+    #print(kwargs)
 
     port   = safe_get(kwargs, "port", 5337)
+    #print(port, type(port))
     messages = safe_get(kwargs, "messages", [])
     cors = safe_get(kwargs, "cors", None)
     if cors:
@@ -719,7 +721,6 @@ def vixynt_handler(command: str, **kwargs):
             prompt=user_prompt,
             model=model,
             provider=provider,
-            filename=filename,
             npc=npc,
             height=height,
             width=width,

tests/test_bash_cli.sh

@@ -0,0 +1,78 @@
+# Basic tests and help commands
+npc help
+npc --help
+
+# Test serve command with different port specification formats
+npc serve --port=5340
+npc serve --port 5341
+npc serve -port=5342
+npc serve -port 5343
+npc serve --cors="http://localhost:3000,http://localhost:8080"
+
+# Test search commands with different providers
+npc search "python asyncio tutorial"
+npc search -p google "python asyncio tutorial"
+npc search --provider perplexity "machine learning basics"
+
+# Test sample/LLM commands
+npc sample "Write a hello world program in Python"
+npc sample "Compare Python and JavaScript" --model gpt-4 --provider openai
+
+# Test file and image processing
+npc rag "litellm" -f ../setup.py
+npc rag --file /path/to/document.txt "What is this document about?"
+npc ots /path/to/screenshot.png "What's happening in this image?"
+npc vixynt "A beautiful sunset over mountains" filename=sunset.png height=512 width=768
+
+# Test with different NPC selection
+npc -n custom_npc "Tell me about yourself"
+npc --npc alternative_assistant "How can you help me?"
+
+# Test other route commands
+npc sleep 3
+npc jinxs
+npc init /tmp/new_npc_project
+npc wander "How to implement a cache system"
+npc plan "Create a new Python project with virtual environment"
+npc trigger "Update all npm packages in the current directory"
+
+# Testing command with multiple arguments and options
+npc serve --port 5338 --cors "http://localhost:3000"
+npc vixynt "A city made by pepsi" height=1024 width=1024 filename=pepsi_city.png
+npc rag -f /path/to/file1.txt -f /path/to/file2.txt "Compare these two documents"
+
+
+
+# Pipe file content to NPC sample command
+cat data.json | npc sample "Summarize this JSON data"
+
+# Pipe command output to NPC
+ls -la | npc sample "Explain what these files are"
+
+# Use grep to filter logs and have NPC analyze them
+grep ERROR /var/log/application.log | npc sample "What are the common error patterns?"
+
+# Use curl to get API response and analyze with NPC
+curl -s https://api.example.com/data | npc sample "Analyze this API response"
+
+# Create a multi-line prompt using heredoc
+cat << EOF | npc sample
+I need to understand how to structure a React application.
+What are the best practices for component organization?
+Should I use Redux or Context API for state management?
+EOF
+
+
+
+
+# Chain NPC commands using xargs
+npc search "machine learning algorithms" | xargs -I {} npc sample "Explain {} in detail"
+
+# Use output from one NPC command as input to another
+npc sample "Generate 5 test cases" | npc sample "Convert these test cases to JavaScript code"
+
+# Use NPC to generate code and then analyze it
+npc sample "Write a Python sorting algorithm" | npc sample "Review this code for efficiency"
+
+# Generate image description and then create image
+npc sample "Describe a futuristic cityscape" | xargs npc vixynt