[ModelicaSystem] use OMCPath as possible input for provided paths

* __init__:fileName
* __init__:customBuildDirectory
* simulate:resultfile
* getSolutions:resultfile

Author: syntron

OMPython/ModelicaSystem.py

@@ -309,12 +309,12 @@ class ModelicaSystem:
 
     def __init__(
             self,
-            fileName: Optional[str | os.PathLike | pathlib.Path] = None,
+            fileName: Optional[str | os.PathLike | pathlib.Path | OMCPath] = None,
             modelName: Optional[str] = None,
             lmodel: Optional[list[str | tuple[str, str]]] = None,
             commandLineOptions: Optional[str] = None,
             variableFilter: Optional[str] = None,
-            customBuildDirectory: Optional[str | os.PathLike | pathlib.Path] = None,
+            customBuildDirectory: Optional[str | os.PathLike | pathlib.Path | OMCPath] = None,
             omhome: Optional[str] = None,
             omc_process: Optional[OMCProcessLocal] = None,
             build: bool = True,
@@ -396,7 +396,11 @@ def __init__(
 
         self._lmodel = lmodel  # may be needed if model is derived from other model
         self._model_name = modelName  # Model class name
-        self._file_name: Optional[OMCPath] = self._getconn.omcpath(fileName).resolve() if fileName is not None else None  # Model file/package name
+        if fileName is not None:
+            file_name = self._getconn.omcpath(fileName).resolve()
+        else:
+            file_name = None
+        self._file_name: Optional[OMCPath] = file_name  # Model file/package name
         self._simulated = False  # True if the model has already been simulated
         self._result_file: Optional[OMCPath] = None  # for storing result file
         self._variable_filter = variableFilter
@@ -460,16 +464,20 @@ def _loadLibrary(self, lmodel: list):
 
     def _set_work_directory(
             self,
-            customBuildDirectory: Optional[str | os.PathLike | pathlib.Path] = None,
+            customBuildDirectory: Optional[str | os.PathLike | pathlib.Path | OMCPath] = None,
     ) -> OMCPath:
         """
         Define a temporary directory to use.
         """
         # create a unique temp directory for each session and build the model in that directory
         if customBuildDirectory is not None:
-            if not os.path.exists(customBuildDirectory):
+            if os.path.exists(customBuildDirectory):
+                tempdir = self._getconn.omcpath(customBuildDirectory).absolute()
+            elif isinstance(customBuildDirectory, OMCPath):
+                tempdir = customBuildDirectory
+
+            if not tempdir.is_dir():
                 raise IOError(f"{customBuildDirectory} does not exist")
-            tempdir = self._getconn.omcpath(customBuildDirectory).absolute()
         else:
             tempdir = self._getconn.omcpath_tempdir().absolute()
             if not tempdir.is_dir():
@@ -1025,7 +1033,7 @@ def simulate_cmd(
 
     def simulate(
             self,
-            resultfile: Optional[str] = None,
+            resultfile: Optional[str | pathlib.Path | OMCPath] = None,
             simflags: Optional[str] = None,
             simargs: Optional[dict[str, Optional[str | dict[str, str]]]] = None,
             timeout: Optional[float] = None,
@@ -1051,10 +1059,12 @@ def simulate(
         if resultfile is None:
             # default result file generated by OM
             self._result_file = self.getWorkDirectory() / f"{self._model_name}_res.mat"
-        elif os.path.exists(resultfile):
-            self._result_file = self._getconn.omcpath(resultfile)
+        elif isinstance(resultfile, OMCPath):
+            self._result_file = resultfile
         else:
-            self._result_file = self.getWorkDirectory() / resultfile
+            self._result_file = self._getconn.omcpath(resultfile)
+            if not self._result_file.is_absolute():
+                self._result_file = self.getWorkDirectory() / resultfile
 
         if not isinstance(self._result_file, OMCPath):
             raise ModelicaSystemError(f"Invalid result file path: {self._result_file} - must be an OMCPath object!")
@@ -1087,7 +1097,7 @@ def simulate(
     def getSolutions(
             self,
             varList: Optional[str | list[str]] = None,
-            resultfile: Optional[str| pathlib.Path] = None,
+            resultfile: Optional[str | pathlib.Path | OMCPath] = None,
     ) -> tuple[str] | np.ndarray:
         """Extract simulation results from a result data file.