Split readers into separate files

src/muse/__init__.py

@@ -96,14 +96,10 @@ def add_file_logger() -> None:
     "investments",
     "objectives",
     "outputs",
-    "read_agent_parameters",
+    "read_agents",
+    "read_existing_capacity",
     "read_global_commodities",
-    "read_initial_capacity",
-    "read_io_technodata",
-    "read_macro_drivers",
     "read_settings",
-    "read_technodictionary",
     "read_technologies",
-    "read_timeslice_shares",
     "sectors",
 ]

src/muse/agents/factories.py

@@ -167,7 +167,7 @@ def create_agent(agent_type: str, **kwargs) -> Agent:
 
 
 def agents_factory(
-    params_or_path: str | Path | list,
+    path: Path,
     capacity: xr.DataArray,
     technologies: xr.Dataset,
     regions: Sequence[str] | None = None,
@@ -178,12 +178,9 @@ def agents_factory(
     from copy import deepcopy
     from logging import getLogger
 
-    from muse.readers import read_agent_parameters
+    from muse.readers import read_agents
 
-    if isinstance(params_or_path, (str, Path)):
-        params = read_agent_parameters(params_or_path)
-    else:
-        params = params_or_path
+    params = read_agents(path)
     assert isinstance(capacity, xr.DataArray)
     if year is None:
         year = int(capacity.year.min())

src/muse/commodities.py

@@ -14,10 +14,10 @@
 
 def setup_module(commodities_path: Path):
     """Sets up global commodities."""
-    from muse.readers.csv import read_global_commodities
+    from muse.readers.csv import read_commodities
 
     global COMMODITIES
-    COMMODITIES = read_global_commodities(commodities_path)
+    COMMODITIES = read_commodities(commodities_path)
 
 
 class CommodityUsage(IntFlag):

src/muse/examples.py

@@ -144,7 +144,7 @@ def technodata(sector: str, model: str = "default") -> xr.Dataset:
     """Technology for a sector of a given example model."""
     from tempfile import TemporaryDirectory
 
-    from muse.readers.toml import read_settings, read_technodata
+    from muse.readers.toml import read_sector_technodata, read_settings
 
     sector = sector.lower()
     allowed = {"residential", "power", "gas", "preset"}
@@ -155,7 +155,7 @@ def technodata(sector: str, model: str = "default") -> xr.Dataset:
     with TemporaryDirectory() as tmpdir:
         path = copy_model(model, tmpdir)
         settings = read_settings(path / "settings.toml")
-        return read_technodata(settings, sector)
+        return read_sector_technodata(settings, sector)
 
 
 def search_space(sector: str, model: str = "default") -> xr.DataArray:

src/muse/readers/__init__.py

@@ -1,8 +1,9 @@
 """Aggregates methods to read data from file."""
 
 from muse.defaults import DATA_DIRECTORY
-from muse.readers.csv import *  # noqa: F403
-from muse.readers.toml import read_settings  # noqa: F401
+
+from .csv import *  # noqa: F403
+from .toml import read_settings  # noqa: F401
 
 DEFAULT_SETTINGS_PATH = DATA_DIRECTORY / "default_settings.toml"
 """Default settings path."""