Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
5900b349
Commit
5900b349
authored
Sep 29, 2017
by
Qubad786
Committed by
muzaffaryousaf
Oct 16, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backend changes for video source language in transcript preferences.
parent
9c06bb65
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
60 additions
and
28 deletions
+60
-28
cms/djangoapps/contentstore/views/tests/test_videos.py
+37
-12
cms/djangoapps/contentstore/views/videos.py
+23
-16
No files found.
cms/djangoapps/contentstore/views/tests/test_videos.py
View file @
5900b349
...
...
@@ -889,6 +889,18 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
VIEW_NAME
=
'transcript_preferences_handler'
def
test_405_with_not_allowed_request_method
(
self
):
"""
Verify that 405 is returned in case of not-allowed request methods.
Allowed request methods are POST and DELETE.
"""
video_transcript_url
=
self
.
get_url_for_course_key
(
self
.
course
.
id
)
response
=
self
.
client
.
get
(
video_transcript_url
,
content_type
=
'application/json'
)
self
.
assertEqual
(
response
.
status_code
,
405
)
@ddt.data
(
# Video transcript feature disabled
(
...
...
@@ -901,7 +913,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
(
{},
True
,
'Invalid provider.'
,
u"Invalid provider None."
,
400
),
(
...
...
@@ -909,7 +921,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'provider'
:
''
},
True
,
'Invalid provider.'
,
u"Invalid provider ."
,
400
),
(
...
...
@@ -917,7 +929,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'provider'
:
'dummy-provider'
},
True
,
'Invalid provider.'
,
u"Invalid provider dummy-provider."
,
400
),
(
...
...
@@ -925,7 +937,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'provider'
:
TranscriptProvider
.
CIELO24
},
True
,
'Invalid cielo24 fidelity.'
,
u"Invalid cielo24 fidelity None."
,
400
),
(
...
...
@@ -934,7 +946,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'cielo24_fidelity'
:
'PROFESSIONAL'
,
},
True
,
'Invalid cielo24 turnaround.'
,
u"Invalid cielo24 turnaround None."
,
400
),
(
...
...
@@ -944,7 +956,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'cielo24_turnaround'
:
'STANDARD'
},
True
,
'Invalid languages.'
,
u"Invalid languages []."
,
400
),
(
...
...
@@ -955,7 +967,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'preferred_languages'
:
[
'es'
,
'ur'
]
},
True
,
'Invalid languages.'
,
u"Invalid languages [u'es', u'ur']."
,
400
),
(
...
...
@@ -963,26 +975,39 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'provider'
:
TranscriptProvider
.
THREE_PLAY_MEDIA
},
True
,
'Invalid 3play turnaround.'
,
u"Invalid 3play turnaround None."
,
400
),
(
{
'provider'
:
TranscriptProvider
.
THREE_PLAY_MEDIA
,
'three_play_turnaround'
:
'default'
'three_play_turnaround'
:
'default'
,
'video_source_language'
:
'zh'
,
},
True
,
u"Unsupported source language zh."
,
400
),
(
{
'provider'
:
TranscriptProvider
.
THREE_PLAY_MEDIA
,
'three_play_turnaround'
:
'default'
,
'video_source_language'
:
'es'
,
'preferred_languages'
:
[
'es'
,
'ur'
]
},
True
,
'Invalid languages.'
,
u"Invalid languages [u'es', u'ur']."
,
400
),
(
{
'provider'
:
TranscriptProvider
.
THREE_PLAY_MEDIA
,
'three_play_turnaround'
:
'default'
,
'video_source_language'
:
'en'
,
'preferred_languages'
:
[
'es'
,
'ur'
]
},
True
,
'Invalid languages.'
,
u"Invalid languages [u'es', u'ur']."
,
400
),
# Success
...
...
@@ -1002,7 +1027,7 @@ class TranscriptPreferencesTestCase(VideoUploadTestBase, CourseTestCase):
'provider'
:
TranscriptProvider
.
THREE_PLAY_MEDIA
,
'three_play_turnaround'
:
'default'
,
'preferred_languages'
:
[
'en'
],
'video_source_language'
:
None
,
# TODO change this once we support source language in platform.
'video_source_language'
:
'en'
,
},
True
,
''
,
...
...
cms/djangoapps/contentstore/views/videos.py
View file @
5900b349
...
...
@@ -256,9 +256,8 @@ def video_images_handler(request, course_key_string, edx_video_id=None):
return
JsonResponse
({
'image_url'
:
image_url
})
def
validate_transcript_preferences
(
provider
,
cielo24_fidelity
,
cielo24_turnaround
,
three_play_turnaround
,
preferred_languages
):
def
validate_transcript_preferences
(
provider
,
cielo24_fidelity
,
cielo24_turnaround
,
three_play_turnaround
,
video_source_language
,
preferred_languages
):
"""
Validate 3rd Party Transcription Preferences.
...
...
@@ -267,6 +266,7 @@ def validate_transcript_preferences(
cielo24_fidelity: Cielo24 transcription fidelity.
cielo24_turnaround: Cielo24 transcription turnaround.
three_play_turnaround: 3PlayMedia transcription turnaround.
video_source_language: Source/Speech language of the videos that are going to be submitted to 3PlayMedia.
preferred_languages: list of language codes.
Returns:
...
...
@@ -286,43 +286,49 @@ def validate_transcript_preferences(
# Validate transcription turnaround
if
cielo24_turnaround
not
in
transcription_plans
[
provider
][
'turnaround'
]:
error
=
_
(
'Invalid cielo24 turnaround.'
)
error
=
'Invalid cielo24 turnaround {}.'
.
format
(
cielo24_turnaround
)
return
error
,
preferences
# Validate transcription languages
supported_languages
=
transcription_plans
[
provider
][
'fidelity'
][
cielo24_fidelity
][
'languages'
]
if
not
len
(
preferred_languages
)
or
not
(
set
(
preferred_languages
)
<=
set
(
supported_languages
.
keys
())):
error
=
_
(
'Invalid languages.'
)
error
=
'Invalid languages {}.'
.
format
(
preferred_languages
)
return
error
,
preferences
# Validated Cielo24 preferences
preferences
=
{
'cielo24_fidelity'
:
cielo24_fidelity
,
'cielo24_turnaround'
:
cielo24_turnaround
,
'preferred_languages'
:
list
(
preferred_languages
)
,
'preferred_languages'
:
preferred_languages
,
}
else
:
error
=
_
(
'Invalid cielo24 fidelity.'
)
error
=
'Invalid cielo24 fidelity {}.'
.
format
(
cielo24_fidelity
)
elif
provider
==
TranscriptProvider
.
THREE_PLAY_MEDIA
:
# Validate transcription turnaround
if
three_play_turnaround
not
in
transcription_plans
[
provider
][
'turnaround'
]:
error
=
_
(
'Invalid 3play turnaround.'
)
error
=
'Invalid 3play turnaround {}.'
.
format
(
three_play_turnaround
)
return
error
,
preferences
# Validate transcription languages
supported_languages
=
transcription_plans
[
provider
][
'languages'
]
if
not
len
(
preferred_languages
)
or
not
(
set
(
preferred_languages
)
<=
set
(
supported_languages
.
keys
())):
error
=
_
(
'Invalid languages.'
)
valid_translations_map
=
transcription_plans
[
provider
][
'translations'
]
if
video_source_language
not
in
valid_translations_map
.
keys
():
error
=
'Unsupported source language {}.'
.
format
(
video_source_language
)
return
error
,
preferences
valid_target_languages
=
valid_translations_map
[
video_source_language
]
if
not
len
(
preferred_languages
)
or
not
(
set
(
preferred_languages
)
<=
set
(
valid_target_languages
)):
error
=
'Invalid languages {}.'
.
format
(
preferred_languages
)
return
error
,
preferences
# Validated 3PlayMedia preferences
preferences
=
{
'three_play_turnaround'
:
three_play_turnaround
,
'preferred_languages'
:
list
(
preferred_languages
),
'video_source_language'
:
video_source_language
,
'preferred_languages'
:
preferred_languages
,
}
else
:
error
=
_
(
'Invalid provider.'
)
error
=
'Invalid provider {}.'
.
format
(
provider
)
return
error
,
preferences
...
...
@@ -353,6 +359,7 @@ def transcript_preferences_handler(request, course_key_string):
cielo24_fidelity
=
data
.
get
(
'cielo24_fidelity'
,
''
),
cielo24_turnaround
=
data
.
get
(
'cielo24_turnaround'
,
''
),
three_play_turnaround
=
data
.
get
(
'three_play_turnaround'
,
''
),
video_source_language
=
data
.
get
(
'video_source_language'
),
preferred_languages
=
data
.
get
(
'preferred_languages'
,
[])
)
if
error
:
...
...
@@ -361,11 +368,11 @@ def transcript_preferences_handler(request, course_key_string):
preferences
.
update
({
'provider'
:
provider
})
transcript_preferences
=
create_or_update_transcript_preferences
(
course_key_string
,
**
preferences
)
response
=
JsonResponse
({
'transcript_preferences'
:
transcript_preferences
},
status
=
200
)
elif
request
.
method
==
'DELETE'
:
remove_transcript_preferences
(
course_key_string
)
response
=
JsonResponse
()
return
response
elif
request
.
method
==
'DELETE'
:
remove_transcript_preferences
(
course_key_string
)
return
JsonResponse
()
@login_required
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment