fix: rename watsonxai to ibmwatsonxai (#1234)

Signed-off-by: Guangya Liu <gyliu@ibm.com>
Co-authored-by: Alex Jones <alexsimonjones@gmail.com>
Signed-off-by: AlexsJones <alexsimonjones@gmail.com>
This commit is contained in:
Guangya Liu 2024-09-24 16:58:01 -04:00 committed by AlexsJones
parent 461f715fb8
commit 8e4f56ae28
4 changed files with 12 additions and 11 deletions

View File

@ -343,7 +343,7 @@ Unused:
> huggingface > huggingface
> noopai > noopai
> googlevertexai > googlevertexai
> watsonxai > ibmwatsonxai
``` ```
For detailed documentation on how to configure and use each provider see [here](https://docs.k8sgpt.ai/reference/providers/backend/). For detailed documentation on how to configure and use each provider see [here](https://docs.k8sgpt.ai/reference/providers/backend/).

View File

@ -48,7 +48,7 @@ var addCmd = &cobra.Command{
if strings.ToLower(backend) == "amazonbedrock" { if strings.ToLower(backend) == "amazonbedrock" {
_ = cmd.MarkFlagRequired("providerRegion") _ = cmd.MarkFlagRequired("providerRegion")
} }
if strings.ToLower(backend) == "watsonxai" { if strings.ToLower(backend) == "ibmwatsonxai" {
_ = cmd.MarkFlagRequired("providerId") _ = cmd.MarkFlagRequired("providerId")
} }
}, },
@ -180,7 +180,7 @@ func init() {
//add flag for amazonbedrock region name //add flag for amazonbedrock region name
addCmd.Flags().StringVarP(&providerRegion, "providerRegion", "r", "", "Provider Region name (only for amazonbedrock, googlevertexai backend)") addCmd.Flags().StringVarP(&providerRegion, "providerRegion", "r", "", "Provider Region name (only for amazonbedrock, googlevertexai backend)")
//add flag for vertexAI/WatsonxAI Project ID //add flag for vertexAI/WatsonxAI Project ID
addCmd.Flags().StringVarP(&providerId, "providerId", "i", "", "Provider specific ID for e.g. project (only for googlevertexai/watsonxai backend)") addCmd.Flags().StringVarP(&providerId, "providerId", "i", "", "Provider specific ID for e.g. project (only for googlevertexai/ibmwatsonxai backend)")
//add flag for OCI Compartment ID //add flag for OCI Compartment ID
addCmd.Flags().StringVarP(&compartmentId, "compartmentId", "k", "", "Compartment ID for generative AI model (only for oci backend)") addCmd.Flags().StringVarP(&compartmentId, "compartmentId", "k", "", "Compartment ID for generative AI model (only for oci backend)")
// add flag for openai organization // add flag for openai organization

View File

@ -32,7 +32,7 @@ var (
&HuggingfaceClient{}, &HuggingfaceClient{},
&GoogleVertexAIClient{}, &GoogleVertexAIClient{},
&OCIGenAIClient{}, &OCIGenAIClient{},
&WatsonxAIClient{}, &IBMWatsonxAIClient{},
} }
Backends = []string{ Backends = []string{
openAIClientName, openAIClientName,
@ -47,7 +47,7 @@ var (
huggingfaceAIClientName, huggingfaceAIClientName,
googleVertexAIClientName, googleVertexAIClientName,
ociClientName, ociClientName,
watsonxAIClientName, ibmWatsonxAIClientName,
} }
) )

View File

@ -4,12 +4,13 @@ import (
"context" "context"
"errors" "errors"
"fmt" "fmt"
wx "github.com/IBM/watsonx-go/pkg/models" wx "github.com/IBM/watsonx-go/pkg/models"
) )
const watsonxAIClientName = "watsonxai" const ibmWatsonxAIClientName = "ibmwatsonxai"
type WatsonxAIClient struct { type IBMWatsonxAIClient struct {
nopCloser nopCloser
client *wx.Client client *wx.Client
@ -25,7 +26,7 @@ const (
maxTokens = 2048 maxTokens = 2048
) )
func (c *WatsonxAIClient) Configure(config IAIConfig) error { func (c *IBMWatsonxAIClient) Configure(config IAIConfig) error {
if config.GetModel() == "" { if config.GetModel() == "" {
c.model = modelMetallama c.model = modelMetallama
} else { } else {
@ -62,7 +63,7 @@ func (c *WatsonxAIClient) Configure(config IAIConfig) error {
return nil return nil
} }
func (c *WatsonxAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) { func (c *IBMWatsonxAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
result, err := c.client.GenerateText( result, err := c.client.GenerateText(
c.model, c.model,
prompt, prompt,
@ -80,6 +81,6 @@ func (c *WatsonxAIClient) GetCompletion(ctx context.Context, prompt string) (str
return result.Text, nil return result.Text, nil
} }
func (c *WatsonxAIClient) GetName() string { func (c *IBMWatsonxAIClient) GetName() string {
return watsonxAIClientName return ibmWatsonxAIClientName
} }