fixup! Issue #112 Add AggregatorBackendConfig.memoizer

Open-EO · Mar 1, 2024 · 36bff83 · 36bff83
1 parent 1feb97d
commit 36bff83
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 36 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is roughly based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+- Add `AggregatorBackendConfig.memoizer` and deprecate `AggregatorConfig.memoizer` ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112))
+
+
 ## [0.24.0]
 
 - Add `AggregatorBackendConfig.partitioned_job_tracking` and deprecate `AggregatorConfig.partitioned_job_tracking` ([#112](https://github.com/Open-EO/openeo-aggregator/issues/112))

diff --git a/conf/aggregator.dev.py b/conf/aggregator.dev.py
@@ -45,6 +45,24 @@
 aggregator_config = AggregatorConfig(
     config_source=__file__,
     zookeeper_prefix="/openeo/aggregator-dev/",
+)
+
+
+config = AggregatorBackendConfig(
+    id="openeo-platform-aggregator-dev",
+    capabilities_title="openEO Platform (dev)",
+    capabilities_description="openEO Platform, provided through openEO Aggregator Driver (development instance).",
+    oidc_providers=oidc_providers,
+    aggregator_backends={
+        "vito": "https://openeo-dev.vito.be/openeo/1.1/",
+        "eodc": "https://openeo-dev.eodc.eu/openeo/1.1.0/",
+        "creo": "https://openeo-staging.creo.vito.be/openeo/1.1",
+        # Sentinel Hub OpenEO by Sinergise
+        "sentinelhub": "https://openeo.sentinel-hub.com/production/",
+    },
+    partitioned_job_tracking={
+        "zk_hosts": ZK_HOSTS,
+    },
     memoizer={
         # See `memoizer_from_config` for more details
         "type": "chained",
@@ -65,21 +83,3 @@
         }
     },
 )
-
-
-config = AggregatorBackendConfig(
-    id="openeo-platform-aggregator-dev",
-    capabilities_title="openEO Platform (dev)",
-    capabilities_description="openEO Platform, provided through openEO Aggregator Driver (development instance).",
-    oidc_providers=oidc_providers,
-    aggregator_backends={
-        "vito": "https://openeo-dev.vito.be/openeo/1.1/",
-        "eodc": "https://openeo-dev.eodc.eu/openeo/1.1.0/",
-        "creo": "https://openeo-staging.creo.vito.be/openeo/1.1",
-        # Sentinel Hub OpenEO by Sinergise
-        "sentinelhub": "https://openeo.sentinel-hub.com/production/",
-    },
-    partitioned_job_tracking={
-        "zk_hosts": ZK_HOSTS,
-    },
-)
diff --git a/conf/aggregator.prod.py b/conf/aggregator.prod.py
@@ -38,6 +38,23 @@
 aggregator_config = AggregatorConfig(
     config_source=__file__,
     zookeeper_prefix="/openeo/aggregator/",
+)
+
+
+config = AggregatorBackendConfig(
+    id="openeo-platform-aggregator-prod",
+    capabilities_title="openEO Platform",
+    capabilities_description="openEO Platform, provided through openEO Aggregator Driver.",
+    oidc_providers=oidc_providers,
+    aggregator_backends={
+        "vito": "https://openeo.vito.be/openeo/1.1/",
+        "eodc": "https://openeo.eodc.eu/openeo/1.1.0/",
+        # Sentinel Hub OpenEO by Sinergise
+        "sentinelhub": "https://openeo.sentinel-hub.com/production/",
+    },
+    partitioned_job_tracking={
+        "zk_hosts": ZK_HOSTS,
+    },
     memoizer={
         # See `memoizer_from_config` for more details
         "type": "chained",
@@ -57,22 +74,4 @@
             ]
         }
     },
-
-)
-
-
-config = AggregatorBackendConfig(
-    id="openeo-platform-aggregator-prod",
-    capabilities_title="openEO Platform",
-    capabilities_description="openEO Platform, provided through openEO Aggregator Driver.",
-    oidc_providers=oidc_providers,
-    aggregator_backends={
-        "vito": "https://openeo.vito.be/openeo/1.1/",
-        "eodc": "https://openeo.eodc.eu/openeo/1.1.0/",
-        # Sentinel Hub OpenEO by Sinergise
-        "sentinelhub": "https://openeo.sentinel-hub.com/production/",
-    },
-    partitioned_job_tracking={
-        "zk_hosts": ZK_HOSTS,
-    },
 )