[OMCCmd] session => omc_process

Author: syntron

OMPython/OMCSession.py

@@ -99,10 +99,10 @@ class OMCCmd:
     Implementation of Open Modelica Compiler API functions. Depreciated!
     """
 
-    def __init__(self, session: OMCSessionZMQ, readonly: bool = False):
-        if not isinstance(session, OMCSessionZMQ):
-            raise OMCProcessException("Invalid session definition!")
-        self._session = session
+    def __init__(self, omc_process: OMCProcess, readonly: bool = False):
+        if not isinstance(omc_process, OMCProcess):
+            raise OMCProcessException("Invalid OMC process definition!")
+        self._omc_process = omc_process
         self._readonly = readonly
         self._omc_cache: dict[tuple[str, bool], Any] = {}
 
@@ -123,7 +123,7 @@ def _ask(self, question: str, opt: Optional[list[str]] = None, parsed: bool = Tr
                 return self._omc_cache[p]
 
         try:
-            res = self._session.sendExpression(expression, parsed=parsed)
+            res = self._omc_process.sendExpression(expression, parsed=parsed)
         except OMCProcessException as ex:
             raise OMCProcessException(f"OMC _ask() failed: {expression} (parsed={parsed})") from ex
 

tests/test_OMSessionCmd.py

@@ -3,7 +3,7 @@
 
 def test_isPackage():
     omczmq = OMPython.OMCSessionZMQ()
-    omccmd = OMPython.OMCCmd(session=omczmq)
+    omccmd = OMPython.OMCCmd(omc_process=omczmq)
     assert not omccmd.isPackage('Modelica')
 
 
@@ -13,7 +13,7 @@ def test_isPackage2():
         model_name="Modelica.Electrical.Analog.Examples.CauerLowPassAnalog",
         libraries=["Modelica"],
     )
-    omccmd = OMPython.OMCCmd(session=mod.get_omc_process())
+    omccmd = OMPython.OMCCmd(omc_process=mod.get_omc_process())
     assert omccmd.isPackage('Modelica')