openedx-learning 0.18.0__tar.gz → 0.18.2__tar.gz

{openedx_learning-0.18.0/openedx_learning.egg-info → openedx_learning-0.18.2}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: openedx-learning
-Version: 0.18.0
+Version: 0.18.2
 Summary: Open edX Learning Core and Tagging.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -19,11 +19,21 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 License-File: LICENSE.txt
 Requires-Dist: attrs
-Requires-Dist: rules<4.0
-Requires-Dist: Django<5.0
-Requires-Dist: djangorestframework<4.0
 Requires-Dist: edx-drf-extensions
+Requires-Dist: Django<5.0
+Requires-Dist: rules<4.0
 Requires-Dist: celery
+Requires-Dist: djangorestframework<4.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Open edX Learning Core (and Tagging)
 ====================================

{openedx_learning-0.18.0 → openedx_learning-0.18.2}/openedx_learning/__init__.py

@@ -2,4 +2,4 @@
 Open edX Learning ("Learning Core").
 """
 
-__version__ = "0.18.0"
+__version__ = "0.18.2"

{openedx_learning-0.18.0 → openedx_learning-0.18.2}/openedx_learning/apps/authoring/contents/models.py

@@ -267,11 +267,7 @@ class Content(models.Model):
     # only in file form. It is an error for ``text`` to be None and ``has_file``
     # to be False, since that would mean we haven't stored data anywhere at all.
     #
-    # We annotate this because mypy doesn't recognize that ``text`` should be
-    # nullable when using MultiCollationTextField, but does the right thing for
-    # TextField. For more info, see:
-    #   https://github.com/openedx/openedx-learning/issues/152
-    text: models.TextField[str | None, str | None] = MultiCollationTextField(
+    text = MultiCollationTextField(
         blank=True,
         null=True,
         max_length=MAX_TEXT_LENGTH,

{openedx_learning-0.18.0 → openedx_learning-0.18.2/openedx_learning.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: openedx-learning
-Version: 0.18.0
+Version: 0.18.2
 Summary: Open edX Learning Core and Tagging.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -19,11 +19,21 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 License-File: LICENSE.txt
 Requires-Dist: attrs
-Requires-Dist: rules<4.0
-Requires-Dist: Django<5.0
-Requires-Dist: djangorestframework<4.0
 Requires-Dist: edx-drf-extensions
+Requires-Dist: Django<5.0
+Requires-Dist: rules<4.0
 Requires-Dist: celery
+Requires-Dist: djangorestframework<4.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 Open edX Learning Core (and Tagging)
 ====================================

{openedx_learning-0.18.0 → openedx_learning-0.18.2}/openedx_tagging/core/tagging/rest_api/v1/serializers.py

@@ -157,8 +157,7 @@ class ObjectTagSerializer(ObjectTagMinimalSerializer):
     class Meta:
         model = ObjectTag
         fields = ObjectTagMinimalSerializer.Meta.fields + [
-            # The taxonomy name
-            "name",
+            "export_id",
             "taxonomy_id",
             # If the Tag or Taxonomy has been deleted, this ObjectTag shouldn't be shown to users.
             "is_deleted",

{openedx_learning-0.18.0 → openedx_learning-0.18.2}/openedx_tagging/core/tagging/rest_api/v1/views.py

@@ -450,6 +450,7 @@ class ObjectTagView(
     minimal_serializer_class = ObjectTagMinimalSerializer
     permission_classes = [ObjectTagObjectPermissions]
     lookup_field = "object_id"
+    lookup_value_regex = r'[\w\.\+\-@:]+'
 
     def get_queryset(self) -> models.QuerySet:
         """
@@ -619,6 +620,7 @@ class ObjectTagCountsView(
 
     serializer_class = ObjectTagSerializer
     lookup_field = "object_id_pattern"
+    lookup_value_regex = r'[\w\.\+\-@:*,]+'
 
     def retrieve(self, request, *args, **kwargs) -> Response:
         """
@@ -780,8 +782,8 @@ class TaxonomyTagsView(ListAPIView, RetrieveUpdateDestroyAPIView):
         The current taxonomy is cached in the view.
         """
         if not self._taxonomy:
-            taxonomy_id = int(self.kwargs["pk"])
-            taxonomy = get_taxonomy(taxonomy_id)
+            taxonomy_id = self.kwargs.get("pk")
+            taxonomy = get_taxonomy(int(taxonomy_id)) if taxonomy_id else None
             if not taxonomy:
                 raise Http404("Taxonomy not found")
             self.check_object_permissions(self.request, taxonomy)
@@ -797,6 +799,9 @@ class TaxonomyTagsView(ListAPIView, RetrieveUpdateDestroyAPIView):
         context['request'] = self.request
         serializer = self.serializer_class(self, context=context)
 
+        if getattr(self, 'swagger_fake_view', False):
+            # queryset just for schema generation metadata
+            return context
         # Instead of checking permissions for each TagData instance, we just check them once for the whole taxonomy
         # (since that's currently how our rules work). This might change if Tag-specific permissions are needed.
         taxonomy = self.get_taxonomy()
@@ -812,6 +817,9 @@ class TaxonomyTagsView(ListAPIView, RetrieveUpdateDestroyAPIView):
         """
         Builds and returns the queryset to be paginated.
         """
+        if getattr(self, 'swagger_fake_view', False):
+            # queryset just for schema generation metadata
+            return Taxonomy.objects.none()  # type: ignore[return-value]
         taxonomy = self.get_taxonomy()
         parent_tag_value = self.request.query_params.get("parent_tag", None)
         include_counts = "include_counts" in self.request.query_params

{openedx_learning-0.18.0 → openedx_learning-0.18.2}/openedx_learning.egg-info/requires.txt

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