From e04ffb792cd987ff2b26ce4f78c2041cba81afee Mon Sep 17 00:00:00 2001
From: e-belfer <ella.belfer@catalyst.coop>
Date: Tue, 7 Jan 2025 10:18:00 -0500
Subject: [PATCH 1/2] Make it possible to pass another sources dict to
 DataSource

---
 src/pudl/metadata/classes.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pudl/metadata/classes.py b/src/pudl/metadata/classes.py
index 2939d47157..16691cd110 100644
--- a/src/pudl/metadata/classes.py
+++ b/src/pudl/metadata/classes.py
@@ -1035,20 +1035,22 @@ def to_rst(
             sys.stdout.write(rendered)
 
     @classmethod
-    def from_field_namespace(cls, x: str) -> list["DataSource"]:
+    def from_field_namespace(
+        cls, x: str, sources: dict[str, Any] = SOURCES
+    ) -> list["DataSource"]:
         """Return list of DataSource objects by field namespace."""
         return [
             cls(**cls.dict_from_id(name))
-            for name, val in SOURCES.items()
+            for name, val in sources.items()
             if val.get("field_namespace") == x
         ]
 
     @staticmethod
-    def dict_from_id(x: str) -> dict:
+    def dict_from_id(x: str, sources: dict[str, Any] = SOURCES) -> dict:
         """Look up the source by source name in the metadata."""
         # If ID ends with _xbrl strip end to find data source
         lookup_id = x.replace("_xbrl", "")
-        return {"name": x, **copy.deepcopy(SOURCES[lookup_id])}
+        return {"name": x, **copy.deepcopy(sources[lookup_id])}
 
     @classmethod
     def from_id(cls, x: str) -> "DataSource":
@@ -1285,6 +1287,7 @@ class Resource(PudlMeta):
             "pudl",
             "nrelatb",
             "vcerare",
+            "phmsagas",
         ]
         | None
     ) = None
@@ -1313,6 +1316,7 @@ class Resource(PudlMeta):
             "service_territories",
             "nrelatb",
             "vcerare",
+            "phmsagas",
         ]
         | None
     ) = None

From 6f3100e167bd1167d10dc09d578917d054b72c55 Mon Sep 17 00:00:00 2001
From: e-belfer <ella.belfer@catalyst.coop>
Date: Tue, 7 Jan 2025 13:03:15 -0500
Subject: [PATCH 2/2] Remove straggler PHMSA reference from other branch

---
 src/pudl/metadata/classes.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pudl/metadata/classes.py b/src/pudl/metadata/classes.py
index 16691cd110..3df06eedd6 100644
--- a/src/pudl/metadata/classes.py
+++ b/src/pudl/metadata/classes.py
@@ -1287,7 +1287,6 @@ class Resource(PudlMeta):
             "pudl",
             "nrelatb",
             "vcerare",
-            "phmsagas",
         ]
         | None
     ) = None
@@ -1316,7 +1315,6 @@ class Resource(PudlMeta):
             "service_territories",
             "nrelatb",
             "vcerare",
-            "phmsagas",
         ]
         | None
     ) = None