hey-cli-python 1.0.5__tar.gz → 1.0.7__tar.gz

{hey_cli_python-1.0.5 → hey_cli_python-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hey-cli-python
-Version: 1.0.5
+Version: 1.0.7
 Summary: A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands.
 Author: Mohit Singh Sinsniwal
 Project-URL: Homepage, https://github.com/sinsniwal/hey-cli

{hey_cli_python-1.0.5 → hey_cli_python-1.0.7}/hey_cli/cli.py

@@ -14,59 +14,82 @@ from rich.text import Text
 
 console = Console()
 
+
 def check_ollama():
-    """Check if Ollama is reachable at localhost:11434. Exit with instructions if not."""
+    """Check if Ollama is reachable. Exit with instructions if not."""
+    from .llm import OLLAMA_HOST
+
     try:
-        urllib.request.urlopen("http://localhost:11434", timeout=2)
+        urllib.request.urlopen(OLLAMA_HOST, timeout=2)
     except Exception:
         msg = Text()
         msg.append("Ollama is not running or not installed.\n\n", style="bold red")
         msg.append("Install Ollama:\n", style="bold white")
         msg.append("  Linux / macOS:\n", style="dim")
-        msg.append("    curl -fsSL https://ollama.com/install.sh | sh\n", style="bold cyan")
+        msg.append(
+            "    curl -fsSL https://ollama.com/install.sh | sh\n", style="bold cyan"
+        )
         msg.append("  Windows:\n", style="dim")
         msg.append("    https://ollama.com/download/windows\n\n", style="bold cyan")
         msg.append("Then pull the default model:\n", style="bold white")
         msg.append("    ollama pull gpt-oss:20b-cloud", style="bold cyan")
-        console.print(Panel(msg, title="[bold yellow]⚠  Ollama Required[/bold yellow]", border_style="yellow"))
+        console.print(
+            Panel(
+                msg,
+                title="[bold yellow]⚠  Ollama Required[/bold yellow]",
+                border_style="yellow",
+            )
+        )
         sys.exit(1)
 
+
 def main():
     parser = argparse.ArgumentParser(
         description="hey-cli: a secure, zero-bloat CLI companion.",
-        formatter_class=argparse.RawTextHelpFormatter
+        formatter_class=argparse.RawTextHelpFormatter,
     )
-    
+
     parser.add_argument("objective", nargs="*", help="Goal or task description")
-    parser.add_argument("--level", type=int, choices=[0, 1, 2, 3], default=None,
-                        help="0: Dry-Run\n1: Supervised (Default)\n2: Unrestricted (Danger)\n3: Troubleshooter")
-    parser.add_argument("--init", action="store_true", help="Initialize ~/.hey-rules.json")
-    parser.add_argument("--clear", action="store_true", help="Clear conversational memory history")
-    parser.add_argument("--check-cache", type=str, help="Check local cache for instant fix")
-    
+    parser.add_argument(
+        "--level",
+        type=int,
+        choices=[0, 1, 2, 3],
+        default=None,
+        help="0: Dry-Run\n1: Supervised (Default)\n2: Unrestricted (Danger)\n3: Troubleshooter",
+    )
+    parser.add_argument(
+        "--init", action="store_true", help="Initialize ~/.hey-rules.json"
+    )
+    parser.add_argument(
+        "--clear", action="store_true", help="Clear conversational memory history"
+    )
+    parser.add_argument(
+        "--check-cache", type=str, help="Check local cache for instant fix"
+    )
+
     args = parser.parse_args()
-    
+
     gov = GovernanceEngine()
     history_mgr = HistoryManager()
-    
+
     if args.clear:
         history_mgr.clear()
         console.print("[dim]Conversational history wiped clean.[/dim]")
         sys.exit(0)
-    
+
     active_level = args.level
     if active_level is None:
         active_level = gov.rules.get("config", {}).get("default_level", 1)
-        
+
     model_name = gov.rules.get("config", {}).get("model", "gpt-oss:20b-cloud")
-    
+
     if args.init:
         if gov.init_rules():
             console.print(f"Initialized security rules at {gov.rules_path}")
         else:
             console.print(f"Rules already exist at {gov.rules_path}")
         sys.exit(0)
-        
+
     if args.check_cache:
         sys.exit(0)
 
@@ -77,7 +100,7 @@ def main():
     if not sys.stdin.isatty():
         try:
             piped_data = sys.stdin.read()
-            sys.stdin = open('/dev/tty')
+            sys.stdin = open("/dev/tty")
         except Exception:
             pass
 
@@ -85,24 +108,33 @@ def main():
     if not objective and not piped_data:
         parser.print_help()
         sys.exit(1)
-        
+
     # Build complete user message for saving later
     user_prompt = objective
     if piped_data:
         user_prompt += f"\n\n[Piped Data]:\n{piped_data}"
-        
+
     console.print("[bold yellow]●[/bold yellow] Thinking...")
     past_messages = history_mgr.load()
     try:
-        response = generate_command(objective, context=piped_data, model_name=model_name, history=past_messages)
-    except urllib.error.URLError:
-        check_ollama()  # always fails here — shows the panel and exits
-    
+        response = generate_command(
+            objective, context=piped_data, model_name=model_name, history=past_messages
+        )
+    except (urllib.error.URLError, ConnectionError, OSError):
+        check_ollama()  # shows the panel and exits
+        sys.exit(1)  # fallback — should never reach here
+
     # Save the user query to history IMMEDIATELY
     history_mgr.append("user", user_prompt)
-    
-    runner = CommandRunner(governance=gov, level=active_level, model_name=model_name, history_mgr=history_mgr)
+
+    runner = CommandRunner(
+        governance=gov,
+        level=active_level,
+        model_name=model_name,
+        history_mgr=history_mgr,
+    )
     runner.execute_flow(response, objective)
 
+
 if __name__ == "__main__":
     main()

{hey_cli_python-1.0.5 → hey_cli_python-1.0.7}/hey_cli/llm.py

@@ -6,6 +6,8 @@ import urllib.error
 from .models import CommandResponse, TroubleshootResponse
 
 DEFAULT_MODEL = "gpt-oss:20b-cloud"
+OLLAMA_HOST = os.environ.get("OLLAMA_HOST", "http://localhost:11434")
+OLLAMA_API_KEY = os.environ.get("OLLAMA_API_KEY", "")
 
 SYSTEM_PROMPT = r"""You are hey-cli, an autonomous, minimalist CLI companion and terminal expert. 
 Your primary goal is to turn natural language objectives and error logs into actionable shell commands.
@@ -26,33 +28,41 @@ CRITICAL JSON REQUIREMENT: If your bash command contains any backslashes (e.g. f
 
 from .skills import get_compiled_skills
 
+
 def get_system_context() -> str:
     os_name = platform.system()
     os_release = platform.release()
     arch = platform.machine()
     shell = os.environ.get("SHELL", "unknown")
-    
+
     skills_block = f"\n\n{get_compiled_skills()}"
-         
+
     return f"Operating System: {os_name} {os_release} ({arch})\nCurrent Shell: {shell}{skills_block}"
 
+
 TROUBLESHOOT_PROMPT = r"""You are acting as an iterative troubleshooter. 
 You will be provided with an objective, the previous commands attempted, and the stdout/stderr.
 Determine the next command to run to resolve the issue, OR if the issue is resolved, indicate it.
 Keep your explanation brief and chill. If a file or tests do not exist, do not try to aggressively brute-force create configurations. Just explain the situation and set is_resolved=True to gracefully stop.
 """
 
-def generate_command(prompt: str, context: str = "", model_name: str = DEFAULT_MODEL, history: list = None) -> CommandResponse:
+
+def generate_command(
+    prompt: str,
+    context: str = "",
+    model_name: str = DEFAULT_MODEL,
+    history: list = None,
+) -> CommandResponse:
     content = prompt
     if context:
         content = f"Context (e.g. error logs or piped data):\n{context}\n\nObjective:\n{prompt}"
-        
+
     sys_context = f"--- ENVIRONMENT ---\n{get_system_context()}\n-------------------\n"
     msgs = [{"role": "system", "content": SYSTEM_PROMPT + "\n\n" + sys_context}]
     if history:
         msgs.extend(history)
     msgs.append({"role": "user", "content": content})
-    
+
     max_retries = 3
     last_error = None
     raw_val = "None"
@@ -64,16 +74,20 @@ def generate_command(prompt: str, context: str = "", model_name: str = DEFAULT_M
                 "messages": msgs,
                 "format": "json",
                 "stream": False,
-                "options": {"temperature": 0.0}
+                "options": {"temperature": 0.0},
             }
+            url = f"{OLLAMA_HOST.rstrip('/')}/api/chat"
+            headers = {"Content-Type": "application/json"}
+            if OLLAMA_API_KEY:
+                headers["Authorization"] = f"Bearer {OLLAMA_API_KEY}"
             req = urllib.request.Request(
-                "http://localhost:11434/api/chat",
-                data=json.dumps(payload).encode('utf-8'),
-                headers={"Content-Type": "application/json"}
+                url,
+                data=json.dumps(payload).encode("utf-8"),
+                headers=headers,
             )
             with urllib.request.urlopen(req, timeout=30) as resp:
-                response = json.loads(resp.read().decode('utf-8'))
-            
+                response = json.loads(resp.read().decode("utf-8"))
+
             raw_val = response["message"]["content"]
             content_str = raw_val
 
@@ -81,11 +95,11 @@ def generate_command(prompt: str, context: str = "", model_name: str = DEFAULT_M
                 content_str = content_str[7:-3].strip()
             elif content_str.startswith("```"):
                 content_str = content_str[3:-3].strip()
-                
+
             data = json.loads(content_str)
             return CommandResponse(**data)
-            
-        except urllib.error.URLError:
+
+        except (urllib.error.URLError, ConnectionError, OSError):
             raise  # Ollama not reachable — don't retry, bubble up to cli
         except Exception as e:
             last_error = e
@@ -93,31 +107,48 @@ def generate_command(prompt: str, context: str = "", model_name: str = DEFAULT_M
                 return CommandResponse(
                     command="",
                     explanation=f"LLM Safety Trigger: The model refused to generate this command.\n\nRaw output: {raw_val.strip()}",
-                    needs_context=False
+                    needs_context=False,
                 )
-            
+
             msgs.append({"role": "assistant", "content": raw_val})
-            msgs.append({"role": "user", "content": f"Your JSON output failed validation: {str(e)}\nPlease strictly follow the schema and output ONLY valid JSON without markdown wrapping."})
+            msgs.append(
+                {
+                    "role": "user",
+                    "content": f"Your JSON output failed validation: {str(e)}\nPlease strictly follow the schema and output ONLY valid JSON without markdown wrapping.",
+                }
+            )
 
     return CommandResponse(
-        command="", 
-        explanation=f"Error generating command from LLM after {max_retries} retries: {str(last_error)}\nRaw Output:\n{raw_val}"
+        command="",
+        explanation=f"Error generating command from LLM after {max_retries} retries: {str(last_error)}\nRaw Output:\n{raw_val}",
+    )
+
+
+def generate_troubleshoot_step(
+    objective: str, history: list, model_name: str = DEFAULT_MODEL
+) -> TroubleshootResponse:
+    history_text = "\n".join(
+        [
+            f"Cmd: {h['cmd']}\nExit: {h['exit_code']}\nOut/Err:\n{h['output']}"
+            for h in history
+        ]
     )
 
-def generate_troubleshoot_step(objective: str, history: list, model_name: str = DEFAULT_MODEL) -> TroubleshootResponse:
-    history_text = "\n".join([
-        f"Cmd: {h['cmd']}\nExit: {h['exit_code']}\nOut/Err:\n{h['output']}"
-        for h in history
-    ])
-    
     content = f"Objective:\n{objective}\n\nHistory of execution:\n{history_text}\n\nAnalyze the specific error and provide the NEXT logical command to test or fix. Re-read logs carefully."
-    
+
     sys_context = f"--- ENVIRONMENT ---\n{get_system_context()}\n-------------------\n"
     msgs = [
-        {"role": "system", "content": SYSTEM_PROMPT + "\n" + TROUBLESHOOT_PROMPT + "\n\n" + sys_context},
-        {"role": "user", "content": content}
+        {
+            "role": "system",
+            "content": SYSTEM_PROMPT
+            + "\n"
+            + TROUBLESHOOT_PROMPT
+            + "\n\n"
+            + sys_context,
+        },
+        {"role": "user", "content": content},
     ]
-    
+
     max_retries = 3
     last_error = None
     raw_val = "None"
@@ -129,38 +160,47 @@ def generate_troubleshoot_step(objective: str, history: list, model_name: str =
                 "messages": msgs,
                 "format": "json",
                 "stream": False,
-                "options": {"temperature": 0.0}
+                "options": {"temperature": 0.0},
             }
+            url = f"{OLLAMA_HOST.rstrip('/')}/api/chat"
+            headers = {"Content-Type": "application/json"}
+            if OLLAMA_API_KEY:
+                headers["Authorization"] = f"Bearer {OLLAMA_API_KEY}"
             req = urllib.request.Request(
-                "http://localhost:11434/api/chat",
-                data=json.dumps(payload).encode('utf-8'),
-                headers={"Content-Type": "application/json"}
+                url,
+                data=json.dumps(payload).encode("utf-8"),
+                headers=headers,
             )
             with urllib.request.urlopen(req, timeout=30) as resp:
-                response = json.loads(resp.read().decode('utf-8'))
-            
+                response = json.loads(resp.read().decode("utf-8"))
+
             raw_val = response["message"]["content"].strip()
             if not raw_val:
                 raise ValueError("LLM returned empty JSON object.")
-                
+
             content_str = raw_val
             if content_str.startswith("```json"):
                 content_str = content_str[7:-3].strip()
             elif content_str.startswith("```"):
                 content_str = content_str[3:-3].strip()
-                
+
             data = json.loads(content_str)
             return TroubleshootResponse(**data)
-            
-        except urllib.error.URLError:
+
+        except (urllib.error.URLError, ConnectionError, OSError):
             raise  # Ollama not reachable — don't retry, bubble up to cli
         except Exception as e:
             last_error = e
             msgs.append({"role": "assistant", "content": raw_val})
-            msgs.append({"role": "user", "content": f"Your JSON output failed validation: {str(e)}\nFix the syntax and output ONLY strict JSON schema."})
+            msgs.append(
+                {
+                    "role": "user",
+                    "content": f"Your JSON output failed validation: {str(e)}\nFix the syntax and output ONLY strict JSON schema.",
+                }
+            )
 
     return TroubleshootResponse(
         command=None,
         explanation=f"Error analyzing execution after {max_retries} retries: {str(last_error)}\nRaw Output:\n{raw_val}",
-        is_resolved=False
+        is_resolved=False,
     )

{hey_cli_python-1.0.5 → hey_cli_python-1.0.7}/hey_cli_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hey-cli-python
-Version: 1.0.5
+Version: 1.0.7
 Summary: A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands.
 Author: Mohit Singh Sinsniwal
 Project-URL: Homepage, https://github.com/sinsniwal/hey-cli

{hey_cli_python-1.0.5 → hey_cli_python-1.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hey-cli-python"
-version = "1.0.5"
+version = "1.0.7"
 description = "A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands."
 readme = "README.md"
 requires-python = ">=3.9"