Refactor CLI structure and update imports

- Updated the entry point for the `auralogger` CLI in `pyproject.toml` to reflect new module structure.
- Refactored imports in `__init__.py` and `client_log.py` to align with the new CLI command organization.
- Removed deprecated files related to CLI commands and authentication to streamline the codebase.
- Enhanced modularity by moving command implementations to the `cli` namespace.

Author: Bhanu-Vardhan-Reddy

auralogger/__init__.py

@@ -1,35 +1,34 @@
 """Public API barrel (mirrors node/src/index.ts)."""
 
-from auralogger.aura_log import AuraServer, aura_log, close_aura_log_socket
-from auralogger.backend_origin import (
-    build_create_browser_logs_url,
-    build_proj_auth_url,
-    build_project_logs_url,
-)
 from auralogger.client.client_log import (
     AuraClient,
     ClientLogInputs,
     auralog,
     client_log,
     close_client_log_socket,
 )
-from auralogger.commands.client_check import run_client_check
-from auralogger.commands.init import run_init
-from auralogger.commands.server_check import run_server_check
-from auralogger.commands.test_clientlog import run_test_clientlog
-from auralogger.commands.test_serverlog import run_test_serverlog
-from auralogger.get_logs import run_get_logs
-from auralogger.get_logs_filters import ApiLogFilter, normalize_and_validate_filters
-from auralogger.http_utils import parse_error_body
-from auralogger.log import log
-from auralogger.log_styles import (
+from auralogger.cli.commands.client_check import run_client_check
+from auralogger.cli.commands.init import run_init
+from auralogger.cli.commands.server_check import run_server_check
+from auralogger.cli.commands.test_clientlog import run_test_clientlog
+from auralogger.cli.commands.test_serverlog import run_test_serverlog
+from auralogger.cli.get_logs import run_get_logs
+from auralogger.cli.get_logs_filters import ApiLogFilter, normalize_and_validate_filters
+from auralogger.cli.log_styles import (
     DEFAULT_LOG_STYLE_SPEC,
     build_style_entries_from_api,
     resolve_log_style_spec,
     style_map_from_config_entries,
 )
-from auralogger.parser import ParsedFilter, ParsedGetLogsCommand, parse_command
-from auralogger.proj_auth import fetch_proj_auth_config, fetch_proj_auth_payload
+from auralogger.server.aura_log import AuraServer, aura_log, close_aura_log_socket
+from auralogger.server.proj_auth import fetch_proj_auth_config, fetch_proj_auth_payload
+from auralogger.utils.backend_origin import (
+    build_create_browser_logs_url,
+    build_proj_auth_url,
+    build_project_logs_url,
+)
+from auralogger.utils.http_utils import parse_error_body
+from auralogger.utils.parser import ParsedFilter, ParsedGetLogsCommand, parse_command
 
 __all__ = [
     "aura_log",
@@ -40,7 +39,6 @@
     "auralog",
     "client_log",
     "close_client_log_socket",
-    "log",
     "run_get_logs",
     "normalize_and_validate_filters",
     "ApiLogFilter",

auralogger/cli/__init__.py

@@ -0,0 +1,19 @@
+"""CLI package. Entrypoint: ``auralogger.cli.cli`` (``main``, ``print_usage``)."""
+
+from __future__ import annotations
+
+from typing import Any
+
+__all__ = ["main", "print_usage"]
+
+
+def __getattr__(name: str) -> Any:
+    if name == "main":
+        from auralogger.cli.cli import main
+
+        return main
+    if name == "print_usage":
+        from auralogger.cli.cli import print_usage
+
+        return print_usage
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

auralogger/cli.py auralogger/cli/cli.pyauralogger/cli.py renamed to auralogger/cli/cli.py

@@ -3,13 +3,13 @@
 import sys
 from typing import TextIO
 
-from auralogger.cli_load_env import load_cli_env_files
-from auralogger.commands.client_check import run_client_check
-from auralogger.commands.get_logs_cmd import run_get_logs_command
-from auralogger.commands.init import run_init
-from auralogger.commands.server_check import run_server_check
-from auralogger.commands.test_clientlog import run_test_clientlog
-from auralogger.commands.test_serverlog import run_test_serverlog
+from auralogger.cli.cli_load_env import load_cli_env_files
+from auralogger.cli.commands.client_check import run_client_check
+from auralogger.cli.commands.get_logs_cmd import run_get_logs_command
+from auralogger.cli.commands.init import run_init
+from auralogger.cli.commands.server_check import run_server_check
+from auralogger.cli.commands.test_clientlog import run_test_clientlog
+from auralogger.cli.commands.test_serverlog import run_test_serverlog
 
 
 def print_usage(stream: TextIO = sys.stdout) -> None:

auralogger/cli_auth.py auralogger/cli/cli_auth.pyauralogger/cli_auth.py renamed to auralogger/cli/cli_auth.py

@@ -5,13 +5,13 @@
 from dataclasses import dataclass
 from typing import Any, Dict, cast
 
-from auralogger.env_config import ENV_PROJECT_TOKEN
-from auralogger.env_config import (
+from auralogger.server.proj_auth import fetch_proj_auth_payload
+from auralogger.utils.env_config import ENV_PROJECT_TOKEN
+from auralogger.utils.env_config import (
     ENV_USER_SECRET,
     get_resolved_project_token,
     get_resolved_user_secret,
 )
-from auralogger.proj_auth import fetch_proj_auth_payload
 
 
 @dataclass(frozen=True)

auralogger/cli_load_env.py auralogger/cli/cli_load_env.pyauralogger/cli_load_env.py renamed to auralogger/cli/cli_load_env.py

@@ -9,11 +9,11 @@
 import websocket
 from websocket import create_connection
 
-from auralogger.backend_origin import (
+from auralogger.cli.cli_auth import resolve_project_context_for_cli_checks
+from auralogger.utils.backend_origin import (
     build_create_browser_logs_url,
     resolve_ws_base_url,
 )
-from auralogger.cli_auth import resolve_project_context_for_cli_checks
 
 CONNECT_TIMEOUT_S = 5
 

auralogger/commands/__init__.py auralogger/cli/commands/__init__.pyauralogger/commands/__init__.py renamed to auralogger/cli/commands/__init__.py

@@ -2,7 +2,7 @@
 
 from typing import List
 
-from auralogger.get_logs import run_get_logs
+from auralogger.cli.get_logs import run_get_logs
 
 
 def run_get_logs_command(argv: List[str]) -> None:

auralogger/commands/client_check.py auralogger/cli/commands/client_check.pyauralogger/commands/client_check.py renamed to auralogger/cli/commands/client_check.py

@@ -5,8 +5,10 @@
 import os
 from typing import Any, Dict, List, cast
 
-from auralogger.cli_auth import resolve_project_token_for_init, resolve_user_secret_for_init
-from auralogger.env_config import (
+from auralogger.cli.cli_auth import resolve_project_token_for_init, resolve_user_secret_for_init
+from auralogger.cli.log_styles import build_style_entries_from_api
+from auralogger.server.proj_auth import fetch_proj_auth_payload
+from auralogger.utils.env_config import (
     ENV_NEXT_PUBLIC_PROJECT_TOKEN,
     ENV_PROJECT_SESSION,
     ENV_PROJECT_TOKEN,
@@ -17,8 +19,6 @@
     get_resolved_session,
     is_full_runtime_env_configured,
 )
-from auralogger.log_styles import build_style_entries_from_api
-from auralogger.proj_auth import fetch_proj_auth_payload
 
 
 def _user_secret_explicitly_in_env() -> bool:

auralogger/commands/get_logs_cmd.py auralogger/cli/commands/get_logs_cmd.pyauralogger/commands/get_logs_cmd.py renamed to auralogger/cli/commands/get_logs_cmd.py

@@ -9,8 +9,8 @@
 import websocket
 from websocket import create_connection
 
-from auralogger.backend_origin import resolve_ws_base_url
-from auralogger.cli_auth import resolve_project_context_for_cli_checks
+from auralogger.cli.cli_auth import resolve_project_context_for_cli_checks
+from auralogger.utils.backend_origin import resolve_ws_base_url
 
 CONNECT_TIMEOUT_S = 5