Переглянути джерело

fix: group model config api route (#336)

zijiren 4 місяців тому
батько
коміт
0acb0b79c3
5 змінених файлів з 23 додано та 19 видалено
  1. 4 4
      core/controller/group.go
  2. 1 1
      core/docs/docs.go
  3. 1 1
      core/docs/swagger.json
  4. 9 9
      core/docs/swagger.yaml
  5. 8 4
      core/router/api.go

+ 4 - 4
core/controller/group.go

@@ -495,7 +495,7 @@ func (r *SaveGroupModelConfigRequest) ToGroupModelConfig(groupID string) model.G
 //	@Param			group	path		string							true	"Group name"
 //	@Param			group	path		string							true	"Group name"
 //	@Param			data	body		[]SaveGroupModelConfigRequest	true	"Group model config information"
 //	@Param			data	body		[]SaveGroupModelConfigRequest	true	"Group model config information"
 //	@Success		200		{object}	middleware.APIResponse
 //	@Success		200		{object}	middleware.APIResponse
-//	@Router			/api/group/{group}/model_configs [post]
+//	@Router			/api/group/{group}/model_configs/ [post]
 func SaveGroupModelConfigs(c *gin.Context) {
 func SaveGroupModelConfigs(c *gin.Context) {
 	group := c.Param("group")
 	group := c.Param("group")
 	if group == "" {
 	if group == "" {
@@ -613,7 +613,7 @@ func DeleteGroupModelConfig(c *gin.Context) {
 //	@Param			group	path		string		true	"Group name"
 //	@Param			group	path		string		true	"Group name"
 //	@Param			models	body		[]string	true	"Model names"
 //	@Param			models	body		[]string	true	"Model names"
 //	@Success		200		{object}	middleware.APIResponse
 //	@Success		200		{object}	middleware.APIResponse
-//	@Router			/api/group/{group}/model_configs [delete]
+//	@Router			/api/group/{group}/model_configs/ [delete]
 func DeleteGroupModelConfigs(c *gin.Context) {
 func DeleteGroupModelConfigs(c *gin.Context) {
 	group := c.Param("group")
 	group := c.Param("group")
 	if group == "" {
 	if group == "" {
@@ -647,7 +647,7 @@ func DeleteGroupModelConfigs(c *gin.Context) {
 //	@Security		ApiKeyAuth
 //	@Security		ApiKeyAuth
 //	@Param			group	path		string	true	"Group name"
 //	@Param			group	path		string	true	"Group name"
 //	@Success		200		{object}	middleware.APIResponse{data=[]model.GroupModelConfig}
 //	@Success		200		{object}	middleware.APIResponse{data=[]model.GroupModelConfig}
-//	@Router			/api/group/{group}/model_configs [get]
+//	@Router			/api/group/{group}/model_configs/ [get]
 func GetGroupModelConfigs(c *gin.Context) {
 func GetGroupModelConfigs(c *gin.Context) {
 	group := c.Param("group")
 	group := c.Param("group")
 	if group == "" {
 	if group == "" {
@@ -754,7 +754,7 @@ func UpdateGroupModelConfig(c *gin.Context) {
 //	@Param			group	path		string							true	"Group name"
 //	@Param			group	path		string							true	"Group name"
 //	@Param			data	body		[]SaveGroupModelConfigRequest	true	"Group model config information"
 //	@Param			data	body		[]SaveGroupModelConfigRequest	true	"Group model config information"
 //	@Success		200		{object}	middleware.APIResponse
 //	@Success		200		{object}	middleware.APIResponse
-//	@Router			/api/group/{group}/model_configs [put]
+//	@Router			/api/group/{group}/model_configs/ [put]
 func UpdateGroupModelConfigs(c *gin.Context) {
 func UpdateGroupModelConfigs(c *gin.Context) {
 	group := c.Param("group")
 	group := c.Param("group")
 	if group == "" {
 	if group == "" {

+ 1 - 1
core/docs/docs.go

@@ -1875,7 +1875,7 @@ const docTemplate = `{
                 }
                 }
             }
             }
         },
         },
-        "/api/group/{group}/model_configs": {
+        "/api/group/{group}/model_configs/": {
             "get": {
             "get": {
                 "security": [
                 "security": [
                     {
                     {

+ 1 - 1
core/docs/swagger.json

@@ -1866,7 +1866,7 @@
                 }
                 }
             }
             }
         },
         },
-        "/api/group/{group}/model_configs": {
+        "/api/group/{group}/model_configs/": {
             "get": {
             "get": {
                 "security": [
                 "security": [
                     {
                     {

+ 9 - 9
core/docs/swagger.yaml

@@ -1158,6 +1158,8 @@ definitions:
         type: integer
         type: integer
       rpm:
       rpm:
         type: integer
         type: integer
+      status_5xx_count:
+        type: integer
       status_400_count:
       status_400_count:
         type: integer
         type: integer
       status_429_count:
       status_429_count:
@@ -1166,8 +1168,6 @@ definitions:
         type: integer
         type: integer
       status_500_count:
       status_500_count:
         type: integer
         type: integer
-      status_5xx_count:
-        type: integer
       total_count:
       total_count:
         description: use Count.RequestCount instead
         description: use Count.RequestCount instead
         type: integer
         type: integer
@@ -1428,16 +1428,16 @@ definitions:
         type: integer
         type: integer
       rpm:
       rpm:
         type: integer
         type: integer
+      status_400_count:
+        type: integer
+      status_429_count:
+        type: integer
       status_4xx_count:
       status_4xx_count:
         type: integer
         type: integer
       status_500_count:
       status_500_count:
         type: integer
         type: integer
       status_5xx_count:
       status_5xx_count:
         type: integer
         type: integer
-      status_400_count:
-        type: integer
-      status_429_count:
-        type: integer
       token_names:
       token_names:
         items:
         items:
           type: string
           type: string
@@ -2372,6 +2372,8 @@ definitions:
         type: integer
         type: integer
       retry_count:
       retry_count:
         type: integer
         type: integer
+      status_4xx_count:
+        type: integer
       status_500_count:
       status_500_count:
         type: integer
         type: integer
       status_5xx_count:
       status_5xx_count:
@@ -2380,8 +2382,6 @@ definitions:
         type: integer
         type: integer
       status_429_count:
       status_429_count:
         type: integer
         type: integer
-      status_4xx_count:
-        type: integer
       timestamp:
       timestamp:
         type: integer
         type: integer
       token_name:
       token_name:
@@ -3727,7 +3727,7 @@ paths:
       summary: Update group model config
       summary: Update group model config
       tags:
       tags:
       - group
       - group
-  /api/group/{group}/model_configs:
+  /api/group/{group}/model_configs/:
     delete:
     delete:
       description: Delete group model configs
       description: Delete group model configs
       parameters:
       parameters:

+ 8 - 4
core/router/api.go

@@ -65,12 +65,16 @@ func SetAPIRouter(router *gin.Engine) {
 			groupRoute.POST("/:group/rpm_ratio", controller.UpdateGroupRPMRatio)
 			groupRoute.POST("/:group/rpm_ratio", controller.UpdateGroupRPMRatio)
 			groupRoute.POST("/:group/tpm_ratio", controller.UpdateGroupTPMRatio)
 			groupRoute.POST("/:group/tpm_ratio", controller.UpdateGroupTPMRatio)
 
 
+			groupModelConfigsRoute := groupRoute.Group("/:group/model_configs")
+			{
+				groupModelConfigsRoute.GET("/", controller.GetGroupModelConfigs)
+				groupModelConfigsRoute.POST("/", controller.SaveGroupModelConfigs)
+				groupModelConfigsRoute.PUT("/", controller.UpdateGroupModelConfigs)
+				groupModelConfigsRoute.DELETE("/", controller.DeleteGroupModelConfigs)
+			}
+
 			groupModelConfigRoute := groupRoute.Group("/:group/model_config")
 			groupModelConfigRoute := groupRoute.Group("/:group/model_config")
 			{
 			{
-				groupModelConfigRoute.GET("", controller.GetGroupModelConfigs)
-				groupModelConfigRoute.POST("", controller.SaveGroupModelConfigs)
-				groupModelConfigRoute.PUT("", controller.UpdateGroupModelConfigs)
-				groupModelConfigRoute.DELETE("", controller.DeleteGroupModelConfigs)
 				groupModelConfigRoute.POST("/*model", controller.SaveGroupModelConfig)
 				groupModelConfigRoute.POST("/*model", controller.SaveGroupModelConfig)
 				groupModelConfigRoute.PUT("/*model", controller.UpdateGroupModelConfig)
 				groupModelConfigRoute.PUT("/*model", controller.UpdateGroupModelConfig)
 				groupModelConfigRoute.DELETE("/*model", controller.DeleteGroupModelConfig)
 				groupModelConfigRoute.DELETE("/*model", controller.DeleteGroupModelConfig)