openedx-learning 0.17.0__tar.gz → 0.18.1__tar.gz

{openedx_learning-0.17.0/openedx_learning.egg-info → openedx_learning-0.18.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.17.0
+Version: 0.18.1
 Summary: Open edX Learning Core and Tagging.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -18,12 +18,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 License-File: LICENSE.txt
-Requires-Dist: Django<5.0
-Requires-Dist: djangorestframework<4.0
-Requires-Dist: edx-drf-extensions
 Requires-Dist: attrs
 Requires-Dist: celery
+Requires-Dist: Django<5.0
 Requires-Dist: rules<4.0
+Requires-Dist: edx-drf-extensions
+Requires-Dist: djangorestframework<4.0
 
 Open edX Learning Core (and Tagging)
 ====================================

{openedx_learning-0.17.0 → openedx_learning-0.18.1}/openedx_learning/__init__.py

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

{openedx_learning-0.17.0 → openedx_learning-0.18.1}/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.17.0 → openedx_learning-0.18.1}/openedx_learning/apps/authoring/publishing/api.py

@@ -50,6 +50,7 @@ __all__ = [
     "soft_delete_draft",
     "reset_drafts_to_published",
     "register_content_models",
+    "filter_publishable_entities",
 ]
 
 
@@ -493,3 +494,22 @@ def register_content_models(
     return PublishableContentModelRegistry.register(
         content_model_cls, content_version_model_cls
     )
+
+
+def filter_publishable_entities(
+    entities: QuerySet[PublishableEntity],
+    has_draft=None,
+    has_published=None
+) -> QuerySet[PublishableEntity]:
+    """
+    Filter an entities query set.
+
+    has_draft: You can filter by entities that has a draft or not.
+    has_published: You can filter by entities that has a published version or not.
+    """
+    if has_draft is not None:
+        entities = entities.filter(draft__version__isnull=not has_draft)
+    if has_published is not None:
+        entities = entities.filter(published__version__isnull=not has_published)
+
+    return entities

{openedx_learning-0.17.0 → openedx_learning-0.18.1/openedx_learning.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.17.0
+Version: 0.18.1
 Summary: Open edX Learning Core and Tagging.
 Home-page: https://github.com/openedx/openedx-learning
 Author: David Ormsbee
@@ -18,12 +18,12 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.11
 License-File: LICENSE.txt
-Requires-Dist: Django<5.0
-Requires-Dist: djangorestframework<4.0
-Requires-Dist: edx-drf-extensions
 Requires-Dist: attrs
 Requires-Dist: celery
+Requires-Dist: Django<5.0
 Requires-Dist: rules<4.0
+Requires-Dist: edx-drf-extensions
+Requires-Dist: djangorestframework<4.0
 
 Open edX Learning Core (and Tagging)
 ====================================

{openedx_learning-0.17.0 → openedx_learning-0.18.1}/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:
         """

{openedx_learning-0.17.0 → openedx_learning-0.18.1}/openedx_learning.egg-info/requires.txt

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