From 7488665d04cf6c1f009219b7a84f4f75c9572523 Mon Sep 17 00:00:00 2001 From: xds Date: Wed, 18 Feb 2026 17:01:06 +0300 Subject: [PATCH] fixes --- api/endpoints/generation_router.py | 9 ++++----- api/service/generation_service.py | 15 +++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/api/endpoints/generation_router.py b/api/endpoints/generation_router.py index fa890c1..d7db815 100644 --- a/api/endpoints/generation_router.py +++ b/api/endpoints/generation_router.py @@ -178,12 +178,11 @@ async def import_external_generation( Import a generation from an external source. Requires server-to-server authentication via HMAC signature. """ - import os - from utils.external_auth import verify_signature - from api.models.ExternalGenerationDTO import ExternalGenerationRequest - - logger.info("import_external_generation called") + import os + from utils.external_auth import verify_signature + from api.models import ExternalGenerationRequest + logger.info("import_external_generation called") # Get raw request body for signature verification body = await request.body() diff --git a/api/service/generation_service.py b/api/service/generation_service.py index 3a0df32..0081bdb 100644 --- a/api/service/generation_service.py +++ b/api/service/generation_service.py @@ -1,25 +1,25 @@ import asyncio +import base64 import logging import random -import base64 from datetime import datetime, UTC from typing import List, Optional, Tuple, Any, Dict -from io import BytesIO from uuid import uuid4 -import httpx +import httpx from aiogram import Bot from aiogram.types import BufferedInputFile + from adapters.Exception import GoogleGenerationException from adapters.google_adapter import GoogleAdapter -from api.models import GenerationRequest, GenerationResponse, GenerationsResponse, GenerationGroupResponse +from adapters.s3_adapter import S3Adapter from api.models import FinancialReport, UsageStats, UsageByEntity +from api.models import GenerationRequest, GenerationResponse, GenerationsResponse, GenerationGroupResponse # Импортируйте ваши модели DAO, Asset, Generation корректно from models.Asset import Asset, AssetType, AssetContentType from models.Generation import Generation, GenerationStatus -from models.enums import AspectRatios, Quality, GenType +from models.enums import AspectRatios, Quality from repos.dao import DAO -from adapters.s3_adapter import S3Adapter logger = logging.getLogger(__name__) @@ -378,8 +378,7 @@ class GenerationService: Returns: Created Generation object """ - from api.models.ExternalGenerationDTO import ExternalGenerationRequest - + # Validate image source external_gen.validate_image_source()