remove singleton class

Author: mohammedahmed18

codeflash/lsp/beta.py

@@ -30,7 +30,7 @@
 )
 from codeflash.either import is_successful
 from codeflash.lsp.features.perform_optimization import get_cancelled_reponse, sync_perform_optimization
-from codeflash.lsp.server import CodeflashServerSingleton
+from codeflash.lsp.server import CodeflashLanguageServer, CodeflashLanguageServerProtocol
 
 if TYPE_CHECKING:
     from argparse import Namespace
@@ -87,7 +87,7 @@ class WriteConfigParams:
     config: any
 
 
-server = CodeflashServerSingleton.get()
+server = CodeflashLanguageServer("codeflash-language-server", "v1.0", protocol_cls=CodeflashLanguageServerProtocol)
 
 
 @server.feature("getOptimizableFunctionsInCurrentDiff")
@@ -421,7 +421,7 @@ async def perform_function_optimization(params: FunctionOptimizationParams) -> d
 
         try:
             ctx = contextvars.copy_context()
-            return await loop.run_in_executor(None, ctx.run, sync_perform_optimization, params)
+            return await loop.run_in_executor(None, ctx.run, sync_perform_optimization, server, params)
         except asyncio.CancelledError:
             server.cancel_event.set()
             return get_cancelled_reponse()

codeflash/lsp/features/perform_optimization.py

@@ -7,11 +7,12 @@
 from codeflash.cli_cmds.console import code_print
 from codeflash.code_utils.git_worktree_utils import create_diff_patch_from_worktree
 from codeflash.either import is_successful
-from codeflash.lsp.server import CodeflashServerSingleton
 
 if TYPE_CHECKING:
     import threading
 
+    from codeflash.lsp.server import CodeflashLanguageServer
+
 
 def get_cancelled_reponse() -> dict[str, str]:
     return {"status": "canceled", "message": "Task was canceled"}
@@ -22,8 +23,7 @@ def abort_if_cancelled(cancel_event: threading.Event) -> None:
         raise RuntimeError("cancelled")
 
 
-def sync_perform_optimization(params) -> dict[str, str]:  # noqa
-    server = CodeflashServerSingleton.get()
+def sync_perform_optimization(server: CodeflashLanguageServer, params) -> dict[str, str]:  # noqa
     cancel_event = server.cancel_event
     server.show_message_log(f"Starting optimization for function: {params.functionName}", "Info")
     should_run_experiment, code_context, original_helper_code = server.current_optimization_init_result

codeflash/lsp/lsp_message.py

@@ -6,7 +6,6 @@
 from typing import Any, Optional
 
 from codeflash.lsp.helpers import replace_quotes_with_backticks, simplify_worktree_paths
-from codeflash.lsp.server import CodeflashServerSingleton
 
 json_primitive_types = (str, float, int, bool)
 max_code_lines_before_collapse = 45
@@ -35,8 +34,9 @@ def type(self) -> str:
         raise NotImplementedError
 
     def serialize(self) -> str:
-        lsp_server_instance = CodeflashServerSingleton.get()
-        current_task_id = lsp_server_instance.execution_context_vars.get().get("task_id", None)
+        from codeflash.lsp.beta import server
+
+        current_task_id = server.execution_context_vars.get().get("task_id", None)
         data = self._loop_through(asdict(self))
         ordered = {"type": self.type(), "task_id": current_task_id, **data}
         return message_delimiter + json.dumps(ordered) + message_delimiter

codeflash/lsp/server.py

@@ -18,22 +18,6 @@ class CodeflashLanguageServerProtocol(LanguageServerProtocol):
     _server: CodeflashLanguageServer
 
 
-class CodeflashServerSingleton:
-    _instance: CodeflashLanguageServer | None = None
-
-    @classmethod
-    def get(cls) -> CodeflashLanguageServer:
-        if cls._instance is None:
-            cls._instance = CodeflashLanguageServer(
-                "codeflash-language-server", "v1.0", protocol_cls=CodeflashLanguageServerProtocol
-            )
-        return cls._instance
-
-    def __init__(self) -> None:
-        # This is a singleton class, so we don't want to initialize.
-        ...
-
-
 class CodeflashLanguageServer(LanguageServer):
     def __init__(self, name: str, version: str, protocol_cls: type[LanguageServerProtocol]) -> None:
         super().__init__(name, version, protocol_cls=protocol_cls)