Revert changes to plugin manager

Author: chadrik

mypy-baseline.txt

@@ -60,7 +60,7 @@ def create_build_process(process_type: str,
     if process_type not in process_types:
         raise BuildProcessError("Unknown build process: %r" % process_type)
 
-    cls = plugin_manager.get_plugin_class('build_process', process_type, BuildProcess)
+    cls = plugin_manager.get_plugin_class('build_process', process_type)
 
     return cls(working_dir,  # ignored (deprecated)
                build_system,

src/rez/build_process.py

@@ -69,13 +69,13 @@ def get_valid_build_systems(working_dir: str,
 
         # package explicitly specifies build system
         if buildsys_name:
-            cls = plugin_manager.get_plugin_class('build_system', buildsys_name, BuildSystem)
+            cls = plugin_manager.get_plugin_class('build_system', buildsys_name)
             return [cls]
 
     # detect valid build systems
     clss = []
     for buildsys_name_ in get_buildsys_types():
-        cls = plugin_manager.get_plugin_class('build_system', buildsys_name_, BuildSystem)
+        cls = plugin_manager.get_plugin_class('build_system', buildsys_name_)
         if cls.is_valid_root(working_dir, package=package):
             clss.append(cls)
 
@@ -115,7 +115,7 @@ def create_build_system(working_dir: str,
         buildsys_type = next(iter(clss)).name()
 
     # create instance of build system
-    cls_ = plugin_manager.get_plugin_class('build_system', buildsys_type, BuildSystem)
+    cls_ = plugin_manager.get_plugin_class('build_system', buildsys_type)
 
     return cls_(working_dir,
                 opts=opts,

src/rez/build_system.py

@@ -40,7 +40,7 @@ def create_memory_package_repository(repository_data: dict) -> MemoryPackageRepo
         `PackageRepository` object.
     """
     from rezplugins.package_repository.memory import MemoryPackageRepository  # noqa
-    cls_ = plugin_manager.get_plugin_class("package_repository", "memory", MemoryPackageRepository)
+    cls_ = plugin_manager.get_plugin_class("package_repository", "memory")
     return cls_.create_repository(repository_data)
 
 
@@ -658,7 +658,7 @@ def clear_caches(self) -> None:
 
     def _get_repository(self, path: str, **repo_args: Any) -> PackageRepository:
         repo_type, location = path.split('@', 1)
-        cls = plugin_manager.get_plugin_class('package_repository', repo_type, PackageRepository)
+        cls = plugin_manager.get_plugin_class('package_repository', repo_type)
         repo = cls(location, self.pool, **repo_args)
         return repo
 

src/rez/package_repository.py

@@ -14,12 +14,22 @@
 from rez.utils.logging_ import print_debug, print_warning
 from rez.exceptions import RezPluginError
 from zipimport import zipimporter
-from typing import overload, Any, TypeVar
+from typing import overload, Any, TypeVar, TYPE_CHECKING
 import pkgutil
 import os.path
 import sys
 import types
 
+if TYPE_CHECKING:
+    from typing import Literal  # not available in typing module until 3.8
+    from rez.shells import Shell
+    from rez.release_vcs import ReleaseVCS
+    from rez.release_hook import ReleaseHook
+    from rez.build_process import BuildProcess
+    from rez.build_system import BuildSystem
+    from rez.package_repository import PackageRepository
+    from rez.command import Command
+
 T = TypeVar("T")
 
 
@@ -362,18 +372,41 @@ def get_plugins(self, plugin_type: str) -> list[str]:
         return list(self._get_plugin_type(plugin_type).plugin_classes.keys())
 
     @overload
-    def get_plugin_class(self, plugin_type: str, plugin_name: str) -> type:
+    def get_plugin_class(self, plugin_type: Literal["shell"], plugin_name: str) -> type[Shell]:
+        pass
+
+    @overload
+    def get_plugin_class(self, plugin_type: Literal["release_vcs"], plugin_name: str) -> type[ReleaseVCS]:
+        pass
+
+    @overload
+    def get_plugin_class(self, plugin_type: Literal["release_hook"], plugin_name: str) -> type[ReleaseHook]:
+        pass
+
+    @overload
+    def get_plugin_class(self, plugin_type: Literal["package_repository"], plugin_name: str) -> type[PackageRepository]:
         pass
 
     @overload
-    def get_plugin_class(self, plugin_type: str, plugin_name: str, expected_type: type[T]) -> type[T]:
+    def get_plugin_class(self, plugin_type: Literal["build_system"], plugin_name: str) -> type[BuildSystem]:
         pass
 
-    def get_plugin_class(self, plugin_type: str, plugin_name: str, expected_type: type | None = None) -> type:
+    @overload
+    def get_plugin_class(self, plugin_type: Literal["package_repository"], plugin_name: str) -> type[PackageRepository]:
+        pass
+
+    @overload
+    def get_plugin_class(self, plugin_type: Literal["build_process"], plugin_name: str) -> type[BuildProcess]:
+        pass
+
+    @overload
+    def get_plugin_class(self, plugin_type: Literal["command"], plugin_name: str) -> type[Command]:
+        pass
+
+    def get_plugin_class(self, plugin_type: str, plugin_name: str) -> type:
         """Return the class registered under the given plugin name."""
         plugin = self._get_plugin_type(plugin_type)
-        cls = plugin.get_plugin_class(plugin_name)
-        return cls
+        return plugin.get_plugin_class(plugin_name)
 
     def get_plugin_module(self, plugin_type: str, plugin_name: str) -> types.ModuleType:
         """Return the module defining the class registered under the given

src/rez/plugin_managers.py

@@ -27,12 +27,12 @@ def create_release_vcs(path: str, vcs_name: str | None = None) -> ReleaseVCS:
     if vcs_name:
         if vcs_name not in vcs_types:
             raise ReleaseVCSError("Unknown version control system: %r" % vcs_name)
-        cls = plugin_manager.get_plugin_class('release_vcs', vcs_name, expected_type=ReleaseVCS)
+        cls = plugin_manager.get_plugin_class('release_vcs', vcs_name)
         return cls(path)
 
     classes_by_level = {}
     for vcs_name in vcs_types:
-        cls = plugin_manager.get_plugin_class('release_vcs', vcs_name, expected_type=ReleaseVCS)
+        cls = plugin_manager.get_plugin_class('release_vcs', vcs_name)
         result = cls.find_vcs_root(path)
         if not result:
             continue

src/rez/release_vcs.py

@@ -52,7 +52,7 @@ def get_shell_class(shell: str | None = None) -> type[Shell]:
             shell = system.shell
 
     from rez.plugin_managers import plugin_manager
-    return plugin_manager.get_plugin_class("shell", shell, Shell)
+    return plugin_manager.get_plugin_class("shell", shell)
 
 
 def create_shell(shell: str | None = None, **kwargs: Any) -> Shell: