FourCIPP 1.14.0__py3-none-any.whl → 1.16.0__py3-none-any.whl

fourcipp/fourc_input.py

@@ -41,8 +41,8 @@ from fourcipp.utils.dict_utils import (
     compare_nested_dicts_or_lists,
     sort_by_key_order,
 )
-from fourcipp.utils.not_set import NotSet, check_if_set
-from fourcipp.utils.typing import Path
+from fourcipp.utils.not_set import NOT_SET, check_if_set
+from fourcipp.utils.type_hinting import Path
 from fourcipp.utils.validation import ValidationError, validate_using_json_schema
 from fourcipp.utils.yaml_io import dump_yaml, load_yaml
 
@@ -289,7 +289,7 @@ class FourCInput:
                 f"Section '{key}' not set. Did out mean '{difflib.get_close_matches(key.upper(), self.all_sections_names, n=1, cutoff=0.3)[0]}'? The set sections are:\n - {sections}"
             )
 
-    def pop(self, key: str, default_value: Any = NotSet) -> Any:
+    def pop(self, key: str, default_value: Any = NOT_SET) -> Any:
         """Pop entry.
 
         Args:

fourcipp/legacy_io/__init__.py

@@ -27,7 +27,7 @@ from fourcipp.legacy_io.element import read_element, write_element
 from fourcipp.legacy_io.node import read_node, write_node
 from fourcipp.legacy_io.node_topology import read_node_topology, write_node_topology
 from fourcipp.legacy_io.particle import read_particle, write_particle
-from fourcipp.utils.typing import T
+from fourcipp.utils.type_hinting import T
 
 
 def _iterate_and_evaluate(function: Callable[..., T], iterable: Sequence) -> list[T]:

fourcipp/legacy_io/element.py

@@ -30,7 +30,7 @@ from fourcipp.legacy_io.inline_dat import (
     nested_casting_factory,
     to_dat_string,
 )
-from fourcipp.utils.typing import LineCastingDict
+from fourcipp.utils.type_hinting import LineCastingDict
 
 ElementCastingDict: TypeAlias = dict[str, dict[str, LineCastingDict]]
 

fourcipp/legacy_io/inline_dat.py

@@ -24,8 +24,8 @@
 from functools import partial
 from typing import Any
 
-from fourcipp.utils.metadata import METADATA_TO_PYTHON
-from fourcipp.utils.typing import (
+from fourcipp.utils.metadata import Primitive
+from fourcipp.utils.type_hinting import (
     Extractor,
     LineCastingDict,
     LineListExtractor,
@@ -34,7 +34,7 @@ from fourcipp.utils.typing import (
 )
 
 # Metadata types currently supported
-SUPPORTED_METADATA_TYPES = list(METADATA_TO_PYTHON.keys()) + ["vector", "enum"]
+SUPPORTED_METADATA_TYPES = Primitive.PRIMITIVE_TYPES + ["enum", "vector"]
 
 
 def to_dat_string(object: Any) -> str:
@@ -121,10 +121,12 @@ def _entry_casting_factory(spec: dict) -> LineListExtractor:
     Returns:
         Casting function for the spec
     """
-    if spec["type"] in METADATA_TO_PYTHON:
-        return partial(_extract_entry, extractor=METADATA_TO_PYTHON[spec["type"]])
+    if spec["type"] in Primitive.PRIMITIVE_TYPES_TO_PYTHON:
+        return partial(
+            _extract_entry, extractor=Primitive.PRIMITIVE_TYPES_TO_PYTHON[spec["type"]]
+        )
     elif spec["type"] == "vector":
-        value_type = METADATA_TO_PYTHON[spec["value_type"]["type"]]
+        value_type = Primitive.PRIMITIVE_TYPES_TO_PYTHON[spec["value_type"]["type"]]
         return partial(_extract_vector, extractor=value_type, size=spec["size"])
     elif spec["type"] == "enum":
         choices = [s["name"] for s in spec["choices"]]

fourcipp/legacy_io/particle.py

@@ -31,7 +31,7 @@ from fourcipp.legacy_io.inline_dat import (
     inline_dat_read,
     to_dat_string,
 )
-from fourcipp.utils.typing import LineCastingDict
+from fourcipp.utils.type_hinting import LineCastingDict
 
 _particle_casting = casting_factory(CONFIG.fourc_metadata["legacy_particle_specs"])
 

fourcipp/utils/cli.py

@@ -33,7 +33,7 @@ from fourcipp.utils.configuration import (
     change_profile,
     show_config,
 )
-from fourcipp.utils.typing import Path
+from fourcipp.utils.type_hinting import Path
 from fourcipp.utils.yaml_io import dump_yaml, load_yaml
 
 

fourcipp/utils/configuration.py

@@ -28,7 +28,7 @@ from dataclasses import dataclass, field
 
 from loguru import logger
 
-from fourcipp.utils.typing import Path
+from fourcipp.utils.type_hinting import Path
 from fourcipp.utils.yaml_io import dump_yaml, load_yaml
 
 CONFIG_PACKAGE: pathlib.Path = pathlib.Path(__file__).parents[1] / "config"