Bladeren bron

refactor: remove tool-selector

Yeuoly 8 maanden geleden
bovenliggende
commit
696a3b5bde

+ 24 - 20
internal/types/entities/plugin_entities/config.go

@@ -18,7 +18,7 @@ const (
 	CONFIG_TYPE_BOOLEAN        ConfigType = BOOLEAN
 	CONFIG_TYPE_MODEL_SELECTOR ConfigType = MODEL_SELECTOR
 	CONFIG_TYPE_APP_SELECTOR   ConfigType = APP_SELECTOR
-	CONFIG_TYPE_TOOL_SELECTOR  ConfigType = TOOL_SELECTOR
+	// CONFIG_TYPE_TOOL_SELECTOR  ConfigType = TOOL_SELECTOR
 )
 
 type ModelConfigScope string
@@ -117,22 +117,26 @@ func isScope(fl validator.FieldLevel) bool {
 			return isAppSelectorScope(fl)
 		} else if providerConfig.Type == CONFIG_TYPE_MODEL_SELECTOR {
 			return isModelConfigScope(fl)
-		} else if providerConfig.Type == CONFIG_TYPE_TOOL_SELECTOR {
-			return isToolSelectorScope(fl)
 		} else {
 			return false
 		}
+
+		//else if providerConfig.Type == CONFIG_TYPE_TOOL_SELECTOR {
+		//return isToolSelectorScope(fl)
+		//}
 	}
 	if toolParameter, ok := parent.(ToolParameter); ok {
 		if toolParameter.Type == TOOL_PARAMETER_TYPE_APP_SELECTOR {
 			return isAppSelectorScope(fl)
 		} else if toolParameter.Type == TOOL_PARAMETER_TYPE_MODEL_SELECTOR {
 			return isModelConfigScope(fl)
-		} else if toolParameter.Type == TOOL_PARAMETER_TYPE_TOOL_SELECTOR {
-			return isToolSelectorScope(fl)
 		} else {
 			return false
 		}
+
+		// else if toolParameter.Type == TOOL_PARAMETER_TYPE_TOOL_SELECTOR {
+		// 	return isToolSelectorScope(fl)
+		// }
 	}
 	return false
 }
@@ -339,21 +343,21 @@ func ValidateProviderConfigs(settings map[string]any, configs []ProviderConfig)
 					return errors.New("setting " + config_name + " is not a valid model config scope")
 				}
 			}
-		case CONFIG_TYPE_TOOL_SELECTOR:
-			m, ok := v.(map[string]any)
-			if !ok {
-				return errors.New("setting " + config_name + " is not a map")
-			}
-			// check keys
-			if _, ok := m["provider"]; !ok {
-				return errors.New("setting " + config_name + " is missing provider")
-			}
-			if _, ok := m["tool"]; !ok {
-				return errors.New("setting " + config_name + " is missing tool")
-			}
-			if _, ok := m["tool_type"]; !ok {
-				return errors.New("setting " + config_name + " is missing tool_type")
-			}
+			// case CONFIG_TYPE_TOOL_SELECTOR:
+			// 	m, ok := v.(map[string]any)
+			// 	if !ok {
+			// 		return errors.New("setting " + config_name + " is not a map")
+			// 	}
+			// 	// check keys
+			// 	if _, ok := m["provider"]; !ok {
+			// 		return errors.New("setting " + config_name + " is missing provider")
+			// 	}
+			// 	if _, ok := m["tool"]; !ok {
+			// 		return errors.New("setting " + config_name + " is missing tool")
+			// 	}
+			// 	if _, ok := m["tool_type"]; !ok {
+			// 		return errors.New("setting " + config_name + " is missing tool_type")
+			// 	}
 		}
 	}
 

+ 1 - 1
internal/types/entities/plugin_entities/constant.go

@@ -10,5 +10,5 @@ const (
 	BOOLEAN        = "boolean"
 	APP_SELECTOR   = "app-selector"
 	MODEL_SELECTOR = "model-selector"
-	TOOL_SELECTOR  = "tool-selector"
+	// TOOL_SELECTOR  = "tool-selector"
 )

+ 3 - 3
internal/types/entities/plugin_entities/tool_declaration.go

@@ -36,7 +36,7 @@ const (
 	TOOL_PARAMETER_TYPE_FILE           ToolParameterType = FILE
 	TOOL_PARAMETER_TYPE_APP_SELECTOR   ToolParameterType = APP_SELECTOR
 	TOOL_PARAMETER_TYPE_MODEL_SELECTOR ToolParameterType = MODEL_SELECTOR
-	TOOL_PARAMETER_TYPE_TOOL_SELECTOR  ToolParameterType = TOOL_SELECTOR
+	// TOOL_PARAMETER_TYPE_TOOL_SELECTOR  ToolParameterType = TOOL_SELECTOR
 )
 
 func isToolParameterType(fl validator.FieldLevel) bool {
@@ -48,9 +48,9 @@ func isToolParameterType(fl validator.FieldLevel) bool {
 		string(TOOL_PARAMETER_TYPE_SELECT),
 		string(TOOL_PARAMETER_TYPE_SECRET_INPUT),
 		string(TOOL_PARAMETER_TYPE_FILE),
+		// string(TOOL_PARAMETER_TYPE_TOOL_SELECTOR),
 		string(TOOL_PARAMETER_TYPE_APP_SELECTOR),
-		string(TOOL_PARAMETER_TYPE_MODEL_SELECTOR),
-		string(TOOL_PARAMETER_TYPE_TOOL_SELECTOR):
+		string(TOOL_PARAMETER_TYPE_MODEL_SELECTOR):
 		return true
 	}
 	return false