- 新增 instance_group_members 中间表关联权限组和实例 - InstanceGroup 模型移除旧的 instances relationship,改为通过中间表查询 - Instance 模型保留 group_id FK(兼容)但移除 group relationship - Schema 新增 readonly_instance_ids / write_instance_ids 字段 - InstanceGroupResponse 改为 readonly_instance_count + write_instance_count - InstanceGroupDetailResponse 返回 readonly_instances + write_instances - InstanceAssignRequest 新增 access_type 参数 - API create/update 支持同步写入 instance_group_members - role_permissions 服务更新为使用中间表查询 - 新增迁移 SQL 并应用到 sqlite3.db - 测试全部通过 (20/20)
79 lines
2.6 KiB
Python
79 lines
2.6 KiB
Python
from datetime import datetime
|
|
from typing import Optional, List
|
|
from pydantic import BaseModel, ConfigDict, Field, field_validator
|
|
|
|
|
|
class InstanceGroupCreate(BaseModel):
|
|
name: str = Field(..., min_length=1, max_length=100)
|
|
description: Optional[str] = None
|
|
db_type: str = Field(default="all", pattern=r"^(mysql|redis|pg|mongo|all)$")
|
|
allowed_databases: Optional[List[str]] = Field(
|
|
default=None,
|
|
description="允许访问的数据库名列表,为空表示关联实例的所有库",
|
|
)
|
|
# Legacy field kept for backward compatibility
|
|
permissions: Optional[List[str]] = None
|
|
is_active: bool = True
|
|
# New: instance ids by access_type
|
|
readonly_instance_ids: List[int] = Field(default_factory=list)
|
|
write_instance_ids: List[int] = Field(default_factory=list)
|
|
|
|
|
|
class InstanceGroupUpdate(BaseModel):
|
|
name: Optional[str] = Field(default=None, min_length=1, max_length=100)
|
|
description: Optional[str] = None
|
|
db_type: Optional[str] = Field(default=None, pattern=r"^(mysql|redis|pg|mongo|all)$")
|
|
allowed_databases: Optional[List[str]] = Field(
|
|
default=None,
|
|
description="允许访问的数据库名列表,为空表示关联实例的所有库",
|
|
)
|
|
# Legacy field kept for backward compatibility
|
|
permissions: Optional[List[str]] = None
|
|
is_active: Optional[bool] = None
|
|
# New: instance ids by access_type
|
|
readonly_instance_ids: Optional[List[int]] = None
|
|
write_instance_ids: Optional[List[int]] = None
|
|
|
|
|
|
class InstanceGroupResponse(BaseModel):
|
|
id: int
|
|
name: str
|
|
description: Optional[str] = None
|
|
db_type: str
|
|
# Legacy field
|
|
permissions: Optional[List[str]] = None
|
|
# New fields
|
|
allowed_databases: Optional[List[str]] = None
|
|
is_active: bool
|
|
created_at: Optional[datetime] = None
|
|
updated_at: Optional[datetime] = None
|
|
readonly_instance_count: int = 0
|
|
write_instance_count: int = 0
|
|
user_count: int = 0
|
|
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
|
|
class InstanceGroupDetailResponse(InstanceGroupResponse):
|
|
readonly_instances: List[dict] = []
|
|
write_instances: List[dict] = []
|
|
users: List[dict] = []
|
|
|
|
|
|
class InstanceAssignRequest(BaseModel):
|
|
instance_ids: List[int] = Field(..., min_length=1)
|
|
access_type: str = Field(default="readonly", pattern=r"^(readonly|write)$")
|
|
|
|
|
|
class InstanceRemoveRequest(BaseModel):
|
|
instance_ids: List[int] = Field(..., min_length=1)
|
|
|
|
|
|
class UserAssignRequest(BaseModel):
|
|
user_ids: List[int] = Field(..., min_length=1)
|
|
permissions: Optional[List[str]] = None
|
|
|
|
|
|
class UserGroupUpdateRequest(BaseModel):
|
|
group_ids: List[int] = Field(default_factory=list)
|