openedx-learning 0.9.0__tar.gz → 0.9.2__tar.gz

{openedx-learning-0.9.0/openedx_learning.egg-info → openedx_learning-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.9.0
+Version: 0.9.2
 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: attrs
-Requires-Dist: Django<5.0
-Requires-Dist: edx-drf-extensions
-Requires-Dist: djangorestframework<4.0
 Requires-Dist: celery
 Requires-Dist: rules<4.0
+Requires-Dist: attrs
+Requires-Dist: djangorestframework<4.0
+Requires-Dist: edx-drf-extensions
+Requires-Dist: Django<5.0
 
 openedx-learning
 =============================

{openedx-learning-0.9.0 → openedx_learning-0.9.2}/openedx_learning/__init__.py

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

{openedx-learning-0.9.0 → openedx_learning-0.9.2/openedx_learning.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.9.0
+Version: 0.9.2
 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: attrs
-Requires-Dist: Django<5.0
-Requires-Dist: edx-drf-extensions
-Requires-Dist: djangorestframework<4.0
 Requires-Dist: celery
 Requires-Dist: rules<4.0
+Requires-Dist: attrs
+Requires-Dist: djangorestframework<4.0
+Requires-Dist: edx-drf-extensions
+Requires-Dist: Django<5.0
 
 openedx-learning
 =============================

{openedx-learning-0.9.0 → openedx_learning-0.9.2}/openedx_learning.egg-info/SOURCES.txt

@@ -93,6 +93,7 @@ openedx_tagging/core/tagging/migrations/0013_tag_parent_blank.py
 openedx_tagging/core/tagging/migrations/0014_minor_fixes.py
 openedx_tagging/core/tagging/migrations/0015_taxonomy_export_id.py
 openedx_tagging/core/tagging/migrations/0016_object_tag_export_id.py
+openedx_tagging/core/tagging/migrations/0017_alter_tagimporttask_status.py
 openedx_tagging/core/tagging/migrations/__init__.py
 openedx_tagging/core/tagging/models/__init__.py
 openedx_tagging/core/tagging/models/base.py

openedx_learning-0.9.2/openedx_tagging/core/tagging/migrations/0017_alter_tagimporttask_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2024-04-05 06:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oel_tagging', '0016_object_tag_export_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tagimporttask',
+            name='status',
+            field=models.CharField(choices=[('loading_data', 'Loading Data'), ('planning', 'Planning'), ('executing', 'Executing'), ('success', 'Success'), ('error', 'Error')], help_text='Task status', max_length=20),
+        ),
+    ]

{openedx-learning-0.9.0 → openedx_learning-0.9.2}/openedx_tagging/core/tagging/models/import_export.py

@@ -3,7 +3,6 @@ Models used by the Taxonomy import/export tasks.
 """
 
 from datetime import datetime
-from enum import Enum
 
 from django.db import models
 from django.utils.translation import gettext as _
@@ -12,15 +11,15 @@ from django.utils.translation import gettext_lazy
 from .base import Taxonomy
 
 
-class TagImportTaskState(Enum):
+class TagImportTaskState(models.TextChoices):
     """
     Enumerates the states that a TagImportTask can be in.
     """
-    LOADING_DATA = "loading_data"
-    PLANNING = "planning"
-    EXECUTING = "executing"
-    SUCCESS = "success"
-    ERROR = "error"
+    LOADING_DATA = "loading_data", gettext_lazy("Loading Data")
+    PLANNING = "planning", gettext_lazy("Planning")
+    EXECUTING = "executing", gettext_lazy("Executing")
+    SUCCESS = "success", gettext_lazy("Success")
+    ERROR = "error", gettext_lazy("Error")
 
 
 class TagImportTask(models.Model):
@@ -42,7 +41,7 @@ class TagImportTask(models.Model):
 
     status = models.CharField(
         max_length=20,
-        choices=[(status, status.value) for status in TagImportTaskState],
+        choices=TagImportTaskState.choices,
         help_text=gettext_lazy("Task status"),
     )
 

{openedx-learning-0.9.0 → openedx_learning-0.9.2}/openedx_tagging/core/tagging/rest_api/v1/serializers.py

@@ -191,22 +191,21 @@ class ObjectTagsByTaxonomySerializer(UserPermissionsSerializerMixin, serializers
         return by_object
 
 
-class ObjectTagUpdateBodySerializer(serializers.Serializer):  # pylint: disable=abstract-method
+class ObjectTagUpdateByTaxonomySerializer(serializers.Serializer):  # pylint: disable=abstract-method
     """
-    Serializer of the body for the ObjectTag UPDATE view
+    Serializer of a taxonomy item of ObjectTag UPDATE view.
     """
-
+    taxonomy = serializers.PrimaryKeyRelatedField(
+        queryset=Taxonomy.objects.all(), required=True
+    )
     tags = serializers.ListField(child=serializers.CharField(), required=True)
 
 
-class ObjectTagUpdateQueryParamsSerializer(serializers.Serializer):  # pylint: disable=abstract-method
+class ObjectTagUpdateBodySerializer(serializers.Serializer):  # pylint: disable=abstract-method
     """
-    Serializer of the query params for the ObjectTag UPDATE view
+    Serializer of the body for the ObjectTag UPDATE view
     """
-
-    taxonomy = serializers.PrimaryKeyRelatedField(
-        queryset=Taxonomy.objects.all(), required=True
-    )
+    tagsData = serializers.ListField(child=ObjectTagUpdateByTaxonomySerializer(), required=True)
 
 
 class TagDataSerializer(UserPermissionsSerializerMixin, serializers.Serializer):  # pylint: disable=abstract-method
@@ -343,7 +342,7 @@ class TaxonomyImportNewBodySerializer(TaxonomyImportBodySerializer):  # pylint:
     """
     taxonomy_name = serializers.CharField(required=True)
     taxonomy_description = serializers.CharField(default="")
-    taxonomy_export_id = serializers.CharField(required=True)
+    taxonomy_export_id = serializers.CharField(required=False)
 
 
 class TagImportTaskSerializer(serializers.ModelSerializer):

{openedx-learning-0.9.0 → openedx_learning-0.9.2}/openedx_tagging/core/tagging/rest_api/v1/views.py

@@ -40,7 +40,6 @@ from .serializers import (
     ObjectTagsByTaxonomySerializer,
     ObjectTagSerializer,
     ObjectTagUpdateBodySerializer,
-    ObjectTagUpdateQueryParamsSerializer,
     TagDataSerializer,
     TaxonomyExportQueryParamsSerializer,
     TaxonomyImportBodySerializer,
@@ -305,12 +304,18 @@ class TaxonomyView(ModelViewSet):
         body.is_valid(raise_exception=True)
 
         taxonomy_name = body.validated_data["taxonomy_name"]
-        taxonomy_export_id = body.validated_data["taxonomy_export_id"]
+        taxonomy_export_id = body.validated_data.get("taxonomy_export_id")
         taxonomy_description = body.validated_data["taxonomy_description"]
         file = body.validated_data["file"].file
         parser_format = body.validated_data["parser_format"]
 
-        taxonomy = create_taxonomy(taxonomy_name, taxonomy_description, export_id=taxonomy_export_id)
+        # If no taxonomy_export_id provided, a unique export id will be generated
+        taxonomy = create_taxonomy(
+            taxonomy_name,
+            taxonomy_description,
+            export_id=taxonomy_export_id,
+        )
+
         try:
             import_success, task, _plan = import_tags(taxonomy, file, parser_format)
 
@@ -501,8 +506,8 @@ class ObjectTagView(
         Update ObjectTags that belong to a given object_id
 
         Pass a list of Tag ids or Tag values to be applied to an object id in the
-        body `tag` parameter. Passing an empty list will remove all tags from
-        the object id.
+        body `tag` parameter, by each taxonomy. Passing an empty list will remove all tags from
+        the object id on an specific taxonomy.
 
         **Example Body Requests**
 
@@ -511,54 +516,76 @@ class ObjectTagView(
         **Example Body Requests**
         ```json
         {
-            "tags": [1, 2, 3]
+            "tagsData": [
+                {
+                    "taxonomy": 1,
+                    "tags": [1, 2, 3]
+                },
+                {
+                    "taxonomy": 1,
+                    "tags": [1, 2, 3]
+                }
+            ],
         },
         {
-            "tags": ["Tag 1", "Tag 2"]
+            "tagsData": [
+                {
+                    "taxonomy": 1,
+                    "tags": ["Tag 1", "Tag 2"]
+                },
+            ]
         },
         {
-            "tags": []
+            "tagsData": [
+                {
+                    "taxonomy": 1,
+                    "tags": []
+                },
+            ]
         }
         """
-
         partial = kwargs.pop('partial', False)
         if partial:
             raise MethodNotAllowed("PATCH", detail="PATCH not allowed")
 
-        query_params = ObjectTagUpdateQueryParamsSerializer(
-            data=request.query_params.dict()
-        )
-        query_params.is_valid(raise_exception=True)
-        taxonomy = query_params.validated_data.get("taxonomy", None)
-        taxonomy = taxonomy.cast()
-
+        object_id = kwargs.pop('object_id')
         perm = "oel_tagging.can_tag_object"
+        body = ObjectTagUpdateBodySerializer(data=request.data)
+        body.is_valid(raise_exception=True)
 
-        object_id = kwargs.pop('object_id')
-        perm_obj = ObjectTagPermissionItem(
-            taxonomy=taxonomy,
-            object_id=object_id,
-        )
+        data = body.validated_data.get("tagsData", [])
 
-        if not request.user.has_perm(
-            perm,
-            # The obj arg expects a model, but we are passing an object
-            perm_obj,  # type: ignore[arg-type]
-        ):
-            raise PermissionDenied(
-                "You do not have permission to change object tags for this taxonomy or object_id."
-            )
+        if not data:
+            return self.retrieve(request, object_id)
 
-        body = ObjectTagUpdateBodySerializer(data=request.data)
-        body.is_valid(raise_exception=True)
+        # Check permissions
+        for tagsData in data:
+            taxonomy = tagsData.get("taxonomy")
 
-        tags = body.data.get("tags", [])
-        try:
-            tag_object(object_id, taxonomy, tags)
-        except TagDoesNotExist as e:
-            raise ValidationError from e
-        except ValueError as e:
-            raise ValidationError from e
+            perm_obj = ObjectTagPermissionItem(
+                taxonomy=taxonomy,
+                object_id=object_id,
+            )
+            if not request.user.has_perm(
+                perm,
+                # The obj arg expects a model, but we are passing an object
+                perm_obj,  # type: ignore[arg-type]
+            ):
+                raise PermissionDenied(f"""
+                    You do not have permission to change object tags
+                    for Taxonomy: {str(taxonomy)} or Object: {object_id}.
+                """)
+
+        # Tag object_id per taxonomy
+        for tagsData in data:
+            taxonomy = tagsData.get("taxonomy")
+            tags = tagsData.get("tags", [])
+            try:
+                tag_object(object_id, taxonomy, tags)
+            except TagDoesNotExist as e:
+                raise ValidationError from e
+            except ValueError as e:
+                raise ValidationError from e
 
         return self.retrieve(request, object_id)
 

{openedx-learning-0.9.0 → openedx_learning-0.9.2}/openedx_learning.egg-info/requires.txt

@@ -1,6 +1,6 @@
-attrs
-Django<5.0
-edx-drf-extensions
-djangorestframework<4.0
 celery
 rules<4.0
+attrs
+djangorestframework<4.0
+edx-drf-extensions
+Django<5.0