Mypy fixes (#2302)

* Change mypy log output

* Fix problem with tested function from __init__ file

Author: tamarinvs19

utbot-cli-python/src/main/kotlin/org/utbot/cli/language/python/PythonGenerateTestsCommand.kt

@@ -17,6 +17,7 @@ import org.utbot.python.framework.codegen.model.Pytest
 import org.utbot.python.framework.codegen.model.Unittest
 import org.utbot.python.newtyping.ast.parseClassDefinition
 import org.utbot.python.newtyping.ast.parseFunctionDefinition
+import org.utbot.python.newtyping.mypy.dropInitFile
 import org.utbot.python.utils.*
 import org.utbot.python.utils.RequirementsUtils.installRequirements
 import org.utbot.python.utils.RequirementsUtils.requirements
@@ -234,7 +235,7 @@ class PythonGenerateTestsCommand : CliktCommand(
             pythonFilePath = sourceFile.toAbsolutePath(),
             pythonFileContent = sourceFileContent,
             directoriesForSysPath = directoriesForSysPath.map { it.toAbsolutePath() }.toSet(),
-            currentPythonModule = currentPythonModule,
+            currentPythonModule = currentPythonModule.dropInitFile(),
             pythonMethods = pythonMethods,
             containingClassName = pythonClass,
             timeout = timeout,

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

@@ -42,6 +42,7 @@ import org.utbot.python.PythonTestGenerationProcessor
 import org.utbot.python.PythonTestGenerationProcessor.processTestGeneration
 import org.utbot.python.framework.api.python.PythonClassId
 import org.utbot.python.framework.codegen.PythonCgLanguageAssistant
+import org.utbot.python.newtyping.mypy.dropInitFile
 import org.utbot.python.utils.RequirementsUtils.installRequirements
 import org.utbot.python.utils.RequirementsUtils.requirements
 import org.utbot.python.utils.camelToSnakeCase
@@ -174,7 +175,7 @@ object PythonDialogProcessor {
                             realElements.toSet(),
                             model.runtimeExceptionTestsBehaviour,
                             directoriesForSysPath,
-                            moduleToImport,
+                            moduleToImport.dropInitFile(),
                             file,
                             realElements.first().getContainingClass() as PyClass?
                         )

utbot-python/samples/easy_samples/test_package/__init__.py

@@ -0,0 +1,2 @@
+def init_function(x: int):
+    return x ** 2

utbot-python/src/main/kotlin/org/utbot/python/newtyping/inference/TypeInferenceProcessor.kt

@@ -60,7 +60,7 @@ class TypeInferenceProcessor(
             val (mypyStorage, report) = readMypyAnnotationStorageAndInitialErrors(
                 pythonPath,
                 path.toString(),
-                moduleOfSourceFile,
+                moduleOfSourceFile.dropInitFile(),
                 configFile
             )
 

utbot-python/src/main/kotlin/org/utbot/python/newtyping/mypy/RunMypy.kt

@@ -45,11 +45,13 @@ fun readMypyAnnotationStorageAndInitialErrors(
         )
     )
     val stderr = if (fileForMypyStderr.exists()) fileForMypyStderr.readText() else null
+    val stdout = if (fileForMypyStdout.exists()) fileForMypyStdout.readText() else null
     val mypyExitStatus = if (fileForMypyExitStatus.exists()) fileForMypyExitStatus.readText() else null
     if (result.exitValue != 0 || mypyExitStatus != "0")
         error("Something went wrong in initial mypy run. " +
                 "\nPython stderr ${result.stderr}" +
-                "\nMypy stderr: $stderr")
+                "\nMypy stderr: $stderr" +
+                "\nMypy stdout: $stdout")
     return Pair(
         readMypyAnnotationStorage(fileForAnnotationStorage.readText()),
         getErrorsAndNotes(fileForMypyStdout.readText())

utbot-python/src/main/kotlin/org/utbot/python/newtyping/mypy/Utils.kt

@@ -5,4 +5,14 @@ fun String.modifyWindowsPath(): String {
         val (disk, path) = this.split(":", limit = 2)
         "\\\\localhost\\$disk$${path.replace("/", "\\")}"
     } else this
+}
+
+/**
+ * Remove .__init__ suffix if it exists.
+  It resolves problem with duplication module names in mypy, e.g. mod.__init__ and mod
+ */
+fun String.dropInitFile(): String {
+    return if (this.endsWith(".__init__")) {
+        this.dropLast(9)
+    } else this
 }