Remove instructions minimization

tamarinvs19 · tamarinvs19 · commit fc391da5d81c · 2023-12-01T17:45:03.000+03:00
diff --git a/utbot-python-executor/src/main/python/utbot_executor/pyproject.toml b/utbot-python-executor/src/main/python/utbot_executor/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "utbot-executor"
-version = "1.9.9"
+version = "1.9.10"
 description = ""
 authors = ["Vyacheslav Tamarin <vyacheslav.tamarin@yandex.ru>"]
 readme = "README.md"
diff --git a/utbot-python-executor/src/main/python/utbot_executor/utbot_executor/executor.py b/utbot-python-executor/src/main/python/utbot_executor/utbot_executor/executor.py
@@ -280,7 +280,7 @@ def _run_calculate_function_value(
 
     logging.debug("Coverage: %s", __tracer.counts)
     logging.debug("Fullpath: %s", fullpath)
-    __stmts_with_def = [UtInstruction(__start, 0, True)] + list(__tracer.counts.keys())
+    __stmts_with_def = [UtInstruction(__start, 0, True)] + __tracer.instructions
     __missed_filtered = [x for x in __all_code_stmts if x not in __stmts_with_def]
     logging.debug("Covered lines: %s", __stmts_with_def)
     logging.debug("Missed lines: %s", __missed_filtered)
diff --git a/utbot-python-executor/src/main/python/utbot_executor/utbot_executor/ut_tracer.py b/utbot-python-executor/src/main/python/utbot_executor/utbot_executor/ut_tracer.py
@@ -1,5 +1,3 @@
-import dis
-import inspect
 import logging
 import os
 import pathlib
@@ -19,7 +17,14 @@ def _modname(path):
 
 
 class UtCoverageSender:
-    def __init__(self, coverage_id: str, host: str, port: int, use_thread: bool = False, send_coverage: bool = True):
+    def __init__(
+        self,
+        coverage_id: str,
+        host: str,
+        port: int,
+        use_thread: bool = False,
+        send_coverage: bool = True,
+    ):
         self.coverage_id = coverage_id
         self.host = host
         self.port = port
@@ -59,7 +64,9 @@ def put_message(self, key: str):
 
 class PureSender(UtCoverageSender):
     def __init__(self):
-        super().__init__("000000", "localhost", 0, use_thread=False, send_coverage=False)
+        super().__init__(
+            "000000", "localhost", 0, use_thread=False, send_coverage=False
+        )
 
 
 class UtTracer:
@@ -72,6 +79,7 @@ def __init__(
     ):
         self.tested_file = tested_file
         self.counts: dict[UtInstruction, int] = {}
+        self.instructions: list[UtInstruction] = []
         self.localtrace = self.localtrace_count
         self.globaltrace = self.globaltrace_lt
         self.ignore_dirs = ignore_dirs
@@ -88,10 +96,6 @@ def runfunc(self, func, /, *args, **kw):
             sys.settrace(None)
         return result
 
-    def coverage(self, filename: str) -> typing.List[int]:
-        filename = _modname(filename)
-        return [line for file, line in self.counts.keys() if file == filename]
-
     def localtrace_count(self, frame, why, arg):
         filename = frame.f_code.co_filename
         lineno = frame.f_lineno
@@ -108,15 +112,18 @@ def localtrace_count(self, frame, why, arg):
                 except Exception:
                     pass
             self.counts[key] = self.counts.get(key, 0) + 1
+            self.instructions.append(key)
         return self.localtrace
 
     def globaltrace_lt(self, frame, why, arg):
-        if why == 'call':
+        if why == "call":
             if self.mode == TraceMode.Instructions:
                 frame.f_trace_opcodes = True
                 frame.f_trace_lines = False
-            filename = frame.f_globals.get('__file__', None)
-            if filename and all(not filename.startswith(d + os.sep) for d in self.ignore_dirs):
+            filename = frame.f_globals.get("__file__", None)
+            if filename and all(
+                not filename.startswith(d + os.sep) for d in self.ignore_dirs
+            ):
                 modulename = _modname(filename)
                 if modulename is not None:
                     return self.localtrace
@@ -140,10 +147,11 @@ def f(x):
     def g(x):
         xs = [[j for j in range(i)] for i in range(10)]
         return x * 2
+
     return g1(x) * g(x) + 2
 
 
 if __name__ == "__main__":
     tracer = UtTracer(pathlib.Path(__file__), [], PureSender())
     tracer.runfunc(f, 2)
-    print(tracer.counts)
+    print(tracer.counts)
diff --git a/utbot-python-executor/src/main/resources/utbot_executor_version b/utbot-python-executor/src/main/resources/utbot_executor_version
@@ -1 +1 @@
-1.9.9
+1.9.10
