use latest nwp consumer ecmwf india

openclimatefix · Jan 7, 2025 · 1c8db00 · 1c8db00
1 parent e18063f
commit 1c8db00
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/terraform/india/development/main.tf b/terraform/india/development/main.tf
@@ -142,7 +142,16 @@ module "nwp_consumer_ecmwf_live_ecs_task" {
   ]
 
   container-env_vars = [
+    { "name" : "MODEL_REPOSITORY", "value" : "ecmwf-realtime" },
+    { "name" : "MODEL", "value" : "hres-ifs-india" },
     { "name" : "AWS_REGION", "value" : var.region },
+    { "name" : "ECMWF_REALTIME_S3_REGION", "value": "eu-west-1" },
+    { "name" : "ECMWF_REALTIME_S3_BUCKET", "value" : "ocf-ecmwf-production" },
+    { "name" : "ZARRDIR", "value" : "s3://${module.s3-nwp-bucket.bucket_id}/ecmwf/data" },
+    { "name" : "LOGLEVEL", "value" : "DEBUG" },
+    { "name" : "SENTRY_DSN", "value" : var.sentry_dsn },
+    { "name" : "CONCURRENCY", "value" : "false" },
+    # legacy
     { "name" : "AWS_S3_BUCKET", "value" : module.s3-nwp-bucket.bucket_id },
     { "name" : "ECMWF_AWS_REGION", "value" : "eu-west-1" },
     { "name" : "ECMWF_AWS_S3_BUCKET", "value" : "ocf-ecmwf-production" },
@@ -153,17 +162,12 @@ module "nwp_consumer_ecmwf_live_ecs_task" {
   ]
   container-secret_vars = [
   {secret_policy_arn:aws_secretsmanager_secret.nwp_consumer_secret.arn,
-  values: ["ECMWF_AWS_ACCESS_KEY", "ECMWF_AWS_ACCESS_SECRET"]
+  values: ["ECMWF_REALTIME_S3_ACCESS_KEY", "ECMWF_REALTIME_S3_ACCESS_SECRET"]
        }]
-  container-tag         = var.version-nwp
+  container-tag         = var.version-nwp-ecmwf
   container-name        = "openclimatefix/nwp-consumer"
   container-command     = [
-    "download",
-    "--source=ecmwf-s3",
-    "--sink=s3",
-    "--rdir=ecmwf/raw",
-    "--zdir=ecmwf/data",
-    "--create-latest"
+    "consume"
   ]
 }
 

diff --git a/terraform/india/development/variables.tf b/terraform/india/development/variables.tf
@@ -10,6 +10,12 @@ variable version-nwp {
   description = "Container image tag of the NWP consumer to use: openclimatefix/nwp-consumer"
 }
 
+variable version-nwp-ecmwf {
+  type = string
+  default = "1.0.9"
+  description = "Container image tag of the NWP consumer to use for ECMWF: openclimatefix/nwp-consumer"
+}
+
 variable version-india_api {
   type = string
   default = "0.1.0"

diff --git a/terraform/modules/services/airflow/dags/india/nwp-dag.py b/terraform/modules/services/airflow/dags/india/nwp-dag.py
@@ -87,7 +87,11 @@
             task_id="determine_latest_zarr_metoffice",
     )(bucket=f"india-nwp-{env}", prefix="metoffice/data")
 
-    latest_only >> nwp_consumer_ecmwf
+    rename_zarr_ecmwf = determine_latest_zarr.override(
+        task_id="determine_latest_zarr_ecmwf",
+    )(bucket=f'india-nwp-{env}', prefix='ecmwf/data')
+
+    latest_only >> rename_zarr_ecmwf >> nwp_consumer_ecmwf
     latest_only >> nwp_consumer_gfs
     latest_only >> nwp_consumer_metoffice >> rename_zarr_metoffice