diff --git a/openedx/core/djangoapps/content_libraries/api.py b/openedx/core/djangoapps/content_libraries/api.py index fdfe2ff0efaf..6c7189a1ac79 100644 --- a/openedx/core/djangoapps/content_libraries/api.py +++ b/openedx/core/djangoapps/content_libraries/api.py @@ -58,6 +58,7 @@ import logging import mimetypes + import attr import requests @@ -1176,26 +1177,11 @@ def add_library_block_static_asset_file(usage_key, file_path, file_content, user component = get_component_from_usage_key(usage_key) - media_type_str, _encoding = mimetypes.guess_type(file_path) - # We use "application/octet-stream" as a generic fallback media type, per - # RFC 2046: https://datatracker.ietf.org/doc/html/rfc2046 - # TODO: This probably makes sense to push down to openedx-learning? - media_type_str = media_type_str or "application/octet-stream" - - now = datetime.now(tz=timezone.utc) - with transaction.atomic(): - media_type = authoring_api.get_or_create_media_type(media_type_str) - content = authoring_api.get_or_create_file_content( - component.publishable_entity.learning_package.id, - media_type.id, - data=file_content, - created=now, - ) component_version = authoring_api.create_next_component_version( component.pk, - content_to_replace={file_path: content.id}, - created=now, + content_to_replace={file_path: file_content}, + created=datetime.now(tz=timezone.utc), created_by=user.id if user else None, ) transaction.on_commit( @@ -1220,7 +1206,7 @@ def add_library_block_static_asset_file(usage_key, file_path, file_content, user return LibraryXBlockStaticFile( path=file_path, url=site_root_url + local_path, - size=content.size, + size=len(file_content), ) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 1fe478a4b9ae..fd08f9063bba 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -146,7 +146,7 @@ optimizely-sdk<5.0 # Date: 2023-09-18 # pinning this version to avoid updates while the library is being developed # Issue for unpinning: https://github.com/openedx/edx-platform/issues/35269 -openedx-learning==0.16.1 +openedx-learning==0.16.3 # Date: 2023-11-29 # Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise. diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index f1a7db4c80ed..4d42c4ae73d0 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -825,7 +825,7 @@ openedx-filters==1.11.0 # -r requirements/edx/kernel.in # lti-consumer-xblock # ora2 -openedx-learning==0.16.1 +openedx-learning==0.16.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/kernel.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index eec25125f84b..b583538f3d84 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -1376,7 +1376,7 @@ openedx-filters==1.11.0 # -r requirements/edx/testing.txt # lti-consumer-xblock # ora2 -openedx-learning==0.16.1 +openedx-learning==0.16.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/doc.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 62f435c49719..25198e64241e 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -986,7 +986,7 @@ openedx-filters==1.11.0 # -r requirements/edx/base.txt # lti-consumer-xblock # ora2 -openedx-learning==0.16.1 +openedx-learning==0.16.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 58f778af500e..18d4d558ebec 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -1037,7 +1037,7 @@ openedx-filters==1.11.0 # -r requirements/edx/base.txt # lti-consumer-xblock # ora2 -openedx-learning==0.16.1 +openedx-learning==0.16.3 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt