From 3396644da35a45ec176532c9dde23a2d26079fab Mon Sep 17 00:00:00 2001 From: Marrrrrrrrry <34876935+Marrrrrrrrry@users.noreply.github.com> Date: Wed, 9 Sep 2026 17:00:42 +0800 Subject: [PATCH] refactor: move config and tasks modules from core to apps/base (core no longer imports apps) --- apps/admin/services.py | 2 +- {core => apps/base}/config.py | 0 {core => apps/base}/tasks.py | 2 +- main.py | 4 ++-- tests/test_admin_security.py | 2 +- tests/test_cleanup_tasks.py | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) rename {core => apps/base}/config.py (100%) rename {core => apps/base}/tasks.py (99%) diff --git a/apps/admin/services.py b/apps/admin/services.py index b1dd9ba..f9581c4 100644 --- a/apps/admin/services.py +++ b/apps/admin/services.py @@ -13,7 +13,7 @@ from core.settings import ( ADMIN_SESSION_EXPIRE_MIN, settings, ) -from core.config import refresh_settings +from apps.base.config import refresh_settings from core.security import INTERNAL_CONFIG_KEYS, generate_jwt_secret from apps.base.models import FileCodes, KeyValue from apps.base.utils import get_expire_info, get_file_path_name diff --git a/core/config.py b/apps/base/config.py similarity index 100% rename from core/config.py rename to apps/base/config.py diff --git a/core/tasks.py b/apps/base/tasks.py similarity index 99% rename from core/tasks.py rename to apps/base/tasks.py index bb57d5f..f4047de 100644 --- a/core/tasks.py +++ b/apps/base/tasks.py @@ -15,7 +15,7 @@ from apps.base.models import ( UploadChunk, ) from apps.base.utils import ip_limit, get_chunk_file_path_name -from core.config import refresh_settings +from apps.base.config import refresh_settings from core.logger import logger from core.settings import settings, data_root from core.storage import FileStorageInterface, storages diff --git a/main.py b/main.py index b6b605c..6097258 100644 --- a/main.py +++ b/main.py @@ -17,7 +17,7 @@ from tortoise.contrib.fastapi import register_tortoise from apps.admin.views import admin_api from apps.base.models import KeyValue from apps.base.views import share_api, chunk_api, presign_api -from core.config import ( +from apps.base.config import ( ensure_security_settings, ensure_settings_row, initialize_system, @@ -28,7 +28,7 @@ from core.database import db_startup_lock, get_db_config, init_db from core.logger import get_log_level_name, is_access_log_enabled, logger from core.response import APIResponse from core.settings import settings, BASE_DIR, DEFAULT_CONFIG -from core.tasks import ( +from apps.base.tasks import ( clean_expired_presign_sessions, clean_incomplete_uploads, delete_expire_files, diff --git a/tests/test_admin_security.py b/tests/test_admin_security.py index 290bc51..3be32a4 100644 --- a/tests/test_admin_security.py +++ b/tests/test_admin_security.py @@ -5,7 +5,7 @@ import unittest import apps.admin.services as admin_services import apps.admin.views as admin_views import apps.admin.dependencies as admin_dependencies -import core.config as core_config +import apps.base.config as core_config from apps.admin.dependencies import create_token, verify_token from apps.admin.schemas import LoginData from apps.admin.services import ConfigService diff --git a/tests/test_cleanup_tasks.py b/tests/test_cleanup_tasks.py index e95ed26..0db4505 100644 --- a/tests/test_cleanup_tasks.py +++ b/tests/test_cleanup_tasks.py @@ -19,7 +19,7 @@ from apps.base.models import ( StorageReservation, UploadChunk, ) -from core.tasks import ( +from apps.base.tasks import ( clean_expired_presign_sessions, clean_incomplete_uploads, delete_expire_files, @@ -38,9 +38,9 @@ class _OneRoundMixin(SettingsOverrideMixin): def _sleep(seconds): raise SleepSentinel - with patch("core.tasks.data_root", Path(tmpdir)), patch( + with patch("apps.base.tasks.data_root", Path(tmpdir)), patch( "core.storage.data_root", Path(tmpdir) - ), patch("core.tasks.asyncio.sleep", side_effect=_sleep): + ), patch("apps.base.tasks.asyncio.sleep", side_effect=_sleep): try: await task_coro_factory() except SleepSentinel: