fix: stop from get loaded context in async (#3852)

Author: benfdking

web/server/api/endpoints/directories.py

@@ -21,7 +21,7 @@ async def write_directory(
 ) -> models.Directory:
     """Create or rename a directory."""
     if new_path:
-        new_path = await validate_path(new_path, settings)
+        new_path = validate_path(new_path, settings)
         replace_file(settings.project_path / path, settings.project_path / new_path)
         return models.Directory(name=os.path.basename(new_path), path=new_path)
 

web/server/api/endpoints/files.py

@@ -25,9 +25,9 @@
 
 
 @router.get("", response_model=models.Directory)
-async def get_files(settings: Settings = Depends(get_settings)) -> models.Directory:
+def get_files(settings: Settings = Depends(get_settings)) -> models.Directory:
     """Get all project files."""
-    return await _get_directory(settings.project_path, settings)
+    return _get_directory(settings.project_path, settings)
 
 
 @router.get("/{path:path}", response_model=models.File)
@@ -56,7 +56,7 @@ async def write_file(
     """Create, update, or rename a file."""
     path_or_new_path = path
     if new_path:
-        path_or_new_path = await validate_path(new_path, settings)
+        path_or_new_path = validate_path(new_path, settings)
         replace_file(settings.project_path / path, settings.project_path / path_or_new_path)
     else:
         full_path = settings.project_path / path
@@ -70,7 +70,7 @@ async def write_file(
             format_file_status = models.FormatFileStatus(
                 status=models.Status.INIT, path=path_or_new_path
             )
-            path_to_model_mapping = await get_path_to_model_mapping(settings=settings)
+            path_to_model_mapping = get_path_to_model_mapping(settings=settings)
             model = path_to_model_mapping.get(Path(full_path))
             default_dialect = config.dialect
             dialect = model.dialect if model and model.is_sql else default_dialect
@@ -118,8 +118,8 @@ async def delete_file(
         )
 
 
-async def _get_directory(path: str | Path, settings: Settings) -> models.Directory:
-    context = await get_context(settings)
+def _get_directory(path: str | Path, settings: Settings) -> models.Directory:
+    context = get_context(settings)
     ignore_patterns = context.config.ignore_patterns if context else c.IGNORE_PATTERNS
 
     def walk_path(

web/server/main.py

@@ -35,7 +35,7 @@ async def dispatch() -> None:
 
     app.state.dispatch_task.cancel()
     app.state.watch_task.cancel()
-    context = await get_context_or_raise(settings=get_settings())
+    context = get_context_or_raise(settings=get_settings())
     context.close()
 
 

web/server/settings.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-import asyncio
+import contextlib
 import logging
 import os
+import threading
 import typing as t
-from contextlib import asynccontextmanager
 from functools import lru_cache
 from pathlib import Path
 
@@ -19,7 +19,8 @@
 from web.server.models import Mode
 
 logger = logging.getLogger(__name__)
-get_context_lock = asyncio.Lock()
+
+get_loaded_context_lock = threading.Lock()
 
 MODE_TO_MODULES = {
     models.Mode.IDE: {
@@ -82,46 +83,39 @@ def _get_path_to_model_mapping(context: Context) -> dict[Path, Model]:
     return {model._path: model for model in context._models.values()}
 
 
-async def get_path_to_model_mapping(
+def get_path_to_model_mapping(
     settings: Settings = Depends(get_settings),
 ) -> dict[Path, Model]:
     try:
-        async with asynccontextmanager(get_loaded_context)(settings) as context:
+        with contextlib.contextmanager(get_loaded_context)(settings) as context:
             return _get_path_to_model_mapping(context)
     except Exception:
         logger.exception("Error creating a context")
         return {}
 
 
-async def get_loaded_context(settings: Settings = Depends(get_settings)) -> t.AsyncGenerator:
-    loop = asyncio.get_running_loop()
-
+def get_loaded_context(
+    settings: Settings = Depends(get_settings),
+) -> t.Generator[Context, None]:
     try:
-        async with get_context_lock:
-            yield await loop.run_in_executor(
-                None,
-                _get_loaded_context,
-                settings.project_path,
-                settings.config,
-                settings.gateway,
-            )
+        with get_loaded_context_lock:
+            yield _get_loaded_context(settings.project_path, settings.config, settings.gateway)
     except Exception:
         raise ApiException(
             message="Unable to create a loaded context",
             origin="API -> settings -> get_loaded_context",
         )
 
 
-async def get_context(settings: Settings = Depends(get_settings)) -> t.Optional[Context]:
+def get_context(settings: Settings = Depends(get_settings)) -> t.Optional[Context]:
     try:
-        async with get_context_lock:
-            return _get_context(settings.project_path, settings.config, settings.gateway)
+        return _get_context(settings.project_path, settings.config, settings.gateway)
     except Exception:
         return None
 
 
-async def get_context_or_raise(settings: Settings = Depends(get_settings)) -> Context:
-    context = await get_context(settings)
+def get_context_or_raise(settings: Settings = Depends(get_settings)) -> Context:
+    context = get_context(settings)
     if not context:
         raise ApiException(
             message="Unable to create a context",

web/server/utils.py

@@ -51,8 +51,8 @@ def func_wrapper() -> R:
     return await loop.run_in_executor(None, func_wrapper)
 
 
-async def validate_path(path: str, settings: Settings = Depends(get_settings)) -> str:
-    context = await get_context(settings)
+def validate_path(path: str, settings: Settings = Depends(get_settings)) -> str:
+    context = get_context(settings)
     resolved_path = settings.project_path.resolve()
     full_path = (resolved_path / path).resolve()
     try:

web/server/watcher.py

@@ -21,7 +21,7 @@
 
 async def watch_project() -> None:
     settings = get_settings()
-    context = await get_context(settings)
+    context = get_context(settings)
     paths = [
         (settings.project_path / c.AUDITS).resolve(),
         (settings.project_path / c.MACROS).resolve(),
@@ -57,10 +57,10 @@ async def watch_project() -> None:
                         )
                     )
                 elif change == Change.added:
-                    directory = await _get_directory(path.parent, settings)
+                    directory = _get_directory(path.parent, settings)
                     directories[directory.path] = directory
                 elif path.is_dir() and change == Change.modified:
-                    directory = await _get_directory(path, settings)
+                    directory = _get_directory(path, settings)
                     directories[directory.path] = directory
                 elif path.is_file() and change == Change.modified:
                     changes.append(