added handling for multiple transcodig profiles (#223)

* added handling for multiple transcodig profiles

* updated env variable name

* added changelog files

* added a param for excluding file group

* added changelog

* added common settings and removed version specs for mitol common

Author: umar8hassan

src/transcoding/changelog.d/20250404_110423_umar.hassan8_7039_update_transcoding_app.md

@@ -0,0 +1,41 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Removed
+
+- A bullet item for the Removed category.
+
+-->
+<!--
+### Added
+
+- A bullet item for the Added category.
+
+-->
+### Changed
+
+- Updated handling for multiple profiles in transcoding job
+
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category.
+
+-->
+<!--
+### Fixed
+
+- A bullet item for the Fixed category.
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category.
+
+-->

src/transcoding/changelog.d/20250404_162424_umar.hassan8_7039_update_transcoding_app.md

@@ -0,0 +1,41 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+For top level release notes, leave all the headers commented out.
+-->
+
+<!--
+### Removed
+
+- A bullet item for the Removed category.
+
+-->
+<!--
+### Added
+
+- A bullet item for the Added category.
+
+-->
+### Changed
+
+- Added handling to exclude file group with hls groups
+
+<!--
+### Deprecated
+
+- A bullet item for the Deprecated category.
+
+-->
+<!--
+### Fixed
+
+- A bullet item for the Fixed category.
+
+-->
+<!--
+### Security
+
+- A bullet item for the Security category.
+
+-->

src/transcoding/mitol/transcoding/api.py

@@ -2,22 +2,42 @@
 
 import json
 from pathlib import Path
+from typing import Optional
 
 import boto3
 from django.conf import settings
 
+from mitol.transcoding.constants import GroupSettings
 
-def media_convert_job(video_source_key: str) -> dict:
+
+def media_convert_job(  # noqa: PLR0913
+    video_source_key: str,
+    source_prefix: str = settings.VIDEO_S3_UPLOAD_PREFIX,
+    source_bucket: str = settings.AWS_STORAGE_BUCKET_NAME,
+    destination_prefix: str = settings.VIDEO_S3_TRANSCODE_PREFIX,
+    destination_bucket: str = (
+        settings.VIDEO_S3_TRANSCODE_BUCKET or settings.AWS_STORAGE_BUCKET_NAME
+    ),
+    group_settings: Optional[dict] = None,
+) -> dict:
     """
     Create a MediaConvert job for a Video
 
     Args:
         video_source_key (str): S3 key for the video source.
+        source_prefix (str): Prefix for the source video.
+        source_bucket (str, optional): S3 bucket for the source video.
+        destination_prefix (str): Prefix for the destination video.
+        destination_bucket (str): S3 bucket for the transcoded output
+        group_settings (dict, optional): Settings for output groups. Defaults to None.
 
     Returns:
         dict: MediaConvert job details.
     """
-    source_prefix = settings.DRIVE_S3_UPLOAD_PREFIX
+
+    if group_settings is None:
+        group_settings = {}
+
     client = boto3.client(
         "mediaconvert",
         region_name=settings.AWS_REGION,
@@ -35,17 +55,72 @@ def media_convert_job(video_source_key: str) -> dict:
         job_dict["Role"] = (
             f"arn:aws:iam::{settings.AWS_ACCOUNT_ID}:role/{settings.AWS_ROLE_NAME}"
         )
-        source_path = Path(
-            video_source_key.replace(
-                source_prefix,
-                settings.VIDEO_S3_TRANSCODE_PREFIX,
+
+        if source_prefix:
+            destination_path = Path(
+                video_source_key.replace(
+                    source_prefix,
+                    destination_prefix,
+                )
             )
-        )
-        destination = str(source_path.parent / source_path.stem)
-        job_dict["Settings"]["OutputGroups"][0]["OutputGroupSettings"][
-            "FileGroupSettings"
-        ]["Destination"] = f"s3://{settings.AWS_STORAGE_BUCKET_NAME}/{destination}"
+        else:
+            destination_path = Path(destination_prefix, video_source_key)
+        destination = str(destination_path.parent / destination_path.stem)
+
         job_dict["Settings"]["Inputs"][0]["FileInput"] = (
-            f"s3://{settings.AWS_STORAGE_BUCKET_NAME}/{video_source_key}"
+            f"s3://{source_bucket}/{video_source_key}"
         )
+
+        add_group_settings(job_dict, destination, destination_bucket, group_settings)
+
         return client.create_job(**job_dict)
+
+
+def add_group_settings(
+    job_dict: dict,
+    destination: str,
+    destination_bucket: str,
+    group_settings: dict,
+) -> None:
+    """
+    Add group settings to the MediaConvert job dictionary.
+
+    Args:
+        job_dict (dict): MediaConvert job dictionary.
+        destination (str): Destination path for the output files.
+        group_settings (dict): Group settings for the job.
+        destination_bucket (str, optional): S3 bucket for the transcoded output.
+    """
+
+    exclude_mp4 = group_settings.get("exclude_mp4", False)
+    output_groups = job_dict["Settings"]["OutputGroups"]
+
+    if exclude_mp4:
+        # Remove the MP4 output group if not needed
+        output_groups = [
+            group
+            for group in output_groups
+            if group["OutputGroupSettings"]["Type"] != GroupSettings.FILE_GROUP_SETTINGS
+        ]
+
+    for group in output_groups:
+        output_group_settings = group["OutputGroupSettings"]
+        group_settings_type = group["OutputGroupSettings"]["Type"]
+        if group_settings_type == GroupSettings.HLS_GROUP_SETTINGS:
+            group_settings_key = GroupSettings.HLS_GROUP_SETTINGS_KEY
+            output_group_settings[group_settings_key]["SegmentLength"] = (
+                group_settings.get("SegmentLength", 10)
+            )
+            output_group_settings[group_settings_key]["AdditionalManifests"][0][
+                "ManifestNameModifier"
+            ] = group_settings.get("ManifestNameModifier", "__index")
+        elif group_settings_type == GroupSettings.FILE_GROUP_SETTINGS:
+            group_settings_key = GroupSettings.FILE_GROUP_SETTINGS_KEY
+        else:
+            group_type = group_settings_type
+            error_msg = f"Unsupported group settings type: {group_type}"
+            raise ValueError(error_msg)
+
+        output_group_settings[group_settings_key]["Destination"] = (
+            f"s3://{destination_bucket}/{destination}"
+        )

src/transcoding/mitol/transcoding/apps.py

@@ -16,8 +16,9 @@ class Transcoding(AppConfig):
         "VIDEO_TRANSCODE_QUEUE",
         "VIDEO_S3_TRANSCODE_ENDPOINT",
         "VIDEO_S3_TRANSCODE_PREFIX",
-        "DRIVE_S3_UPLOAD_PREFIX",
+        "VIDEO_S3_UPLOAD_PREFIX",
         "AWS_STORAGE_BUCKET_NAME",
+        "VIDEO_S3_TRANSCODE_BUCKET",
         "AWS_REGION",
         "AWS_ACCOUNT_ID",
         "AWS_ROLE_NAME",

src/transcoding/mitol/transcoding/constants.py

@@ -6,3 +6,15 @@
     "TopicArn=arn:aws:sns:{AWS_REGION}:{AWS_ACCOUNT_ID}:"
     "MediaConvertJobAlert&Token={TOKEN}"
 )
+
+
+class GroupSettings:
+    """
+    Constants for AWS MediaConvert group settings types used in job configuration.
+    """
+
+    HLS_GROUP_SETTINGS = "HLS_GROUP_SETTINGS"
+    HLS_GROUP_SETTINGS_KEY = "HlsGroupSettings"
+
+    FILE_GROUP_SETTINGS = "FILE_GROUP_SETTINGS"
+    FILE_GROUP_SETTINGS_KEY = "FileGroupSettings"

src/transcoding/mitol/transcoding/settings/job.py

@@ -12,6 +12,21 @@
     default="Default",
     description=("Name of MediaConvert queue to use for transcoding"),
 )
+VIDEO_S3_TRANSCODE_BUCKET = get_string(
+    name="VIDEO_S3_TRANSCODE_BUCKET",
+    default="",
+    description=("Bucket to be used for transcoding"),
+)
+VIDEO_S3_TRANSCODE_PREFIX = get_string(
+    name="VIDEO_S3_TRANSCODE_PREFIX",
+    default="",
+    description=("Prefix for the transcoded video"),
+)
+VIDEO_S3_UPLOAD_PREFIX = get_string(
+    name="VIDEO_S3_UPLOAD_PREFIX",
+    default="",
+    description=("Prefix for the source video"),
+)
 POST_TRANSCODE_ACTIONS = get_delimited_list(
     name="POST_TRANSCODE_ACTIONS",
     default=[],

src/transcoding/pyproject.toml

@@ -3,7 +3,7 @@ name = "mitol-django-transcoding"
 version = "2025.3.17"
 description = "MIT Open Learning Django app extension for Transcoding jobs"
 dependencies = [
-  "mitol-django-common==2023.12.19",
+  "mitol-django-common",
   "django-stubs>=1.13.1",
   "django>=3.0",
   "boto3==1.37.11",