From baf08c6a0d690c8f80709f3a668485d0c41d7428 Mon Sep 17 00:00:00 2001
From: Matthias Mohr <webmaster@mamo-net.de>
Date: Wed, 8 Mar 2023 13:20:17 +0100
Subject: [PATCH] Remove job-id subtype #384

---
 CHANGELOG.md                 |  1 +
 meta/subtype-schemas.json    |  7 -------
 proposals/load_ml_model.json | 10 ++--------
 proposals/load_result.json   | 24 ++++++++----------------
 4 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2165c06..1c5ba454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `between`: Support for temporal comparison.
 - Deprecated `GeometryCollections` are not supported any longer. [#389](https://github.com/Open-EO/openeo-processes/issues/389)
 - Deprecated PROJ definitions for the CRS are not supported any longer.
+- `load_result`: Subtype `job-id` removed in favor of providing a URL. [#384](https://github.com/Open-EO/openeo-processes/issues/384)
 
 ### Fixed
 
diff --git a/meta/subtype-schemas.json b/meta/subtype-schemas.json
index 941e6a48..8ce3570e 100644
--- a/meta/subtype-schemas.json
+++ b/meta/subtype-schemas.json
@@ -185,13 +185,6 @@
             "title": "Options for Input File Formats",
             "description": "Key-value-pairs with arguments for the input format options supported by the back-end."
         },
-        "job-id": {
-            "type": "string",
-            "subtype": "job-id",
-            "title": "Batch Job ID",
-            "description": "A batch job id, either one of the jobs a user has stored or a publicly available job.",
-            "pattern": "^[\\w\\-\\.~]+$"
-        },
         "kernel": {
             "type": "array",
             "subtype": "kernel",
diff --git a/proposals/load_ml_model.json b/proposals/load_ml_model.json
index 151513c8..a8ece22e 100644
--- a/proposals/load_ml_model.json
+++ b/proposals/load_ml_model.json
@@ -10,22 +10,16 @@
     "parameters": [
         {
             "name": "id",
-            "description": "The STAC Item to load the machine learning model from. The STAC Item must implement the `ml-model` extension.",
+            "description": "The STAC Item that implements the `ml-model` extension to load the machine learning model from. Loading a model is possible only if a single model can be identified unambiguously.",
             "schema": [
                 {
                     "title": "URL",
+                    "description": "Either a URL to an external STAC Item or a batch job result.",
                     "type": "string",
                     "format": "uri",
                     "subtype": "uri",
                     "pattern": "^https?://"
                 },
-                {
-                    "title": "Batch Job ID",
-                    "description": "Loading a model by batch job ID is possible only if a single model has been saved by the job. Otherwise, you have to load a specific model from a batch job by URL.",
-                    "type": "string",
-                    "subtype": "job-id",
-                    "pattern": "^[\\w\\-\\.~]+$"
-                },
                 {
                     "title": "User-uploaded File",
                     "type": "string",
diff --git a/proposals/load_result.json b/proposals/load_result.json
index 26f6039d..29495806 100644
--- a/proposals/load_result.json
+++ b/proposals/load_result.json
@@ -10,22 +10,14 @@
     "parameters": [
         {
             "name": "id",
-            "description": "The id of a batch job with results.",
-            "schema": [
-                {
-                    "title": "ID",
-                    "type": "string",
-                    "subtype": "job-id",
-                    "pattern": "^[\\w\\-\\.~]+$"
-                },
-                {
-                    "title": "URL",
-                    "type": "string",
-                    "format": "uri",
-                    "subtype": "uri",
-                    "pattern": "^https?://"
-                }
-            ]
+            "description": "The URL of a batch job with results.",
+            "schema": {
+                "title": "URL",
+                "type": "string",
+                "format": "uri",
+                "subtype": "uri",
+                "pattern": "^https?://"
+            }
         },
         {
             "name": "spatial_extent",