Merge pull request #12 from dnv-opensource/eis

Introduce structured variables to component-model

Author: Jorgelmh

.github/workflows/_test.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           python-version: ${{ matrix.python.version }}
       - name: Install the project
-        run: uv sync --upgrade -p ${{ matrix.python.version }} --no-dev
+        run: uv sync --upgrade -p ${{ matrix.python.version }} --no-dev --extra modelTest
       - name: Install pytest
         run: |
           uv pip install pytest

.github/workflows/_test_future.yml

@@ -28,7 +28,7 @@ jobs:
         with:
           python-version: ${{ matrix.python.version }}
       - name: Install the project
-        run: uv sync --upgrade -p ${{ matrix.python.uvpy }} --no-dev
+        run: uv sync --upgrade -p ${{ matrix.python.uvpy }} --no-dev --extra modelTest
       - name: Install pytest
         run: |
           uv pip install pytest

.vscode/extensions.json

@@ -38,9 +38,9 @@ def run(self):
         self.state.nested_parse(self.content, self.content_offset, assumption_node)
 
         if not hasattr(self.env, "assumption_all_assumptions"):
-            self.env.assumptions_all_assumptions = []
+            self.env.assumptions_all_assumptions = []  # type: ignore[attr-defined]
 
-        self.env.assumptions_all_assumptions.append(
+        self.env.assumptions_all_assumptions.append(  # type: ignore[attr-defined]
             {
                 "docname": self.env.docname,
                 "lineno": self.lineno,

.vscode/launch.json

@@ -25,7 +25,10 @@ def run(self):
         obj = importlib.import_module(sPkg + "." + sMod)
         while len(sObj):
             sSub, _, sObj = sObj.partition(".")
-            obj = getattr(obj, sSub, "not found")
+            if not hasattr(obj, sSub):
+                raise KeyError(f"Attribute {sSub} not found in {obj}") from None
+            else:
+                obj = getattr(obj, sSub)
         print(
             "INFO [" + self.arguments[0] + "] Type:",
             type(obj),
@@ -43,14 +46,14 @@ def run(self):
         elif isinstance(obj, (complex, float, int, str, list, dict, tuple)):  # no docstring
             text = str(obj).strip()
         else:  # if type(obj).__name__ in ('module','type','function') or isinstance( obj, type): # objects where docstring should be returned
-            text = obj.__doc__.strip()
+            text = obj.__doc__.strip() if obj.__doc__ is not None else ""
 
-        self.content = nodes.paragraph(text=text)
+        par = nodes.paragraph(text=text)
         if self.typ is None:  # need to parse the extracted text
             parNode = nodes.paragraph(text="")  # use an empty paragraph node as parent
-            self.state.nested_parse(self.content, 0, parNode)  # here the content of the retrieved text is parsed
+            self.state.nested_parse(par, 0, parNode)  # here the content of the retrieved text is parsed
         else:  # use the text as is
-            parNode = self.content
+            parNode = par
         return [parNode]
 
 

.vscode/settings.json

@@ -44,9 +44,9 @@ def run(self):
         self.state.nested_parse(self.content, self.content_offset, spec_node)
 
         if not hasattr(self.env, "spec_all_specs"):
-            self.env.spec_all_specs = []
+            self.env.spec_all_specs = []  # type: ignore[attr-defined]
 
-        self.env.spec_all_specs.append(
+        self.env.spec_all_specs.append(  # type: ignore[attr-defined]
             {
                 "docname": self.env.docname,
                 "lineno": self.lineno,

docs/_ext/assumption.py

@@ -41,9 +41,9 @@ def run(self):
         self.state.nested_parse(self.content, self.content_offset, spec_node)
 
         if not hasattr(self.env, "spec_all_specs"):
-            self.env.specs_all_specs = []
+            self.env.spec_all_specs = []  # type: ignore[attr-defined]
 
-        self.env.specs_all_specs.append(
+        self.env.specs_all_specs.append(  # type: ignore[attr-defined]
             {
                 "docname": self.env.docname,
                 "lineno": self.lineno,