fixed bug with cancel button and in ArgInfoCollector

Author: tochilinak

utbot-intellij/src/main/kotlin/org/utbot/intellij/plugin/python/PythonDialogProcessor.kt

@@ -124,7 +124,6 @@ object PythonDialogProcessor {
 
                 val testCaseGenerator = PythonTestCaseGenerator.apply {
                     init(
-                        testSourceRoot,
                         model.directoriesForSysPath,
                         model.moduleToImport,
                         pythonPath,

utbot-python/types/ast_json_encoders.py renamed to utbot-python/our_scripts/ast_json_encoders.py

@@ -1,4 +1,4 @@
-import types
+import our_scripts
 from typing import Optional
 
 import astor.code_gen
@@ -15,7 +15,7 @@ def find_all_classes_in_file(filename: str, prefix: str = '') -> list[str]:
     ]
 
 
-def find_module_types(module_name: types.ModuleType) -> list[str]:
+def find_module_types(module_name: our_scripts.ModuleType) -> list[str]:
     def eval_name(name, module_name):
         return name if 'builtin' in module_name.__name__ else f'{module_name.__name__}.{name}'
 
@@ -29,7 +29,7 @@ def eval_name(name, module_name):
 def find_import_types():
     return [
         (name, val) for name, val in globals().items()
-        if isinstance(val, types.ModuleType)
+        if isinstance(val, our_scripts.ModuleType)
     ]
 
 

utbot-python/types/find_and_check_types.py renamed to utbot-python/our_scripts/find_and_check_types.py

@@ -17,7 +17,6 @@ import java.io.File
 
 class PythonEngine(
     private val methodUnderTest: PythonMethod,
-    private val testSourceRoot: String,
     private val directoriesForSysPath: List<String>,
     private val moduleToImport: String,
     private val pythonPath: String,
@@ -39,13 +38,11 @@ class PythonEngine(
             parameterNameMap = { index -> methodUnderTest.arguments.getOrNull(index)?.name }
         }
 
-        var testsGenerated = 0
         fuzz(methodUnderTestDescription, concreteTypesModelProvider).forEach { values ->
             val modelList = values.map { it.model }
             val evalResult = PythonEvaluation.evaluate(
                 methodUnderTest,
                 modelList,
-                testSourceRoot,
                 directoriesForSysPath,
                 moduleToImport,
                 pythonPath
@@ -90,10 +87,6 @@ class PythonEngine(
                     )
                 )
             }
-
-            testsGenerated += 1
-            if (testsGenerated == 100)
-                return@sequence
         }
     }
 }

utbot-python/types/mypy_check_annotations.py renamed to utbot-python/our_scripts/mypy_check_annotations.py

@@ -5,7 +5,6 @@ import org.utbot.framework.plugin.api.UtModel
 import org.utbot.python.code.PythonCodeGenerator
 import org.utbot.python.utils.FileManager
 import org.utbot.python.utils.runCommand
-import java.io.File
 
 
 sealed class EvaluationResult
@@ -26,7 +25,6 @@ object PythonEvaluation {
     fun evaluate(
         method: PythonMethod,
         methodArguments: List<UtModel>,
-        testSourceRoot: String,
         directoriesForSysPath: List<String>,
         moduleToImport: String,
         pythonPath: String

utbot-python/types/mypy_reports/f_report.txt renamed to utbot-python/our_scripts/mypy_reports/f_report.txt

@@ -10,24 +10,23 @@ import org.utbot.python.utils.annotationToClassId
 import java.io.File
 
 object PythonTestCaseGenerator {
-    lateinit var testSourceRoot: String
-    lateinit var directoriesForSysPath: List<String>
-    lateinit var moduleToImport: String
-    lateinit var pythonPath: String
-    lateinit var projectRoot: String
-    lateinit var fileOfMethod: String
-    lateinit var isCancelled: () -> Boolean
+    private lateinit var directoriesForSysPath: List<String>
+    private lateinit var moduleToImport: String
+    private lateinit var pythonPath: String
+    private lateinit var projectRoot: String
+    private lateinit var fileOfMethod: String
+    private lateinit var isCancelled: () -> Boolean
+
+    private const val maxTestCount = 30
 
     fun init(
-        testSourceRoot: String,
         directoriesForSysPath: List<String>,
         moduleToImport: String,
         pythonPath: String,
         projectRoot: String,
         fileOfMethod: String,
         isCancelled: () -> Boolean
     ) {
-        this.testSourceRoot = testSourceRoot
         this.directoriesForSysPath = directoriesForSysPath
         this.moduleToImport = moduleToImport
         this.pythonPath = pythonPath
@@ -52,27 +51,36 @@ object PythonTestCaseGenerator {
         val executions = mutableListOf<PythonExecution>()
         val errors = mutableListOf<PythonError>()
 
-        annotationSequence.forEach typeSelection@{ annotations ->
-            if (isCancelled())
-                return@typeSelection
-
-            val engine = PythonEngine(
-                method,
-                testSourceRoot,
-                directoriesForSysPath,
-                moduleToImport,
-                pythonPath,
-                argInfoCollector.getConstants(),
-                annotations
-            )
+        var testsGenerated = 0
 
-            engine.fuzzing().forEach fuzzing@{
+        run breaking@ {
+            annotationSequence.forEach { annotations ->
                 if (isCancelled())
-                    return@fuzzing
-                when (it) {
-                    is PythonExecution -> executions += it
-                    is PythonError -> errors += it
+                    return@breaking
+
+                val engine = PythonEngine(
+                    method,
+                    directoriesForSysPath,
+                    moduleToImport,
+                    pythonPath,
+                    argInfoCollector.getConstants(),
+                    annotations
+                )
+
+                engine.fuzzing().forEach {
+                    if (isCancelled())
+                        return@breaking
+                    when (it) {
+                        is PythonExecution -> executions += it
+                        is PythonError -> errors += it
+                    }
+                    testsGenerated += 1
+                    if (testsGenerated >= maxTestCount)
+                        return@breaking
                 }
+
+                if (testsGenerated >= maxTestCount)
+                    return@breaking
             }
         }
 
@@ -100,7 +108,6 @@ object PythonTestCaseGenerator {
                 argInfoCollector,
                 method,
                 existingAnnotations,
-                testSourceRoot,
                 moduleToImport,
                 directoriesForSysPath,
                 pythonPath,
@@ -154,7 +161,6 @@ object PythonTestCaseGenerator {
         argInfoCollector: ArgInfoCollector,
         methodUnderTest: PythonMethod,
         existingAnnotations: Map<String, String>,
-        testSourceRoot: String,
         moduleToImport: String,
         directoriesForSysPath: List<String>,
         pythonPath: String,

utbot-python/types/mypy_reports/get_answer_report.txt renamed to utbot-python/our_scripts/mypy_reports/get_answer_report.txt

@@ -13,6 +13,7 @@ import io.github.danielnaczo.python3parser.model.expr.operators.binaryops.compar
 import io.github.danielnaczo.python3parser.model.expr.atoms.Name
 import io.github.danielnaczo.python3parser.model.expr.atoms.Num
 import io.github.danielnaczo.python3parser.model.expr.atoms.Str
+import io.github.danielnaczo.python3parser.model.expr.atoms.trailers.arguments.Arguments
 import io.github.danielnaczo.python3parser.model.expr.operators.Operator
 import io.github.danielnaczo.python3parser.model.expr.operators.binaryops.*
 import io.github.danielnaczo.python3parser.model.expr.operators.binaryops.boolops.Or
@@ -106,7 +107,7 @@ class ArgInfoCollector(val method: PythonMethod, val argumentTypes: List<ClassId
             val names: List<Parser<(String) -> A, A, N>> = paramNames.map { paramName ->
                 map0(refl(name(equal(paramName))), paramName)
             }
-            return names.reduce { acc, elem -> or(acc, elem) }
+            return names.fold(reject()) { acc, elem -> or(acc, elem) }
         }
 
         private fun getStr(str: String): String {
@@ -183,11 +184,13 @@ class ArgInfoCollector(val method: PythonMethod, val argumentTypes: List<ClassId
                 paramNames.map { paramName ->
                     map0(anyIndexed(refl(name(equal(paramName)))), paramName)
                 }
+            val argPat: Parser<(String) -> (Int) -> ResFuncArg, ResFuncArg, List<Expression>> =
+                argNamePatterns.fold(reject()) { acc, elem -> or(acc, elem) }
             val pat = functionCallWithPrefix(
                 fprefix = drop(),
                 fid = apply(),
                 farguments = arguments(
-                    fargs = argNamePatterns.reduce { acc, elem -> or(acc, elem) },
+                    fargs = argPat,
                     drop(), drop(), drop()
                 )
             )