Skip to content

Commit

Permalink
fix: rename watsonxai to ibmwatsonxai
Browse files Browse the repository at this point in the history
Signed-off-by: Guangya Liu <[email protected]>
  • Loading branch information
gyliu513 committed Aug 22, 2024
1 parent 644581f commit 595965a
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ Unused:
> huggingface
> noopai
> googlevertexai
> watsonxai
> ibmwatsonxai
```

For detailed documentation on how to configure and use each provider see [here](https://docs.k8sgpt.ai/reference/providers/backend/).
Expand Down
4 changes: 2 additions & 2 deletions cmd/auth/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var addCmd = &cobra.Command{
if strings.ToLower(backend) == "amazonbedrock" {
_ = cmd.MarkFlagRequired("providerRegion")
}
if strings.ToLower(backend) == "watsonxai" {
if strings.ToLower(backend) == "ibmwatsonxai" {
_ = cmd.MarkFlagRequired("providerId")
}
},
Expand Down Expand Up @@ -180,7 +180,7 @@ func init() {
//add flag for amazonbedrock region name
addCmd.Flags().StringVarP(&providerRegion, "providerRegion", "r", "", "Provider Region name (only for amazonbedrock, googlevertexai backend)")
//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
addCmd.Flags().StringVarP(&compartmentId, "compartmentId", "k", "", "Compartment ID for generative AI model (only for oci backend)")
// add flag for openai organization
Expand Down
4 changes: 2 additions & 2 deletions pkg/ai/iai.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var (
&HuggingfaceClient{},
&GoogleVertexAIClient{},
&OCIGenAIClient{},
&WatsonxAIClient{},
&IBMWatsonxAIClient{},
}
Backends = []string{
openAIClientName,
Expand All @@ -47,7 +47,7 @@ var (
huggingfaceAIClientName,
googleVertexAIClientName,
ociClientName,
watsonxAIClientName,
ibmWatsonxAIClientName,
}
)

Expand Down
13 changes: 7 additions & 6 deletions pkg/ai/watsonxai.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"context"
"errors"
"fmt"

wx "github.com/IBM/watsonx-go/pkg/models"
)

const watsonxAIClientName = "watsonxai"
const ibmWatsonxAIClientName = "ibmwatsonxai"

type WatsonxAIClient struct {
type IBMWatsonxAIClient struct {
nopCloser

client *wx.Client
Expand All @@ -25,7 +26,7 @@ const (
maxTokens = 2048
)

func (c *WatsonxAIClient) Configure(config IAIConfig) error {
func (c *IBMWatsonxAIClient) Configure(config IAIConfig) error {
if config.GetModel() == "" {
c.model = modelMetallama
} else {
Expand Down Expand Up @@ -62,7 +63,7 @@ func (c *WatsonxAIClient) Configure(config IAIConfig) error {
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(
c.model,
prompt,
Expand All @@ -80,6 +81,6 @@ func (c *WatsonxAIClient) GetCompletion(ctx context.Context, prompt string) (str
return result.Text, nil
}

func (c *WatsonxAIClient) GetName() string {
return watsonxAIClientName
func (c *IBMWatsonxAIClient) GetName() string {
return ibmWatsonxAIClientName
}

0 comments on commit 595965a

Please sign in to comment.