RasterArgument implementation for flexible raster arguments

Author: dirkvdb

.cargo/config.toml

@@ -25,3 +25,4 @@ standalone
 target
 *.so
 python/geodynamix.data/data/share/geodynamix/proj.db
+.cargo/config.toml

.gitignore

@@ -0,0 +1,18 @@
+[
+    {
+        "label": "Gdx build wheel",
+        "command": "just",
+        "args": ["wheel_develop"],
+        "use_new_terminal": false,
+        "allow_concurrent_runs": false,
+        "reveal": "always"
+    },
+    {
+        "label": "Gdx test wheel",
+        "command": "just",
+        "args": ["test"],
+        "use_new_terminal": false,
+        "allow_concurrent_runs": false,
+        "reveal": "always"
+    }
+]

.zed/tasks.json

@@ -1,24 +1,24 @@
 [package]
-name    = "geodynamix"
+name = "geodynamix"
 version = "0.16.0"
 edition = "2021"
 
 [workspace]
 members = ["infra-rs/crates/geo", "infra-rs/crates/inf"]
 
 [lib]
-name       = "geodynamix"
+name = "geodynamix"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3     = { version = "0.23", features = ["extension-module"] }
+pyo3 = { version = "0.23", features = ["extension-module"] }
 pyo3-log = "0.12"
-numpy    = "0.23"
-inf      = { path = "infra-rs/crates/inf" }
-geo      = { path = "infra-rs/crates/geo", features = ["gdal", "python"] }
+numpy = "0.23"
+inf = { path = "infra-rs/crates/inf" }
+geo = { path = "infra-rs/crates/geo", features = ["gdal", "python"] }
 
 [features]
-default      = []
+default = []
 static_build = ["geo/gdal-static"]
 
 [package.metadata.vcpkg]

Cargo.toml

@@ -21,7 +21,7 @@ cargo-config-gen:
   cp infra-rs/.cargo/config.toml.in .cargo/config.toml
   sd @CARGO_VCPKG_TRIPLET@ {{VCPKG_DEFAULT_TRIPLET}} .cargo/config.toml
   sd @PYTHON_EXE@ {{PYTHON_EXE}} .cargo/config.toml
-  
+
 bootstrap: cargo-config-gen
   echo "Bootstrapping vcpkg:{{VCPKG_DEFAULT_TRIPLET}}..."
   cargo vcpkg -v build
@@ -34,7 +34,7 @@ bootstrap: cargo-config-gen
   cp ./target/data/proj.db ./target/release/
   cp ./target/data/proj.db ./python/geodynamix.data/data/share/geodynamix/
   pixi install
-  
+
 doc:
   cargo doc --workspace --exclude='infra-rs' --exclude='vector_derive' --no-deps --all-features --open
 
@@ -48,10 +48,10 @@ build_release:
   cargo build --workspace --release
 
 test_debug:
-  cargo nextest run --profile ci --workspace --features=static_build
-
-build: build_release
+    cargo nextest run --profile ci --workspace --features=static_build
 
-test:
-  pixi run maturin develop; pixi run test
+wheel_develop:
+    pixi run maturin develop
 
+test: wheel_develop
+    pixi run test

infra-rs

@@ -1,9 +1,6 @@
 use pyo3::prelude::*;
 
-use crate::{
-    pyraster::{PythonDenseArray, Raster},
-    pyutils,
-};
+use crate::{utils, PythonDenseArray, Raster};
 
 #[pyfunction]
 pub fn read(path: std::path::PathBuf) -> PyResult<Raster> {
@@ -12,7 +9,7 @@ pub fn read(path: std::path::PathBuf) -> PyResult<Raster> {
 
 #[pyfunction]
 pub fn read_as(dtype: &Bound<'_, PyAny>, path: std::path::PathBuf) -> PyResult<Raster> {
-    let dtype = pyutils::convert_data_type(dtype)?;
+    let dtype = utils::convert_data_type(dtype)?;
     Ok(PythonDenseArray::read_as(dtype, &path)?.into())
 }
 

justfile

@@ -1,34 +1,41 @@
+use geo::AnyDenseArray;
 use pyo3::prelude::*;
-use std::path::PathBuf;
 
-mod pyio;
-mod pyraster;
-pub(crate) mod pyutils;
+mod io;
+mod nodata;
+mod raster;
+mod rasterargument;
+mod rastermetadata;
+pub(crate) mod utils;
 
-#[pyfunction]
-fn version() -> String {
-    env!("CARGO_PKG_VERSION").to_string()
-}
+pub use nodata::Nodata;
+pub use raster::Raster;
+pub use rastermetadata::RasterMetadata;
+pub type PythonDenseArray = AnyDenseArray<RasterMetadata>;
 
-/// A Python module implemented in Rust.
+/// The main geodynamix module
+/// Typically imported as `import geodynamix as gdx`
 #[pymodule]
 fn geodynamix(m: &Bound<'_, PyModule>) -> PyResult<()> {
     pyo3_log::init();
 
     #[cfg(feature = "static_build")]
     configure_proj_data()?;
 
-    m.add_class::<pyraster::RasterMetadata>()?;
-    m.add_class::<pyraster::Raster>()?;
-    m.add_function(wrap_pyfunction!(version, m)?)?;
-    m.add_function(wrap_pyfunction!(pyio::read, m)?)?;
-    m.add_function(wrap_pyfunction!(pyio::read_as, m)?)?;
-    m.add_function(wrap_pyfunction!(pyio::write, m)?)?;
+    m.add_class::<RasterMetadata>()?;
+    m.add_class::<raster::Raster>()?;
+    m.add_function(wrap_pyfunction!(io::read, m)?)?;
+    m.add_function(wrap_pyfunction!(io::read_as, m)?)?;
+    m.add_function(wrap_pyfunction!(io::write, m)?)?;
+    m.add_function(wrap_pyfunction!(raster::raster_equal, m)?)?;
+    m.add("nodata", Nodata::default())?;
     Ok(())
 }
 
 #[cfg(feature = "static_build")]
 fn configure_proj_data() -> PyResult<()> {
+    use std::path::PathBuf;
+
     // If we are using a static build, we are responsible for shipping the proj.db
     // So make sure gdal can find it
     let python_exe = std::env::current_exe()?;

src/pyio.rs src/io.rssrc/pyio.rs renamed to src/io.rs

@@ -0,0 +1,5 @@
+use pyo3::prelude::*;
+
+#[pyclass(name = "nodata")]
+#[derive(Default)]
+pub struct Nodata {}