??? rename [OMCSessionBase] => [OMCSessionCmd]; remove dependencies

Author: syntron

OMPython/ModelicaSystem.py

@@ -46,7 +46,7 @@
 from dataclasses import dataclass
 from typing import Optional
 
-from OMPython.OMCSession import OMCSessionBase, OMCSessionZMQ, OMCSessionException
+from OMPython.OMCSession import OMCSessionZMQ, OMCSessionException
 
 # define logger using the current module name as ID
 logger = logging.getLogger(__name__)

OMPython/OMCSession.py

@@ -3,6 +3,8 @@
 Definition of an OMC session.
 """
 
+from __future__ import annotations
+
 __license__ = """
  This file is part of OpenModelica.
 
@@ -81,9 +83,10 @@ class OMCSessionException(Exception):
 
 
 # noinspection PyPep8Naming
-class OMCSessionBase(metaclass=abc.ABCMeta):
+class OMCSessionCmd:
 
-    def __init__(self, readonly=False):
+    def __init__(self, session: OMCSessionZMQ, readonly=False):
+        self._session = session
         self._readonly = readonly
         self._omc_cache = {}
 
@@ -127,7 +130,7 @@ def _ask(self, question: str, opt: Optional[list[str]] = None, parsed: Optional[
         logger.debug('OMC ask: %s (parsed=%s)', expression, parsed)
 
         try:
-            res = self.sendExpression(expression, parsed=parsed)
+            res = self._session.sendExpression(expression, parsed=parsed)
         except OMCSessionException as ex:
             raise OMCSessionException("OMC ask failed: %s (parsed=%s)", expression, parsed) from ex
 
@@ -302,7 +305,7 @@ def getClassNames(self, className=None, recursive=False, qualified=False, sort=F
 
 
 # noinspection PyPep8Naming
-class OMCSessionZMQ(OMCSessionBase):
+class OMCSessionZMQ:
 
     def __init__(self, readonly=False, timeout=10.00,
                  docker=None, dockerContainer=None, dockerExtraArgs=None, dockerOpenModelicaPath="omc",

OMPython/__init__.py

@@ -38,7 +38,7 @@
 
 import logging
 
-from OMPython.OMCSession import OMCSessionBase, OMCSessionZMQ, OMCSessionException
+from OMPython.OMCSession import OMCSessionCmd, OMCSessionZMQ, OMCSessionException
 from OMPython.ModelicaSystem import ModelicaSystem, ModelicaSystemError, LinearizationResult
 
 
@@ -67,5 +67,5 @@ def ompython_log_definiton():
 
     'OMCSessionException',
     'OMCSessionZMQ',
-    'OMCSessionBase',
+    'OMCSessionCmd',
 ]