Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: add timeout to the ollama plugin #1040

Merged
merged 2 commits into from
Oct 28, 2024
Merged

Fix: add timeout to the ollama plugin #1040

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3b5070
Fix: add timeout to the ollama plugin
alonsopec89 Oct 11, 2024
f83faac
Merge branch 'main' into 719-golang-ollama-plugin-uses-a-fixed-30s-ti…
alonsopec89 Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions go/plugins/ollama/ollama.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ var state struct {
mu sync.Mutex
initted bool
serverAddress string
timeout int
}

func DefineModel(model ModelDefinition, caps *ai.ModelCapabilities) ai.Model {
Expand All @@ -67,7 +68,7 @@ func DefineModel(model ModelDefinition, caps *ai.ModelCapabilities) ai.Model {
Label: "Ollama - " + model.Name,
Supports: mc,
}
g := &generator{model: model, serverAddress: state.serverAddress}
g := &generator{model: model, serverAddress: state.serverAddress, timeout: state.timeout}
return ai.DefineModel(provider, model.Name, meta, g.generate)

}
Expand All @@ -92,6 +93,7 @@ type ModelDefinition struct {
type generator struct {
model ModelDefinition
serverAddress string
timeout int
}

type ollamaMessage struct {
Expand Down Expand Up @@ -148,6 +150,7 @@ type ollamaGenerateResponse struct {
type Config struct {
// Server Address of oLLama.
ServerAddress string
Timeout int
}

// Init initializes the plugin.
Expand All @@ -162,6 +165,10 @@ func Init(ctx context.Context, cfg *Config) (err error) {
if cfg == nil || cfg.ServerAddress == "" {
return errors.New("ollama: need ServerAddress")
}
if cfg.Timeout == 0 {
cfg.Timeout = 30
}
state.timeout = cfg.Timeout
state.serverAddress = cfg.ServerAddress
state.initted = true
return nil
Expand Down Expand Up @@ -201,7 +208,7 @@ func (g *generator) generate(ctx context.Context, input *ai.GenerateRequest, cb
Stream: stream,
}
}
client := &http.Client{Timeout: 30 * time.Second}
client := &http.Client{Timeout: time.Duration(g.timeout) * time.Second}
payloadBytes, err := json.Marshal(payload)
if err != nil {
return nil, err
Expand Down
Loading