fix: .dspy文件按开发规范重写

- 移除所有import语句(json/DBPools/datetime均为ahserver预加载全局)
- ret=json.dumps(result) 改为 return result
- 提前return简化if/else嵌套逻辑
- 12个.dspy文件全部修正
This commit is contained in:
yumoqing 2026-05-28 11:17:30 +08:00
parent 0e5696f5da
commit 78036b9640
12 changed files with 69 additions and 110 deletions

View File

@ -1,20 +1,17 @@
import json
group_id = params_kw.get('group_id', '')
apikey = params_kw.get('apikey', '')
secretkey = params_kw.get('secretkey', '')
if not group_id:
result = {"success": False, "message": "group_id 不能为空"}
elif not apikey or not secretkey:
result = {"success": False, "message": "请提供供应商 API Key"}
else:
from sqlor.dbpools import DBPools
dbname = get_module_dbname('reallife_asset')
db = DBPools()
async with db.sqlorContext(dbname) as sor:
recs = await sor.R("rl_asset_group", {"id": group_id})
vendor = recs[0].vendor if recs else "volcengine"
result = await rl_check_validate_result(group_id, vendor, apikey=apikey, secretkey=secretkey)
return {"success": False, "message": "group_id 不能为空"}
if not apikey or not secretkey:
return {"success": False, "message": "请提供供应商 API Key"}
ret = json.dumps(result, ensure_ascii=False)
dbname = get_module_dbname('reallife_asset')
db = DBPools()
async with db.sqlorContext(dbname) as sor:
recs = await sor.R("rl_asset_group", {"id": group_id})
vendor = recs[0].vendor if recs else "volcengine"
result = await rl_check_validate_result(group_id, vendor, apikey=apikey, secretkey=secretkey)
return result

View File

@ -1,6 +1,3 @@
import json
from sqlor.dbpools import DBPools
org_id = (await get_userorgid()) or '0'
dbname = get_module_dbname('reallife_asset')
db = DBPools()
@ -11,4 +8,4 @@ async with db.sqlorContext(dbname) as sor:
total = len(recs)
data = [dict(r) for r in recs]
ret = json.dumps({"data": data, "total": total, "status": "ok"}, ensure_ascii=False)
return {"data": data, "total": total, "status": "ok"}

View File

@ -1,6 +1,3 @@
import json
from sqlor.dbpools import DBPools
org_id = (await get_userorgid()) or '0'
dbname = get_module_dbname('reallife_asset')
db = DBPools()
@ -11,4 +8,4 @@ async with db.sqlorContext(dbname) as sor:
total = len(recs)
data = [dict(r) for r in recs]
ret = json.dumps({"data": data, "total": total, "status": "ok"}, ensure_ascii=False)
return {"data": data, "total": total, "status": "ok"}

View File

@ -1,5 +1,3 @@
import json
org_id = (await get_userorgid()) or '0'
user_id = await get_user()
group_id = params_kw.get('group_id', '')
@ -10,16 +8,15 @@ apikey = params_kw.get('apikey', '')
secretkey = params_kw.get('secretkey', '')
if not group_id:
result = {"success": False, "message": "请选择素材组合"}
elif not source_url:
result = {"success": False, "message": "请提供素材URL"}
elif not apikey or not secretkey:
result = {"success": False, "message": "请提供供应商 API Key"}
else:
result = await rl_create_asset(
org_id, group_id, source_url,
asset_type=asset_type, name=name,
apikey=apikey, secretkey=secretkey, user_id=user_id
)
return {"success": False, "message": "请选择素材组合"}
if not source_url:
return {"success": False, "message": "请提供素材URL"}
if not apikey or not secretkey:
return {"success": False, "message": "请提供供应商 API Key"}
ret = json.dumps(result, ensure_ascii=False)
result = await rl_create_asset(
org_id, group_id, source_url,
asset_type=asset_type, name=name,
apikey=apikey, secretkey=secretkey, user_id=user_id
)
return result

View File

@ -1,5 +1,3 @@
import json
org_id = (await get_userorgid()) or '0'
rid = params_kw.get('id', '')
apikey = params_kw.get('apikey', '')
@ -7,12 +5,12 @@ secretkey = params_kw.get('secretkey', '')
if apikey and secretkey:
result = await rl_delete_asset(rid, apikey=apikey, secretkey=secretkey)
else:
from sqlor.dbpools import DBPools
dbname = get_module_dbname('reallife_asset')
db = DBPools()
async with db.sqlorContext(dbname) as sor:
await sor.D("rl_asset", {"id": rid, "org_id": org_id})
result = {"success": True, "message": "本地删除成功"}
return result
ret = json.dumps(result, ensure_ascii=False)
# Local-only delete
dbname = get_module_dbname('reallife_asset')
db = DBPools()
async with db.sqlorContext(dbname) as sor:
await sor.D("rl_asset", {"id": rid, "org_id": org_id})
return {"success": True, "message": "本地删除成功"}

View File

@ -1,7 +1,3 @@
import json
from appPublic.uniqueID import getID
from datetime import datetime
org_id = (await get_userorgid()) or '0'
user_id = await get_user()
vendor = params_kw.get('vendor', 'volcengine')
@ -11,13 +7,12 @@ apikey = params_kw.get('apikey', '')
secretkey = params_kw.get('secretkey', '')
if not callback_url:
result = {"success": False, "message": "callback_url 不能为空"}
elif not apikey or not secretkey:
result = {"success": False, "message": "请提供供应商 API Key (apikey/secretkey)"}
else:
result = await rl_create_validate_session(
org_id, vendor, callback_url, project_name,
apikey=apikey, secretkey=secretkey, user_id=user_id
)
return {"success": False, "message": "callback_url 不能为空"}
if not apikey or not secretkey:
return {"success": False, "message": "请提供供应商 API Key (apikey/secretkey)"}
ret = json.dumps(result, ensure_ascii=False)
result = await rl_create_validate_session(
org_id, vendor, callback_url, project_name,
apikey=apikey, secretkey=secretkey, user_id=user_id
)
return result

View File

@ -1,5 +1,3 @@
import json
org_id = (await get_userorgid()) or '0'
rid = params_kw.get('id', '')
apikey = params_kw.get('apikey', '')
@ -7,14 +5,13 @@ secretkey = params_kw.get('secretkey', '')
if apikey and secretkey:
result = await rl_delete_group(rid, apikey=apikey, secretkey=secretkey)
else:
# Local-only delete
from sqlor.dbpools import DBPools
dbname = get_module_dbname('reallife_asset')
db = DBPools()
async with db.sqlorContext(dbname) as sor:
await sor.D("rl_asset", {"group_id": rid})
await sor.D("rl_asset_group", {"id": rid, "org_id": org_id})
result = {"success": True, "message": "本地删除成功"}
return result
ret = json.dumps(result, ensure_ascii=False)
# Local-only delete
dbname = get_module_dbname('reallife_asset')
db = DBPools()
async with db.sqlorContext(dbname) as sor:
await sor.D("rl_asset", {"group_id": rid})
await sor.D("rl_asset_group", {"id": rid, "org_id": org_id})
return {"success": True, "message": "本地删除成功"}

View File

@ -1,7 +1,3 @@
import json
from datetime import datetime
from sqlor.dbpools import DBPools
org_id = (await get_userorgid()) or '0'
rid = params_kw.get('id', '')
now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@ -16,5 +12,4 @@ async with db.sqlorContext(dbname) as sor:
upd[f] = v
await sor.U("rl_asset_group", upd, {"id": rid, "org_id": org_id})
result = {"success": True, "message": "更新成功"}
ret = json.dumps(result, ensure_ascii=False)
return {"success": True, "message": "更新成功"}

View File

@ -1,7 +1,3 @@
import json
from datetime import datetime
from sqlor.dbpools import DBPools
org_id = (await get_userorgid()) or '0'
rid = params_kw.get('id', '')
now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@ -16,5 +12,4 @@ async with db.sqlorContext(dbname) as sor:
upd[f] = v
await sor.U("rl_asset", upd, {"id": rid, "org_id": org_id})
result = {"success": True, "message": "更新成功"}
ret = json.dumps(result, ensure_ascii=False)
return {"success": True, "message": "更新成功"}

View File

@ -1,14 +1,11 @@
import json
asset_id = params_kw.get('asset_id', '')
apikey = params_kw.get('apikey', '')
secretkey = params_kw.get('secretkey', '')
if not asset_id:
result = {"success": False, "message": "asset_id 不能为空"}
elif not apikey or not secretkey:
result = {"success": False, "message": "请提供供应商 API Key"}
else:
result = await rl_sync_asset_status(asset_id, apikey=apikey, secretkey=secretkey)
return {"success": False, "message": "asset_id 不能为空"}
if not apikey or not secretkey:
return {"success": False, "message": "请提供供应商 API Key"}
ret = json.dumps(result, ensure_ascii=False)
result = await rl_sync_asset_status(asset_id, apikey=apikey, secretkey=secretkey)
return result

View File

@ -1,17 +1,14 @@
import json
org_id = (await get_userorgid()) or '0'
group_id = params_kw.get('group_id', '')
apikey = params_kw.get('apikey', '')
secretkey = params_kw.get('secretkey', '')
if not group_id:
result = {"success": False, "message": "group_id 不能为空"}
elif not apikey or not secretkey:
result = {"success": False, "message": "请提供供应商 API Key"}
else:
result = await rl_sync_assets_from_vendor(
org_id, group_id, apikey=apikey, secretkey=secretkey
)
return {"success": False, "message": "group_id 不能为空"}
if not apikey or not secretkey:
return {"success": False, "message": "请提供供应商 API Key"}
ret = json.dumps(result, ensure_ascii=False)
result = await rl_sync_assets_from_vendor(
org_id, group_id, apikey=apikey, secretkey=secretkey
)
return result

View File

@ -1,5 +1,3 @@
import json
org_id = (await get_userorgid()) or '0'
vendor = params_kw.get('vendor', 'volcengine')
apikey = params_kw.get('apikey', '')
@ -7,11 +5,10 @@ secretkey = params_kw.get('secretkey', '')
project_name = params_kw.get('project_name', 'default')
if not apikey or not secretkey:
result = {"success": False, "message": "请提供供应商 API Key"}
else:
result = await rl_sync_group_from_vendor(
org_id, vendor, apikey=apikey, secretkey=secretkey,
project_name=project_name
)
return {"success": False, "message": "请提供供应商 API Key"}
ret = json.dumps(result, ensure_ascii=False)
result = await rl_sync_group_from_vendor(
org_id, vendor, apikey=apikey, secretkey=secretkey,
project_name=project_name
)
return result