npcpy 1.3.7__py3-none-any.whl → 1.3.9__py3-none-any.whl

npcpy/gen/response.py

@@ -745,6 +745,23 @@ def get_litellm_response(
             auto_process_tool_calls=auto_process_tool_calls,
             **kwargs
         )
+    elif provider == 'lmstudio' or (model and '.lmstudio' in str(model)):
+        # LM Studio uses OpenAI-compatible API on port 1234
+        # Also detect models with .lmstudio in path (e.g., /home/user/.lmstudio/models/...)
+        api_url = api_url or "http://127.0.0.1:1234/v1"
+        provider = "openai"
+        api_key = api_key or "lm-studio"  # LM Studio doesn't require real API key
+        # Default timeout for local CPU inference (can be overridden via kwargs)
+        if 'timeout' not in kwargs:
+            kwargs['timeout'] = 300  # 5 minutes for CPU inference with large prompts
+    elif provider == 'llamacpp-server':
+        # llama.cpp server uses OpenAI-compatible API on port 8080
+        api_url = api_url or "http://127.0.0.1:8080/v1"
+        provider = "openai"
+        api_key = api_key or "llamacpp"  # llama.cpp server doesn't require real API key
+        # Default timeout for local CPU inference (can be overridden via kwargs)
+        if 'timeout' not in kwargs:
+            kwargs['timeout'] = 300  # 5 minutes for CPU inference with large prompts
 
     if attachments:
         for attachment in attachments:
@@ -875,7 +892,16 @@ def get_litellm_response(
     if provider is None:
         provider = os.environ.get("NPCSH_CHAT_PROVIDER")
 
-    api_params["model"] = f"{provider}/{model}" if "/" not in model else model
+    # For OpenAI-compatible endpoints with api_base, always prefix with provider
+    # LiteLLM needs this to know how to route the request
+    # Also handle file paths (starting with /) which contain slashes but still need prefix
+    if "api_base" in api_params and provider == "openai":
+        api_params["model"] = f"openai/{model}"
+    elif "/" not in model or model.startswith("/"):
+        # No provider prefix in model, or model is a file path - add provider prefix
+        api_params["model"] = f"{provider}/{model}"
+    else:
+        api_params["model"] = model
     if api_key is not None: 
         api_params["api_key"] = api_key
     if tools: 
@@ -888,7 +914,7 @@ def get_litellm_response(
             if key in [
                 "stop", "temperature", "top_p", "max_tokens", "max_completion_tokens",
                  "extra_headers", "parallel_tool_calls",
-                "response_format", "user",
+                "response_format", "user", "timeout",
             ]:
                 api_params[key] = value
 

npcpy/llm_funcs.py

@@ -589,8 +589,20 @@ def check_llm_command(
     # If we have jinxs, use ReAct fallback (JSON prompting) instead of tool_calls
     if jinxs:
         return _react_fallback(
-            command, model, provider, api_url, api_key, npc, team,
-            full_messages, images, stream, context, jinxs, extra_globals, max_iterations
+            command, 
+            model, 
+            provider, 
+            api_url, 
+            api_key, 
+            npc, 
+            team,
+            full_messages, 
+            images, 
+            stream, 
+            context, 
+            jinxs, 
+            extra_globals, 
+            max_iterations
         )
 
     # No jinxs - just get a direct response
@@ -633,8 +645,20 @@ def check_llm_command(
 
 
 def _react_fallback(
-    command, model, provider, api_url, api_key, npc, team,
-    messages, images, stream, context, jinxs, extra_globals, max_iterations
+    command, 
+    model, 
+    provider, 
+    api_url, 
+    api_key, 
+    npc, 
+    team,
+    messages, 
+    images, 
+    stream, 
+    context, 
+    jinxs, 
+    extra_globals, 
+    max_iterations
 ):
     """ReAct-style fallback for models without tool calling."""
     import logging
@@ -705,6 +729,12 @@ Instructions:
         print(f"[REACT-DEBUG] Full response keys: {response.keys()}")
         print(f"[REACT-DEBUG] Raw response['response']: {str(response.get('response', 'NONE'))[:500]}")
         print(f"[REACT-DEBUG] Raw decision type: {type(decision)}, value: {str(decision)[:500]}")
+
+        # Handle None response - model decided no action needed
+        if decision is None:
+            logger.debug(f"[_react_fallback] Decision is None, returning current output")
+            return {"messages": current_messages, "output": "", "usage": total_usage, "jinx_executions": jinx_executions}
+
         if isinstance(decision, str):
             try:
                 decision = json.loads(decision)
@@ -712,7 +742,7 @@ Instructions:
                 logger.debug(f"[_react_fallback] Could not parse JSON, returning as text")
                 return {"messages": current_messages, "output": decision, "usage": total_usage, "jinx_executions": jinx_executions}
 
-        logger.debug(f"[_react_fallback] Parsed decision action: {decision.get('action')}")
+        logger.debug(f"[_react_fallback] Parsed decision action: {decision.get('action') if decision else 'None'}")
         if decision.get("action") == "answer":
             output = decision.get("response", "")
 

npcpy/npc_compiler.py

@@ -185,13 +185,17 @@ def initialize_npc_project(
         directory = os.getcwd()
     directory = os.path.expanduser(os.fspath(directory))
 
+    # Create top-level directories for assets
+    for subdir in ["images", "models", "attachments", "mcp_servers"]:
+        os.makedirs(os.path.join(directory, subdir), exist_ok=True)
+
     npc_team_dir = os.path.join(directory, "npc_team")
     os.makedirs(npc_team_dir, exist_ok=True)
-    
-    for subdir in ["jinxs", 
-                   "assembly_lines", 
-                   "sql_models", 
-                   "jobs", 
+
+    for subdir in ["jinxs",
+                   "assembly_lines",
+                   "sql_models",
+                   "jobs",
                    "triggers",
                    "tools"]:
         os.makedirs(os.path.join(npc_team_dir, subdir), exist_ok=True)
@@ -2114,17 +2118,19 @@ Requirements:
                             context=None,
                             team=None,
                             stream=False,
-                            jinxs=None):
+                            jinxs=None, 
+                            use_jinxs=True):
         """Check if a command is for the LLM"""
         if context is None:
             context = self.shared_context
 
         if team:
             self._current_team = team
-
-        # Use provided jinxs or fall back to NPC's own jinxs
-        jinxs_to_use = jinxs if jinxs is not None else self.jinxs_dict
-
+        if jinxs is None and use_jinxs:
+            jinxs_to_use = self.jinxs_dict
+        elif jinxs is not None and use_jinxs:
+            jinxs_to_use = jinxs
+            
         return npy.llm_funcs.check_llm_command(
             command,
             model=self.model,

npcpy/npc_sysenv.py

@@ -266,6 +266,8 @@ def get_locally_available_models(project_directory, airplane_mode=False):
                             'gemini-2.0-pro', 
                             'gemini-1.5-pro', 
                             'gemini-1.5-flash'
+                            'gemini-3-flash-preview', 
+                            'gemini-3-pro-preview', 
                         ]
                         
                         for m in client.models.list():
@@ -332,6 +334,30 @@ def get_locally_available_models(project_directory, airplane_mode=False):
         except Exception as e:
             logging.info(f"Error scanning GGUF directory {scan_dir}: {e}")
 
+    # Check for LM Studio server (OpenAI-compatible API on port 1234)
+    try:
+        import requests
+        response = requests.get('http://127.0.0.1:1234/v1/models', timeout=1)
+        if response.ok:
+            data = response.json()
+            for model in data.get('data', []):
+                model_id = model.get('id', model.get('name', 'unknown'))
+                available_models[model_id] = "lmstudio"
+    except Exception as e:
+        logging.debug(f"LM Studio not available: {e}")
+
+    # Check for llama.cpp server (OpenAI-compatible API on port 8080)
+    try:
+        import requests
+        response = requests.get('http://127.0.0.1:8080/v1/models', timeout=1)
+        if response.ok:
+            data = response.json()
+            for model in data.get('data', []):
+                model_id = model.get('id', model.get('name', 'unknown'))
+                available_models[model_id] = "llamacpp-server"
+    except Exception as e:
+        logging.debug(f"llama.cpp server not available: {e}")
+
     return available_models
 
 
@@ -853,8 +879,7 @@ The current date and time are : {datetime.now().strftime("%Y-%m-%d %H:%M:%S")}
             db_path = npc.db_conn.url.database
         elif hasattr(npc.db_conn, "database"):
             db_path = npc.db_conn.database
-        system_message += """What follows is in
-        formation about the database connection. If you are asked to execute queries with tools, use this information. 
+        system_message += """What follows is information about the database connection. If you are asked to execute queries with tools, use this information. 
         If you are asked for help with debugging queries, use this information. 
         Do not unnecessarily reference that you possess this information unless it is
         specifically relevant to the request.

npcpy/serve.py

@@ -737,9 +737,10 @@ def get_global_settings():
             "embedding_provider": "ollama",
             "search_provider": "perplexity",
             "default_folder": os.path.expanduser("~/.npcsh/"),
-            "is_predictive_text_enabled": False, # Default value for the new setting
-            "predictive_text_model": "llama3.2", # Default predictive text model
-            "predictive_text_provider": "ollama", # Default predictive text provider
+            "is_predictive_text_enabled": False,
+            "predictive_text_model": "llama3.2",
+            "predictive_text_provider": "ollama",
+            "backend_python_path": "",  # Empty means use bundled backend
         }
         global_vars = {}
 
@@ -772,9 +773,10 @@ def get_global_settings():
                         "NPCSH_SEARCH_PROVIDER": "search_provider",
                         "NPCSH_STREAM_OUTPUT": "NPCSH_STREAM_OUTPUT",
                         "NPC_STUDIO_DEFAULT_FOLDER": "default_folder",
-                        "NPC_STUDIO_PREDICTIVE_TEXT_ENABLED": "is_predictive_text_enabled", # New mapping
-                        "NPC_STUDIO_PREDICTIVE_TEXT_MODEL": "predictive_text_model",         # New mapping
-                        "NPC_STUDIO_PREDICTIVE_TEXT_PROVIDER": "predictive_text_provider",   # New mapping
+                        "NPC_STUDIO_PREDICTIVE_TEXT_ENABLED": "is_predictive_text_enabled",
+                        "NPC_STUDIO_PREDICTIVE_TEXT_MODEL": "predictive_text_model",
+                        "NPC_STUDIO_PREDICTIVE_TEXT_PROVIDER": "predictive_text_provider",
+                        "BACKEND_PYTHON_PATH": "backend_python_path",  # Custom Python for backend
                     }
 
                     if key in key_mapping:
@@ -1067,9 +1069,10 @@ def save_global_settings():
             "search_provider": "NPCSH_SEARCH_PROVIDER",
             "NPCSH_STREAM_OUTPUT": "NPCSH_STREAM_OUTPUT",
             "default_folder": "NPC_STUDIO_DEFAULT_FOLDER",
-            "is_predictive_text_enabled": "NPC_STUDIO_PREDICTIVE_TEXT_ENABLED", # New mapping
-            "predictive_text_model": "NPC_STUDIO_PREDICTIVE_TEXT_MODEL",         # New mapping
-            "predictive_text_provider": "NPC_STUDIO_PREDICTIVE_TEXT_PROVIDER",   # New mapping
+            "is_predictive_text_enabled": "NPC_STUDIO_PREDICTIVE_TEXT_ENABLED",
+            "predictive_text_model": "NPC_STUDIO_PREDICTIVE_TEXT_MODEL",
+            "predictive_text_provider": "NPC_STUDIO_PREDICTIVE_TEXT_PROVIDER",
+            "backend_python_path": "BACKEND_PYTHON_PATH",  # Custom Python for backend (requires restart)
         }
 
         os.makedirs(os.path.dirname(npcshrc_path), exist_ok=True)
@@ -2349,6 +2352,43 @@ def init_project_team():
         print(f"Error initializing project team: {e}")
         return jsonify({"error": str(e)}), 500
 
+@app.route("/api/npcsh/check", methods=["GET"])
+def check_npcsh_folder():
+    """Check if ~/.npcsh folder exists and has a valid npc_team."""
+    try:
+        npcsh_path = os.path.expanduser("~/.npcsh")
+        npc_team_path = os.path.join(npcsh_path, "npc_team")
+
+        exists = os.path.exists(npcsh_path)
+        has_npc_team = os.path.exists(npc_team_path)
+        has_forenpc = os.path.exists(os.path.join(npc_team_path, "forenpc.npc")) if has_npc_team else False
+
+        return jsonify({
+            "exists": exists,
+            "has_npc_team": has_npc_team,
+            "has_forenpc": has_forenpc,
+            "path": npcsh_path,
+            "error": None
+        })
+    except Exception as e:
+        print(f"Error checking npcsh folder: {e}")
+        return jsonify({"error": str(e)}), 500
+
+@app.route("/api/npcsh/init", methods=["POST"])
+def init_npcsh_folder():
+    """Initialize the ~/.npcsh folder with a default npc_team."""
+    try:
+        npcsh_path = os.path.expanduser("~/.npcsh")
+        result = initialize_npc_project(directory=npcsh_path)
+        return jsonify({
+            "message": result,
+            "path": npcsh_path,
+            "error": None
+        })
+    except Exception as e:
+        print(f"Error initializing npcsh folder: {e}")
+        return jsonify({"error": str(e)}), 500
+
 @app.route("/api/context/websites", methods=["GET"])
 def get_context_websites():
     """Gets the websites list from a .ctx file."""
@@ -2537,13 +2577,15 @@ def get_attachment_response():
                                                                                                                                                                                                            
 IMAGE_MODELS = {
     "openai": [
+        {"value": "gpt-image-1.5", "display_name": "GPT-Image-1.5"},
+        {"value": "gpt-image-1", "display_name": "GPT-Image-1"},
         {"value": "dall-e-3", "display_name": "DALL-E 3"},
         {"value": "dall-e-2", "display_name": "DALL-E 2"},
-        {"value": "gpt-image-1", "display_name": "GPT-Image-1"},
     ],
     "gemini": [
+        {"value": "gemini-3-pro-image-preview", "display_name": "Gemini 3 Pro Image"},
         {"value": "gemini-2.5-flash-image-preview", "display_name": "Gemini 2.5 Flash Image"},
-        {"value": "imagen-3.0-generate-002", "display_name": "Imagen 3.0 Generate (Preview)"}, 
+        {"value": "imagen-3.0-generate-002", "display_name": "Imagen 3.0 Generate (Preview)"},
     ],
     "diffusers": [
         {"value": "runwayml/stable-diffusion-v1-5", "display_name": "Stable Diffusion v1.5"},
@@ -3551,7 +3593,15 @@ def stream():
     stream_response = {"output": "", "messages": messages}
 
     exe_mode = data.get('executionMode','chat')
-    
+
+    # Initialize api_url with default before checking npc_object
+    api_url = None
+    if npc_object is not None:
+        try:
+            api_url = npc_object.api_url if npc_object.api_url else None
+        except AttributeError:
+            api_url = None
+
     if exe_mode == 'chat':
         stream_response = get_llm_response(
             commandstr, 
@@ -3560,7 +3610,7 @@ def stream():
             model=model,
             provider=provider, 
             npc=npc_object, 
-            api_url = npc_object.api_url if npc_object.api_url else None,
+            api_url = api_url,
             team=team_object,
             stream=True, 
             attachments=attachment_paths_for_llm,
@@ -4935,22 +4985,37 @@ def get_local_model_status():
             import requests
             response = requests.get('http://127.0.0.1:1234/v1/models', timeout=2)
             if response.ok:
-                return jsonify({'status': 'running'})
+                return jsonify({'status': 'running', 'running': True})
         except:
             pass
-        return jsonify({'status': 'not_running'})
+        return jsonify({'status': 'not_running', 'running': False})
 
     elif provider == 'llamacpp':
         try:
             import requests
             response = requests.get('http://127.0.0.1:8080/v1/models', timeout=2)
             if response.ok:
-                return jsonify({'status': 'running'})
+                return jsonify({'status': 'running', 'running': True})
         except:
             pass
-        return jsonify({'status': 'not_running'})
+        return jsonify({'status': 'not_running', 'running': False})
+
+    return jsonify({'status': 'unknown', 'running': False, 'error': f'Unknown provider: {provider}'})
 
-    return jsonify({'status': 'unknown', 'error': f'Unknown provider: {provider}'})
+
+# ============== Activity Tracking ==============
+@app.route('/api/activity/track', methods=['POST'])
+def track_activity():
+    """Track user activity for predictive features."""
+    try:
+        data = request.json or {}
+        # For now, just acknowledge the activity - can be expanded later
+        # to store in database for RNN-based predictions
+        activity_type = data.get('type', 'unknown')
+        return jsonify({'success': True, 'tracked': activity_type})
+    except Exception as e:
+        print(f"Error tracking activity: {e}")
+        return jsonify({'success': False, 'error': str(e)}), 500
 
 
 def start_flask_server(

{npcpy-1.3.7.dist-info → npcpy-1.3.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcpy
-Version: 1.3.7
+Version: 1.3.9
 Summary: npcpy is the premier open-source library for integrating LLMs and Agents into python systems.
 Home-page: https://github.com/NPC-Worldwide/npcpy
 Author: Christopher Agostino

{npcpy-1.3.7.dist-info → npcpy-1.3.9.dist-info}/RECORD

@@ -1,13 +1,13 @@
 npcpy/__init__.py,sha256=uJcJGjR1mWvE69GySNAufkgiRwJA28zdObDBWaxp0tY,505
 npcpy/build_funcs.py,sha256=vOz6pjV0zS-kYKo0ux-pn9AcppVaR8KIDi2ldOxb3RQ,7479
-npcpy/llm_funcs.py,sha256=1ZEIOrNhkMKdoufYwjA9Ej24pYKAEa85xgE3UkuYkok,75493
+npcpy/llm_funcs.py,sha256=YtKwLnJLfhr6U3EEp-js41bQbbni-0HVH_zcqANoOVU,76040
 npcpy/main.py,sha256=RWoRIj6VQLxKdOKvdVyaq2kwG35oRpeXPvp1CAAoG-w,81
 npcpy/ml_funcs.py,sha256=UI7k7JR4XOH_VXR-xxLaO4r9Kyx_jBaEnp3TUIY7ZLQ,22657
 npcpy/npc_array.py,sha256=fVTxcMiXV-lvltmuwaRnTU9D3ikPq3-7k5wzp7MA5OY,40224
-npcpy/npc_compiler.py,sha256=trMvZHZjGDHo0TvjxZc8QJZXit78-rPDpxU0wsxtocw,118139
-npcpy/npc_sysenv.py,sha256=QOwnxiMmJloYxYbVtu5QjWnaukNgXppsC0kiLXT2uCc,37806
+npcpy/npc_compiler.py,sha256=9U6_F7qweURaL2nQgrF7I9OQEmYjOENmkBV-YChr3oM,118402
+npcpy/npc_sysenv.py,sha256=VH7le3xwxHvO55ZYCG1e-gj8X5YTSIqbIiU6ifSqhss,38917
 npcpy/npcs.py,sha256=eExuVsbTfrRobTRRptRpDm46jCLWUgbvy4_U7IUQo-c,744
-npcpy/serve.py,sha256=mSLVLZSDy-269gKI1CbwM4-QCqxnlmBQrt82xk0QOWI,201503
+npcpy/serve.py,sha256=rl1SFx5F2W3ejJTwz3BfvMj8acEoPKCpHZzacjs-aGw,203964
 npcpy/tools.py,sha256=A5_oVmZkzGnI3BI-NmneuxeXQq-r29PbpAZP4nV4jrc,5303
 npcpy/data/__init__.py,sha256=1tcoChR-Hjn905JDLqaW9ElRmcISCTJdE7BGXPlym2Q,642
 npcpy/data/audio.py,sha256=3qryGXnWHa4JFMonjuX-lf0fCrF8jmbHe7mHAuOdua0,12397
@@ -30,7 +30,7 @@ npcpy/gen/audio_gen.py,sha256=w4toESu7nmli1T5FOwRRCGC_QK9W-SMWknYYkbRv9jE,635
 npcpy/gen/embeddings.py,sha256=QStTJ2ELiC379OEZsLEgGGIIFD267Y8zQchs7HRn2Zg,2089
 npcpy/gen/image_gen.py,sha256=SOZYpvlxSiAdDK9j750OEBKjm22OUNdXg1kQ10sJSy0,21853
 npcpy/gen/ocr.py,sha256=rgmXWHrCYX1Po-qG_LrNFbVYEZ8aaupxFTgparcoB_Y,6554
-npcpy/gen/response.py,sha256=g39md6cbBTu1f30pGWxtgIXYaBUv4875kFH7-Gj7-qg,46923
+npcpy/gen/response.py,sha256=Pw01M0UxjsXOPJlvShAbq9n6IVnvEqxT6MQaLyEwJFs,48505
 npcpy/gen/video_gen.py,sha256=RFi3Zcq_Hn3HIcfoF3mijQ6G7RYFZaM_9pjPTh-8E64,3239
 npcpy/gen/world_gen.py,sha256=_8ytE7E3QVQ5qiX8DmOby-xd0d9zV20rRI6Wkpf-qcY,18922
 npcpy/memory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -53,8 +53,8 @@ npcpy/work/browser.py,sha256=p2PeaoZdAXipFuAgKCCB3aXXLE_p3yIRqC87KlZKZWc,679
 npcpy/work/desktop.py,sha256=F3I8mUtJp6LAkXodsh8hGZIncoads6c_2Utty-0EdDA,2986
 npcpy/work/plan.py,sha256=QyUwg8vElWiHuoS-xK4jXTxxHvkMD3VkaCEsCmrEPQk,8300
 npcpy/work/trigger.py,sha256=P1Y8u1wQRsS2WACims_2IdkBEar-iBQix-2TDWoW0OM,9948
-npcpy-1.3.7.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
-npcpy-1.3.7.dist-info/METADATA,sha256=6Va5OUEV4r5QfZ2B41TIwMO0S2ybymwrexoFFtoXwMo,37884
-npcpy-1.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcpy-1.3.7.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
-npcpy-1.3.7.dist-info/RECORD,,
+npcpy-1.3.9.dist-info/licenses/LICENSE,sha256=j0YPvce7Ng9e32zYOu0EmXjXeJ0Nwawd0RA3uSGGH4E,1070
+npcpy-1.3.9.dist-info/METADATA,sha256=aQk_TjR_0MsXFWx5UU-ZN_Ze3s2PPd9m6EPL678WMps,37884
+npcpy-1.3.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+npcpy-1.3.9.dist-info/top_level.txt,sha256=g1pbSvrOOncB74Bg5-J0Olg4V0A5VzDw-Xz5YObq8BU,6
+npcpy-1.3.9.dist-info/RECORD,,