WiP WiP-check2

Author: syntron

.github/workflows/Test.yml

@@ -14,9 +14,9 @@ jobs:
     timeout-minutes: 30
     strategy:
       matrix:
-        python-version: ['3.10', '3.12', '3.13']
+        python-version: ['3.13']
         os: ['ubuntu-latest', 'windows-latest']
-        omc-version: ['stable', 'nightly']
+        omc-version: ['stable']
 
     steps:
       - uses: actions/checkout@v6

OMPython/ModelicaSystem.py

@@ -21,16 +21,18 @@
 import numpy as np
 
 from OMPython.OMCSession import (
-    ModelExecutionData,
     ModelExecutionException,
-
-    OMCPath,
-    OMCSession,
-    OMCSessionDummy,
-    OMCSessionException,
+    ModelExecutionData,
+    PathBase,
+    SessionBase,
+    SessionRunner,
     OMCSessionLocal,
+    OMCSessionException,
 )
 
+OMCPath = PathBase
+OMCSession = SessionBase
+
 # define logger using the current module name as ID
 logger = logging.getLogger(__name__)
 
@@ -1665,8 +1667,6 @@ def buildModel(self, variableFilter: Optional[str] = None):
     def sendExpression(self, expr: str, parsed: bool = True) -> Any:
         """
         Wrapper for OMCSession.sendExpression().
-
-        TODO: rename expr => command
         """
         try:
             retval = self._session.sendExpression(command=expr, parsed=parsed)
@@ -2244,8 +2244,6 @@ def prepare(self) -> int:
             build_dir.mkdir()
             self._mod.setWorkDirectory(work_directory=build_dir)
 
-            # TODO: check omc_mod
-
             sim_param_structure = {}
             for idx_structure, pk_structure in enumerate(param_structure.keys()):
                 sim_param_structure[pk_structure] = pc_structure[idx_structure]
@@ -2423,7 +2421,6 @@ def worker(worker_id, task_queue):
     def get_doe_solutions(
             self,
             var_list: Optional[list] = None,
-            # TODO: omc_mod
     ) -> Optional[tuple[str] | dict[str, dict[str, np.ndarray]]]:
         """
         Get all solutions of the DoE run. The following return values are possible:
@@ -2453,8 +2450,6 @@ def get_doe_solutions(
         if len(self._doe_def) == 0:
             raise ModelicaSystemError("No result files available - all simulations did fail?")
 
-        # TODO: check omc_mod
-
         sol_dict: dict[str, dict[str, Any]] = {}
         for resultfilename in self._doe_def:
             resultfile = self._resultpath / resultfilename
@@ -2495,12 +2490,12 @@ class ModelicaSystemRunner(ModelicaSystemBase):
     def __init__(
             self,
             work_directory: Optional[str | os.PathLike] = None,
-            session: Optional[OMCSession] = None,
+            session: Optional[SessionBase] = None,
     ) -> None:
         if session is None:
-            session = OMCSessionDummy()
+            session = SessionRunner()
 
-        if not isinstance(session, OMCSessionDummy):
+        if not isinstance(session, SessionRunner):
             raise ModelicaSystemError("Only working if OMCsessionDummy is used!")
 
         super().__init__(