pymecli 0.4.5__tar.gz → 0.4.6__tar.gz

{pymecli-0.4.5 → pymecli-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymecli
-Version: 0.4.5
+Version: 0.4.6
 Summary: My CLI
 Project-URL: Homepage, https://pypi.org/project/pymecli
 Project-URL: Repository, https://github.com/meme2046/pymecli
@@ -16,6 +16,7 @@ Requires-Dist: dotenv>=0.9.9
 Requires-Dist: fastapi>=0.127.0
 Requires-Dist: numpy<2.0.0
 Requires-Dist: pandas>=2.3.3
+Requires-Dist: pydantic-settings>=2.14.2
 Requires-Dist: pymysql>=1.1.2
 Requires-Dist: pytz>=2025.2
 Requires-Dist: pyyaml>=6.0.3

{pymecli-0.4.5 → pymecli-0.4.6}/cli/fast.py

@@ -1,4 +1,3 @@
-import os
 from contextlib import asynccontextmanager
 
 import redis.asyncio as redis
@@ -20,10 +19,10 @@ from models.response import SuccessResponse
 async def lifespan(app: FastAPI):
     """管理应用生命周期的上下文管理器"""
     redis_pool = redis.ConnectionPool(
-        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"),
+        host=settings.REDIS_HOST,
+        port=settings.REDIS_PORT,
+        db=settings.REDIS_DB,
+        password=settings.REDIS_PASSWORD,
         max_connections=20,  # 根据需要调整最大连接数
         decode_responses=True,
     )
@@ -41,9 +40,9 @@ typer_app = typer.Typer()
 
 
 app = FastAPI(
-    title=settings.NAME,
-    description=settings.DESCRIPTION,
-    version=settings.VERSION,
+    title=settings.PROJECT_NAME,
+    description=settings.PROJECT_DESCRIPTION,
+    version=settings.PROJECT_VERSION,
     lifespan=lifespan,
 )
 
@@ -104,7 +103,7 @@ async def general_exception_handler(request, exc):
 
 @app.get("/")
 async def root():
-    return SuccessResponse(data=f"Welcome to {settings.DESCRIPTION}")
+    return SuccessResponse(data=f"Welcome to {settings.PROJECT_DESCRIPTION}")
 
 
 @app.get("/ping", response_class=PlainTextResponse)
@@ -153,7 +152,17 @@ def run_app(
         "-p",
         help="服务器代理,传入则通过代理转换Clash订阅,比如:socks5://127.0.0.1:7897",
     ),
+    redis_host: str = typer.Option(
+        None,
+        "--redis-host",
+        "-r",
+        help="redis host",
+    ),
 ):
+    settings.reload()
+    if redis_host is not None:
+        settings.REDIS_HOST = redis_host
+
     clash_config = ClashConfig(rule, my_rule, proxy)
     init_generator(clash_config)
 

pymecli-0.4.6/core/config.py

@@ -0,0 +1,40 @@
+import importlib.metadata
+
+from pydantic_settings import BaseSettings
+
+metadata = importlib.metadata.metadata("pymecli")
+# module_dir = Path(__file__).resolve().parent.parent
+
+# project = read_toml(str(module_dir / "./pyproject.toml"))["project"]
+
+
+class Settings(BaseSettings):
+    # API配置
+    API_V1_STR: str = "/api/v1"
+    PROJECT_NAME: str = metadata["Name"]
+
+    REDIS_HOST: str = "192.168.124.7"
+    REDIS_PORT: int = 6379
+    REDIS_DB: int = 0
+    REDIS_PASSWORD: str = ""
+
+    PROJECT_DESCRIPTION: str = (
+        f"{metadata['Summary']}, FastAPI提供: clash订阅转换、baidu.gushitong api"
+    )
+    PROJECT_VERSION: str = metadata["Version"]
+
+    class Config:
+        env_prefix = "PYME_CLI_"  # 添加环境变量前缀
+        case_sensitive = True
+
+    def reload(self):
+        new_settings = Settings()
+        for field in Settings.model_fields:
+            setattr(self, field, getattr(new_settings, field))
+
+
+settings = Settings()
+
+print(f"project: {settings.PROJECT_NAME}")
+print(f"version: {settings.PROJECT_VERSION}")
+print(f"description: {settings.PROJECT_DESCRIPTION}")

{pymecli-0.4.5 → pymecli-0.4.6}/core/redis_client.py

@@ -8,7 +8,7 @@ import redis
 class RedisClient:
     def __init__(
         self,
-        host=os.getenv("REDIS_HOST", "192.168.123.7"),
+        host=os.getenv("REDIS_HOST", "192.168.124.7"),
         port=int(os.getenv("REDIS_PORT", 6379)),
         db=int(os.getenv("REDIS_DB", 0)),
         password=os.getenv("REDIS_PASSWORD"),

{pymecli-0.4.5 → pymecli-0.4.6}/pyproject.toml

@@ -26,13 +26,14 @@
     "typer>=0.20.1",
     "uvicorn>=0.40.0",
     "webdriver-manager>=4.0.2",
+    "pydantic-settings>=2.14.2",
   ]
   description = "My CLI"
   license = { text = "MIT" }
   name = "pymecli"
   readme = "README.md"
   requires-python = ">=3.10"
-  version = "0.4.5"
+  version = "0.4.6"
 
 [project.urls]
   Homepage = "https://pypi.org/project/pymecli"

{pymecli-0.4.5 → pymecli-0.4.6}/utils/pyredis.py

@@ -5,7 +5,7 @@ import redis.asyncio as redis
 
 
 def get_redis_client(
-    host=os.getenv("REDIS_HOST", "192.168.123.7"),
+    host=os.getenv("REDIS_HOST", "192.168.124.7"),
     port=int(os.getenv("REDIS_PORT", 6379)),
     db=int(os.getenv("REDIS_DB", 0)),
     password=os.getenv("REDIS_PASSWORD"),
@@ -21,7 +21,7 @@ def get_redis_client(
 
 
 def get_redis_client_sync(
-    host=os.getenv("REDIS_HOST", "192.168.123.7"),
+    host=os.getenv("REDIS_HOST", "192.168.124.7"),
     port=int(os.getenv("REDIS_PORT", 6379)),
     db=int(os.getenv("REDIS_DB", 0)),
     password=os.getenv("REDIS_PASSWORD"),

pymecli-0.4.5/core/config.py

@@ -1,23 +0,0 @@
-import importlib.metadata
-
-metadata = importlib.metadata.metadata("pymecli")
-# module_dir = Path(__file__).resolve().parent.parent
-
-# project = read_toml(str(module_dir / "./pyproject.toml"))["project"]
-
-
-class Settings:
-    # API配置
-    API_V1_STR: str = "/api/v1"
-    NAME: str = metadata["Name"]
-    DESCRIPTION: str = (
-        f"{metadata['Summary']}, FastAPI提供: clash订阅转换、baidu.gushitong api"
-    )
-    VERSION: str = metadata["Version"]
-
-    print(f"project: {NAME}")
-    print(f"version: {VERSION}")
-    print(f"description: {DESCRIPTION}")
-
-
-settings = Settings()