fix circular dependency issue with Config

Author: robtaylor

chipflow_lib/__init__.py

@@ -8,7 +8,6 @@
 import sys
 import tomli
 from pathlib import Path
-from pydantic import ValidationError
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -52,8 +51,15 @@ def _ensure_chipflow_root():
     return _ensure_chipflow_root.root  #type: ignore
 
 
+def _get_src_loc(src_loc_at=0):
+      frame = sys._getframe(1 + src_loc_at)
+      return (frame.f_code.co_filename, frame.f_lineno)
+
+
+
 def _parse_config() -> 'Config':
     """Parse the chipflow.toml configuration file."""
+    from .config import _parse_config_file
     chipflow_root = _ensure_chipflow_root()
     config_file = Path(chipflow_root) / "chipflow.toml"
     try:
@@ -62,29 +68,3 @@ def _parse_config() -> 'Config':
        raise ChipFlowError(f"Config file not found. I expected to find it at {config_file}")
     except tomli.TOMLDecodeError as e:
         raise ChipFlowError(f"TOML Error found when loading {config_file}: {e.msg} at line {e.lineno}, column {e.colno}")
-
-
-def _parse_config_file(config_file) -> 'Config':
-    """Parse a specific chipflow.toml configuration file."""
-
-    with open(config_file, "rb") as f:
-        config_dict = tomli.load(f)
-
-    try:
-        # Validate with Pydantic
-        return Config.model_validate(config_dict)  # Just validate the config_dict
-    except ValidationError as e:
-        # Format Pydantic validation errors in a user-friendly way
-        error_messages = []
-        for error in e.errors():
-            location = ".".join(str(loc) for loc in error["loc"])
-            message = error["msg"]
-            error_messages.append(f"Error at '{location}': {message}")
-
-        error_str = "\n".join(error_messages)
-        raise ChipFlowError(f"Validation error in chipflow.toml:\n{error_str}")
-
-def _get_src_loc(src_loc_at=0):
-      frame = sys._getframe(1 + src_loc_at)
-      return (frame.f_code.co_filename, frame.f_lineno)
-

chipflow_lib/config.py

@@ -2,9 +2,38 @@
 import os
 
 
+import tomli
+from pydantic import ValidationError
+
+from . import ChipFlowError
+from .config_models import Config
+
 def get_dir_models():
     return os.path.dirname(__file__) + "/models"
 
 
 def get_dir_software():
     return os.path.dirname(__file__) + "/software"
+
+
+def _parse_config_file(config_file) -> 'Config':
+    """Parse a specific chipflow.toml configuration file."""
+
+    with open(config_file, "rb") as f:
+        config_dict = tomli.load(f)
+
+    try:
+        # Validate with Pydantic
+        return Config.model_validate(config_dict)  # Just validate the config_dict
+    except ValidationError as e:
+        # Format Pydantic validation errors in a user-friendly way
+        error_messages = []
+        for error in e.errors():
+            location = ".".join(str(loc) for loc in error["loc"])
+            message = error["msg"]
+            error_messages.append(f"Error at '{location}': {message}")
+
+        error_str = "\n".join(error_messages)
+        raise ChipFlowError(f"Validation error in chipflow.toml:\n{error_str}")
+
+