checkpoint commit

Author: toresbe

.gitignore

@@ -97,13 +97,13 @@ ipython_config.py
 # UV
 #   Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
+#   commonly ignored for app.
 #uv.lock
 
 # poetry
 #   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
 #   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
+#   commonly ignored for app.
 #   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
 #poetry.lock
 #poetry.toml

libraries/__init__.py app/__init__.pylibraries/__init__.py renamed to app/__init__.py

@@ -1,8 +1,6 @@
-import logging
 from pathlib import Path
 
 import yaml
-
 from jinja2 import Environment, PackageLoader, select_autoescape
 from pydantic import BaseModel
 

libraries/config.py app/config.pylibraries/config.py renamed to app/config.py

@@ -1,5 +1,5 @@
 from frikanalen_django_api_client import AuthenticatedClient
 
-from libraries.config import config
+from app.config import config
 
 api_client = AuthenticatedClient(config.django.base_url, config.django.token)

libraries/converter/__init__.py app/converter/__init__.pylibraries/converter/__init__.py renamed to app/converter/__init__.py

@@ -3,12 +3,13 @@
 
 from fastapi import Depends
 from frikanalen_django_api_client import AuthenticatedClient
-from frikanalen_django_api_client.api.videofiles import videofiles_list, videofiles_partial_update, videofiles_create
-from frikanalen_django_api_client.api.videos import videos_partial_update, videos_list
-from frikanalen_django_api_client.models import VideoFile, VideoFileRequest, PatchedVideoRequest
-from libraries.util.pprint_object_list import pprint_object_list
-from libraries.tus_hook.hook_server import get_client_from_app_state, build_client
-from libraries.loudness.loudness_measurement import LoudnessMeasurement
+from frikanalen_django_api_client.api.videofiles import videofiles_create, videofiles_list, videofiles_partial_update
+from frikanalen_django_api_client.api.videos import videos_list, videos_partial_update
+from frikanalen_django_api_client.models import PatchedVideoRequest, VideoFile, VideoFileRequest
+
+from app.loudness.loudness_measurement import LoudnessMeasurement
+from app.tus_hook.hook_server import build_client, get_client_from_app_state
+from app.util.pprint_object_list import pprint_object_list
 
 
 class DjangoApiService:
@@ -58,7 +59,8 @@ async def get_videos(self, limit=10):
 
 if __name__ == "__main__":
     import asyncio
-    from libraries.tus_hook.hook_server import get_client_from_app_state
+
+    from app.tus_hook.hook_server import get_client_from_app_state
 
     async def main():
         service = DjangoApiService(build_client())

libraries/django_api/__init__.py app/django_api/__init__.pylibraries/django_api/__init__.py renamed to app/django_api/__init__.py

@@ -0,0 +1,164 @@
+# generated by datamodel-codegen:
+#   filename:  ffprobe.json
+
+from __future__ import annotations
+
+from typing import Optional, Union
+
+from pydantic import BaseModel, ConfigDict
+
+
+class ProgramVersion(BaseModel):
+    version: str
+    copyright: str
+    compiler_ident: str
+    configuration: str
+
+
+class LibraryVersion(BaseModel):
+    name: str
+    major: int
+    minor: int
+    micro: int
+    version: int
+    ident: str
+
+
+class PixelFormat(BaseModel):
+    pass
+
+
+class Packet(BaseModel):
+    pass
+
+
+class Frame(BaseModel):
+    pass
+
+
+class Format(BaseModel):
+    filename: str
+    nb_streams: int
+    nb_programs: int
+    format_name: str
+    probe_score: int
+    format_long_name: Optional[str] = None
+    start_time: Optional[str] = None
+    duration: Optional[str] = None
+    size: Optional[str] = None
+    bit_rate: Optional[str] = None
+    tags: Optional[dict[str, str]] = None
+
+
+class Chapter(BaseModel):
+    id: int
+    time_base: str
+    start: int
+    start_time: str
+    end: int
+    end_time: str
+    tags: Optional[dict[str, str]] = None
+
+
+class Disposition(BaseModel):
+    default: Optional[int] = None
+    dub: Optional[int] = None
+    original: Optional[int] = None
+    comment: Optional[int] = None
+    lyrics: Optional[int] = None
+    karaoke: Optional[int] = None
+    forced: Optional[int] = None
+    hearing_impaired: Optional[int] = None
+    visual_impaired: Optional[int] = None
+    clean_effects: Optional[int] = None
+    attached_pic: Optional[int] = None
+    timed_thumbnails: Optional[int] = None
+    captions: Optional[int] = None
+    descriptions: Optional[int] = None
+    metadata: Optional[int] = None
+    dependent: Optional[int] = None
+    still_image: Optional[int] = None
+
+
+class Error(BaseModel):
+    code: int
+    string: str
+
+
+class Stream(BaseModel):
+    index: int
+    codec_tag_string: str
+    codec_tag: str
+    codec_name: Optional[str] = None
+    codec_long_name: Optional[str] = None
+    profile: Optional[str] = None
+    codec_type: Optional[str] = None
+    width: Optional[int] = None
+    height: Optional[int] = None
+    coded_width: Optional[int] = None
+    coded_height: Optional[int] = None
+    closed_captions: Optional[int] = None
+    has_b_frames: Optional[int] = None
+    sample_aspect_ratio: Optional[str] = None
+    display_aspect_ratio: Optional[str] = None
+    pix_fmt: Optional[str] = None
+    level: Optional[int] = None
+    color_range: Optional[str] = None
+    color_space: Optional[str] = None
+    color_transfer: Optional[str] = None
+    color_primaries: Optional[str] = None
+    chroma_location: Optional[str] = None
+    field_order: Optional[str] = None
+    refs: Optional[int] = None
+    sample_fmt: Optional[str] = None
+    sample_rate: Optional[str] = None
+    channels: Optional[int] = None
+    channel_layout: Optional[str] = None
+    bits_per_sample: Optional[int] = None
+    id: Optional[str] = None
+    r_frame_rate: Optional[str] = None
+    avg_frame_rate: Optional[str] = None
+    time_base: Optional[str] = None
+    start_pts: Optional[int] = None
+    start_time: Optional[str] = None
+    duration_ts: Optional[int] = None
+    duration: Optional[str] = None
+    bit_rate: Optional[str] = None
+    max_bit_rate: Optional[str] = None
+    bits_per_raw_sample: Optional[str] = None
+    nb_frames: Optional[str] = None
+    nb_read_frames: Optional[str] = None
+    nb_read_packets: Optional[str] = None
+    disposition: Optional[Disposition] = None
+    tags: Optional[dict[str, str]] = None
+
+
+class Program(BaseModel):
+    program_id: int
+    program_num: int
+    nb_streams: int
+    pmt_pid: int
+    pcr_pid: int
+    start_pts: int
+    start_time: str
+    end_pts: int
+    end_time: str
+    streams: list[Stream]
+    tags: Optional[dict[str, str]] = None
+
+
+class FfprobeOutput(BaseModel):
+    model_config = ConfigDict(
+        extra="forbid",
+    )
+    program_version: Optional[ProgramVersion] = None
+    library_version: Optional[list[LibraryVersion]] = None
+    pixel_formats: Optional[list[PixelFormat]] = None
+    packets: Optional[list[Packet]] = None
+    frames: Optional[list[Frame]] = None
+    packets_and_frames: Optional[list[Union[Packet, Frame]]] = None
+    programs: Optional[list[Program]] = None
+    streams: Optional[list[Stream]] = None
+    format: Optional[Format] = None
+    chapters: Optional[list[Chapter]] = None
+    error: Optional[Error] = None

libraries/django_api/client.py app/django_api/client.pylibraries/django_api/client.py renamed to app/django_api/client.py

@@ -0,0 +1,38 @@
+import asyncio
+import logging
+from pathlib import Path
+
+from app.ffprobe.ffprobe_schema import FfprobeOutput
+
+
+async def _run_ffprobe(filepath: Path) -> str:
+    cmd = ["ffprobe", "-v", "quiet", "-show_format", "-show_streams", "-of", "json", str(filepath)]
+    logging.debug("Running ffprobe command: %s", cmd)
+
+    process = await asyncio.create_subprocess_exec(
+        *cmd,
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE,
+    )
+    stdout, stderr = await process.communicate()
+
+    if process.returncode != 0:
+        raise RuntimeError(f"ffprobe failed: {stderr.decode()}")
+
+    return stdout.decode()
+
+
+async def ffprobe_file(filepath: Path) -> FfprobeOutput:
+    data = await _run_ffprobe(filepath)
+    logging.debug("Validating ffprobe output against JSON Schema: %s", data)
+    return FfprobeOutput.model_validate_json(data)
+
+
+if __name__ == "__main__":
+    import sys
+
+    async def main():
+        result = await ffprobe_file(Path(sys.argv[1]))
+        print(result)
+
+    asyncio.run(main())