One more case in utbot-python-types subtype checker (#2688)

A little more accurate SupportsCall

Author: tochilinak

utbot-python-types/src/main/kotlin/org/utbot/python/newtyping/PythonTypeComparison.kt

@@ -406,6 +406,18 @@ class PythonSubtypeChecker(
 
         val rightCallAttribute = rightCallAttributeAbstract as? FunctionType ?: return false
 
+        // __call__(*args): in this case check only return type
+        if (leftMeta.argumentKinds.contains(PythonCallableTypeDescription.ArgKind.ARG_STAR)) {
+            return PythonSubtypeChecker(
+                left = leftAsFunctionType.returnValue,
+                right = rightCallAttribute.returnValue,
+                pythonTypeStorage,
+                typeParameterCorrespondence,
+                nextAssumingSubtypePairs,
+                recursionDepth + 1
+            ).rightIsSubtypeOfLeft()
+        }
+
         if (rightCallAttribute.arguments.size != leftAsFunctionType.arguments.size)
             return false
         val leftBounded = leftAsFunctionType.getBoundedParameters()

utbot-python-types/src/test/kotlin/org/utbot/python/newtyping/PythonSubtypeCheckerTest.kt

@@ -127,4 +127,22 @@ internal class PythonSubtypeCheckerTest {
 
         assertTrue(checkIfRightIsSubtypeOfLeft(abstractSetOfAny, setOfAny, pythonTypeStorage))
     }
+
+    @Test
+    fun testSupportsCall() {
+        val hasF = storage.definitions["subtypes"]!!["HasF"]!!.getUtBotType()
+        val classS = storage.definitions["subtypes"]!!["S"]!!.getUtBotType()
+
+        assertTrue(checkIfRightIsSubtypeOfLeft(hasF, classS, pythonTypeStorage))
+    }
+
+    @Test
+    fun testSupportsSpecificCall() {
+        val hasF = storage.definitions["subtypes"]!!["HasSpecificF"]!!.getUtBotType()
+        val classS = storage.definitions["subtypes"]!!["S"]!!.getUtBotType()
+        val classR = storage.definitions["subtypes"]!!["RImpl"]!!.getUtBotType()
+
+        assertFalse(checkIfRightIsSubtypeOfLeft(hasF, classS, pythonTypeStorage))
+        assertTrue(checkIfRightIsSubtypeOfLeft(hasF, classR, pythonTypeStorage))
+    }
 }

utbot-python-types/src/test/resources/annotation_tests.json

@@ -52,4 +52,22 @@ def func_abs(x: SupportsAbs[T]):
     return abs(x)
 
 
-b: int = 10
+b: int = 10
+
+
+class SupportsCall(Protocol):
+    def __call__(self, *args, **kwargs):
+        ...
+
+
+class HasF(Protocol):
+    f: SupportsCall
+
+
+class SupportsSpecificCall(Protocol):
+    def __call__(self, *args, **kwargs) -> HasF:
+        ...
+
+
+class HasSpecificF(Protocol):
+    f: SupportsSpecificCall