Merge branch 'release/0.1.5'

Author: mkdir700

docker-compose.yaml

@@ -68,6 +68,7 @@ services:
       - MYSQL_DATABASE=solana_trade_bot
     volumes:
       - mysql_data:/var/lib/mysql
+      - ./mysql:/docker-entrypoint-initdb.d
     ports:
       - "3307:3306"
     command: --default-authentication-plugin=mysql_native_password

example.config.toml

@@ -42,6 +42,7 @@ mysql_url = "mysql+pymysql://root:root@mysql:3306/solana_trade_bot"
 redis_url = "redis://redis:6379/0"
 
 [sentry]
+enable = true
 dsn = ""
 traces_sample_rate = 1.0
 

mysql/init.sql

@@ -0,0 +1,7 @@
+-- 创建用户并授予权限
+CREATE USER IF NOT EXISTS 'root'@'%' IDENTIFIED BY 'root';
+GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION;
+FLUSH PRIVILEGES;
+
+-- 确保数据库存在
+CREATE DATABASE IF NOT EXISTS solana_trade_bot;

pdm.lock

@@ -19,7 +19,7 @@ dependencies = [
     "anchorpy>=0.20.1",
     "backoff>=2.2.1",
     "solana-tx-parser>=0.0.1",
-    "sentry-sdk>=2.19.0",
+    "sentry-sdk>=2.21.0",
     "cryptography>=44.0.0",
     "grpcio>=1.68.1",
     "grpcio-tools>=1.68.1",

pyproject.toml

@@ -8,8 +8,8 @@
 from cache.auto.raydium_pool import RaydiumPoolCache
 from common.config import settings
 from common.log import logger
+from common.prestart import pre_start
 from db.redis import RedisClient
-from db.session import init_db
 
 
 class AutoUpdateCacheService:
@@ -87,7 +87,7 @@ async def stop(self):
 
 async def main():
     """主函数"""
-    init_db()
+    pre_start()
 
     service = AutoUpdateCacheService()
 

src/cache/main.py

@@ -7,7 +7,14 @@
 from typing import Any, Literal, cast
 
 import tomli
-from pydantic import BaseModel, ConfigDict, Field, MySQLDsn, RedisDsn, field_validator
+from pydantic import (
+    BaseModel,
+    ConfigDict,
+    Field,
+    MySQLDsn,
+    RedisDsn,
+    field_validator,
+)
 from pydantic.fields import FieldInfo
 from pydantic_settings import (
     BaseSettings,
@@ -211,6 +218,12 @@ def validate_target_wallet(cls, value: str) -> Pubkey:
         return Pubkey.from_string(value)
 
 
+class SentryConfig(BaseModel):
+    enable: bool = False
+    dsn: str = ""
+    traces_sample_rate: float = 1.0
+
+
 class Settings(TomlSettings):
     model_config = SettingsConfigDict(
         env_file_encoding="utf-8",
@@ -226,6 +239,7 @@ class Settings(TomlSettings):
     db: DBConfig
     log: LogConfig
     tg_bot: TgBotConfig
+    sentry: SentryConfig
 
 
 class LazySettings:

src/common/config.py

@@ -14,7 +14,7 @@
 # Add console handler with custom format
 logger.add(
     sys.stderr,
-    format="<green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>",
+    format="<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>",
     level=LOG_LEVEL,
     enqueue=True,
 )
@@ -24,7 +24,7 @@
 log_path.mkdir(exist_ok=True)
 logger.add(
     log_path / "error.log",
-    format="{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {name}:{function}:{line} - {message}",
+    format="{time:YYYY-MM-DD HH:mm:ss.SSS} | {level: <8} | {name}:{function}:{line} - {message}",
     level="ERROR",
     rotation="1 day",
     retention="7 days",

src/common/log.py

@@ -0,0 +1,16 @@
+from common.log import logger
+from common.sentry import init_sentry as _init_sentry
+from db.session import init_db as _init_db
+
+
+def pre_start(
+    init_db: bool = True,
+    init_sentry: bool = True,
+):
+    if init_db:
+        _init_db()
+        logger.info("Database initialized")
+
+    if init_sentry:
+        _init_sentry()
+        logger.info("Sentry initialized")

src/common/prestart.py

@@ -0,0 +1,17 @@
+import sentry_sdk
+from pydantic import HttpUrl, ValidationError
+
+from common.config import settings
+
+
+def init_sentry() -> None:
+    if settings.sentry.enable is False:
+        return
+
+    dsn = settings.sentry.dsn
+    try:
+        HttpUrl(dsn)
+    except ValidationError:
+        raise ValueError("Invalid Sentry DSN, must be a valid URL")
+    traces_sample_rate = settings.sentry.traces_sample_rate
+    sentry_sdk.init(dsn=dsn, traces_sample_rate=traces_sample_rate)