npcsh 1.0.9__py3-none-any.whl → 1.0.11__py3-none-any.whl

npcsh/alicanto.py

@@ -14,11 +14,11 @@ import subprocess
 import networkx as nx
 
 from npcpy.npc_compiler import NPC
-from npcpy.llm_funcs import get_llm_response
+from npcpy.llm_funcs import get_llm_response, extract_facts, identify_groups, assign_groups_to_fact
 from npcsh._state import NPCSH_CHAT_MODEL, NPCSH_CHAT_PROVIDER
 from npcpy.npc_sysenv import print_and_process_stream_with_markdown
-from npcpy.memory.deep_research import consolidate_research
-from npcpy.memory.knowledge_graph import extract_facts, identify_groups, assign_groups_to_fact
+
+
 
 def generate_random_npcs(num_npcs: int, model: str, provider: str, request: str) -> List[NPC]:
     """

npcsh/npcsh.py

@@ -54,8 +54,6 @@ from npcpy.memory.command_history import (
     CommandHistory,
     save_conversation_message,
 )
-from npcpy.memory.knowledge_graph import breathe
-from npcpy.memory.sleep import sleep, forget
 from npcpy.npc_compiler import NPC, Team, load_jinxs_from_directory
 from npcpy.llm_funcs import check_llm_command, get_llm_response, execute_llm_command
 from npcpy.gen.embeddings import get_embeddings
@@ -563,6 +561,15 @@ def execute_slash_command(command: str, stdin_input: Optional[str], state: Shell
     """Executes slash commands using the router or checking NPC/Team jinxs."""
     command_parts = command.split()
     command_name = command_parts[0].lstrip('/')
+
+    if command_name in ['n', 'npc']:
+        npc_to_switch_to = command_parts[1] if len(command_parts) > 1 else None
+        if npc_to_switch_to and state.team and npc_to_switch_to in state.team.npcs:
+            state.npc = state.team.npcs[npc_to_switch_to]
+            return state, f"Switched to NPC: {npc_to_switch_to}"
+        else:
+            available_npcs = list(state.team.npcs.keys()) if state.team else []
+            return state, colored(f"NPC '{npc_to_switch_to}' not found. Available NPCs: {', '.join(available_npcs)}", "red")
     handler = router.get_route(command_name)
     #print(handler)
     if handler:
@@ -585,10 +592,8 @@ def execute_slash_command(command: str, stdin_input: Optional[str], state: Shell
             result_dict = handler(command, **handler_kwargs)
 
             if isinstance(result_dict, dict):
-                #some respond with output, some with response, needs to be fixed upstream
-                output = result_dict.get("output") or result_dict.get("response")
                 state.messages = result_dict.get("messages", state.messages)
-                return state, output
+                return state, result_dict
             else:
                 return state, result_dict
 
@@ -702,7 +707,7 @@ def process_pipeline_command(
             images=state.attachments,
             stream=stream_final,
             context=info,
-            shell=True,
+
         )
         if isinstance(llm_result, dict):
             state.messages = llm_result.get("messages", state.messages)
@@ -859,8 +864,6 @@ def execute_command(
                     try:
                         bash_state, bash_output = handle_bash_command(cmd_parts, command, None, state)
                         return bash_state, bash_output
-                    except CommandNotFoundError:
-                        return state, colored(f"Command not found: {command_name}", "red")
                     except Exception as bash_err:
                         return state, colored(f"Bash execution failed: {bash_err}", "red")
             except Exception:
@@ -1137,12 +1140,13 @@ def execute_todo_item(todo: Dict[str, Any], ride_state: RideState, shell_state:
         team=shell_state.team,
         messages=[],
         stream=shell_state.stream_output,
-        shell=True,
+
     )
     
     output_payload = result.get("output", "")
     output_str = ""
 
+
     if isgenerator(output_payload):
         output_str = print_and_process_stream_with_markdown(output_payload, shell_state.chat_model, shell_state.chat_provider)
     elif isinstance(output_payload, dict):
@@ -1252,7 +1256,7 @@ def print_welcome_message():
     print(
             """
 Welcome to \033[1;94mnpc\033[0m\033[1;38;5;202msh\033[0m!
-\033[1;94m                    \033[0m\033[1;38;5;202m                \\\\
+\033[1;94m                    \033[0m\033[1;38;5;202m        _       \\\\
 \033[1;94m _ __   _ __    ___ \033[0m\033[1;38;5;202m  ___  | |___    \\\\
 \033[1;94m| '_ \\ | '  \\  / __|\033[0m\033[1;38;5;202m / __/ | |_ _|    \\\\
 \033[1;94m| | | || |_) |( |__ \033[0m\033[1;38;5;202m \\_  \\ | | | |    //
@@ -1397,35 +1401,32 @@ def process_result(
     final_output_str = None
     if user_input =='/help':
         render_markdown(output)
+        
     elif result_state.stream_output:
-
-        try:
-            final_output_str = print_and_process_stream_with_markdown(output, result_state.chat_model, result_state.chat_provider)
-        except AttributeError as e:
-            if isinstance(output, str):
-                if len(output) > 0:
-                    final_output_str = output
-                    render_markdown(final_output_str) 
-        except TypeError as e:
-
-            if isinstance(output, str):
-                if len(output) > 0:
-                    final_output_str = output
-                    render_markdown(final_output_str)
-            elif isinstance(output, dict):
-                if 'output' in output:
-                    final_output_str = output['output']
-                    render_markdown(final_output_str)
+        
+        if isinstance(output, dict):
+            output_gen = output.get('output')
+            model = output.get('model', result_state.chat_model)
+            provider = output.get('provider', result_state.chat_provider)
+        else:
+            output_gen = output
+            model = result_state.chat_model
+            provider = result_state.chat_provider
+        print('processing stream output with markdown...')
+
+        final_output_str = print_and_process_stream_with_markdown(output_gen, 
+                                                                    model, 
+                                                                    provider)
                         
     elif output is not None:
         final_output_str = str(output)
-        render_markdown(final_output_str)
+        render_markdown( final_output_str)
     if final_output_str and result_state.messages and result_state.messages[-1].get("role") != "assistant":
         result_state.messages.append({"role": "assistant", "content": final_output_str})
 
     #print(result_state.messages)
 
-    print() # Add spacing after output
+
 
     if final_output_str:
         save_conversation_message(
@@ -1443,8 +1444,13 @@ def process_result(
 def run_repl(command_history: CommandHistory, initial_state: ShellState):
     state = initial_state
     print_welcome_message()
-    print(f'Using {state.current_mode} mode. Use /agent, /cmd, /chat, or /ride to switch to other modes')
-    print(f'To switch to a different NPC, type /<npc_name>')
+
+
+    render_markdown(f'- Using {state.current_mode} mode. Use /agent, /cmd, /chat, or /ride to switch to other modes')
+    render_markdown(f'- To switch to a different NPC, type /npc <npc_name> or /n <npc_name> to switch to that NPC.')
+    render_markdown('\n- Here are the current NPCs available in your team: ' + ', '.join([npc_name for npc_name in state.team.npcs.keys()]))
+
+
     is_windows = platform.system().lower().startswith("win")
     try:
         completer = make_completer(state)

npcsh/routes.py

@@ -24,6 +24,7 @@ from npcpy.llm_funcs import (
     get_llm_response,
     gen_image,
     gen_video,
+    breathe,
 )
 from npcpy.npc_compiler import NPC, Team, Jinx
 from npcpy.npc_compiler import initialize_npc_project
@@ -38,8 +39,8 @@ from npcpy.memory.search import execute_rag_command, execute_search_command, exe
 from npcpy.memory.command_history import CommandHistory
 
 
-from npcpy.memory.knowledge_graph import breathe
-from npcpy.memory.sleep import sleep, forget
+
+
 from npcpy.serve import start_flask_server
 
 
@@ -257,27 +258,7 @@ def init_handler(command: str, **kwargs):
         traceback.print_exc()
         output = f"Error initializing project: {e}"
     return {"output": output, "messages": messages}
-# Add these route handlers after the existing imports (around line 50):
-@router.route("n")
-@router.route("npc")
-def switch_npc_handler(command: str, **kwargs) -> dict:
-    """Switch to a different NPC"""
-    team = kwargs.get('team')
-    parts = command.split()
-    
-    if len(parts) < 2:
-        if team:
-            available_npcs = list(team.npcs.keys())
-            return {"output": f"Available NPCs: {', '.join(available_npcs)}"}
-        return {"output": "No team loaded or no NPC specified"}
-    
-    npc_name = parts[1]
-    if team and npc_name in team.npcs:
-        # We can't directly modify the state here, so return a special signal
-        return {"output": f"SWITCH_NPC:{npc_name}"}
-    else:
-        available_npcs = list(team.npcs.keys()) if team else []
-        return {"output": f"NPC '{npc_name}' not found. Available: {', '.join(available_npcs)}"}
+
 
 
 
@@ -288,8 +269,10 @@ def ots_handler(command: str, **kwargs):
     npc = safe_get(kwargs, 'npc')
     vision_model = safe_get(kwargs, 'model', NPCSH_VISION_MODEL)
     vision_provider = safe_get(kwargs, 'provider', NPCSH_VISION_PROVIDER)
-    if vision_model == NPCSH_CHAT_MODEL: vision_model = NPCSH_VISION_MODEL
-    if vision_provider == NPCSH_CHAT_PROVIDER: vision_provider = NPCSH_VISION_PROVIDER
+    if vision_model == NPCSH_CHAT_MODEL: 
+        vision_model = NPCSH_VISION_MODEL
+    if vision_provider == NPCSH_CHAT_PROVIDER: 
+        vision_provider = NPCSH_VISION_PROVIDER
 
     messages = safe_get(kwargs, 'messages', [])
     stream = safe_get(kwargs, 'stream', NPCSH_STREAM_OUTPUT)
@@ -336,7 +319,7 @@ def ots_handler(command: str, **kwargs):
             api_url=safe_get(kwargs, 'api_url'),
             api_key=safe_get(kwargs, 'api_key')
         )
-        return {"output": response_data.get('response'), "messages": response_data.get('messages')}
+        return {"output": response_data.get('response'), "messages": response_data.get('messages'), "model": vision_model, "provider": vision_provider}
 
     except Exception as e:
         traceback.print_exc()

{npcsh-1.0.9.dist-info → npcsh-1.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.0.9
+Version: 1.0.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.0.9.dist-info → npcsh-1.0.11.dist-info}/RECORD

@@ -1,21 +1,21 @@
 npcsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 npcsh/_state.py,sha256=GCMUIwgIBlS7LEBLYlfBiPNKVaK19ZyxT833NFU-djU,31109
-npcsh/alicanto.py,sha256=zJF5YwSNvtbK2EUKXzG45WOCMsSFu5cek5jCR7FgiuE,44709
+npcsh/alicanto.py,sha256=F-zZGjBTo3a_PQHvPC8-DNF6t4mJELo_zx7gBGvDehg,44611
 npcsh/guac.py,sha256=Ocmk_c4NUtGsC3JOtmkbgLvD6u-XtBPRFRYcckpgUJU,33099
 npcsh/mcp_helpers.py,sha256=Ktd2yXuBnLL2P7OMalgGLj84PXJSzaucjqmJVvWx6HA,12723
 npcsh/mcp_npcsh.py,sha256=SfmplH62GS9iI6q4vuQLVUS6tkrok6L7JxODx_iH7ps,36158
 npcsh/mcp_server.py,sha256=l2Ra0lpFrUu334pvp0Q9ajF2n73KvZswFi0FgbDhh9k,5884
 npcsh/npc.py,sha256=7ujKrMQFgkeGJ4sX5Kn_dB5tjrPN58xeC91PNt453aM,7827
-npcsh/npcsh.py,sha256=Fn6-5Ma4qYx6nDERhBbu1CgEyRM80giYKb1Gh6XALss,59793
+npcsh/npcsh.py,sha256=_vpphATMKlM2FtUZR3RrwKoRh-eg9QiAp7axIIDAITg,59986
 npcsh/plonk.py,sha256=U2e9yUJZN95Girzzvgrh-40zOdl5zO3AHPsIjoyLv2M,15261
 npcsh/pti.py,sha256=jGHGE5SeIcDkV8WlOEHCKQCnYAL4IPS-kUBHrUz0oDA,10019
-npcsh/routes.py,sha256=hYdq0gTaSNlKOa-X2w8AjnuBhku_yGIgCG2QyffdFX8,37795
+npcsh/routes.py,sha256=5u23bFTbdXXJ3V7I8BJMq42wWUZFeMbzItwBf8WHlpY,36917
 npcsh/spool.py,sha256=GhnSFX9uAtrB4m_ijuyA5tufH12DrWdABw0z8FmiCHc,11497
 npcsh/wander.py,sha256=BiN6eYyFnEsFzo8MFLRkdZ8xS9sTKkQpjiCcy9chMcc,23225
 npcsh/yap.py,sha256=h5KNt9sNOrDPhGe_zfn_yFIeQhizX09zocjcPWH7m3k,20905
-npcsh-1.0.9.dist-info/licenses/LICENSE,sha256=IKBvAECHP-aCiJtE4cHGCE5Yl0tozYz02PomGeWS3y4,1070
-npcsh-1.0.9.dist-info/METADATA,sha256=51qElvL9UUOvqSDreAdYK3OjTjMPqgR_Tm1FqIHsov8,22747
-npcsh-1.0.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcsh-1.0.9.dist-info/entry_points.txt,sha256=qxOYTm3ym3JWyWf2nv2Mk71uMcJIdUoNEJ8VYMkyHiY,214
-npcsh-1.0.9.dist-info/top_level.txt,sha256=kHSNgKMCkfjV95-DH0YSp1LLBi0HXdF3w57j7MQON3E,6
-npcsh-1.0.9.dist-info/RECORD,,
+npcsh-1.0.11.dist-info/licenses/LICENSE,sha256=IKBvAECHP-aCiJtE4cHGCE5Yl0tozYz02PomGeWS3y4,1070
+npcsh-1.0.11.dist-info/METADATA,sha256=kv7abgprmCXu31NjmmaYZhfLz_x1zIVlzUZAIb1RliI,22748
+npcsh-1.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+npcsh-1.0.11.dist-info/entry_points.txt,sha256=qxOYTm3ym3JWyWf2nv2Mk71uMcJIdUoNEJ8VYMkyHiY,214
+npcsh-1.0.11.dist-info/top_level.txt,sha256=kHSNgKMCkfjV95-DH0YSp1LLBi0HXdF3w57j7MQON3E,6
+npcsh-1.0.11.dist-info/RECORD,,