pymecli 0.5.7__tar.gz → 0.5.9__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pymecli
-Version: 0.5.7
+Version: 0.5.9
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -67,8 +67,8 @@ 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 /cron/jobs -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 /cron/jobs -e d:/.env/pymecli.env -t kvs
 etcdsync mysql2etcd -e d:/.env/pymecli.env -t kvs # 全量
 ```

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

@@ -28,8 +28,8 @@ 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 /cron/jobs -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 /cron/jobs -e d:/.env/pymecli.env -t kvs
 etcdsync mysql2etcd -e d:/.env/pymecli.env -t kvs # 全量
 ```

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

@@ -28,22 +28,24 @@ def sync(
 ):
     """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
-    redis = get_redis_client()
+    redis = get_redis_client(env_path=env_path)
     try:
 
         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)
+            try:
+                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)
+            finally:
+                await redis.close()
 
         asyncio.run(_run())
     finally:
         engine.dispose()
-        asyncio.run(redis.close())
 
 
 @app.command()

{pymecli-0.5.7 → pymecli-0.5.9}/cli/fast.py

@@ -13,13 +13,14 @@ from api.v1 import api_router
 from core.clash import ClashConfig, init_generator
 from core.config import settings
 from models.response import SuccessResponse
+from utils.pyredis import prepare_redis_url
 
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     """管理应用生命周期的上下文管理器"""
     redis_pool = redis.ConnectionPool.from_url(
-        settings.REDIS_URL,
+        prepare_redis_url(settings.REDIS_URL),
         max_connections=20,  # 根据需要调整最大连接数
         decode_responses=True,
     )

{pymecli-0.5.7 → pymecli-0.5.9}/cli/gate.py

@@ -17,14 +17,16 @@ def rsync(
 ):
     """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
-    redis = get_redis_client()
+    redis = get_redis_client(env_path=env_path)
     try:
 
         async def _run():
-            await grid_open(engine, redis)
-            await grid_close(engine, redis)
+            try:
+                await grid_open(engine, redis)
+                await grid_close(engine, redis)
+            finally:
+                await redis.close()
 
         asyncio.run(_run())
     finally:
         engine.dispose()
-        asyncio.run(redis.close())

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

@@ -18,14 +18,16 @@ def sync(
 ):
     """同步mysql中grid数据到redis"""
     engine = get_database_engine(env_path)
-    redis = get_redis_client()
+    redis = get_redis_client(env_path=env_path)
     try:
 
         async def _run():
-            await grid_open(engine, redis)
-            await grid_close(engine, redis)
+            try:
+                await grid_open(engine, redis)
+                await grid_close(engine, redis)
+            finally:
+                await redis.close()
 
         asyncio.run(_run())
     finally:
-        engine.dispose()
-        asyncio.run(redis.close())
+        engine.dispose()

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

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

pymecli-0.5.9/utils/pyredis.py

@@ -0,0 +1,45 @@
+import os
+from urllib.parse import urlsplit, urlunsplit
+
+import redis as redis_sync
+import redis.asyncio as redis
+from dotenv import load_dotenv
+
+DEFAULT_REDIS_URL = "redis://192.168.123.7:6379/0"
+
+
+def prepare_redis_url(url: str) -> str:
+    """规范化 Redis URL，追加 protocol=2 兼容 Redis 7"""
+    if "protocol=" in url:
+        return url
+    parts = urlsplit(url)
+    query = parts.query + ("&" if parts.query else "") + "protocol=2"
+    return urlunsplit((parts.scheme, parts.netloc, parts.path, query, ""))
+
+
+# 向后兼容别名
+_force_resp2 = prepare_redis_url
+
+
+def get_redis_client(
+    url: str | None = None,
+    decode_responses: bool = True,
+    env_path: str = ".env",
+) -> redis.Redis:
+    load_dotenv(env_path)
+    redis_url = url or os.getenv("REDIS_URL", DEFAULT_REDIS_URL)
+    return redis.Redis.from_url(
+        _force_resp2(redis_url), decode_responses=decode_responses
+    )
+
+
+def get_redis_client_sync(
+    url: str | None = None,
+    decode_responses: bool = True,
+    env_path: str = ".env",
+) -> redis_sync.Redis:
+    load_dotenv(env_path)
+    redis_url = url or os.getenv("REDIS_URL", DEFAULT_REDIS_URL)
+    return redis_sync.Redis.from_url(
+        _force_resp2(redis_url), decode_responses=decode_responses
+    )

pymecli-0.5.7/utils/pyredis.py

@@ -1,18 +0,0 @@
-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)