openedx-learning 0.9.3__py2.py3-none-any.whl → 0.10.0__py2.py3-none-any.whl

openedx_learning/__init__.py

@@ -1,4 +1,4 @@
 """
 Open edX Learning ("Learning Core").
 """
-__version__ = "0.9.3"
+__version__ = "0.10.0"

openedx_learning/api/authoring.py

@@ -0,0 +1,14 @@
+"""
+This is the public API for content authoring in Learning Core.
+
+This is the single ``api`` module that code outside of the
+``openedx_learning.apps.authoring.*`` package should import from. It will
+re-export the public functions from all api.py modules of all authoring apps. It
+may also implement its own convenience APIs that wrap calls to multiple app
+APIs.
+"""
+# These wildcard imports are okay because these api modules declare __all__.
+# pylint: disable=wildcard-import
+from ..apps.authoring.components.api import *
+from ..apps.authoring.contents.api import *
+from ..apps.authoring.publishing.api import *

openedx_learning/api/authoring_models.py

@@ -0,0 +1,13 @@
+"""
+This is where we expose a small handful of models and model mixins that we want
+callers to extend or make foreign keys to. Callers importing this module should
+never instantiate any of the models themselves–there are API functions in
+authoring.py to create and modify data models in a way that keeps those models
+consistent.
+"""
+# These wildcard imports are okay because these modules declare __all__.
+# pylint: disable=wildcard-import
+from ..apps.authoring.components.models import *
+from ..apps.authoring.contents.models import *
+from ..apps.authoring.publishing.model_mixins import *
+from ..apps.authoring.publishing.models import *

openedx_learning/{core → apps/authoring}/components/api.py

@@ -21,6 +21,24 @@ from django.db.transaction import atomic
 from ..publishing import api as publishing_api
 from .models import Component, ComponentType, ComponentVersion, ComponentVersionContent
 
+# The public API that will be re-exported by openedx_learning.apps.authoring.api
+# is listed in the __all__ entries below. Internal helper functions that are
+# private to this module should start with an underscore. If a function does not
+# start with an underscore AND it is not in __all__, that function is considered
+# to be callable only by other apps in the authoring package.
+__all__ = [
+    "get_or_create_component_type",
+    "create_component",
+    "create_component_version",
+    "create_next_version",
+    "create_component_and_version",
+    "get_component",
+    "get_component_by_key",
+    "component_exists_by_key",
+    "get_components",
+    "create_component_version_content",
+]
+
 
 def get_or_create_component_type(namespace: str, name: str) -> ComponentType:
     """
@@ -308,6 +326,9 @@ def look_up_component_version_content(
 
     Can raise a django.core.exceptions.ObjectDoesNotExist error if there is no
     matching ComponentVersionContent.
+
+    This API call was only used in our proof-of-concept assets media server, and
+    I don't know if we wantto make it a part of the public interface.
     """
     queries = (
         Q(component_version__component__learning_package__key=learning_package_key)

openedx_learning/{core → apps/authoring}/components/apps.py

@@ -9,8 +9,8 @@ class ComponentsConfig(AppConfig):
     Configuration for the Components Django application.
     """
 
-    name = "openedx_learning.core.components"
-    verbose_name = "Learning Core: Components"
+    name = "openedx_learning.apps.authoring.components"
+    verbose_name = "Learning Core > Authoring > Components"
     default_auto_field = "django.db.models.BigAutoField"
     label = "oel_components"
 

openedx_learning/{core → apps/authoring}/components/models.py

@@ -19,12 +19,19 @@ from __future__ import annotations
 
 from django.db import models
 
-from ...lib.fields import case_sensitive_char_field, immutable_uuid_field, key_field
-from ...lib.managers import WithRelationsManager
+from ....lib.fields import case_sensitive_char_field, immutable_uuid_field, key_field
+from ....lib.managers import WithRelationsManager
 from ..contents.models import Content
 from ..publishing.model_mixins import PublishableEntityMixin, PublishableEntityVersionMixin
 from ..publishing.models import LearningPackage
 
+__all__ = [
+    "ComponentType",
+    "Component",
+    "ComponentVersion",
+    "ComponentVersionContent",
+]
+
 
 class ComponentType(models.Model):
     """

openedx_learning/{core → apps/authoring}/contents/api.py

@@ -11,9 +11,21 @@ from datetime import datetime
 from django.core.files.base import ContentFile
 from django.db.transaction import atomic
 
-from ...lib.fields import create_hash_digest
+from ....lib.fields import create_hash_digest
 from .models import Content, MediaType
 
+# The public API that will be re-exported by openedx_learning.apps.authoring.api
+# is listed in the __all__ entries below. Internal helper functions that are
+# private to this module should start with an underscore. If a function does not
+# start with an underscore AND it is not in __all__, that function is considered
+# to be callable only by other apps in the authoring package.
+__all__ = [
+    "get_or_create_media_type",
+    "get_content",
+    "get_or_create_text_content",
+    "get_or_create_file_content",
+]
+
 
 def get_or_create_media_type(mime_type: str) -> MediaType:
     """

openedx_learning/{core → apps/authoring}/contents/apps.py

@@ -9,7 +9,7 @@ class ContentsConfig(AppConfig):
     Configuration for the Contents Django application.
     """
 
-    name = "openedx_learning.core.contents"
-    verbose_name = "Learning Core: Contents"
+    name = "openedx_learning.apps.authoring.contents"
+    verbose_name = "Learning Core > Authoring > Contents"
     default_auto_field = "django.db.models.BigAutoField"
     label = "oel_contents"

openedx_learning/{core → apps/authoring}/contents/models.py

@@ -13,10 +13,15 @@ from django.core.files.storage import Storage, default_storage
 from django.core.validators import MaxValueValidator
 from django.db import models
 
-from ...lib.fields import MultiCollationTextField, case_insensitive_char_field, hash_field, manual_date_time_field
-from ...lib.managers import WithRelationsManager
+from ....lib.fields import MultiCollationTextField, case_insensitive_char_field, hash_field, manual_date_time_field
+from ....lib.managers import WithRelationsManager
 from ..publishing.models import LearningPackage
 
+__all__ = [
+    "MediaType",
+    "Content",
+]
+
 
 def get_storage() -> Storage:
     """

openedx_learning/{core → apps/authoring}/publishing/api.py

@@ -23,6 +23,34 @@ from .models import (
     PublishLogRecord,
 )
 
+# The public API that will be re-exported by openedx_learning.apps.authoring.api
+# is listed in the __all__ entries below. Internal helper functions that are
+# private to this module should start with an underscore. If a function does not
+# start with an underscore AND it is not in __all__, that function is considered
+# to be callable only by other apps in the authoring package.
+__all__ = [
+    "get_learning_package",
+    "get_learning_package_by_key",
+    "create_learning_package",
+    "update_learning_package",
+    "learning_package_exists",
+    "create_publishable_entity",
+    "create_publishable_entity_version",
+    "get_publishable_entity",
+    "get_publishable_entity_by_key",
+    "get_last_publish",
+    "get_all_drafts",
+    "get_entities_with_unpublished_changes",
+    "get_entities_with_unpublished_deletes",
+    "publish_all_drafts",
+    "get_draft_version",
+    "get_published_version",
+    "set_draft_version",
+    "soft_delete_draft",
+    "reset_drafts_to_published",
+    "register_content_models",
+]
+
 
 def get_learning_package(learning_package_id: int, /) -> LearningPackage:
     """
@@ -105,6 +133,13 @@ def update_learning_package(
     return lp
 
 
+def learning_package_exists(key: str) -> bool:
+    """
+    Check whether a LearningPackage with a particular key exists.
+    """
+    return LearningPackage.objects.filter(key=key).exists()
+
+
 def create_publishable_entity(
     learning_package_id: int,
     /,
@@ -167,13 +202,6 @@ def get_publishable_entity_by_key(learning_package_id, /, key) -> PublishableEnt
     )
 
 
-def learning_package_exists(key: str) -> bool:
-    """
-    Check whether a LearningPackage with a particular key exists.
-    """
-    return LearningPackage.objects.filter(key=key).exists()
-
-
 def get_last_publish(learning_package_id: int, /) -> PublishLog | None:
     return PublishLog.objects \
                      .filter(learning_package_id=learning_package_id) \

openedx_learning/{core → apps/authoring}/publishing/apps.py

@@ -10,7 +10,7 @@ class PublishingConfig(AppConfig):
     Configuration for the publishing Django application.
     """
 
-    name = "openedx_learning.core.publishing"
-    verbose_name = "Learning Core: Publishing"
+    name = "openedx_learning.apps.authoring.publishing"
+    verbose_name = "Learning Core > Authoring > Publishing"
     default_auto_field = "django.db.models.BigAutoField"
     label = "oel_publishing"

openedx_learning/{core → apps/authoring}/publishing/model_mixins.py

@@ -11,6 +11,12 @@ from django.db.models.query import QuerySet
 
 from .models import PublishableEntity, PublishableEntityVersion
 
+__all__ = [
+    "PublishableEntityMixin",
+    "PublishableEntityVersionMixin",
+    "PublishableContentModelRegistry",
+]
+
 
 class PublishableEntityMixin(models.Model):
     """

openedx_learning/{core → apps/authoring}/publishing/models.py

@@ -23,6 +23,16 @@ from openedx_learning.lib.fields import (
     manual_date_time_field,
 )
 
+__all__ = [
+    "LearningPackage",
+    "PublishableEntity",
+    "PublishableEntityVersion",
+    "Draft",
+    "PublishLog",
+    "PublishLogRecord",
+    "Published",
+]
+
 
 class LearningPackage(models.Model):  # type: ignore[django-manager-missing]
     """

openedx_learning/contrib/media_server/views.py

@@ -8,7 +8,7 @@ from pathlib import Path
 from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
 from django.http import FileResponse, Http404
 
-from openedx_learning.core.components.api import look_up_component_version_content
+from openedx_learning.apps.authoring.components.api import look_up_component_version_content
 
 
 def component_asset(

{openedx_learning-0.9.3.dist-info → openedx_learning-0.10.0.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.9.3
-Summary: An experiment.
+Version: 0.10.0
+Summary: Open edX Learning Core and Tagging.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
 Author-email: dave@tcril.org
@@ -19,26 +19,23 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE.txt
-Requires-Dist: djangorestframework <4.0
+Requires-Dist: rules <4.0
 Requires-Dist: Django <5.0
 Requires-Dist: edx-drf-extensions
 Requires-Dist: attrs
 Requires-Dist: celery
-Requires-Dist: rules <4.0
+Requires-Dist: djangorestframework <4.0
 
-openedx-learning
-=============================
+Open edX Learning Core (and Tagging)
+====================================
 
 |pypi-badge| |ci-badge| |codecov-badge| |doc-badge| |pyversions-badge|
 |license-badge|
 
-This is experimentation/prototyping and not in any way production ready!
-------------------------------------------------------------------------
-
 Overview
 --------
 
-The Open edX Learning repository holds Django apps that represent core learning concepts and data models that have been extracted from edx-platform.
+The ``openedx_learning`` package holds Django apps that represent core learning concepts and data models that have been extracted from edx-platform. At the moment, this repo also contains the ``openedx_tagging`` package, but this will likely be moved out in the future.
 
 Motivation
 ----------
@@ -54,18 +51,16 @@ Parts
 ~~~~~
 
 * ``openedx_learning.lib`` is for shared utilities, and may include things like custom field types, plugin registration code, etc.
-* ``openedx_learning.core`` contains our Core Django apps, where foundational data structures and APIs will live.
+* ``openedx_learning.apps`` contains our Learning Core Django apps, where foundational data structures and APIs will live. The first of these is ``authoring``, which holds apps related to the editing and publishing of learning content.
 * ``openedx_tagging.core`` contains the core Tagging app, which provides data structures and apis for tagging Open edX objects.
 
-App Dependencies
-~~~~~~~~~~~~~~~~
+Learning Core Package Dependencies
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Anything can import from ``openedx_learning.lib``.
+Learning Core code should never import from ``edx-platform``.
 
-Core apps can import from each other, but cannot import from other apps outside of core. For those apps:
+We want to be very strict about dependency management internally as well. Please read the `.importlinter config file <.importlinter>`_ file and the `Python API Conventions ADR <docs/decisions/0016-python-public-api-conventions>`_ for more details.
 
-* ``learning_publishing`` has no dependencies. All the other apps depend on it.
-* ``learning_composition`` and ``learning_navigation`` both depend on ``learning_partitioning``
 
 Model Conventions
 ~~~~~~~~~~~~~~~~~
@@ -74,7 +69,7 @@ We have a few different identifier types in the schema, and we try to avoid ``_i
 
 * ``id`` is the auto-generated, internal row ID and primary key. This never changes. Data models should make foreign keys to this field, as per Django convention.
 * ``uuid`` is a randomly generated UUID4. This is the stable way to refer to a row/resource from an external service. This never changes. This is separate from ``id`` mostly because there are performance penalties when using UUIDs as primary keys with MySQL.
-* ``key`` is intended to be a case-sensitive, alphanumeric key, which holds some meaning to library clients. This is usually stable, but can be changed, depending on the business logic of the client. The apps in this repo should make no assumptions about it being stable. It can be used as a suffix.
+* ``key`` is intended to be a case-sensitive, alphanumeric key, which holds some meaning to library clients. This is usually stable, but can be changed, depending on the business logic of the client. The apps in this repo should make no assumptions about it being stable. It can be used as a suffix. Since ``key`` is a reserved name on certain database systems, the database field is ``_key``.
 * ``num`` is like ``key``, but for use when it's strictly numeric. It can also be used as a suffix.
 
 
@@ -89,7 +84,7 @@ The structure of this repo follows [OEP-0049](https://open-edx-proposals.readthe
 Code Overview
 -------------
 
-The ``openedx_learning.apps`` package contains all our Django applications. All apps are named with a ``learning_`` prefix to better avoid name conflicts, because Django's app namespace is flat. Apps will adhere to `OEP-0049: Django App Patterns <https://open-edx-proposals.readthedocs.io/en/latest/architectural-decisions/oep-0049-django-app-patterns.html>`_.
+The ``openedx_learning.apps`` package contains all our Django applications.
 
 Development Workflow
 --------------------
@@ -103,7 +98,7 @@ One Time Setup
   cd openedx-learning
 
   # Set up a virtualenv using virtualenvwrapper with the same name as the repo and activate it
-  mkvirtualenv -p python3.8 openedx-learning
+  mkvirtualenv -p python3.11 openedx-learning
 
 
 Every time you develop something in this repo

{openedx_learning-0.9.3.dist-info → openedx_learning-0.10.0.dist-info}/RECORD

@@ -1,35 +1,39 @@
-openedx_learning/__init__.py,sha256=EfjfyOQVIjOVYMNlUo9QxJoi0su5KwN9ncFBkCrXPAk,67
+openedx_learning/__init__.py,sha256=DnOb5RNB5dogIDUc96QphWmX4TqWV73iB0Ikmixury4,68
 openedx_learning/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/api/authoring.py,sha256=HPfDBTr4Sxf_GciObkv_7vaUiC9P1GdGEMAZgCFQv_w,615
+openedx_learning/api/authoring_models.py,sha256=jcYkX6-MYiNf-e4BnzSDEc3qS17dg8UVXyX1bxeyjR8,642
+openedx_learning/apps/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/apps/authoring/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/apps/authoring/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/apps/authoring/components/admin.py,sha256=QE7e76C6X2V1AQPxQe6SayQPfCMmbs4RZPEPIGcvTWw,4672
+openedx_learning/apps/authoring/components/api.py,sha256=1A0xcpW4ciVs_vA-Xd16k4YfFBXhNYjISQyamyq03Uc,13191
+openedx_learning/apps/authoring/components/apps.py,sha256=YoYPsI9gcleA3uEs8CiLIrjUncRMo2DKbYt4mDfzePg,770
+openedx_learning/apps/authoring/components/models.py,sha256=j9k0-FmOkySxYbJ-frMuCR82zrPgsu9K3aCk2IKRdFs,13280
+openedx_learning/apps/authoring/components/migrations/0001_initial.py,sha256=446LkJSFeK8J_-l-bxakZ_BVx_CiJIllGcBYqWcEenA,4664
+openedx_learning/apps/authoring/components/migrations/0002_alter_componentversioncontent_key.py,sha256=98724dtucRjJCRyLt5p45qXYb2d6-ouVGp7PB6zTG6E,539
+openedx_learning/apps/authoring/components/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/apps/authoring/contents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/apps/authoring/contents/admin.py,sha256=4ILH_cEiAXKUlfPVwJJZeh5yupgF3v7kf-xJ6ZTTFDE,1174
+openedx_learning/apps/authoring/contents/api.py,sha256=QRHCZNKLvKqvl1S4j8lfUjVsvilcWetuCQ_GO_TXYGk,6070
+openedx_learning/apps/authoring/contents/apps.py,sha256=EEUZEnww7TcYcyxMovZthG2muNxd7j7nxBIf21gKrp4,398
+openedx_learning/apps/authoring/contents/models.py,sha256=4XzHqQ3Fgz4lt2LfGBXAViQ4q_jT9thHj2vpayszspA,15192
+openedx_learning/apps/authoring/contents/migrations/0001_initial.py,sha256=FtOTmIGX2KHpjw-PHbfRjxkFEomI5CEDhNKCZ7IpFeE,3060
+openedx_learning/apps/authoring/contents/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/apps/authoring/publishing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/apps/authoring/publishing/admin.py,sha256=F-0QlVQmuovLIF258XK_vKJdOnn7lLa_0A5veE72TKc,4830
+openedx_learning/apps/authoring/publishing/api.py,sha256=kZ5tayJzScmaKUmpuWr-EBQ62nDDCZb4713awMpSzrM,15278
+openedx_learning/apps/authoring/publishing/apps.py,sha256=jUfd78xvXaZg3dwkqXihatbeajJGm3Uz1rJpuyd-3g0,402
+openedx_learning/apps/authoring/publishing/model_mixins.py,sha256=cau70b3boi2J3DvkC0UE-sd7Nyjk9TLHJ47-nq89ELQ,13533
+openedx_learning/apps/authoring/publishing/models.py,sha256=ImMAujPDc2-CECZw_yvVlUOdtGYwmt99TJ2r1HJkkV8,20488
+openedx_learning/apps/authoring/publishing/migrations/0001_initial.py,sha256=wvekNV19YRSdxRmQaFnLSn_nCsQlHIucPDVMmgKf_OE,9272
+openedx_learning/apps/authoring/publishing/migrations/0002_alter_learningpackage_key_and_more.py,sha256=toI7qJhNukk6hirKfFx9EpqTpzF2O2Yq1VpFJusDn2M,806
+openedx_learning/apps/authoring/publishing/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/contrib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/contrib/media_server/__init__.py,sha256=iYijWFCl5RNR9omSu22kMl49EfponoqXBqXr0HMp4QI,56
 openedx_learning/contrib/media_server/apps.py,sha256=FPT0rsUFtPyhFpWKjSI1e_s58wU0IbDyaAW_66V6sY4,816
 openedx_learning/contrib/media_server/urls.py,sha256=newNjV41sM9A9Oy_rgnZSXdkTFxSHiupIiAsVIGE2CE,365
-openedx_learning/contrib/media_server/views.py,sha256=V-eq0SFi5815lkGdRz8dye4fF3dHzO5lVfm78gfG3mg,1537
-openedx_learning/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/core/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/core/components/admin.py,sha256=QE7e76C6X2V1AQPxQe6SayQPfCMmbs4RZPEPIGcvTWw,4672
-openedx_learning/core/components/api.py,sha256=2ux1s9Bpfvs5sgTViHLagMb1IHpMo_vRR-MbrbXh0_U,12345
-openedx_learning/core/components/apps.py,sha256=invLeAY0B-d_Ac9xu_b5ZWeb7v5NJe_-938BO9U2-jo,747
-openedx_learning/core/components/models.py,sha256=duVLdkTFnM7ixsqXQPlvmqmgf32hYyXdeRw1W7MdOpg,13170
-openedx_learning/core/components/migrations/0001_initial.py,sha256=446LkJSFeK8J_-l-bxakZ_BVx_CiJIllGcBYqWcEenA,4664
-openedx_learning/core/components/migrations/0002_alter_componentversioncontent_key.py,sha256=98724dtucRjJCRyLt5p45qXYb2d6-ouVGp7PB6zTG6E,539
-openedx_learning/core/components/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/core/contents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/core/contents/admin.py,sha256=4ILH_cEiAXKUlfPVwJJZeh5yupgF3v7kf-xJ6ZTTFDE,1174
-openedx_learning/core/contents/api.py,sha256=09159G0e_r7glDvi-G8c5k6ads2LmhmDLHnHeTSpotI,5553
-openedx_learning/core/contents/apps.py,sha256=6O04ikajbc4FsSdzx7yEl0cdQpEHpK1LdE471vygdII,375
-openedx_learning/core/contents/models.py,sha256=HInsxr3Bnl48_0fbdoDKnGmrpIxTFTpoQTUg6_opdB4,15143
-openedx_learning/core/contents/migrations/0001_initial.py,sha256=FtOTmIGX2KHpjw-PHbfRjxkFEomI5CEDhNKCZ7IpFeE,3060
-openedx_learning/core/contents/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/core/publishing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/core/publishing/admin.py,sha256=F-0QlVQmuovLIF258XK_vKJdOnn7lLa_0A5veE72TKc,4830
-openedx_learning/core/publishing/api.py,sha256=pfBePrmP0jnU5YTt4x7qhT37RN02P95gw2-xQNA_e9A,14254
-openedx_learning/core/publishing/apps.py,sha256=skY84raPW6gvrb5VPzhrLR2_gIHTUG67tMhSO7umVN4,379
-openedx_learning/core/publishing/model_mixins.py,sha256=Y6hGh0MKVOx0dUyNL0YkLL9ErUnYI2Nv2ZGMhc3CMng,13412
-openedx_learning/core/publishing/models.py,sha256=MGezxLoKFqHYnZccknqWyuNYrgiqu9eGDc4H9yIYzrg,20321
-openedx_learning/core/publishing/migrations/0001_initial.py,sha256=wvekNV19YRSdxRmQaFnLSn_nCsQlHIucPDVMmgKf_OE,9272
-openedx_learning/core/publishing/migrations/0002_alter_learningpackage_key_and_more.py,sha256=toI7qJhNukk6hirKfFx9EpqTpzF2O2Yq1VpFJusDn2M,806
-openedx_learning/core/publishing/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+openedx_learning/contrib/media_server/views.py,sha256=A4umcQr9xU5l-7dCSUX9jP9-gtwf4LGjoMn7NlsdLsk,1547
 openedx_learning/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/lib/admin_utils.py,sha256=5z9NrXxmT5j8azx9u1t0AgxV5PIDTc2jPyM5z5yW8cw,4021
 openedx_learning/lib/cache.py,sha256=ppT36KiPLdsAF3GfZCF0IdiHodckd2gLiF1sNhjSJuk,958
@@ -38,12 +42,6 @@ openedx_learning/lib/fields.py,sha256=eiGoXMPhRuq25EH2qf6BAODshAQE3DBVdIYAMIUAXW
 openedx_learning/lib/managers.py,sha256=ofcUxHS2wsJSFP4CB7OCkN6JiWFxNlIyNh_VDgFtgug,1538
 openedx_learning/lib/test_utils.py,sha256=g3KLuepIZbaDBCsaj9711YuqyUx7LD4gXDcfNC-mWdc,527
 openedx_learning/lib/validators.py,sha256=98UldFhFxd77zF1VxzQcOPt0blh64gMZDv-d_uQ67mg,396
-openedx_learning/rest_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/rest_api/apps.py,sha256=aZpox3cdQEKl0idiFyyjrtwWXuoxR0HRm9BQjr6Lz-8,346
-openedx_learning/rest_api/urls.py,sha256=r73z_2aiFUfDYPZnSADTwVXNjJpvvkPHRscvtdLn1tM,157
-openedx_learning/rest_api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openedx_learning/rest_api/v1/components.py,sha256=OYNWqarNtVmiKunIMlZWNGVCeZ5ATco2ZTuxPR-BS9I,757
-openedx_learning/rest_api/v1/urls.py,sha256=g0nYjq6qWjd08TUzsb-tQ_ZFRmQsxCIQvQRNa6oCAns,256
 openedx_tagging/__init__.py,sha256=V9N8M7f9LYlAbA_DdPUsHzTnWjYRXKGa5qHw9P1JnNI,30
 openedx_tagging/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -55,10 +53,10 @@ openedx_tagging/core/tagging/data.py,sha256=421EvmDzdM7H523dBVQk4J0W_UwTT4U5syqP
 openedx_tagging/core/tagging/rules.py,sha256=Gzw2RCQxoAv2PpOwOWgpD17XoZfowlFnNgQqYn59q_g,6715
 openedx_tagging/core/tagging/urls.py,sha256=-0Nzmh0mlF9-GgEuocwBdSJn6n8EINnxR4m4pmPou44,159
 openedx_tagging/core/tagging/import_export/__init__.py,sha256=q5K4JalFQlJxAFUFyqhLY5zQtAskDnRM1H_aVuP_E3Q,83
-openedx_tagging/core/tagging/import_export/actions.py,sha256=1nsGoa7eSfMF4gB-GqNRlTkl22z3Lqo7y8ay1rnNy0E,13368
-openedx_tagging/core/tagging/import_export/api.py,sha256=Eio1KeVZB5lsRwZYLR-ECtJfIoPZSyV6ghuUAUSpWNE,6173
+openedx_tagging/core/tagging/import_export/actions.py,sha256=n007-M59D0mXYcwi9CDldDDy5JHAaGCVv9dQbiY4pZ4,13275
+openedx_tagging/core/tagging/import_export/api.py,sha256=n8xamMNsFoucyC_qynpjzkIS2EbOfFDWdhsG_SNT4V0,7120
 openedx_tagging/core/tagging/import_export/exceptions.py,sha256=GGBldoW0tjYBrSlqDDwKkl6N0FIg1Yt5xcl7efxfo20,3116
-openedx_tagging/core/tagging/import_export/import_plan.py,sha256=9JbZ8lMCLPpGqrw9sbcG1b1VvMpiaSuY1vMZCzXR4MA,6627
+openedx_tagging/core/tagging/import_export/import_plan.py,sha256=ol9mLfqqR0t1q0Om7D-iC9zKw1EI9MX3yAEKL8q6ias,6824
 openedx_tagging/core/tagging/import_export/parsers.py,sha256=eXjMPfMfqcCUKSaXc5xfPEI5PFEK1tNJNGnKHz51tY8,9864
 openedx_tagging/core/tagging/import_export/tasks.py,sha256=ZNtCGZuWn7z5E5o6OskrKjeV3vzzVa_yHaa-KlCnaEs,924
 openedx_tagging/core/tagging/import_export/template.csv,sha256=HbmXyW94oyfqfVyiaPv1uBEyul9qb8oPmbk9UiMQYo4,1559
@@ -85,7 +83,7 @@ openedx_tagging/core/tagging/migrations/0017_alter_tagimporttask_status.py,sha25
 openedx_tagging/core/tagging/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/models/__init__.py,sha256=yYdOnthuc7EUdfEULtZgqRwn5Y4bbYQmJCjVZqR5GTM,236
 openedx_tagging/core/tagging/models/base.py,sha256=1WAPxssL8thAg8LHh1GbwSo98H81-nVdTVQt1nC1ZdU,39335
-openedx_tagging/core/tagging/models/import_export.py,sha256=HoYYg4kcKFUro5_i7O6Ms7373zmrDQV4yK3skNWP5fU,4217
+openedx_tagging/core/tagging/models/import_export.py,sha256=Aj0pleh0nh2LNS6zmdB1P4bpdgUMmvmobTkqBerORAI,4570
 openedx_tagging/core/tagging/models/system_defined.py,sha256=_6LfvUZGEltvQMtm2OXy6TOLh3C8GnVTqtZDSAZW6K4,9062
 openedx_tagging/core/tagging/models/utils.py,sha256=-A3Dj24twmTf65UB7G4WLvb_9qEvduEPIwahZ-FJDlg,1926
 openedx_tagging/core/tagging/rest_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -98,8 +96,8 @@ openedx_tagging/core/tagging/rest_api/v1/serializers.py,sha256=gbvEBLvsmfPc3swWz
 openedx_tagging/core/tagging/rest_api/v1/urls.py,sha256=dNUKCtUCx_YzrwlbEbpDfjGVQbb2QdJ1VuJCkladj6E,752
 openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=ZRkSILdb8g5k_BcuuVVfdffEdY9vFQ_YtMa3JrN0Xz8,35581
 openedx_tagging/core/tagging/rest_api/v1/views_import.py,sha256=kbHUPe5A6WaaJ3J1lFIcYCt876ecLNQfd19m7YYub6c,1470
-openedx_learning-0.9.3.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
-openedx_learning-0.9.3.dist-info/METADATA,sha256=qCr7maCmqbhW_lwaYhJRsu6BdicczVsjiRlxdcgJk1g,8860
-openedx_learning-0.9.3.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-openedx_learning-0.9.3.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
-openedx_learning-0.9.3.dist-info/RECORD,,
+openedx_learning-0.10.0.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
+openedx_learning-0.10.0.dist-info/METADATA,sha256=B3Gg7iIer_sJiWvXtA9Sd4xdbguHC3XIqaAsjhp15I4,8829
+openedx_learning-0.10.0.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+openedx_learning-0.10.0.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
+openedx_learning-0.10.0.dist-info/RECORD,,

openedx_tagging/core/tagging/import_export/actions.py

@@ -244,16 +244,13 @@ class CreateTag(ImportAction):
         """
         Creates a Tag
         """
-        parent = None
-        if self.tag.parent_id:
-            parent = self.taxonomy.tag_set.get(external_id=self.tag.parent_id)
-        taxonomy_tag = Tag(
+        Tag.objects.create(
             taxonomy=self.taxonomy,
-            parent=parent,
+            parent=self.taxonomy.tag_set.get(external_id=self.tag.parent_id)
+            if self.tag.parent_id is not None else None,
             value=self.tag.value,
             external_id=self.tag.id,
         )
-        taxonomy_tag.save()
 
 
 class UpdateParentTag(ImportAction):
@@ -409,8 +406,7 @@ class DeleteTag(ImportAction):
         Delete a tag
         """
         try:
-            taxonomy_tag = self._get_tag()
-            taxonomy_tag.delete()
+            self._get_tag().delete()
         except Tag.DoesNotExist:
             pass  # The tag may be already cascade deleted if the parent tag was deleted
 

openedx_tagging/core/tagging/import_export/api.py

@@ -44,6 +44,7 @@ TODO for next versions
 """
 from __future__ import annotations
 
+import time
 from typing import BinaryIO
 
 from django.utils.translation import gettext as _
@@ -77,6 +78,7 @@ def import_tags(
 
     Set `plan_only` to True to only generate the actions and not execute them.
     """
+    global_start_time = time.time()
     _import_validations(taxonomy)
 
     # Checks that exists only one task import in progress at a time per taxonomy
@@ -92,7 +94,10 @@ def import_tags(
     task = TagImportTask.create(taxonomy)
 
     try:
+        # Start of parsing
+
         # Get the parser and parse the file
+        start_time = time.time()
         task.log_parser_start()
         parser = get_parser(parser_format)
         tags, errors = parser.parse_import(file)
@@ -102,23 +107,48 @@ def import_tags(
             task.handle_parser_errors(errors)
             return False, task, None
 
-        task.log_parser_end()
+        end_time = time.time()
+        elapsed_time = end_time - start_time
+        elapsed_time = round(elapsed_time, 5)
+        task.log_parser_end(elapsed_time)
+
+        # End of parsing
+
+        # Start of generate actions
+
+        start_time = time.time()
 
-        # Generate actions
         task.log_start_planning()
         tag_import_plan = TagImportPlan(taxonomy)
         tag_import_plan.generate_actions(tags, replace)
-        task.log_plan(tag_import_plan)
+
+        end_time = time.time()
+        elapsed_time = end_time - start_time
+        elapsed_time = round(elapsed_time, 5)
+        task.log_plan(tag_import_plan, elapsed_time)
+
+        # End of generate actions
 
         if tag_import_plan.errors:
             task.handle_plan_errors()
             return False, task, tag_import_plan
 
         if not plan_only:
+            # Start of execute
+            start_time = time.time()
             task.log_start_execute()
             tag_import_plan.execute(task)
+            end_time = time.time()
+            elapsed_time = end_time - start_time
+            elapsed_time = round(elapsed_time, 5)
+            task.log_end_execute(elapsed_time)
+            # End of execute
+
+        global_end_time = time.time()
+        global_elapsed_time = global_end_time - global_start_time
+        global_elapsed_time = round(global_elapsed_time, 5)
 
-        task.end_success()
+        task.end_success(global_elapsed_time)
 
         return True, task, tag_import_plan
     except Exception as exception:

openedx_tagging/core/tagging/import_export/import_plan.py

@@ -207,8 +207,12 @@ class TagImportPlan:
         if self.errors:
             return
         for action in self.actions:
+            # Avoid to save each log because it is slow and costs a lot in memory
+            # It is necessary to save at the end.
             if task:
-                task.add_log(f"#{action.index}: {str(action)} [Started]")
+                task.add_log(f"#{action.index}: {str(action)} [Started]", save=False)
             action.execute()
             if task:
-                task.add_log("Success")
+                task.add_log("Success", save=False)
+        if task:
+            task.save()

openedx_tagging/core/tagging/models/import_export.py

@@ -90,11 +90,11 @@ class TagImportTask(models.Model):
         """
         self.add_log(_("Starting to load data from file"))
 
-    def log_parser_end(self):
+    def log_parser_end(self, elapsed_time):
         """
         Logs the parser finished event.
         """
-        self.add_log(_("Load data finished"))
+        self.add_log(_("Load data finished. Time elapsed: ") + str(elapsed_time) + _(" seconds"))
 
     def handle_parser_errors(self, errors):
         """
@@ -113,11 +113,11 @@ class TagImportTask(models.Model):
         self.status = TagImportTaskState.PLANNING.value
         self.save()
 
-    def log_plan(self, plan):
+    def log_plan(self, plan, elapsed_time):
         """
         Logs the task plan.
         """
-        self.add_log(_("Plan finished"))
+        self.add_log(_("Plan finished. Time elapsed: ") + str(elapsed_time) + _(" seconds"))
         plan_str = plan.plan()
         self.log += f"\n{plan_str}\n"
         self.save()
@@ -138,10 +138,13 @@ class TagImportTask(models.Model):
         self.status = TagImportTaskState.EXECUTING.value
         self.save()
 
-    def end_success(self):
+    def log_end_execute(self, elapsed_time):
+        self.add_log(_("Execute actions finished. Time elapsed: ") + str(elapsed_time) + _(" seconds"))
+
+    def end_success(self, elapsed_time):
         """
         Completes task execution with a log message, and moves the task status to SUCCESS.
         """
-        self.add_log(_("Execution finished"), save=False)
+        self.add_log(_("Execution finished. Total time elapsed: ") + str(elapsed_time) + _("seconds"), save=False)
         self.status = TagImportTaskState.SUCCESS.value
         self.save()

openedx_learning/rest_api/apps.py

@@ -1,14 +0,0 @@
-"""
-Django metadata for the Learning Core REST API app
-"""
-from django.apps import AppConfig
-
-
-class RESTAPIConfig(AppConfig):
-    """
-    Configuration for the Learning Core REST API Django app.
-    """
-
-    name = "openedx_learning.rest_api"
-    verbose_name = "Learning Core: REST API"
-    default_auto_field = "django.db.models.BigAutoField"

openedx_learning/rest_api/urls.py

@@ -1,6 +0,0 @@
-"""
-URLs for the Learning Core REST API
-"""
-from django.urls import include, path
-
-urlpatterns = [path("v1/", include("openedx_learning.rest_api.v1.urls"))]

openedx_learning/rest_api/v1/components.py

@@ -1,30 +0,0 @@
-"""
-This is just an example REST API endpoint.
-"""
-from rest_framework import viewsets
-
-from openedx_learning.core.components.models import Component
-
-
-class ComponentViewSet(viewsets.ViewSet):
-    """
-    Example endpoints for a Components REST API. Not implemented.
-    """
-    def list(self, request):
-        _items = Component.objects.all()
-        raise NotImplementedError
-
-    def retrieve(self, request, pk=None):
-        raise NotImplementedError
-
-    def create(self, request):
-        raise NotImplementedError
-
-    def update(self, request, pk=None):
-        raise NotImplementedError
-
-    def partial_update(self, request, pk=None):
-        raise NotImplementedError
-
-    def destroy(self, request, pk=None):
-        raise NotImplementedError

openedx_learning/rest_api/v1/urls.py

@@ -1,10 +0,0 @@
-"""
-URLs for the Learning Core REST API v1
-"""
-from rest_framework.routers import DefaultRouter
-
-from . import components
-
-router = DefaultRouter()
-router.register(r"components", components.ComponentViewSet, basename="component")
-urlpatterns = router.urls