??? fix errors ...

Author: syntron

OMPython/ModelicaSystem.py

@@ -131,7 +131,7 @@ def __init__(
             variableFilter: Optional[str] = None,
             customBuildDirectory: Optional[str | os.PathLike] = None,
             omhome: Optional[str] = None,
-            session: Optional[OMCSessionBase] = None
+            session: Optional[OMCSessionZMQ] = None
             ):
         """Initialize, load and build a model.
 
@@ -237,7 +237,7 @@ def setCommandLineOptions(self, commandLineOptions: str):
         exp = f'setCommandLineOptions("{commandLineOptions}")'
         self.sendExpression(exp)
 
-    def loadFile(self, fileName: Path):
+    def loadFile(self, fileName: pathlib.Path):
         # load file
         self.sendExpression(f'loadFile("{fileName.as_posix()}")')
 
@@ -460,7 +460,7 @@ def getContinuous(self, names=None):  # 4
                         raise ModelicaSystemError(f"{i} is not continuous")
                 return valuelist
 
-        raise ModelicaSystemError(f"Unhandled input for getContinous()")
+        raise ModelicaSystemError("Unhandled input for getContinous()")
 
     def getParameters(self, names: Optional[str | list[str]] = None) -> dict[str, str] | list[str]:  # 5
         """Get parameter values.
@@ -491,7 +491,7 @@ def getParameters(self, names: Optional[str | list[str]] = None) -> dict[str, st
         elif isinstance(names, list):
             return [self.paramlist.get(x, "NotExist") for x in names]
 
-        raise ModelicaSystemError(f"Unhandled input for getParameters()")
+        raise ModelicaSystemError("Unhandled input for getParameters()")
 
     def getInputs(self, names: Optional[str | list[str]] = None) -> dict | list:  # 6
         """Get input values.
@@ -527,7 +527,7 @@ def getInputs(self, names: Optional[str | list[str]] = None) -> dict | list:  #
         elif isinstance(names, list):
             return [self.inputlist.get(x, "NotExist") for x in names]
 
-        raise ModelicaSystemError(f"Unhandled input for getInputs()")
+        raise ModelicaSystemError("Unhandled input for getInputs()")
 
     def getOutputs(self, names: Optional[str | list[str]] = None):  # 7
         """Get output values.
@@ -707,7 +707,7 @@ def simulate(self, resultfile=None, simflags=None, timeout: Optional[int] = None
                 if float(self.simulateOptions["stopTime"]) != val[-1][0]:
                     raise ModelicaSystemError(f"stopTime not matched for Input {i}!")
             self.csvFile = self.createCSVData()  # create csv file
-            csvinput = " -csvInput=" + self.csvFile.as_posx()
+            csvinput = " -csvInput=" + self.csvFile.as_posix()
         else:
             csvinput = ""
 
@@ -925,7 +925,7 @@ def checkValidInputs(self, name):
             else:
                 ModelicaSystemError('Error!!! Value must be in tuple format')
 
-    def createCSVData(self) -> Path:
+    def createCSVData(self) -> pathlib.Path:
         start_time: float = float(self.simulateOptions["startTime"])
         stop_time: float = float(self.simulateOptions["stopTime"])
 
@@ -972,7 +972,7 @@ def createCSVData(self) -> Path:
             writer = csv.writer(f)
             writer.writerows(csv_rows)
 
-        return csvfile
+        return csvFile
 
     # to convert Modelica model to FMU
     def convertMo2Fmu(self, version="2.0", fmuType="me_cs", fileNamePrefix="<default>", includeResources=True):  # 19
@@ -1012,10 +1012,10 @@ def convertFmu2Mo(self, fmuName):  # 20
         fmuFileName = self.requestApi('importFMU', fmuName)
 
         # report proper error message
-        if not os.path.exists(fileName):
+        if not os.path.exists(fmuFileName):
             raise ModelicaSystemError(f"Missing FMU file {fmuFileName}")
 
-        return fileName
+        return fmuFileName
 
     # to optimize model
     def optimize(self):  # 21
@@ -1105,7 +1105,7 @@ def linearize(self, lintime: Optional[float] = None, simflags: Optional[str] = N
             linearFile = pathlib.Path(f'linear_{self.modelName}.py')
 
         if not linearFile.exists():
-            raise ModelicaSystemError(f"Linearization failed: {linearFile} not found: {errormsg}")
+            raise ModelicaSystemError(f"Linearization failed: {linearFile} not found!")
 
         # this function is called from the generated python code linearized_model.py at runtime,
         # to improve the performance by directly reading the matrices A, B, C and D from the julia code and avoid building the linearized modelica model

OMPython/OMCSession.py

@@ -116,9 +116,9 @@ def _ask(self, question: str, opt: Optional[list[str]] = None, parsed: Optional[
         if opt is None:
             expression = question
         elif isinstance(opt, list):
-            expression = f'{question}({','.join(opt)})'
+            expression = f"{question}({','.join(opt)})"
         else:
-            raise OMCSessionException(f"Invalid definition of options: {repr(opt)}")
+            raise OMCSessionException(f"Invalid definition of options for {repr(question)}: {repr(opt)}")
 
         p = (expression, parsed)
 
@@ -313,8 +313,6 @@ def __init__(self, readonly=False, timeout=10.00,
         if dockerExtraArgs is None:
             dockerExtraArgs = []
 
-        super().__init__(readonly=readonly)
-
         self.omhome = self._get_omhome(omhome=omhome)
 
         self._omc_process = None