hey-cli-python 1.0.0__tar.gz → 1.0.1__tar.gz

{hey_cli_python-1.0.0 → hey_cli_python-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hey-cli-python
-Version: 1.0.0
+Version: 1.0.1
 Summary: A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands.
 Author: Mohit S.
 Project-URL: Homepage, https://github.com/sinsniwal/hey-cli
@@ -21,7 +21,6 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pydantic>=2.0.0
 Requires-Dist: ollama>=0.1.0
 Requires-Dist: rich>=13.0.0
 Dynamic: license-file

{hey_cli_python-1.0.0 → hey_cli_python-1.0.1}/hey_cli/llm.py

@@ -46,45 +46,52 @@ def generate_command(prompt: str, context: str = "", model_name: str = DEFAULT_M
     if context:
         content = f"Context (e.g. error logs or piped data):\n{context}\n\nObjective:\n{prompt}"
         
-    try:
-        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})
-        
-        response = ollama.chat(
-            model=model_name,
-            messages=msgs,
-            format="json",
-            options={"temperature": 0.0}
-        )
-        
-        content = response["message"]["content"]
-        # In case ollama returns markdown format code block for JSON
-        if content.startswith("```json"):
-            content = content[7:-3].strip()
-        elif content.startswith("```"):
-            content = content[3:-3].strip()
-            
-        data = json.loads(content)
-        return CommandResponse(**data)
-    except Exception as e:
-        raw_val = content if 'content' in locals() else "None"
-        
-        # Check if the error was caused by a safety refusal schema validation failure
-        if "refusal" in raw_val.lower() or "sorry" in raw_val.lower():
-            return CommandResponse(
-                command="",
-                explanation=f"LLM Safety Trigger: The model refused to generate this command.\n\nRaw output: {raw_val.strip()}",
-                needs_context=False
+    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"
+
+    for attempt in range(max_retries):
+        try:
+            response = ollama.chat(
+                model=model_name,
+                messages=msgs,
+                format="json",
+                options={"temperature": 0.0}
             )
             
-        # Fallback empty block on failure
-        return CommandResponse(
-            command="", 
-            explanation=f"Error generating command from LLM: {str(e)}\nRaw Output:\n{raw_val}"
-        )
+            raw_val = response["message"]["content"]
+            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 CommandResponse(**data)
+            
+        except Exception as e:
+            last_error = e
+            if "refusal" in raw_val.lower() or "sorry" in raw_val.lower():
+                return CommandResponse(
+                    command="",
+                    explanation=f"LLM Safety Trigger: The model refused to generate this command.\n\nRaw output: {raw_val.strip()}",
+                    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."})
+
+    return CommandResponse(
+        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([
@@ -94,37 +101,45 @@ def generate_troubleshoot_step(objective: str, history: list, model_name: str =
     
     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."
     
-    try:
-        sys_context = f"--- ENVIRONMENT ---\n{get_system_context()}\n-------------------\n"
-        response = ollama.chat(
-            model=model_name,
-            messages=[
-                {"role": "system", "content": SYSTEM_PROMPT + "\n" + TROUBLESHOOT_PROMPT + "\n\n" + sys_context},
-                {"role": "user", "content": content}
-            ],
-            format="json",
-            options={"temperature": 0.0}
-        )
-        
-        content = response["message"]["content"].strip()
-        if not content:
-            return TroubleshootResponse(
-                command=None,
-                explanation="LLM returned empty JSON object.",
-                is_resolved=False
+    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}
+    ]
+    
+    max_retries = 3
+    last_error = None
+    raw_val = "None"
+
+    for attempt in range(max_retries):
+        try:
+            response = ollama.chat(
+                model=model_name,
+                messages=msgs,
+                format="json",
+                options={"temperature": 0.0}
             )
             
-        if content.startswith("```json"):
-            content = content[7:-3].strip()
-        elif content.startswith("```"):
-            content = content[3:-3].strip()
+            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)
             
-        data = json.loads(content)
-        return TroubleshootResponse(**data)
-    except Exception as e:
-        raw_val = content if 'content' in locals() else "None"
-        return TroubleshootResponse(
-            command=None,
-            explanation=f"Error analyzing execution: {str(e)}\nRaw Output:\n{raw_val}",
-            is_resolved=False
-        )
+        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."})
+
+    return TroubleshootResponse(
+        command=None,
+        explanation=f"Error analyzing execution after {max_retries} retries: {str(last_error)}\nRaw Output:\n{raw_val}",
+        is_resolved=False
+    )

{hey_cli_python-1.0.0 → hey_cli_python-1.0.1}/hey_cli/models.py

@@ -1,12 +1,14 @@
-from pydantic import BaseModel, ConfigDict
+from dataclasses import dataclass
 from typing import Optional
 
-class CommandResponse(BaseModel):
+@dataclass
+class CommandResponse:
     command: str
     explanation: str = ""
     needs_context: bool = False
 
-class TroubleshootResponse(BaseModel):
+@dataclass
+class TroubleshootResponse:
     command: Optional[str] = None
     explanation: str = ""
     is_resolved: bool = False

{hey_cli_python-1.0.0 → hey_cli_python-1.0.1}/hey_cli_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hey-cli-python
-Version: 1.0.0
+Version: 1.0.1
 Summary: A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands.
 Author: Mohit S.
 Project-URL: Homepage, https://github.com/sinsniwal/hey-cli
@@ -21,7 +21,6 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pydantic>=2.0.0
 Requires-Dist: ollama>=0.1.0
 Requires-Dist: rich>=13.0.0
 Dynamic: license-file

{hey_cli_python-1.0.0 → hey_cli_python-1.0.1}/hey_cli_python.egg-info/requires.txt

@@ -1,3 +1,2 @@
-pydantic>=2.0.0
 ollama>=0.1.0
 rich>=13.0.0

{hey_cli_python-1.0.0 → hey_cli_python-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hey-cli-python"
-version = "1.0.0"
+version = "1.0.1"
 description = "A secure, zero-bloat CLI companion that turns natural language and error logs into executable commands."
 readme = "README.md"
 requires-python = ">=3.9"
@@ -26,7 +26,6 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
-    "pydantic>=2.0.0",
     "ollama>=0.1.0",
     "rich>=13.0.0"
 ]