Optimize definitions of multiple utility functions (#1001)

* Optimize definitions of multiple utility functions

* Update plugin tools

Author: wu-clan

backend/__init__.py

@@ -1,6 +1,6 @@
 import sqlalchemy as sa
 
-from backend.utils.import_parse import get_all_models
+from backend.utils.dynamic_import import get_all_models
 
 # import all models for auto create db tables
 for cls in get_all_models():

backend/app/admin/crud/crud_user.py

@@ -25,7 +25,7 @@
     UpdateUserParam,
 )
 from backend.app.admin.utils.password_security import get_hash_password
-from backend.utils.import_parse import import_module_cached
+from backend.utils.dynamic_import import import_module_cached
 from backend.utils.serializers import select_join_serialize
 from backend.utils.timezone import timezone
 

backend/app/admin/service/plugin_service.py

@@ -15,8 +15,8 @@
 from backend.core.conf import settings
 from backend.core.path_conf import PLUGIN_DIR
 from backend.database.redis import redis_client
-from backend.plugin.tools import uninstall_requirements_async
-from backend.utils.file_ops import install_git_plugin, install_zip_plugin
+from backend.plugin.installer import install_git_plugin, install_zip_plugin
+from backend.plugin.requirements import uninstall_requirements_async
 from backend.utils.timezone import timezone
 
 

backend/app/admin/utils/password_security.py

@@ -6,7 +6,7 @@
 from backend.common.exception import errors
 from backend.core.conf import settings
 from backend.utils.dynamic_config import load_user_security_config
-from backend.utils.re_verify import is_has_letter, is_has_number, is_has_special_char
+from backend.utils.pattern_validate import is_has_letter, is_has_number, is_has_special_char
 
 password_hash = PasswordHash((BcryptHasher(),))
 

backend/app/task/utils/schedulers.py

@@ -23,7 +23,7 @@
 from backend.core.conf import settings
 from backend.database.db import async_db_session
 from backend.database.redis import redis_client
-from backend.utils._await import run_await
+from backend.utils.async_helper import run_await
 from backend.utils.serializers import select_as_dict
 from backend.utils.timezone import timezone
 

backend/cli.py

@@ -33,10 +33,11 @@
 )
 from backend.database.db import async_db_session, create_tables, drop_tables
 from backend.database.redis import redis_client
-from backend.plugin.tools import get_plugin_sql, get_plugins
+from backend.plugin.core import get_plugin_sql, get_plugins
+from backend.plugin.installer import install_git_plugin, install_zip_plugin
 from backend.utils.console import console
-from backend.utils.file_ops import install_git_plugin, install_zip_plugin, parse_sql_script
-from backend.utils.import_parse import import_module_cached
+from backend.utils.dynamic_import import import_module_cached
+from backend.utils.sql_parser import parse_sql_script
 
 output_help = '\n更多信息，尝试 "[cyan]--help[/]"'
 

backend/common/security/permission.py

@@ -9,7 +9,7 @@
 from backend.common.enums import RoleDataRuleExpressionType, RoleDataRuleOperatorType
 from backend.common.exception import errors
 from backend.core.conf import settings
-from backend.utils.import_parse import get_all_models
+from backend.utils.dynamic_import import get_all_models
 
 
 class RequestPermission:

backend/common/security/rbac.py

@@ -6,7 +6,7 @@
 from backend.common.log import log
 from backend.common.security.jwt import DependsJwtAuth
 from backend.core.conf import settings
-from backend.utils.import_parse import import_module_cached
+from backend.utils.dynamic_import import import_module_cached
 
 
 async def rbac_verify(request: Request, _token: str = DependsJwtAuth) -> None:  # noqa: C901

backend/core/registrar.py

@@ -29,10 +29,10 @@
 from backend.middleware.jwt_auth_middleware import JwtAuthMiddleware
 from backend.middleware.opera_log_middleware import OperaLogMiddleware
 from backend.middleware.state_middleware import StateMiddleware
-from backend.plugin.tools import build_final_router
-from backend.utils.demo_site import demo_site
-from backend.utils.health_check import ensure_unique_route_names, http_limit_callback
-from backend.utils.openapi import simplify_operation_ids
+from backend.plugin.core import build_final_router
+from backend.utils.demo_mode import demo_site
+from backend.utils.limiter import http_limit_callback
+from backend.utils.openapi import ensure_unique_route_names, simplify_operation_ids
 from backend.utils.otel import init_otel
 from backend.utils.serializers import MsgSpecJSONResponse
 from backend.utils.snowflake import snowflake

backend/main.py

@@ -2,7 +2,8 @@
 from rich.text import Text
 
 from backend.core.registrar import register_app
-from backend.plugin.tools import get_plugins, install_requirements
+from backend.plugin.core import get_plugins
+from backend.plugin.requirements import install_requirements
 from backend.utils.console import console
 from backend.utils.timezone import timezone