pymecli 0.5.5__tar.gz → 0.5.6__tar.gz

{pymecli-0.5.5 → pymecli-0.5.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pymecli
-Version: 0.5.5
+Version: 0.5.6
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli

{pymecli-0.5.5 → pymecli-0.5.6}/cli/fast.py

@@ -18,11 +18,8 @@ from models.response import SuccessResponse
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     """管理应用生命周期的上下文管理器"""
-    redis_pool = redis.ConnectionPool(
-        host=settings.REDIS_HOST,
-        port=settings.REDIS_PORT,
-        db=settings.REDIS_DB,
-        password=settings.REDIS_PASSWORD,
+    redis_pool = redis.ConnectionPool.from_url(
+        settings.REDIS_URL,
         max_connections=20,  # 根据需要调整最大连接数
         decode_responses=True,
     )
@@ -152,16 +149,15 @@ def run_app(
         "-p",
         help="服务器代理,传入则通过代理转换Clash订阅,比如:socks5://127.0.0.1:7897",
     ),
-    redis_host: str = typer.Option(
+    redis_url: str = typer.Option(
         None,
-        "--redis-host",
-        "-r",
-        help="redis host",
+        "--redis-url",
+        help="redis url, 格式: redis://[user:password@]host[:port][/db]",
     ),
 ):
     settings.reload()
-    if redis_host is not None:
-        settings.REDIS_HOST = redis_host
+    if redis_url is not None:
+        settings.REDIS_URL = redis_url
 
     clash_config = ClashConfig(rule, my_rule, proxy)
     init_generator(clash_config)

{pymecli-0.5.5 → pymecli-0.5.6}/core/config.py

@@ -13,10 +13,7 @@ class Settings(BaseSettings):
     API_V1_STR: str = "/api/v1"
     PROJECT_NAME: str = metadata["Name"]
 
-    REDIS_HOST: str = "192.168.123.7"
-    REDIS_PORT: int = 6379
-    REDIS_DB: int = 0
-    REDIS_PASSWORD: str = ""
+    REDIS_URL: str = "redis://192.168.123.7:6379/0"
 
     PROJECT_DESCRIPTION: str = (
         f"{metadata['Summary']}, FastAPI提供: clash订阅转换、redis API"

{pymecli-0.5.5 → pymecli-0.5.6}/core/redis_client.py

@@ -8,26 +8,17 @@ import redis
 class RedisClient:
     def __init__(
         self,
-        host=os.getenv("REDIS_HOST", "192.168.123.7"),
-        port=int(os.getenv("REDIS_PORT", 6379)),
-        db=int(os.getenv("REDIS_DB", 0)),
-        password=os.getenv("REDIS_PASSWORD"),
-        decode_responses=True,
+        url: str = os.getenv("REDIS_URL", "redis://192.168.123.7:6379/0"),
+        decode_responses: bool = True,
     ):
         """
         初始化Redis客户端
-        :param host: Redis服务器地址
-        :param port: Redis服务器端口
-        :param db: 数据库编号
-        :param password: 密码（如果需要）
+        :param url: Redis连接URL, 格式 redis://[user:password@]host[:port][/db]
         :param decode_responses: 是否自动解码响应（将字节转换为字符串）
         """
 
-        self.client = redis.Redis(
-            host=host,
-            port=port,
-            db=db,
-            password=password,
+        self.client = redis.Redis.from_url(
+            url,
             decode_responses=decode_responses,
             socket_connect_timeout=5,
             socket_timeout=5,

{pymecli-0.5.5 → pymecli-0.5.6}/pyproject.toml

@@ -36,7 +36,7 @@
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.5.5"
+  version = "0.5.6"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"

{pymecli-0.5.5 → pymecli-0.5.6}/utils/mysql.py

@@ -1,4 +1,6 @@
 import os
+import re
+from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
 
 import pandas as pd
 from dotenv import load_dotenv
@@ -8,25 +10,62 @@ from utils import logger
 from utils.pd import deduplicated, dt_to_timestamp
 from utils.pyredis import get_redis_client
 
+# Go go-sql-driver/mysql 专有参数，Python pymysql / SQLAlchemy 不支持
+_GO_DSN_PARAMS = {
+    "parseTime", "loc", "timeout", "readTimeout", "writeTimeout",
+    "allowNativePasswords", "tls", "serverCert", "clientCert",
+    "clientKey", "multiStatements", "columnsWithAlias", "interpolateParams"}
+
+
+def _strip_go_params(query: str) -> str:
+    """从 query string 中移除 Go DSN 专有参数"""
+    if not query:
+        return query
+    kept = [(k, v) for k, v in parse_qsl(query) if k not in _GO_DSN_PARAMS]
+    return urlencode(kept)
+
+
+def _to_sqlalchemy_url(dsn: str) -> str:
+    """
+    将 Go/Node 通用 MySQL DSN 转为 SQLAlchemy URL。
+
+    输入格式(Go go-sql-driver/mysql DSN 或 Node mysql URI):
+        root:password@192.168.123.7:3366/bot_tx?charset=utf8mb4&parseTime=True&loc=Local
+        root:password@tcp(192.168.123.7:3366)/bot_tx?charset=utf8mb4
+        mysql://root:password@192.168.123.7:3306/mydb
+
+    输出格式(SQLAlchemy):
+        mysql+pymysql://root:password@192.168.123.7:3366/bot_tx?charset=utf8mb4
+    """
+    # 如果已经是完整的 scheme:// URL，直接处理
+    if "://" in dsn:
+        parts = urlsplit(dsn)
+        # mysql:// → mysql+pymysql://
+        scheme = parts.scheme
+        if scheme == "mysql":
+            scheme = "mysql+pymysql"
+        return urlunsplit((scheme, parts.netloc, parts.path, _strip_go_params(parts.query), ""))
+
+    # Go DSN 格式：[user[:password]@][tcp(]host[:port][)]/db[?params]
+    # 去掉 tcp() 包装
+    dsn = re.sub(r"tcp\(([^)]+)\)", r"\1", dsn)
+
+    # user:pass@host:port/db?query → mysql+pymysql://user:pass@host:port/db?query
+    url = f"mysql+pymysql://{dsn}"
+    parts = urlsplit(url)
+    return urlunsplit((parts.scheme, parts.netloc, parts.path, _strip_go_params(parts.query), ""))
+
 
 def get_database_engine(env_path: str = ".env") -> Engine:
     """创建数据库引擎"""
     load_dotenv(env_path)
-    host = os.getenv("MYSQL_HOST")
-    port = os.getenv("MYSQL_PORT")
-    database = os.getenv("MYSQL_DATABASE")
-    user = os.getenv("MYSQL_USER")
-    password = os.getenv("MYSQL_PASSWORD")
-
-    engine = create_engine(
-        f"mysql+pymysql://{user}:{password}@{host}:{port}/{database}",
-        connect_args={
-            # 对于MySQL，可以在连接参数中指定时区
-            # "init_command": "SET time_zone='+00:00'",  # UTC时间
-            # 或者使用本地时区，例如：
-            # "init_command": "SET time_zone='+08:00'",  # 中国标准时间
-        },
+    dsn = os.getenv(
+        "MYSQL_URL",
+        "root:@127.0.0.1:3306/?charset=utf8mb4",
     )
+    url = _to_sqlalchemy_url(dsn)
+
+    engine = create_engine(url, connect_args={})
 
     try:
         with engine.connect() as connection:
@@ -123,12 +162,12 @@ async def mysql_to_redis_and_csv(
         id = f"{idx1}_{idx2}"
         key = f"{key_prefix}:{id}"
 
-        # 转换行数据为字典（处理 NaN 为 None 或空字符串）
+        # 转换行数据为字典(处理 NaN 为 None 或空字符串)
         row_dict = row.where(pd.notna(row), "").to_dict()
 
-        # 1. 写入完整数据到 Hash（自动覆盖）
+        # 1. 写入完整数据到 Hash(自动覆盖)
         pipe.hset(key, mapping=row_dict)
-        # 2. 写入 ZSet 索引：score = 开仓时间戳（空值用 0 兜底）
+        # 2. 写入 ZSet 索引：score = 开仓时间戳(空值用 0 兜底)
         score = row["open_at"]
         if score is None or pd.isna(score):
             score = 0

pymecli-0.5.6/utils/pyredis.py

@@ -0,0 +1,18 @@
+import os
+
+import redis as redis_sync
+import redis.asyncio as redis
+
+
+def get_redis_client(
+    url: str = os.getenv("REDIS_URL", "redis://192.168.123.7:6379/0"),
+    decode_responses: bool = True,
+) -> redis.Redis:
+    return redis.Redis.from_url(url, decode_responses=decode_responses)
+
+
+def get_redis_client_sync(
+    url: str = os.getenv("REDIS_URL", "redis://192.168.123.7:6379/0"),
+    decode_responses: bool = True,
+) -> redis_sync.Redis:
+    return redis_sync.Redis.from_url(url, decode_responses=decode_responses)

pymecli-0.5.5/utils/pyredis.py

@@ -1,36 +0,0 @@
-import os
-
-import redis as redis_sync
-import redis.asyncio as redis
-
-
-def get_redis_client(
-    host=os.getenv("REDIS_HOST", "192.168.123.7"),
-    port=int(os.getenv("REDIS_PORT", 6379)),
-    db=int(os.getenv("REDIS_DB", 0)),
-    password=os.getenv("REDIS_PASSWORD"),
-    decode_responses=True,
-) -> redis.Redis:
-    return redis.Redis(
-        host=host,
-        port=port,
-        db=db,
-        password=password,
-        decode_responses=decode_responses,
-    )
-
-
-def get_redis_client_sync(
-    host=os.getenv("REDIS_HOST", "192.168.123.7"),
-    port=int(os.getenv("REDIS_PORT", 6379)),
-    db=int(os.getenv("REDIS_DB", 0)),
-    password=os.getenv("REDIS_PASSWORD"),
-    decode_responses=True,
-) -> redis_sync.Redis:
-    return redis_sync.Redis(
-        host=host,
-        port=port,
-        db=db,
-        password=password,
-        decode_responses=decode_responses,
-    )