try different flag behavior

Author: gtfierro

.github/workflows/artifacts.yml

@@ -15,7 +15,7 @@ concurrency:
 
 jobs:
   binary_linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:

Cargo.lock

@@ -7,7 +7,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.2.0-a6"
+version = "0.2.0-a7"
 authors = ["Gabe Fierro <[email protected]>"]
 license = "BSD-3-Clause"
 edition = "2021"
@@ -35,7 +35,7 @@ clap = { version = "4.4.18", features = ["derive"] }
 derive_builder = "0.20"
 oxigraph = "0.4.4"
 
-ontoenv = { version = "0.2.0-a6", path = "lib" }
+ontoenv = { version = "0.2.0-a7", path = "lib" }
 
 [profile.profiling]
 inherits = "release"

Cargo.toml

@@ -175,7 +175,6 @@ impl OntoEnv {
             true => Box::new(crate::io::ReadOnlyPersistentGraphIO::new(
                 ontoenv_dir.into(),
                 config.offline,
-                config.strict,
             )?),
             false => Box::new(crate::io::PersistentGraphIO::new(
                 ontoenv_dir.into(),

lib/src/api.rs

@@ -270,18 +270,16 @@ impl GraphIO for PersistentGraphIO {
 pub struct ReadOnlyPersistentGraphIO {
     store: Store,
     offline: bool,
-    strict: bool,
     store_path: PathBuf,
 }
 
 impl ReadOnlyPersistentGraphIO {
-    pub fn new(path: PathBuf, offline: bool, strict: bool) -> Result<Self> {
+    pub fn new(path: PathBuf, offline: bool) -> Result<Self> {
         let store_path = path.join("store.db");
         let store = Store::open_read_only(store_path.clone())?;
         Ok(Self {
             store,
             offline,
-            strict,
             store_path,
         })
     }

lib/src/io.rs

@@ -15,15 +15,15 @@ name = "ontoenv"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.23", features = ["extension-module"] }
+pyo3 = { version = "0.24", features = ["extension-module"] }
 ontoenv.workspace = true
 anyhow.workspace = true
 oxigraph.workspace = true
 env_logger.workspace = true
 log.workspace = true
 
 [build-dependencies]
-pyo3-build-config = "0.23"
+pyo3-build-config = "0.24"
 
 [features]
 abi3 = ["pyo3/abi3-py39"]

python/Cargo.toml

@@ -195,8 +195,13 @@ impl OntoEnv {
             // If no config but a valid path is given, attempt to load from the directory
             OntoEnvRs::load_from_directory(config_path.as_ref().unwrap().clone(), read_only)
                 .map_err(anyhow_to_pyerr)
+        } else if !recreate {
+            // if recreate is 'false', try to load from the directory
+            OntoEnvRs::load_from_directory(config_path.as_ref().unwrap().clone(), read_only)
+                .map_err(anyhow_to_pyerr)
         } else if let Some(c) = config {
-            // If a config is provided, initialize a new OntoEnv
+            // If a config is provided, initialize a new OntoEnv. 'recreate' will be true here
+            // (else it would have been loaded from the directory in the previous step)
             OntoEnvRs::init(c.cfg, recreate).map_err(anyhow_to_pyerr)
         } else {
             // Return an error if neither a valid path nor a config is provided