- Changed the way that we represent enums in Python to use propre enu…

…ms with default values

- Added `read_shacl_str` and `read_shacl_path` to pyrudof

CHANGELOG.md

@@ -2,8 +2,14 @@
 
 ## Current changes without release yet
 
-## [v0.1.45] - 2025-10-29
+## [v0.1.47] - 2025-10-29
 
+- Changed the way that we represent enums in Python to use propre enums with default values
+- Added `read_shacl_str` and `read_shacl_path` to pyrudof
+
+## [v0.1.46] - 2025-10-29
+
+- Added default values to `pyrudof` to allow a more flexible API
 - minor release to include RDFFormat and ReaderMode in export list of `pyrudof`
 
 ## [v0.1.45] - 2024-10-29

rudof_cli/src/main.rs

@@ -565,7 +565,7 @@ fn run_validate_shex(
         };
         let base_iri = config.shex_config().base;
         let schema_base = base_iri.as_ref().map(|iri| iri.as_str());
-        rudof.read_shex(schema_reader, schema_base, &schema_format)?;
+        rudof.read_shex(schema_reader, &schema_format, schema_base)?;
         get_data_rudof(&mut rudof, data, data_format, endpoint, reader_mode, config)?;
 
         let shapemap_format = shapemap_format_convert(shapemap_format);
@@ -1429,7 +1429,7 @@ fn parse_shex_schema_rudof(
     let schema_format = shex_format_convert(schema_format);
     let shex_config = config.shex_config();
     let base = base_convert(&shex_config.base);
-    rudof.read_shex(reader, base, &schema_format)?;
+    rudof.read_shex(reader, &schema_format, base)?;
     Ok(())
 }
 

rudof_lib/src/rudof.rs

@@ -360,8 +360,8 @@ impl Rudof {
     pub fn read_shex<R: io::Read>(
         &mut self,
         reader: R,
-        base: Option<&str>,
         format: &ShExFormat,
+        base: Option<&str>,
     ) -> Result<()> {
         let schema_json = match format {
             ShExFormat::ShExC => {
@@ -668,7 +668,7 @@ mod tests {
             .unwrap();
 
         rudof
-            .read_shex(shex.as_bytes(), None, &ShExFormat::ShExC)
+            .read_shex(shex.as_bytes(), &ShExFormat::ShExC, None)
             .unwrap();
         rudof
             .read_shapemap(shapemap.as_bytes(), &ShapeMapFormat::default())
@@ -695,7 +695,7 @@ mod tests {
             .unwrap();
 
         rudof
-            .read_shex(shex.as_bytes(), None, &ShExFormat::ShExC)
+            .read_shex(shex.as_bytes(), &ShExFormat::ShExC, None)
             .unwrap();
         rudof
             .read_shapemap(shapemap.as_bytes(), &ShapeMapFormat::default())