npcsh 1.0.12__py3-none-any.whl → 1.0.14__py3-none-any.whl

npcsh/_state.py

@@ -1,45 +1,35 @@
 
 from colorama import Fore, Back, Style
-
-
-from datetime import datetime
-from dotenv import load_dotenv
-
-import re
+from dataclasses import dataclass, field
+import filecmp
 import os
-from termcolor import colored
-
-
-
-from typing import Dict, List
-import subprocess
-import termios
-import tty
+import platform
 import pty
+import re
 import select
+import shutil
 import signal
-import time
-import os
-import re
 import sqlite3
-from datetime import datetime
+import subprocess
+import sys
+from termcolor import colored
+import termios
+import time
+from typing import Dict, List,  Any, Tuple, Union, Optional
+import tty
 import logging
 import textwrap
 from termcolor import colored
-import sys
-import platform
-
+from npcpy.memory.command_history import (
+    start_new_conversation,
+)
+from npcpy.npc_compiler import NPC, Team
 
 def get_npc_path(npc_name: str, db_path: str) -> str:
-    # First, check in project npc_team directory
     project_npc_team_dir = os.path.abspath("./npc_team")
     project_npc_path = os.path.join(project_npc_team_dir, f"{npc_name}.npc")
-
-    # Then, check in global npc_team directory
     user_npc_team_dir = os.path.expanduser("~/.npcsh/npc_team")
     global_npc_path = os.path.join(user_npc_team_dir, f"{npc_name}.npc")
-
-    # Check database for compiled NPCs
     try:
         with sqlite3.connect(db_path) as conn:
             cursor = conn.cursor()
@@ -105,9 +95,6 @@ def initialize_base_npcs_if_needed(db_path: str) -> None:
     package_dir = os.path.dirname(__file__)
     package_npc_team_dir = os.path.join(package_dir, "npc_team")
 
-    
-
-    # User's global npc_team directory
     user_npc_team_dir = os.path.expanduser("~/.npcsh/npc_team")
 
     user_jinxs_dir = os.path.join(user_npc_team_dir, "jinxs")
@@ -115,7 +102,7 @@ def initialize_base_npcs_if_needed(db_path: str) -> None:
     os.makedirs(user_npc_team_dir, exist_ok=True)
     os.makedirs(user_jinxs_dir, exist_ok=True)
     os.makedirs(user_templates_dir, exist_ok=True)
-    # Copy NPCs from package to user directory
+
     for filename in os.listdir(package_npc_team_dir):
         if filename.endswith(".npc"):
             source_path = os.path.join(package_npc_team_dir, filename)
@@ -243,11 +230,11 @@ def ensure_npcshrc_exists() -> str:
             npcshrc.write("# NPCSH Configuration File\n")
             npcshrc.write("export NPCSH_INITIALIZED=0\n")
             npcshrc.write("export NPCSH_DEFAULT_MODE='agent'\n")
+            npcshrc.write("export NPCSH_BUILD_KG=1")
             npcshrc.write("export NPCSH_CHAT_PROVIDER='ollama'\n")
-            npcshrc.write("export NPCSH_CHAT_MODEL='llama3.2'\n")
+            npcshrc.write("export NPCSH_CHAT_MODEL='gemma3:4b'\n")
             npcshrc.write("export NPCSH_REASONING_PROVIDER='ollama'\n")
             npcshrc.write("export NPCSH_REASONING_MODEL='deepseek-r1'\n")
-
             npcshrc.write("export NPCSH_EMBEDDING_PROVIDER='ollama'\n")
             npcshrc.write("export NPCSH_EMBEDDING_MODEL='nomic-embed-text'\n")
             npcshrc.write("export NPCSH_VISION_PROVIDER='ollama'\n")
@@ -287,6 +274,92 @@ def setup_npcsh_config() -> None:
     add_npcshrc_to_shell_config()
 
 
+
+CANONICAL_ARGS = [
+    'model',            
+    'provider',         
+    'output_file',           
+    'attachments',     
+    'format',    
+    'temperature',
+    'top_k',
+    'top_p',
+    'max_tokens',
+    'messages',    
+    'npc',
+    'team',
+    'height',
+    'width',
+    'num_frames',
+    'sprovider',
+    'emodel',
+    'eprovider',
+    'igmodel',
+    'igprovider',
+    'vmodel',
+    'vprovider',
+    'rmodel',
+    'rprovider',
+    'num_npcs',
+    'depth',
+    'exploration',
+    'creativity',
+    'port',
+    'cors',
+    'config_dir',
+    'plots_dir',
+    'refresh_period',
+    'lang',
+]
+
+def get_argument_help() -> Dict[str, List[str]]:
+    """
+    Analyzes CANONICAL_ARGS to generate a map of canonical arguments
+    to all their possible shorthands.
+    
+    Returns -> {'model': ['m', 'mo', 'mod', 'mode'], 'provider': ['p', 'pr', ...]}
+    """
+    arg_map = {arg: [] for arg in CANONICAL_ARGS}
+    
+    for arg in CANONICAL_ARGS:
+        # Generate all possible prefixes for this argument
+        for i in range(1, len(arg)):
+            prefix = arg[:i]
+            
+            # Check if this prefix is an unambiguous shorthand
+            matches = [canonical for canonical in CANONICAL_ARGS if canonical.startswith(prefix)]
+            
+            # If this prefix uniquely resolves to our current argument, it's a valid shorthand
+            if len(matches) == 1 and matches[0] == arg:
+                arg_map[arg].append(prefix)
+
+    return arg_map
+
+
+
+
+def normalize_and_expand_flags(parsed_flags: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    Expands argument aliases based on the priority order of CANONICAL_ARGS.
+    The first matching prefix in the list wins.
+    """
+    normalized = {}
+    for key, value in parsed_flags.items():
+        if key in CANONICAL_ARGS:
+            if key in normalized:
+                print(colored(f"Warning: Argument '{key}' specified multiple times. Using last value.", "yellow"))
+            normalized[key] = value
+            continue
+        first_match = next((arg for arg in CANONICAL_ARGS if arg.startswith(key)), None)
+        if first_match:
+            if first_match in normalized:
+                print(colored(f"Warning: Argument '{first_match}' specified multiple times (via alias '{key}'). Using last value.", "yellow"))
+            normalized[first_match] = value
+        else:
+            normalized[key] = value
+    return normalized
+
+
 BASH_COMMANDS = [
     "npc",
     "npm",
@@ -973,12 +1046,13 @@ NPCSH_REASONING_PROVIDER = os.environ.get("NPCSH_REASONING_PROVIDER", "ollama")
 NPCSH_STREAM_OUTPUT = eval(os.environ.get("NPCSH_STREAM_OUTPUT", "0")) == 1
 NPCSH_API_URL = os.environ.get("NPCSH_API_URL", None)
 NPCSH_SEARCH_PROVIDER = os.environ.get("NPCSH_SEARCH_PROVIDER", "duckduckgo")
-
+NPCSH_BUILD_KG = os.environ.get("NPCSH_BUILD_KG") == "1" 
 READLINE_HISTORY_FILE = os.path.expanduser("~/.npcsh_history")
 
 
 
 def setup_readline() -> str:
+    import readline
     if readline is None:
         return None
     try:
@@ -1011,14 +1085,6 @@ def save_readline_history():
 
 
 
-
-from npcpy.memory.command_history import (
-    start_new_conversation,
-)
-from dataclasses import dataclass, field
-from typing import Optional, List, Dict, Any, Tuple, Union
-from npcpy.npc_compiler import NPC, Team
-import os
 @dataclass
 class ShellState:
     npc: Optional[Union[NPC, str]] = None
@@ -1034,11 +1100,13 @@ class ShellState:
     embedding_provider: str = NPCSH_EMBEDDING_PROVIDER
     reasoning_model: str = NPCSH_REASONING_MODEL
     reasoning_provider: str = NPCSH_REASONING_PROVIDER
+    search_provider: str = NPCSH_SEARCH_PROVIDER
     image_gen_model: str = NPCSH_IMAGE_GEN_MODEL
     image_gen_provider: str = NPCSH_IMAGE_GEN_PROVIDER
     video_gen_model: str = NPCSH_VIDEO_GEN_MODEL
     video_gen_provider: str = NPCSH_VIDEO_GEN_PROVIDER
     current_mode: str = NPCSH_DEFAULT_MODE
+    build_kg: bool = NPCSH_BUILD_KG,
     api_key: Optional[str] = None
     api_url: Optional[str] = NPCSH_API_URL
     current_path: str = field(default_factory=os.getcwd)
@@ -1076,5 +1144,6 @@ initial_state = ShellState(
     image_gen_provider=NPCSH_IMAGE_GEN_PROVIDER,
     video_gen_model=NPCSH_VIDEO_GEN_MODEL,
     video_gen_provider=NPCSH_VIDEO_GEN_PROVIDER,
+    build_kg=NPCSH_BUILD_KG, 
     api_url=NPCSH_API_URL,
 )

npcsh/alicanto.py

@@ -20,7 +20,10 @@ from npcpy.npc_sysenv import print_and_process_stream_with_markdown
 
 
 
-def generate_random_npcs(num_npcs: int, model: str, provider: str, request: str) -> List[NPC]:
+def generate_random_npcs(num_npcs: int, 
+                         model: str, 
+                         provider: str, 
+                         request: str) -> List[NPC]:
     """
     Generate a diverse set of NPCs with different expertise and perspectives
     related to the research request.
@@ -135,10 +138,14 @@ def generate_random_npcs(num_npcs: int, model: str, provider: str, request: str)
     
     return npcs
 
-def generate_research_chain(request: str, npc: NPC, depth: int, memory: int = 3, 
-                           context: str = None, model: str = None, provider: str = None,
-                           exploration_factor: float = 0.3,
-                           creativity_factor: float = 0.5) -> List[str]:
+def generate_research_chain(request: str, 
+                            npc: NPC, depth: int, 
+                            memory: int = 3, 
+                            context: str = None, 
+                            model: str = None, 
+                            provider: str = None,
+                            exploration_factor: float = 0.3,
+                            creativity_factor: float = 0.5) -> List[str]:
     """
     Generate a chain of research thoughts from a single NPC, diving deeper with each step.
     
@@ -209,7 +216,11 @@ def format_facts_list(facts: List[str]) -> str:
     """Format a list of facts for display in a report"""
     return "\n".join([f"• {fact}" for fact in facts])
 
-def simulate_experiments(research: Dict[str, Any], request: str, model: str = None, provider: str = None, max_experiments: int = None) -> Dict[str, Dict[str, Any]]:
+def simulate_experiments(research: Dict[str, Any], 
+                         request: str, 
+                         model: str = None, 
+                         provider: str = None, 
+                         max_experiments: int = None) -> Dict[str, Dict[str, Any]]:
     """
     Simulate thought experiments based on research findings
     
@@ -269,7 +280,11 @@ def simulate_experiments(research: Dict[str, Any], request: str, model: str = No
     simulations, thought experiments, and interdisciplinary methods.
     """
     
-    response = get_llm_response(prompt=prompt, model=model, provider=provider, temperature=0.8, format="json")
+    response = get_llm_response(prompt=prompt, 
+                                model=model, 
+                                provider=provider,
+                                temperature=0.8, 
+                                format="json")
     experiments = response.get("response", {})
     
     # Limit experiments if needed