build: update to Rust 1.92 (#1101)

* build: update to Rust 1.92

* update dependencies

* pattern update fix

Author: ChristianBeilschmidt

Cargo.lock

@@ -71,16 +71,16 @@ actix-files = "0.6"
 actix-http = { version = "3.11", features = ["ws"] }
 actix-multipart = "0.7"
 actix-rt = "2.9"
-actix-web = "4.11"
+actix-web = "4.12"
 actix-web-httpauth = "0.8"
 actix-ws = "0.3"
 aes-gcm = "0.10.3"
 anyhow = "1.0"
 approx = "0.5"
-arrow = { version = "57.0", features = ["ipc_compression"] }
-arrow-array = "57.0"
-arrow-ord = "57.0"
-arrow-schema = { version = "57.0", features = ["serde"] }
+arrow = { version = "57.1", features = ["ipc_compression"] }
+arrow-array = "57.1"
+arrow-ord = "57.1"
+arrow-schema = { version = "57.1", features = ["serde"] }
 aruna-rust-api = "2.0.2"
 assert_cmd = "2.0"
 async-stream = "0.3"
@@ -96,31 +96,31 @@ chrono = { version = "0.4", features = ["serde"] }
 clap = { version = "4.5", features = ["derive"] }
 clap_derive = "4.5"
 config = "0.15"
-convert_case = "0.8"
-criterion = "0.7"
+convert_case = "0.10"
+criterion = "0.8"
 csv = "1.4"
 erased-serde = "0.4"
 fallible-iterator = "0.2" # only for postgres-protocol
 flexi_logger = { version = "0.31", features = ["trc"] }
 float-cmp = "0.10"
 futures = "0.3"
 futures-util = "0.3"
-gdal = "0.18"
-gdal-sys = "0.11"
+gdal = "0.19"
+gdal-sys = "0.12"
 # when changing geo version also adapt the Cargo.toml in the expression "deps-workspace"!
-geo = "0.31.0"
-geo-rand = { git = "https://github.com/lelongg/geo-rand.git", branch = "dependabot/cargo/geo-0.31.0" } # TODO: revert back to "0.5" when it is released
-geo-types = "0.7.17"                                                                                   # important for compatibility when linking expressions
+geo = "0.32.0"
+geo-rand = { git = "https://github.com/lelongg/geo-rand.git", branch = "dependabot/cargo/geo-0.32.0" } # TODO: revert back to "0.5" when it is released
+geo-types = "0.7.18"                                                                                   # important for compatibility when linking expressions
 geojson = { version = "0.24", features = ["geo-types"] }
 httptest = "0.16"
 image = "0.25"
 indoc = "2.0"
 itertools = "0.14"
-libloading = "0.8"
+libloading = "0.9"
 lru = "0.16"
-lz4_flex = "0.11"
+lz4_flex = "0.12"
 mime = "0.3"
-ndarray = { version = "0.16", features = ["approx"] }                                                  # has to match with `ort`
+ndarray = { version = "0.17", features = ["approx"] }                                                  # has to match with `ort`
 num = "0.4"
 num-traits = "0.2"
 oauth2 = "5.0"
@@ -132,7 +132,7 @@ opentelemetry = { version = "0.31", default-features = false, features = [
 ] }
 opentelemetry_sdk = { version = "0.31", features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.31", features = ["grpc-tonic"] }
-ort = { version = "2.0.0-rc.10", features = ["ndarray"] }
+ort = { version = "2.0.0-rc.11", features = ["ndarray"] }
 ouroboros = "0.18"
 paste = "1.0"
 pbkdf2 = "0.12.2"
@@ -156,7 +156,7 @@ pwhash = "1.0"
 quote = "1.0"
 rand = "0.9"
 rayon = "1.8"
-reqwest = { version = "0.12", features = [
+reqwest = { version = "0.12", features = [ # must be compatible with `oauth2`
     "json",
     "multipart",
     "stream",
@@ -165,18 +165,18 @@ rustc-hash = { version = "2.1", default-features = false }
 serde = { version = "1.0", features = ["derive", "rc"] }
 serde_json = "1.0"
 serde_urlencoded = "0.7"
-serde_with = "3.15"
-serial_test = "3.0"
+serde_with = "3.16"
+serial_test = "3.3"
 sha2 = "0.10"
 snafu = "0.8"
-stac = "0.13"
+stac = "0.16"
 stream-cancel = "0.8"
 strum = { version = "0.27", features = ["derive"] }
 strum_macros = "0.27"
 syn = { version = "2.0", features = ["full", "extra-traits"] }
-tempfile = "3.23"
+tempfile = "3.24"
 time = "0.3"
-tokio = { version = "1.48", features = [
+tokio = { version = "1.49", features = [
     "fs",
     "macros",
     "signal",
@@ -198,7 +198,7 @@ tracing-subscriber = { version = "0.3", features = [
     "ansi",
     "tracing-log",
 ] }
-tracing-appender = "0.2.3"
+tracing-appender = "0.2"
 typetag = "0.2"
 url = { version = "2.5", features = ["serde"] }
 utoipa = { version = "5.4", features = [
@@ -219,5 +219,5 @@ vergen = "9.0"
 vergen-gitcl = "1.0"
 walkdir = "2.4"
 wkt = "0.14"
-xml = "1.1"
-zip = "6.0"
+xml = "1.2"
+zip = "7.0"

Cargo.toml

@@ -1,3 +1,6 @@
+// lots of structs generated by Snafu for `MachineLearningError` have the suffix "type"
+#![allow(clippy::struct_field_names)]
+
 use geoengine_datatypes::{
     machine_learning::MlTensorShape3D,
     raster::{GridShape2D, RasterDataType},
@@ -13,8 +16,7 @@ pub mod onnx;
 pub mod onnx_util;
 
 #[derive(Debug, Snafu)]
-#[snafu(visibility(pub(crate)))]
-#[snafu(context(suffix(false)), module(error))] // disables default `Snafu` suffix
+#[snafu(context(suffix(false)) /* disables default `Snafu` suffix */, module(error), visibility(pub(crate)))]
 pub enum MachineLearningError {
     #[snafu(display("Error in Onnx model: {}", source))]
     Ort { source: ort::Error },

expression/deps-workspace/Cargo.lock

@@ -229,7 +229,7 @@ where
         // TODO: re-use session accross queries?
         // TODO: use another method: https://github.com/pykeio/ort/issues/402#issuecomment-2949993914
         let mut session = load_onnx_model_from_loading_info(&self.model_loading_info)?;
-        let input_name = session.inputs[0].name.clone(); // clone input name to avoid mutability problems
+        let input_name = session.inputs()[0].name().to_string(); // clone input name to avoid mutability problems
 
         let stream = self
             .source
@@ -502,7 +502,7 @@ mod tests {
             .commit_from_file(test_data!("ml/onnx/test_classification.onnx"))
             .unwrap();
 
-        let input_name = &session.inputs[0].name.clone();
+        let input_name = &session.inputs()[0].name().to_string();
 
         let new_samples = arr2(&[[0.1f32, 0.2], [0.2, 0.3], [0.2, 0.2], [0.3, 0.1]]);
 
@@ -525,7 +525,7 @@ mod tests {
             .commit_from_file(test_data!("ml/onnx/test_classification.onnx"))
             .unwrap();
 
-        let input_name = &session.inputs[0].name.clone();
+        let input_name = &session.inputs()[0].name().to_string();
 
         let pixels = vec![
             vec![0.1f32, 0.2],
@@ -561,7 +561,7 @@ mod tests {
             .commit_from_file(test_data!("ml/onnx/test_regression.onnx"))
             .unwrap();
 
-        let input_name = &session.inputs[0].name.clone();
+        let input_name = &session.inputs()[0].name().to_string();
 
         let pixels = vec![
             vec![0.1f32, 0.1, 0.2],

operators/src/machine_learning/mod.rs

@@ -147,7 +147,7 @@ pub fn check_onnx_model_input_matches_metadata(
     metadata_input: MlTensorShape3D,
     metadata_input_type: RasterDataType,
 ) -> Result<(), MachineLearningError> {
-    let inputs = &session.inputs;
+    let inputs = &session.inputs();
     ensure!(
         inputs.len() == 1,
         MultipleInputsNotSupported {
@@ -157,12 +157,11 @@ pub fn check_onnx_model_input_matches_metadata(
 
     let input = &inputs[0];
 
-    let (Some(input_tensor_type), Some(tensor_shape)) = (
-        input.input_type.tensor_type(),
-        input.input_type.tensor_shape(),
-    ) else {
+    let (Some(input_tensor_type), Some(tensor_shape)) =
+        (input.dtype().tensor_type(), input.dtype().tensor_shape())
+    else {
         return Err(MachineLearningError::InvalidInputType {
-            input_type: input.input_type.clone(),
+            input_type: input.dtype().clone(),
         });
     };
 
@@ -203,20 +202,20 @@ pub fn check_onnx_model_output_matches_metadata(
     metadata_output: MlTensorShape3D,
     metadata_output_type: RasterDataType,
 ) -> Result<(), MachineLearningError> {
-    let outputs = &session.outputs;
+    let outputs = &session.outputs();
 
     // we assume that the first output is the one to use
     // TODO: make this configurable?
     let output = &outputs[0];
     ensure!(
-        output.output_type.is_tensor(),
+        output.dtype().is_tensor(),
         InvalidOutputType {
-            output_type: output.output_type.clone()
+            output_type: output.dtype().clone()
         }
     );
 
     let dimensions = output
-        .output_type
+        .dtype()
         .tensor_shape()
         .expect("input must be a tensor. checked before!");
 
@@ -232,7 +231,7 @@ pub fn check_onnx_model_output_matches_metadata(
     );
 
     let output_tensor_type = output
-        .output_type
+        .dtype()
         .tensor_type()
         .expect("output must be a tensor. ckecked above!");
     let output_raster_type = try_raster_datatype_from_tensor_element_type(output_tensor_type)?;

operators/src/machine_learning/onnx.rs

@@ -279,10 +279,7 @@ impl PlotQueryProcessor for BoxPlotVectorQueryProcessor {
 
                 for accum in &mut accums {
                     let feature_data = collection.data(&accum.name).expect("checked in param");
-                    let iter = feature_data.float_options_iter().map(|o| match o {
-                        Some(v) => v,
-                        None => f64::NAN,
-                    });
+                    let iter = feature_data.float_options_iter().map(|o| o.unwrap_or(f64::NAN));
                     accum.update(iter)?;
                 }
             }

operators/src/machine_learning/onnx_util.rs

@@ -5,38 +5,30 @@ use crate::engine::{
     RasterBandDescriptors, RasterOperator, RasterQueryProcessor, RasterResultDescriptor,
     SingleVectorSource, TypedRasterQueryProcessor, TypedVectorQueryProcessor, WorkflowOperatorPath,
 };
-use arrow::datatypes::ArrowNativeTypeOp;
-use geoengine_datatypes::primitives::{CacheHint, ColumnSelection};
-
 use crate::error;
 use crate::processing::rasterization::GridOrDensity::Grid;
 use crate::util;
-
+use arrow::datatypes::ArrowNativeTypeOp;
 use async_trait::async_trait;
-
 use futures::stream::BoxStream;
 use futures::{StreamExt, stream};
 use geoengine_datatypes::collections::GeometryCollection;
-
 use geoengine_datatypes::primitives::{
     AxisAlignedRectangle, BoundingBox2D, Coordinate2D, RasterQueryRectangle, SpatialPartition2D,
     SpatialPartitioned, SpatialResolution, VectorQueryRectangle,
 };
+use geoengine_datatypes::primitives::{CacheHint, ColumnSelection};
 use geoengine_datatypes::raster::{
     GeoTransform, Grid2D, GridOrEmpty, GridSize, GridSpaceToLinearSpace, RasterDataType,
     RasterTile2D, TilingSpecification,
 };
-
 use num_traits::FloatConst;
 use rayon::prelude::*;
-
 use serde::{Deserialize, Serialize};
 use snafu::ensure;
 
 use crate::util::{spawn_blocking, spawn_blocking_with_thread_pool};
 
-use typetag::serde;
-
 /// An operator that rasterizes vector data
 pub type Rasterization = Operator<GridOrDensity, SingleVectorSource>;
 

operators/src/plot/box_plot.rs

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.91.1"
+channel = "1.92.0"
 components = ["cargo", "rustfmt", "rust-src", "clippy", "llvm-tools"]

operators/src/processing/rasterization/mod.rs

@@ -3,7 +3,7 @@ pub mod ml_models;
 
 use actix_http::StatusCode;
 use actix_web::{HttpResponse, dev::ServiceResponse};
-use convert_case::{Converter, pattern};
+use convert_case::{Converter, Pattern};
 use serde::{Deserialize, Serialize};
 use std::fmt;
 use utoipa::{ToResponse, ToSchema, openapi::schema::SchemaType};
@@ -131,7 +131,7 @@ where
             // error variant was not tagged with custom display
             // => derive more sensible default than snafu
             let conv = Converter::new()
-                .set_pattern(pattern::sentence)
+                .set_pattern(Pattern::Sentence)
                 .set_delim(' ');
             message = conv.convert(variant_name);
         }