sycommon-python-lib 0.2.2a9__tar.gz → 0.2.2a11__tar.gz

{sycommon_python_lib-0.2.2a9 → sycommon_python_lib-0.2.2a11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.2a9
+Version: 0.2.2a11
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -37,6 +37,7 @@ Requires-Dist: starlette[full]>=1.0.0
 Requires-Dist: tiktoken>=0.12.0
 Requires-Dist: uvicorn>=0.46.0
 Requires-Dist: wecom-aibot-python-sdk>=1.0.2
+Requires-Dist: twine>=6.2.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.2.2a9 → sycommon_python_lib-0.2.2a11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.2a9"
+version = "0.2.2a11"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -38,6 +38,7 @@ dependencies = [
     "tiktoken>=0.12.0",
     "uvicorn>=0.46.0",
     "wecom-aibot-python-sdk>=1.0.2",
+    "twine>=6.2.0",
 ]
 
 [tool.setuptools]

sycommon_python_lib-0.2.2a11/src/nexus/__init__.py

@@ -0,0 +1,40 @@
+import subprocess
+import sys
+import os
+import glob
+import argparse
+
+
+NEXUS_URL = "http://192.168.2.174:8081"
+USERNAME = "Osulcode.xiao"
+PASSWORD = "Osulcode.xiao@123"
+REPOSITORY = "shengye"
+
+
+def main():
+    parser = argparse.ArgumentParser(prog="sypublish", description="上传 whl 到 Nexus")
+    parser.add_argument("file", nargs="?", help="whl 文件路径 (默认: dist/*.whl 中最新的)")
+    parser.add_argument("--url", default=NEXUS_URL, help=f"Nexus 地址 (默认: {NEXUS_URL})")
+    parser.add_argument("-r", "--repository", default=REPOSITORY, help=f"仓库名称 (默认: {REPOSITORY})")
+    args = parser.parse_args()
+
+    if args.file:
+        file_path = args.file
+    else:
+        dist_files = sorted(glob.glob("dist/*.whl"))
+        if not dist_files:
+            print("No .whl file found in dist/")
+            sys.exit(1)
+        file_path = dist_files[-1]
+
+    if not os.path.exists(file_path):
+        print(f"File not found: {file_path}")
+        sys.exit(1)
+
+    repo_url = f"{args.url}/repository/{args.repository}/"
+    cmd = ["twine", "upload", "--repository-url", repo_url, file_path, "-u", USERNAME, "-p", PASSWORD]
+    sys.exit(subprocess.call(cmd))
+
+
+if __name__ == "__main__":
+    main()

{sycommon_python_lib-0.2.2a9 → sycommon_python_lib-0.2.2a11}/src/sycommon/services.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import os
 import yaml
 from contextlib import asynccontextmanager
 from dotenv import load_dotenv
@@ -22,10 +23,6 @@ from sycommon.database.redis_service import RedisService
 from sycommon.database.database_service import DatabaseService
 from sycommon.xxljob.xxljob_service import XxlJobService
 
-# 延迟导入的类型（避免循环导入）
-AgentConfig = Any  # type: ignore[misc]
-TeamConfig = Any  # type: ignore[misc]
-
 # 类型别名，支持更灵活的参数
 # - bool: True 启用默认配置，False 不启用
 # - dict: 使用字典配置
@@ -182,6 +179,25 @@ class Services(metaclass=SingletonMeta):
             "h11_max_incomplete_event_size": cls._config.get('H11MaxIncompleteEventSize', 1024 * 1024 * 10)
         }
 
+        workers = cls._config.get('Workers', 1)
+
+        # Worker 进程检测逻辑：
+        # 当 workers > 1 时，uvicorn 通过 spawn 创建子进程。子进程会重新 import app 模块，
+        # 导致 plugins() 在每个子进程中再次执行。需要确保 Nacos 注册等只执行一次。
+        #
+        # 检测方式：
+        # 1. 第一次调用 plugins() 的是主进程（设置了 _SY_MAIN_PID），主进程正常注册 Nacos
+        # 2. 子进程通过 spawn 创建后，_SY_MAIN_PID 环境变量已设置，且 PID 不同 → 判定为 worker
+        # 3. 主进程在 plugins() 返回后、uvicorn.run() 前设置 _SY_WORKER=1，
+        #    让子进程 import 时能直接通过环境变量判断
+        _is_worker = os.environ.get("_SY_WORKER") == "1"
+        app.state._is_worker = _is_worker
+
+        if workers > 1 and not _is_worker:
+            # 主进程：设置环境变量，子进程 spawn 后会继承
+            os.environ["_SY_WORKER"] = "1"
+            logging.info(f"多 Worker 模式 (workers={workers})，主进程将注册 Nacos，子进程跳过")
+
         # 保存可插拔服务开关状态到类变量（实例创建时会被拷贝到实例变量）
         Services._enable_es = elasticsearch_service is not None
         Services._enable_redis = redis_service is not None
@@ -197,8 +213,10 @@ class Services(metaclass=SingletonMeta):
             if multi_agent_service:
                 cls._config['MultiAgentService'] = True
 
-        if nacos_service:
+        if nacos_service and not _is_worker:
             nacos_service(cls._config)
+        elif _is_worker:
+            logging.info("Worker 进程，跳过 Nacos 注册")
 
         if middleware:
             middleware(app, cls._config)
@@ -226,6 +244,9 @@ class Services(metaclass=SingletonMeta):
             # 获取 Services 实例
             instance = cls(config, app_instance)
 
+            # 传递 worker 标记到 app.state，供用户 lifespan 使用
+            app_instance.state._is_worker = _is_worker
+
             # 沙箱清理任务引用，在 finally 中用于取消
             sandbox_cleanup_task = None
 
@@ -292,7 +313,11 @@ class Services(metaclass=SingletonMeta):
                     logging.info("沙箱后台清理任务已启动")
 
                 # 5. 执行用户定义的生命周期
-                if cls._user_lifespan:
+                # Worker 进程跳过用户 lifespan（如企微机器人等不支持多实例的服务）
+                if _is_worker:
+                    logging.info("Worker 进程，跳过用户生命周期")
+                    yield
+                elif cls._user_lifespan:
                     async with cls._user_lifespan(app_instance):
                         yield
                 else:

{sycommon_python_lib-0.2.2a9 → sycommon_python_lib-0.2.2a11}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.2a9
+Version: 0.2.2a11
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -37,6 +37,7 @@ Requires-Dist: starlette[full]>=1.0.0
 Requires-Dist: tiktoken>=0.12.0
 Requires-Dist: uvicorn>=0.46.0
 Requires-Dist: wecom-aibot-python-sdk>=1.0.2
+Requires-Dist: twine>=6.2.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.2.2a9 → sycommon_python_lib-0.2.2a11}/src/sycommon_python_lib.egg-info/requires.txt

@@ -31,3 +31,4 @@ starlette[full]>=1.0.0
 tiktoken>=0.12.0
 uvicorn>=0.46.0
 wecom-aibot-python-sdk>=1.0.2
+twine>=6.2.0

sycommon_python_lib-0.2.2a9/src/nexus/__init__.py

@@ -1,97 +0,0 @@
-import aiohttp
-import asyncio
-import random
-import argparse
-import sys
-import os
-import glob
-
-
-NEXUS_URL = "http://192.168.2.174:8081"
-USERNAME = "T3N1bGNvZGUueGlhbw=="
-PASSWORD = "T3N1bGNvZGUueGlhb0AxMjM="
-REPOSITORY = "shengye"
-
-
-async def upload(file_path: str, nexus_url: str = NEXUS_URL,
-                 username: str = USERNAME, password: str = PASSWORD,
-                 repository: str = REPOSITORY) -> bool:
-    if not os.path.exists(file_path):
-        print(f"File not found: {file_path}")
-        return False
-
-    jar = aiohttp.CookieJar(unsafe=True)
-    async with aiohttp.ClientSession(cookie_jar=jar) as session:
-        async with session.get(f"{nexus_url}/") as resp:
-            resp.raise_for_status()
-
-        async with session.post(
-            f"{nexus_url}/service/rapture/session",
-            data={"username": username, "password": password},
-        ) as resp:
-            resp.raise_for_status()
-
-        csrf_token = str(random.random())
-        session.cookie_jar.update_cookies(
-            {"NX-ANTI-CSRF-TOKEN": csrf_token},
-            response_url=aiohttp.client.URL(nexus_url),
-        )
-
-        filename = os.path.basename(file_path)
-        data = aiohttp.FormData()
-        data.add_field("NX-ANTI-CSRF-TOKEN", csrf_token)
-        data.add_field(
-            "asset0", open(file_path, "rb"),
-            filename=filename, content_type="application/octet-stream",
-        )
-
-        async with session.post(
-            f"{nexus_url}/service/rest/internal/ui/upload/{repository}",
-            data=data,
-        ) as resp:
-            status = resp.status
-            text = await resp.text()
-
-        if status in (200, 204):
-            print(f"Upload successful: {filename} -> {repository}")
-            return True
-        else:
-            print(f"Upload failed ({status}): {text}")
-            return False
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        prog="nexus-upload",
-        description="上传 whl 包到 Nexus 仓库",
-    )
-    parser.add_argument(
-        "file", nargs="?", default=None,
-        help="whl 文件路径 (默认: dist/*.whl 中最新的)",
-    )
-    parser.add_argument(
-        "--url", default=NEXUS_URL,
-        help=f"Nexus 地址 (默认: {NEXUS_URL})",
-    )
-    parser.add_argument(
-        "-r", "--repository", default=REPOSITORY,
-        help=f"仓库名称 (默认: {REPOSITORY})",
-    )
-
-    args = parser.parse_args()
-
-    if args.file:
-        file_path = args.file
-    else:
-        dist_files = sorted(glob.glob("dist/*.whl"))
-        if not dist_files:
-            print("No .whl file found in dist/")
-            sys.exit(1)
-        file_path = dist_files[-1]
-
-    ok = asyncio.run(upload(file_path, nexus_url=args.url, repository=args.repository))
-    sys.exit(0 if ok else 1)
-
-
-if __name__ == "__main__":
-    main()