fix: respond with new edx_video_id if created by transcript upload

Author: kdmccormick

openedx/core/djangoapps/video_config/services.py

@@ -116,34 +116,36 @@ def upload_transcript(
         self,
         *,
         video_block: VideoBlock,
-        edx_video_id: str | None,
-        transcript_file: File,
         language_code: str,
-        new_language_code: str,
+        new_language_code: str | None,
+        transcript_file: File,
+        edx_video_id: str | None,
     ) -> None:
         """
         Store a transcript, however the runtime prefers to.
 
+        Mutates:
+        * video_block.transcripts
+        * video_block.edx_video_id, iff a new video is created in edx-val.
+
         Can raise:
         * UnicodeDecodeError
         * TranscriptsGenerationException
         """
-        edx_video_id = clean_video_id(edx_video_id)
         is_library = isinstance(video_block.usage_key.context_key, LibraryLocatorV2)
+        content: bytes = transcript_file.read()
         if is_library:
+            # Save transcript as static asset in Learning Core if is a library component
             filename = f'transcript-{new_language_code}.srt'
+            add_library_block_static_asset_file(video_block.usage_key, f"static/{filename}", content)
         else:
+            edx_video_id = clean_video_id(edx_video_id)
             if not edx_video_id:
                 # Back-populate the video ID for an external video.
                 # pylint: disable=attribute-defined-outside-init
-                video_block.edx_video_id = edx_video_id = create_external_video(display_name='external video')
+                edx_video_id = create_external_video(display_name='external video')
+                video_block.edx_video_id = edx_video_id
             filename = f'{edx_video_id}-{new_language_code}.srt'
-
-        content = transcript_file.read()
-        if is_library:
-            # Save transcript as static asset in Learning Core if is a library component
-            add_library_block_static_asset_file(video_block.usage_key, f"static/{filename}", content)
-        else:
             # Convert SRT transcript into an SJSON format and upload it to S3 if a course component
             sjson_subs = Transcript.convert(
                 content=content.decode('utf-8'),
@@ -155,7 +157,7 @@ def upload_transcript(
                 language_code=language_code,
                 metadata={
                     'file_format': Transcript.SJSON,
-                    'language_code': new_language_code
+                    'language_code': new_language_code,
                 },
                 file_data=ContentFile(sjson_subs),
             )

xmodule/video_block/video_handlers.py

@@ -519,18 +519,24 @@ def _studio_transcript_upload(self, request):
         error = self.validate_transcript_upload_data(data=request.POST)
         if error:
             return Response(json={'error': error}, status=400)
-        edx_video_id = request.POST['edx_video_id']
+        edx_video_id = (request.POST['edx_video_id'] or "").strip()
         language_code = request.POST['language_code']
+        new_language_code = request.POST['new_language_code']
         try:
             video_config_service.upload_transcript(
-                video_block=self,
+                video_block=self,  # NOTE: .edx_video_id and .transcripts may get mutated
                 edx_video_id=edx_video_id,
                 language_code=language_code,
+                new_language_code=new_language_code,
                 transcript_file=request.POST['file'].file,
-                new_language_code=request.POST['new_language_code'],
             )
             return Response(
-                json.dumps({"edx_video_id": edx_video_id, "language_code": language_code}),
+                json.dumps(
+                    {
+                        "edx_video_id": edx_video_id or self.edx_video_id,
+                        "language_code": new_language_code,
+                    }
+                ),
                 status=201,
             )
         except (TranscriptsGenerationException, UnicodeDecodeError):
@@ -556,7 +562,7 @@ def _studio_transcript_delete(self, request):
             return Response(status=400)
         video_config_service.delete_transcript(
             video_block=self,
-            edx_video_id=request_data['edx_video_id'] or self.edx_video_id,
+            edx_video_id=request_data['edx_video_id'],
             language_code=request_data['lang'],
         )
         return Response(status=200)