Skip to content

Commit 5edb6f3

Browse files
authored
small changes to wave ai error handling (#2520)
1 parent a23bbc0 commit 5edb6f3

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

frontend/app/aipanel/aipanel.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,6 @@ const AIPanelComponentInner = memo(() => {
239239
onError: (error) => {
240240
console.error("AI Chat error:", error);
241241
model.setError(error.message || "An error occurred");
242-
setMessages((prevMessages) => {
243-
if (prevMessages.length > 0 && prevMessages[prevMessages.length - 1].role === "user") {
244-
return prevMessages.slice(0, -1);
245-
}
246-
return prevMessages;
247-
});
248242
},
249243
});
250244

pkg/aiusechat/openai/openai-backend.go

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,22 @@ import (
2525
"github.com/wavetermdev/waveterm/pkg/web/sse"
2626
)
2727

28+
// sanitizeHostnameInError removes the specific hostname from error messages
29+
func sanitizeHostnameInError(err error, baseURL string) error {
30+
if err == nil {
31+
return nil
32+
}
33+
34+
errStr := err.Error()
35+
parsedURL, parseErr := url.Parse(baseURL)
36+
if parseErr == nil && parsedURL.Host != "" {
37+
errStr = strings.ReplaceAll(errStr, baseURL, "AI service")
38+
errStr = strings.ReplaceAll(errStr, parsedURL.Host, "host")
39+
}
40+
41+
return fmt.Errorf("%s", errStr)
42+
}
43+
2844
// ---------- OpenAI wire types (subset) ----------
2945

3046
type OpenAIChatMessage struct {
@@ -495,7 +511,7 @@ func RunOpenAIChatStep(
495511

496512
resp, err := httpClient.Do(req)
497513
if err != nil {
498-
return nil, nil, nil, err
514+
return nil, nil, nil, sanitizeHostnameInError(err, chatOpts.Config.BaseURL)
499515
}
500516
defer resp.Body.Close()
501517

0 commit comments

Comments
 (0)