pymecli 0.5.4__tar.gz → 0.5.5__tar.gz

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

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

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

@@ -20,7 +20,10 @@ app = typer.Typer()
 
 @app.command()
 def sync(
-    env_path: str = "d:/.env",
+    env_path: str = typer.Argument(
+        ".env",
+        help="dotenv环境变量路径",
+    ),
 ):
     """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)

pymecli-0.5.5/cli/gate.py

@@ -0,0 +1,20 @@
+import asyncio
+
+import typer
+
+from crypto.gate import grid_close, grid_open
+from utils.mysql import get_database_engine
+
+app = typer.Typer()
+
+@app.command()
+def rsync(
+    env_path: str = typer.Argument(
+        ".env",
+        help="dotenv环境变量路径",
+    ),
+):
+    """同步mysql中grid数据到redis"""
+    engine = get_database_engine(env_path)
+    asyncio.run(grid_open(engine))
+    asyncio.run(grid_close(engine))

pymecli-0.5.5/cli/okx.py

@@ -0,0 +1,22 @@
+import asyncio
+
+import typer
+
+from crypto.okx import grid_close, grid_open
+from utils.mysql import get_database_engine
+
+app = typer.Typer()
+
+
+@app.command()
+def sync(
+    env_path: str = typer.Argument(
+        ".env",
+        help="dotenv环境变量路径",
+    ),
+):
+    """同步mysql中grid数据到redis"""
+    engine = get_database_engine(env_path)
+
+    asyncio.run(grid_open(engine))
+    asyncio.run(grid_close(engine))

{pymecli-0.5.4 → pymecli-0.5.5}/cli/tele.py

@@ -12,10 +12,10 @@ app = typer.Typer()
 @app.command()
 def info(
     dotenv_path: str = typer.Argument(
-        help="dotenv file contains TELE_SEESION_STRING", default="d:/.env"
+        help="dotenv file contains TELE_SEESION_STRING", default=".env"
     ),
 ):
-    load_dotenv("d:/.env")
+    load_dotenv(dotenv_path)
     logger.info(os.getenv("TELE_SESSION_STRING"))
 
 
@@ -23,7 +23,7 @@ def info(
 def check(
     dotenv_path: str = typer.Argument(
         help="dotenv file contains TELE_SESSION_STRING / TELE_API_ID / TELE_API_HASH",
-        default="d:/.env",
+        default=".env",
     ),
 ):
     """验证 TELE_SESSION_STRING 是否有效。
@@ -87,7 +87,7 @@ def check(
 def login(
     dotenv_path: str = typer.Argument(
         help="dotenv file containing TELE_API_ID / TELE_API_HASH",
-        default="d:/.env",
+        default=".env",
     ),
 ):
     """交互式登录并打印 TELE_SESSION_STRING。
@@ -141,7 +141,7 @@ def upload(
         help="要上传的图片文件路径",
     ),
     dotenv_path: str = typer.Option(
-        help="dotenv file path", default="d:/.env"
+        help="dotenv file path", default=".env"
     ),
 ):
     """上传图片到指定 Telegram 频道。
@@ -289,7 +289,7 @@ def upload(
 @app.command()
 def list_channels(
     dotenv_path: str = typer.Option(
-        help="dotenv file path", default="d:/.env"
+        help="dotenv file path", default=".env"
     ),
 ):
     """列出当前账号加入的所有频道及其 ID。

pymecli-0.5.5/crypto/okx.py

@@ -0,0 +1,52 @@
+from sqlalchemy import Engine
+
+from utils import logger
+from utils.mysql import mysql_to_redis
+
+
+async def grid_open(engine: Engine):
+    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"
+
+    row_count = await mysql_to_redis(
+        engine,
+        key_prefix,
+        table,
+        query,
+        update_status=1,
+        d_column_names=["order_id", "client_order_id"],
+        pd_dtype={
+            "order_id": str,
+            "fx_order_id": str,
+            "created_at": "datetime64[ns]",
+            "open_at": "datetime64[ns]",
+            "close_at": "datetime64[ns]",
+        },
+    )
+
+    logger.info(f"🧮 okx grid open count:({row_count})")
+
+
+async def grid_close(engine: Engine):
+    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"
+
+    row_count = await mysql_to_redis(
+        engine,
+        key_prefix,
+        table,
+        query,
+        update_status=2,
+        d_column_names=["order_id", "client_order_id"],
+        pd_dtype={
+            "order_id": str,
+            "fx_order_id": str,
+            "created_at": "datetime64[ns]",
+            "open_at": "datetime64[ns]",
+            "close_at": "datetime64[ns]",
+        },
+    )
+
+    logger.info(f"🧮 okx grid close count:({row_count})")

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

@@ -36,7 +36,7 @@
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.5.4"
+  version = "0.5.5"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"
@@ -49,6 +49,7 @@
   example = "cli.example:app"
   fast = "cli.fast:typer_app"
   gate = "cli.gate:app"
+  okx = "cli.okx:app"
   util = "cli.util:app"
   # 临时命令
   rd = "cli.redis_csv:app"

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

@@ -1,5 +1,4 @@
 import os
-import time
 
 import pandas as pd
 from dotenv import load_dotenv
@@ -10,7 +9,7 @@ from utils.pd import deduplicated, dt_to_timestamp
 from utils.pyredis import get_redis_client
 
 
-def get_database_engine(env_path: str) -> Engine:
+def get_database_engine(env_path: str = ".env") -> Engine:
     """创建数据库引擎"""
     load_dotenv(env_path)
     host = os.getenv("MYSQL_HOST")
@@ -129,8 +128,11 @@ async def mysql_to_redis_and_csv(
 
         # 1. 写入完整数据到 Hash（自动覆盖）
         pipe.hset(key, mapping=row_dict)
-        # 2. 写入 ZSet 索引：score = Unix 时间戳
-        pipe.zadd(f"by_time:{key_prefix}", {id: time.time()})
+        # 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()
@@ -221,7 +223,10 @@ async def mysql_to_redis(
         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()})
+        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()

pymecli-0.5.4/cli/gate.py

@@ -1,28 +0,0 @@
-import asyncio
-
-import typer
-
-from crypto.gate import grid_close, grid_open
-from utils.mysql import get_database_engine
-
-app = typer.Typer()
-
-
-# @app.command()
-# def sync(
-#     env_path: str = "d:/.env", csv_path: str = "d:/github/meme2046/data/gate_0.csv"
-# ):
-#     """同步mysql中grid数据到csv文件"""
-#     engine = get_database_engine(env_path)
-#     gate_open(engine, csv_path)
-#     gate_close(engine, csv_path)
-
-
-@app.command()
-def rsync(
-    env_path: str = "d:/.env",
-):
-    """同步mysql中grid数据到redis"""
-    engine = get_database_engine(env_path)
-    asyncio.run(grid_open(engine))
-    asyncio.run(grid_close(engine))