??? fix rebase fallout

Author: syntron

OMPython/ModelicaSystem.py

@@ -52,6 +52,7 @@
     OMCSessionRunData,
     OMCSessionZMQ,
     OMCProcess,
+    OMCProcessLocal,
     OMCPath,
 )
 
@@ -323,13 +324,10 @@ def parse_simflags(simflags: str) -> dict[str, Optional[str | dict[str, Any] | n
 class ModelicaSystem:
     def __init__(
             self,
-            fileName: Optional[str | os.PathLike] = None,
-            modelName: Optional[str] = None,
-            lmodel: Optional[list[str | tuple[str, str]]] = None,
             commandLineOptions: Optional[list[str]] = None,
             customBuildDirectory: Optional[str | os.PathLike] = None,
             omhome: Optional[str] = None,
-            omc_process: Optional[OMCProcessLocal] = None,
+            omc_process: Optional[OMCProcess] = None,
     ) -> None:
         """Create a ModelicaSystem instance. To define the model use model() or convertFmu2Mo().
 
@@ -379,9 +377,9 @@ def __init__(
             self.setCommandLineOptions(commandLineOptions=opt)
 
         self._simulated = False  # True if the model has already been simulated
-        self._result_file: Optional[pathlib.Path] = None  # for storing result file
+        self._result_file: Optional[OMCPath] = None  # for storing result file
 
-        self._work_dir: pathlib.Path = self.setWorkDirectory(customBuildDirectory)
+        self._work_dir: OMCPath = self.setWorkDirectory(customBuildDirectory)
 
         self._model_name: Optional[str] = None
         self._libraries: Optional[list[str | tuple[str, str]]] = None
@@ -391,7 +389,7 @@ def __init__(
     def model(
             self,
             name: str,
-            file: Optional[str | os.PathLike | pathlib.Path] = None,
+            file: Optional[str | os.PathLike] = None,
             libraries: Optional[list[str | tuple[str, str]]] = None,
             variable_filter: Optional[str] = None,
             build: bool = True,
@@ -441,7 +439,7 @@ def model(
         # set variables
         self._model_name = name  # Model class name
         self._libraries = libraries  # may be needed if model is derived from other model
-        self._file_name = pathlib.Path(file).resolve() if file is not None else None  # Model file/package name
+        self._file_name = self._session.omcpath(file).resolve() if file is not None else None  # Model file/package name
         self._variable_filter = variable_filter
 
         if self._file_name is not None and not self._file_name.is_file():  # if file does not exist
@@ -1152,15 +1150,15 @@ def plot(
         Plot a variable using OMC; this will work for local OMC usage only (OMCProcessLocal).
         """
 
-        if not isinstance(self._getconn.omc_process, OMCProcessLocal):
+        if not isinstance(self._session.omc_process, OMCProcessLocal):
             raise ModelicaSystemError("Plot is using the OMC plot functionality; "
                                       "thus, it is only working if OMC is running locally!")
 
         plot_result_file = None
         if resultfile is not None:
-            plot_result_file = pathlib.Path(resultfile)
+            plot_result_file = self._session.omcpath(resultfile)
         elif self._result_file is not None:
-            plot_result_file = pathlib.Path(self._result_file)
+            plot_result_file = self._session.omcpath(self._result_file)
         else:
             raise ModelicaSystemError("No resultfile available - either run simulate() before plotting "
                                       "or provide a result file!")
@@ -1921,18 +1919,21 @@ def __init__(
         ModelicaSystem.simulate(). Additionally, the path to store the result files is needed (= resultpath) as well as
         a list of parameters to vary for the Doe (= parameters). All possible combinations are considered.
         """
+        if modelName is None:
+            raise ModelicaSystemError("No model name provided!")
 
         self._mod = ModelicaSystem(
-            fileName=fileName,
-            modelName=modelName,
-            lmodel=lmodel,
             commandLineOptions=commandLineOptions,
-            variableFilter=variableFilter,
             customBuildDirectory=customBuildDirectory,
             omhome=omhome,
             omc_process=omc_process,
         )
-
+        self._mod.model(
+            file=fileName,
+            name=modelName,
+            libraries=lmodel,
+            variable_filter=variableFilter,
+        )
         self._model_name = modelName
 
         self._simargs = simargs

tests/test_ModelicaSystem.py

@@ -143,7 +143,7 @@ def test_customBuildDirectory(tmp_path, model_firstorder):
         file=filePath,
         name="M",
     )
-    assert pathlib.Path(m.getWorkDirectory()).resolve() == tmpdir.resolve()
+    assert pathlib.Path(mod.getWorkDirectory()).resolve() == tmpdir.resolve()
     result_file = tmpdir / "a.mat"
     assert not result_file.exists()
     mod.simulate(resultfile="a.mat")