clan-app: Add a 'group' to log_manager. Move log_manager to own subdirectory

pkgs/clan-app/clan_app/app.py

@@ -8,14 +8,15 @@ from dataclasses import dataclass
 from pathlib import Path
 
 import clan_lib.machines.actions  # noqa: F401
-from clan_lib.api import API, ApiError, ErrorDataClass, SuccessDataClass
-from clan_lib.api.log_manager import LogDayDir, LogFile, LogFuncDir, LogManager
+from clan_lib.api import API, ErrorDataClass, SuccessDataClass
 
 # TODO: We have to manually import python files to make the API.register be triggered.
 # We NEED to fix this, as this is super unintuitive and error-prone.
 from clan_lib.api.tasks import list_tasks as dummy_list  # noqa: F401
 from clan_lib.custom_logger import setup_logging
 from clan_lib.dirs import user_data_dir
+from clan_lib.log_manager import LogManager
+from clan_lib.log_manager import api as log_manager_api
 
 from clan_app.api.file_gtk import open_file
 from clan_app.deps.webview.webview import Size, SizeHint, Webview
@@ -47,7 +48,9 @@ def app_run(app_opts: ClanAppOptions) -> int:
     # This seems to call the gtk api correctly but and gtk also seems to our icon, but somehow the icon is not loaded.
     webview.icon = "clan-white"
 
-    log_manager = LogManager(base_dir=user_data_dir() / "clan-app" / "logs")
+    log_manager_api.LOG_MANAGER_INSTANCE = LogManager(
+        base_dir=user_data_dir() / "clan-app" / "logs"
+    )
 
     def cancel_task(
         task_id: str, *, op_key: str
@@ -79,118 +82,10 @@ def app_run(app_opts: ClanAppOptions) -> int:
             status="success",
         )
 
-    def list_log_days(
-        *, op_key: str
-    ) -> SuccessDataClass[list[LogDayDir]] | ErrorDataClass:
-        """List all log days."""
-        log.debug("Listing all log days.")
-        return SuccessDataClass(
-            op_key=op_key,
-            data=log_manager.list_log_days(),
-            status="success",
-        )
-
-    def list_log_funcs_at_day(
-        day: str, *, op_key: str
-    ) -> SuccessDataClass[list[LogFuncDir]] | ErrorDataClass:
-        """List all log functions at a specific day."""
-        log.debug(f"Listing all log functions for day: {day}")
-        try:
-            log_day_dir = LogDayDir(date_day=day, _base_dir=log_manager.base_dir)
-        except ValueError:
-            return ErrorDataClass(
-                op_key=op_key,
-                status="error",
-                errors=[
-                    ApiError(
-                        message="Invalid day format",
-                        description=f"Day {day} is not in the correct format (YYYY-MM-DD).",
-                        location=["app::list_log_funcs_at_day", "day"],
-                    )
-                ],
-            )
-        return SuccessDataClass(
-            op_key=op_key,
-            data=log_day_dir.get_log_files(),
-            status="success",
-        )
-
-    def list_log_files(
-        day: str, func_name: str, *, op_key: str
-    ) -> SuccessDataClass[list[LogFile]] | ErrorDataClass:
-        """List all log functions at a specific day."""
-        log.debug(f"Listing all log functions for day: {day}")
-
-        try:
-            log_func_dir = LogFuncDir(
-                date_day=day, func_name=func_name, _base_dir=log_manager.base_dir
-            )
-        except ValueError:
-            return ErrorDataClass(
-                op_key=op_key,
-                status="error",
-                errors=[
-                    ApiError(
-                        message="Invalid day format",
-                        description=f"Day {day} is not in the correct format (YYYY-MM-DD).",
-                        location=["app::list_log_files", "day"],
-                    )
-                ],
-            )
-        return SuccessDataClass(
-            op_key=op_key,
-            data=log_func_dir.get_log_files(),
-            status="success",
-        )
-
-    def get_log_file(
-        id_key: str, *, op_key: str
-    ) -> SuccessDataClass[str] | ErrorDataClass:
-        """Get a specific log file."""
-
-        try:
-            log_file = log_manager.get_log_file(id_key)
-        except ValueError:
-            return ErrorDataClass(
-                op_key=op_key,
-                status="error",
-                errors=[
-                    ApiError(
-                        message="Invalid log file ID",
-                        description=f"Log file ID {id_key} is not in the correct format.",
-                        location=["app::get_log_file", "id_key"],
-                    )
-                ],
-            )
-
-        if not log_file:
-            return ErrorDataClass(
-                op_key=op_key,
-                status="error",
-                errors=[
-                    ApiError(
-                        message="Log file not found",
-                        description=f"Log file with id {id_key} not found.",
-                        location=["app::get_log_file", "id_key"],
-                    )
-                ],
-            )
-
-        log_file_path = log_file.get_file_path()
-        return SuccessDataClass(
-            op_key=op_key,
-            data=log_file_path.read_text(encoding="utf-8"),
-            status="success",
-        )
-
     API.overwrite_fn(list_tasks)
     API.overwrite_fn(open_file)
     API.overwrite_fn(cancel_task)
-    API.overwrite_fn(list_log_days)
-    API.overwrite_fn(list_log_funcs_at_day)
-    API.overwrite_fn(list_log_files)
-    API.overwrite_fn(get_log_file)
-    webview.bind_jsonschema_api(API, log_manager=log_manager)
+    webview.bind_jsonschema_api(API, log_manager=log_manager_api.LOG_MANAGER_INSTANCE)
     webview.size = Size(1280, 1024, SizeHint.NONE)
     webview.navigate(content_uri)
     webview.run()

pkgs/clan-app/clan_app/deps/webview/webview.py

@@ -16,9 +16,9 @@ from clan_lib.api import (
     dataclass_to_dict,
     from_dict,
 )
-from clan_lib.api.log_manager import LogManager
 from clan_lib.async_run import AsyncContext, get_async_ctx, set_async_ctx
 from clan_lib.custom_logger import setup_logging
+from clan_lib.log_manager import LogManager
 
 from ._webview_ffi import _encode_c_string, _webview_lib