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

npcsh/guac.py

@@ -6,18 +6,9 @@ import pandas as pd
 import sys
 import argparse
 import importlib.metadata
-import matplotlib
-import platform
 import queue
 plot_queue = queue.Queue()
 
-if platform.system() == 'Darwin':
-    try:
-        matplotlib.use('TkAgg')
-    except ImportError:
-        matplotlib.use('Agg')
-else:
-    matplotlib.use('TkAgg')
 
 import matplotlib.pyplot as plt
 from chroptiks.plotting_utils import * 
@@ -155,17 +146,16 @@ def is_python_code(text: str) -> bool:
     text = text.strip()
     if not text:
         return False
+    
     try:
-        compile(text, "<input>", "eval")
+        compile(text, "<input>", "exec")
         return True
     except SyntaxError:
-        try:
-            compile(text, "<input>", "exec")
-            return True
-        except SyntaxError:
-            return False
+        return False
     except (OverflowError, ValueError):
         return False
+    except IndentationError:
+        return True
 def execute_python_code(code_str: str, state: ShellState, locals_dict: Dict[str, Any]) -> Tuple[ShellState, Any]:
     import io
     output_capture = io.StringIO()
@@ -1168,24 +1158,7 @@ def _run_agentic_mode(command: str,
         compressed_state = state.npc.compress_planning_state(planning_state)
         state.messages = [{"role": "system", "content": f"Session context: {compressed_state}"}]
 
-    existing_vars_context = "EXISTING VARIABLES IN ENVIRONMENT:\n"
-    for var_name, var_value in locals_dict.items():
-        if not var_name.startswith('_') and var_name not in ['In', 'Out', 'exit', 'quit', 'get_ipython']:
-            try:
-                var_type = type(var_value).__name__
-                var_repr = repr(var_value)
-                if len(var_repr) > 100:
-                    var_repr = var_repr[:97] + "..."
-                existing_vars_context += f"- {var_name} ({var_type}): {var_repr}\n"
-            except:
-                existing_vars_context += f"- {var_name} ({type(var_value).__name__}): <unrepresentable>\n"
-    previous_code = ''
-    next_step = ''
-    steps = []
-    while iteration < max_iterations and consecutive_failures < max_consecutive_failures:
-        iteration += 1
-        print(f"\n{_get_guac_agent_emoji(consecutive_failures, max_consecutive_failures)} Agentic iteration {iteration} ")
-        
+
         
   
     existing_vars_context = "EXISTING VARIABLES IN ENVIRONMENT:\n"
@@ -1489,6 +1462,7 @@ def execute_guac_command(command: str, state: ShellState, locals_dict: Dict[str,
   
     if stripped_command.startswith('/') and stripped_command not in ["/refresh", "/agent", "/chat", "/cmd"]:
         return execute_command(stripped_command, state, review=True, router=router)
+    print(is_python_code(stripped_command))
     if is_python_code(stripped_command):
         try:
             state, exec_output = execute_python_code(stripped_command, state, locals_dict)
@@ -1497,6 +1471,7 @@ def execute_guac_command(command: str, state: ShellState, locals_dict: Dict[str,
             print("\nExecution interrupted by user")
             return state, "Execution interrupted"
     if state.current_mode == "agent":
+
         return _run_agentic_mode(stripped_command, state, locals_dict, npc_team_dir) 
     if state.current_mode == "cmd":
        
@@ -1908,38 +1883,78 @@ def enter_guac_mode(npc=None,
     state.command_history = command_history
 
     if npc is None and default_npc is None:
-        guac_npc_path = Path(npc_team_dir) / "guac.npc" 
-        if guac_npc_path.exists():
-            npc = NPC(file=str(guac_npc_path), 
-                      db_conn=command_history.engine)
-            print(guac_npc_path, npc)
-
-            team_ctx_path = get_team_ctx_path(str(npc_team_dir))
-            team_ctx = {}
-            if team_ctx_path and Path(team_ctx_path).exists():
-                with open(team_ctx_path, "r") as f:
-                    team_ctx = yaml.safe_load(f) or {}
-            print(team_ctx, team_ctx_path)
-            team = Team(team_path=str(npc_team_dir), 
-                        forenpc=npc, 
-                        jinxs={}) 
-            team.name = team_ctx.get("team_name", "guac_global_team")
-            team.team_ctx = team_ctx
-            print(team)
-            if npc.model is None:
-                npc.model = team_ctx.get("model", state.chat_model)
-            if npc.provider is None:
-                npc.provider = team_ctx.get("provider", state.chat_provider)
+            guac_npc_path = Path(npc_team_dir) / "guac.npc" 
+            if guac_npc_path.exists():
+                npc = NPC(file=str(guac_npc_path), 
+                        db_conn=command_history.engine)
+                print(guac_npc_path, npc)
+
+                team_ctx_path = get_team_ctx_path(str(npc_team_dir))
+                team_ctx = {}
+                if team_ctx_path and Path(team_ctx_path).exists():
+                    with open(team_ctx_path, "r") as f:
+                        team_ctx = yaml.safe_load(f) or {}
+                print(team_ctx, team_ctx_path)
+                team = Team(team_path=str(npc_team_dir), 
+                            forenpc=npc, 
+                            jinxs={}) 
+                team.name = team_ctx.get("team_name", "guac_global_team")
+                team.team_ctx = team_ctx
+                print(team)
+                if npc.model is None:
+                    npc.model = team_ctx.get("model", state.chat_model)
+                if npc.provider is None:
+                    npc.provider = team_ctx.get("provider", state.chat_provider)
+                    
+                for npc_name, npc_obj in team.npcs.items():
+                    if not npc_obj.model:
+                        npc_obj.model = team_ctx.get("model", state.chat_model)
+                    if not npc_obj.provider:
+                        npc_obj.provider = team_ctx.get("provider", state.chat_provider)
+            else:
+                print("No local guac.npc found. Checking for global team...")
+                global_team_dir = ensure_global_guac_team()
+                global_guac_npc_path = global_team_dir / "guac.npc"
                 
-            for npc_name, npc_obj in team.npcs.items():
-                if not npc_obj.model:
-                    npc_obj.model = team_ctx.get("model", state.chat_model)
-                if not npc_obj.provider:
-                    npc_obj.provider = team_ctx.get("provider", state.chat_provider)
-        else:
-            raise RuntimeError(f"No NPC loaded and {guac_npc_path} not found!")
+                if global_guac_npc_path.exists():
+                    print("Using global guac team")
+                    npc = NPC(file=str(global_guac_npc_path), 
+                            db_conn=command_history.engine)
+                    team_ctx_path = global_team_dir / "team.ctx"
+                    team_ctx = {}
+                    if team_ctx_path.exists():
+                        with open(team_ctx_path, "r") as f:
+                            team_ctx = yaml.safe_load(f) or {}
+                    
+                    team = Team(team_path=str(global_team_dir), 
+                                forenpc=npc, 
+                                jinxs={})
+                    team.name = team_ctx.get("team_name", "guac_global_team")
+                    team.team_ctx = team_ctx
+                    
+                    if npc.model is None:
+                        npc.model = team_ctx.get("model", state.chat_model)
+                    if npc.provider is None:
+                        npc.provider = team_ctx.get("provider", state.chat_provider)
+                else:
+                    print("Could not find or create global guac team. Please run /init to set up guac properly.")
+                    try:
+                        user_choice = input("Would you like to initialize guac now? (y/n): ").strip().lower()
+                        if user_choice == 'y':
+                            setup_npc_team(Path(npc_team_dir), lang)
+                            npc = NPC(file=str(Path(npc_team_dir) / "guac.npc"), 
+                                    db_conn=command_history.engine)
+                            team = Team(team_path=str(npc_team_dir), forenpc=npc, jinxs={})
+                        else:
+                            print("Exiting guac mode.")
+                            return
+                    except (KeyboardInterrupt, EOFError):
+                        print("Initialization cancelled. Exiting guac mode.")
+                        return
     elif default_npc and npc is None:
         npc = default_npc
+
+
     state.npc = npc or default_npc
     state.team = team or default_team
 

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

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

@@ -2,7 +2,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/guac.py,sha256=qzoylPid9PdttTZvbU4vSrG1yBNhrfIXqrmvNFAFguM,79334
+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
 npcsh/npc.py,sha256=OjCDu03hAcXyqPbzMeBBr1cBnmQsB1FBhd7kLNsWALc,8330
@@ -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.30.data/data/npcsh/npc_team/alicanto.npc,sha256=y9yDY3lq8ZwxQxpnrgle8w5IJwZqvxDepZFU4OaZCtg,148
-npcsh-1.0.30.data/data/npcsh/npc_team/alicanto.png,sha256=A7xeMbcoKGjlkELxJEVifCEZLVWbOKZarTN5ZFJG-FM,3519858
-npcsh-1.0.30.data/data/npcsh/npc_team/bash_executer.jinx,sha256=C_oQccOY8cKevMMPLRdznlMOccQvLgyzyOIThXvmrD8,692
-npcsh-1.0.30.data/data/npcsh/npc_team/corca.npc,sha256=HI3Bs6KlUBPMz7icF1TRE8-V3f3EdU_VxvQxEpru3L4,662
-npcsh-1.0.30.data/data/npcsh/npc_team/corca.png,sha256=0lF70hKu6tY-37YmIPVF2cuaPzvnQ4-UtQOzuAbKEf4,1666776
-npcsh-1.0.30.data/data/npcsh/npc_team/edit_file.jinx,sha256=4PaJs8g_cdeDpbQwQSBycU5RDA0rczEC_NpLfLjo74Y,3490
-npcsh-1.0.30.data/data/npcsh/npc_team/foreman.npc,sha256=WqB8jLfBToGmr8c1vip1KOnTHxfXlGXwDUGnZoDMQr0,327
-npcsh-1.0.30.data/data/npcsh/npc_team/frederic.npc,sha256=EE2dOUItp-VKuW3ZMSHffmIEO4evjPcU2W_C4P3WXbY,362
-npcsh-1.0.30.data/data/npcsh/npc_team/frederic4.png,sha256=ll8uoV0npnPp5HVJWv7h0xDSeuq4pqsk_gYGBHLS0VY,1590744
-npcsh-1.0.30.data/data/npcsh/npc_team/guac.png,sha256=MCE7eJuEJwLJEzc9FS7lL62Mm-38jQRHkxXogPfOTuw,211470
-npcsh-1.0.30.data/data/npcsh/npc_team/image_generation.jinx,sha256=bQxZdEm0_eqvf_OJSHw3qarp8Klp3LlBDv1_HY3COo4,1307
-npcsh-1.0.30.data/data/npcsh/npc_team/internet_search.jinx,sha256=s8zVxwKFUAof_VzQrwB5dpAQdeJ6hUBkbIdRsT-I5mo,1267
-npcsh-1.0.30.data/data/npcsh/npc_team/kadiefa.npc,sha256=Yl5a4wrfe4F2f6Ndw_ukzlVVX7NE9g_mG-3QqJSkg_o,381
-npcsh-1.0.30.data/data/npcsh/npc_team/kadiefa.png,sha256=3CAwL8crKIwJko6o75Z6OYYEEM9Rk--yGzCJg7zoszg,3062528
-npcsh-1.0.30.data/data/npcsh/npc_team/npcsh.ctx,sha256=-jKYaPm2YbZHAGgWAXhyPIwhiNe1H1ZRFg1Zc7tHSxk,1049
-npcsh-1.0.30.data/data/npcsh/npc_team/npcsh_sibiji.png,sha256=9fUqgYMsSHmaH-kBTBQ7N5UCS5-eLZF94Log0O3mtFg,4544
-npcsh-1.0.30.data/data/npcsh/npc_team/plonk.npc,sha256=u1m2a1D512XGQ2kC3eWDAY8Y2IvpkNU73DI_CPE65UE,90
-npcsh-1.0.30.data/data/npcsh/npc_team/plonk.png,sha256=IU5ey-Dl4HEKlwnf75RSWNSHpF8rVqGmdbsa0deL4rQ,2727773
-npcsh-1.0.30.data/data/npcsh/npc_team/plonkjr.npc,sha256=It-i-BEuG0XddKk0d85onk2aJr9Pe5pLnJzNaCWaQIM,87
-npcsh-1.0.30.data/data/npcsh/npc_team/plonkjr.png,sha256=MqLEGwsyECUeODZIti0HQQrMMVxA6XERpW01R06NbpY,2606710
-npcsh-1.0.30.data/data/npcsh/npc_team/python_executor.jinx,sha256=vZz3pZaj1BnPFHMs_wpyjRc0b32JR4rLhZfulCMDF1s,398
-npcsh-1.0.30.data/data/npcsh/npc_team/screen_cap.jinx,sha256=-4DG0EiEe61N_kMhVqqHKhLVGOLuZQT9ax6IZk20NjI,960
-npcsh-1.0.30.data/data/npcsh/npc_team/sibiji.npc,sha256=Hb4wXKIObKKgibwnio5hLec9yd_9bKDCA87Nm2zijFA,216
-npcsh-1.0.30.data/data/npcsh/npc_team/sibiji.png,sha256=1dlZb7J3E62FcVo9CVOzLb8nu1bIUV7cr97nsFocHCM,35615
-npcsh-1.0.30.data/data/npcsh/npc_team/spool.png,sha256=LWTLkwDxXBfLuSUCX32_lo5yAmLYGsA67Xpsz-7MmWU,2876725
-npcsh-1.0.30.data/data/npcsh/npc_team/yap.png,sha256=_l7UbWnXJdsy4Mx-x5l9DT0R6ize3HTnkwQQnOFlI18,1548649
-npcsh-1.0.30.dist-info/licenses/LICENSE,sha256=IKBvAECHP-aCiJtE4cHGCE5Yl0tozYz02PomGeWS3y4,1070
-npcsh-1.0.30.dist-info/METADATA,sha256=w9tSdXf-u7Z0BYYDfGAwWfzYUfFCEhBzowXbCjZtrVU,25486
-npcsh-1.0.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-npcsh-1.0.30.dist-info/entry_points.txt,sha256=S5yIuGm8ZXQ4siHYgN5gs0J7bxgobSEULXf8L5HaW5o,206
-npcsh-1.0.30.dist-info/top_level.txt,sha256=kHSNgKMCkfjV95-DH0YSp1LLBi0HXdF3w57j7MQON3E,6
-npcsh-1.0.30.dist-info/RECORD,,
+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,,