pymecli 0.5.5__tar.gz → 0.5.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pymecli
-Version: 0.5.5
+Version: 0.5.7
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -13,11 +13,13 @@ Requires-Dist: arrow>=1.4.0
 Requires-Dist: babel>=2.17.0
 Requires-Dist: cowsay>=6.1
 Requires-Dist: dotenv>=0.9.9
+Requires-Dist: etcd3>=0.12.0
 Requires-Dist: fastapi>=0.127.0
 Requires-Dist: ifaddr>=0.2.0
 Requires-Dist: netifaces-plus>=0.12.5
 Requires-Dist: numpy<2.0.0
 Requires-Dist: pandas>=2.3.3
+Requires-Dist: protobuf<4
 Requires-Dist: pydantic-settings>=2.14.2
 Requires-Dist: pymysql>=1.1.2
 Requires-Dist: pytz>=2025.2
@@ -61,3 +63,12 @@ uv run dst cmu d:/.backups/dontstarvetogether/modoverrides.lua -o c:/.dst/save/C
 
 uv run dst cml d:/.backups/dontstarvetogether/modoverrides.lua -m 3486375086
 ```
+
+# etcdsync
+
+```shell
+etcdsync etcd2mysql /test -e d:/.env/pymecli.env -t kvs
+etcdsync etcd2mysql "" -e d:/.env/pymecli.env -t kvs # 全量
+etcdsync mysql2etcd /test -e d:/.env/pymecli.env -t kvs
+etcdsync mysql2etcd -e d:/.env/pymecli.env -t kvs # 全量
+```

{pymecli-0.5.5 → pymecli-0.5.7}/README.md

@@ -24,3 +24,12 @@ uv run dst cmu d:/.backups/dontstarvetogether/modoverrides.lua -o c:/.dst/save/C
 
 uv run dst cml d:/.backups/dontstarvetogether/modoverrides.lua -m 3486375086
 ```
+
+# etcdsync
+
+```shell
+etcdsync etcd2mysql /test -e d:/.env/pymecli.env -t kvs
+etcdsync etcd2mysql "" -e d:/.env/pymecli.env -t kvs # 全量
+etcdsync mysql2etcd /test -e d:/.env/pymecli.env -t kvs
+etcdsync mysql2etcd -e d:/.env/pymecli.env -t kvs # 全量
+```

{pymecli-0.5.5 → pymecli-0.5.7}/cli/bitget.py

@@ -14,6 +14,7 @@ from crypto.bitget import (
     spot_tickers,
 )
 from utils.mysql import get_database_engine
+from utils.pyredis import get_redis_client
 
 app = typer.Typer()
 
@@ -27,16 +28,22 @@ def sync(
 ):
     """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
+    redis = get_redis_client()
+    try:
 
-    asyncio.run(grid_open(engine))
-    asyncio.run(grid_close(engine))
+        async def _run():
+            await grid_open(engine, redis)
+            await grid_close(engine, redis)
+            await bitget_sf_open(engine, redis)
+            await bitget_sf_close(engine, redis)
+            await bitget_ff_open(engine, redis)
+            await bitget_ff_pending(engine, redis)
+            await bitget_ff_close(engine, redis)
 
-    asyncio.run(bitget_sf_open(engine))
-    asyncio.run(bitget_sf_close(engine))
-
-    asyncio.run(bitget_ff_open(engine))
-    asyncio.run(bitget_ff_pending(engine))
-    asyncio.run(bitget_ff_close(engine))
+        asyncio.run(_run())
+    finally:
+        engine.dispose()
+        asyncio.run(redis.close())
 
 
 @app.command()

pymecli-0.5.7/cli/etcd_mysql.py

@@ -0,0 +1,162 @@
+"""
+MySQL <-> Etcd 数据同步 CLI。
+
+两个子命令:
+    mysql2etcd  将 MySQL kvs 表的 k, v 写入 etcd
+    etcd2mysql  将 etcd 指定前缀的 key/value 写入 MySQL kvs 表
+"""
+
+import logging
+import os
+
+import typer
+from sqlalchemy import text
+
+from utils.etcd import get_etcd_client
+from utils.logger import get_logger
+from utils.mysql import get_database_engine
+
+app = typer.Typer(help="MySQL <-> Etcd 数据同步工具")
+logger = get_logger(__name__, level=logging.INFO)
+
+DEFAULT_TABLE = "kvs"
+
+
+@app.command("mysql2etcd")
+def mysql_to_etcd(
+    prefix: str = typer.Argument(
+        "",
+        help="MySQL k 列的前缀过滤（空字符串表示全量）",
+    ),
+    env_path: str = typer.Option(
+        ".env",
+        "--env",
+        "-e",
+        help="dotenv 文件路径",
+    ),
+    table: str = typer.Option(
+        DEFAULT_TABLE,
+        "--table",
+        "-t",
+        help="MySQL 表名，包含 k, v 字段",
+    ),
+    key_col: str = typer.Option(
+        "k",
+        "--key-col",
+        help="MySQL 中作为 etcd key 的列名",
+    ),
+    val_col: str = typer.Option(
+        "v",
+        "--val-col",
+        help="MySQL 中作为 etcd value 的列名",
+    ),
+):
+    """
+    将 MySQL 表中的 k, v 全量同步到 etcd。
+
+    每行记录会以 k 为 key、v 为 value 写入 etcd（覆盖已有值）。
+    """
+    engine = get_database_engine(env_path)
+    etcd = get_etcd_client(env_path)
+
+    try:
+        count = 0
+        with engine.connect() as conn:
+            if prefix:
+                query = text(
+                    f"SELECT {key_col}, {val_col} FROM {table} WHERE {key_col} LIKE :p"
+                )
+                rows = conn.execute(query, {"p": f"{prefix}%"}).fetchall()
+            else:
+                query = text(f"SELECT {key_col}, {val_col} FROM {table}")
+                rows = conn.execute(query).fetchall()
+
+            for row in rows:
+                k, v = str(row[0]), str(row[1])
+                etcd.put(k, v)
+                logger.debug(f"put: {k} -> {v}")
+                count += 1
+
+        logger.info(f"✅ 已写入 {count} 条到 etcd")
+    finally:
+        engine.dispose()
+        etcd.close()
+
+
+@app.command("etcd2mysql")
+def etcd_to_mysql(
+    prefix: str = typer.Argument(
+        ...,
+        help="etcd key 前缀（空字符串表示全量）",
+    ),
+    env_path: str = typer.Option(
+        ".env",
+        "--env",
+        "-e",
+        help="dotenv 文件路径",
+    ),
+    table: str = typer.Option(
+        DEFAULT_TABLE,
+        "--table",
+        "-t",
+        help="MySQL 表名，包含 k, v 字段",
+    ),
+    key_col: str = typer.Option(
+        "k",
+        "--key-col",
+        help="MySQL 中作为 key 的列名",
+    ),
+    val_col: str = typer.Option(
+        "v",
+        "--val-col",
+        help="MySQL 中作为 value 的列名",
+    ),
+):
+    """
+    将 etcd 中指定前缀的 key/value 同步到 MySQL。
+
+    如果 k 已存在则更新 v, 不存在则新增。
+    """
+    engine = get_database_engine(env_path)
+    etcd = get_etcd_client(env_path)
+
+    try:
+        # get_prefix 不支持空前缀，全量时用 get_all
+        count = 0
+        with engine.connect() as conn:
+            iterator = etcd.get_all() if not prefix else etcd.get_prefix(prefix)
+            for value, meta in iterator:
+                k = meta.key.decode("utf-8")
+                v = value.decode("utf-8") if isinstance(value, bytes) else value
+
+                # 检查是否存在
+                check_sql = text(
+                    f"SELECT id FROM {table} WHERE {key_col} = :k LIMIT 1"
+                )
+                existing = conn.execute(check_sql, {"k": k}).fetchone()
+
+                if existing:
+                    update_sql = text(
+                        f"UPDATE {table} SET {val_col} = :v WHERE {key_col} = :k"
+                    )
+                    conn.execute(update_sql, {"v": v, "k": k})
+                    logger.debug(f"update: {k}")
+                else:
+                    insert_sql = text(
+                        f"INSERT INTO {table} ({key_col}, {val_col}) VALUES (:k, :v)"
+                    )
+                    conn.execute(insert_sql, {"k": k, "v": v})
+                    logger.debug(f"insert: {k}")
+
+                count += 1
+
+            conn.commit()
+
+        logger.info(f"✅ 已同步 {count} 条到 MySQL")
+    finally:
+        engine.dispose()
+        etcd.close()
+
+
+if __name__ == "__main__":
+    app()

{pymecli-0.5.5 → pymecli-0.5.7}/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.7}/cli/gate.py

@@ -4,6 +4,7 @@ import typer
 
 from crypto.gate import grid_close, grid_open
 from utils.mysql import get_database_engine
+from utils.pyredis import get_redis_client
 
 app = typer.Typer()
 
@@ -16,5 +17,14 @@ def rsync(
 ):
     """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
-    asyncio.run(grid_open(engine))
-    asyncio.run(grid_close(engine))
+    redis = get_redis_client()
+    try:
+
+        async def _run():
+            await grid_open(engine, redis)
+            await grid_close(engine, redis)
+
+        asyncio.run(_run())
+    finally:
+        engine.dispose()
+        asyncio.run(redis.close())

{pymecli-0.5.5 → pymecli-0.5.7}/cli/okx.py

@@ -4,6 +4,7 @@ import typer
 
 from crypto.okx import grid_close, grid_open
 from utils.mysql import get_database_engine
+from utils.pyredis import get_redis_client
 
 app = typer.Typer()
 
@@ -17,6 +18,14 @@ def sync(
 ):
     """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
+    redis = get_redis_client()
+    try:
 
-    asyncio.run(grid_open(engine))
-    asyncio.run(grid_close(engine))
+        async def _run():
+            await grid_open(engine, redis)
+            await grid_close(engine, redis)
+
+        asyncio.run(_run())
+    finally:
+        engine.dispose()
+        asyncio.run(redis.close())

{pymecli-0.5.5 → pymecli-0.5.7}/cli/redis_csv.py

@@ -86,7 +86,6 @@ async def csv_pd_redis(
         #         df[col] = pd.to_datetime(df[col], format="mixed")
         #         df[col] = dt_to_timestamp(df[col])
 
-        r = get_redis_client()
         pipe = r.pipeline()  # 启用 pipeline
         count = 0
 
@@ -141,7 +140,13 @@ def count(
     :type key_prefix: str
 
     """
-    asyncio.run(count_async(key_prefix))
+    async def _cmd():
+        try:
+            await count_async(key_prefix)
+        finally:
+            await r.close()
+
+    asyncio.run(_cmd())
 
 
 @app.command()
@@ -173,14 +178,18 @@ def csv2redis(
     :param fp: 说明
     :type fp: csv文件路径
     """
-    asyncio.run(
-        csv_pd_redis(
-            id1,
-            id2,
-            kp,
-            fp,
-        )
-    )
+    async def _cmd():
+        try:
+            await csv_pd_redis(
+                id1,
+                id2,
+                kp,
+                fp,
+            )
+        finally:
+            await r.close()
+
+    asyncio.run(_cmd())
 
 
 @app.command()

{pymecli-0.5.5 → pymecli-0.5.7}/cli/util.py

@@ -177,7 +177,10 @@ def ipv6():
     print(f"IPv6 稳定地址: {ips}")
 
     r = get_redis_client_sync()
-    r.set("local.IPv6", ips[0])
+    try:
+        r.set("local.IPv6", ips[0])
+    finally:
+        r.close()
     return ips
 
 

{pymecli-0.5.5 → pymecli-0.5.7}/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.7}/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.7}/crypto/bitget.py

@@ -47,7 +47,7 @@ def spot_tickers(symbols: list, proxy: str | None = None):
     tickers(url, symbols, proxy)
 
 
-async def bitget_sf_open(engine: Engine):
+async def bitget_sf_open(engine: Engine, redis_client=None):
     query = "select * from bitget_sf where spot_open_usdt is not null and futures_open_usdt is not null and pnl is null and up_status = 0 and deleted_at is null;"
     key_prefix = "bitget_sf"
     table = "bitget_sf"
@@ -70,12 +70,13 @@ async def bitget_sf_open(engine: Engine):
             "spot_close_at": "datetime64[ns]",
             "futures_close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"🚀 bitget SF open count:({row_count})")
 
 
-async def bitget_ff_open(engine: Engine):
+async def bitget_ff_open(engine: Engine, redis_client=None):
     key_prefix = "bitget_ff"
     table = "bitget_ff"
     query = f"select * from {table} where long_open_usdt is not null and short_open_usdt is not null and pnl is null and up_status = 0 and deleted_at is null;"
@@ -98,12 +99,13 @@ async def bitget_ff_open(engine: Engine):
             "long_close_at": "datetime64[ns]",
             "short_close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"💰 bitget FF open count:({row_count})")
 
 
-async def bitget_sf_close(engine: Engine):
+async def bitget_sf_close(engine: Engine, redis_client=None):
     query = "select * from bitget_sf where pnl is not null and up_status in (0,1);"
     key_prefix = "bitget_sf"
     table = "bitget_sf"
@@ -126,12 +128,13 @@ async def bitget_sf_close(engine: Engine):
             "spot_close_at": "datetime64[ns]",
             "futures_close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"🚀 bitget SF close count:({row_count})")
 
 
-async def bitget_ff_pending(engine: Engine):
+async def bitget_ff_pending(engine: Engine, redis_client=None):
     key_prefix = "bitget_ff"
     table = "bitget_ff"
     query = f"select * from {table} where pnl is null and (long_close_at is not null or short_close_at is not null) and up_status in (1);"
@@ -154,12 +157,13 @@ async def bitget_ff_pending(engine: Engine):
             "long_close_at": "datetime64[ns]",
             "short_close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"💰 bitget FF pending count:({row_count})")
 
 
-async def bitget_ff_close(engine: Engine):
+async def bitget_ff_close(engine: Engine, redis_client=None):
     key_prefix = "bitget_ff"
     table = "bitget_ff"
     query = f"select * from {table} where pnl is not null and up_status in (0,1,2);"
@@ -182,12 +186,13 @@ async def bitget_ff_close(engine: Engine):
             "long_close_at": "datetime64[ns]",
             "short_close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"💰 bitget FF close count:({row_count})")
 
 
-async def grid_open(engine: Engine):
+async def grid_open(engine: Engine, redis_client=None):
     query = "select * from bitget where ((cost is not null or benefit is not null) and profit is null) and up_status = 0 and order_id is not null and deleted_at is null;"
     key_prefix = "bitget_grid"
     table = "bitget"
@@ -206,12 +211,13 @@ async def grid_open(engine: Engine):
             "open_at": "datetime64[ns]",
             "close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"🧮 bitget grid open count:({row_count})")
 
 
-async def grid_close(engine: Engine):
+async def grid_close(engine: Engine, redis_client=None):
     query = "select * from bitget where profit is not null and up_status in (0,1) and deleted_at is null;"
     key_prefix = "bitget_grid"
     table = "bitget"
@@ -230,6 +236,7 @@ async def grid_close(engine: Engine):
             "open_at": "datetime64[ns]",
             "close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"🧮 bitget grid close count:({row_count})")

{pymecli-0.5.5 → pymecli-0.5.7}/crypto/gate.py

@@ -4,7 +4,7 @@ from utils import logger
 from utils.mysql import mysql_to_csv, mysql_to_redis
 
 
-async def grid_open(engine: Engine):
+async def grid_open(engine: Engine, redis_client=None):
     query = "select * from gate where ((cost is not null or benefit is not null) and profit is null) and up_status = 0 and order_id is not null and deleted_at is null;"
     key_prefix = "gate_grid"
     table = "gate"
@@ -23,12 +23,13 @@ async def grid_open(engine: Engine):
             "open_at": "datetime64[ns]",
             "close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"🧮 gate open count:({row_count})")
 
 
-async def grid_close(engine: Engine):
+async def grid_close(engine: Engine, redis_client=None):
     query = "select * from gate where profit is not null and up_status in (0,1) and deleted_at is null;"
     key_prefix = "gate_grid"
     table = "gate"
@@ -47,6 +48,7 @@ async def grid_close(engine: Engine):
             "open_at": "datetime64[ns]",
             "close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
     logger.info(f"🧮 gate close count:({row_count})")
 

{pymecli-0.5.5 → pymecli-0.5.7}/crypto/okx.py

@@ -4,7 +4,7 @@ from utils import logger
 from utils.mysql import mysql_to_redis
 
 
-async def grid_open(engine: Engine):
+async def grid_open(engine: Engine, redis_client=None):
     query = "select * from okx_spot where ((cost is not null or benefit is not null) and profit is null) and up_status = 0 and order_id is not null and deleted_at is null;"
     key_prefix = "okx_grid"
     table = "okx_spot"
@@ -23,12 +23,13 @@ async def grid_open(engine: Engine):
             "open_at": "datetime64[ns]",
             "close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"🧮 okx grid open count:({row_count})")
 
 
-async def grid_close(engine: Engine):
+async def grid_close(engine: Engine, redis_client=None):
     query = "select * from okx_spot where profit is not null and up_status in (0,1) and deleted_at is null;"
     key_prefix = "okx_grid"
     table = "okx_spot"
@@ -47,6 +48,7 @@ async def grid_close(engine: Engine):
             "open_at": "datetime64[ns]",
             "close_at": "datetime64[ns]",
         },
+        redis_client=redis_client,
     )
 
     logger.info(f"🧮 okx grid close count:({row_count})")

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

@@ -9,6 +9,7 @@
     "babel>=2.17.0",
     "cowsay>=6.1",
     "dotenv>=0.9.9",
+    "etcd3>=0.12.0",
     "fastapi>=0.127.0",
     "SLPP>=1.2.3",
     "numpy<2.0.0",
@@ -30,13 +31,14 @@
     "netifaces-plus>=0.12.5",
     "ifaddr>=0.2.0",
     "telethon>=1.44.0",
+    "protobuf<4",
   ]
   description = "My CLI"
   license = { text = "MIT" }
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.5.5"
+  version = "0.5.7"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"
@@ -46,6 +48,7 @@
   # baidu = "cli.baidu:app"
   bitget = "cli.bitget:app"
   dst = "cli.dst:app"
+  etcdsync = "cli.etcd_mysql:app"
   example = "cli.example:app"
   fast = "cli.fast:typer_app"
   gate = "cli.gate:app"

pymecli-0.5.7/utils/etcd.py

@@ -0,0 +1,39 @@
+import os
+from urllib.parse import urlsplit
+
+from dotenv import load_dotenv
+
+import etcd3
+
+DEFAULT_ETCD_URL = "http://localhost:2379"
+
+
+def _parse_etcd_url(url: str) -> tuple[str, int]:
+    """
+    解析 ETCD_URL 为 (host, port)。
+
+    支持格式:
+        http://localhost:2379
+        https://127.0.0.1:2379
+        localhost:2379
+        127.0.0.1
+    """
+    if "://" not in url:
+        url = f"http://{url}"
+    parts = urlsplit(url)
+    host = parts.hostname or "localhost"
+    port = parts.port or 2379
+    return host, port
+
+
+def get_etcd_client(env_path: str = ".env") -> "etcd3.Etcd3Client":
+    """
+    创建 etcd v3 客户端。
+
+    从环境变量 ETCD_URL 读取连接地址，默认 http://localhost:2379。
+    """
+    load_dotenv(env_path)
+    etcd_url = os.getenv("ETCD_URL", DEFAULT_ETCD_URL)
+    host, port = _parse_etcd_url(etcd_url)
+
+    return etcd3.client(host=host, port=port)

{pymecli-0.5.5 → pymecli-0.5.7}/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:
@@ -82,6 +121,7 @@ async def mysql_to_redis_and_csv(
     d_column_names: list[str],
     pd_dtype: dict | None = None,
     del_column_names: list[str] = ["id", "created_at", "updated_at", "deleted_at"],
+    redis_client=None,
 ) -> int:
     # 查询数据
     df = pd.read_sql(query, engine, dtype=pd_dtype)
@@ -110,33 +150,38 @@ async def mysql_to_redis_and_csv(
             # df[col] = dt_to_timestamp(pd.to_datetime(df[col], errors="coerce"))
 
     # 数据写入redis
-    r = get_redis_client()
-    pipe = r.pipeline()  # 启用 pipeline
-    count = 0
-    n1, n2 = d_column_names
-
-    for _, row in df.iterrows():
-        idx1 = row[n1]
-        idx2 = row[n2]
-        if not idx1 or not idx2:
-            raise ValueError("ERR:id行无效")
-        id = f"{idx1}_{idx2}"
-        key = f"{key_prefix}:{id}"
-
-        # 转换行数据为字典（处理 NaN 为 None 或空字符串）
-        row_dict = row.where(pd.notna(row), "").to_dict()
-
-        # 1. 写入完整数据到 Hash（自动覆盖）
-        pipe.hset(key, mapping=row_dict)
-        # 2. 写入 ZSet 索引：score = 开仓时间戳（空值用 0 兜底）
-        score = row["open_at"]
-        if score is None or pd.isna(score):
-            score = 0
-        pipe.zadd(f"by_time:{key_prefix}", {id: score})
-        count += 1
-
-    await pipe.execute()
-    logger.debug(f"🧱 to redis: {count}")
+    own_client = redis_client is None
+    r = redis_client or get_redis_client()
+    try:
+        pipe = r.pipeline()  # 启用 pipeline
+        count = 0
+        n1, n2 = d_column_names
+
+        for _, row in df.iterrows():
+            idx1 = row[n1]
+            idx2 = row[n2]
+            if not idx1 or not idx2:
+                raise ValueError("ERR:id行无效")
+            id = f"{idx1}_{idx2}"
+            key = f"{key_prefix}:{id}"
+
+            # 转换行数据为字典(处理 NaN 为 None 或空字符串)
+            row_dict = row.where(pd.notna(row), "").to_dict()
+
+            # 1. 写入完整数据到 Hash(自动覆盖)
+            pipe.hset(key, mapping=row_dict)
+            # 2. 写入 ZSet 索引：score = 开仓时间戳(空值用 0 兜底)
+            score = row["open_at"]
+            if score is None or pd.isna(score):
+                score = 0
+            pipe.zadd(f"by_time:{key_prefix}", {id: score})
+            count += 1
+
+        await pipe.execute()
+        logger.debug(f"🧱 to redis: {count}")
+    finally:
+        if own_client:
+            await r.close()
 
     df.to_csv(
         csv_fp,
@@ -184,6 +229,7 @@ async def mysql_to_redis(
     d_column_names: list[str],
     pd_dtype: dict | None = None,
     del_column_names: list[str] = ["id", "created_at", "updated_at", "deleted_at"],
+    redis_client=None,
 ) -> int:
     df = pd.read_sql(query, engine, dtype=pd_dtype)
     df["open_at"] = df["open_at"].fillna(df["created_at"])
@@ -207,30 +253,35 @@ async def mysql_to_redis(
         if col in df.columns:
             df[col] = dt_to_timestamp(df[col])
 
-    r = get_redis_client()
-    pipe = r.pipeline()
-    count = 0
-    n1, n2 = d_column_names
-
-    for _, row in df.iterrows():
-        idx1 = row[n1]
-        idx2 = row[n2]
-        if not idx1 or not idx2:
-            raise ValueError("ERR:id行无效")
-        id = f"{idx1}_{idx2}"
-        key = f"{key_prefix}:{id}"
-
-        row_dict = row.where(pd.notna(row), "").to_dict()
-
-        pipe.hset(key, mapping=row_dict)
-        score = row["open_at"]
-        if score is None or pd.isna(score):
-            score = 0
-        pipe.zadd(f"by_time:{key_prefix}", {id: score})
-        count += 1
-
-    await pipe.execute()
-    logger.debug(f"🧱 to redis: {count}")
+    own_client = redis_client is None
+    r = redis_client or get_redis_client()
+    try:
+        pipe = r.pipeline()
+        count = 0
+        n1, n2 = d_column_names
+
+        for _, row in df.iterrows():
+            idx1 = row[n1]
+            idx2 = row[n2]
+            if not idx1 or not idx2:
+                raise ValueError("ERR:id行无效")
+            id = f"{idx1}_{idx2}"
+            key = f"{key_prefix}:{id}"
+
+            row_dict = row.where(pd.notna(row), "").to_dict()
+
+            pipe.hset(key, mapping=row_dict)
+            score = row["open_at"]
+            if score is None or pd.isna(score):
+                score = 0
+            pipe.zadd(f"by_time:{key_prefix}", {id: score})
+            count += 1
+
+        await pipe.execute()
+        logger.debug(f"🧱 to redis: {count}")
+    finally:
+        if own_client:
+            await r.close()
 
     return _update_status(engine, table, ids, update_status)
 

pymecli-0.5.7/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,
-    )