Echo process and OGC API Processes validation

.github/workflows/ci.yml

@@ -2,7 +2,12 @@ name: CI
 
 on:
   push:
+    branches:
+      - main
   pull_request:
+  merge_group:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 env:
   CARGO_TERM_COLOR: always
@@ -15,7 +20,7 @@ jobs:
     steps:
       - name: Dependencies
         run: sudo apt-get update && sudo apt-get install -y build-essential pkg-config libclang-dev libgdal-dev
-      
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -27,9 +32,52 @@ jobs:
 
       - name: Format
         run: cargo fmt --all -- --check
-      
+
       - name: Clippy
         run: cargo clippy --workspace --all-features --all-targets -- -D warnings
 
       - name: Test
         run: cargo test --workspace --all-features --all-targets
+
+  ogc-compliance:
+    name: Validate OGC API Compliance
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Dependencies
+        run: |
+          sudo apt-get update
+            sudo apt-get install -y \
+              build-essential \
+              pkg-config \
+              libclang-dev \
+              libgdal-dev \
+              python3-dotenv
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup
+        run: docker compose up db -d
+
+      - name: Start service
+        run: |
+          cargo run -p demo-service &
+          npx wait-on http://localhost:8484/
+
+      - name: Validate service
+        uses: geo-engine/ogc-validator@v2
+        with:
+          service-url: http://localhost:8484/
+          ogc-api-processes: true
+          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: |-
+            testJobCreationInputValidation
+            testJobCreationInputRef
+          ogc-api-features: true
+          ogc-api-features-container-tag: 1.9-teamengine-6.0.0-RC2
+          ogc-api-features-ignore: |-
+            featureOperation
+            validateFeatureResponse

README.md

@@ -84,6 +84,7 @@ cargo clippy --workspace --all-features --all-targets
 ```bash
 podman run --network host docker.io/ogccite/ets-ogcapi-features10
 # podman run --network host docker.io/ogccite/ets-ogcapi-edr10
+# podman run --network host docker.io/ogccite/ets-ogcapi-processes10
 ```
 
 Navigate to <http://localhost:8080/teamengine/> to execute the test suite. For documentation and more info see <https://cite.opengeospatial.org/teamengine/about/ogcapi-features-1.0/1.0/site>.

examples/demo-service/src/main.rs

@@ -2,7 +2,10 @@ use clap::Parser;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
 use ogcapi::{
-    processes::{gdal_loader::GdalLoader, geojson_loader::GeoJsonLoader, greeter::Greeter},
+    processes::{
+        echo::Echo,
+        // gdal_loader::GdalLoader, geojson_loader::GeoJsonLoader, greeter::Greeter
+    },
     services::{AppState, Config, Service},
 };
 
@@ -25,9 +28,10 @@ async fn main() {
 
     // Register processes/processors
     let state = state.processors(vec![
-        Box::new(Greeter),
-        Box::new(GeoJsonLoader),
-        Box::new(GdalLoader),
+        // Box::new(Greeter),
+        // Box::new(GeoJsonLoader),
+        // Box::new(GdalLoader),
+        Box::new(Echo),
     ]);
 
     // Build & run with hyper

ogcapi-client/src/processes.rs

@@ -1,7 +1,6 @@
 use crate::{Client, Error};
-
-use ogcapi_processes::ProcessResponseBody;
-use ogcapi_types::processes::{Execute, Response, Results, StatusInfo, TransmissionMode};
+use ogcapi_types::processes::{Execute, Output, Response, Results, StatusInfo, TransmissionMode};
+use std::collections::HashMap;
 
 impl Client {
     #[cfg(feature = "processes")]
@@ -56,9 +55,20 @@ impl Client {
     }
 }
 
+#[derive(Debug, serde::Serialize, serde::Deserialize)]
+pub enum ProcessResponseBody {
+    Requested {
+        outputs: HashMap<String, Output>,
+        parts: Vec<Vec<u8>>,
+    },
+    Results(Results),
+    Empty(String),
+    StatusInfo(StatusInfo),
+}
+
 #[cfg(test)]
 mod tests {
-    use ogcapi_processes::gdal_loader::GdalLoaderOutputs;
+    // use ogcapi_processes::gdal_loader::GdalLoaderOutputs;
     use ogcapi_types::processes::Execute;
 
     use super::*;
@@ -100,41 +110,41 @@ mod tests {
         )
     }
 
-    #[test]
-    #[ignore = "needs running demo service"]
-    fn execute_gdal_loader() {
-        use ogcapi_processes::{
-            Processor,
-            gdal_loader::{GdalLoader, GdalLoaderInputs},
-        };
-
-        let endpoint = "http://0.0.0.0:8484/";
-        let client = Client::new(endpoint).unwrap();
-
-        let input = GdalLoaderInputs {
-            input: "/data/ne_10m_railroads_north_america.geojson".to_owned(),
-            collection: "streets".to_string(),
-            filter: None,
-            s_srs: None,
-            database_url: "postgresql://postgres:password@db:5432/ogcapi".to_string(),
-        };
-
-        let execute = Execute {
-            inputs: input.execute_input(),
-            outputs: GdalLoaderOutputs::execute_output(),
-            ..Default::default()
-        };
-
-        let response = client.execute(GdalLoader {}.id(), &execute).unwrap();
-
-        let ProcessResponseBody::Requested {
-            outputs: _outputs,
-            parts,
-        } = response
-        else {
-            panic!()
-        };
-
-        assert_eq!(String::from_utf8(parts[0].clone()).unwrap(), "streets");
-    }
+    // #[test]
+    // #[ignore = "needs running demo service"]
+    // fn execute_gdal_loader() {
+    //     use ogcapi_processes::{
+    //         Processor,
+    //         gdal_loader::{GdalLoader, GdalLoaderInputs},
+    //     };
+
+    //     let endpoint = "http://0.0.0.0:8484/";
+    //     let client = Client::new(endpoint).unwrap();
+
+    //     let input = GdalLoaderInputs {
+    //         input: "/data/ne_10m_railroads_north_america.geojson".to_owned(),
+    //         collection: "streets".to_string(),
+    //         filter: None,
+    //         s_srs: None,
+    //         database_url: "postgresql://postgres:password@db:5432/ogcapi".to_string(),
+    //     };
+
+    //     let execute = Execute {
+    //         inputs: input.execute_input(),
+    //         outputs: GdalLoaderOutputs::execute_output(),
+    //         ..Default::default()
+    //     };
+
+    //     let response = client.execute(GdalLoader {}.id(), &execute).unwrap();
+
+    //     let ProcessResponseBody::Requested {
+    //         outputs: _outputs,
+    //         parts,
+    //     } = response
+    //     else {
+    //         panic!()
+    //     };
+
+    //     assert_eq!(String::from_utf8(parts[0].clone()).unwrap(), "streets");
+    // }
 }

ogcapi-drivers/migrations/20251020900000_response_type.sql

@@ -0,0 +1,3 @@
+CREATE TYPE response_type AS ENUM ('raw', 'document');
+
+ALTER TABLE meta.jobs ADD COLUMN response response_type NOT NULL;