"Update HTTPProvider to require stream in payload for /api/generate endpoint"

Author: manyfacedqod

llm/http.go

@@ -13,52 +13,60 @@ import (
 )
 
 type HTTPProvider struct {
-    cfg *config.Config
+	cfg *config.Config
 }
 
 func NewHTTPProvider(cfg *config.Config) (*HTTPProvider, error) {
-    if cfg.BaseURL == "" || cfg.Model == "" {
-        return nil, errors.New("base_url and model required")
-    }
-    return &HTTPProvider{cfg}, nil
+	if cfg.BaseURL == "" || cfg.Model == "" {
+		return nil, errors.New("base_url and model required")
+	}
+	return &HTTPProvider{cfg}, nil
 }
 
 func (h *HTTPProvider) Generate(prompt string) (string, error) {
-    payload := map[string]interface{}{
-        "model":  h.cfg.Model,
-        "prompt": prompt,
-    }
-    body, _ := json.Marshal(payload)
+	payload := map[string]interface{}{
+		"model":  h.cfg.Model,
+		"prompt": prompt,
+		"stream": false, // required for /api/generate
+	}
 
-    req, err := http.NewRequest("POST", h.cfg.BaseURL, bytes.NewReader(body))
-    if err != nil {
-        return "", err
-    }
-    req.Header.Set("Content-Type", "application/json")
-    if h.cfg.APIKey != "" {
-        req.Header.Set("Authorization", "Bearer "+h.cfg.APIKey)
-    }
-    for k, v := range h.cfg.Headers {
-        req.Header.Set(k, v)
-    }
+	body, _ := json.Marshal(payload)
 
-    resp, err := http.DefaultClient.Do(req)
-    if err != nil {
-        return "", err
-    }
-    defer resp.Body.Close()
-    out, _ := io.ReadAll(resp.Body)
+	req, err := http.NewRequest("POST", h.cfg.BaseURL, bytes.NewReader(body))
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	if h.cfg.APIKey != "" {
+		req.Header.Set("Authorization", "Bearer "+h.cfg.APIKey)
+	}
+	for k, v := range h.cfg.Headers {
+		req.Header.Set(k, v)
+	}
 
-    var js map[string]interface{}
-    if err := json.Unmarshal(out, &js); err != nil {
-        return "", err
-    }
-    // Try common fields
-    if v, ok := js["response"]; ok {
-        return strings.TrimSpace(v.(string)), nil
-    }
-    if v, ok := js["content"]; ok {
-        return strings.TrimSpace(v.(string)), nil
-    }
-    return "", fmt.Errorf("unexpected response: %s", string(out))
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+
+	out, _ := io.ReadAll(resp.Body)
+
+	var res struct {
+		Response string `json:"response"`
+		Content  string `json:"content"`
+	}
+
+	if err := json.Unmarshal(out, &res); err != nil {
+		return "", fmt.Errorf("failed to parse response: %w", err)
+	}
+
+	switch {
+	case res.Response != "":
+		return strings.TrimSpace(res.Response), nil
+	case res.Content != "":
+		return strings.TrimSpace(res.Content), nil
+	default:
+		return "", fmt.Errorf("no usable content in response: %s", string(out))
+	}
 }