Refactor python code execution

Author: tamarinvs19

utbot-python/src/main/kotlin/org/utbot/python/PythonEngine.kt

@@ -16,6 +16,11 @@ import org.utbot.fuzzing.Control
 import org.utbot.fuzzing.fuzz
 import org.utbot.python.code.MemoryDump
 import org.utbot.python.code.toPythonTree
+import org.utbot.python.evaluation.PythonCodeExecutor
+import org.utbot.python.evaluation.PythonCodeExecutorImpl
+import org.utbot.python.evaluation.PythonEvaluationError
+import org.utbot.python.evaluation.PythonEvaluationSuccess
+import org.utbot.python.evaluation.PythonEvaluationTimeout
 import org.utbot.python.framework.api.python.PythonTreeModel
 import org.utbot.python.fuzzing.PythonFeedback
 import org.utbot.python.fuzzing.PythonFuzzedConcreteValue
@@ -30,7 +35,6 @@ import org.utbot.python.utils.camelToSnakeCase
 import org.utbot.summary.fuzzer.names.TestSuggestedInfo
 
 private val logger = KotlinLogging.logger {}
-const val TIMEOUT: Long = 10
 
 sealed interface FuzzingExecutionFeedback
 class ValidExecution(val utFuzzedExecution: UtFuzzedExecution): FuzzingExecutionFeedback
@@ -104,21 +108,23 @@ class PythonEngine(
             "builtins.TypeError"
         )
 
-        if (evaluationResult.isException && (evaluationResult.result.type.name in prohibitedExceptions)) {  // wrong type (sometimes mypy fails)
+        val resultModel = evaluationResult.stateAfter.getById(evaluationResult.resultId).toPythonTree(evaluationResult.stateAfter)
+
+        if (evaluationResult.isException && (resultModel.type.name in prohibitedExceptions)) {  // wrong type (sometimes mypy fails)
             val errorMessage = "Evaluation with prohibited exception. Substituted types: ${
                 types.joinToString { it.pythonTypeRepresentation() }
-            }. Exception type: ${evaluationResult.result.type.name}"
+            }. Exception type: ${resultModel.type.name}"
 
             logger.info(errorMessage)
             return TypeErrorFeedback(errorMessage)
         }
 
         val executionResult =
             if (evaluationResult.isException) {
-                UtExplicitlyThrownException(Throwable(evaluationResult.result.output.type.toString()), false)
+                UtExplicitlyThrownException(Throwable(resultModel.type.toString()), false)
             }
             else {
-                UtExecutionSuccess(PythonTreeModel(evaluationResult.result.output))
+                UtExecutionSuccess(PythonTreeModel(resultModel))
             }
 
         val testMethodName = suggestExecutionName(methodUnderTestDescription, executionResult)
@@ -138,7 +144,7 @@ class PythonEngine(
         return ValidExecution(utFuzzedExecution)
     }
 
-    private fun constructEvaluationInput(arguments: List<PythonFuzzedValue>, additionalModules: List<String>): EvaluationInput {
+    private fun constructEvaluationInput(arguments: List<PythonFuzzedValue>, additionalModules: List<String>): PythonCodeExecutor {
         val argumentValues = arguments.map { PythonTreeModel(it.tree, it.tree.type) }
 
         val (thisObject, modelList) =
@@ -152,16 +158,15 @@ class PythonEngine(
             .map { it.moduleName }
         val localAdditionalModules = (additionalModules + argumentModules).toSet()
 
-        return EvaluationInput(
+        return PythonCodeExecutorImpl(
             methodUnderTest,
-            directoriesForSysPath,
+            FunctionArguments(thisObject, methodUnderTest.thisObjectName, modelList, methodUnderTest.argumentsNames),
+            argumentValues.map { FuzzedValue(it) },
             moduleToImport,
+            localAdditionalModules,
             pythonPath,
+            directoriesForSysPath,
             timeoutForRun,
-            thisObject,
-            modelList,
-            argumentValues.map { FuzzedValue(it) },
-            localAdditionalModules
         )
     }
 
@@ -188,10 +193,10 @@ class PythonEngine(
                 return@PythonFuzzing PythonFeedback(control = Control.STOP)
             }
 
-            val evaluationInput = constructEvaluationInput(arguments, additionalModules)
-            val jobResult = evaluationInput.evaluate()
+            val codeExecutor = constructEvaluationInput(arguments, additionalModules)
+            //            val jobResult = evaluationInput.evaluate()
 
-            when (val evaluationResult = jobResult.evalResult) {
+            when (val evaluationResult = codeExecutor.run()) {
                 is PythonEvaluationError -> {
                     val utError = UtError(
                         "Error evaluation: ${evaluationResult.status}, ${evaluationResult.message}",
@@ -219,7 +224,7 @@ class PythonEngine(
                         .zip(methodUnderTest.arguments)
                         .mapNotNull { it.first.summary?.replace("%var%", it.second.name) }
 
-                    val hasThisObject = jobResult.thisObject != null
+                    val hasThisObject = codeExecutor.methodArguments.thisObject != null
                     val result = handleSuccessResult(parameters, evaluationResult, description, hasThisObject, summary)
                     emit(result)
 

utbot-python/src/main/kotlin/org/utbot/python/PythonEvaluation.kt

@@ -4,6 +4,7 @@ import org.parsers.python.ast.Block
 import org.utbot.framework.plugin.api.UtError
 import org.utbot.framework.plugin.api.UtExecution
 import org.utbot.python.framework.api.python.PythonClassId
+import org.utbot.python.framework.api.python.PythonModel
 import org.utbot.python.framework.api.python.util.pythonAnyClassId
 import org.utbot.python.newtyping.*
 import org.utbot.python.typing.MypyAnnotations
@@ -33,9 +34,7 @@ class PythonMethod(
     TODO: Now we think that all class methods has `self` argument! We should support `@property` decorator
      */
     val hasThisArgument: Boolean
-        get() {
-            return containingPythonClassId != null
-        }
+        get() = containingPythonClassId != null
 
     val arguments: List<PythonArgument>
         get() {
@@ -44,6 +43,12 @@ class PythonMethod(
                 PythonArgument(it.second, it.first.pythonTypeRepresentation())
             }
         }
+
+    val thisObjectName: String?
+        get() = if (hasThisArgument) arguments[0].name else null
+
+    val argumentsNames: List<String>
+        get() = arguments.map { it.name }.drop(if (hasThisArgument) 1 else 0)
 }
 
 data class PythonTestSet(
@@ -52,4 +57,13 @@ data class PythonTestSet(
     val errors: List<UtError>,
     val mypyReport: List<MypyAnnotations.MypyReportLine>,
     val classId: PythonClassId? = null,
-)
+)
+
+data class FunctionArguments(
+    val thisObject: PythonModel?,
+    val thisObjectName: String?,
+    val arguments: List<PythonModel>,
+    val names: List<String?>,
+) {
+    val allArguments: List<PythonModel> = (listOf(thisObject) + arguments).filterNotNull()
+}