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

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

@@ -149,8 +149,8 @@ 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],
     *,
@@ -159,6 +159,9 @@ def parse_dif13_row(
     converter: curies.Converter | None = None,
 ) -> 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 +191,11 @@ 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=error_accumulator)
+        return None
+
     try:
         rv = EducationalResourceDIF13(
             uuid=uuid,
@@ -198,7 +206,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.16"
 
 
 def get_git_hash() -> str:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dalia_dif
-Version: 0.0.15
+Version: 0.0.16
 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.16.dist-info}/RECORD

@@ -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=vdHUawwDx1ohdldGbXtJDaAysEKdOmBUkP_sNhf1YJo,16853
 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=P0HhClGD_f2DxANB1sjaKV-SnG74QwaGHI6c9mzq30k,962
+dalia_dif-0.0.16.dist-info/licenses/LICENSE,sha256=S-DsND478R_VQyGmtXbVYW67fRiJj3QfY8UXIJ4zvLI,1076
+dalia_dif-0.0.16.dist-info/WHEEL,sha256=z-mOpxbJHqy3cq6SvUThBZdaLGFZzdZPtgWLcP2NKjQ,79
+dalia_dif-0.0.16.dist-info/entry_points.txt,sha256=GmBz8JVyUD6m4v2QIxa7gm3sHIVNjTl5KTPP7L3FCGI,50
+dalia_dif-0.0.16.dist-info/METADATA,sha256=KGz1zzlomjuz7BA_lKnVrsL-Y-vgY62wkbn4RVUP3GA,17760
+dalia_dif-0.0.16.dist-info/RECORD,,