fix: filter out the model provider credential when reporting tool info

The model provider credential cannot be set by the user nor can it be deleted. Therefore, it doesn't make sense to include it when report tool infos on agents and workflows. Signed-off-by: Donnie Adams <[email protected]>
obot-platform · Jan 9, 2025 · c7604ed · c7604ed
1 parent c77a7b8
commit c7604ed
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/pkg/controller/handlers/toolinfo/toolinfo.go b/pkg/controller/handlers/toolinfo/toolinfo.go
@@ -44,11 +44,10 @@ func (h *Handler) SetToolInfoStatus(req router.Request, resp router.Response) (e
 		return err
 	}
 
-	credsSet := make(sets.Set[string], len(creds)+1)
+	credsSet := make(sets.Set[string], len(creds))
 	for _, cred := range creds {
 		credsSet.Insert(cred.ToolName)
 	}
-	credsSet.Insert(system.ModelProviderCredential)
 
 	obj := req.Object.(v1.ToolUser)
 	tools := obj.GetTools()
@@ -78,6 +77,13 @@ func (h *Handler) SetToolInfoStatus(req router.Request, resp router.Response) (e
 			toolRef.Status.Tool.CredentialNames = nil
 		}
 
+		for i := 0; i < len(credNames); i++ {
+			if credNames[i] == system.ModelProviderCredential {
+				credNames = append(credNames[:i], credNames[i+1:]...)
+				i--
+			}
+		}
+
 		toolInfos[tool] = types.ToolInfo{
 			CredentialNames: credNames,
 			Authorized:      credsSet.HasAll(credNames...),

diff --git a/pkg/storage/apis/obot.obot.ai/v1/file.go b/pkg/storage/apis/obot.obot.ai/v1/file.go
@@ -9,6 +9,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+var (
+	_ fields.Fields = (*KnowledgeFile)(nil)
+	_ DeleteRefs    = (*KnowledgeFile)(nil)
+)
+
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 type KnowledgeFile struct {
@@ -19,8 +24,6 @@ type KnowledgeFile struct {
 	Status KnowledgeFileStatus `json:"status,omitempty"`
 }
 
-var _ fields.Fields = (*KnowledgeFile)(nil)
-
 func (k *KnowledgeFile) GetColumns() [][]string {
 	return [][]string{
 		{"Name", "Name"},
@@ -75,8 +78,6 @@ func (*KnowledgeFile) FieldNames() []string {
 	return []string{"spec.knowledgeSourceName", "spec.knowledgeSetName"}
 }
 
-var _ fields.Fields = (*KnowledgeFile)(nil)
-
 type KnowledgeFileSpec struct {
 	KnowledgeSetName    string `json:"knowledgeSetName,omitempty"`
 	KnowledgeSourceName string `json:"knowledgeSourceName,omitempty"`