Update ReduceNode rendering and fix format

Author: tamarinvs19

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

@@ -1,8 +1,11 @@
 package org.utbot.python
 
+import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.isActive
+import kotlinx.coroutines.isActive
 import mu.KotlinLogging
 import org.utbot.framework.plugin.api.*
 import org.utbot.fuzzer.*
@@ -244,6 +247,9 @@ class PythonEngine(
                 evaluationInput.modelList
             )
 
+            if (!currentCoroutineContext().isActive) {
+                return@PythonFuzzing PythonFeedback(control = Control.STOP)
+            }
             when (val evaluationResult = jobResult.evalResult) {
                 is PythonEvaluationError -> {
                     if (evaluationResult.status != 0) {

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

@@ -12,12 +12,10 @@ import org.utbot.python.framework.api.python.NormalizedPythonAnnotation
 import org.utbot.python.framework.api.python.util.pythonAnyClassId
 import org.utbot.python.newtyping.PythonTypeDescription
 import org.utbot.python.newtyping.general.FunctionTypeCreator
-import org.utbot.python.newtyping.readMypyAnnotationStorage
+import org.utbot.python.newtyping.runmypy.RunMypy
 import org.utbot.python.typing.AnnotationFinder.findAnnotations
 import org.utbot.python.typing.MypyAnnotations
 import org.utbot.python.utils.AnnotationNormalizer.annotationFromProjectToClassId
-import org.utbot.python.utils.TemporaryFileManager
-import org.utbot.python.utils.runCommand
 import java.nio.file.Path
 
 private val logger = KotlinLogging.logger {}
@@ -63,24 +61,13 @@ object PythonTestCaseGenerator {
     }
 
     private fun newGenerate(method: PythonMethod): PythonTestSet {
-        val mypyAnnotationSource = PythonTestCaseGenerator::class.java.getResource("/mypy/extract_annotations.py")?.readText() ?: error("Didn't find /mypy/extract_annotations.py")
-        val mypyAnnotationFile = TemporaryFileManager.createTemporaryFile(mypyAnnotationSource, tag = "mypy_file")
-        val mypyAnnotationPath = mypyAnnotationFile.absolutePath
-
-        val mypyIniSource = PythonTestCaseGenerator::class.java.getResource("/mypy/mypy_config.ini")?.readText() ?: error("Didn't find /mypy/mypy_config.ini")
-        val mypyIniFile = TemporaryFileManager.createTemporaryFile(mypyIniSource, tag = "mypy_ini")
-        val mypyIniPath = mypyIniFile.absolutePath
-        val results = runCommand(
-            listOf(
-                pythonPath,
-                mypyAnnotationPath,
-                mypyIniPath,
-                method.moduleFilename,
-            )
+        val mypyConfigFile = RunMypy.setConfigFile(directoriesForSysPath)
+        val (storage, _) = RunMypy.readMypyAnnotationStorageAndInitialErrors(
+            pythonPath,
+            method.moduleFilename,
+            mypyConfigFile
         )
-        val moduleName = method.moduleFilename.split("/").last().split(".").first()
-        val storage = readMypyAnnotationStorage(results.stdout)
-        val functionDef = (storage.definitions[moduleName]!![method.name]!!.annotation.asUtBotType as FunctionTypeCreator.Original)
+        val functionDef = (storage.definitions[curModule]!![method.name]!!.annotation.asUtBotType as FunctionTypeCreator.Original)
         val args = functionDef.arguments
 
         storageForMypyMessages.clear()
@@ -135,6 +122,10 @@ object PythonTestCaseGenerator {
                 if (withMinimization && missingLines?.isEmpty() == true) {//&& generated % CHUNK_SIZE == 0)
                     coverageLimit = 0
                 }
+
+                if (coverageLimit == 0) {
+                    isCancelled = {true}
+                }
             }
         }
 

utbot-python/src/main/kotlin/org/utbot/python/code/KlaxonPythonTreeParser.kt

@@ -76,7 +76,7 @@ class KlaxonPythonTreeParser(
         memory[id] = initObject
         initObject.state = parsePythonDict(value.array("state")!!).items.map {
             (it.key as PythonTree.PrimitiveNode).repr to it.value
-        }.toMap()
+        }.toMap().toMutableMap()
         initObject.listitems = parsePythonList(value.array("listitems")!!).children
         initObject.dictitems = parsePythonDict(value.array("dictitems")!!).items
         return initObject

utbot-python/src/main/kotlin/org/utbot/python/framework/api/python/PythonApi.kt

@@ -60,7 +60,7 @@ class PythonTreeModel(
     override val allContainingClassIds: Set<PythonClassId>
         get() {
             val children = tree.children.map { PythonTreeModel(it, it.type) }
-            return super.allContainingClassIds + children.flatMap { it.allContainingClassIds }
+            return super.allContainingClassIds + children.filter {it.tree != tree}.flatMap { it.allContainingClassIds }
         }
 }
 

utbot-python/src/main/kotlin/org/utbot/python/framework/api/python/PythonTree.kt

@@ -140,7 +140,7 @@ object PythonTree {
         type: PythonClassId,
         val constructor: PythonClassId,
         val args: List<PythonTreeNode>,
-        var state: Map<String, PythonTreeNode>,
+        var state: MutableMap<String, PythonTreeNode>,
         var listitems: List<PythonTreeNode>,
         var dictitems: Map<PythonTreeNode, PythonTreeNode>,
     ) : PythonTreeNode(type) {
@@ -149,7 +149,7 @@ object PythonTree {
             type: PythonClassId,
             constructor: PythonClassId,
             args: List<PythonTreeNode>,
-        ) : this(id, type, constructor, args, emptyMap(), emptyList(), emptyMap())
+        ) : this(id, type, constructor, args, emptyMap<String, PythonTreeNode>().toMutableMap(), emptyList(), emptyMap())
 
         override val children: List<PythonTreeNode>
             get() = args + state.values + listitems + dictitems.values + dictitems.keys + PythonTreeNode(constructor)
@@ -185,6 +185,13 @@ object PythonTree {
         }
     }
 
+    fun fromObject(): PrimitiveNode {
+        return PrimitiveNode(
+            PythonClassId("builtins.object"),
+            "object"
+        )
+    }
+
     fun fromNone(): PrimitiveNode {
         return PrimitiveNode(
             pythonNoneClassId,

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/constructor/tree/PythonCgCallableAccessManager.kt

@@ -2,6 +2,7 @@ package org.utbot.python.framework.codegen.model.constructor.tree
 
 import org.utbot.framework.codegen.domain.context.CgContext
 import org.utbot.framework.codegen.domain.context.CgContextOwner
+import org.utbot.framework.codegen.domain.models.CgAssignment
 import org.utbot.framework.codegen.domain.models.CgConstructorCall
 import org.utbot.framework.codegen.domain.models.CgExecutableCall
 import org.utbot.framework.codegen.domain.models.CgExpression
@@ -18,8 +19,12 @@ import org.utbot.framework.plugin.api.FieldId
 import org.utbot.framework.plugin.api.MethodId
 import org.utbot.framework.plugin.api.util.exceptions
 import org.utbot.python.framework.api.python.PythonMethodId
+import org.utbot.python.framework.api.python.PythonTree
+import org.utbot.python.framework.api.python.PythonTreeModel
 import org.utbot.python.framework.api.python.util.pythonAnyClassId
+import org.utbot.python.framework.codegen.PythonCgLanguageAssistant
 import org.utbot.python.framework.codegen.model.constructor.util.importIfNeeded
+import org.utbot.python.framework.codegen.model.tree.CgPythonTree
 
 class PythonCgCallableAccessManagerImpl(val context: CgContext) : CgCallableAccessManager,
     CgContextOwner by context {
@@ -46,7 +51,28 @@ class PythonCgCallableAccessManagerImpl(val context: CgContext) : CgCallableAcce
     }
 
     override fun CgIncompleteMethodCall.invoke(vararg args: Any?): CgMethodCall {
-        val resolvedArgs = args.resolve()
+        val resolvedArgs = emptyList<CgExpression>().toMutableList()
+        args.forEach { arg ->
+            if (arg is CgPythonTree) {
+                resolvedArgs.add(arg.value)
+                arg.children.forEach { +it }
+            } else {
+                resolvedArgs.add(arg as CgExpression)
+            }
+        }
+//        resolvedArgs.forEach {
+//            if (it is CgPythonTree) {
+//                it.children.forEach { child ->
+//                    if (child is CgAssignment) {
+//                        if (!existingVariableNames.contains(child.lValue.toString())) {
+//                            +child
+//                        }
+//                    } else {
+//                        +child
+//                    }
+//                }
+//            }
+//        }
         val methodCall = CgMethodCall(caller, method, resolvedArgs)
         if (method is PythonMethodId)
             newMethodCall(method)

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/constructor/tree/PythonCgMethodConstructor.kt

@@ -20,6 +20,8 @@ import org.utbot.python.framework.codegen.PythonCgLanguageAssistant
 import org.utbot.python.framework.codegen.model.tree.*
 
 class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(context) {
+    val maxDepth: Int = 5
+
     override fun assertEquality(expected: CgValue, actual: CgVariable) {
         pythonDeepEquals(expected, actual)
     }
@@ -47,7 +49,7 @@ class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(contex
             testMethod(testMethodName, execution.displayName) {
                 val statics = currentExecution!!.stateBefore.statics
                 rememberInitialStaticFields(statics)
-                (context.cgLanguageAssistant as PythonCgLanguageAssistant).memoryObjects.clear()
+//                 (context.cgLanguageAssistant as PythonCgLanguageAssistant).memoryObjects.clear()
 
                 val modificationInfo = StateModificationInfo()
                 val fieldStateManager = context.cgLanguageAssistant.getCgFieldStateManager(context)
@@ -186,6 +188,7 @@ class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(contex
         require(expected is CgPythonTree) {
             "Expected value have to be CgPythonTree but `${expected::class}` found"
         }
+        (context.cgLanguageAssistant as PythonCgLanguageAssistant).memoryObjects.clear()
         val expectedValue = pythonBuildObject(expected.tree)
         pythonDeepTreeEquals(expected.tree, expectedValue, actual)
     }
@@ -282,9 +285,10 @@ class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(contex
     private fun pythonDeepTreeEquals(
         expectedNode: PythonTree.PythonTreeNode,
         expected: CgValue,
-        actual: CgVariable
+        actual: CgVariable,
+        depth: Int = maxDepth
     ) {
-        if (expectedNode.comparable) {
+        if (expectedNode.comparable || depth == 0) {
             emptyLineIfNeeded()
             testFrameworkManager.assertEquals(
                 expected,
@@ -352,7 +356,7 @@ class PythonCgMethodConstructor(context: CgContext) : CgMethodConstructor(contex
                                 )
                             )
                         }
-                        pythonDeepTreeEquals(value, fieldExpected, fieldActual)
+                        pythonDeepTreeEquals(value, fieldExpected, fieldActual, depth - 1)
                     }
                 } else {
                     emptyLineIfNeeded()

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/constructor/tree/PythonCgVariableConstructor.kt

@@ -58,7 +58,7 @@ class PythonCgVariableConstructor(context_: CgContext) : CgVariableConstructor(c
         }
     }
 
-    fun pythonBuildObject2(objectNode: PythonTree.PythonTreeNode): Pair<CgValue, List<CgStatement>> {
+    private fun pythonBuildObject2(objectNode: PythonTree.PythonTreeNode): Pair<CgValue, List<CgStatement>> {
         return when (objectNode) {
             is PythonTree.PrimitiveNode -> {
                 Pair(CgLiteral(objectNode.type, objectNode.repr), emptyList())

utbot-python/src/main/kotlin/org/utbot/python/framework/codegen/model/constructor/visitor/CgPythonRenderer.kt

@@ -322,7 +322,9 @@ internal class CgPythonRenderer(
         renderMethodDocumentation(element)
         renderMethodSignature(element)
         visit(element as CgMethod)
-        println("pass")
+        withIndent {
+            println("pass")
+        }
     }
 
     override fun renderMethodSignature(element: CgParameterizedTestDataProviderMethod) {
@@ -507,7 +509,7 @@ internal class CgPythonRenderer(
     }
 
     override fun visit(element: CgPythonTree) {
-//        element.children.forEach { it.accept(this) }
+        element.children.forEach { it.accept(this) }
         element.value.accept(this)
     }
 

utbot-python/src/main/kotlin/org/utbot/python/fuzzing/provider/ReduceValueProvider.kt

@@ -25,6 +25,17 @@ class ReduceValueProvider(
         val meta = type.meta as PythonConcreteCompositeTypeDescription
         val arguments = (type.getPythonAttributes().first { it.name == "__init__" }.type as FunctionTypeCreator.Original).arguments
         val nonSelfArgs = arguments.drop(1)
+
+        val fields = type.getPythonAttributes().filter { attr -> attr.type.getPythonAttributes().all { it.name != "__call__" }}
+
+        val modifications = emptyList<Routine.Call<Type, PythonTreeModel>>().toMutableList()
+        modifications.addAll(fields.map { field ->
+            Routine.Call(listOf(field.type)) { instance, arguments ->
+                val obj = instance.tree as PythonTree.ReduceNode
+                obj.state[field.name] = arguments.first().tree
+            }
+        })
+
         yield(Seed.Recursive(
             construct = Routine.Create(nonSelfArgs) { v ->
                 PythonTreeModel(
@@ -37,7 +48,8 @@ class ReduceValueProvider(
                     PythonClassId(meta.name.toString())
                 )
             },
-            empty = Routine.Empty { PythonTreeModel(PythonTree.fromNone(), PythonClassId(meta.name.toString())) }
+            modify = modifications.asSequence(),
+            empty = Routine.Empty { PythonTreeModel(PythonTree.fromObject(), PythonClassId(meta.name.toString())) }
         ))
     }
 }