[OMCSession] align definition of sendExpression() - use expr (was: command)

Author: syntron

OMPython/ModelicaSystem.py

@@ -561,7 +561,7 @@ def buildModel(self, variableFilter: Optional[str] = None):
 
     def sendExpression(self, expr: str, parsed: bool = True) -> Any:
         try:
-            retval = self._session.sendExpression(command=expr, parsed=parsed)
+            retval = self._session.sendExpression(expr=expr, parsed=parsed)
         except OMCSessionException as ex:
             raise ModelicaSystemError(f"Error executing {repr(expr)}: {ex}") from ex
 

OMPython/OMCSession.py

@@ -372,7 +372,7 @@ def _omc_resolve(self, pathstr: str) -> str:
                       'cd(omcpath_cwd)')
 
         try:
-            result = self._session.sendExpression(command=expression, parsed=False)
+            result = self._session.sendExpression(expr=expression, parsed=False)
             result_parts = result.split('\n')
             pathstr_resolved = result_parts[1]
             pathstr_resolved = pathstr_resolved[1:-1]  # remove quotes
@@ -573,7 +573,7 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
         The complete error handling of the OMC result is done within this method using '"getMessagesStringInternal()'.
         Caller should only check for OMCSessionException.
         """
-        return self.omc_process.sendExpression(command=command, parsed=parsed)
+        return self.omc_process.sendExpression(expr=command, parsed=parsed)
 
 
 class PostInitCaller(type):
@@ -856,9 +856,9 @@ def execute(self, command: str):
                       category=DeprecationWarning,
                       stacklevel=2)
 
-        return self.sendExpression(command, parsed=False)
+        return self.sendExpression(expr=command, parsed=False)
 
-    def sendExpression(self, command: str, parsed: bool = True) -> Any:
+    def sendExpression(self, expr: str, parsed: bool = True) -> Any:
         """
         Send an expression to the OMC server and return the result.
 
@@ -869,12 +869,12 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
         if self._omc_zmq is None:
             raise OMCSessionException("No OMC running. Please create a new instance of OMCSession!")
 
-        logger.debug("sendExpression(%r, parsed=%r)", command, parsed)
+        logger.debug("sendExpression(%r, parsed=%r)", expr, parsed)
 
         loop = self._timeout_loop(timestep=0.05)
         while next(loop):
             try:
-                self._omc_zmq.send_string(str(command), flags=zmq.NOBLOCK)
+                self._omc_zmq.send_string(str(expr), flags=zmq.NOBLOCK)
                 break
             except zmq.error.Again:
                 pass
@@ -888,7 +888,7 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
             logger.error(f"Docker did not start. Log-file says:\n{log_content}")
             raise OMCSessionException(f"No connection with OMC (timeout={self._timeout}).")
 
-        if command == "quit()":
+        if expr == "quit()":
             self._omc_zmq.close()
             self._omc_zmq = None
             return None
@@ -898,13 +898,13 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
         if result.startswith('Error occurred building AST'):
             raise OMCSessionException(f"OMC error: {result}")
 
-        if command == "getErrorString()":
+        if expr == "getErrorString()":
             # no error handling if 'getErrorString()' is called
             if parsed:
                 logger.warning("Result of 'getErrorString()' cannot be parsed!")
             return result
 
-        if command == "getMessagesStringInternal()":
+        if expr == "getMessagesStringInternal()":
             # no error handling if 'getMessagesStringInternal()' is called
             if parsed:
                 logger.warning("Result of 'getMessagesStringInternal()' cannot be parsed!")
@@ -958,7 +958,7 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
                 log_level = log_raw[0][8]
                 log_id = log_raw[0][9]
 
-                msg_short = (f"[OMC log for 'sendExpression({command}, {parsed})']: "
+                msg_short = (f"[OMC log for 'sendExpression({expr}, {parsed})']: "
                              f"[{log_kind}:{log_level}:{log_id}] {log_message}")
 
                 # response according to the used log level
@@ -980,7 +980,7 @@ def sendExpression(self, command: str, parsed: bool = True) -> Any:
                 msg_long_list.append(msg_long)
             if has_error:
                 msg_long_str = '\n'.join(f"{idx:02d}: {msg}" for idx, msg in enumerate(msg_long_list))
-                raise OMCSessionException(f"OMC error occurred for 'sendExpression({command}, {parsed}):\n"
+                raise OMCSessionException(f"OMC error occurred for 'sendExpression({expr}, {parsed}):\n"
                                           f"{msg_long_str}")
 
         if not parsed: