openedx-learning 0.3.3__py2.py3-none-any.whl → 0.3.5__py2.py3-none-any.whl

openedx_learning/__init__.py

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

{openedx_learning-0.3.3.dist-info → openedx_learning-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.3.3
+Version: 0.3.5
 Summary: An experiment.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -17,12 +17,12 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Requires-Python: >=3.8
-Requires-Dist: Django (<5.0)
-Requires-Dist: celery
-Requires-Dist: attrs
-Requires-Dist: edx-drf-extensions
 Requires-Dist: djangorestframework (<4.0)
+Requires-Dist: celery
 Requires-Dist: rules (<4.0)
+Requires-Dist: Django (<5.0)
+Requires-Dist: edx-drf-extensions
+Requires-Dist: attrs
 
 openedx-learning
 =============================
@@ -210,9 +210,10 @@ Change Log
 Unreleased
 ~~~~~~~~~~
 
+* Removed usage of ``tox-battery`` and added support for ``tox 4.0``
 * Switch from ``edx-sphinx-theme`` to ``sphinx-book-theme`` since the former is
   deprecated.  See https://github.com/openedx/edx-sphinx-theme/issues/184 for
-  more details.
+  more details.  
 
 [0.1.0] - 2021-08-08
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

{openedx_learning-0.3.3.dist-info → openedx_learning-0.3.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-openedx_learning/__init__.py,sha256=uCM-EDfQ6j2lvGvX4fNePRahmlupHBm1GFrksXxa37k,67
+openedx_learning/__init__.py,sha256=Ho0NTFgVeG0pxXs5miy44Bt4snnD-dyzeE4yKvRL1bE,67
 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
@@ -43,7 +43,7 @@ openedx_tagging/__init__.py,sha256=V9N8M7f9LYlAbA_DdPUsHzTnWjYRXKGa5qHw9P1JnNI,3
 openedx_tagging/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_tagging/core/tagging/admin.py,sha256=5mSTxlftMq5MVGzdE8xl3AcxgtfpnrKpXPNdvw7hAno,1075
-openedx_tagging/core/tagging/api.py,sha256=P0NBPTsJvrQqRzuLrFgM6x0SumKsxQ2c-pRZGWC2OKs,12063
+openedx_tagging/core/tagging/api.py,sha256=KFXA3x06ahaUeYRVZ9ZaELCJogDedm3lqFj558FjCK8,13840
 openedx_tagging/core/tagging/apps.py,sha256=-gp0VYqX4XQzwjjd-G68Ev2Op0INLh9Byz5UOqF5_7k,345
 openedx_tagging/core/tagging/data.py,sha256=C5uRsR3she-iB3n1OyPdQm6PsIc1Lg-XOI7HT0yNLPI,1327
 openedx_tagging/core/tagging/rules.py,sha256=vhBaVpRBAjsx7B2tbeFqorU3H-LZgWERlbpFKFaEeM4,6113
@@ -87,10 +87,10 @@ openedx_tagging/core/tagging/rest_api/v1/permissions.py,sha256=FeSulmsFD7wAAuYpx
 openedx_tagging/core/tagging/rest_api/v1/serializers.py,sha256=HMDWJ--VoRx1KfmCIRdjHsz8yNUHDYT3BoxsU_kZbiY,8558
 openedx_tagging/core/tagging/rest_api/v1/urls.py,sha256=dNUKCtUCx_YzrwlbEbpDfjGVQbb2QdJ1VuJCkladj6E,752
 openedx_tagging/core/tagging/rest_api/v1/utils.py,sha256=PR8ERgXaL4_r9kiOLpOSgGdtK7oA6jIP74ej2gDWCUs,822
-openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=-wcFEHEvVTCbjRYNaGp7N-1w_AXTZqGvEh50kfZH0Zw,28989
+openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=MixTy8JSnJ6-F6Km-udNDh-SY6IKcijGILP7Q3aWCvc,28636
 openedx_tagging/core/tagging/rest_api/v1/views_import.py,sha256=kbHUPe5A6WaaJ3J1lFIcYCt876ecLNQfd19m7YYub6c,1470
-openedx_learning-0.3.3.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
-openedx_learning-0.3.3.dist-info/METADATA,sha256=cOczYR2FkAwPNSDqfF6fn-KvEEqqe036iJGj6TvcIXM,8687
-openedx_learning-0.3.3.dist-info/WHEEL,sha256=Z-nyYpwrcSqxfdux5Mbn_DQ525iP7J2DG3JgGvOYyTQ,110
-openedx_learning-0.3.3.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
-openedx_learning-0.3.3.dist-info/RECORD,,
+openedx_learning-0.3.5.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
+openedx_learning-0.3.5.dist-info/METADATA,sha256=Fs4z5Sc1ZxmTxQSamHeACYCb1JjoQx9V8ecsI2RjXPo,8758
+openedx_learning-0.3.5.dist-info/WHEEL,sha256=Z-nyYpwrcSqxfdux5Mbn_DQ525iP7J2DG3JgGvOYyTQ,110
+openedx_learning-0.3.5.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
+openedx_learning-0.3.5.dist-info/RECORD,,

openedx_tagging/core/tagging/api.py

@@ -12,6 +12,8 @@ are stored in this app.
 """
 from __future__ import annotations
 
+from typing import Any
+
 from django.db import models, transaction
 from django.db.models import F, QuerySet, Value
 from django.db.models.functions import Coalesce, Concat, Lower
@@ -157,6 +159,7 @@ def resync_object_tags(object_tags: QuerySet | None = None) -> int:
 def get_object_tags(
     object_id: str,
     taxonomy_id: int | None = None,
+    include_deleted: bool = False,
     object_tag_class: type[ObjectTag] = ObjectTag
 ) -> QuerySet[ObjectTag]:
     """
@@ -165,8 +168,16 @@ def get_object_tags(
     Pass taxonomy_id to limit the returned object_tags to a specific taxonomy.
     """
     filters = {"taxonomy_id": taxonomy_id} if taxonomy_id else {}
+    base_qs = (
+        object_tag_class.objects
+        .filter(object_id=object_id, **filters)
+        .exclude(taxonomy__enabled=False)  # Exclude if the whole taxonomy is disabled
+    )
+    if not include_deleted:
+        base_qs = base_qs.exclude(taxonomy_id=None)  # Exclude if the whole taxonomy was deleted
+        base_qs = base_qs.exclude(tag_id=None, taxonomy__allow_free_text=False)  # Exclude if just the tag is deleted
     tags = (
-        object_tag_class.objects.filter(object_id=object_id, **filters)
+        base_qs
         # Preload related objects, including data for the "get_lineage" method on ObjectTag/Tag:
         .select_related("taxonomy", "tag", "tag__parent", "tag__parent__parent")
         # Sort the tags within each taxonomy in "tree order". See Taxonomy._get_filtered_tags_deep for details on this:
@@ -185,6 +196,31 @@ def get_object_tags(
     return tags
 
 
+def get_object_tag_counts(object_id_pattern: str) -> dict[str, int]:
+    """
+    Given an object ID, a "starts with" glob pattern like
+    "course-v1:foo+bar+baz@*", or a list of "comma,separated,IDs", return a
+    dict of matching object IDs and how many tags each object has.
+
+    Deleted tags and disabled taxonomies are excluded from the counts, even if
+    ObjectTag data about them is present.
+    """
+    # Note: in the future we may add an option to exclude system taxonomies from the count.
+    qs: Any = ObjectTag.objects
+    if object_id_pattern.endswith("*"):
+        qs = qs.filter(object_id__startswith=object_id_pattern[0:len(object_id_pattern) - 1])
+    elif "*" in object_id_pattern:
+        raise ValueError("Wildcard matches are only supported if the * is at the end.")
+    else:
+        qs = qs.filter(object_id__in=object_id_pattern.split(","))
+    # Don't include deleted tags or disabled taxonomies:
+    qs = qs.exclude(taxonomy_id=None)  # The whole taxonomy was deleted
+    qs = qs.exclude(taxonomy__enabled=False)  # The whole taxonomy is disabled
+    qs = qs.exclude(tag_id=None, taxonomy__allow_free_text=False)  # The taxonomy exists but the tag is deleted
+    qs = qs.values("object_id").annotate(num_tags=models.Count("id")).order_by("object_id")
+    return {row["object_id"]: row["num_tags"] for row in qs}
+
+
 def delete_object_tags(object_id: str):
     """
     Delete all ObjectTag entries for a given object.

openedx_tagging/core/tagging/rest_api/v1/views.py

@@ -3,8 +3,6 @@ Tagging API Views
 """
 from __future__ import annotations
 
-from typing import Any
-
 from django.db import models
 from django.http import Http404, HttpResponse
 from rest_framework import mixins, status
@@ -20,6 +18,7 @@ from ...api import (
     add_tag_to_taxonomy,
     create_taxonomy,
     delete_tags_from_taxonomy,
+    get_object_tag_counts,
     get_object_tags,
     get_taxonomies,
     get_taxonomy,
@@ -29,7 +28,7 @@ from ...api import (
 from ...data import TagDataQuerySet
 from ...import_export.api import export_tags, get_last_import_log, import_tags
 from ...import_export.parsers import ParserFormat
-from ...models import ObjectTag, Taxonomy
+from ...models import Taxonomy
 from ...rules import ObjectTagPermissionItem
 from ..paginators import TAGS_THRESHOLD, DisabledTagsPagination, TagsPagination
 from .permissions import ObjectTagObjectPermissions, TagObjectPermissions, TaxonomyObjectPermissions
@@ -295,7 +294,8 @@ class TaxonomyView(ModelViewSet):
     @action(detail=True, url_path="tags/import", methods=["put"])
     def update_import(self, request: Request, **_kwargs) -> Response:
         """
-        Imports tags from the uploaded file to an already created taxonomy.
+        Imports tags from the uploaded file to an already created taxonomy,
+        overwriting any existing tags.
         """
         body = TaxonomyImportBodySerializer(data=request.data)
         body.is_valid(raise_exception=True)
@@ -305,7 +305,7 @@ class TaxonomyView(ModelViewSet):
 
         taxonomy = self.get_object()
         try:
-            import_success = import_tags(taxonomy, file, parser_format)
+            import_success = import_tags(taxonomy, file, parser_format, replace=True)
 
             if import_success:
                 serializer = self.get_serializer(taxonomy)
@@ -517,16 +517,10 @@ class ObjectTagCountsView(
         """
         # This API does NOT bother doing any permission checks as the # of tags is not considered sensitive information.
         object_id_pattern = self.kwargs["object_id_pattern"]
-        qs: Any = ObjectTag.objects
-        if object_id_pattern.endswith("*"):
-            qs = qs.filter(object_id__startswith=object_id_pattern[0:len(object_id_pattern) - 1])
-        elif "*" in object_id_pattern:
-            raise ValidationError("Wildcard matches are only supported if the * is at the end.")
-        else:
-            qs = qs.filter(object_id__in=object_id_pattern.split(","))
-
-        qs = qs.values("object_id").annotate(num_tags=models.Count("id")).order_by("object_id")
-        return Response({row["object_id"]: row["num_tags"] for row in qs})
+        try:
+            return Response(get_object_tag_counts(object_id_pattern))
+        except ValueError as err:
+            raise ValidationError(err.args[0]) from err
 
 
 @view_auth_classes