openedx-learning 0.17.0__py2.py3-none-any.whl → 0.18.1__py2.py3-none-any.whl

openedx_learning/__init__.py

@@ -2,4 +2,4 @@
 Open edX Learning ("Learning Core").
 """
 
-__version__ = "0.17.0"
+__version__ = "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/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.dist-info → openedx_learning-0.18.1.dist-info}/METADATA

@@ -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.dist-info → openedx_learning-0.18.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-openedx_learning/__init__.py,sha256=IMpdIFxhnSJC8rI3HtW2SRy57WekVbE3qOwH-dTdmnw,69
+openedx_learning/__init__.py,sha256=e94qKf1zR9la6hClqpjVg7BcDFrKfZDs8fMoFBOVHHY,69
 openedx_learning/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/api/authoring.py,sha256=vbRpiQ2wOfN3oR2bbN0-bI2ra0QRtha9tVixKW1ENis,929
@@ -32,12 +32,12 @@ openedx_learning/apps/authoring/contents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 openedx_learning/apps/authoring/contents/admin.py,sha256=9Njd_lje1emcd168KBWUTGf0mVJ6K-dMYMcqHNjRU4k,1761
 openedx_learning/apps/authoring/contents/api.py,sha256=bXb9yQjPfoP1Ynf1aAYz3BEPffK7H5cnba6KdPFSiG0,8818
 openedx_learning/apps/authoring/contents/apps.py,sha256=EEUZEnww7TcYcyxMovZthG2muNxd7j7nxBIf21gKrp4,398
-openedx_learning/apps/authoring/contents/models.py,sha256=RobNGdqkFhChcpub9FszOeqft4c1TJQgS5vQ3Cp2NCA,17899
+openedx_learning/apps/authoring/contents/models.py,sha256=AG3U00TPEjshngBdBhC_qCTF_dPcQMEmjmzW9pjA4BU,17599
 openedx_learning/apps/authoring/contents/migrations/0001_initial.py,sha256=FtOTmIGX2KHpjw-PHbfRjxkFEomI5CEDhNKCZ7IpFeE,3060
 openedx_learning/apps/authoring/contents/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/apps/authoring/publishing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/apps/authoring/publishing/admin.py,sha256=F-0QlVQmuovLIF258XK_vKJdOnn7lLa_0A5veE72TKc,4830
-openedx_learning/apps/authoring/publishing/api.py,sha256=CbJ8bvUGbN879JMX29auLfHeTQ_CotA6n868qglyaPM,16845
+openedx_learning/apps/authoring/publishing/api.py,sha256=dawwRDbqbA_02xtPAwFIukWShrkO6MoQptmEKdAN7uA,17475
 openedx_learning/apps/authoring/publishing/apps.py,sha256=jUfd78xvXaZg3dwkqXihatbeajJGm3Uz1rJpuyd-3g0,402
 openedx_learning/apps/authoring/publishing/model_mixins.py,sha256=DGM6cZSNX4KZHy5xWtNy6yO4bRT04VDus8yZJ4v3vI0,14447
 openedx_learning/apps/authoring/publishing/models.py,sha256=ImMAujPDc2-CECZw_yvVlUOdtGYwmt99TJ2r1HJkkV8,20488
@@ -110,10 +110,10 @@ openedx_tagging/core/tagging/rest_api/v1/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 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=D7brBbgmU7MnbU7Ln_xiLG-TtXno0aciE5AhjsXlClE,13903
 openedx_tagging/core/tagging/rest_api/v1/urls.py,sha256=dNUKCtUCx_YzrwlbEbpDfjGVQbb2QdJ1VuJCkladj6E,752
-openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=LA0EF7-p91JgVrLZpZaG474elKD1dswODGvoPIw47Mg,35837
+openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=IREy15_3u_TzUcxnoXCh3f84wA_QKUmU0WN958MJKxY,35923
 openedx_tagging/core/tagging/rest_api/v1/views_import.py,sha256=kbHUPe5A6WaaJ3J1lFIcYCt876ecLNQfd19m7YYub6c,1470
-openedx_learning-0.17.0.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
-openedx_learning-0.17.0.dist-info/METADATA,sha256=m44VGrMwjZ7BC1hHVgyx3lA-0jUYasgctFJ4WxswbNU,8777
-openedx_learning-0.17.0.dist-info/WHEEL,sha256=OpXWERl2xLPRHTvd2ZXo_iluPEQd8uSbYkJ53NAER_Y,109
-openedx_learning-0.17.0.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
-openedx_learning-0.17.0.dist-info/RECORD,,
+openedx_learning-0.18.1.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
+openedx_learning-0.18.1.dist-info/METADATA,sha256=sRm1pUlIfUuXpiEXk-rSdvjRtgPQ4nIw9D4jL4b0g40,8777
+openedx_learning-0.18.1.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+openedx_learning-0.18.1.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
+openedx_learning-0.18.1.dist-info/RECORD,,

{openedx_learning-0.17.0.dist-info → openedx_learning-0.18.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any

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:
         """