npcsh 1.0.31__py3-none-any.whl → 1.0.33__py3-none-any.whl

npcsh/corca.py

@@ -7,6 +7,7 @@ from contextlib import AsyncExitStack
 from typing import Optional, Callable, Dict, Any, Tuple, List
 import shutil
 import traceback
+from litellm.exceptions import Timeout, ContextWindowExceededError, RateLimitError
 
 try:
     from mcp import ClientSession, StdioServerParameters
@@ -250,6 +251,7 @@ def process_mcp_stream(stream_response, active_npc):
 
 
 
+
 def execute_command_corca(command: str, state: ShellState, command_history, selected_mcp_tools_names: Optional[List[str]] = None) -> Tuple[ShellState, Any]:
     mcp_tools_for_llm = []
     
@@ -270,27 +272,63 @@ def execute_command_corca(command: str, state: ShellState, command_history, sele
 
     active_npc = state.npc if isinstance(state.npc, NPC) else NPC(name="default")
 
-    if len(state.messages) > 20:
-        compressed_state = active_npc.compress_planning_state({
-            "goal": "ongoing session", 
-            "facts": [], 
-            "successes": [], 
-            "mistakes": [],
-            "todos": [],
-            "constraints": []
-        })
-        state.messages = [{"role": "system", "content": f"Session context: {compressed_state}"}]
-
-    response_dict = get_llm_response(
-        prompt=command,
-        npc=state.npc,
-        messages=state.messages,
-        tools=mcp_tools_for_llm,
-        auto_process_tool_calls=False,
-        stream=state.stream_output,
-        team=state.team  
-    )
-   
+    if len(state.messages) > 50:
+        compressed_state = active_npc.compress_planning_state(state.messages)
+        state.messages = [{"role": "system", "content": compressed_state}]
+        print(compressed_state)
+        
+    try:
+        response_dict = get_llm_response(
+            prompt=command,
+            npc=state.npc,
+            messages=state.messages,
+            tools=mcp_tools_for_llm,
+            auto_process_tool_calls=False,
+            stream=state.stream_output,
+            team=state.team  
+        )
+    except Timeout:
+        response_dict = get_llm_response(
+            prompt=command,
+            npc=state.npc,
+            messages=state.messages,
+            tools=mcp_tools_for_llm,
+            auto_process_tool_calls=False,
+            stream=state.stream_output,
+            team=state.team  
+        )
+    except ContextWindowExceededError:
+        compressed_state = active_npc.compress_planning_state(state.messages)
+        state.messages = [{"role": "system", "content": compressed_state}]
+        
+        response_dict = get_llm_response(
+            prompt=command,
+            npc=state.npc,
+            messages=state.messages,
+            tools=mcp_tools_for_llm,
+            auto_process_tool_calls=False,
+            stream=state.stream_output,
+            team=state.team  
+        )
+    except RateLimitError:
+        import time
+        print('rate limit hit... waiting 60 seconds')
+        time.sleep(60)
+        print('compressing..... ')
+        compressed_state = active_npc.compress_planning_state(state.messages)
+        state.messages = [{"role": "system", "content": compressed_state}]
+        
+        response_dict = get_llm_response(
+            prompt=command,
+            npc=state.npc,
+            messages=state.messages,
+            tools=mcp_tools_for_llm,
+            auto_process_tool_calls=False,
+            stream=state.stream_output,
+            team=state.team  
+        )
+         
+
     stream_response = response_dict.get('response')
     messages = response_dict.get('messages', state.messages)
     
@@ -308,6 +346,8 @@ def execute_command_corca(command: str, state: ShellState, command_history, sele
         "tool_calls": tool_calls,
         "messages": state.messages
     }
+
+
 def _resolve_and_copy_mcp_server_path(
     explicit_path: Optional[str],
     current_path: Optional[str],
@@ -906,8 +946,12 @@ def _resolve_and_copy_mcp_server_path(
             
     cprint("No MCP server script found in any expected location.", "yellow")
     return None
-def create_corca_state_and_mcp_client(conversation_id, command_history, npc=None, team=None,
-                                     current_path=None, mcp_server_path_from_request: Optional[str] = None):
+def create_corca_state_and_mcp_client(conversation_id, 
+                                      command_history, 
+                                      npc=None, 
+                                      team=None,
+                                      current_path=None, 
+                                      mcp_server_path: Optional[str] = None):
     from npcsh._state import ShellState
     
     state = ShellState(
@@ -925,7 +969,7 @@ def create_corca_state_and_mcp_client(conversation_id, command_history, npc=None
     auto_copy_bypass = os.getenv("NPCSH_CORCA_AUTO_COPY_MCP_SERVER", "false").lower() == "true"
 
     resolved_server_path = _resolve_and_copy_mcp_server_path(
-        explicit_path=mcp_server_path_from_request,
+        explicit_path=mcp_server_path,
         current_path=current_path,
         team_ctx_mcp_servers=team.team_ctx.get('mcp_servers', []) if team and hasattr(team, 'team_ctx') else None,
         interactive=False,

npcsh/routes.py

@@ -1130,18 +1130,11 @@ def yap_handler(command: str, **kwargs):
 @router.route("alicanto", "Conduct deep research with multiple perspectives, identifying gold insights and cliff warnings")
 def alicanto_handler(command: str, **kwargs):
     messages = safe_get(kwargs, "messages", [])
-    
-  
     parts = shlex.split(command)
-    
   
     query = ""
     num_npcs = safe_get(kwargs, 'num_npcs', 5)
     depth = safe_get(kwargs, 'depth', 3)
-    exploration_factor = safe_get(kwargs, 'exploration', 0.3)
-    creativity_factor = safe_get(kwargs, 'creativity', 0.5)
-    output_format = safe_get(kwargs, 'format', 'report')
-    
   
     i = 1
     while i < len(parts):
@@ -1217,17 +1210,25 @@ def alicanto_handler(command: str, **kwargs):
     
     try:
         logging.info(f"Starting Alicanto research on: {query}")
+        model = safe_get(kwargs, 'model')
+        if len(model) == 0 :
+            model = NPCSH_CHAT_MODEL
+        provider = safe_get(kwargs, 'provider')
+        if len(provider) == 0 :
+            provider = NPCSH_CHAT_PROVIDER
+
+
+        print('model: ', model)
+        print('provider: ', provider)
+
         result = alicanto(
-            request=query,
+            query,
             num_npcs=num_npcs,
             depth=depth,
-            memory=3,
-            context=None,
-            model=safe_get(kwargs, 'model', NPCSH_CHAT_MODEL),
-            provider=safe_get(kwargs, 'provider', NPCSH_CHAT_PROVIDER),
-            exploration_factor=exploration_factor,
-            creativity_factor=creativity_factor,
-            output_format=output_format
+            model=model,
+            provider=provider, 
+            max_steps = safe_get(kwargs, 'max_steps', 20),
+
         )
         
       

{npcsh-1.0.31.dist-info → npcsh-1.0.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: npcsh
-Version: 1.0.31
+Version: 1.0.33
 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.31.dist-info → npcsh-1.0.33.dist-info}/RECORD

@@ -1,7 +1,7 @@
 npcsh/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 npcsh/_state.py,sha256=sntRSm9DKthandawaLCf-semAm_1CNx3AUh-066G248,86498
-npcsh/alicanto.py,sha256=S-_mFtEzE8CKWSctJawUtAKmVLgUz-loODTDtL0f6eo,41538
-npcsh/corca.py,sha256=XuaNVhZ1Yslx43AcdmApViUXMuWMoXncLaNT0wwiHmk,47737
+npcsh/alicanto.py,sha256=ZftzxfQPQuuj9VB9V2FCTQN5NIE9Rvsg4iNiNqOUE6U,38118
+npcsh/corca.py,sha256=4OluICXdL0APOWmk9JdeLuMbQPiA3LoupUmCJ8Ot0dE,49272
 npcsh/guac.py,sha256=sVdLYVkzkQw6TE7crtLUX0QJZFkzQthWZTe1p7IfAQE,80412
 npcsh/mcp_helpers.py,sha256=9TsCfcquGu_vX4WaKlY3J3P13-uxruQKrXng-jJ5YyY,11176
 npcsh/mcp_server.py,sha256=krc1rhiSU9gI76w99Ph3Mk7OyUVzfiEXKMvVid-7-Ik,5201
@@ -9,7 +9,7 @@ npcsh/npc.py,sha256=OjCDu03hAcXyqPbzMeBBr1cBnmQsB1FBhd7kLNsWALc,8330
 npcsh/npcsh.py,sha256=3WLkZxHGzRekVGxHiJUA4VFyhC3A1jwX11aB0kgzE9s,8818
 npcsh/plonk.py,sha256=IfOuiE5FBvk-EIsrWFjGy0SrNywDpn4a49E7seBtEmY,14246
 npcsh/pti.py,sha256=UciiiH2Kz4ERQFy0-FX6BQEU2VxYQEUril-_Cvj76Y0,7853
-npcsh/routes.py,sha256=1r9WI3fVtj_vy7ZdL_90R9DtX2UulYrqer1SQG8pJks,44213
+npcsh/routes.py,sha256=ulQMLrNwOAQqfbHC1Nijr8lkn9v4efviCdkgZe9T0iY,44106
 npcsh/spool.py,sha256=oCive2dbn1o3UGUJnFMzfON6g4bOnauuzyyQBgul6RI,9839
 npcsh/wander.py,sha256=8WOX8az8BXjizXGraEvu-ZVphi6PECKZzo9alTK4gmA,21730
 npcsh/yap.py,sha256=QU-j9eg8zixXG6nyjoIYXsanJ4FjPnzhS4aJ241HLxw,18467
@@ -39,35 +39,35 @@ npcsh/npc_team/jinxs/image_generation.jinx,sha256=bQxZdEm0_eqvf_OJSHw3qarp8Klp3L
 npcsh/npc_team/jinxs/internet_search.jinx,sha256=s8zVxwKFUAof_VzQrwB5dpAQdeJ6hUBkbIdRsT-I5mo,1267
 npcsh/npc_team/jinxs/python_executor.jinx,sha256=vZz3pZaj1BnPFHMs_wpyjRc0b32JR4rLhZfulCMDF1s,398
 npcsh/npc_team/jinxs/screen_cap.jinx,sha256=-4DG0EiEe61N_kMhVqqHKhLVGOLuZQT9ax6IZk20NjI,960
-npcsh-1.0.31.data/data/npcsh/npc_team/alicanto.npc,sha256=y9yDY3lq8ZwxQxpnrgle8w5IJwZqvxDepZFU4OaZCtg,148
-npcsh-1.0.31.data/data/npcsh/npc_team/alicanto.png,sha256=A7xeMbcoKGjlkELxJEVifCEZLVWbOKZarTN5ZFJG-FM,3519858
-npcsh-1.0.31.data/data/npcsh/npc_team/bash_executer.jinx,sha256=C_oQccOY8cKevMMPLRdznlMOccQvLgyzyOIThXvmrD8,692
-npcsh-1.0.31.data/data/npcsh/npc_team/corca.npc,sha256=HI3Bs6KlUBPMz7icF1TRE8-V3f3EdU_VxvQxEpru3L4,662
-npcsh-1.0.31.data/data/npcsh/npc_team/corca.png,sha256=0lF70hKu6tY-37YmIPVF2cuaPzvnQ4-UtQOzuAbKEf4,1666776
-npcsh-1.0.31.data/data/npcsh/npc_team/edit_file.jinx,sha256=4PaJs8g_cdeDpbQwQSBycU5RDA0rczEC_NpLfLjo74Y,3490
-npcsh-1.0.31.data/data/npcsh/npc_team/foreman.npc,sha256=WqB8jLfBToGmr8c1vip1KOnTHxfXlGXwDUGnZoDMQr0,327
-npcsh-1.0.31.data/data/npcsh/npc_team/frederic.npc,sha256=EE2dOUItp-VKuW3ZMSHffmIEO4evjPcU2W_C4P3WXbY,362
-npcsh-1.0.31.data/data/npcsh/npc_team/frederic4.png,sha256=ll8uoV0npnPp5HVJWv7h0xDSeuq4pqsk_gYGBHLS0VY,1590744
-npcsh-1.0.31.data/data/npcsh/npc_team/guac.png,sha256=MCE7eJuEJwLJEzc9FS7lL62Mm-38jQRHkxXogPfOTuw,211470
-npcsh-1.0.31.data/data/npcsh/npc_team/image_generation.jinx,sha256=bQxZdEm0_eqvf_OJSHw3qarp8Klp3LlBDv1_HY3COo4,1307
-npcsh-1.0.31.data/data/npcsh/npc_team/internet_search.jinx,sha256=s8zVxwKFUAof_VzQrwB5dpAQdeJ6hUBkbIdRsT-I5mo,1267
-npcsh-1.0.31.data/data/npcsh/npc_team/kadiefa.npc,sha256=Yl5a4wrfe4F2f6Ndw_ukzlVVX7NE9g_mG-3QqJSkg_o,381
-npcsh-1.0.31.data/data/npcsh/npc_team/kadiefa.png,sha256=3CAwL8crKIwJko6o75Z6OYYEEM9Rk--yGzCJg7zoszg,3062528
-npcsh-1.0.31.data/data/npcsh/npc_team/npcsh.ctx,sha256=-jKYaPm2YbZHAGgWAXhyPIwhiNe1H1ZRFg1Zc7tHSxk,1049
-npcsh-1.0.31.data/data/npcsh/npc_team/npcsh_sibiji.png,sha256=9fUqgYMsSHmaH-kBTBQ7N5UCS5-eLZF94Log0O3mtFg,4544
-npcsh-1.0.31.data/data/npcsh/npc_team/plonk.npc,sha256=u1m2a1D512XGQ2kC3eWDAY8Y2IvpkNU73DI_CPE65UE,90
-npcsh-1.0.31.data/data/npcsh/npc_team/plonk.png,sha256=IU5ey-Dl4HEKlwnf75RSWNSHpF8rVqGmdbsa0deL4rQ,2727773
-npcsh-1.0.31.data/data/npcsh/npc_team/plonkjr.npc,sha256=It-i-BEuG0XddKk0d85onk2aJr9Pe5pLnJzNaCWaQIM,87
-npcsh-1.0.31.data/data/npcsh/npc_team/plonkjr.png,sha256=MqLEGwsyECUeODZIti0HQQrMMVxA6XERpW01R06NbpY,2606710
-npcsh-1.0.31.data/data/npcsh/npc_team/python_executor.jinx,sha256=vZz3pZaj1BnPFHMs_wpyjRc0b32JR4rLhZfulCMDF1s,398
-npcsh-1.0.31.data/data/npcsh/npc_team/screen_cap.jinx,sha256=-4DG0EiEe61N_kMhVqqHKhLVGOLuZQT9ax6IZk20NjI,960
-npcsh-1.0.31.data/data/npcsh/npc_team/sibiji.npc,sha256=Hb4wXKIObKKgibwnio5hLec9yd_9bKDCA87Nm2zijFA,216
-npcsh-1.0.31.data/data/npcsh/npc_team/sibiji.png,sha256=1dlZb7J3E62FcVo9CVOzLb8nu1bIUV7cr97nsFocHCM,35615
-npcsh-1.0.31.data/data/npcsh/npc_team/spool.png,sha256=LWTLkwDxXBfLuSUCX32_lo5yAmLYGsA67Xpsz-7MmWU,2876725
-npcsh-1.0.31.data/data/npcsh/npc_team/yap.png,sha256=_l7UbWnXJdsy4Mx-x5l9DT0R6ize3HTnkwQQnOFlI18,1548649
-npcsh-1.0.31.dist-info/licenses/LICENSE,sha256=IKBvAECHP-aCiJtE4cHGCE5Yl0tozYz02PomGeWS3y4,1070
-npcsh-1.0.31.dist-info/METADATA,sha256=gAjnehN3A7kfXcP4WxyuZnf2JwKBBklbLjUl2VtCuS4,25486
-npcsh-1.0.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcsh-1.0.31.dist-info/entry_points.txt,sha256=S5yIuGm8ZXQ4siHYgN5gs0J7bxgobSEULXf8L5HaW5o,206
-npcsh-1.0.31.dist-info/top_level.txt,sha256=kHSNgKMCkfjV95-DH0YSp1LLBi0HXdF3w57j7MQON3E,6
-npcsh-1.0.31.dist-info/RECORD,,
+npcsh-1.0.33.data/data/npcsh/npc_team/alicanto.npc,sha256=y9yDY3lq8ZwxQxpnrgle8w5IJwZqvxDepZFU4OaZCtg,148
+npcsh-1.0.33.data/data/npcsh/npc_team/alicanto.png,sha256=A7xeMbcoKGjlkELxJEVifCEZLVWbOKZarTN5ZFJG-FM,3519858
+npcsh-1.0.33.data/data/npcsh/npc_team/bash_executer.jinx,sha256=C_oQccOY8cKevMMPLRdznlMOccQvLgyzyOIThXvmrD8,692
+npcsh-1.0.33.data/data/npcsh/npc_team/corca.npc,sha256=HI3Bs6KlUBPMz7icF1TRE8-V3f3EdU_VxvQxEpru3L4,662
+npcsh-1.0.33.data/data/npcsh/npc_team/corca.png,sha256=0lF70hKu6tY-37YmIPVF2cuaPzvnQ4-UtQOzuAbKEf4,1666776
+npcsh-1.0.33.data/data/npcsh/npc_team/edit_file.jinx,sha256=4PaJs8g_cdeDpbQwQSBycU5RDA0rczEC_NpLfLjo74Y,3490
+npcsh-1.0.33.data/data/npcsh/npc_team/foreman.npc,sha256=WqB8jLfBToGmr8c1vip1KOnTHxfXlGXwDUGnZoDMQr0,327
+npcsh-1.0.33.data/data/npcsh/npc_team/frederic.npc,sha256=EE2dOUItp-VKuW3ZMSHffmIEO4evjPcU2W_C4P3WXbY,362
+npcsh-1.0.33.data/data/npcsh/npc_team/frederic4.png,sha256=ll8uoV0npnPp5HVJWv7h0xDSeuq4pqsk_gYGBHLS0VY,1590744
+npcsh-1.0.33.data/data/npcsh/npc_team/guac.png,sha256=MCE7eJuEJwLJEzc9FS7lL62Mm-38jQRHkxXogPfOTuw,211470
+npcsh-1.0.33.data/data/npcsh/npc_team/image_generation.jinx,sha256=bQxZdEm0_eqvf_OJSHw3qarp8Klp3LlBDv1_HY3COo4,1307
+npcsh-1.0.33.data/data/npcsh/npc_team/internet_search.jinx,sha256=s8zVxwKFUAof_VzQrwB5dpAQdeJ6hUBkbIdRsT-I5mo,1267
+npcsh-1.0.33.data/data/npcsh/npc_team/kadiefa.npc,sha256=Yl5a4wrfe4F2f6Ndw_ukzlVVX7NE9g_mG-3QqJSkg_o,381
+npcsh-1.0.33.data/data/npcsh/npc_team/kadiefa.png,sha256=3CAwL8crKIwJko6o75Z6OYYEEM9Rk--yGzCJg7zoszg,3062528
+npcsh-1.0.33.data/data/npcsh/npc_team/npcsh.ctx,sha256=-jKYaPm2YbZHAGgWAXhyPIwhiNe1H1ZRFg1Zc7tHSxk,1049
+npcsh-1.0.33.data/data/npcsh/npc_team/npcsh_sibiji.png,sha256=9fUqgYMsSHmaH-kBTBQ7N5UCS5-eLZF94Log0O3mtFg,4544
+npcsh-1.0.33.data/data/npcsh/npc_team/plonk.npc,sha256=u1m2a1D512XGQ2kC3eWDAY8Y2IvpkNU73DI_CPE65UE,90
+npcsh-1.0.33.data/data/npcsh/npc_team/plonk.png,sha256=IU5ey-Dl4HEKlwnf75RSWNSHpF8rVqGmdbsa0deL4rQ,2727773
+npcsh-1.0.33.data/data/npcsh/npc_team/plonkjr.npc,sha256=It-i-BEuG0XddKk0d85onk2aJr9Pe5pLnJzNaCWaQIM,87
+npcsh-1.0.33.data/data/npcsh/npc_team/plonkjr.png,sha256=MqLEGwsyECUeODZIti0HQQrMMVxA6XERpW01R06NbpY,2606710
+npcsh-1.0.33.data/data/npcsh/npc_team/python_executor.jinx,sha256=vZz3pZaj1BnPFHMs_wpyjRc0b32JR4rLhZfulCMDF1s,398
+npcsh-1.0.33.data/data/npcsh/npc_team/screen_cap.jinx,sha256=-4DG0EiEe61N_kMhVqqHKhLVGOLuZQT9ax6IZk20NjI,960
+npcsh-1.0.33.data/data/npcsh/npc_team/sibiji.npc,sha256=Hb4wXKIObKKgibwnio5hLec9yd_9bKDCA87Nm2zijFA,216
+npcsh-1.0.33.data/data/npcsh/npc_team/sibiji.png,sha256=1dlZb7J3E62FcVo9CVOzLb8nu1bIUV7cr97nsFocHCM,35615
+npcsh-1.0.33.data/data/npcsh/npc_team/spool.png,sha256=LWTLkwDxXBfLuSUCX32_lo5yAmLYGsA67Xpsz-7MmWU,2876725
+npcsh-1.0.33.data/data/npcsh/npc_team/yap.png,sha256=_l7UbWnXJdsy4Mx-x5l9DT0R6ize3HTnkwQQnOFlI18,1548649
+npcsh-1.0.33.dist-info/licenses/LICENSE,sha256=IKBvAECHP-aCiJtE4cHGCE5Yl0tozYz02PomGeWS3y4,1070
+npcsh-1.0.33.dist-info/METADATA,sha256=oxuT3G2l8HLWmgzV4GlVCUYaBx5C1LT-b2IggcgCvtA,25486
+npcsh-1.0.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+npcsh-1.0.33.dist-info/entry_points.txt,sha256=S5yIuGm8ZXQ4siHYgN5gs0J7bxgobSEULXf8L5HaW5o,206
+npcsh-1.0.33.dist-info/top_level.txt,sha256=kHSNgKMCkfjV95-DH0YSp1LLBi0HXdF3w57j7MQON3E,6
+npcsh-1.0.33.dist-info/RECORD,,