Merge pull request #171 from thegridelectric/dev

0.5.6 -- gnrmic_tx -> amq.topic etc

Author: jessicamillar

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gridworks-base"
-version = "0.5.5"
+version = "0.5.6"
 description = "Gridworks Base"
 readme = "README.md"
 authors = [

rabbit/rabbitconfig/dev_definitions.json

@@ -167,6 +167,14 @@
       "routing_key": "rjb.#",
       "source": "timemic_tx",
       "vhost": "d1__1"
+    },
+    {
+      "arguments": {},
+      "destination": "amq.topic",
+      "destination_type": "exchange",
+      "routing_key": "rjb.#",
+      "source": "gnrmic_tx",
+      "vhost": "d1__1"
     }
   ],
   "exchanges": [

rabbit/rabbitconfig/prod_definitions.json …bit/rabbitconfig/hybrid_definitions.jsonrabbit/rabbitconfig/prod_definitions.json renamed to rabbit/rabbitconfig/hybrid_definitions.json rabbit/rabbitconfig/prod_definitions.json renamed to rabbit/rabbitconfig/hybrid_definitions.json

@@ -167,6 +167,14 @@
       "routing_key": "rjb.#",
       "source": "timemic_tx",
       "vhost": "hw1__1"
+    },
+    {
+      "arguments": {},
+      "destination": "amq.topic",
+      "destination_type": "exchange",
+      "routing_key": "rjb.#",
+      "source": "gnrmic_tx",
+      "vhost": "hw1__1"
     }
   ],
   "exchanges": [

src/gwbase/rabbit_definitions.py

@@ -20,13 +20,15 @@
 # The committed broker-definitions artifacts: filename -> build kwargs.
 # Single source for both the generator (writes them) and the CI drift-guard
 # (test_definitions_drift.py regenerates and diffs). Dev carries the
-# non-secret smqPublic credential; prod carries none (injected at deploy).
+# non-secret smqPublic credential; hybrid carries none (injected at deploy).
+# A vhost is `<universe>__<run>` — run 1 of each universe here; provisioning
+# a further run of a universe (hw1__2, …) regenerates with that vhost.
 DEFINITION_ARTIFACTS: list[tuple[str, dict[str, Any]]] = [
     (
         "dev_definitions.json",
         {"vhost": "d1__1", "user": "smqPublic", "password": "smqPublic"},
     ),
-    ("prod_definitions.json", {"vhost": "hw1__1"}),
+    ("hybrid_definitions.json", {"vhost": "hw1__1"}),
 ]
 
 # Fixed 4-byte salt so the dev password hash is deterministic (the dev

src/gwbase/topology.py

@@ -130,6 +130,18 @@ def exchange_bindings() -> list[BindingSpec]:
             f"{MessageCategory.JsonBroadcast.value}.#",
         )
     )
+    # Same bridge for the grid-node-registry's BROADCASTS (`g.node.forest`
+    # topology changes, radio_channel = the audience-known alias), so
+    # MQTT-native actors can passively hear ancestor renames too. The forest
+    # carries aliases + immutable ids only — never coordinates — so it is
+    # safe to cross to the MQTT side.
+    bindings.append(
+        BindingSpec(
+            publish_exchange(RoutingClass.GridNodeRegistry),
+            AMQP_TOPIC,
+            f"{MessageCategory.JsonBroadcast.value}.#",
+        )
+    )
     return bindings
 
 

src/gwbase/transport_encoding.py

@@ -11,7 +11,20 @@
 class TransportClass(StrEnum):
     """Closed taxonomy of routable classes on the rabbit transport. This
     is NOT Sema vocabulary; in particular ``Supervisor`` is not a member of
-    ``gw.g.node.class`` because a Supervisor is not a GNode."""
+    ``gw.g.node.class`` because a Supervisor is not a GNode.
+
+    Actor-tier map (which runtime tier a class rides):
+
+    - **Orchestrator (non-GNode, ServiceSettings):** ``Supervisor``,
+      ``TimeCoordinator``, ``GridNodeRegistry`` — orchestration/infra
+      participants with no ``g.node.gt`` identity file at boot.
+    - **GridworksActor (GNode identity):** ``TerminalAsset``,
+      ``LeafTransactiveNode``, ``MarketMaker``, ``PriceForecastService``,
+      ``WeatherForecastService``.
+    - **No gwbase runtime:** ``Scada`` (MQTT-native, reached via
+      ``amq.topic``) and ``ConnectivityNode`` (passive — a map vertex,
+      not an actor).
+    """
 
     TerminalAsset = "TerminalAsset"
     LeafTransactiveNode = "LeafTransactiveNode"

tests/test_rabbit_definitions.py

@@ -35,7 +35,7 @@ def test_dev_definitions_include_user_and_permissions() -> None:
     ]
 
 
-def test_prod_definitions_have_no_baked_credential() -> None:
+def test_hybrid_definitions_have_no_baked_credential() -> None:
     d = build_definitions(vhost="hw1__1")
     assert d["vhosts"] == [{"name": "hw1__1"}]
     assert d["users"] == []

tests/test_topology.py

@@ -55,8 +55,9 @@ def test_exchanges_cover_ear_plus_a_pair_per_class() -> None:
 def test_bindings_cover_edges_and_ear_taps() -> None:
     bindings = topo.exchange_bindings()
     # one per routing edge, plus one ear tap per AMQP class, plus the
-    # amq.topic ear tap, plus the timemic -> amq.topic MQTT bridge tap
-    assert len(bindings) == len(topo.ROUTING_EDGES) + len(topo.AMQP_ACTOR_CLASSES) + 2
+    # amq.topic ear tap, plus the timemic and gnrmic -> amq.topic MQTT
+    # bridge taps
+    assert len(bindings) == len(topo.ROUTING_EDGES) + len(topo.AMQP_ACTOR_CLASSES) + 3
 
     # a known direct edge: ltnmic_tx -> super_tx on *.*.ltn.*.super.*
     assert any(
@@ -78,3 +79,11 @@ def test_bindings_cover_edges_and_ear_taps() -> None:
         and b.routing_key == "rjb.#"
         for b in bindings
     )
+    # registry broadcasts (g.node.forest) cross too, so MQTT-native actors
+    # can passively hear ancestor renames
+    assert any(
+        b.source == "gnrmic_tx"
+        and b.destination == "amq.topic"
+        and b.routing_key == "rjb.#"
+        for b in bindings
+    )