Better encapsulation

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

pkg/model/provider/anthropic/client.go

@@ -121,7 +121,7 @@ func NewClient(ctx context.Context, cfg *latest.ModelConfig, env environment.Pro
 
 	slog.Debug("Anthropic client created successfully", "model", cfg.Model)
 
-	if globalOptions.StructuredOutput != nil {
+	if globalOptions.StructuredOutput() != nil {
 		return &Client{}, errors.New("anthropic does not support native structured_output")
 	}
 

pkg/model/provider/dmr/client.go

@@ -384,15 +384,16 @@ func (c *Client) CreateChatCompletionStream(ctx context.Context, messages []chat
 	} else {
 		slog.Error("Failed to marshal DMR request to JSON", "error", err)
 	}
-	if c.ModelOptions.StructuredOutput != nil {
-		slog.Debug("Adding structured output to DMR request", "structured_output", c.ModelOptions.StructuredOutput)
+	if structuredOutput := c.ModelOptions.StructuredOutput(); structuredOutput != nil {
+		slog.Debug("Adding structured output to DMR request", "structured_output", structuredOutput)
+
 		request.ResponseFormat = &openai.ChatCompletionResponseFormat{
 			Type: openai.ChatCompletionResponseFormatTypeJSONSchema,
 			JSONSchema: &openai.ChatCompletionResponseFormatJSONSchema{
-				Name:        c.ModelOptions.StructuredOutput.Name,
-				Description: c.ModelOptions.StructuredOutput.Description,
-				Schema:      jsonSchema(c.ModelOptions.StructuredOutput.Schema),
-				Strict:      c.ModelOptions.StructuredOutput.Strict,
+				Name:        structuredOutput.Name,
+				Description: structuredOutput.Description,
+				Schema:      jsonSchema(structuredOutput.Schema),
+				Strict:      structuredOutput.Strict,
 			},
 		}
 	}

pkg/model/provider/gemini/client.go

@@ -251,9 +251,9 @@ func (c *Client) buildConfig() *genai.GenerateContentConfig {
 		}
 	}
 
-	if c.ModelOptions.StructuredOutput != nil {
+	if structuredOutput := c.ModelOptions.StructuredOutput(); structuredOutput != nil {
 		config.ResponseMIMEType = "application/json"
-		config.ResponseJsonSchema = c.ModelOptions.StructuredOutput.Schema
+		config.ResponseJsonSchema = structuredOutput.Schema
 	}
 
 	return config

pkg/model/provider/openai/client.go

@@ -283,17 +283,18 @@ func (c *Client) CreateChatCompletionStream(
 	}
 
 	// Apply structured output configuration
-	if c.ModelOptions.StructuredOutput != nil {
+	if structuredOutput := c.ModelOptions.StructuredOutput(); structuredOutput != nil {
+		slog.Debug("OpenAI request using structured output", "name", structuredOutput.Name, "strict", structuredOutput.Strict)
+
 		request.ResponseFormat = &openai.ChatCompletionResponseFormat{
 			Type: openai.ChatCompletionResponseFormatTypeJSONSchema,
 			JSONSchema: &openai.ChatCompletionResponseFormatJSONSchema{
-				Name:        c.ModelOptions.StructuredOutput.Name,
-				Description: c.ModelOptions.StructuredOutput.Description,
-				Schema:      jsonSchema(c.ModelOptions.StructuredOutput.Schema),
-				Strict:      c.ModelOptions.StructuredOutput.Strict,
+				Name:        structuredOutput.Name,
+				Description: structuredOutput.Description,
+				Schema:      jsonSchema(structuredOutput.Schema),
+				Strict:      structuredOutput.Strict,
 			},
 		}
-		slog.Debug("OpenAI request using structured output", "name", c.ModelOptions.StructuredOutput.Name, "strict", c.ModelOptions.StructuredOutput.Strict)
 	}
 
 	// Log the request in JSON format for debugging

pkg/model/provider/options/options.go

@@ -6,13 +6,17 @@ import (
 
 type ModelOptions struct {
 	gateway          string
-	StructuredOutput *latest.StructuredOutput
+	structuredOutput *latest.StructuredOutput
 }
 
 func (c *ModelOptions) Gateway() string {
 	return c.gateway
 }
 
+func (c *ModelOptions) StructuredOutput() *latest.StructuredOutput {
+	return c.structuredOutput
+}
+
 type Opt func(*ModelOptions)
 
 func WithGateway(gateway string) Opt {
@@ -21,9 +25,9 @@ func WithGateway(gateway string) Opt {
 	}
 }
 
-func WithStructuredOutput(output *latest.StructuredOutput) Opt {
+func WithStructuredOutput(structuredOutput *latest.StructuredOutput) Opt {
 	return func(cfg *ModelOptions) {
-		cfg.StructuredOutput = output
+		cfg.structuredOutput = structuredOutput
 	}
 }
 
@@ -34,8 +38,8 @@ func FromModelOptions(m ModelOptions) []Opt {
 	if g := m.Gateway(); g != "" {
 		out = append(out, WithGateway(g))
 	}
-	if m.StructuredOutput != nil {
-		out = append(out, WithStructuredOutput(m.StructuredOutput))
+	if m.structuredOutput != nil {
+		out = append(out, WithStructuredOutput(m.structuredOutput))
 	}
 	return out
 }