dalia_dif 0.0.15__py3-none-any.whl → 0.0.17__py3-none-any.whl

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/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/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/version.py

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

{dalia_dif-0.0.15.dist-info → dalia_dif-0.0.17.dist-info}/METADATA

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

@@ -1,7 +1,7 @@
 dalia_dif/.DS_Store,sha256=MtnD5ThzFbk9R7gZVWNniR_qnre6YMJscVWWkkQW8AM,6148
 dalia_dif/__init__.py,sha256=uyO7jo0cu-99M2a87I7XeOH6c9ZPqRH46YgTdfXLOWg,66
 dalia_dif/__main__.py,sha256=dlPNI11KSS49DY4SoTA1l8gQZr6iR9N1JJsySTjicUg,126
-dalia_dif/cli.py,sha256=pdmO-y0wCZW7XkQywltnCpzpxdzC99I9m2OrKq6cXrU,2951
+dalia_dif/cli.py,sha256=zIKecW5aCvUrwyeW6k3ZXbb33Jl3X1d-9tZBsRpBLoU,3163
 dalia_dif/dif13/__init__.py,sha256=tMaSW0hhnuO_Mt8CM_d0cTT6j_FSTGFY99crUawWa4w,457
 dalia_dif/dif13/community/__init__.py,sha256=y8RnUSR1-d0oU02ZJA6z1hmDIJlUTJ66Yb51JGcp0JE,1051
 dalia_dif/dif13/community/dalia_communities.csv,sha256=Tcpo310kOtn1zNMKu183GjqcM8XlsubGrLSvbvotJxI,6191
@@ -14,10 +14,10 @@ dalia_dif/dif13/legacy/authors.py,sha256=u7dye1lW1FifhwCnSS9GsDQPOyBRMyChkWUQFGT
 dalia_dif/dif13/legacy/components.py,sha256=xS9VIfawsPl1xNF5jplgj5r6c_4xoPvFlCCZkiyni1c,11908
 dalia_dif/dif13/legacy/learning_resource.py,sha256=N_eCXE10C7ITgcH7mXacMT2VZez89F-gAXOxzJJ65wc,4448
 dalia_dif/dif13/model.py,sha256=GIfzAnT0Blh7Qe-wk3w_lxZld-B4VbfH2ahyaDdpuR4,6935
-dalia_dif/dif13/picklists.py,sha256=SX0jyWYhiboU1j7Np3CeoFEvd4NMg5YOQI3d6PCR5-M,4762
+dalia_dif/dif13/picklists.py,sha256=FapSFANJZ_u432RtGyOq7v8FpKfR4X9C7n3bAAXbrNI,4933
 dalia_dif/dif13/predicates.py,sha256=rrWVPMnMPvMelS4i2hOEWGhL11t-KR8yRrDArhGvYPE,1700
 dalia_dif/dif13/rdf.py,sha256=ZPdGB1hM2zNuxe6gidNwOn0LJB00Zs-mj2fHOYNm_qU,5908
-dalia_dif/dif13/reader.py,sha256=w0Kbcm9tt0y0__u3ele75DOvDlg2JUYZy_qcBC0gtPw,16604
+dalia_dif/dif13/reader.py,sha256=g7ZtDSrUBhlKNYyvB39auAdWQHndGf6pZGJa3jFpWes,17200
 dalia_dif/dif13/utils.py,sha256=-r5ezhD7AkaJUAsUtZl1sHG_P76fz2Q_ULXgXLyDNII,814
 dalia_dif/namespace/__init__.py,sha256=kJGpIXZzeUdVhM_Pj465XlMkVqMB2Uc9aAZeFKQp5IQ,3105
 dalia_dif/namespace/bibframe_lite_relation.py,sha256=2trFP98s1wCPUfiAjHg-EK09yjWXC6ePLNJIVqgZvd8,255
@@ -31,9 +31,9 @@ dalia_dif/namespace/modalia.py,sha256=pSL-G9ib0E--Jwrbu9PvMMRjMe2FzzxoSjEv-0ank2
 dalia_dif/namespace/rec.py,sha256=c2Ce5IEhnM_BcZJUCXiMQEZ2GLFcC_76hfkKE16-zLc,241
 dalia_dif/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 dalia_dif/utils.py,sha256=AA19Bw0vv8-ODZzDy_VR57WwndRccaQIepVS8tvodDo,761
-dalia_dif/version.py,sha256=3KPOrovLhb8UZjNbgXvcHQWQF4R3zKM9QcByY5-hEtk,962
-dalia_dif-0.0.15.dist-info/licenses/LICENSE,sha256=S-DsND478R_VQyGmtXbVYW67fRiJj3QfY8UXIJ4zvLI,1076
-dalia_dif-0.0.15.dist-info/WHEEL,sha256=z-mOpxbJHqy3cq6SvUThBZdaLGFZzdZPtgWLcP2NKjQ,79
-dalia_dif-0.0.15.dist-info/entry_points.txt,sha256=GmBz8JVyUD6m4v2QIxa7gm3sHIVNjTl5KTPP7L3FCGI,50
-dalia_dif-0.0.15.dist-info/METADATA,sha256=YbucTaME2VJgpvpePnyKUnl_bbYi7ibA2egEJspDbws,17760
-dalia_dif-0.0.15.dist-info/RECORD,,
+dalia_dif/version.py,sha256=aAPqI66QtdgdBvrGfuSXNCjIUCx6siw8G6_BPaSwT7w,962
+dalia_dif-0.0.17.dist-info/licenses/LICENSE,sha256=S-DsND478R_VQyGmtXbVYW67fRiJj3QfY8UXIJ4zvLI,1076
+dalia_dif-0.0.17.dist-info/WHEEL,sha256=XjEbIc5-wIORjWaafhI6vBtlxDBp7S9KiujWF1EM7Ak,79
+dalia_dif-0.0.17.dist-info/entry_points.txt,sha256=GmBz8JVyUD6m4v2QIxa7gm3sHIVNjTl5KTPP7L3FCGI,50
+dalia_dif-0.0.17.dist-info/METADATA,sha256=JwAwFe9RTi_fMDtlWApattEpFAihCPtSqcG20tF-rKg,17760
+dalia_dif-0.0.17.dist-info/RECORD,,

{dalia_dif-0.0.15.dist-info → dalia_dif-0.0.17.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.15
+Generator: uv 0.9.25
 Root-Is-Purelib: true
 Tag: py3-none-any