Refine some challenges, support mutitple solutions in testing

challenges/advanced-descriptor/question.py

@@ -0,0 +1,32 @@
+"""
+TODO:
+
+Create a descriptor and annotate the __get__ method.
+
+HINT: use typing.overload
+"""
+
+
+class Descriptor:
+    def __get__(self, instance, owner):
+        """you don't need to implement this"""
+        ...
+
+
+## End of your code ##
+class TestClass:
+    a = Descriptor()
+
+
+def descriptor_self(x: Descriptor) -> None:
+    ...
+
+
+def string_value(x: str) -> None:
+    ...
+
+
+descriptor_self(TestClass.a)
+string_value(TestClass().a)
+descriptor_self(TestClass().a)  # expect-type-error
+string_value(TestClass.a)  # expect-type-error

challenges/advanced-descriptor-basic/solution.py → challenges/advanced-descriptor/solution.py

@@ -1,7 +1,9 @@
 """
 TODO:
 
-Define a descriptor, make test case works.
+Create a descriptor and annotate the __get__ method.
+
+HINT: use typing.overload
 """
 
 from typing import overload, Self, Any
@@ -17,10 +19,7 @@ def __get__(self, instance: Any, owner: type) -> str:
         ...
 
     def __get__(self, instance: Any, owner: type) -> Self | str:
-        if instance is None:
-            return self
-
-        return ""
+        ...
 
 
 ## End of your code ##
@@ -38,6 +37,5 @@ def string_value(x: str) -> None:
 
 descriptor_self(TestClass.a)
 string_value(TestClass().a)
-
 descriptor_self(TestClass().a)  # expect-type-error
 string_value(TestClass.a)  # expect-type-error

challenges/extreme-self-casting/question.py

@@ -1,8 +1,10 @@
 """
 TODO:
 
-Enhance the Fn[VnCallable].into_callable method to return a Callable with an additional Any parameter at the beginning (using Concatenate).
-This should preserve the remaining parts of the function signature from VnCallable (i.e., parameters and their types, excluding the suffix), as well as the return type.
+Enhance the Fn[VnCallable].into_callable method to return a Callable with an additional
+Any parameter at the beginning (using Concatenate).
+This should preserve the remaining parts of the function signature from VnCallable
+(i.e., parameters and their types, excluding the suffix), as well as the return type.
 """
 
 from typing import Callable, TypeVar, Generic, Any, assert_type

challenges/extreme-self-casting/solution.py

@@ -1,8 +1,10 @@
 """
 TODO:
 
-Enhance the Fn[VnCallable].into_callable method to return a Callable with an additional Any parameter at the beginning (using Concatenate).
-This should preserve the remaining parts of the function signature from VnCallable (i.e., parameters and their types, excluding the suffix), as well as the return type.
+Enhance the Fn[VnCallable].into_callable method to return a Callable with an additional
+Any parameter at the beginning (using Concatenate).
+This should preserve the remaining parts of the function signature from VnCallable
+(i.e., parameters and their types, excluding the suffix), as well as the return type.
 """
 
 from typing import Callable, Concatenate, ParamSpec, TypeVar, Generic, Any, assert_type

challenges/extreme-self-casting/solution2.py

@@ -0,0 +1,24 @@
+from typing import Callable, Concatenate, Any, assert_type
+
+
+class Fn[R, **P]():
+    def __init__(self, f: Callable[P, R]) -> None:
+        self.f = f
+
+    def into_callable(self) -> Callable[Concatenate[Any, P], R]:
+        ...
+
+
+## End of your code ##
+@Fn
+def example(a: int, b: str, c: float, *, d: bool = False) -> None:
+    return
+
+
+assert_type(example.f(1, "1", 1.0, d=False), None)
+
+a: Any = 11111111
+b = example.into_callable()(a, 1, "1", 1.0, d=False)
+assert_type(b, None)
+
+example.into_callable()(1, "1", 1.0, d=False)  # expect-type-error

tests/conftest.py

@@ -13,7 +13,7 @@
 
 CHALLENGES_DIR = Path(__file__).parent.parent / "challenges"
 ALL_QUESTIONS = list(CHALLENGES_DIR.glob("**/question.py"))
-ALL_SOLUTIONS = list(CHALLENGES_DIR.glob("**/solution.py"))
+ALL_SOLUTIONS = list(CHALLENGES_DIR.glob("**/solution*.py"))
 
 
 @pytest.fixture