fix: use generics to fix type error

raymond-u · Mar 18, 2024 · 7ae1714 · 7ae1714
1 parent 39f98b4
commit 7ae1714
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/lungo_cli/core/plugin.py b/src/lungo_cli/core/plugin.py
@@ -23,7 +23,7 @@
 from ..models.plugin import BaseSettings, Config, PluginOutput
 
 
-class BasePlugin(ABC):
+class BasePlugin[T: BaseSettings](ABC):
     """Base class for all plugins."""
 
     config: ClassVar[Config]
@@ -37,7 +37,7 @@ class BasePlugin(ABC):
 
     def __init__(
         self,
-        settings: BaseSettings,
+        settings: T,
         console: Console,
         context_manager: ContextManager,
         file_utils: FileUtils,
@@ -54,7 +54,7 @@ def __init__(
     # Chaining `classmethod` descriptor with `property` descriptor is no longer supported
     # `ClassVar` parameter cannot include type variables
     @classmethod
-    def get_plugin_settings_cls(cls) -> Type[BaseSettings]:
+    def get_plugin_settings_cls(cls) -> Type[T]:
         return BaseSettings
 
     def get_render_context(self) -> dict[str, Any]:

diff --git a/src/lungo_cli/plugins/filebrowser/plugin.py b/src/lungo_cli/plugins/filebrowser/plugin.py
@@ -1,7 +1,7 @@
-from lungo_cli.core.plugin import BasePlugin, Config
+from lungo_cli.core.plugin import BasePlugin, BaseSettings, Config
 
 
-class Plugin(BasePlugin):
+class Plugin(BasePlugin[BaseSettings]):
     config = Config(
         name="filebrowser",
         descriptive_name="File Browser",

diff --git a/src/lungo_cli/plugins/jupyterhub/plugin.py b/src/lungo_cli/plugins/jupyterhub/plugin.py
@@ -9,7 +9,7 @@ class Settings(BaseSettings):
     password: str | None = None
 
 
-class Plugin(BasePlugin):
+class Plugin(BasePlugin[Settings]):
     config = Config(
         name="jupyterhub",
         descriptive_name="JupyterHub",
@@ -30,7 +30,7 @@ def password_file(self) -> Path:
 
     @classmethod
     @override
-    def get_plugin_settings_cls(cls) -> Type[BaseSettings]:
+    def get_plugin_settings_cls(cls) -> Type[Settings]:
         return Settings
 
     @override

diff --git a/src/lungo_cli/plugins/privatebin/plugin.py b/src/lungo_cli/plugins/privatebin/plugin.py
@@ -1,9 +1,9 @@
 from typing import override
 
-from lungo_cli.core.plugin import BasePlugin, Config
+from lungo_cli.core.plugin import BasePlugin, BaseSettings, Config
 
 
-class Plugin(BasePlugin):
+class Plugin(BasePlugin[BaseSettings]):
     config = Config(
         name="privatebin",
         descriptive_name="PrivateBin",

diff --git a/src/lungo_cli/plugins/rstudio/plugin.py b/src/lungo_cli/plugins/rstudio/plugin.py
@@ -9,7 +9,7 @@ class Settings(BaseSettings):
     password: str | None = None
 
 
-class Plugin(BasePlugin):
+class Plugin(BasePlugin[Settings]):
     config = Config(
         name="rstudio",
         descriptive_name="RStudio",
@@ -27,7 +27,7 @@ def password_file(self) -> Path:
 
     @classmethod
     @override
-    def get_plugin_settings_cls(cls) -> Type[BaseSettings]:
+    def get_plugin_settings_cls(cls) -> Type[Settings]:
         return Settings
 
     @override

diff --git a/src/lungo_cli/plugins/xray/plugin.py b/src/lungo_cli/plugins/xray/plugin.py
@@ -13,7 +13,7 @@ class Settings(BaseSettings):
     ip_range_whitelist: list[IPv4Network] = []
 
 
-class Plugin(BasePlugin):
+class Plugin(BasePlugin[Settings]):
     config = Config(
         name="xray",
         descriptive_name="Xray",
@@ -31,7 +31,7 @@ def salt_file(self) -> Path:
 
     @classmethod
     @override
-    def get_plugin_settings_cls(cls) -> Type[BaseSettings]:
+    def get_plugin_settings_cls(cls) -> Type[Settings]:
         return Settings
 
     @override