tenseleyflow/parrot / f52cbf3

Browse files

Fix double output and backend fallback issues

- Prevent duplicate messages on shell reload
- Fix localhost IPv6 resolution issues
- Fix HTTP timeout handling
- Fix error response body reading

Co-authored-by: espadonne <espadonne@outlook.com>
Co-authored-by: mfwolffe <wolffemf@dukes.jmu.edu>
Authored by Claude <noreply@anthropic.com>
SHA
f52cbf34f17df4063916ba4355a01b4b5f147304
Parents
4a1b647
Tree
2ade231

6 changed files

StatusFile+-
M config/parrot.toml.example 2 1
M internal/llm/api.go 2 1
M internal/llm/manager.go 8 3
M internal/llm/ollama.go 6 3
M parrot-hook.sh 31 17
M test-config.toml 1 1
config/parrot.toml.examplemodified
@@ -39,7 +39,8 @@ timeout = 30
39
39
40
 [local]
40
 [local]
41
 # Ollama server endpoint
41
 # Ollama server endpoint
42
-base_url = "http://localhost:11434"
42
+# Note: Use 127.0.0.1 instead of localhost to avoid IPv6 resolution issues
43
+base_url = "http://127.0.0.1:11434"
43
 
44
 
44
 # Model to use (will be pulled automatically if not present)
45
 # Model to use (will be pulled automatically if not present)
45
 # llama3.2:3b - Fast loading, good quality for CLI responses
46
 # llama3.2:3b - Fast loading, good quality for CLI responses
internal/llm/api.gomodified
@@ -50,7 +50,8 @@ func NewAPIClient(endpoint, apiKey, model string, timeout int) *APIClient {
50
 		APIKey:   apiKey,
50
 		APIKey:   apiKey,
51
 		Model:    model,
51
 		Model:    model,
52
 		client: &http.Client{
52
 		client: &http.Client{
53
-			Timeout: time.Duration(timeout) * time.Second,
53
+			// Use a generous timeout; actual timeout is controlled by context
54
+			Timeout: 60 * time.Second,
54
 		},
55
 		},
55
 	}
56
 	}
56
 }
57
 }
internal/llm/manager.gomodified
@@ -73,8 +73,13 @@ func (m *LLMManager) Generate(ctx context.Context, prompt string, commandType st
73
 		if m.config.General.Debug {
73
 		if m.config.General.Debug {
74
 			fmt.Printf("🔍 Trying API backend...\n")
74
 			fmt.Printf("🔍 Trying API backend...\n")
75
 		}
75
 		}
76
-		
76
+
77
-		response, err := m.apiClient.Generate(ctx, prompt)
77
+		// Create timeout context for API calls
78
+		timeoutDuration := time.Duration(m.config.API.Timeout) * time.Second
79
+		apiCtx, cancel := context.WithTimeout(ctx, timeoutDuration)
80
+		defer cancel()
81
+
82
+		response, err := m.apiClient.Generate(apiCtx, prompt)
78
 		if err == nil && response != "" {
83
 		if err == nil && response != "" {
79
 			response = m.cleanResponse(response)
84
 			response = m.cleanResponse(response)
80
 			if m.config.General.Debug {
85
 			if m.config.General.Debug {
@@ -82,7 +87,7 @@ func (m *LLMManager) Generate(ctx context.Context, prompt string, commandType st
82
 			}
87
 			}
83
 			return response, BackendAPI
88
 			return response, BackendAPI
84
 		}
89
 		}
85
-		
90
+
86
 		if m.config.General.Debug {
91
 		if m.config.General.Debug {
87
 			fmt.Printf("❌ API backend failed: %v\n", err)
92
 			fmt.Printf("❌ API backend failed: %v\n", err)
88
 		}
93
 		}
internal/llm/ollama.gomodified
@@ -39,7 +39,7 @@ func NewOllamaClient(baseURL, model string) *OllamaClient {
39
 		BaseURL: baseURL,
39
 		BaseURL: baseURL,
40
 		Model:   model,
40
 		Model:   model,
41
 		client: &http.Client{
41
 		client: &http.Client{
42
-			Timeout: 10 * time.Second, // More reasonable timeout for CLI
42
+			Timeout: 60 * time.Second, // Maximum timeout; actual timeout controlled by context
43
 		},
43
 		},
44
 	}
44
 	}
45
 }
45
 }
@@ -74,8 +74,11 @@ func (c *OllamaClient) Generate(ctx context.Context, prompt string) (string, err
74
 	defer resp.Body.Close()
74
 	defer resp.Body.Close()
75
 
75
 
76
 	if resp.StatusCode != http.StatusOK {
76
 	if resp.StatusCode != http.StatusOK {
77
-		body, _ := json.Marshal(resp.Body)
77
+		// Read the actual error response body
78
-		return "", fmt.Errorf("ollama API returned status %d: %s", resp.StatusCode, string(body))
78
+		bodyBytes := make([]byte, 512) // Read first 512 bytes for error message
79
+		n, _ := resp.Body.Read(bodyBytes)
80
+		bodyStr := string(bodyBytes[:n])
81
+		return "", fmt.Errorf("ollama API returned status %d: %s", resp.StatusCode, bodyStr)
79
 	}
82
 	}
80
 
83
 
81
 	var genResp GenerateResponse
84
 	var genResp GenerateResponse
parrot-hook.shmodified
@@ -50,22 +50,36 @@ parrot_precmd() {
50
     fi
50
     fi
51
 }
51
 }
52
 
52
 
53
-# Setup based on shell type
53
+# Setup based on shell type (only show messages if not already initialized)
54
-if [ -n "$BASH_VERSION" ]; then
54
+if [ -z "$PARROT_INITIALIZED" ]; then
55
-    # Bash setup
55
+    if [ -n "$BASH_VERSION" ]; then
56
-    PROMPT_COMMAND="parrot_prompt_command${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
56
+        # Bash setup
57
-    echo "🦜 Parrot is now watching your bash commands..."
57
+        PROMPT_COMMAND="parrot_prompt_command${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
58
-elif [ -n "$ZSH_VERSION" ]; then
58
+        echo "🦜 Parrot is now watching your bash commands..."
59
-    # Zsh setup
59
+    elif [ -n "$ZSH_VERSION" ]; then
60
-    autoload -Uz add-zsh-hook
60
+        # Zsh setup
61
-    add-zsh-hook preexec parrot_preexec
61
+        autoload -Uz add-zsh-hook
62
-    add-zsh-hook precmd parrot_precmd
62
+        add-zsh-hook preexec parrot_preexec
63
-    echo "🦜 Parrot is now watching your zsh commands..."
63
+        add-zsh-hook precmd parrot_precmd
64
-else
64
+        echo "🦜 Parrot is now watching your zsh commands..."
65
-    echo "⚠️  Parrot: Unsupported shell. Only bash and zsh are supported."
65
+    else
66
-fi
66
+        echo "⚠️  Parrot: Unsupported shell. Only bash and zsh are supported."
67
+    fi
68
+
69
+    # Show performance tip
70
+    if [ "${PARROT_ASYNC:-}" != "true" ]; then
71
+        echo "💡 Tip: Set PARROT_ASYNC=true to prevent terminal hangs on slow networks"
72
+    fi
67
 
73
 
68
-# Show performance tip
74
+    # Mark as initialized for this shell session
69
-if [ "${PARROT_ASYNC:-}" != "true" ]; then
75
+    export PARROT_INITIALIZED=1
70
-    echo "💡 Tip: Set PARROT_ASYNC=true to prevent terminal hangs on slow networks"
76
+else
77
+    # Silent re-initialization (e.g., when sourcing .zshrc again)
78
+    if [ -n "$BASH_VERSION" ]; then
79
+        PROMPT_COMMAND="parrot_prompt_command${PROMPT_COMMAND:+;$PROMPT_COMMAND}"
80
+    elif [ -n "$ZSH_VERSION" ]; then
81
+        autoload -Uz add-zsh-hook
82
+        add-zsh-hook preexec parrot_preexec
83
+        add-zsh-hook precmd parrot_precmd
84
+    fi
71
 fi
85
 fi
test-config.tomlmodified
@@ -9,7 +9,7 @@ 
9
 [local]
9
 [local]
10
   enabled = true
10
   enabled = true
11
   provider = "ollama"
11
   provider = "ollama"
12
-  endpoint = "http://localhost:11434"
12
+  endpoint = "http://127.0.0.1:11434"
13
   model = "phi3.5:3.8b"
13
   model = "phi3.5:3.8b"
14
   timeout = 30
14
   timeout = 30
15
 
15