refactor, Introduce model method for model ID without provider prefix

Author: zimmski

model/llm/llm.go

@@ -73,11 +73,21 @@ func (m *Model) ID() (id string) {
 	return m.id
 }
 
-// ModelID returns the unique identifier of this model.
+// ModelID returns the unique identifier of this model with its provider.
 func (m *Model) ModelID() (modelID string) {
 	return m.modelID
 }
 
+// ModelIDWithoutProvider returns the unique identifier of this model without its provider.
+func (m *Model) ModelIDWithoutProvider() (modelID string) {
+	_, modelID, ok := strings.Cut(m.modelID, provider.ProviderModelSeparator)
+	if !ok {
+		panic(m.modelID)
+	}
+
+	return modelID
+}
+
 // Attributes returns query attributes.
 func (m *Model) Attributes() (attributes map[string]string) {
 	return m.attributes

model/model.go

@@ -11,8 +11,10 @@ import (
 type Model interface {
 	// ID returns full identifier, including the provider and attributes.
 	ID() (id string)
-	// ModelID returns the unique identifier of this model.
+	// ModelID returns the unique identifier of this model with its provider.
 	ModelID() (modelID string)
+	// ModelIDWithoutProvider returns the unique identifier of this model without its provider.
+	ModelIDWithoutProvider() (modelID string)
 
 	// Attributes returns query attributes.
 	Attributes() (attributes map[string]string)

model/symflower/symflower.go

@@ -67,11 +67,16 @@ func (m *Model) ID() (id string) {
 	return "symflower" + provider.ProviderModelSeparator + m.id
 }
 
-// ModelID returns the unique identifier of this model.
+// ModelID returns the unique identifier of this model with its provider.
 func (m *Model) ModelID() (modelID string) {
 	return "symflower" + provider.ProviderModelSeparator + m.id
 }
 
+// ModelIDWithoutProvider returns the unique identifier of this model without its provider.
+func (m *Model) ModelIDWithoutProvider() (modelID string) {
+	return m.id
+}
+
 // Attributes returns query attributes.
 func (m *Model) Attributes() (attributes map[string]string) {
 	return nil

model/testing/Model_mock_gen.go

@@ -82,10 +82,7 @@ var _ provider.Query = (*Provider)(nil)
 
 // Query queries the provider with the given model name.
 func (p *Provider) Query(ctx context.Context, model model.Model, promptText string) (response string, err error) {
-	client := p.client()
-	modelIdentifier := strings.TrimPrefix(model.ModelID(), p.ID()+provider.ProviderModelSeparator)
-
-	return openaiapi.QueryOpenAIAPIModel(ctx, client, modelIdentifier, model.Attributes(), promptText)
+	return openaiapi.QueryOpenAIAPIModel(ctx, p.client(), model.ModelIDWithoutProvider(), model.Attributes(), promptText)
 }
 
 // client returns a new client with the current configuration.

provider/ollama/ollama.go

@@ -2,7 +2,6 @@ package openaiapi
 
 import (
 	"context"
-	"strings"
 
 	"github.com/sashabaranov/go-openai"
 
@@ -61,10 +60,7 @@ var _ provider.Query = (*Provider)(nil)
 
 // Query queries the provider with the given model name.
 func (p *Provider) Query(ctx context.Context, model model.Model, promptText string) (response string, err error) {
-	client := p.client()
-	modelIdentifier := strings.TrimPrefix(model.ModelID(), p.ID()+provider.ProviderModelSeparator)
-
-	return QueryOpenAIAPIModel(ctx, client, modelIdentifier, model.Attributes(), promptText)
+	return QueryOpenAIAPIModel(ctx, p.client(), model.ModelIDWithoutProvider(), model.Attributes(), promptText)
 }
 
 // client returns a new client with the current configuration.

provider/openai-api/openai.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"strings"
 	"time"
 
 	"github.com/avast/retry-go"
@@ -139,10 +138,7 @@ var _ provider.Query = (*Provider)(nil)
 
 // Query queries the provider with the given model name.
 func (p *Provider) Query(ctx context.Context, model model.Model, promptText string) (response string, err error) {
-	client := p.client()
-	modelIdentifier := strings.TrimPrefix(model.ModelID(), p.ID()+provider.ProviderModelSeparator)
-
-	return openaiapi.QueryOpenAIAPIModel(ctx, client, modelIdentifier, model.Attributes(), promptText)
+	return openaiapi.QueryOpenAIAPIModel(ctx, p.client(), model.ModelIDWithoutProvider(), model.Attributes(), promptText)
 }
 
 // client returns a new client with the current configuration.