Improve python object constructors rendering (#2078)

Author: tamarinvs19

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

@@ -4,7 +4,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 import mu.KotlinLogging
 import org.utbot.framework.plugin.api.*
-import org.utbot.fuzzer.UtFuzzedExecution
 import org.utbot.fuzzing.Control
 import org.utbot.fuzzing.fuzz
 import org.utbot.fuzzing.utils.Trie
@@ -14,6 +13,7 @@ import org.utbot.python.evaluation.serialiation.toPythonTree
 import org.utbot.python.framework.api.python.PythonTree
 import org.utbot.python.framework.api.python.PythonTreeModel
 import org.utbot.python.framework.api.python.PythonTreeWrapper
+import org.utbot.python.framework.api.python.PythonUtExecution
 import org.utbot.python.fuzzing.*
 import org.utbot.python.newtyping.PythonTypeStorage
 import org.utbot.python.newtyping.general.Type
@@ -117,12 +117,15 @@ class PythonEngine(
 
         val testMethodName = suggestExecutionName(methodUnderTestDescription, executionResult)
 
+        val (thisObject, initModelList) = transformModelList(hasThisObject, evaluationResult.stateInit, evaluationResult.modelListIds)
         val (beforeThisObject, beforeModelList) = transformModelList(hasThisObject, evaluationResult.stateBefore, evaluationResult.modelListIds)
         val (afterThisObject, afterModelList) = transformModelList(hasThisObject, evaluationResult.stateAfter, evaluationResult.modelListIds)
 
-        val utFuzzedExecution = UtFuzzedExecution(
+        val utFuzzedExecution = PythonUtExecution(
+            stateInit = EnvironmentModels(thisObject, initModelList, emptyMap()),
             stateBefore = EnvironmentModels(beforeThisObject, beforeModelList, emptyMap()),
             stateAfter = EnvironmentModels(afterThisObject, afterModelList, emptyMap()),
+            diffIds = evaluationResult.diffIds,
             result = executionResult,
             coverage = evaluationResult.coverage,
             testMethodName = testMethodName.testName?.camelToSnakeCase(),

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

@@ -6,6 +6,7 @@ import org.utbot.framework.minimization.minimizeExecutions
 import org.utbot.framework.plugin.api.UtError
 import org.utbot.framework.plugin.api.UtExecution
 import org.utbot.framework.plugin.api.UtExecutionSuccess
+import org.utbot.python.framework.api.python.PythonUtExecution
 import org.utbot.python.fuzzing.*
 import org.utbot.python.newtyping.*
 import org.utbot.python.newtyping.ast.visitor.Visitor
@@ -123,7 +124,7 @@ class PythonTestCaseGenerator(
         typeStorage: PythonTypeStorage,
         coveredLines: MutableSet<Int>,
         errors: MutableList<UtError>,
-        executions: MutableList<UtExecution>,
+        executions: MutableList<PythonUtExecution>,
         initMissingLines: Set<Int>?,
         until: Long,
         additionalVars: String = ""
@@ -218,7 +219,7 @@ class PythonTestCaseGenerator(
 
         val typeStorage = PythonTypeStorage.get(mypyStorage)
 
-        val executions = mutableListOf<UtExecution>()
+        val executions = mutableListOf<PythonUtExecution>()
         val errors = mutableListOf<UtError>()
         val coveredLines = mutableSetOf<Int>()
 

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

@@ -190,7 +190,10 @@ object PythonTestGenerationProcessor {
                         testFrameworkModule,
                         sysImport
                     )
-                ).filterNotNull().toSet()
+                )
+                .filterNotNull()
+//                .filterNot { it.importName == pythonBuiltinsModuleName }
+                .toSet()
 
             val context = UtContext(this::class.java.classLoader)
             withUtContext(context) {

utbot-python/src/main/kotlin/org/utbot/python/evaluation/CodeEvaluationApi.kt

@@ -35,8 +35,10 @@ data class PythonEvaluationTimeout(
 data class PythonEvaluationSuccess(
     val isException: Boolean,
     val coverage: Coverage,
+    val stateInit: MemoryDump,
     val stateBefore: MemoryDump,
     val stateAfter: MemoryDump,
+    val diffIds: List<Long>,
     val modelListIds: List<String>,
     val resultId: String,
 ) : PythonEvaluationResult()

utbot-python/src/main/kotlin/org/utbot/python/evaluation/PythonCodeExecutorImpl.kt

@@ -66,6 +66,7 @@ class PythonCodeSocketExecutor(
             additionalModulesToImport.toList(),
             syspathDirectories.toList(),
             arguments,
+            emptyMap(),  // here can be only-kwargs arguments
             memory,
             method.moduleFilename,
         )
@@ -102,14 +103,18 @@ class PythonCodeSocketExecutor(
         )
         return when (executionResult) {
             is SuccessExecution -> {
+                val stateInit = ExecutionResultDeserializer.parseMemoryDump(executionResult.stateInit) ?: return parsingException
                 val stateBefore = ExecutionResultDeserializer.parseMemoryDump(executionResult.stateBefore) ?: return parsingException
                 val stateAfter = ExecutionResultDeserializer.parseMemoryDump(executionResult.stateAfter) ?: return parsingException
+                val diffIds = executionResult.diffIds.map {it.toLong()}
                 PythonEvaluationSuccess(
                     executionResult.isException,
                     calculateCoverage(executionResult.statements, executionResult.missedStatements),
+                    stateInit,
                     stateBefore,
                     stateAfter,
-                    executionResult.argsIds + executionResult.kwargsIds,
+                    diffIds,
+                    executionResult.argsIds + executionResult.kwargsIds.values,
                     executionResult.resultId,
                 )
             }

utbot-python/src/main/kotlin/org/utbot/python/evaluation/PythonCodeSocketExecutor.kt

@@ -21,6 +21,7 @@ data class ExecutionRequest(
     val imports: List<String>,
     val syspaths: List<String>,
     val argumentsIds: List<String>,
+    val kwargumentsIds: Map<String, String>,
     val serializedMemory: String,
     val filepath: String,
 )

utbot-python/src/main/kotlin/org/utbot/python/evaluation/serialiation/ExecutionRequestSerializer.kt

@@ -45,10 +45,12 @@ data class SuccessExecution(
     val isException: Boolean,
     val statements: List<Int>,
     val missedStatements: List<Int>,
+    val stateInit: String,
     val stateBefore: String,
     val stateAfter: String,
+    val diffIds: List<String>,
     val argsIds: List<String>,
-    val kwargsIds: List<String>,
+    val kwargsIds: Map<String, String>,
     val resultId: String,
 ): PythonExecutionResult()