openedx-learning 0.6.0__py2.py3-none-any.whl → 0.6.1__py2.py3-none-any.whl

openedx_learning/__init__.py

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

openedx_learning/core/components/api.py

@@ -51,7 +51,7 @@ def create_component(
     """
     Create a new Component (an entity like a Problem or Video)
     """
-    key = f"{component_type.namespace}:{component_type.name}@{local_key}"
+    key = f"{component_type.namespace}:{component_type.name}:{local_key}"
     with atomic():
         publishable_entity = publishing_api.create_publishable_entity(
             learning_package_id, key, created, created_by

openedx_learning/core/components/migrations/0002_alter_componentversioncontent_key.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.10 on 2024-02-14 22:02
+
+from django.db import migrations
+
+import openedx_learning.lib.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oel_components', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='componentversioncontent',
+            name='key',
+            field=openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_column='_key', max_length=500),
+        ),
+    ]

openedx_learning/core/components/models.py

@@ -237,7 +237,13 @@ class ComponentVersionContent(models.Model):
     content = models.ForeignKey(Content, on_delete=models.RESTRICT)
 
     uuid = immutable_uuid_field()
-    key = key_field()
+
+    # "key" is a reserved word for MySQL, so we're temporarily using the column
+    # name of "_key" to avoid breaking downstream tooling. A possible
+    # alternative name for this would be "path", since it's most often used as
+    # an internal file path. However, we might also want to put special
+    # identifiers that don't map as cleanly to file paths at some point.
+    key = key_field(db_column="_key")
 
     # Long explanation for the ``learner_downloadable`` field:
     #

openedx_learning/core/publishing/migrations/0002_alter_learningpackage_key_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.10 on 2024-02-14 22:02
+
+from django.db import migrations
+
+import openedx_learning.lib.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('oel_publishing', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='learningpackage',
+            name='key',
+            field=openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_column='_key', max_length=500),
+        ),
+        migrations.AlterField(
+            model_name='publishableentity',
+            name='key',
+            field=openedx_learning.lib.fields.MultiCollationCharField(db_collations={'mysql': 'utf8mb4_bin', 'sqlite': 'BINARY'}, db_column='_key', max_length=500),
+        ),
+    ]

openedx_learning/core/publishing/models.py

@@ -38,7 +38,14 @@ class LearningPackage(models.Model):  # type: ignore[django-manager-missing]
     id = models.AutoField(primary_key=True)
 
     uuid = immutable_uuid_field()
-    key = key_field()
+
+    # "key" is a reserved word for MySQL, so we're temporarily using the column
+    # name of "_key" to avoid breaking downstream tooling. There's an open
+    # question as to whether this field needs to exist at all, or whether the
+    # top level library key it's currently used for should be entirely in the
+    # LibraryContent model.
+    key = key_field(db_column="_key")
+
     title = case_insensitive_char_field(max_length=500, blank=False)
 
     # TODO: We should probably defer this field, since many things pull back
@@ -172,7 +179,12 @@ class PublishableEntity(models.Model):
         on_delete=models.CASCADE,
         related_name="publishable_entities",
     )
-    key = key_field()
+
+    # "key" is a reserved word for MySQL, so we're temporarily using the column
+    # name of "_key" to avoid breaking downstream tooling. Consider renaming
+    # this later.
+    key = key_field(db_column="_key")
+
     created = manual_date_time_field()
     created_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,

openedx_learning/lib/fields.py

@@ -109,7 +109,7 @@ def immutable_uuid_field() -> models.UUIDField:
     )
 
 
-def key_field() -> MultiCollationCharField:
+def key_field(**kwargs) -> MultiCollationCharField:
     """
     Externally created Identifier fields.
 
@@ -120,7 +120,7 @@ def key_field() -> MultiCollationCharField:
     Other apps should *not* make references to these values directly, since
     these values may in theory change (even if this is rare in practice).
     """
-    return case_sensitive_char_field(max_length=500, blank=False)
+    return case_sensitive_char_field(max_length=500, blank=False, **kwargs)
 
 
 def hash_field() -> models.CharField:

{openedx_learning-0.6.0.dist-info → openedx_learning-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openedx-learning
-Version: 0.6.0
+Version: 0.6.1
 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: edx-drf-extensions
-Requires-Dist: attrs
 Requires-Dist: Django (<5.0)
-Requires-Dist: celery
-Requires-Dist: djangorestframework (<4.0)
 Requires-Dist: rules (<4.0)
+Requires-Dist: djangorestframework (<4.0)
+Requires-Dist: attrs
+Requires-Dist: edx-drf-extensions
+Requires-Dist: celery
 
 openedx-learning
 =============================

{openedx_learning-0.6.0.dist-info → openedx_learning-0.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-openedx_learning/__init__.py,sha256=11W0yK6VQ2Sghj3ZMU64TRxMwmEBKPtxfeNCBBxGoUU,67
+openedx_learning/__init__.py,sha256=4Akvu3WuVTtV-T_BQb8iO3zg_KBv_PDEc1owlfudTlQ,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
@@ -7,10 +7,11 @@ openedx_learning/contrib/media_server/views.py,sha256=V-eq0SFi5815lkGdRz8dye4fF3
 openedx_learning/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/core/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/core/components/admin.py,sha256=QE7e76C6X2V1AQPxQe6SayQPfCMmbs4RZPEPIGcvTWw,4672
-openedx_learning/core/components/api.py,sha256=EW_Did2yHRwKN2yWaZj4yWqdunKCAhSJv4Ob8jz-4dc,12345
+openedx_learning/core/components/api.py,sha256=2ux1s9Bpfvs5sgTViHLagMb1IHpMo_vRR-MbrbXh0_U,12345
 openedx_learning/core/components/apps.py,sha256=invLeAY0B-d_Ac9xu_b5ZWeb7v5NJe_-938BO9U2-jo,747
-openedx_learning/core/components/models.py,sha256=cOMmMdIQNciRqg11a7nZJMaI-7Xsr5ICRn-QTi4xUXA,12779
+openedx_learning/core/components/models.py,sha256=duVLdkTFnM7ixsqXQPlvmqmgf32hYyXdeRw1W7MdOpg,13170
 openedx_learning/core/components/migrations/0001_initial.py,sha256=446LkJSFeK8J_-l-bxakZ_BVx_CiJIllGcBYqWcEenA,4664
+openedx_learning/core/components/migrations/0002_alter_componentversioncontent_key.py,sha256=98724dtucRjJCRyLt5p45qXYb2d6-ouVGp7PB6zTG6E,539
 openedx_learning/core/components/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/core/contents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/core/contents/admin.py,sha256=4ILH_cEiAXKUlfPVwJJZeh5yupgF3v7kf-xJ6ZTTFDE,1174
@@ -24,14 +25,15 @@ openedx_learning/core/publishing/admin.py,sha256=F-0QlVQmuovLIF258XK_vKJdOnn7lLa
 openedx_learning/core/publishing/api.py,sha256=pfBePrmP0jnU5YTt4x7qhT37RN02P95gw2-xQNA_e9A,14254
 openedx_learning/core/publishing/apps.py,sha256=skY84raPW6gvrb5VPzhrLR2_gIHTUG67tMhSO7umVN4,379
 openedx_learning/core/publishing/model_mixins.py,sha256=Y6hGh0MKVOx0dUyNL0YkLL9ErUnYI2Nv2ZGMhc3CMng,13412
-openedx_learning/core/publishing/models.py,sha256=Vke2fxVIh6P0e6GXm-Shvc1BBXXez4IKyEJ8ipV56IQ,19771
+openedx_learning/core/publishing/models.py,sha256=MGezxLoKFqHYnZccknqWyuNYrgiqu9eGDc4H9yIYzrg,20321
 openedx_learning/core/publishing/migrations/0001_initial.py,sha256=wvekNV19YRSdxRmQaFnLSn_nCsQlHIucPDVMmgKf_OE,9272
+openedx_learning/core/publishing/migrations/0002_alter_learningpackage_key_and_more.py,sha256=toI7qJhNukk6hirKfFx9EpqTpzF2O2Yq1VpFJusDn2M,806
 openedx_learning/core/publishing/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openedx_learning/lib/admin_utils.py,sha256=5z9NrXxmT5j8azx9u1t0AgxV5PIDTc2jPyM5z5yW8cw,4021
 openedx_learning/lib/cache.py,sha256=ppT36KiPLdsAF3GfZCF0IdiHodckd2gLiF1sNhjSJuk,958
 openedx_learning/lib/collations.py,sha256=mMUXt6rnKoYOKTIVAVwiIQtWhaNsxRCfdeR25TPeK3U,4325
-openedx_learning/lib/fields.py,sha256=DZvpeYW_I9ZeV_dE3DawYW52SGx7Gvr7qVoXCAD2GLg,7504
+openedx_learning/lib/fields.py,sha256=eiGoXMPhRuq25EH2qf6BAODshAQE3DBVdIYAMIUAXW0,7522
 openedx_learning/lib/managers.py,sha256=ofcUxHS2wsJSFP4CB7OCkN6JiWFxNlIyNh_VDgFtgug,1538
 openedx_learning/lib/test_utils.py,sha256=g3KLuepIZbaDBCsaj9711YuqyUx7LD4gXDcfNC-mWdc,527
 openedx_learning/lib/validators.py,sha256=98UldFhFxd77zF1VxzQcOPt0blh64gMZDv-d_uQ67mg,396
@@ -92,8 +94,8 @@ openedx_tagging/core/tagging/rest_api/v1/serializers.py,sha256=I9jk3x3wPIeV_XCyC
 openedx_tagging/core/tagging/rest_api/v1/urls.py,sha256=dNUKCtUCx_YzrwlbEbpDfjGVQbb2QdJ1VuJCkladj6E,752
 openedx_tagging/core/tagging/rest_api/v1/views.py,sha256=opPY8xwbOupUaLnX0ovCV-oJ06l-d_qV8CgT47-m-Dc,34358
 openedx_tagging/core/tagging/rest_api/v1/views_import.py,sha256=kbHUPe5A6WaaJ3J1lFIcYCt876ecLNQfd19m7YYub6c,1470
-openedx_learning-0.6.0.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
-openedx_learning-0.6.0.dist-info/METADATA,sha256=DQNCjPuDYxV9Z0ZMYgd9Ih6oKNF675zV-YilKQ96dok,8758
-openedx_learning-0.6.0.dist-info/WHEEL,sha256=Z-nyYpwrcSqxfdux5Mbn_DQ525iP7J2DG3JgGvOYyTQ,110
-openedx_learning-0.6.0.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
-openedx_learning-0.6.0.dist-info/RECORD,,
+openedx_learning-0.6.1.dist-info/LICENSE.txt,sha256=QTW2QN7q3XszgUAXm9Dzgtu5LXYKbR1SGnqMa7ufEuY,35139
+openedx_learning-0.6.1.dist-info/METADATA,sha256=yw2xbOghDZ_i09kmUY-TqCnVX3gTYc0KP164ZDzis0E,8758
+openedx_learning-0.6.1.dist-info/WHEEL,sha256=Z-nyYpwrcSqxfdux5Mbn_DQ525iP7J2DG3JgGvOYyTQ,110
+openedx_learning-0.6.1.dist-info/top_level.txt,sha256=IYFbr5mgiEHd-LOtZmXj3q3a0bkGK1M9LY7GXgnfi4M,33
+openedx_learning-0.6.1.dist-info/RECORD,,