update: 更新配置文件中的服务地址，修改模型管理相关代码，调整数据结构和逻辑，优化模型列表查询和会话模型设置，更新数据库表结构和索引，修改模块名称和依赖版本

dao/model_dao.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"fmt"
 
-	"model-asynch/consts/public"
-	"model-asynch/model/dto"
-	"model-asynch/model/entity"
+	"model-gateway/consts/public"
+	"model-gateway/model/dto"
+	"model-gateway/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
+	"gitea.com/red-future/common/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 )
@@ -17,8 +18,13 @@ var Model = &modelDao{}
 
 type modelDao struct{}
 
-func (d *modelDao) Insert(ctx context.Context, m *entity.AsynchModel) (id int64, err error) {
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).Data(m).Insert()
+func (d *modelDao) Insert(ctx context.Context, req *dto.CreateModelReq) (id int64, err error) {
+	asyncModel := new(entity.AsynchModel)
+	err = gconv.Struct(req, &asyncModel)
+	if err != nil {
+		return
+	}
+	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).Data(asyncModel).Insert()
 	if err != nil {
 		return 0, err
 	}
@@ -38,20 +44,6 @@ func (d *modelDao) Update(ctx context.Context, m *dto.UpdateModelReq) (rows int6
 	return r.RowsAffected()
 }
 
-func (d *modelDao) UpdateByID(ctx context.Context, m *dto.UpdateModelReq) (rows int64, err error) {
-	// 专用于切换会话模型，只更新 is_chat_model 字段
-	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).
-		Where(entity.AsynchModelCol.Id, m.ID).
-		Data(g.Map{
-			"is_chat_model": m.IsChatModel,
-		}).
-		Update()
-	if err != nil {
-		return 0, err
-	}
-	return r.RowsAffected()
-}
-
 func (d *modelDao) DeleteByID(ctx context.Context, id string) (rows int64, err error) {
 	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).
 		Where(entity.AsynchModelCol.Id, id).
@@ -78,6 +70,7 @@ func (d *modelDao) GetByModelName(ctx context.Context, modelName string) (m *ent
 
 func (d *modelDao) Get(ctx context.Context, id int64) (m *entity.AsynchModel, err error) {
 	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).
+		NoTenantId(ctx).
 		Where(entity.AsynchModelCol.Id, id).
 		One()
 	if err != nil {
@@ -90,6 +83,13 @@ func (d *modelDao) Get(ctx context.Context, id int64) (m *entity.AsynchModel, er
 	return
 }
 
+func (d *modelDao) Count(ctx context.Context, req *dto.GetModelReq) (count int, err error) {
+	count, err = gfdb.DB(ctx).Model(ctx, public.TableNameModel).OmitEmpty().
+		Where(entity.AsynchModelCol.Creator, req.Creator).
+		Where(entity.AsynchModelCol.Id, req.ID).Count()
+	return
+}
+
 func (d *modelDao) List(ctx context.Context, pageNum, pageSize int, modelNameLike string, modelType int, isPrivate int) (list []*entity.AsynchModel, total int64, err error) {
 	model := gfdb.DB(ctx).Model(ctx, public.TableNameModel).
 		OrderDesc(entity.AsynchModelCol.CreatedAt)
@@ -97,7 +97,7 @@ func (d *modelDao) List(ctx context.Context, pageNum, pageSize int, modelNameLik
 		model = model.WhereLike(entity.AsynchModelCol.ModelName, "%"+modelNameLike+"%")
 	}
 	if modelType != 0 {
-		model = model.Where(entity.AsynchModelCol.ModelsType, modelType)
+		model = model.Where(entity.AsynchModelCol.ModelType, modelType)
 	}
 	if isPrivate != 0 {
 		model = model.Where(entity.AsynchModelCol.IsPrivate, isPrivate)
@@ -150,39 +150,64 @@ func (d *modelDao) ListByCreatorAndPlatform(ctx context.Context, creator string,
 	err = r.Structs(&list)
 	return
 }
-
-func (d *modelDao) GetByCreatorAndPlatform(ctx context.Context, creator string, modelNameLike string, modelType int, isPrivate int) (list []*entity.AsynchModel, err error) {
-	whereSQL := "deleted_at IS NULL AND (tenant_id = 1 OR creator = ?)"
-	args := []any{creator}
-
-	if modelNameLike != "" {
-		whereSQL += " AND model_name LIKE ?"
-		args = append(args, "%"+modelNameLike+"%")
+func (d *modelDao) GetByCreatorAndPlatform(ctx context.Context, req *dto.ListModelReq) (list []*entity.AsynchModel, total int, err error) {
+	// 基础 SQL
+	sql := `
+SELECT DISTINCT ON (model_name) *
+FROM asynch_models
+WHERE deleted_at IS NULL 
+  AND (? = '' OR model_name LIKE ?)
+  AND (? = 0 OR model_type = ?)
+`
+	args := []any{
+		req.ModelName, "%" + req.ModelName + "%",
+		req.ModelType, req.ModelType,
 	}
-	if modelType != 0 {
-		whereSQL += " AND models_type = ?"
-		args = append(args, modelType)
+	if !g.IsEmpty(req.IsPrivate) {
+		sql += ` AND is_private = ? `
+		args = append(args, req.IsPrivate)
 	}
-	if isPrivate != 0 {
-		whereSQL += " AND is_private = ?"
-		args = append(args, isPrivate)
+	if req.IsOwner != nil && *req.IsOwner == 0 {
+		sql += ` AND creator = ? AND is_owner = ? `
+		args = append(args, req.Creator)
+		args = append(args, req.IsOwner)
+	} else if req.IsOwner != nil && *req.IsOwner == 1 {
+		if req.Enabled != nil && *req.Enabled == 1 {
+			sql += ` AND ((creator = ? AND is_owner = ? AND enabled=1) OR (is_owner = 0 AND enabled=1)) `
+		} else if req.Enabled != nil && *req.Enabled == 0 {
+			sql += ` AND ((creator = ? AND is_owner = ? AND enabled=0) OR (is_owner = 0 AND enabled=1)) `
+		} else {
+			sql += ` AND ((creator = ? AND is_owner = ?) OR (is_owner = 0 AND enabled=1)) `
+		}
+		args = append(args, req.Creator)
+		args = append(args, req.IsOwner)
 	}
 
-	querySQL := fmt.Sprintf("SELECT * FROM %s WHERE %s ORDER BY created_at DESC", public.TableNameModel, whereSQL)
+	// 最后拼接排序
+	sql += ` ORDER BY model_name, is_owner DESC, created_at DESC`
 
-	r, err := gfdb.DB(ctx).GetAll(ctx, querySQL, args...)
+	r, err := gfdb.DB(ctx).GetAll(ctx, sql, args...)
 	if err != nil {
-		return nil, err
+		return nil, 0, err
 	}
 
 	err = r.Structs(&list)
+	if err != nil {
+		return nil, 0, err
+	}
+
+	total = len(list)
 	return
 }
 
-func (d *modelDao) GetByIsChatModel(ctx context.Context, userName string) (m *entity.AsynchModel, err error) {
+func (d *modelDao) GetByIsChatModel(ctx context.Context) (m *entity.AsynchModel, err error) {
+	userInfo, err := utils.GetUserInfo(ctx)
+	if err != nil {
+		return nil, err
+	}
 	r, err := gfdb.DB(ctx).Model(ctx, public.TableNameModel).
 		Where(entity.AsynchModelCol.IsChatModel, 1).
-		Where(entity.AsynchModelCol.Creator, userName).
+		Where(entity.AsynchModelCol.Creator, userInfo.UserName).
 		One()
 	if err != nil {
 		return nil, err

dao/model_dao_bg.go

@@ -3,8 +3,8 @@ package dao
 import (
 	"context"
 
-	"model-asynch/consts/public"
-	"model-asynch/model/entity"
+	"model-gateway/consts/public"
+	"model-gateway/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
 )

dao/op_log_dao.go

@@ -3,8 +3,8 @@ package dao
 import (
 	"context"
 
-	"model-asynch/consts/public"
-	"model-asynch/model/entity"
+	"model-gateway/consts/public"
+	"model-gateway/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
 )

dao/stat_dao.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"model-asynch/consts/public"
-	"model-asynch/model/entity"
+	"model-gateway/consts/public"
+	"model-gateway/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/os/gtime"

dao/task_dao.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"model-asynch/consts/public"
-	"model-asynch/model/entity"
+	"model-gateway/consts/public"
+	"model-gateway/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/database/gdb"

dao/task_dao_bg.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"model-asynch/consts/public"
-	"model-asynch/model/entity"
+	"model-gateway/consts/public"
+	"model-gateway/model/entity"
 
 	"gitea.com/red-future/common/db/gfdb"
 	"github.com/gogf/gf/v2/database/gdb"