Bläddra i källkod

fix: model credential from schemas

Yeuoly 10 månader sedan
förälder
incheckning
d838b924de

+ 21 - 14
internal/server/http_server.go

@@ -18,12 +18,10 @@ func (app *App) server(config *app.Config) func() {
 	engine := gin.Default()
 	engine.GET("/health/check", controllers.HealthCheck)
 
-	app.pluginInvokeGroup(engine.Group("/plugin"), config)
-	app.remoteDebuggingGroup(engine.Group("/plugin/:tenant_id/debugging"), config)
 	app.endpointGroup(engine.Group("/e"), config)
 	app.awsLambdaTransactionGroup(engine.Group("/backwards-invocation"), config)
 	app.endpointManagementGroup(engine.Group("/endpoint"))
-	app.pluginGroup(engine.Group("/plugin"), config)
+	app.pluginGroup(engine.Group("/plugin/:tenant_id"), config)
 
 	srv := &http.Server{
 		Addr:    fmt.Sprintf(":%d", config.ServerPort),
@@ -43,8 +41,16 @@ func (app *App) server(config *app.Config) func() {
 	}
 }
 
-func (app *App) pluginInvokeGroup(group *gin.RouterGroup, config *app.Config) {
+func (app *App) pluginGroup(group *gin.RouterGroup, config *app.Config) {
 	group.Use(CheckingKey(config.ServerKey))
+
+	app.remoteDebuggingGroup(group.Group("/debugging"), config)
+	app.pluginDispatchGroup(group.Group("/dispatch"), config)
+	app.pluginManagementGroup(group.Group("/management"), config)
+	app.pluginAssetGroup(group.Group("/asset"), config)
+}
+
+func (app *App) pluginDispatchGroup(group *gin.RouterGroup, config *app.Config) {
 	group.Use(app.RedirectPluginInvoke())
 	group.Use(app.InitClusterID())
 
@@ -97,15 +103,16 @@ func (app *App) endpointManagementGroup(group *gin.RouterGroup) {
 	group.POST("/disable", controllers.DisableEndpoint)
 }
 
-func (app *App) pluginGroup(group *gin.RouterGroup, config *app.Config) {
-	group.Use(CheckingKey(config.ServerKey))
+func (app *App) pluginManagementGroup(group *gin.RouterGroup, config *app.Config) {
+	group.POST("/install/pkg", controllers.InstallPluginFromPkg(config))
+	group.POST("/install/identifier", controllers.InstallPluginFromIdentifier(config))
+	group.GET("/fetch/identifier", controllers.FetchPluginFromIdentifier)
+	group.POST("/uninstall", controllers.UninstallPlugin)
+	group.GET("/list", controllers.ListPlugins)
+	group.GET("/models", controllers.ListModels)
+	group.GET("/tools", controllers.ListTools)
+}
 
-	group.GET("/asset/:id", controllers.GetAsset)
-	group.POST("/:tenant_id/install/pkg", controllers.InstallPluginFromPkg(config))
-	group.POST("/:tenant_id/install/identifier", controllers.InstallPluginFromIdentifier(config))
-	group.GET("/:tenant_id/fetch/identifier", controllers.FetchPluginFromIdentifier)
-	group.POST("/:tenant_id/uninstall", controllers.UninstallPlugin)
-	group.GET("/:tenant_id/list", controllers.ListPlugins)
-	group.GET("/:tenant_id/models", controllers.ListModels)
-	group.GET("/:tenant_id/tools", controllers.ListTools)
+func (app *App) pluginAssetGroup(group *gin.RouterGroup, config *app.Config) {
+	group.GET("/:id", controllers.GetAsset)
 }

+ 2 - 2
internal/types/entities/plugin_entities/model_declaration.go

@@ -184,8 +184,8 @@ type FieldModelSchema struct {
 }
 
 type ModelCredentialSchema struct {
-	Model                  FieldModelSchema                    `json:"model" validate:"required"`
-	CredentialsFormSchemas []ModelProviderCredentialFormSchema `json:"credentials_form_schemas" validate:"omitempty,lte=32,dive"`
+	Model                 FieldModelSchema                    `json:"model" validate:"required"`
+	CredentialFormSchemas []ModelProviderCredentialFormSchema `json:"credential_form_schemas" validate:"omitempty,lte=32,dive"`
 }
 
 type ModelProviderHelpEntity struct {

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

@@ -1,7 +1,7 @@
 package plugin_entities
 
 type InvokePluginUserIdentity struct {
-	TenantId string `json:"tenant_id" validate:"required"`
+	TenantId string `json:"tenant_id" validate:"required" uri:"tenant_id"`
 	UserId   string `json:"user_id" validate:"required"`
 }