Merge 783967571e into d6c4b9f6b3

Bump sqlalchemy from 2.0.34 to 2.0.35

README.md

@@ -175,7 +175,13 @@ documentations lives at `http://127.0.0.1:1984/docs`.
        "download_media_type": "AUDIO_VIDEO",
        "save_to_storage": false,
        "custom_filename": "cool.mp4",
-       "automatic_extension": false
+       "automatic_extension": false,
+       "custom_options": {
+           "http_headers": {
+               "User-Agent": "MyApp/1.0.0",
+               "Authorization": "Bearer <token>"
+           }
+       }
    }
    ```
    Response

app_api/api/api/api_v1/schemas/task.py

@@ -59,7 +59,7 @@ class CreateTaskIn(StrictRealBaseModel):
     save_to_storage: bool = ...
     custom_filename: str = ...
     automatic_extension: bool = ...
-
+    custom_options: dict | None = Field(None, strict=False)
 
 class CreateTaskOut(StrictRealBaseModel):
     id: uuid.UUID

app_api/api/core/services/task.py

@@ -81,6 +81,7 @@ class TaskService:
             ack_message_id=None,
             custom_filename=task.custom_filename,
             automatic_extension=task.automatic_extension,
+            custom_options=task.custom_options,
         )
         if not await publisher.send_for_download(payload):
             raise TaskServiceError('Failed to create task')

app_api/requirements.txt

@@ -1,2 +1,2 @@
 fastapi-cache2[redis]==0.2.2
-fastapi[standart]==0.112.2
+fastapi[standart]==0.115.0

app_bot/bot/core/service.py

@@ -37,6 +37,7 @@ class UrlService:
             download_media_type=url.download_media_type,
             custom_filename=None,
             automatic_extension=False,
+            custom_options=None,
         )
         is_sent = await self._rmq_publisher.send_for_download(payload)
         if not is_sent:

app_bot/requirements.txt

@@ -1,4 +1,4 @@
 PyYAML==6.0.2
-pyrofork==2.3.43
+pyrofork==2.3.46
 tenacity==9.0.0
 TgCrypto-pyrofork @ git+https://github.com/Mayuri-Chan/tgcrypto-pyrofork

app_worker/worker/core/downloader.py

@@ -60,6 +60,13 @@ class MediaDownloader:
                 media_type=media_type, curr_tmp_dir=curr_tmp_dir
             )
 
+            if media_payload.custom_options:
+                for key, value in media_payload.custom_options.items():
+                    try:
+                        ytdl_opts_model.ytdl_opts[key].update(value)
+                    except KeyError:
+                        ytdl_opts_model.ytdl_opts[key] = value
+
             with yt_dlp.YoutubeDL(ytdl_opts_model.ytdl_opts) as ytdl:
                 self._log.info('Downloading "%s" to "%s"', url, curr_tmp_dir)
                 self._log.info(

yt_shared/requirements_shared.txt

@@ -1,9 +1,9 @@
 SQLAlchemy-Utils==0.41.2
-SQLAlchemy==2.0.32
+SQLAlchemy==2.0.35
 aio-pika==9.4.3
 aiohttp==3.10.5
 asyncpg==0.29.0
 pillow==10.4.0
-pydantic==2.8.2
-pydantic_settings==2.4.0
+pydantic==2.9.2
+pydantic_settings==2.5.2
 uvloop==0.20.0

yt_shared/yt_shared/schemas/media.py

@@ -37,6 +37,7 @@ class InbMediaPayload(StrictRealBaseModel):
     download_media_type: DownMediaType
     custom_filename: str | None
     automatic_extension: bool
+    custom_options: dict[str, dict] | None
     added_at: datetime = Field(default_factory=lambda: datetime.now(timezone.utc))