Fix Type Hints (#38)

Author: Behemyth

cppython/project.py

@@ -36,7 +36,9 @@ class ProjectBuilder:
     def __init__(self, configuration: ProjectConfiguration) -> None:
         self.configuration = configuration
 
-    def gather_plugins(self, plugin_type: Type[Plugin]) -> list[Type[Plugin]]:
+    DerivedPlugin = TypeVar("DerivedPlugin", bound=Plugin)
+
+    def gather_plugins(self, plugin_type: Type[DerivedPlugin]) -> list[Type[DerivedPlugin]]:
         """
         TODO
         """
@@ -50,29 +52,29 @@ def gather_plugins(self, plugin_type: Type[Plugin]) -> list[Type[Plugin]]:
 
         return plugins
 
-    def generate_model(self, plugins: list[Type[Plugin]]) -> Type[PyProject]:
+    def generate_model(self, plugins: list[Type[Generator]]) -> Type[PyProject]:
         """
         TODO
         """
         plugin_fields = {}
         for plugin_type in plugins:
             plugin_fields[plugin_type.name()] = plugin_type.data_type()
 
-        ExtendedCPPythonData = create_model(
+        extended_cppython_type = create_model(
             "ExtendedCPPythonData",
             **plugin_fields,
             __base__=CPPythonData,
         )
 
-        ExtendedToolData = create_model(
+        extended_tool_type = create_model(
             "ToolData",
-            cppython=ExtendedCPPythonData,
+            cppython=extended_cppython_type,
             __base__=ToolData,
         )
 
         return create_model(
             "PyProject",
-            tool=ExtendedToolData,
+            tool=extended_tool_type,
             __base__=PyProject,
         )
 
@@ -110,8 +112,8 @@ def __init__(
                 interface.print("No generator plugin was found.")
             return
 
-        ExtendedPyProject = builder.generate_model(plugins)
-        pyproject = ExtendedPyProject(**pyproject_data)
+        extended_pyproject_type = builder.generate_model(plugins)
+        pyproject = extended_pyproject_type(**pyproject_data)
 
         if pyproject.tool is None:
             if self.configuration.verbose:

pdm.lock

@@ -47,18 +47,18 @@ def test_generator_data_construction(self, mocker: MockerFixture):
 
         configuration = ProjectConfiguration()
         builder = ProjectBuilder(configuration)
-        Model = builder.generate_model([])
+        model_type = builder.generate_model([])
 
-        assert Model.__base__ == PyProject
+        assert model_type.__base__ == PyProject
 
         generator = mocker.Mock(spec=Generator)
         generator_data = mocker.Mock(spec=GeneratorData)
 
         generator.name.return_value = "mock"
         generator.data_type.return_value = type(generator_data)
-        Model = builder.generate_model([generator])
+        model_type = builder.generate_model([generator])
 
-        assert Model.__base__ == PyProject
+        assert model_type.__base__ == PyProject
 
     def test_generator_creation(self, mocker: MockerFixture):
         """