Merge pull request #684 from thedadams/default-model-provider-set-model

thedadams · web-flow · commit c94dd107c162 · 2024-07-31T18:02:15.000-04:00
fix: ensure default model is parsed when using default model provider
diff --git a/pkg/remote/remote.go b/pkg/remote/remote.go
@@ -51,7 +51,12 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 		return nil, fmt.Errorf("failed to find remote model %s", messageRequest.Model)
 	}
 
-	_, modelName := types.SplitToolRef(messageRequest.Model)
+	toolName, modelName := types.SplitToolRef(messageRequest.Model)
+	if modelName == "" {
+		// modelName is empty, then the messageRequest.Model is not of the form 'modelName from provider'
+		// Therefore, the modelName is the toolName
+		modelName = toolName
+	}
 	messageRequest.Model = modelName
 	return client.Call(ctx, messageRequest, status)
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,12 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques`
`51`	`51`	`return nil, fmt.Errorf("failed to find remote model %s", messageRequest.Model)`
`52`	`52`	`}`
`53`	`53`
`54`		`- _, modelName := types.SplitToolRef(messageRequest.Model)`
	`54`	`+ toolName, modelName := types.SplitToolRef(messageRequest.Model)`
	`55`	`+ if modelName == "" {`
	`56`	`+ // modelName is empty, then the messageRequest.Model is not of the form 'modelName from provider'`
	`57`	`+ // Therefore, the modelName is the toolName`
	`58`	`+ modelName = toolName`
	`59`	`+ }`
`55`	`60`	`messageRequest.Model = modelName`
`56`	`61`	`return client.Call(ctx, messageRequest, status)`
`57`	`62`	`}`