updated modelgen tool

api/graphql.py

@@ -3,14 +3,14 @@ GraphQL API using graphene, mounted on FastAPI/Starlette.
 
 Provides the same data as the REST API but via GraphQL queries and mutations.
 Uses Django ORM directly for data access.
-Types are generated from schema/ via modelgen — see api/schemas/graphql_types.py.
+Types are generated from schema/ via modelgen — see api/schema/graphql.py.
 """
 
 import os
 
 import graphene
 
-from api.schemas.graphql import (
+from api.schema.graphql import (
     CreateJobInput,
     MediaAssetType,
     ScanResultType,

api/routes/assets.py

@@ -8,7 +8,7 @@ from uuid import UUID
 from fastapi import APIRouter, Depends, HTTPException, Query
 
 from api.deps import get_asset
-from api.schemas import AssetCreate, AssetResponse, AssetUpdate
+from api.schema import AssetCreate, AssetResponse, AssetUpdate
 from core.storage import BUCKET_IN, list_objects
 
 router = APIRouter(prefix="/assets", tags=["assets"])

api/routes/jobs.py

@@ -10,7 +10,7 @@ from uuid import UUID
 from fastapi import APIRouter, Depends, Header, HTTPException, Query
 
 from api.deps import get_asset, get_job, get_preset
-from api.schemas import JobCreate, JobResponse
+from api.schema import JobCreate, JobResponse
 
 router = APIRouter(prefix="/jobs", tags=["jobs"])
 

api/routes/presets.py

@@ -7,7 +7,7 @@ from uuid import UUID
 from fastapi import APIRouter, Depends, HTTPException
 
 from api.deps import get_preset
-from api.schemas import PresetCreate, PresetResponse, PresetUpdate
+from api.schema import PresetCreate, PresetResponse, PresetUpdate
 
 router = APIRouter(prefix="/presets", tags=["presets"])
 

api/schema/asset.py

@@ -1,16 +1,21 @@
 """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
-from .models import AssetStatus
+
+
+class AssetStatus(str, Enum):
+    PENDING = "pending"
+    READY = "ready"
+    ERROR = "error"
 
 
 class AssetCreate(BaseSchema):
     """AssetCreate schema."""
-
     filename: str
     file_path: str
     file_size: Optional[int] = None
@@ -23,12 +28,10 @@ class AssetCreate(BaseSchema):
     bitrate: Optional[int] = None
     properties: Dict[str, Any]
     comments: str = ""
-    tags: List[str]
-
+    tags: List[str] = Field(default_factory=list)
 
 class AssetUpdate(BaseSchema):
     """AssetUpdate schema."""
-
     filename: Optional[str] = None
     file_path: Optional[str] = None
     status: Optional[AssetStatus] = None
@@ -45,10 +48,8 @@ class AssetUpdate(BaseSchema):
     comments: Optional[str] = None
     tags: Optional[List[str]] = None
 
-
 class AssetResponse(BaseSchema):
     """AssetResponse schema."""
-
     id: UUID
     filename: str
     file_path: str
@@ -64,6 +65,6 @@ class AssetResponse(BaseSchema):
     bitrate: Optional[int] = None
     properties: Dict[str, Any]
     comments: str = ""
-    tags: List[str]
+    tags: List[str] = Field(default_factory=list)
     created_at: Optional[datetime] = None
     updated_at: Optional[datetime] = None

api/schema/job.py

@@ -1,27 +1,43 @@
 """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
-from .models import JobStatus
+
+
+class JobStatus(str, Enum):
+    PENDING = "pending"
+    PROCESSING = "processing"
+    COMPLETED = "completed"
+    FAILED = "failed"
+    CANCELLED = "cancelled"
 
 
 class JobCreate(BaseSchema):
-    """Client-facing job creation request."""
-
+    """JobCreate schema."""
     source_asset_id: UUID
     preset_id: Optional[UUID] = None
+    preset_snapshot: Dict[str, Any]
     trim_start: Optional[float] = None
     trim_end: Optional[float] = None
-    output_filename: Optional[str] = None
+    output_filename: str = ""
+    output_path: Optional[str] = None
+    output_asset_id: Optional[UUID] = None
+    progress: float = 0.0
+    current_frame: Optional[int] = None
+    current_time: Optional[float] = None
+    speed: Optional[str] = None
+    celery_task_id: Optional[str] = None
+    execution_arn: Optional[str] = None
     priority: int = 0
-
+    started_at: Optional[datetime] = None
+    completed_at: Optional[datetime] = None
 
 class JobUpdate(BaseSchema):
     """JobUpdate schema."""
-
     source_asset_id: Optional[UUID] = None
     preset_id: Optional[UUID] = None
     preset_snapshot: Optional[Dict[str, Any]] = None
@@ -37,14 +53,13 @@ class JobUpdate(BaseSchema):
     speed: Optional[str] = None
     error_message: Optional[str] = None
     celery_task_id: Optional[str] = None
+    execution_arn: Optional[str] = None
     priority: Optional[int] = None
     started_at: Optional[datetime] = None
     completed_at: Optional[datetime] = None
 
-
 class JobResponse(BaseSchema):
     """JobResponse schema."""
-
     id: UUID
     source_asset_id: UUID
     preset_id: Optional[UUID] = None
@@ -61,6 +76,7 @@ class JobResponse(BaseSchema):
     speed: Optional[str] = None
     error_message: Optional[str] = None
     celery_task_id: Optional[str] = None
+    execution_arn: Optional[str] = None
     priority: int = 0
     created_at: Optional[datetime] = None
     started_at: Optional[datetime] = None

api/schema/preset.py

@@ -24,7 +24,7 @@ class PresetCreate(BaseSchema):
     audio_bitrate: Optional[str] = None
     audio_channels: Optional[int] = None
     audio_samplerate: Optional[int] = None
-    extra_args: List[str]
+    extra_args: List[str] = Field(default_factory=list)
 
 class PresetUpdate(BaseSchema):
     """PresetUpdate schema."""
@@ -61,6 +61,6 @@ class PresetResponse(BaseSchema):
     audio_bitrate: Optional[str] = None
     audio_channels: Optional[int] = None
     audio_samplerate: Optional[int] = None
-    extra_args: List[str]
+    extra_args: List[str] = Field(default_factory=list)
     created_at: Optional[datetime] = None
     updated_at: Optional[datetime] = None

api/schemas/models.py

@@ -1,90 +0,0 @@
-"""
-Pydantic Models - GENERATED FILE
-
-Do not edit directly. Regenerate using modelgen.
-"""
-
-from datetime import datetime
-from enum import Enum
-from typing import Any, Dict, List, Optional
-from uuid import UUID
-
-from pydantic import BaseModel, Field
-
-class AssetStatus(str, Enum):
-    PENDING = "pending"
-    READY = "ready"
-    ERROR = "error"
-
-class JobStatus(str, Enum):
-    PENDING = "pending"
-    PROCESSING = "processing"
-    COMPLETED = "completed"
-    FAILED = "failed"
-    CANCELLED = "cancelled"
-
-class MediaAsset(BaseModel):
-    """A video/audio file registered in the system."""
-    id: UUID
-    filename: str
-    file_path: str
-    status: AssetStatus = "AssetStatus.PENDING"
-    error_message: Optional[str] = None
-    file_size: Optional[int] = None
-    duration: Optional[float] = None
-    video_codec: Optional[str] = None
-    audio_codec: Optional[str] = None
-    width: Optional[int] = None
-    height: Optional[int] = None
-    framerate: Optional[float] = None
-    bitrate: Optional[int] = None
-    properties: Dict[str, Any]
-    comments: str = ""
-    tags: List[str] = Field(default_factory=list)
-    created_at: Optional[datetime] = None
-    updated_at: Optional[datetime] = None
-
-class TranscodePreset(BaseModel):
-    """A reusable transcoding configuration (like Handbrake presets)."""
-    id: UUID
-    name: str
-    description: str = ""
-    is_builtin: bool = False
-    container: str = "mp4"
-    video_codec: str = "libx264"
-    video_bitrate: Optional[str] = None
-    video_crf: Optional[int] = None
-    video_preset: Optional[str] = None
-    resolution: Optional[str] = None
-    framerate: Optional[float] = None
-    audio_codec: str = "aac"
-    audio_bitrate: Optional[str] = None
-    audio_channels: Optional[int] = None
-    audio_samplerate: Optional[int] = None
-    extra_args: List[str] = Field(default_factory=list)
-    created_at: Optional[datetime] = None
-    updated_at: Optional[datetime] = None
-
-class TranscodeJob(BaseModel):
-    """A transcoding or trimming job in the queue."""
-    id: UUID
-    source_asset_id: UUID
-    preset_id: Optional[UUID] = None
-    preset_snapshot: Dict[str, Any]
-    trim_start: Optional[float] = None
-    trim_end: Optional[float] = None
-    output_filename: str = ""
-    output_path: Optional[str] = None
-    output_asset_id: Optional[UUID] = None
-    status: JobStatus = "JobStatus.PENDING"
-    progress: float = 0.0
-    current_frame: Optional[int] = None
-    current_time: Optional[float] = None
-    speed: Optional[str] = None
-    error_message: Optional[str] = None
-    celery_task_id: Optional[str] = None
-    execution_arn: Optional[str] = None
-    priority: int = 0
-    created_at: Optional[datetime] = None
-    started_at: Optional[datetime] = None
-    completed_at: Optional[datetime] = None