Fix SchemePointer bug

src/ansys/fluent/core/fluent_connection.py

@@ -208,6 +208,11 @@ def __init__(
 
         self._scheme_eval_service = SchemeEvalService(self._channel, self._metadata)
         self.scheme_eval = SchemeEval(self._scheme_eval_service)
+        try:
+            version = self.scheme_eval.string_eval("(cx-version)")
+            self.scheme_eval.version = ".".join(version.strip("()").split()[0:2])
+        except Exception:  # for pypim launch
+            self.scheme_eval.version = "23.1"
 
         self._cleanup_on_exit = cleanup_on_exit
         self._start_transcript = start_transcript

src/ansys/fluent/core/services/scheme_eval.py

@@ -65,20 +65,20 @@ def __init__(self, str: str):
         self.str = str
 
 
-def _convert_pair_to_scheme_pointer(val: Tuple[Any, Any], p: SchemePointer):
-    _convert_py_value_to_scheme_pointer(val[0], p.pair.car)
-    _convert_py_value_to_scheme_pointer(val[1], p.pair.cdr)
+def _convert_pair_to_scheme_pointer(val: Tuple[Any, Any], p: SchemePointer, version):
+    _convert_py_value_to_scheme_pointer(val[0], p.pair.car, version)
+    _convert_py_value_to_scheme_pointer(val[1], p.pair.cdr, version)
 
 
 def _convert_list_of_pairs_to_scheme_pointer(
-    val: List[Tuple[Any, Any]], p: SchemePointer
+    val: List[Tuple[Any, Any]], p: SchemePointer, version
 ):
     if len(val) > 0:
-        _convert_pair_to_scheme_pointer(val[0], p.pair.car)
-        _convert_list_of_pairs_to_scheme_pointer(val[1:], p.pair.cdr)
+        _convert_pair_to_scheme_pointer(val[0], p.pair.car, version)
+        _convert_list_of_pairs_to_scheme_pointer(val[1:], p.pair.cdr, version)
 
 
-def _convert_py_value_to_scheme_pointer(val: Any, p: SchemePointer):
+def _convert_py_value_to_scheme_pointer(val: Any, p: SchemePointer, version):
     """Convert Python datatype to Scheme pointer."""
     if isinstance(val, bool):
         p.b = val
@@ -91,25 +91,37 @@ def _convert_py_value_to_scheme_pointer(val: Any, p: SchemePointer):
     elif isinstance(val, Symbol):
         p.sym = val.str
     elif isinstance(val, tuple) and len(val) == 2:
-        _convert_py_value_to_scheme_pointer(val[0], p.pair.car)
-        _convert_py_value_to_scheme_pointer(val[1], p.pair.cdr)
+        _convert_py_value_to_scheme_pointer(val[0], p.pair.car, version)
+        _convert_py_value_to_scheme_pointer(val[1], p.pair.cdr, version)
     elif isinstance(val, list) or isinstance(val, tuple):
-        if val:
-            val = list(val)
-            _convert_py_value_to_scheme_pointer(val[0], p.pair.car)
-            _convert_py_value_to_scheme_pointer(val[1:], p.pair.cdr)
+        if version < "23.1":
+            if val:
+                val = list(val)
+                _convert_py_value_to_scheme_pointer(val[0], p.pair.car, version)
+                _convert_py_value_to_scheme_pointer(val[1:], p.pair.cdr, version)
+        else:
+            for item in val:
+                _convert_py_value_to_scheme_pointer(item, p.list.item.add(), version)
     elif isinstance(val, dict):
-        as_list = list(val.items())
-        if as_list:
-            _convert_pair_to_scheme_pointer(as_list[0], p.pair.car)
-            _convert_list_of_pairs_to_scheme_pointer(as_list[1:], p.pair.cdr)
+        if version < "23.1":
+            as_list = list(val.items())
+            if as_list:
+                _convert_pair_to_scheme_pointer(as_list[0], p.pair.car, version)
+                _convert_list_of_pairs_to_scheme_pointer(
+                    as_list[1:], p.pair.cdr, version
+                )
+        else:
+            for k, v in val.items():
+                item = p.list.item.add()
+                _convert_py_value_to_scheme_pointer(k, item.pair.car, version)
+                _convert_py_value_to_scheme_pointer(v, item.pair.cdr, version)
 
 
-def _convert_scheme_pointer_to_py_list(p: SchemePointer):
+def _convert_scheme_pointer_to_py_list(p: SchemePointer, version):
     val = []
-    val.append(_convert_scheme_pointer_to_py_value(p.pair.car))
+    val.append(_convert_scheme_pointer_to_py_value(p.pair.car, version))
     if p.pair.cdr.HasField("pair"):
-        tail = _convert_scheme_pointer_to_py_list(p.pair.cdr)
+        tail = _convert_scheme_pointer_to_py_list(p.pair.cdr, version)
         val.extend([tail] if isinstance(tail, dict) else tail)
     if all(
         isinstance(x, dict)
@@ -130,7 +142,7 @@ def _convert_scheme_pointer_to_py_list(p: SchemePointer):
     return val
 
 
-def _convert_scheme_pointer_to_py_value(p: SchemePointer):
+def _convert_scheme_pointer_to_py_value(p: SchemePointer, version):
     """Convert Scheme pointer to Python datatype."""
     if p.HasField("b"):
         return p.b
@@ -145,17 +157,38 @@ def _convert_scheme_pointer_to_py_value(p: SchemePointer):
     elif p.HasField("sym"):
         return Symbol(p.sym)
     elif p.HasField("pair"):
-        if any(
-            p.pair.cdr.HasField(x)
-            for x in ["b", "fixednum", "flonum", "c", "str", "sym"]
-        ):
+        if version < "23.1":
+            if any(
+                p.pair.cdr.HasField(x)
+                for x in ["b", "fixednum", "flonum", "c", "str", "sym"]
+            ):
+                return (
+                    _convert_scheme_pointer_to_py_value(p.pair.car, version),
+                    _convert_scheme_pointer_to_py_value(p.pair.cdr, version),
+                )
+            else:
+                val = _convert_scheme_pointer_to_py_list(p, version)
+                return val
+        else:
             return (
-                _convert_scheme_pointer_to_py_value(p.pair.car),
-                _convert_scheme_pointer_to_py_value(p.pair.cdr),
+                _convert_scheme_pointer_to_py_value(p.pair.car, version),
+                _convert_scheme_pointer_to_py_value(p.pair.cdr, version),
             )
+    elif p.HasField("list"):
+        is_dict = all(item.HasField("pair") for item in p.list.item)
+        if is_dict:
+            return {
+                _convert_scheme_pointer_to_py_value(
+                    item.pair.car, version
+                ): _convert_scheme_pointer_to_py_value(item.pair.cdr, version)
+                for item in p.list.item
+            }
         else:
-            val = _convert_scheme_pointer_to_py_list(p)
-            return val
+            return [
+                _convert_scheme_pointer_to_py_value(item, version)
+                for item in p.list.item
+            ]
+
     return None
 
 
@@ -176,8 +209,9 @@ class SchemeEval:
         value
     """
 
-    def __init__(self, service: SchemeEvalService):
+    def __init__(self, service: SchemeEvalService, version=None):
         self.service = service
+        self.version = version
 
     def eval(self, val: Any) -> Any:
         """Evaluates a scheme expression.
@@ -193,9 +227,9 @@ def eval(self, val: Any) -> Any:
             Output scheme value represented as Python datatype
         """
         request = SchemePointer()
-        _convert_py_value_to_scheme_pointer(val, request)
+        _convert_py_value_to_scheme_pointer(val, request, self.version)
         response = self.service.eval(request)
-        return _convert_scheme_pointer_to_py_value(response)
+        return _convert_scheme_pointer_to_py_value(response, self.version)
 
     def exec(
         self, commands: Sequence[str], wait: bool = True, silent: bool = True
@@ -262,6 +296,6 @@ def scheme_eval(self, input: str) -> Any:
             (S("with-input-from-string"), input, S("read")),
             S("user-initial-environment"),
         )
-        _convert_py_value_to_scheme_pointer(val, request)
+        _convert_py_value_to_scheme_pointer(val, request, self.version)
         response = self.service.eval(request)
-        return _convert_scheme_pointer_to_py_value(response)
+        return _convert_scheme_pointer_to_py_value(response, self.version)

tests/test_scheme_eval.py → tests/test_scheme_eval_222.py

@@ -108,7 +108,7 @@ def test_convert_py_value_to_scheme_pointer(
     py_value: Any, json_dict: Dict[str, Any]
 ) -> None:
     p = SchemePointer()
-    _convert_py_value_to_scheme_pointer(py_value, p)
+    _convert_py_value_to_scheme_pointer(py_value, p, "22.2")
     assert MessageToDict(p) == json_dict
 
 
@@ -246,7 +246,7 @@ def test_convert_scheme_pointer_to_py_value(
 ) -> None:
     p = SchemePointer()
     ParseDict(json_dict, p)
-    val = _convert_scheme_pointer_to_py_value(p)
+    val = _convert_scheme_pointer_to_py_value(p, "22.2")
     assert val == py_value
 
 
@@ -261,7 +261,7 @@ def test_convert_scheme_pointer_having_symbol_to_py_value() -> None:
         },
         p,
     )
-    val = _convert_scheme_pointer_to_py_value(p)
+    val = _convert_scheme_pointer_to_py_value(p, "22.2")
     assert isinstance(val, tuple)
     assert len(val) == 2
     assert val[0] == "abc"
@@ -284,7 +284,7 @@ def test_convert_scheme_pointer_having_pair_to_py_value() -> None:
         },
         p,
     )
-    val = _convert_scheme_pointer_to_py_value(p)
+    val = _convert_scheme_pointer_to_py_value(p, "22.2")
     assert isinstance(val, list)
     assert isinstance(val[0], Symbol)
     assert val[0].str == "+"
@@ -311,16 +311,16 @@ def test_convert_scheme_pointer_having_pair_to_py_value() -> None:
 )
 def test_two_way_conversion(py_value: Any) -> None:
     p = SchemePointer()
-    _convert_py_value_to_scheme_pointer(py_value, p)
-    val = _convert_scheme_pointer_to_py_value(p)
+    _convert_py_value_to_scheme_pointer(py_value, p, "22.2")
+    val = _convert_scheme_pointer_to_py_value(p, "22.2")
     assert val == py_value
 
 
 def test_two_way_conversion_for_symbol() -> None:
     py_value = [Symbol("+"), 2.0, 3.0]
     p = SchemePointer()
-    _convert_py_value_to_scheme_pointer(py_value, p)
-    val = _convert_scheme_pointer_to_py_value(p)
+    _convert_py_value_to_scheme_pointer(py_value, p, "22.2")
+    val = _convert_scheme_pointer_to_py_value(p, "22.2")
     assert isinstance(val, list)
     assert isinstance(val[0], Symbol)
     assert val[0].str == "+"
@@ -330,8 +330,8 @@ def test_two_way_conversion_for_symbol() -> None:
 def test_two_way_conversion_for_pairs() -> None:
     py_value = ("abc", 5.0)
     p = SchemePointer()
-    _convert_py_value_to_scheme_pointer(py_value, p)
-    val = _convert_scheme_pointer_to_py_value(p)
+    _convert_py_value_to_scheme_pointer(py_value, p, "22.2")
+    val = _convert_scheme_pointer_to_py_value(p, "22.2")
     assert isinstance(val, tuple)
     assert len(val) == 2
     assert val[0] == "abc"