V3.2

Author: willgebhardt

ngcsimlib/__init__.py

@@ -1,5 +1,4 @@
 from ngcsimlib._src.component import Component as Component
-from ngcsimlib._src.process import Process
-
-import ngcsimlib.operations
-
+from ngcsimlib._src.process.methodProcess import MethodProcess
+from ngcsimlib._src.process.jointProcess import JointProcess
+from ngcsimlib._src.deprecators import deprecated, deprecate_args

ngcsimlib/_src/compartment/compartment.py

@@ -27,14 +27,18 @@ class Compartment(metaclass=CompartmentMeta):
 
         fixed (default=False): sets the flag for if this compartment is fixed.
     """
-    def __init__(self, initial_value: T, fixed: bool = False):
+    def __init__(self, initial_value: T, fixed: bool = False,
+                 display_name=None, units=None):
         self._initial_value = initial_value
 
         self.name = None
         self._root_target = None
         self._target = self._root_target
         self._fixed = fixed
 
+        self.display_name = display_name
+        self.units = units
+
     @property
     def root(self):
         return self._root_target
@@ -67,7 +71,11 @@ def set(self, value: T) -> None:
         Args:
             value: The value to set in the global state.
         """
-        if self._fixed:
+        if self.target is None:
+            self._initial_value = value
+            return
+
+        if self._fixed and gState.check_key(self.target):
             warn(f"Attempting to set {self._root_target} which is a fixed compartment. Aborting!")
             return
         if self.target != self._root_target:
@@ -87,6 +95,9 @@ def get_needed_keys(self):
         return set(self.target)
 
     def _get_value(self):
+        if self.target is None:
+            return self._initial_value
+
         if isinstance(self.target, BaseOp):
             return self.target.get()
 

ngcsimlib/_src/parser/contextTransformer.py

@@ -113,13 +113,49 @@ def visit_Expr(self, node):
 
         return node
 
+    @staticmethod
+    def _resolve_self_attr_chain_and_path(attr_node: ast.Attribute):
+        """
+        Returns (base_is_self, attr_chain: List[str])
+        e.g., self.foo.targeted -> (True, ['foo', 'targeted'])
+        """
+        chain = []
+        node = attr_node
+        while isinstance(node, ast.Attribute):
+            chain.insert(0, node.attr)
+            node = node.value
+
+        is_self = isinstance(node, ast.Name) and node.id == "self"
+        return is_self, chain if is_self else None
+
     def visit_If(self, node):
+        parent_map = {}
+        for parent in ast.walk(node.test):
+            for child in ast.iter_child_nodes(parent):
+                parent_map[child] = parent
+
         for n in ast.walk(node.test):
             if isinstance(n, ast.Attribute):
-                if isinstance(n.value, ast.Name) and n.value.id == "self":
-                    attr = getattr(self.obj, n.attr, None)
-                    if isinstance(attr, Compartment):
-                        raise RuntimeError("Conditionals can not be dependant on model state")
+                if isinstance(parent_map.get(n), ast.Attribute):
+                    continue
+
+                is_self, chain = self._resolve_self_attr_chain_and_path(n)
+                if not is_self or not chain:
+                    continue
+
+                if chain[-1] == "targeted":
+                    continue
+
+                target = self.obj
+                try:
+                    for attr in chain:
+                        target = getattr(target, attr)
+                except AttributeError:
+                    continue
+
+                if isinstance(target, Compartment) and not target.fixed:
+                    raise RuntimeError(f"{self.obj.name}:{self.method.__name__}:[{target.root}], Conditionals can not be dependant on model state")
+
 
         condition_expr = ast.Expression(node.test)
         compiled = compile(ast.fix_missing_locations(condition_expr), "<ast>", "eval")

ngcsimlib/_src/parser/utils.py

@@ -44,7 +44,12 @@ def __call__(self, *args, **kwargs):
         return self._fn(*args, **kwargs)
 
 def _bind(obj, method, ast_obj, namespace=None, auxiliary_ast=None):
-    code = compile(ast_obj, filename=f"{method.__name__}_compiled", mode='exec')
+    try:
+        code = compile(ast_obj, filename=f"{method.__name__}_compiled", mode='exec')
+    except Exception as e:
+        print(obj)
+        print(method)
+        raise e
     namespace = method.__globals__.copy() if namespace is None else namespace
     exec(code, namespace)