Linked constants with kind

Author: Martin Ruefenacht

src/pympistandard/__init__.py

@@ -143,7 +143,7 @@ def _resolve_path(
     """Find correct path to load apis.json from."""
 
     if force_bundled:
-        with importlib.resources.path("pympistandard.data", "apis.json") as datapath:
+        with importlib.resources.path("pympistandard.data", "mpidb.json") as datapath:
             path = datapath
 
     # convert str path to Path
@@ -152,11 +152,11 @@ def _resolve_path(
 
     # use given path
     elif isinstance(given_path, Path):
-        path = given_path / "apis.json"
+        path = given_path / "mpidb.json"
 
     # use environment variable paths
     elif "MPISTANDARD" in os.environ:
-        path = Path(os.environ["MPISTANDARD"] + "/apis.json")
+        path = Path(os.environ["MPISTANDARD"] + "/mpidb.json")
 
     # else:
     #     raise RuntimeError(
@@ -167,7 +167,7 @@ def _resolve_path(
     else:
         # fallback to packaged data
         # AFTER 3.9 path = importlib.resources.files("pympistandard.data").joinpath("apis.json")
-        with importlib.resources.path("pympistandard.data", "apis.json") as datapath:
+        with importlib.resources.path("pympistandard.data", "mpidb.json") as datapath:
             path = datapath
 
     # require resolved path to exist
@@ -183,11 +183,6 @@ def _load_database_v1(path: Path) -> None:
 
     # TODO discover which files of our database are in path, apis.json, constants.json
 
-    with path.joinpath("constants.json").open() as constants_file:
-        for name, desc in dataset.items():
-            const = Constant(name, desc)
-            CONSTANTS[const.name] = const
-
     with path.open("r") as datafile:
         if path.suffix == ".json":
             dataset = json.load(datafile)
@@ -206,7 +201,7 @@ def _load_database_v1(path: Path) -> None:
             raise RuntimeError(f"Unrecognized suffix of data file {path}")
 
         # read in datafile
-        for name, desc in dataset.items():
+        for name, desc in dataset["procedures"].items():
             if desc["attributes"]["predefined_function"]:
                 predef = PredefinedFunction(name, desc)
                 PREDEFINED_FUNCTIONS[predef.name] = predef
@@ -218,3 +213,7 @@ def _load_database_v1(path: Path) -> None:
             else:
                 procedure = Procedure(name, desc)
                 PROCEDURES[procedure.name] = procedure
+
+        for name, desc in dataset["constants"].items():
+            const = Constant(name, desc)
+            CONSTANTS[name] = const

src/pympistandard/kind.py

@@ -7,10 +7,10 @@
 
 from dataclasses import dataclass
 from collections import defaultdict
-from typing import Optional, MutableMapping, TYPE_CHECKING
+from typing import Optional, MutableMapping, TYPE_CHECKING, List
 
 
-from .storage import CALLBACKS
+from .storage import CALLBACKS, CONSTANTS
 
 
 if TYPE_CHECKING:
@@ -106,7 +106,7 @@ def has_embiggenment(self) -> bool:
         return False
 
     @property
-    def callback(self) -> Optional['Callback']:
+    def callback(self) -> Optional["Callback"]:
         """Access the relevant Callback object for this Kind."""
 
         # NOTE this should eventually be non-optional, all FUNCTION KINDs will have a Callback
@@ -126,6 +126,12 @@ def callback(self) -> Optional['Callback']:
 
         return None
 
+    @property
+    def constants(self) -> List:
+        """Access all constants with this KIND."""
+
+        return [const for const in CONSTANTS.values() if const.kind == self]
+
     @property
     def express(self) -> KindExpressions:
         """Get the KindExpression object to express the Kind in a language."""