alihan/crush-code-agent-ide
1
0
Fork 0
mirror of https://github.com/charmbracelet/crush.git synced 2025-08-02 05:20:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore: small fix

Browse Source
This commit is contained in:
Kujtim Hoxha
2025-07-30 16:01:03 +02:00
parent 30b508fc5d
commit c5d7e901fd
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/llm/agent/agent.go
View File

@@ -420,6 +420,12 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string
msgHistory = append(msgHistory, agentMessage, *toolResults)
continue
}
if agentMessage.FinishReason() == "" {
// Kujtim: could not track down where this is happening but this means its cancelled
agentMessage.AddFinish(message.FinishReasonCanceled, "Request cancelled", "")
_ = a.messages.Update(context.Background(), agentMessage)
return a.err(ErrRequestCancelled)
}
return AgentEvent{
Type: AgentEventTypeResponse,
Message: agentMessage,

52
internal/llm/provider/openai.go
View File

@@ -319,6 +319,10 @@ func (o *openaiClient) stream(ctx context.Context, messages []message.Message, t
go func() {
for {
attempts++
// Kujtim: fixes an issue with anthropig models on openrouter
if len(params.Tools) == 0 {
params.Tools = nil
}
openaiStream := o.client.Chat.Completions.NewStreaming(
ctx,
params,
@@ -484,31 +488,41 @@ func (o *openaiClient) stream(ctx context.Context, messages []message.Message, t
}
func (o *openaiClient) shouldRetry(attempts int, err error) (bool, int64, error) {
var apiErr *openai.Error
if !errors.As(err, &apiErr) {
return false, 0, err
}
if attempts > maxRetries {
return false, 0, fmt.Errorf("maximum retry attempts reached for rate limit: %d retries", maxRetries)
}
// Check for token expiration (401 Unauthorized)
if apiErr.StatusCode == 401 {
o.providerOptions.apiKey, err = config.Get().Resolve(o.providerOptions.config.APIKey)
if err != nil {
return false, 0, fmt.Errorf("failed to resolve API key: %w", err)
}
o.client = createOpenAIClient(o.providerOptions)
return true, 0, nil
}
if apiErr.StatusCode != 429 && apiErr.StatusCode != 500 {
if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
return false, 0, err
}
var apiErr *openai.Error
retryMs := 0
retryAfterValues := apiErr.Response.Header.Values("Retry-After")
retryAfterValues := []string{}
if errors.As(err, &apiErr) {
// Check for token expiration (401 Unauthorized)
if apiErr.StatusCode == 401 {
o.providerOptions.apiKey, err = config.Get().Resolve(o.providerOptions.config.APIKey)
if err != nil {
return false, 0, fmt.Errorf("failed to resolve API key: %w", err)
}
o.client = createOpenAIClient(o.providerOptions)
return true, 0, nil
}
if apiErr.StatusCode != 429 && apiErr.StatusCode != 500 {
return false, 0, err
}
retryAfterValues = apiErr.Response.Header.Values("Retry-After")
}
if apiErr != nil {
slog.Warn("OpenAI API error", "status_code", apiErr.StatusCode, "message", apiErr.Message, "type", apiErr.Type)
if len(retryAfterValues) > 0 {
slog.Warn("Retry-After header", "values", retryAfterValues)
}
} else {
slog.Warn("OpenAI API error", "error", err.Error())
}
backoffMs := 2000 * (1 << (attempts - 1))
jitterMs := int(float64(backoffMs) * 0.2)