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

openedx_learning/__init__.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.9.3
+Version: 0.9.4
 Summary: An experiment.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -19,12 +19,12 @@ 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: Django <5.0
 Requires-Dist: edx-drf-extensions
-Requires-Dist: attrs
-Requires-Dist: celery
 Requires-Dist: rules <4.0
+Requires-Dist: celery
+Requires-Dist: Django <5.0
+Requires-Dist: attrs
+Requires-Dist: djangorestframework <4.0
 
 openedx-learning
 =============================

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

@@ -1,4 +1,4 @@
-openedx_learning/__init__.py,sha256=EfjfyOQVIjOVYMNlUo9QxJoi0su5KwN9ncFBkCrXPAk,67
+openedx_learning/__init__.py,sha256=kjHnMSOx6G1q0RhcvJpPELPXo4ytbQqp3XpU6wcZb4A,67
 openedx_learning/py.typed,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
@@ -55,10 +55,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 +85,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 +98,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.9.4.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
+openedx_learning-0.9.4.dist-info/METADATA,sha256=nmkH-b_5JrqbfKBYGFPv_flMHz_b7TJEnq2oOEXsWb4,8860
+openedx_learning-0.9.4.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+openedx_learning-0.9.4.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
+openedx_learning-0.9.4.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()