diff --git a/api/graphql.py b/api/graphql.py index 3adb176..01dec2b 100644 --- a/api/graphql.py +++ b/api/graphql.py @@ -10,7 +10,7 @@ import os import graphene -from api.schemas.graphql_types import ( +from api.schemas.graphql import ( CreateJobInput, MediaAssetType, ScanResultType, diff --git a/api/schemas/asset.py b/api/schemas/asset.py index 7f13d61..acd680f 100644 --- a/api/schemas/asset.py +++ b/api/schemas/asset.py @@ -1,21 +1,16 @@ """MediaAsset Schemas - GENERATED FILE""" from datetime import datetime -from enum import Enum from typing import Any, Dict, List, Optional from uuid import UUID from .base import BaseSchema - - -class AssetStatus(str, Enum): - PENDING = "pending" - READY = "ready" - ERROR = "error" +from .models import AssetStatus class AssetCreate(BaseSchema): """AssetCreate schema.""" + filename: str file_path: str file_size: Optional[int] = None @@ -30,8 +25,10 @@ class AssetCreate(BaseSchema): comments: str = "" tags: List[str] + class AssetUpdate(BaseSchema): """AssetUpdate schema.""" + filename: Optional[str] = None file_path: Optional[str] = None status: Optional[AssetStatus] = None @@ -48,8 +45,10 @@ class AssetUpdate(BaseSchema): comments: Optional[str] = None tags: Optional[List[str]] = None + class AssetResponse(BaseSchema): """AssetResponse schema.""" + id: UUID filename: str file_path: str diff --git a/api/schemas/graphql_types.py b/api/schemas/graphql.py similarity index 100% rename from api/schemas/graphql_types.py rename to api/schemas/graphql.py diff --git a/api/schemas/job.py b/api/schemas/job.py index c24abe4..20944c4 100644 --- a/api/schemas/job.py +++ b/api/schemas/job.py @@ -1,19 +1,11 @@ """TranscodeJob Schemas - GENERATED FILE""" from datetime import datetime -from enum import Enum from typing import Any, Dict, List, Optional from uuid import UUID from .base import BaseSchema - - -class JobStatus(str, Enum): - PENDING = "pending" - PROCESSING = "processing" - COMPLETED = "completed" - FAILED = "failed" - CANCELLED = "cancelled" +from .models import JobStatus class JobCreate(BaseSchema): diff --git a/ctrl/generate.sh b/ctrl/generate.sh index dc8f689..c0bc77a 100755 --- a/ctrl/generate.sh +++ b/ctrl/generate.sh @@ -32,7 +32,7 @@ python -m modelgen from-schema \ # Graphene types for GraphQL: domain models + enums + API types python -m modelgen from-schema \ --schema schema/models \ - --output api/schemas/graphql_types.py \ + --output api/schemas/graphql.py \ --targets graphene \ --include dataclasses,enums,api