update for API compatibility

Author: toresbe

app/django_client/service.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from enum import Enum
 
 from frikanalen_django_api_client import AuthenticatedClient
 from frikanalen_django_api_client.api.videofiles import videofiles_create, videofiles_list, videofiles_partial_update
@@ -15,6 +16,33 @@
 from app.util.pprint_object_list import pprint_object_list
 
 
+class FormatEnum(str, Enum):
+    BROADCAST = "broadcast"
+    CLOUDFLARE_ID = "cloudflare_id"
+    LARGE_THUMB = "large_thumb"
+    MED_THUMB = "med_thumb"
+    ORIGINAL = "original"
+    SMALL_THUMB = "small_thumb"
+    SRT = "srt"
+    THEORA = "theora"
+    VC1 = "vc1"
+
+    def __str__(self) -> str:
+        return str(self.value)
+
+
+class IntFormatEnum(int, Enum):
+    LARGE_THUMB = 1
+    BROADCAST = 2
+    VC1 = 3
+    MED_THUMB = 4
+    SMALL_THUMB = 5
+    ORIGINAL = 6
+    THEORA = 7
+    SRT = 8
+    CLOUDFLARE_ID = 9
+
+
 class DjangoApiService:
     client: AuthenticatedClient
 
@@ -55,8 +83,11 @@ async def set_video_loudness(self, video_id: str, loudness: LoudnessMeasurement)
     async def get_files_for_video(self, video_id: str):
         return await videofiles_list.asyncio(client=self.client, video_id=int(video_id))
 
-    async def create_video_file(self, video_file: VideoFileRequest):
-        return await videofiles_create.asyncio(client=self.client, body=video_file)
+    async def create_video_file(self, filename: str, video_id: str, file_format: FormatEnum):
+        req = VideoFileRequest(
+            filename=str(filename), video=int(video_id), format_=IntFormatEnum[file_format.name].value
+        )
+        return await videofiles_create.asyncio(client=self.client, body=req)
 
     async def get_videos(self, limit=10):
         return (await videos_list.asyncio(client=self.client, limit=limit, ordering="-uploaded_time")).results or []
@@ -70,7 +101,7 @@ async def main():
 
         settings = get_settings()
         token = api_get_key(
-            settings.api.url,
+            str(settings.api.url),
             settings.api.username,
             settings.api.password.get_secret_value(),
         )

app/ingest.py

@@ -2,9 +2,7 @@
 from logging import Logger, getLogger
 from pathlib import Path
 
-from frikanalen_django_api_client.models import FormatEnum, VideoFileRequest
-
-from app.django_client.service import DjangoApiService
+from app.django_client.service import DjangoApiService, FormatEnum
 from app.util.logging import VideoIdFilter
 
 from .archive_store import Archive
@@ -50,31 +48,35 @@ async def ingest(self, video_id: str, original_file: Path, metadata: FfprobeOutp
         try:
             self.logger.info("Setting video duration: %s", metadata.format.duration)
             await self.django_api.set_video_duration(video_id, metadata.format.duration)
-            req = VideoFileRequest(filename=str(archive_original), format_=FormatEnum.ORIGINAL, video=int(video_id))
-            await self.django_api.create_video_file(video_file=req)
+
+            await self.django_api.create_video_file(
+                filename=archive_original, file_format=FormatEnum.ORIGINAL, video_id=video_id
+            )
         except Exception as e:
             self.logger.error("django-api error post original ingest: %s", e)
             raise
 
-        for format in DESIRED_FORMATS:
-            await self._process_format(format, metadata, archive_original, video_id)
+        for file_format in DESIRED_FORMATS:
+            await self._process_format(file_format, metadata, archive_original, video_id)
 
         await self.django_api.set_video_proper_import(video_id, True)
 
-    async def _process_format(self, format: FormatEnum, metadata: FfprobeOutput, archive_original: Path, video_id: str):
+    async def _process_format(
+        self, file_format: FormatEnum, metadata: FfprobeOutput, archive_original: Path, video_id: str
+    ):
         self.logger.info("Processing: %s", archive_original)
-        output_directory = archive_original.parent.parent / format
+        output_directory = archive_original.parent.parent / file_format
 
         self.logger.info("Creating directory: %s", output_directory)
         output_directory.mkdir(exist_ok=True)
 
-        self.logger.info("Building command for format: %s", format)
-        template = TemplatedCommandGenerator(format)
+        self.logger.info("Building command for format: %s", file_format)
+        template = TemplatedCommandGenerator(file_format)
 
         output_file_name = f"{archive_original.stem}.{template.metadata.output_file_extension}"
         output_file = output_directory / output_file_name
 
-        self.logger.info("Storing %s to %s", format, output_file)
+        self.logger.info("Storing %s to %s", file_format, output_file)
 
         template_args = ProfileTemplateArguments(
             input_file=archive_original,
@@ -86,5 +88,4 @@ async def _process_format(self, format: FormatEnum, metadata: FfprobeOutput, arc
         await TKB(command).execute()
 
         self.logger.info("Creating video file entry for %s", output_file)
-        req = VideoFileRequest(filename=str(output_file), format_=format, video=int(video_id))
-        await self.django_api.create_video_file(video_file=req)
+        await self.django_api.create_video_file(filename=str(output_file), file_format=file_format, video_id=video_id)