Fix and refactor CLI code

Author: bkis

Tekst-API/tekst/__main__.py

@@ -25,41 +25,40 @@
 """
 
 
-async def _init_odm() -> None:
-    from tekst import db
-
-    await db.init_odm()
-
-
 async def _create_indices() -> None:
-    await _init_odm()
-    from tekst import search
+    from tekst import db, search
 
+    await db.init_odm()
     await search.create_indices_task()
     await search.close()
+    await db.close()
 
 
 async def _refresh_precomputed_cache(force: bool) -> None:
-    await _init_odm()
-    from tekst import resources
+    from tekst import db, resources
 
+    await db.init_odm()
     await resources.call_resource_precompute_hooks(force=force)
+    await db.close()
 
 
 async def _cleanup() -> None:
-    await _init_odm()
-    from tekst import platform
+    from tekst import db, platform
 
+    await db.init_odm()
     await platform.cleanup_task()
+    await db.close()
 
 
 async def _maintenance() -> None:
-    await _init_odm()
-    from tekst import platform, resources, search
+    from tekst import db, platform, resources, search
 
+    await db.init_odm()
     await search.create_indices_task()
     await resources.call_resource_precompute_hooks()
     await platform.cleanup_task()
+    await search.close()
+    await db.close()
 
 
 async def _export(
@@ -77,6 +76,12 @@ async def _export(
         click.echo(f"Output directory {output_dir_path} is not a directory", err=True)
         exit(1)
 
+    # prepare system
+    from tekst import db, resources
+    from tekst.routers import resources as resources_router
+
+    await db.init_odm()
+
     # delete all existing files in output directory
     if delete:
         if not quiet:
@@ -85,11 +90,6 @@ async def _export(
             if child.is_file():
                 child.unlink()
 
-    # prepare system
-    await _init_odm()
-    from tekst import resources
-    from tekst.routers import resources as resources_router
-
     # call precompute hooks
     await resources.call_resource_precompute_hooks()
 
@@ -141,6 +141,8 @@ async def _export(
             if not quiet:
                 click.echo(f"Exported resource {res_id_str} as {str(target_path)}.")
 
+    await db.close()
+
 
 @click.command()
 def bootstrap():

Tekst-API/tekst/auth.py

@@ -1,6 +1,7 @@
 import contextlib
 import re
 
+from collections.abc import Callable
 from typing import Annotated, Any
 
 import fastapi_users.models as fapi_users_models
@@ -388,7 +389,7 @@ def setup_auth_routes(app: FastAPI) -> list[APIRouter]:
     )
 
 
-def _current_user(**kwargs) -> callable:
+def _current_user(**kwargs) -> Callable:
     """Returns auth dependencies for API routes (optional auth in dev mode)"""
     return _fastapi_users.current_user(
         get_enabled_backends=_get_enabled_backends,