🏗️ Make execution_mode class attribute to avoid running init

Ackee-Blockchain · Jan 30, 2024 · 723e470 · 723e470
1 parent 980db5b
commit 723e470
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 38 deletions.
diff --git a/wake/detectors/api.py b/wake/detectors/api.py
@@ -138,6 +138,7 @@ class Detector(Visitor, metaclass=ABCMeta):
     paths: List[Path]
     extra: Dict[Any, Any]
     lsp_provider: Optional[LspProvider]
+    execution_mode: Literal["cli", "lsp", "both"] = "both"  # TODO is this needed?
 
     @property
     def visit_mode(self) -> Literal["paths", "all"]:
@@ -151,18 +152,6 @@ def visit_mode(self) -> Literal["paths", "all"]:
         """
         return "paths"
 
-    # TODO is this needed?
-    @property
-    def execution_mode(self) -> Literal["cli", "lsp", "both"]:
-        """
-        Configurable execution mode of the detector. If set to `cli`, the detector will be executed only when running `wake detect`.
-        If set to `lsp`, the detector will be executed by the LSP server. If set to `both`, the detector will be executed in both cases.
-
-        Returns:
-            Execution mode of the detector.
-        """
-        return "both"
-
     @abstractmethod
     def detect(self) -> List[DetectorResult]:
         """
@@ -497,6 +486,13 @@ def _callback(  # pyright: ignore reportGeneralTypeIssues
             original_callback = command.callback
             command.callback = partial(_callback, command.name)
 
+            if lsp_provider is not None and cls.execution_mode == "cli":
+                detectors.remove(command)
+                continue
+            elif lsp_provider is None and cls.execution_mode == "lsp":
+                detectors.remove(command)
+                continue
+
             try:
                 instance = object.__new__(cls)
                 instance.build = build
@@ -521,13 +517,6 @@ def _callback(  # pyright: ignore reportGeneralTypeIssues
                 with sub_ctx:
                     sub_ctx.command.invoke(sub_ctx)
 
-                if lsp_provider is not None and instance.execution_mode == "cli":
-                    detectors.remove(command)
-                    continue
-                elif lsp_provider is None and instance.execution_mode == "lsp":
-                    detectors.remove(command)
-                    continue
-
                 collected_detectors[command.name] = instance
                 if instance.visit_mode == "all":
                     visit_all_detectors.add(command.name)

diff --git a/wake/printers/api.py b/wake/printers/api.py
@@ -51,6 +51,7 @@ class Printer(Visitor, metaclass=ABCMeta):
     paths: List[Path]
     extra: Dict[Any, Any]
     lsp_provider: Optional[LspProvider]
+    execution_mode: Literal["cli", "lsp", "both"] = "cli"  # TODO remove both?
 
     @property
     def visit_mode(self) -> Literal["paths", "all"]:
@@ -63,18 +64,6 @@ def visit_mode(self) -> Literal["paths", "all"]:
         """
         return "paths"
 
-    # TODO remove both?
-    @property
-    def execution_mode(self) -> Literal["cli", "lsp", "both"]:
-        """
-        Configurable execution mode of the printer. If set to `cli`, the printer will be executed only when running `wake print printer-name`.
-        If set to `lsp`, the printer will be executed by the LSP server. If set to `both`, the printer will be executed in both cases.
-
-        Returns:
-            Execution mode of the printer.
-        """
-        return "cli"
-
     @abstractmethod
     def print(self) -> None:
         """
@@ -292,6 +281,13 @@ def _callback(  # pyright: ignore reportGeneralTypeIssues
             original_callback = command.callback
             command.callback = partial(_callback, command.name)
 
+            if lsp_provider is not None and cls.execution_mode == "cli":
+                printers.remove(command)
+                continue
+            elif lsp_provider is None and cls.execution_mode == "lsp":
+                printers.remove(command)
+                continue
+
             try:
                 instance = object.__new__(cls)
                 instance.build = build
@@ -317,13 +313,6 @@ def _callback(  # pyright: ignore reportGeneralTypeIssues
                 with sub_ctx:
                     sub_ctx.command.invoke(sub_ctx)
 
-                if lsp_provider is not None and instance.execution_mode == "cli":
-                    printers.remove(command)
-                    continue
-                elif lsp_provider is None and instance.execution_mode == "lsp":
-                    printers.remove(command)
-                    continue
-
                 collected_printers[command.name] = instance
                 if instance.visit_mode == "all":
                     visit_all_printers.add(command.name)