pymecli 0.5.3__tar.gz → 0.5.4__tar.gz

{pymecli-0.5.3 → pymecli-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pymecli
-Version: 0.5.3
+Version: 0.5.4
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -28,6 +28,7 @@ Requires-Dist: selenium>=4.40.0
 Requires-Dist: slpp>=1.2.3
 Requires-Dist: sqlalchemy>=2.0.45
 Requires-Dist: tabulate>=0.9.0
+Requires-Dist: telethon>=1.44.0
 Requires-Dist: toml>=0.10.2
 Requires-Dist: typer>=0.20.1
 Requires-Dist: uvicorn>=0.40.0

{pymecli-0.5.3 → pymecli-0.5.4}/cli/bitget.py

@@ -21,23 +21,19 @@ app = typer.Typer()
 @app.command()
 def sync(
     env_path: str = "d:/.env",
-    csv_dir: str = "d:/github/meme2046/data",
 ):
-    """同步mysql中grid数据到csv文件"""
+    """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
-    grid_csv_fp = f"{csv_dir}/bitget_grid_0.csv"
-    sf_csv_fp = f"{csv_dir}/bitget_sf_0.csv"
-    ff_csv_fp = f"{csv_dir}/bitget_ff_0.csv"
 
-    asyncio.run(grid_open(engine, grid_csv_fp))
-    asyncio.run(grid_close(engine, grid_csv_fp))
+    asyncio.run(grid_open(engine))
+    asyncio.run(grid_close(engine))
 
-    asyncio.run(bitget_sf_open(engine, sf_csv_fp))
-    asyncio.run(bitget_sf_close(engine, sf_csv_fp))
+    asyncio.run(bitget_sf_open(engine))
+    asyncio.run(bitget_sf_close(engine))
 
-    asyncio.run(bitget_ff_open(engine, ff_csv_fp))
-    asyncio.run(bitget_ff_pending(engine, ff_csv_fp))
-    asyncio.run(bitget_ff_close(engine, ff_csv_fp))
+    asyncio.run(bitget_ff_open(engine))
+    asyncio.run(bitget_ff_pending(engine))
+    asyncio.run(bitget_ff_close(engine))
 
 
 @app.command()

{pymecli-0.5.3 → pymecli-0.5.4}/cli/gate.py

@@ -21,10 +21,8 @@ app = typer.Typer()
 @app.command()
 def rsync(
     env_path: str = "d:/.env",
-    csv_dir: str = "d:/github/meme2046/data",
 ):
-    """同步mysql中grid数据到csv文件"""
+    """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
-    grid_csv_fp = f"{csv_dir}/gate_grid_0.csv"
-    asyncio.run(grid_open(engine, grid_csv_fp))
-    asyncio.run(grid_close(engine, grid_csv_fp))
+    asyncio.run(grid_open(engine))
+    asyncio.run(grid_close(engine))

pymecli-0.5.4/cli/tele.py

@@ -0,0 +1,355 @@
+import os
+
+import typer
+from dotenv import load_dotenv
+
+from utils.logger import get_logger
+
+logger = get_logger(__name__)
+app = typer.Typer()
+
+
+@app.command()
+def info(
+    dotenv_path: str = typer.Argument(
+        help="dotenv file contains TELE_SEESION_STRING", default="d:/.env"
+    ),
+):
+    load_dotenv("d:/.env")
+    logger.info(os.getenv("TELE_SESSION_STRING"))
+
+
+@app.command()
+def check(
+    dotenv_path: str = typer.Argument(
+        help="dotenv file contains TELE_SESSION_STRING / TELE_API_ID / TELE_API_HASH",
+        default="d:/.env",
+    ),
+):
+    """验证 TELE_SESSION_STRING 是否有效。
+
+    通过 StringSession 建立客户端并发起一次 get_me 调用：
+    能正常返回账号对象即视为 session 有效；get_me 在 auth_key
+    未授权 / 被注销时会内部捕获 UnauthorizedError 并返回 None，
+    故 me is None 即判定 session 失效。
+    需要 .env 中同时配置 TELE_API_ID 与 TELE_API_HASH。
+    """
+    load_dotenv(dotenv_path)
+
+    session_string = os.getenv("TELE_SESSION_STRING")
+    api_id = os.getenv("TELE_API_ID")
+    api_hash = os.getenv("TELE_API_HASH")
+    if not session_string:
+        logger.error("TELE_SESSION_STRING 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+    if not (api_id and api_hash):
+        logger.error("TELE_API_ID / TELE_API_HASH 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+
+    # 延迟导入：仅在使用 check 子命令时才加载 telethon，避免拖慢其它子命令
+    import asyncio
+    from typing import Awaitable, cast
+
+    from telethon import TelegramClient
+    from telethon.sessions import StringSession
+
+    async def _verify():
+        client = TelegramClient(StringSession(session_string), int(api_id), api_hash)
+        try:
+            await client.connect()
+            # get_me 会真正发起一次 API 调用，能返回即说明 auth_key 仍然有效
+            return await client.get_me()
+        finally:
+            # telethon 的 disconnect 声明为同步 def，但 loop 运行时实际返回协程，
+            # Pylance 据签名推断返回 None 导致 await 报错，用 cast 显式标注
+            await cast(Awaitable[None], client.disconnect())
+
+    try:
+        me = asyncio.run(_verify())
+    except Exception as e:
+        # 网络异常等非鉴权问题，打印完整堆栈便于排查
+        logger.exception("验证 session 时发生异常: %s", e)
+        raise typer.Exit(1)
+
+    # get_me 内部 catch UnauthorizedError（含 AuthKeyUnregistered/Invalid 等所有子类）后返回 None，
+    # 所以 me is None 才是 auth_key 已被服务器拒绝 / session 失效的真实信号
+    if me is None:
+        logger.error("session 无效: auth_key 未授权或已被服务器注销")
+        raise typer.Exit(1)
+
+    logger.info(
+        "session 有效: id=%s name=%s phone=%s",
+        getattr(me, "id", None), getattr(me, "first_name", None), getattr(me, "phone", None),
+    )
+
+
+@app.command()
+def login(
+    dotenv_path: str = typer.Argument(
+        help="dotenv file containing TELE_API_ID / TELE_API_HASH",
+        default="d:/.env",
+    ),
+):
+    """交互式登录并打印 TELE_SESSION_STRING。
+
+    使用 telethon 的 start() 完成 phone → 验证码 → 2FA 的交互式登录，
+    登录成功后用 StringSession.save() 取出可复用 session 串并打印。
+    session string 失效周期很长，手动复制到 .env 即可，不做自动回写。
+    需要 .env 中已配置 TELE_API_ID 与 TELE_API_HASH。
+    """
+    load_dotenv(dotenv_path)
+    api_id = os.getenv("TELE_API_ID")
+    api_hash = os.getenv("TELE_API_HASH")
+    if not (api_id and api_hash):
+        logger.error("TELE_API_ID / TELE_API_HASH 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+
+    # 延迟导入：仅在使用 login 子命令时才加载 telethon
+    import asyncio
+    from typing import Awaitable, cast
+
+    from telethon import TelegramClient
+    from telethon.sessions import StringSession
+
+    async def _login():
+        # 空 StringSession + start() 触发交互式登录（控制台输入 phone / 验证码 / 2FA 密码）
+        session = StringSession()
+        client = TelegramClient(session, int(api_id), api_hash)
+        try:
+            # start() 同 disconnect 一样声明为同步 def，loop 运行时返回协程，用 cast 标注
+            await cast(Awaitable[None], client.start())
+            # telethon 在 connect 时原地写入 session.auth_key，故持有的 session 引用即登录后状态；
+            # 直接用 session.save() 而非 client.session，避开 client.session 宽类型推断的 .save() 报错
+            return session.save()
+        finally:
+            await cast(Awaitable[None], client.disconnect())
+
+    try:
+        session_string = asyncio.run(_login())
+    except Exception as e:
+        logger.exception("生成 session string 时发生异常: %s", e)
+        raise typer.Exit(1)
+
+    # 只打印，不自动回写 .env：session string 失效周期长，手动加一次即可，避免覆盖风险
+    typer.secho("TELE_SESSION_STRING 生成成功，请复制下行并手动写入 .env：", fg=typer.colors.GREEN)
+    typer.secho(session_string, fg=typer.colors.CYAN)
+
+
+@app.command()
+def upload(
+    image_path: str = typer.Argument(
+        help="要上传的图片文件路径",
+    ),
+    dotenv_path: str = typer.Option(
+        help="dotenv file path", default="d:/.env"
+    ),
+):
+    """上传图片到指定 Telegram 频道。
+
+    使用 TELE_SESSION_STRING 登录并上传图片到 TELE_ONEDAOSHARE 环境变量指定的频道。
+    """
+    load_dotenv(dotenv_path)
+
+    session_string = os.getenv("TELE_SESSION_STRING")
+    api_id = os.getenv("TELE_API_ID")
+    api_hash = os.getenv("TELE_API_HASH")
+    channel = os.getenv("TELE_ONEDAOSHARE")
+
+    if not session_string:
+        logger.error("TELE_SESSION_STRING 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+    if not (api_id and api_hash):
+        logger.error("TELE_API_ID / TELE_API_HASH 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+    if not channel:
+        logger.error("TELE_ONEDAOSHARE 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+    if not os.path.isfile(image_path):
+        logger.error("图片文件不存在: %s", image_path)
+        raise typer.Exit(1)
+
+    import asyncio
+    from typing import Awaitable, cast
+
+    from telethon import TelegramClient
+    from telethon.sessions import StringSession
+
+    async def _upload():
+        client = TelegramClient(StringSession(session_string), int(api_id), api_hash)
+        try:
+            await client.connect()
+            if not await client.is_user_authorized():
+                logger.error("session 无效或已失效，请先运行 login 命令重新生成")
+                raise typer.Exit(1)
+            
+            # 规范化频道 ID：如果是纯数字，自动加 -100 前缀
+            target = channel.strip()
+            if target.isdigit():
+                target = f"-100{target}"
+                logger.info("频道 ID 已自动规范化为: %s", target)
+            
+            target_id = int(target) if target.lstrip('-').isdigit() else None
+            
+            # 方法1：先尝试直接通过 ID 在 dialogs 缓存中查找（更可靠）
+            logger.info("正在查找频道: %s", target)
+            found_dialog = None
+            async for dialog in client.iter_dialogs():
+                if dialog.id == target_id:
+                    found_dialog = dialog
+                    break
+            
+            if found_dialog:
+                logger.info("成功找到频道: %s (ID: %s)", target, found_dialog.id)
+                # 使用 dialog.entity 作为目标，避免再次解析
+                target = found_dialog.entity
+            else:
+                # 方法2：退回到 get_entity（支持 @username 等）
+                logger.info("缓存中未找到，尝试通过 get_entity 解析: %s", target)
+                try:
+                    entity = await client.get_entity(target)
+                    if isinstance(entity, list):
+                        entity = entity[0]
+                    logger.info("成功解析: %s (ID: %s)", target, getattr(entity, 'id', 'N/A'))
+                    target = entity
+                except ValueError as e:
+                    logger.error(
+                        "无法访问频道 %s。请检查：\n"
+                        "1. ID 是否正确（纯数字需要带 -100 前缀）\n"
+                        "2. 当前登录的账号是否为该频道成员\n"
+                        "3. 如果是私有名片，请使用频道的 @username\n"
+                        "错误详情: %s", target, e
+                    )
+                    raise typer.Exit(1)
+            
+            # 发送文件到频道，force_document=False 表示作为图片发送（Telegram 会自动压缩）
+            # 如果想原样发送文件，设置 force_document=True
+            result = await client.send_file(
+                target,
+                image_path,
+                caption="",  # 可以自定义描述
+                force_document=False,
+            )
+            
+            # send_file 可能返回 Message 或 List[Message]
+            message = result[0] if isinstance(result, list) else result
+            
+            # 下载媒体文件到本地临时目录
+            download_link = None
+            try:
+                if hasattr(message, 'media') and message.media:
+                    import tempfile
+                    temp_dir = tempfile.gettempdir()
+                    local_path = await client.download_media(
+                        message,
+                        file=temp_dir
+                    )
+                    if local_path:
+                        download_link = local_path
+            except Exception as e:
+                logger.debug("下载文件失败: %s", e)
+            
+            return message, download_link
+        finally:
+            await cast(Awaitable[None], client.disconnect())
+
+    try:
+        message, download_link = asyncio.run(_upload())
+        
+        # 打印详细的上传响应信息
+        typer.secho("\n📤 上传成功！", fg=typer.colors.GREEN, bold=True)
+        typer.secho("-" * 50, fg=typer.colors.CYAN)
+        typer.secho(f"  消息 ID: {message.id}", fg=typer.colors.WHITE)
+        typer.secho(f"  频道: {channel}", fg=typer.colors.WHITE)
+        
+        # 尝试获取文件信息
+        if hasattr(message, 'media') and message.media:
+            media = message.media
+            # 递归打印完整结构（类似 JSON 格式）
+            typer.secho(f"  Media 类型: {type(media).__name__}", fg=typer.colors.YELLOW)
+        
+        # 打印下载的本地文件路径（telesco.pe 公网链接 telethon 无法直接获取）
+        if download_link:
+            typer.secho(f"\n  � 本地下载路径:", fg=typer.colors.MAGENTA, bold=True)
+            typer.secho(f"  {download_link}", fg=typer.colors.MAGENTA)
+        
+        # 打印消息链接（如果可能）
+        if hasattr(message, 'chat') and message.chat:
+            chat_id = getattr(message.chat, 'id', None)
+            if chat_id:
+                typer.secho(f"  聊天 ID: {chat_id}", fg=typer.colors.WHITE)
+        
+        typer.secho("-" * 50, fg=typer.colors.CYAN)
+    except typer.Exit:
+        raise  # 重新抛出 typer.Exit 以保持退出码
+    except Exception as e:
+        logger.exception("上传图片时发生异常: %s", e)
+        raise typer.Exit(1)
+
+
+@app.command()
+def list_channels(
+    dotenv_path: str = typer.Option(
+        help="dotenv file path", default="d:/.env"
+    ),
+):
+    """列出当前账号加入的所有频道及其 ID。
+
+    方便获取正确的频道 ID 填入 TELE_ONE_DAO_SHARE。
+    """
+    load_dotenv(dotenv_path)
+
+    session_string = os.getenv("TELE_SESSION_STRING")
+    api_id = os.getenv("TELE_API_ID")
+    api_hash = os.getenv("TELE_API_HASH")
+
+    if not session_string:
+        logger.error("TELE_SESSION_STRING 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+    if not (api_id and api_hash):
+        logger.error("TELE_API_ID / TELE_API_HASH 未找到: %s", dotenv_path)
+        raise typer.Exit(1)
+
+    import asyncio
+    from typing import Awaitable, cast
+
+    from telethon import TelegramClient
+    from telethon.sessions import StringSession
+
+    async def _list():
+        client = TelegramClient(StringSession(session_string), int(api_id), api_hash)
+        try:
+            await client.connect()
+            if not await client.is_user_authorized():
+                logger.error("session 无效或已失效，请先运行 login 命令重新生成")
+                raise typer.Exit(1)
+            
+            channels = []
+            async for dialog in client.iter_dialogs():
+                if dialog.is_channel:
+                    channels.append(dialog)
+            return channels
+        finally:
+            await cast(Awaitable[None], client.disconnect())
+
+    try:
+        channels = asyncio.run(_list())
+        if not channels:
+            typer.secho("你还没有加入任何频道", fg=typer.colors.YELLOW)
+            return
+        
+        typer.secho(f"\n你加入的 {len(channels)} 个频道：\n", fg=typer.colors.GREEN)
+        typer.secho(f"{'频道名称':<40} {'ID':<25}", fg=typer.colors.CYAN)
+        typer.secho("-" * 65, fg=typer.colors.CYAN)
+        for ch in channels:
+            name = ch.name or "(无名称)"
+            typer.secho(f"{name:<40} {ch.id:<25}")
+        typer.secho("\n提示：复制 ID（如 -100xxxxxxxx）到 .env 的 TELE_ONEDAOSHARE", fg=typer.colors.YELLOW)
+    except typer.Exit:
+        raise
+    except Exception as e:
+        logger.exception("列出频道时发生异常: %s", e)
+        raise typer.Exit(1)
+
+
+if __name__ == "__main__":
+    logger.info("main")

{pymecli-0.5.3 → pymecli-0.5.4}/crypto/bitget.py

@@ -4,7 +4,7 @@ import requests
 from sqlalchemy import Engine
 
 from utils import logger
-from utils.mysql import mysql_to_csv, mysql_to_redis_and_csv
+from utils.mysql import mysql_to_csv, mysql_to_redis
 
 
 def tickers(url: str, symbols: list, proxy: str | None = None):
@@ -47,15 +47,14 @@ def spot_tickers(symbols: list, proxy: str | None = None):
     tickers(url, symbols, proxy)
 
 
-async def bitget_sf_open(engine: Engine, csv_fp: str):
+async def bitget_sf_open(engine: Engine):
     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"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_fp,
         table,
         query,
         update_status=1,
@@ -76,15 +75,14 @@ async def bitget_sf_open(engine: Engine, csv_fp: str):
     logger.info(f"🚀 bitget SF open count:({row_count})")
 
 
-async def bitget_ff_open(engine: Engine, csv_fp: str):
+async def bitget_ff_open(engine: Engine):
     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;"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_fp,
         table,
         query,
         update_status=1,
@@ -105,15 +103,14 @@ async def bitget_ff_open(engine: Engine, csv_fp: str):
     logger.info(f"💰 bitget FF open count:({row_count})")
 
 
-async def bitget_sf_close(engine: Engine, csv_path: str):
+async def bitget_sf_close(engine: Engine):
     query = "select * from bitget_sf where pnl is not null and up_status in (0,1);"
     key_prefix = "bitget_sf"
     table = "bitget_sf"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_path,
         table,
         query,
         update_status=2,
@@ -134,15 +131,14 @@ async def bitget_sf_close(engine: Engine, csv_path: str):
     logger.info(f"🚀 bitget SF close count:({row_count})")
 
 
-async def bitget_ff_pending(engine: Engine, csv_path: str):
+async def bitget_ff_pending(engine: Engine):
     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);"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_path,
         table,
         query,
         update_status=2,
@@ -163,15 +159,14 @@ async def bitget_ff_pending(engine: Engine, csv_path: str):
     logger.info(f"💰 bitget FF pending count:({row_count})")
 
 
-async def bitget_ff_close(engine: Engine, csv_path: str):
+async def bitget_ff_close(engine: Engine):
     key_prefix = "bitget_ff"
     table = "bitget_ff"
     query = f"select * from {table} where pnl is not null and up_status in (0,1,2);"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_path,
         table,
         query,
         update_status=3,
@@ -192,15 +187,14 @@ async def bitget_ff_close(engine: Engine, csv_path: str):
     logger.info(f"💰 bitget FF close count:({row_count})")
 
 
-async def grid_open(engine: Engine, csv_path: str):
+async def grid_open(engine: Engine):
     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"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_path,
         table,
         query,
         update_status=1,
@@ -217,15 +211,14 @@ async def grid_open(engine: Engine, csv_path: str):
     logger.info(f"🧮 bitget grid open count:({row_count})")
 
 
-async def grid_close(engine: Engine, csv_path: str):
+async def grid_close(engine: Engine):
     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"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_path,
         table,
         query,
         update_status=2,

{pymecli-0.5.3 → pymecli-0.5.4}/crypto/gate.py

@@ -1,18 +1,17 @@
 from sqlalchemy import Engine
 
 from utils import logger
-from utils.mysql import mysql_to_csv, mysql_to_redis_and_csv
+from utils.mysql import mysql_to_csv, mysql_to_redis
 
 
-async def grid_open(engine: Engine, csv_path: str):
+async def grid_open(engine: Engine):
     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"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_path,
         table,
         query,
         update_status=1,
@@ -29,15 +28,14 @@ async def grid_open(engine: Engine, csv_path: str):
     logger.info(f"🧮 gate open count:({row_count})")
 
 
-async def grid_close(engine: Engine, csv_path: str):
+async def grid_close(engine: Engine):
     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"
 
-    row_count = await mysql_to_redis_and_csv(
+    row_count = await mysql_to_redis(
         engine,
         key_prefix,
-        csv_path,
         table,
         query,
         update_status=2,

{pymecli-0.5.3 → pymecli-0.5.4}/pyproject.toml

@@ -29,13 +29,14 @@
     "pydantic-settings>=2.14.2",
     "netifaces-plus>=0.12.5",
     "ifaddr>=0.2.0",
+    "telethon>=1.44.0",
   ]
   description = "My CLI"
   license = { text = "MIT" }
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.5.3"
+  version = "0.5.4"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"
@@ -51,6 +52,7 @@
   util = "cli.util:app"
   # 临时命令
   rd = "cli.redis_csv:app"
+  # tele = "cli.tele:app"
 
 [tool.uv]
 [[tool.uv.index]]

{pymecli-0.5.3 → pymecli-0.5.4}/utils/mysql.py

@@ -70,22 +70,7 @@ def mysql_to_csv(
     # csv去重,保留最后加入的数据
     deduplicated(csv_path, d_column_names, "last", pd_dtype)
 
-    # 根据提取的 'id' 列更新数据库中 up_status 字段
-    if ids:
-        # 使用 text() 构建查询时，确保 :ids 是一个列表
-        update_query = text(
-            f"UPDATE {table} SET up_status = :status WHERE id IN ({','.join(map(str, ids))});"
-        )
-        with engine.connect() as connection:
-            with connection.begin():
-                result = connection.execute(
-                    update_query,
-                    {"status": update_status},
-                )
-
-                return result.rowcount
-
-    return 0
+    return _update_status(engine, table, ids, update_status)
 
 
 async def mysql_to_redis_and_csv(
@@ -185,9 +170,68 @@ async def mysql_to_redis_and_csv(
 
     logger.debug(f"𝄜 to csv: {count}")
 
-    # 根据提取的 'id' 列更新数据库中 up_status 字段
+    return _update_status(engine, table, ids, update_status)
+
+
+async def mysql_to_redis(
+    engine: Engine,
+    key_prefix: str,
+    table: str,
+    query: str,
+    update_status: int,
+    d_column_names: list[str],
+    pd_dtype: dict | None = None,
+    del_column_names: list[str] = ["id", "created_at", "updated_at", "deleted_at"],
+) -> int:
+    df = pd.read_sql(query, engine, dtype=pd_dtype)
+    df["open_at"] = df["open_at"].fillna(df["created_at"])
+    ids = df["id"].tolist()
+    columns_to_drop = [col for col in del_column_names if col in df.columns]
+    df = df.drop(columns=columns_to_drop)
+
+    datetime_cols = [
+        "open_at",
+        "close_at",
+        "spot_close_at",
+        "futures_close_at",
+        "long_close_at",
+        "short_close_at",
+    ]
+
+    logger.debug(df.head())
+    logger.debug(df.dtypes)
+
+    for col in datetime_cols:
+        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)
+        pipe.zadd(f"by_time:{key_prefix}", {id: time.time()})
+        count += 1
+
+    await pipe.execute()
+    logger.debug(f"🧱 to redis: {count}")
+
+    return _update_status(engine, table, ids, update_status)
+
+
+def _update_status(engine: Engine, table: str, ids: list, update_status: int) -> int:
     if ids:
-        # 使用 text() 构建查询时，确保 :ids 是一个列表
         update_query = text(
             f"UPDATE {table} SET up_status = :status WHERE id IN ({','.join(map(str, ids))});"
         )
@@ -197,7 +241,5 @@ async def mysql_to_redis_and_csv(
                     update_query,
                     {"status": update_status},
                 )
-
                 return result.rowcount
-
     return 0