le-utils 0.2.7__tar.gz → 0.2.9__tar.gz

{le-utils-0.2.7/le_utils.egg-info → le-utils-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: le-utils
-Version: 0.2.7
+Version: 0.2.9
 Summary: LE-Utils contains shared constants used in Kolibri, Ricecooker, and Kolibri Studio.
 Home-page: https://github.com/learningequality/le-utils
 Author: Learning Equality
@@ -13,7 +13,7 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Programming Language :: Python
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Utilities
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*,  <3.13
+Requires-Python: >=3.6,  <3.14
 Description-Content-Type: text/markdown
 Provides-Extra: lang_utils
 License-File: LICENSE.txt

{le-utils-0.2.7 → le-utils-0.2.9}/le_utils/constants/embed_content_request.py

@@ -78,8 +78,8 @@ SCHEMA = {
             "additionalProperties": False,
             "properties": {
                 "id": {
-                    "type": "string",
-                    "description": "The ID of the content resource",
+                    "$ref": "/schemas/common_embed_definitions#/definitions/uuid",
+                    "description": "The UUID of the content resource",
                 },
                 "title": {
                     "type": "string",
@@ -99,8 +99,12 @@ SCHEMA = {
                     "description": "A list of files associated with the content resource",
                     "items": {"$ref": "#/definitions/file"},
                 },
+                "content_id": {
+                    "$ref": "/schemas/common_embed_definitions#/definitions/uuid",
+                    "description": "The UUID of the content resource(s)",
+                },
             },
-            "required": ["id", "title", "description", "text"],
+            "required": ["id", "title", "description", "text", "content_id"],
         },
     },
     "properties": {

le-utils-0.2.9/le_utils/validators/common.py

@@ -0,0 +1,20 @@
+import json
+import os
+
+from jsonschema import RefResolver
+
+
+def get_embed_schema_resolver(schema):
+    """
+    Returns a properly configured JSON schema resolver for embed schemas.
+
+    :param schema: The schema to use as the base schema
+    :return: A configured RefResolver
+    """
+    schema_dir = os.path.join(os.path.dirname(__file__), "..", "..", "spec")
+    with open(os.path.join(schema_dir, "definitions-embed_common.json")) as f:
+        common_definitions = json.load(f)
+
+    schema_store = {"/schemas/common_embed_definitions": common_definitions}
+
+    return RefResolver.from_schema(schema, store=schema_store)

{le-utils-0.2.7 → le-utils-0.2.9}/le_utils/validators/embed_content_request.py

@@ -1,6 +1,7 @@
 import jsonschema
 
 from le_utils.constants.embed_content_request import SCHEMA
+from le_utils.validators.common import get_embed_schema_resolver
 
 
 def validate(data):
@@ -8,4 +9,6 @@ def validate(data):
     :param data: Dictionary of data to validate
     :raises: jsonschema.ValidationError: When invalid
     """
-    jsonschema.validate(instance=data, schema=SCHEMA)
+    jsonschema.validate(
+        instance=data, schema=SCHEMA, resolver=get_embed_schema_resolver(SCHEMA)
+    )

{le-utils-0.2.7 → le-utils-0.2.9}/le_utils/validators/embed_topics_request.py

@@ -1,6 +1,7 @@
 import jsonschema
 
 from le_utils.constants.embed_topics_request import SCHEMA
+from le_utils.validators.common import get_embed_schema_resolver
 
 
 def validate(data):
@@ -8,4 +9,6 @@ def validate(data):
     :param data: Dictionary of data to validate
     :raises: jsonschema.ValidationError: When invalid
     """
-    jsonschema.validate(instance=data, schema=SCHEMA)
+    jsonschema.validate(
+        instance=data, schema=SCHEMA, resolver=get_embed_schema_resolver(SCHEMA)
+    )

{le-utils-0.2.7 → le-utils-0.2.9/le_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: le-utils
-Version: 0.2.7
+Version: 0.2.9
 Summary: LE-Utils contains shared constants used in Kolibri, Ricecooker, and Kolibri Studio.
 Home-page: https://github.com/learningequality/le-utils
 Author: Learning Equality
@@ -13,7 +13,7 @@ Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Programming Language :: Python
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Utilities
-Requires-Python: >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*,  <3.13
+Requires-Python: >=3.6,  <3.14
 Description-Content-Type: text/markdown
 Provides-Extra: lang_utils
 License-File: LICENSE.txt

{le-utils-0.2.7 → le-utils-0.2.9}/le_utils.egg-info/SOURCES.txt

@@ -40,5 +40,6 @@ le_utils/resources/languagelookup.json
 le_utils/resources/licenselookup.json
 le_utils/resources/presetlookup.json
 le_utils/validators/__init__.py
+le_utils/validators/common.py
 le_utils/validators/embed_content_request.py
 le_utils/validators/embed_topics_request.py

{le-utils-0.2.7 → le-utils-0.2.9}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-description-file = README.md
+long_description = file: README.md
 
 [flake8]
 max-line-length = 160

{le-utils-0.2.7 → le-utils-0.2.9}/setup.py

@@ -12,7 +12,7 @@ lang_utils_requirements = [
 setup(
     name="le-utils",
     packages=find_packages(),
-    version="0.2.7",
+    version="0.2.9",
     description="LE-Utils contains shared constants used in Kolibri, Ricecooker, and Kolibri Studio.",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -33,5 +33,5 @@ setup(
     ],
     author="Learning Equality",
     author_email="info@learningequality.org",
-    python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*,  <3.13",
+    python_requires=">=3.6,  <3.14",
 )