dalia_dif 0.0.15__tar.gz → 0.0.17__tar.gz

{dalia_dif-0.0.15 → dalia_dif-0.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dalia_dif
-Version: 0.0.15
+Version: 0.0.17
 Summary: Tools for DALIA's data model for open educational resources
 Keywords: snekpack,cookiecutter,open educational resources,educational resources,training
 Author: Charles Tapley Hoyt

{dalia_dif-0.0.15 → dalia_dif-0.0.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "dalia_dif"
-version = "0.0.15"
+version = "0.0.17"
 description = "Tools for DALIA's data model for open educational resources"
 readme = "README.md"
 authors = [
@@ -82,7 +82,7 @@ typing = [
     { include-group = "tests" },
     "mypy",
     "pydantic",
-    "click-types",
+    "types-click",
     "types-requests",
 ]
 docs-lint = [
@@ -250,7 +250,7 @@ known-first-party = [
 docstring-code-format = true
 
 [tool.bumpversion]
-current_version = "0.0.15"
+current_version = "0.0.17"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)(?:-(?P<release>[0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?(?:\\+(?P<build>[0-9A-Za-z-]+(?:\\.[0-9A-Za-z-]+)*))?"
 serialize = [
     "{major}.{minor}.{patch}-{release}+{build}",

{dalia_dif-0.0.15 → dalia_dif-0.0.17}/src/dalia_dif/cli.py

@@ -17,8 +17,9 @@ def main() -> None:
 
 @main.command()
 @click.option("--dif-version", type=click.Choice(["1.3"]), default="1.3")
+@click.option("--ignore-missing-description", is_flag=True)
 @click.argument("location")
-def validate(location: str, dif_version: str) -> None:
+def validate(location: str, dif_version: str, ignore_missing_description: bool) -> None:
     """Validate a local/remote file or local folder of DIF-encoded CSVs."""
     from dalia_dif.dif13 import read_dif13
 
@@ -31,7 +32,11 @@ def validate(location: str, dif_version: str) -> None:
         for path in p.glob("*.csv"):
             click.secho(f"\n> {path.relative_to(p)}", fg="green")
             errors: list[str] = []
-            read_dif13(path, error_accumulator=errors)
+            read_dif13(
+                path,
+                error_accumulator=errors,
+                ignore_missing_description=ignore_missing_description,
+            )
             if errors:
                 fail = True
                 for error in errors:

{dalia_dif-0.0.15 → dalia_dif-0.0.17}/src/dalia_dif/dif13/picklists.py

@@ -42,6 +42,7 @@ MEDIA_TYPES = {
     "image": SDO.ImageObject,
     "multipart": modalia.Multipart,
 }
+
 PROFICIENCY_LEVELS = {
     "novice": modalia.Novice,
     "advanced beginner": modalia.Beginner,
@@ -49,6 +50,14 @@ PROFICIENCY_LEVELS = {
     "proficient": modalia.Proficient,
     "expert": modalia.Expert,
 }
+PROFICIENCY_TO_ORDER: dict[URIRef, int] = {
+    modalia.Novice: 0,
+    modalia.Beginner: 1,
+    modalia.Competent: 2,
+    modalia.Proficient: 3,
+    modalia.Expert: 4,
+}
+
 RELATED_WORKS_RELATIONS = {
     "isPartOf": modalia.isPartOf,
     "hasPart": SDO.hasPart,
@@ -62,7 +71,6 @@ RELATED_WORKS_RELATIONS = {
     "isTranslationOf": modalia.isTranslationOf,
 }
 
-
 # Entries that will be ignored during the mapping because they shall be used as media type.
 # Format: URI -> media type to be used instead
 MEDIA_TYPE_EXCEPTIONS = {

{dalia_dif-0.0.15 → dalia_dif-0.0.17}/src/dalia_dif/dif13/reader.py

@@ -101,6 +101,7 @@ def read_dif13(
     *,
     error_accumulator: list[str] | None = None,
     converter: curies.Converter | None = None,
+    ignore_missing_description: bool = False,
 ) -> list[EducationalResourceDIF13]:
     """Parse DALIA records."""
     if isinstance(path, str) and (path.startswith("http://") or path.startswith("https://")):
@@ -132,7 +133,12 @@ def read_dif13(
             for idx, record in enumerate(reader, start=2)
             if (
                 oer := parse_dif13_row(
-                    file_name, idx, record, error_accumulator=error_accumulator, converter=converter
+                    file_name,
+                    idx,
+                    record,
+                    error_accumulator=error_accumulator,
+                    converter=converter,
+                    ignore_missing_description=ignore_missing_description,
                 )
             )
             is not None
@@ -149,16 +155,20 @@ def read_dif13_into_rdflib(
     return graph
 
 
-def parse_dif13_row(
-    file_name: str,
+def parse_dif13_row(  # noqa:C901
+    file_name: str | Path,
     idx: int,
     row: dict[str, str],
     *,
     future: bool = False,
     error_accumulator: list[str] | None = None,
     converter: curies.Converter | None = None,
+    ignore_missing_description: bool = False,
 ) -> EducationalResourceDIF13 | None:
     """Convert a row in a DALIA curation file to a resource, or return none if unable."""
+    if isinstance(file_name, Path):
+        file_name = file_name.name
+
     supporting_communities, recommending_communities = _process_communities(
         file_name, idx, row, error_accumulator=error_accumulator
     )
@@ -188,6 +198,16 @@ def parse_dif13_row(
             else:
                 raise ValueError(f"converter was unable to expand CURIE in keyword: {keyword}")
 
+    description = row.pop("Description").strip()
+    if not description:
+        _log(
+            file_name,
+            idx,
+            "no description given",
+            error_accumulator=None if ignore_missing_description else error_accumulator,
+        )
+        return None
+
     try:
         rv = EducationalResourceDIF13(
             uuid=uuid,
@@ -198,7 +218,7 @@ def parse_dif13_row(
             links=external_uris,
             supporting_communities=supporting_communities,
             recommending_communities=recommending_communities,
-            description=row.pop("Description").strip() or None,
+            description=description,
             disciplines=_process_disciplines(
                 file_name, idx, row, error_accumulator=error_accumulator
             ),

{dalia_dif-0.0.15 → dalia_dif-0.0.17}/src/dalia_dif/version.py

@@ -12,7 +12,7 @@ __all__ = [
     "get_version",
 ]
 
-VERSION = "0.0.15"
+VERSION = "0.0.17"
 
 
 def get_git_hash() -> str: