prepay_enabled_flip: filter by esco

cli's - pass through ENV

Author: chatch

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simt-emlite"
-version = "0.25.2"
+version = "0.25.3"
 description = "API and CLI for communicating with the Emlite meters via EMOP"
 authors = [{ name = "Chris Hatch", email = "[email protected]" }]
 requires-python = ">=3.13,<4.0"

simt_emlite/cli/emop.py

@@ -28,6 +28,8 @@
 FLY_API_TOKEN = config["fly_api_token"]
 FLY_REGION: str | None = cast(str | None, config["fly_region"])
 
+ENV: str | None = cast(str | None, config["env"])
+
 """
     This is a CLI wrapper around the mediator client.
 """
@@ -92,6 +94,7 @@ def __init__(
                     esco=esco_code,
                     serial=serial,
                     region=FLY_REGION,
+                    env=cast(str | None, ENV),
                 )
                 mediator_address = containers.mediator_address(meter_id, serial)
                 if not mediator_address:

simt_emlite/cli/mediators.py

@@ -37,6 +37,8 @@
 
 SIMT_EMLITE_IMAGE: str | int | None = config["simt_emlite_image"]
 
+ENV: str | int | None = config["env"]
+
 """
     This is a CLI for managing Emlite mediator processes.
 """
@@ -193,6 +195,7 @@ def create(self, serial: str, skip_confirm: bool = False) -> None:
             esco=meter["esco"],
             serial=serial,
             region=FLY_REGION,
+            env=cast(str | None, ENV)
         )
         containers_api.create(
             "simt_emlite.mediator.grpc.server",
@@ -286,6 +289,7 @@ def sync(self, serial: str) -> None:
             esco=meter["esco"],
             serial=serial,
             region=FLY_REGION,
+            env=cast(str | None, ENV),
         )
 
         mediator_address = containers_api.mediator_address(meter["id"], serial)
@@ -392,6 +396,7 @@ def _container_by_serial(self, serial: str):
             esco=meter["esco"],
             serial=serial,
             region=FLY_REGION,
+            env=cast(str | None, ENV),
         )
         container = containers_api.get(meter["id"])
         if container is None:
@@ -415,6 +420,7 @@ def _add_container_info_to_app_per_esco_meters(self, meters) -> None:
             containers_api = get_instance(
                 esco=esco_code,
                 region=FLY_REGION,
+                env=cast(str | None, ENV),
             )
             containers = containers_api.list()
 
@@ -440,6 +446,7 @@ def _add_container_info_to_app_per_serial_meters(self, meters) -> None:
                 is_single_meter_app=True,
                 serial=meter["serial"],
                 region=FLY_REGION,
+                env=cast(str | None, ENV),
             )
             containers = containers_api.list()
             container_matches = list(

simt_emlite/jobs/prepay_enabled_flip.py

@@ -125,9 +125,19 @@ def run_job(self, meter_row) -> bool:
     def run(self):
         self.log.info("Starting prepay_enabled_flip job...")
 
+        escos = (
+            self.supabase.table("escos").select("id").ilike("code", self.esco).execute()
+        )
+        if len(escos.data) == 0:
+            self.log.error("no esco found for " + self.esco)
+            sys.exit(10)
+
+        esco_id = list(escos.data)[0]["id"]
+
         meters_result = (
             self.flows_supabase.table("meter_registry")
             .select("*")
+            .eq("esco_id", esco_id)
             .eq("prepay_enabled", True)
             .neq("hardware", "P1.ax")
             .neq("hardware", "P1.cx")