some fixes

ChristianBeilschmidt · ChristianBeilschmidt · commit 0b0ae59443cf · 2025-10-27T14:27:38.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,15 +66,18 @@ jobs:
           npx wait-on http://localhost:8484/
 
       - name: Validate service
-        uses: geo-engine/ogc-validator@v1
+        uses: geo-engine/ogc-validator@v2
         with:
           service-url: http://localhost:8484/
           ogc-api-processes: true
-          ogc-api-processes-version: 1.3-teamengine-6.0.0-RC2
+          ogc-api-processes-container-tag: 1.3-teamengine-6.0.0-RC2
           echoprocessid: echo
+          # cf. <https://github.com/opengeospatial/ets-ogcapi-processes10/issues/106>
           ogc-api-processes-ignore: |-
-            testJobCreationOp
             testJobCreationInputValidation
-            testJobCreationRequest
             testJobCreationInputRef
-            testJobList
+          ogc-api-features: true
+          ogc-api-features-container-tag: 1.9-teamengine-6.0.0-RC2
+          ogc-api-features-ignore: |-
+            featureOperation
+            validateFeatureResponse
diff --git a/ogcapi-drivers/src/lib.rs b/ogcapi-drivers/src/lib.rs
@@ -110,6 +110,7 @@ pub trait JobHandler: Send + Sync {
 }
 
 #[cfg(feature = "processes")]
+#[derive(Debug)]
 pub enum ProcessResult {
     NoSuchJob,
     NotReady,
diff --git a/ogcapi-drivers/src/postgres/job.rs b/ogcapi-drivers/src/postgres/job.rs
@@ -13,8 +13,6 @@ use super::Db;
 #[async_trait::async_trait]
 impl JobHandler for Db {
     async fn register(&self, job: &StatusInfo, response_mode: Response) -> anyhow::Result<String> {
-        eprintln!("{}", serde_json::to_string_pretty(job).unwrap());
-        eprintln!("{}", serde_json::to_string_pretty(&response_mode).unwrap());
         let (id,): (String,) = sqlx::query_as(
             r#"
             INSERT INTO meta.jobs(
@@ -150,24 +148,23 @@ impl JobHandler for Db {
     }
 
     async fn results(&self, id: &str) -> anyhow::Result<ProcessResult> {
-        let results: Option<(
-            Option<sqlx::types::Json<HashMap<String, ExecuteResult>>>,
-            sqlx::types::Json<Response>,
-        )> = sqlx::query_as(
-            r#"
+        let results: Option<(Json<Option<HashMap<String, ExecuteResult>>>, Json<Response>)> = dbg!(
+            sqlx::query_as(
+                r#"
             SELECT results, to_jsonb(response)
             FROM meta.jobs
             WHERE job_id = $1
             "#,
-        )
-        .bind(id)
-        .fetch_optional(&self.pool)
-        .await?;
+            )
+            .bind(id)
+            .fetch_optional(&self.pool)
+            .await
+        )?;
 
         Ok(match results {
             None => ProcessResult::NoSuchJob,
-            Some((None, _)) => ProcessResult::NotReady,
-            Some((Some(Json(results)), Json(response_mode))) => ProcessResult::Results {
+            Some((Json(None), _)) => ProcessResult::NotReady,
+            Some((Json(Some(results)), Json(response_mode))) => ProcessResult::Results {
                 results,
                 response_mode,
             },
diff --git a/ogcapi-processes/src/echo.rs b/ogcapi-processes/src/echo.rs
@@ -36,6 +36,7 @@ pub struct EchoInputs {
     // pub bounding_box_input: Option<BoundingBoxInput>,
     // pub images_input: Option<Vec<String>>,
     // pub feature_collection_input: Option<String>,
+    pub pause: Option<u64>,
 }
 
 #[derive(Deserialize, Serialize, Debug, JsonSchema)]
@@ -174,20 +175,50 @@ impl Processor for Echo {
                     .title("Execution endpoint"),
                 ],
             },
-            inputs: HashMap::from([(
-                "stringInput".to_string(),
-                InputDescription {
-                    description_type: DescriptionType {
-                        title: Some("String Literal Input Example".to_string()),
-                        description: Some(
-                            "This is an example of a STRING literal input.".to_string(),
-                        ),
+            inputs: HashMap::from([
+                (
+                    "stringInput".to_string(),
+                    InputDescription {
+                        description_type: DescriptionType {
+                            title: Some("String Literal Input Example".to_string()),
+                            description: Some(
+                                "This is an example of a STRING literal input.".to_string(),
+                            ),
+                            ..Default::default()
+                        },
+                        schema: generator.root_schema_for::<StringInput>().to_value(),
                         ..Default::default()
                     },
-                    schema: generator.root_schema_for::<StringInput>().to_value(),
-                    ..Default::default()
-                },
-            )]),
+                ),
+                (
+                    "doubleInput".to_string(),
+                    InputDescription {
+                        description_type: DescriptionType {
+                            title: Some("Double Literal Input Example".to_string()),
+                            description: Some(
+                                "This is an example of a DOUBLE literal input.".to_string(),
+                            ),
+                            ..Default::default()
+                        },
+                        schema: generator.root_schema_for::<f64>().to_value(),
+                        ..Default::default()
+                    },
+                ),
+                (
+                    "pause".to_string(),
+                    InputDescription {
+                        description_type: DescriptionType {
+                            title: Some("Pause Duration".to_string()),
+                            description: Some(
+                                "Optional pause duration in seconds before responding.".to_string(),
+                            ),
+                            ..Default::default()
+                        },
+                        schema: generator.root_schema_for::<u64>().to_value(),
+                        ..Default::default()
+                    },
+                ),
+            ]),
             outputs: HashMap::from([(
                 "stringOutput".to_string(),
                 OutputDescription {
@@ -202,6 +233,10 @@ impl Processor for Echo {
         let value = serde_json::to_value(execute.inputs)?;
         let inputs: EchoInputs = serde_json::from_value(value)?;
 
+        if let Some(pause_duration) = inputs.pause {
+            tokio::time::sleep(std::time::Duration::from_secs(pause_duration)).await;
+        }
+
         let output_values = EchoOutputs {
             string_output: inputs.string_input,
             double_output: inputs.double_input,
diff --git a/ogcapi-services/src/error.rs b/ogcapi-services/src/error.rs
@@ -6,6 +6,7 @@ use axum::{
 use hyper::HeaderMap;
 
 use ogcapi_types::common::{Exception, media_type::PROBLEM_JSON};
+use tracing::error;
 
 /// A common error type that can be used throughout the API.
 ///
@@ -102,3 +103,25 @@ impl From<Error> for Exception {
         Exception::new(status.as_u16()).detail(message)
     }
 }
+
+/// Helper function to read-lock a RwLock, recovering from poisoning if necessary.
+pub fn read_lock<T>(mutex: &std::sync::RwLock<T>) -> std::sync::RwLockReadGuard<'_, T> {
+    match mutex.read() {
+        Ok(guard) => guard,
+        Err(poisoned) => {
+            error!("Mutex was poisoned, attempting to recover.");
+            poisoned.into_inner()
+        }
+    }
+}
+
+/// Helper function to read-lock a RwLock, recovering from poisoning if necessary.
+pub fn write_lock<T>(mutex: &std::sync::RwLock<T>) -> std::sync::RwLockWriteGuard<'_, T> {
+    match mutex.write() {
+        Ok(guard) => guard,
+        Err(poisoned) => {
+            error!("Mutex was poisoned, attempting to recover.");
+            poisoned.into_inner()
+        }
+    }
+}
diff --git a/ogcapi-services/src/processes.rs b/ogcapi-services/src/processes.rs
@@ -1,6 +1,8 @@
+use crate::Error;
 use axum::{
     Json,
     body::Body,
+    extract::{FromRequest, Request},
     http::{HeaderValue, StatusCode},
     response::{IntoResponse, IntoResponseParts, Response, ResponseParts},
 };
@@ -10,7 +12,7 @@ use mail_builder::headers::content_type::ContentType;
 use mail_builder::headers::text::Text;
 use mail_builder::mime::{BodyPart, MimePart};
 use ogcapi_types::{
-    common::Link,
+    common::{Exception, Link},
     processes::{ExecuteResult, InlineOrRefData, StatusInfo},
 };
 use std::borrow::Cow;
@@ -412,6 +414,38 @@ fn qualified_input_value_to_binary(
     }
 }
 
+#[derive(Debug, Clone, Copy, Default)]
+#[must_use]
+pub struct ValidParams<T>(pub T);
+
+impl<T, S> FromRequest<S> for ValidParams<T>
+where
+    T: FromRequest<S>,
+    T::Rejection: std::fmt::Display,
+    S: Send + Sync,
+{
+    type Rejection = Error;
+
+    async fn from_request(req: Request, state: &S) -> Result<Self, Self::Rejection> {
+        let json = T::from_request(req, state).await;
+
+        match json {
+            Ok(value) => Ok(ValidParams(value)),
+            Err(rejection) => {
+                // let response_body = rejection.body_text();
+                Err(Error::OgcApiException(
+                    Exception::new("InvalidParameterValue")
+                        .status(404)
+                        .title("InvalidParameterValue")
+                        .detail(format!(
+                            "The following parameters are not recognized: {rejection}",
+                        )),
+                ))
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use std::collections::BTreeMap;
diff --git a/ogcapi-services/src/routes/processes.rs b/ogcapi-services/src/routes/processes.rs
diff --git a/ogcapi-types/src/processes/execute.rs b/ogcapi-types/src/processes/execute.rs

Original file line number	Diff line number	Diff line change
`@@ -110,6 +110,7 @@ pub trait JobHandler: Send + Sync {`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`#[cfg(feature = "processes")]`
	`113`	`+#[derive(Debug)]`
`113`	`114`	`pub enum ProcessResult {`
`114`	`115`	`NoSuchJob,`
`115`	`116`	`NotReady,`