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

openedx_learning/__init__.py

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.9.1
+Version: 0.9.3
 Summary: An experiment.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -20,9 +20,9 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 License-File: LICENSE.txt
 Requires-Dist: djangorestframework <4.0
-Requires-Dist: attrs
-Requires-Dist: edx-drf-extensions
 Requires-Dist: Django <5.0
+Requires-Dist: edx-drf-extensions
+Requires-Dist: attrs
 Requires-Dist: celery
 Requires-Dist: rules <4.0
 

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

@@ -1,4 +1,4 @@
-openedx_learning/__init__.py,sha256=_LrU4yjEt6yqHKH8WWeN0l5QmPdRZ-p7bjWqLUzzYwI,67
+openedx_learning/__init__.py,sha256=EfjfyOQVIjOVYMNlUo9QxJoi0su5KwN9ncFBkCrXPAk,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
@@ -52,7 +52,7 @@ openedx_tagging/core/tagging/admin.py,sha256=Ngc2l9Mf6gkzmqu7aOwq-d0mgV8szx0GzSe
 openedx_tagging/core/tagging/api.py,sha256=JlS8KQiTBd0rEQqEqE5hf7QnCnR9KZRFw-ShcJPhJ4U,18749
 openedx_tagging/core/tagging/apps.py,sha256=-gp0VYqX4XQzwjjd-G68Ev2Op0INLh9Byz5UOqF5_7k,345
 openedx_tagging/core/tagging/data.py,sha256=421EvmDzdM7H523dBVQk4J0W_UwTT4U5syqPRXUYK4g,1353
-openedx_tagging/core/tagging/rules.py,sha256=UqIPPbOVA6FFF6uqLk0s5ORUczSYQt-a-S6Q_dB-RiE,6286
+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
@@ -94,12 +94,12 @@ openedx_tagging/core/tagging/rest_api/urls.py,sha256=egXaRQv1EAgF04ThgVZBQuvLK1L
 openedx_tagging/core/tagging/rest_api/utils.py,sha256=XZXixZ44vpNlxiyFplW8Lktyh_m1EfR3Y-tnyvA7acc,3620
 openedx_tagging/core/tagging/rest_api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/rest_api/v1/permissions.py,sha256=7HPE_NuKku_ISnkeE_HsFNXVYt0IbVkJN6M4wqwHGHU,2443
-openedx_tagging/core/tagging/rest_api/v1/serializers.py,sha256=apNHVKKtOtPwa1LIiwl5V_GM5p6A91ldejn8aSCj5-s,13475
+openedx_tagging/core/tagging/rest_api/v1/serializers.py,sha256=gbvEBLvsmfPc3swWz-_TEK8YpXiOa4oBXsU89_5iXiE,13749
 openedx_tagging/core/tagging/rest_api/v1/urls.py,sha256=dNUKCtUCx_YzrwlbEbpDfjGVQbb2QdJ1VuJCkladj6E,752
-openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=GPGYdA6NrjYNEWHnFBEpsBGal42hW1LWRuedzVkF3-M,35447
+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.1.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
-openedx_learning-0.9.1.dist-info/METADATA,sha256=fOa3PvcLYeSE7QNNc9iJSdzx3rFBsMGduje7WOLohDI,8860
-openedx_learning-0.9.1.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-openedx_learning-0.9.1.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
-openedx_learning-0.9.1.dist-info/RECORD,,
+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_tagging/core/tagging/rest_api/v1/serializers.py

@@ -140,7 +140,14 @@ class ObjectTagMinimalSerializer(UserPermissionsSerializerMixin, serializers.Mod
         fields = ["value", "lineage", "can_delete_objecttag"]
 
     lineage = serializers.ListField(child=serializers.CharField(), source="get_lineage", read_only=True)
-    can_delete_objecttag = serializers.SerializerMethodField(method_name='get_can_delete')
+    can_delete_objecttag = serializers.SerializerMethodField()
+
+    def get_can_delete_objecttag(self, instance) -> bool | None:
+        """
+        Returns True if the current request user may delete object tags on this taxonomy
+        """
+        perm_name = f'{self.app_label}.remove_objecttag_objectid'
+        return self._can(perm_name, instance.object_id)
 
 
 class ObjectTagSerializer(ObjectTagMinimalSerializer):
@@ -342,7 +349,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_tagging/core/tagging/rest_api/v1/views.py

@@ -304,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)
 

openedx_tagging/core/tagging/rules.py

@@ -137,6 +137,16 @@ def can_change_object_tag_objectid(_user: UserType, _object_id: str) -> bool:
     return False
 
 
+@rules.predicate
+def can_remove_object_tag_objectid(_user: UserType, _object_id: str) -> bool:
+    """
+    Nobody can remove object tags without checking the permission for the tagged object.
+
+    This rule could be defined in other apps for proper permission checking.
+    """
+    return can_change_object_tag_objectid(_user, _object_id)
+
+
 @rules.predicate
 def can_change_object_tag(
     user: UserType, perm_obj: ObjectTagPermissionItem | None = None
@@ -194,3 +204,4 @@ rules.add_perm("oel_tagging.view_objecttag_objectid", can_view_object_tag_object
 rules.add_perm("oel_tagging.view_objecttag_taxonomy", can_view_object_tag_taxonomy)
 rules.add_perm("oel_tagging.change_objecttag_taxonomy", can_view_object_tag_taxonomy)
 rules.add_perm("oel_tagging.change_objecttag_objectid", can_change_object_tag_objectid)
+rules.add_perm("oel_tagging.remove_objecttag_objectid", can_remove_object_tag_objectid)