[Andrew Polyakov] Changed python executor

Author: AndrewPolyakov1

utbot-python-executor/src/main/python/utbot_executor/utbot_executor/deep_serialization/json_converter.py

@@ -31,7 +31,7 @@ def default(self, o):
             elif isinstance(o, NdarrayMemoryObject):
                 base_json["items"] = o.items
                 base_json["comparable"] = True
-                # raise AttributeError(base_json)
+                base_json["dimensions"] = o.dimensions
             elif isinstance(o, (ListMemoryObject, DictMemoryObject)):
                 base_json["items"] = o.items
             elif isinstance(o, IteratorMemoryObject):
@@ -59,8 +59,9 @@ def default(self, o):
                 "module": o.module,
             }
         if isinstance(o, np.ndarray):
-            # raise TypeError(f'Object {o.tolist()}, type: {type(o)}')
-            return all(o.tolist())
+            raise NotImplementedError("np.ndarray is not supported")
+        if isinstance(o, np.bool_):
+            return bool(o)
         return json.JSONEncoder.default(self, o)
 
 
@@ -91,6 +92,7 @@ def as_reduce_object(dct: Dict) -> Union[MemoryObject, Dict]:
                 kind=dct["typeinfo"]["kind"], module=dct["typeinfo"]["module"]
             )
             obj.comparable = dct["comparable"]
+            obj.dimensions = dct["dimensions"]
             return obj
 
         if dct["strategy"] == "dict":
@@ -160,6 +162,7 @@ def reload_id(self) -> MemoryDump:
                 new_memory_object.items = [
                     self.dump_id_to_real_id[id_] for id_ in new_memory_object.items
                 ]
+                new_memory_object.dimensions = obj.dimensions
             elif isinstance(new_memory_object, IteratorMemoryObject):
                 new_memory_object.items = [
                     self.dump_id_to_real_id[id_] for id_ in new_memory_object.items
@@ -220,17 +223,27 @@ def load_object(self, python_id: PythonId) -> object:
 
                 for item in dump_object.items:
                     real_object.append(self.load_object(item))
+
         elif isinstance(dump_object, NdarrayMemoryObject):
-            # print(f"Hi", file=sys.stderr)
             real_object = []
 
             id_ = PythonId(str(id(real_object)))
             self.dump_id_to_real_id[python_id] = id_
             self.memory[id_] = real_object
 
+            temp_list = []
             for item in dump_object.items:
-                real_object = np.append(real_object, self.load_object(item))
-                # real_object.append()
+                temp_list.append(self.load_object(item))
+
+            dt = np.dtype(type(temp_list[0]) if len(temp_list) > 0 else np.int64)
+            temp_list = np.array(temp_list, dtype=dt)
+
+            real_object = np.ndarray(
+                shape=dump_object.dimensions,
+                dtype=dt,
+                buffer=temp_list
+            )
+
         elif isinstance(dump_object, DictMemoryObject):
             real_object = {}
 

utbot-python-executor/src/main/python/utbot_executor/utbot_executor/deep_serialization/memory_objects.py

@@ -112,13 +112,15 @@ def initialize(self) -> None:
         elif self.typeinfo.fullname == "builtins.set":
             deserialized_obj = set(deserialized_obj)
 
+
         comparable = all(serializer.get_by_id(elem).comparable for elem in self.items)
 
         super()._initialize(deserialized_obj, comparable)
 
 class NdarrayMemoryObject(MemoryObject):
     strategy: str = "ndarray"
     items: List[PythonId] = []
+    dimensions: List[int] = []
 
     def __init__(self, ndarray_object: object) -> None:
         self.items: List[PythonId] = []
@@ -129,21 +131,23 @@ def initialize(self) -> None:
         self.deserialized_obj = []  # for recursive collections
         self.comparable = False  # for recursive collections
 
-        for elem in self.obj:
-            elem_id = serializer.write_object_to_memory(elem)
-            self.items.append(elem_id)
-            self.deserialized_obj.append(serializer[elem_id])
+        temp_object = self.obj.copy().flatten()
 
-        deserialized_obj = self.deserialized_obj
-        comparable = all(serializer.get_by_id(elem).comparable for elem in self.items)
-        # comparable = True
+        self.dimensions = self.obj.shape
+        if temp_object.shape != (0, ):
+            for elem in temp_object:
+                elem_id = serializer.write_object_to_memory(elem)
+                self.items.append(elem_id)
+                self.deserialized_obj.append(serializer[elem_id])
 
+        deserialized_obj = self.deserialized_obj
+        comparable = all(serializer.get_by_id(elem).comparable for elem in self.items) if self.deserialized_obj != [] else True
         super()._initialize(deserialized_obj, comparable)
 
     def __repr__(self) -> str:
         if hasattr(self, "obj"):
             return str(self.obj)
-        return f"{self.typeinfo.kind}{self.items}"
+        return f"{self.typeinfo.kind}{self.items}{self.dimensions}"
 
 
 class DictMemoryObject(MemoryObject):
@@ -413,7 +417,7 @@ def get_serializer(obj: object) -> Optional[Type[MemoryObject]]:
 class ListMemoryObjectProvider(MemoryObjectProvider):
     @staticmethod
     def get_serializer(obj: object) -> Optional[Type[MemoryObject]]:
-        if any(type(obj) == t for t in (list, set, tuple, frozenset)):
+        if any(type(obj) == t for t in (list, set, tuple, frozenset)) and type(obj) != np.ndarray:
             return ListMemoryObject
         return None
 
@@ -482,13 +486,13 @@ class PythonSerializer:
     visited: Set[PythonId] = set()
 
     providers: List[MemoryObjectProvider] = [
+        NdarrayMemoryObjectProvider,
         ListMemoryObjectProvider,
         DictMemoryObjectProvider,
         IteratorMemoryObjectProvider,
         ReduceMemoryObjectProvider,
         ReprMemoryObjectProvider,
         ReduceExMemoryObjectProvider,
-        NdarrayMemoryObjectProvider
     ]
 
     def __new__(cls):