sycommon-python-lib 0.2.1b4__tar.gz → 0.2.1b5__tar.gz

{sycommon_python_lib-0.2.1b4 → sycommon_python_lib-0.2.1b5}/PKG-INFO

@@ -1,41 +1,41 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1b4
+Version: 0.2.1b5
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
 Requires-Dist: aio-pika>=9.6.2
-Requires-Dist: aiohttp>=3.13.3
+Requires-Dist: aiohttp>=3.13.5
 Requires-Dist: aiomysql>=0.3.2
 Requires-Dist: anyio>=4.12.1
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: deepagents>=0.5.0a2
+Requires-Dist: deepagents>=0.5.1
 Requires-Dist: elasticsearch>=9.3.0
-Requires-Dist: fastapi>=0.135.1
+Requires-Dist: fastapi>=0.135.3
 Requires-Dist: jinja2>=3.1.6
-Requires-Dist: kafka-python>=2.3.0
-Requires-Dist: langchain>=1.2.13
-Requires-Dist: langchain-core>=1.2.20
+Requires-Dist: kafka-python>=2.3.1
+Requires-Dist: langchain>=1.2.15
+Requires-Dist: langchain-core>=1.2.28
 Requires-Dist: langchain-openai>=1.1.11
-Requires-Dist: langfuse>=4.0.1
-Requires-Dist: langgraph>=1.1.3
+Requires-Dist: langfuse>=4.1.0
+Requires-Dist: langgraph>=1.1.6
 Requires-Dist: langgraph-checkpoint-redis>=0.4.0
 Requires-Dist: ldap3>=2.9.1
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.6.0
-Requires-Dist: nacos-sdk-python<3.0,>=2.0.9
+Requires-Dist: nacos-sdk-python<3.0,>=2.0.11
 Requires-Dist: psutil>=7.2.2
 Requires-Dist: pyxxl>=0.4.6
 Requires-Dist: pydantic>=2.12.5
 Requires-Dist: python-dotenv>=1.2.2
-Requires-Dist: python-multipart>=0.0.22
+Requires-Dist: python-multipart>=0.0.24
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: redis>=7.3.0
-Requires-Dist: sentry-sdk[fastapi]>=2.55.0
+Requires-Dist: sentry-sdk[fastapi]>=2.57.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.48
 Requires-Dist: starlette[full]>=1.0.0
 Requires-Dist: tiktoken>=0.12.0
-Requires-Dist: uvicorn>=0.42.0
+Requires-Dist: uvicorn>=0.44.0
 Requires-Dist: wecom-aibot-python-sdk>=1.0.2
 
 # sycommon-python-lib

{sycommon_python_lib-0.2.1b4 → sycommon_python_lib-0.2.1b5}/pyproject.toml

@@ -1,42 +1,42 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.1b4"
+version = "0.2.1b5"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
     "aio-pika>=9.6.2",
-    "aiohttp>=3.13.3",
+    "aiohttp>=3.13.5",
     "aiomysql>=0.3.2",
     "anyio>=4.12.1",
     "decorator>=5.2.1",
-    "deepagents>=0.5.0a2",
+    "deepagents>=0.5.1",
     "elasticsearch>=9.3.0",
-    "fastapi>=0.135.1",
+    "fastapi>=0.135.3",
     "jinja2>=3.1.6",
-    "kafka-python>=2.3.0",
-    "langchain>=1.2.13",
-    "langchain-core>=1.2.20",
+    "kafka-python>=2.3.1",
+    "langchain>=1.2.15",
+    "langchain-core>=1.2.28",
     "langchain-openai>=1.1.11",
-    "langfuse>=4.0.1",
-    "langgraph>=1.1.3",
+    "langfuse>=4.1.0",
+    "langgraph>=1.1.6",
     "langgraph-checkpoint-redis>=0.4.0",
     "ldap3>=2.9.1",
     "loguru>=0.7.3",
     "mysql-connector-python>=9.6.0",
-    "nacos-sdk-python>=2.0.9,<3.0",
+    "nacos-sdk-python>=2.0.11,<3.0",
     "psutil>=7.2.2",
     "pyxxl>=0.4.6",
     "pydantic>=2.12.5",
     "python-dotenv>=1.2.2",
-    "python-multipart>=0.0.22",
+    "python-multipart>=0.0.24",
     "pyyaml>=6.0.3",
     "redis>=7.3.0",
-    "sentry-sdk[fastapi]>=2.55.0",
+    "sentry-sdk[fastapi]>=2.57.0",
     "sqlalchemy[asyncio]>=2.0.48",
     "starlette[full]>=1.0.0",
     "tiktoken>=0.12.0",
-    "uvicorn>=0.42.0",
+    "uvicorn>=0.44.0",
     "wecom-aibot-python-sdk>=1.0.2",
 ]
 
@@ -49,3 +49,4 @@ build-backend = "setuptools.build_meta"
 
 [project.scripts]
 sycommon = "command.cli:main"
+sycli = "sycli.cli:main"

{sycommon_python_lib-0.2.1b4 → sycommon_python_lib-0.2.1b5}/src/command/cli.py

@@ -5,12 +5,15 @@ Usage:
     sycommon init web my_project              # 交互式创建Web项目
     sycommon init agent my_project            # 交互式创建Agent项目
     sycommon init web my_project --with-db    # 命令行指定功能
-    sycommon version                          # 显示版本
+    sycommon init agent my_project --port 9090
     sycommon doctor                           # 项目健康检查
+    sycommon list                             # 查看可用模板
+    sycommon version                          # 显示版本
 """
 import argparse
 import sys
 from importlib.metadata import version, PackageNotFoundError
+from importlib.resources import files
 
 from .core.models import FeatureOptions
 from .core.project import init_project
@@ -39,6 +42,7 @@ def create_init_parser(subparsers) -> None:
   sycommon init web my_project --dry-run    # 预览将要创建的文件
   sycommon init web my_project --force      # 强制覆盖已存在的目录
   sycommon init web my_project -q           # 静默模式（使用默认配置）
+  sycommon init agent my_project --port 9090
   sycommon init web my_project --with-db --with-mq --with-redis --with-es
 
 项目类型说明:
@@ -48,9 +52,10 @@ def create_init_parser(subparsers) -> None:
 Agent 项目结构:
   agent/           - Agent 核心 (main_agent, nodes, states, enums)
   api/sse/         - SSE 流式接口
+  api/query.py     - 查询接口
   tools/           - 工具函数 (含 MQ 处理)
   db/              - 数据库服务
-  model/           - 数据模型
+  model/           - 数据模型 (含 parse.py 请求模型)
 
 Web 项目结构:
   api/             - API 接口 (含 SSE)
@@ -116,6 +121,8 @@ Web 项目结构:
         "-q", "--quiet", action="store_true", help="静默模式")
     behavior_group.add_argument(
         "-v", "--verbose", action="store_true", help="详细输出")
+    behavior_group.add_argument(
+        "--port", type=int, default=8080, help="服务端口 (默认: 8080)")
 
 
 def handle_init_command(args) -> bool:
@@ -126,7 +133,29 @@ def handle_init_command(args) -> bool:
         args.no_nacos, args.no_kafka, args.no_llm, args.no_sentry
     ])
 
-    if use_cli_mode or args.quiet:
+    # 静默模式使用项目类型推荐默认值
+    if args.quiet:
+        features = FeatureOptions.defaults_for(args.project_type)
+        # 覆盖命令行明确指定的选项
+        if args.with_db:
+            features.database = True
+        if args.with_mq:
+            features.rabbitmq = True
+        if args.with_sse:
+            features.sse = True
+        if args.with_redis:
+            features.redis = True
+        if args.with_es:
+            features.elasticsearch = True
+        if args.no_nacos:
+            features.nacos = False
+        if args.no_kafka:
+            features.kafka_log = False
+        if args.no_llm:
+            features.llm = False
+        if args.no_sentry:
+            features.sentry = False
+    elif use_cli_mode:
         features = FeatureOptions(
             database=args.with_db,
             rabbitmq=args.with_mq,
@@ -149,7 +178,8 @@ def handle_init_command(args) -> bool:
         features=features,
         dry_run=args.dry_run,
         force=args.force,
-        verbose=verbose
+        verbose=verbose,
+        port=args.port,
     )
 
 
@@ -164,11 +194,12 @@ def create_doctor_parser(subparsers) -> None:
   sycommon doctor                    # 检查当前目录
   sycommon doctor /path/to/project   # 检查指定目录
 
-检查项目:
+检查项:
+  - 项目类型检测 (web / agent)
+  - 必要文件和目录完整性
   - 依赖安装状态
   - 配置文件完整性
-  - 环境变量配置
-  - 代码规范检查
+  - Python 版本
 """
     )
     doctor_parser.add_argument(
@@ -184,6 +215,17 @@ def create_doctor_parser(subparsers) -> None:
     )
 
 
+def _detect_project_type(project_path) -> str | None:
+    """检测项目类型"""
+    from pathlib import Path
+    if (project_path / "agent" / "main_agent.py").exists() or \
+       (project_path / "agent" / "enums").is_dir():
+        return "agent"
+    if (project_path / "api").is_dir():
+        return "web"
+    return None
+
+
 def handle_doctor_command(args) -> bool:
     """处理 doctor 命令"""
     from pathlib import Path
@@ -197,6 +239,13 @@ def handle_doctor_command(args) -> bool:
     issues = []
     warnings = []
 
+    # 0. 检测项目类型
+    project_type = _detect_project_type(project_path)
+    if project_type:
+        print_success(f"项目类型: {project_type}")
+    else:
+        warnings.append("无法识别项目类型 (非 web / agent 标准结构)")
+
     # 1. 检查必要文件
     required_files = ["app.py", "requirements.txt"]
     for file in required_files:
@@ -209,10 +258,29 @@ def handle_doctor_command(args) -> bool:
         if not (project_path / file).exists():
             warnings.append(f"缺少配置文件: {file}")
 
-    # 3. 检查目录结构
-    recommended_dirs = ["api", "model", "tools", "client"]
-    for dir_name in recommended_dirs:
-        if not (project_path / dir_name).exists():
+    # 3. 根据项目类型检查目录结构
+    if project_type == "agent":
+        required_dirs = ["agent", "api", "model", "tools"]
+        agent_subdirs = ["agent/nodes", "agent/states", "agent/enums"]
+        for dir_name in agent_subdirs:
+            if not (project_path / dir_name).is_dir():
+                warnings.append(f"缺少 Agent 目录: {dir_name}/")
+        # 检查 agent 关键文件
+        agent_files = [
+            "agent/main_agent.py",
+            "agent/enums/node_type.py",
+            "agent/states/agent_state.py",
+        ]
+        for file in agent_files:
+            if not (project_path / file).exists():
+                issues.append(f"缺少 Agent 核心文件: {file}")
+    elif project_type == "web":
+        required_dirs = ["api", "model", "tools", "client"]
+    else:
+        required_dirs = ["api", "model", "tools"]
+
+    for dir_name in required_dirs:
+        if not (project_path / dir_name).is_dir():
             warnings.append(f"缺少推荐目录: {dir_name}/")
 
     # 4. 检查 Python 版本
@@ -244,6 +312,8 @@ def handle_doctor_command(args) -> bool:
             ("uvicorn", "Uvicorn"),
             ("sycommon", "sycommon-python-lib"),
         ]
+        if project_type == "agent":
+            packages.append(("langgraph", "LangGraph"))
         for module, name in packages:
             spec = importlib.util.find_spec(module)
             if spec:
@@ -262,6 +332,59 @@ def handle_doctor_command(args) -> bool:
         return True
 
 
+def handle_list_command(args) -> bool:
+    """处理 list 命令 - 显示可用模板"""
+    template_root = files("command.templates")
+
+    print(f"\n{Colors.HEADER}📋 可用项目模板{Colors.ENDC}")
+    print("-" * 50)
+
+    templates = {
+        "web": {
+            "desc": "标准 FastAPI Web 服务",
+            "dirs": ["api/", "api/sse/", "tools/", "model/", "client/"],
+            "features": "nacos, kafka_log, llm, sentry (默认启用)",
+        },
+        "agent": {
+            "desc": "AI Agent 服务 (LangGraph 状态图)",
+            "dirs": ["agent/", "agent/nodes/", "agent/states/", "agent/enums/",
+                     "api/sse/", "api/query.py", "tools/", "model/", "db/"],
+            "features": "nacos, kafka_log, llm, sentry (默认启用)",
+        },
+    }
+
+    for name, info in templates.items():
+        print(f"\n{Colors.OKGREEN}{name}{Colors.ENDC} - {info['desc']}")
+        print(f"  目录结构:")
+        for d in info["dirs"]:
+            exists = (template_root / name / d.replace("/", "")).exists() if d.endswith("/") else True
+            marker = "✓" if exists else "?"
+            print(f"    {marker} {d}")
+        print(f"  默认功能: {info['features']}")
+
+    # 列出所有功能选项
+    print(f"\n{Colors.HEADER}功能模块{Colors.ENDC}")
+    print("-" * 50)
+    features = [
+        ("database", "MySQL 数据库 (SQLAlchemy)", False),
+        ("rabbitmq", "RabbitMQ 消息队列", False),
+        ("nacos", "Nacos 服务注册与配置中心", True),
+        ("kafka_log", "Kafka 日志收集", True),
+        ("sse", "Server-Sent Events 流式响应", False),
+        ("llm", "LLM 大模型 (LangChain/LangGraph)", True),
+        ("redis", "Redis 缓存服务", False),
+        ("elasticsearch", "Elasticsearch 搜索/日志", False),
+        ("sentry", "Sentry 错误监控", True),
+    ]
+    for name, desc, default in features:
+        status = "默认启用" if default else "默认禁用"
+        flag = f"--with-{name.replace('_', '-')}" if not default else f"--no-{name.replace('_', '-')}"
+        print(f"  {name:20s} {desc:30s} [{status}] ({flag})")
+
+    print(f"\n{Colors.OKCYAN}使用 sycommon init <type> <name> 创建项目{Colors.ENDC}")
+    return True
+
+
 def main() -> None:
     """CLI 主入口"""
     parser = argparse.ArgumentParser(
@@ -276,6 +399,7 @@ def main() -> None:
     create_init_parser(subparsers)
     create_doctor_parser(subparsers)
     subparsers.add_parser("version", help="显示版本信息")
+    subparsers.add_parser("list", help="显示可用模板和功能模块")
 
     try:
         args = parser.parse_args()
@@ -294,6 +418,9 @@ def main() -> None:
             if not success:
                 sys.exit(1)
 
+        if args.command == "list":
+            handle_list_command(args)
+
     except argparse.ArgumentError as e:
         print_error(str(e))
         cmd = args.command if 'args' in locals() and hasattr(args, 'command') else ''

{sycommon_python_lib-0.2.1b4 → sycommon_python_lib-0.2.1b5}/src/command/core/models.py

@@ -1,10 +1,19 @@
 """
 CLI 数据模型
 """
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import Dict
 
 
+# Agent 项目默认启用的功能
+AGENT_DEFAULTS = {
+    "database": True,
+    "rabbitmq": True,
+    "sse": True,
+    "llm": True,
+}
+
+
 @dataclass
 class FeatureOptions:
     """功能模块选项"""
@@ -18,6 +27,13 @@ class FeatureOptions:
     elasticsearch: bool = False  # Elasticsearch 日志/Token记录
     sentry: bool = True  # Sentry 错误监控，默认开启
 
+    @classmethod
+    def defaults_for(cls, project_type: str) -> "FeatureOptions":
+        """根据项目类型返回推荐默认配置"""
+        if project_type == "agent":
+            return cls(**AGENT_DEFAULTS)
+        return cls()
+
     def to_template_vars(self) -> dict:
         """转换为模板变量"""
         return {

{sycommon_python_lib-0.2.1b4 → sycommon_python_lib-0.2.1b5}/src/command/core/project.py

@@ -17,8 +17,25 @@ from .console import (
 from .utils import get_all_files_in_directory
 
 
-def interactive_feature_selection() -> FeatureOptions:
-    """交互式功能选择"""
+def _get_current_user() -> str:
+    """获取当前用户名，兼容容器/CI 等无 tty 环境。"""
+    try:
+        return os.getlogin()
+    except OSError:
+        # 容器、CI、非交互式 shell 等环境下 os.getlogin() 会失败
+        import getpass
+        return getpass.getuser() or "unknown"
+
+
+def interactive_feature_selection(project_type: str = "web") -> FeatureOptions:
+    """交互式功能选择
+
+    提示默认值从 FeatureOptions 数据类获取，保证 --quiet 模式和
+    交互模式使用完全一致的默认值。
+    """
+    # 根据项目类型获取推荐默认值
+    defaults = FeatureOptions.defaults_for(project_type)
+
     print(f"\n{Colors.HEADER}🔧 功能模块配置{Colors.ENDC}")
     print("-" * 40)
 
@@ -35,15 +52,15 @@ def interactive_feature_selection() -> FeatureOptions:
             print_warning("请输入 y/n")
 
     return FeatureOptions(
-        database=ask_yes_no("启用数据库 (MySQL)?", default=True),
-        rabbitmq=ask_yes_no("启用 RabbitMQ 消息队列?", default=True),
-        nacos=ask_yes_no("启用 Nacos 服务注册?", default=True),
-        kafka_log=ask_yes_no("启用 Kafka 日志?", default=True),
-        sse=ask_yes_no("启用 SSE 流式响应?", default=True),
-        llm=ask_yes_no("启用 LLM 大模型支持?", default=True),
-        redis=ask_yes_no("启用 Redis 缓存?", default=True),
-        elasticsearch=ask_yes_no("启用 Elasticsearch?", default=True),
-        sentry=ask_yes_no("启用 Sentry 错误监控?", default=True),
+        database=ask_yes_no("启用数据库 (MySQL)?", default=defaults.database),
+        rabbitmq=ask_yes_no("启用 RabbitMQ 消息队列?", default=defaults.rabbitmq),
+        nacos=ask_yes_no("启用 Nacos 服务注册?", default=defaults.nacos),
+        kafka_log=ask_yes_no("启用 Kafka 日志?", default=defaults.kafka_log),
+        sse=ask_yes_no("启用 SSE 流式响应?", default=defaults.sse),
+        llm=ask_yes_no("启用 LLM 大模型支持?", default=defaults.llm),
+        redis=ask_yes_no("启用 Redis 缓存?", default=defaults.redis),
+        elasticsearch=ask_yes_no("启用 Elasticsearch?", default=defaults.elasticsearch),
+        sentry=ask_yes_no("启用 Sentry 错误监控?", default=defaults.sentry),
     )
 
 
@@ -53,7 +70,8 @@ def init_project(
     features: Optional[FeatureOptions] = None,
     dry_run: bool = False,
     force: bool = False,
-    verbose: bool = True
+    verbose: bool = True,
+    port: int = 8080
 ) -> bool:
     """
     初始化项目，自动读取模板文件并替换占位符
@@ -65,6 +83,7 @@ def init_project(
         dry_run: 仅预览，不实际创建文件
         force: 强制覆盖已存在的目录
         verbose: 显示详细输出
+        port: 服务端口
 
     Returns:
         是否成功
@@ -85,7 +104,7 @@ def init_project(
     # 交互式功能选择
     if features is None:
         try:
-            features = interactive_feature_selection()
+            features = interactive_feature_selection(project_type)
         except KeyboardInterrupt:
             print("\n")
             print_info("操作已取消")
@@ -100,26 +119,65 @@ def init_project(
     # 处理项目名称
     short_project_name = project_name.replace("shengye-platform-", "")
     short_project_name_upper = short_project_name.upper()
+    # 生成合法的 Python 标识符（用于类名、变量名）
+    # "goodsprice-parse" -> "GoodspriceParse", "GOODSPRICE_PARSE"
+    safe_identifier = re.sub(r'[^a-zA-Z0-9]', '_', short_project_name)
+    safe_class_name = "".join(part.capitalize() for part in safe_identifier.split("_") if part)
+    safe_upper_name = safe_identifier.upper()
+
 
     # 定义模板变量
     context = {
         "project_name": project_name,
         "short_project_name": short_project_name,
         "short_project_name_upper": short_project_name_upper,
+        "safe_class_name": safe_class_name,
+        "safe_upper_name": safe_upper_name,
+        "safe_identifier": safe_identifier,
         "project_type": project_type,
         "create_time": datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
-        "author": os.getlogin(),
-        "default_port": 8080,
+        "author": _get_current_user(),
+        "default_port": port,
     }
     context.update(features.to_template_vars())
 
+    # 文件过滤：跳过不需要的模块
+    feature_map = {
+        'feature_rabbitmq': [
+            'tools/mq.py', 'tools/mq.py.tpl',
+        ],
+        'feature_sse': [
+            'api/sse/', 'sse/',
+        ],
+        'feature_database': [
+            'db/', 'db/service.py', 'db/model/', 'db/model/entity.py',
+        ],
+    }
+    disabled_features = {
+        key for key, flag_val in features.to_template_vars().items()
+        if flag_val == 'false' and key in feature_map
+    }
+
+    def _should_skip(rel_path: str) -> bool:
+        """检查文件是否因功能关闭而应跳过"""
+        for feat_key in disabled_features:
+            for pattern in feature_map[feat_key]:
+                if pattern in rel_path:
+                    return True
+        return False
+
     # 获取模板文件
     base_dir = template_root / "base"
     type_dir = template_root / project_type
 
     base_files = get_all_files_in_directory(base_dir)
     type_specific_files = get_all_files_in_directory(type_dir)
-    file_mappings = base_files + type_specific_files
+
+    # 过滤掉不需要的文件
+    file_mappings = []
+    for abs_path, rel_path in base_files + type_specific_files:
+        if not _should_skip(rel_path):
+            file_mappings.append((abs_path, rel_path))
 
     # Dry run 模式
     if dry_run:
@@ -197,12 +255,13 @@ def _render_files(
                     pattern = re.compile(rf'{{\s*{re.escape(key)}\s*}}')
                     rendered_content = pattern.sub(str(value), rendered_content)
 
-            # 清理引号
-            rendered_content = re.sub(
-                r'(\w+)\s*:\s*["\']([^"\']+)["\']',
-                r'\1: \2',
-                rendered_content
-            )
+            # 清理引号（仅对 .py 文件，避免破坏 YAML/JSON/Dockerfile 等格式）
+            if target_rel_path.endswith('.py') or target_rel_path.endswith('.py.tpl'):
+                rendered_content = re.sub(
+                    r'(\w+)\s*:\s*["\']([^"\']+)["\']',
+                    r'\1: \2',
+                    rendered_content
+                )
 
             # 处理文件后缀
             if target_rel_path.endswith('.tpl'):
@@ -234,5 +293,7 @@ def _print_success_message(
     print()
     print_info("下一步操作:")
     print(f"  cd {project_name}")
+    print(f"  # 建议先创建虚拟环境")
+    print(f"  python -m venv .venv && source .venv/bin/activate")
     print(f"  pip install -r requirements.txt")
     print(f"  python app.py")

sycommon_python_lib-0.2.1b5/src/sycli/__init__.py

@@ -0,0 +1,3 @@
+"""sycli - RL-based multi-agent code optimization CLI."""
+
+__version__ = "0.1.0"

sycommon_python_lib-0.2.1b5/src/sycli/__main__.py

@@ -0,0 +1,6 @@
+"""Allow running sycli as `python -m sycli`."""
+
+from sycli.cli import main
+
+if __name__ == "__main__":
+    main()

sycommon_python_lib-0.2.1b5/src/sycli/agents/__init__.py

@@ -0,0 +1 @@
+"""Agent factory for sycli."""