Remove job-id subtype #384

Open-EO · Mar 8, 2023 · baf08c6 · baf08c6
1 parent db242a8
commit baf08c6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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",