Skip to content

Commit 0dd63ed

Browse files
author
zhanglongbin
committed
1.Modify the operator icon loading method
2.Optimize task template initialization
1 parent 1400028 commit 0dd63ed

7 files changed

Lines changed: 143 additions & 153 deletions

File tree

data_server/api/endpoints/algo_templates.py

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
from fastapi import APIRouter, Depends, HTTPException, Query, Path, status
1+
from fastapi import APIRouter, Depends, HTTPException, Query, Path, status, Header
22
from sqlalchemy.orm import Session
33
from typing import List, Dict, Any, Optional, Annotated
44
from loguru import logger
55
from pydantic import BaseModel, Field
66

7-
from data_server.api.dependencies import get_validated_token_payload
87
from data_server.database.session import get_sync_session
98
from data_server.algo_templates.mapper.algo_template_mapper import (
109
get_template_by_id,
@@ -34,17 +33,16 @@ class AlgoTemplateListResponse(BaseModel):
3433

3534
@router.get("/", response_model=dict, summary="获取算法模板列表")
3635
async def get_algo_templates(
37-
payload: Dict = Depends(get_validated_token_payload),
36+
user_id: str = Header(..., alias="user_id", description="用户ID"),
3837
page: int = Query(1, ge=1, description="页码"),
3938
page_size: int = Query(10, ge=1, le=100000000, description="每页数量"),
4039
buildin: bool = Query(None,description="是否为内置模版过滤"),
4140
db: Session = Depends(get_sync_session)
4241
):
4342

4443
try:
45-
user_id = payload.get("uuid")
4644
if not user_id:
47-
return response_fail(msg="Token中缺少用户信息 (uuid)")
45+
return response_fail(msg="请求头中缺少用户信息 (user_id)")
4846

4947
templates, total = get_templates_by_query(
5048
db, user_id, page, page_size, buildin
@@ -74,15 +72,14 @@ async def get_algo_templates(
7472

7573
@router.get("/{template_id}", response_model=dict, summary="根据模板id获取单个算法模板详情")
7674
async def get_algo_template_by_id(
77-
payload: Dict = Depends(get_validated_token_payload),
75+
user_id: str = Header(..., alias="user_id", description="用户ID"),
7876
template_id: int = Path(..., description="模板ID"),
7977
db: Session = Depends(get_sync_session)
8078
):
8179

8280
try:
83-
user_id = payload.get("uuid")
8481
if not user_id:
85-
return response_fail(msg="Token中缺少用户信息 (uuid)")
82+
return response_fail(msg="请求头中缺少用户信息 (user_id)")
8683

8784

8885
template = get_template_by_id(db, template_id, user_id)
@@ -107,14 +104,13 @@ async def get_algo_template_by_id(
107104
@router.post("/", response_model=dict, summary="创建新的算法模板")
108105
async def create_algo_template(
109106
template_data: AlgoTemplateCreate,
110-
payload: Dict = Depends(get_validated_token_payload),
107+
user_id: str = Header(..., alias="user_id", description="用户ID"),
111108
db: Session = Depends(get_sync_session)
112109
):
113110

114111
try:
115-
user_id = payload.get("uuid")
116112
if not user_id:
117-
return response_fail(msg="Token中缺少用户信息 (uuid)")
113+
return response_fail(msg="请求头中缺少用户信息 (user_id)")
118114

119115

120116
template_dict = template_data.model_dump(exclude_none=True)
@@ -144,16 +140,15 @@ async def create_algo_template(
144140

145141
@router.put("/{template_id}", response_model=dict, summary="更新算法模板")
146142
async def update_algo_template(
147-
payload: Dict = Depends(get_validated_token_payload),
143+
user_id: str = Header(..., alias="user_id", description="用户ID"),
148144
template_id: int = Path(..., description="模板ID"),
149145
template_data: AlgoTemplateUpdate = None,
150146
db: Session = Depends(get_sync_session)
151147
):
152148

153149
try:
154-
user_id = payload.get("uuid")
155150
if not user_id:
156-
return response_fail(msg="Token中缺少用户信息 (uuid)")
151+
return response_fail(msg="请求头中缺少用户信息 (user_id)")
157152

158153

159154
current_template = get_template_by_id(db, template_id, user_id)
@@ -191,15 +186,14 @@ async def update_algo_template(
191186

192187
@router.delete("/{template_id}", response_model=dict, summary="删除算法模板")
193188
async def delete_algo_template(
194-
payload: Dict = Depends(get_validated_token_payload),
189+
user_id: str = Header(..., alias="user_id", description="用户ID"),
195190
template_id: int = Path(..., description="模板ID"),
196191
db: Session = Depends(get_sync_session)
197192
):
198193

199194
try:
200-
user_id = payload.get("uuid")
201195
if not user_id:
202-
return response_fail(msg="Token中缺少用户信息 (uuid)")
196+
return response_fail(msg="请求头中缺少用户信息 (user_id)")
203197

204198

205199
success = delete_template_by_id(db, template_id, user_id)
@@ -231,15 +225,14 @@ async def get_algo_template_type():
231225

232226
@router.get("/get/ByName", response_model=dict, summary="根据模版名称获取算法模板列表")
233227
async def get_algo_template_by_name(
234-
payload: Dict = Depends(get_validated_token_payload),
228+
user_id: str = Header(..., alias="user_id", description="用户ID"),
235229
template_name: str = Query(..., description="模板名称"),
236230
db: Session = Depends(get_sync_session)
237231
):
238232

239233
try:
240-
user_id = payload.get("uuid")
241234
if not user_id:
242-
return response_fail(msg="Token中缺少用户信息 (uuid)")
235+
return response_fail(msg="请求头中缺少用户信息 (user_id)")
243236

244237

245238
template = find_repeat_name(db, template_name, user_id)

0 commit comments

Comments
 (0)