1
This commit is contained in:
@@ -37,7 +37,6 @@ from app.schemas.admin import (
|
||||
ResetPasswordRequest,
|
||||
UpdateFrontendUserKindRequest,
|
||||
OperationLogOut,
|
||||
AdminCreditRecordListOut,
|
||||
)
|
||||
from app.schemas.team import UpdateUserTeamRequest
|
||||
from app.schemas.industry import IndustryConfigCreate, IndustryConfigOut
|
||||
@@ -62,7 +61,6 @@ from app.services.generation_billing_service import (
|
||||
get_next_credit_attempt_no,
|
||||
)
|
||||
from app.services.generation_refund_service import mark_generation_record_failed_and_refund_once
|
||||
from app.services.generation_ai_service import _build_image_snapshot, _build_video_snapshot
|
||||
from app.utils.id_gen import generate_id
|
||||
from app.schemas.generation import GenerationType, ASPECT_RATIOS, RESOLUTIONS
|
||||
|
||||
@@ -483,7 +481,7 @@ async def admin_change_password(
|
||||
|
||||
# ── Credit Records ───────────────────────────────────────
|
||||
|
||||
@router.get("/credit-records", response_model=AdminCreditRecordListOut)
|
||||
@router.get("/credit-records")
|
||||
async def list_credit_records(
|
||||
page: int = Query(1, ge=1),
|
||||
page_size: int = Query(20, ge=1, le=1000),
|
||||
@@ -500,12 +498,6 @@ async def list_credit_records(
|
||||
source_module: str | None = Query(None),
|
||||
source_step_code: str | None = Query(None),
|
||||
billing_scene: str | None = Query(None),
|
||||
engine_provider: str | None = Query(None),
|
||||
engine_model_name: str | None = Query(None),
|
||||
pricing_version_code: str | None = Query(None),
|
||||
provider_cost_status: str | None = Query(None),
|
||||
provider_cost_is_estimated: bool | None = Query(None),
|
||||
has_attachment: bool | None = Query(None),
|
||||
start_date: str = Query(None),
|
||||
end_date: str = Query(None),
|
||||
admin: User = Depends(get_admin_user),
|
||||
@@ -528,12 +520,6 @@ async def list_credit_records(
|
||||
source_module=source_module,
|
||||
source_step_code=source_step_code,
|
||||
billing_scene=billing_scene,
|
||||
engine_provider=engine_provider,
|
||||
engine_model_name=engine_model_name,
|
||||
pricing_version_code=pricing_version_code,
|
||||
provider_cost_status=provider_cost_status,
|
||||
provider_cost_is_estimated=provider_cost_is_estimated,
|
||||
has_attachment=has_attachment,
|
||||
start_date=start_date,
|
||||
end_date=end_date,
|
||||
)
|
||||
@@ -2060,9 +2046,6 @@ async def admin_generate_video(
|
||||
raise HTTPException(status_code=400, detail="不支持的分辨率")
|
||||
|
||||
duration = record.duration or 5
|
||||
from app.services.video_gen import get_active_engine, submit_video_task
|
||||
engine = await get_active_engine(db)
|
||||
engine_snapshot = _build_video_snapshot(engine, aspect_ratio, resolution, duration)
|
||||
media_billing = await charge_generation_media_by_params(
|
||||
db,
|
||||
user_id=record.user_id,
|
||||
@@ -2070,21 +2053,14 @@ async def admin_generate_video(
|
||||
gen_type="video",
|
||||
duration=duration,
|
||||
resolution=resolution,
|
||||
aspect_ratio=aspect_ratio,
|
||||
fps=24,
|
||||
engine_id=engine.id,
|
||||
project_name=project_name,
|
||||
description_prefix="视频生成(管理后台)",
|
||||
owner_type=OWNER_GENERATION_RECORD,
|
||||
attempt_no=attempt_no,
|
||||
media_references=record.media_references,
|
||||
)
|
||||
|
||||
record.aspect_ratio = aspect_ratio
|
||||
record.resolution = resolution
|
||||
record.engine_id = engine.id
|
||||
record.engine_snapshot_json = json.dumps(engine_snapshot, ensure_ascii=False, default=str)
|
||||
record.current_billing_attempt_no = attempt_no
|
||||
record.credits_cost = round(float(record.credits_cost or 0) + media_billing.total_charged, 2)
|
||||
record.status = "generating"
|
||||
record.error_message = None
|
||||
@@ -2095,6 +2071,8 @@ async def admin_generate_video(
|
||||
await db.flush()
|
||||
|
||||
try:
|
||||
from app.services.video_gen import get_active_engine, submit_video_task
|
||||
engine = await get_active_engine(db)
|
||||
task_id = await submit_video_task(
|
||||
db,
|
||||
engine,
|
||||
@@ -2117,31 +2095,19 @@ async def admin_generate_video(
|
||||
|
||||
post_image_size = body.get("image_size", "")
|
||||
image_size = post_image_size or record.image_size or "2K"
|
||||
from app.services.image_gen import get_active_image_engine
|
||||
engine = await get_active_image_engine(db)
|
||||
image_proportion = record.image_proportion or "1:1"
|
||||
image_px = record.image_px or "2048x2048"
|
||||
engine_snapshot = _build_image_snapshot(engine, image_size, image_proportion, image_px)
|
||||
media_billing = await charge_generation_media_by_params(
|
||||
db,
|
||||
user_id=record.user_id,
|
||||
record_id=record.id,
|
||||
gen_type="image",
|
||||
image_size=image_size,
|
||||
image_px=image_px,
|
||||
aspect_ratio=image_proportion,
|
||||
engine_id=engine.id,
|
||||
project_name=project_name,
|
||||
description_prefix="图片生成(管理后台)",
|
||||
owner_type=OWNER_GENERATION_RECORD,
|
||||
attempt_no=attempt_no,
|
||||
media_references=record.media_references,
|
||||
)
|
||||
|
||||
record.image_size = image_size
|
||||
record.engine_id = engine.id
|
||||
record.engine_snapshot_json = json.dumps(engine_snapshot, ensure_ascii=False, default=str)
|
||||
record.current_billing_attempt_no = attempt_no
|
||||
record.credits_cost = round(float(record.credits_cost or 0) + media_billing.total_charged, 2)
|
||||
record.status = "generating"
|
||||
record.error_message = None
|
||||
|
||||
Reference in New Issue
Block a user