sdpy-kit 0.1.3__tar.gz → 0.1.5__tar.gz

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sdpy-kit
-Version: 0.1.3
+Version: 0.1.5
 Summary: SDPY Kit——统一数据库访问层（PG/MySQL/SQLite）与 AI/MCP/Redis/文件/文档/向量工具集
 Author-email: Clark <changhongyuan@126.com>
 License-Expression: MIT
@@ -17,23 +17,44 @@ Classifier: Topic :: Database
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.13
-Requires-Dist: fastmcp>=4.0.3
-Requires-Dist: firecrawl-anydoc>=0.2.4
-Requires-Dist: httpx>=0.28.1
-Requires-Dist: markdown-it-py>=3.0
-Requires-Dist: numpy>=2.0
-Requires-Dist: pimd[pdfa]>=2.2.5
-Requires-Dist: psycopg2-binary>=2.9.12
 Requires-Dist: pydantic-settings>=2.0
 Requires-Dist: pydantic>=2.0
-Requires-Dist: pymysql>=1.2.0
-Requires-Dist: python-dotenv>=1.2.3
-Requires-Dist: redis>=5.0.0
-Requires-Dist: requests>=2.34.0
 Requires-Dist: sqlalchemy~=2.0.51
-Requires-Dist: sqliteai-vector>=1.0.0
 Requires-Dist: sqlmodel>=0.0.39
-Requires-Dist: zvec>=0.6.0
+Provides-Extra: ai
+Requires-Dist: httpx>=0.28.1; extra == 'ai'
+Provides-Extra: all
+Requires-Dist: fastmcp>=4.0.3; extra == 'all'
+Requires-Dist: firecrawl-anydoc>=0.2.4; extra == 'all'
+Requires-Dist: httpx>=0.28.1; extra == 'all'
+Requires-Dist: markdown-it-py>=3.0; extra == 'all'
+Requires-Dist: numpy>=2.0; extra == 'all'
+Requires-Dist: pimd[pdfa]>=2.2.5; extra == 'all'
+Requires-Dist: psycopg2-binary>=2.9.12; extra == 'all'
+Requires-Dist: pymysql>=1.2.0; extra == 'all'
+Requires-Dist: redis>=5.0.0; extra == 'all'
+Requires-Dist: requests>=2.34.0; extra == 'all'
+Requires-Dist: sqliteai-vector>=1.0.0; extra == 'all'
+Requires-Dist: zvec>=0.6.0; extra == 'all'
+Provides-Extra: doc
+Requires-Dist: firecrawl-anydoc>=0.2.4; extra == 'doc'
+Requires-Dist: markdown-it-py>=3.0; extra == 'doc'
+Requires-Dist: pimd[pdfa]>=2.2.5; extra == 'doc'
+Provides-Extra: mcp
+Requires-Dist: fastmcp>=4.0.3; extra == 'mcp'
+Provides-Extra: mineru
+Requires-Dist: requests>=2.34.0; extra == 'mineru'
+Provides-Extra: mysql
+Requires-Dist: pymysql>=1.2.0; extra == 'mysql'
+Provides-Extra: pg
+Requires-Dist: psycopg2-binary>=2.9.12; extra == 'pg'
+Provides-Extra: redis
+Requires-Dist: redis>=5.0.0; extra == 'redis'
+Provides-Extra: vec
+Requires-Dist: numpy>=2.0; extra == 'vec'
+Requires-Dist: sqliteai-vector>=1.0.0; extra == 'vec'
+Provides-Extra: zvec
+Requires-Dist: zvec>=0.6.0; extra == 'zvec'
 Description-Content-Type: text/markdown
 
 # sdpy-kit
@@ -45,11 +66,26 @@ SDPY 统一工具集（Kit 体系），供 Python 项目开箱即用：统一数
 ## 安装
 
 ```bash
-pip install sdpy-kit
+pip install sdpy-kit            # 基础版：config/log + kit.db 核心（SQLite 常规操作零额外依赖）
 # 或
 uv add sdpy-kit
 ```
 
+可选能力按 extras 按需安装（均为延迟导入，不装不影响基础使用，缺依赖时报错会提示安装命令）：
+
+| extra | 能力 | 安装 |
+|-------|------|------|
+| `pg` | PgKit（PostgreSQL 驱动） | `pip install "sdpy-kit[pg]"` |
+| `mysql` | MySqlKit（MySQL 驱动） | `pip install "sdpy-kit[mysql]"` |
+| `vec` | SQLiteKit 向量方法（numpy / sqliteai-vector，SQLite 向量扩展） | `pip install "sdpy-kit[vec]"` |
+| `zvec` | ZvecKit（zvec，阿里独立向量库，与 `vec` 完全独立） | `pip install "sdpy-kit[zvec]"` |
+| `redis` | RedisKit | `pip install "sdpy-kit[redis]"` |
+| `mcp` | McpKit（fastmcp） | `pip install "sdpy-kit[mcp]"` |
+| `ai` | AI 服务池（httpx） | `pip install "sdpy-kit[ai]"` |
+| `doc` | DocKit 文档转换 | `pip install "sdpy-kit[doc]"` |
+| `mineru` | MineruKit 解析 API | `pip install "sdpy-kit[mineru]"` |
+| `all` | 全部能力 | `pip install "sdpy-kit[all]"` |
+
 ## 配置（.env）
 
 kit 通过 pydantic-settings 读取项目根目录 `.env`（默认值见下，均可省略）：

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/README.md

@@ -7,11 +7,26 @@ SDPY 统一工具集（Kit 体系），供 Python 项目开箱即用：统一数
 ## 安装
 
 ```bash
-pip install sdpy-kit
+pip install sdpy-kit            # 基础版：config/log + kit.db 核心（SQLite 常规操作零额外依赖）
 # 或
 uv add sdpy-kit
 ```
 
+可选能力按 extras 按需安装（均为延迟导入，不装不影响基础使用，缺依赖时报错会提示安装命令）：
+
+| extra | 能力 | 安装 |
+|-------|------|------|
+| `pg` | PgKit（PostgreSQL 驱动） | `pip install "sdpy-kit[pg]"` |
+| `mysql` | MySqlKit（MySQL 驱动） | `pip install "sdpy-kit[mysql]"` |
+| `vec` | SQLiteKit 向量方法（numpy / sqliteai-vector，SQLite 向量扩展） | `pip install "sdpy-kit[vec]"` |
+| `zvec` | ZvecKit（zvec，阿里独立向量库，与 `vec` 完全独立） | `pip install "sdpy-kit[zvec]"` |
+| `redis` | RedisKit | `pip install "sdpy-kit[redis]"` |
+| `mcp` | McpKit（fastmcp） | `pip install "sdpy-kit[mcp]"` |
+| `ai` | AI 服务池（httpx） | `pip install "sdpy-kit[ai]"` |
+| `doc` | DocKit 文档转换 | `pip install "sdpy-kit[doc]"` |
+| `mineru` | MineruKit 解析 API | `pip install "sdpy-kit[mineru]"` |
+| `all` | 全部能力 | `pip install "sdpy-kit[all]"` |
+
 ## 配置（.env）
 
 kit 通过 pydantic-settings 读取项目根目录 `.env`（默认值见下，均可省略）：

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/__init__.py

@@ -23,7 +23,7 @@ Author: Clark Chang
 数据库访问通过 kit.db 子包提供（基于 SQLModel）。
 """
 
-__version__ = "0.1.3"
+__version__ = "0.1.5"
 
 from kit.db import (
     MYSQL,

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/ai/base_service.py

@@ -127,7 +127,7 @@ class BaseAIService[RequestT, ResponseT](ABC):
             data = await self._client.post_json(payload)
             result = self._parse_response(data)
         except AIError as exc:
-            logger.info(
+            logger.error(
                 f"********** {desc} ********** "
                 f"耗时 {time.perf_counter() - start:.1f}秒（失败：{exc}）"
             )

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/ai/chat_service.py

@@ -116,6 +116,7 @@ class ChatService(BaseAIService[ChatRequest, str]):
         logger.info(f"请求参数: {params}")
         start = time.perf_counter()
         note = ""
+        failed = False
         try:
             async for parsed in self._client.stream_json(payload):
                 if parsed is None:
@@ -130,12 +131,14 @@ class ChatService(BaseAIService[ChatRequest, str]):
                     yield delta
         except AIError as exc:
             note = f"（失败：{exc}）"
+            failed = True
             raise
         except BaseException:  # noqa: BLE001 - 中断路径（提前 break/取消）也需收尾日志
             note = "（中断）"
             raise
         finally:
-            logger.info(
+            log = logger.error if failed else logger.info
+            log(
                 f"********** {desc} ********** "
                 f"耗时 {time.perf_counter() - start:.1f}秒{note}"
             )

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/ai/embedding_service.py

@@ -146,7 +146,8 @@ class EmbeddingService(BaseAIService[EmbeddingRequest, list[list[float]]]):
 
             return [vec for vec in results if vec is not None]
         finally:
-            logger.info(
+            log = logger.error if failures else logger.info
+            log(
                 f"********** {desc} ********** "
                 f"耗时 {time.perf_counter() - start:.1f}秒{note}"
             )

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/ai/model_client.py

@@ -23,7 +23,10 @@ import random
 from collections.abc import AsyncIterator
 from typing import Final
 
-import httpx
+try:
+    import httpx
+except ImportError as e:
+    raise ImportError("kit.ai 需要可选依赖，请安装：pip install sdpy-kit[ai]") from e
 
 from kit.ai.exceptions import (
     AIRequestError,

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/db/sqlite_kit.py

@@ -41,7 +41,6 @@ from __future__ import annotations
     rows = SQLiteKit.search_vectors("images", [0.1, 0.2, ...], top_k=5)
 """
 
-import numpy as np
 from sqlalchemy import text
 
 from kit.config.log_config import get_default_logger
@@ -219,6 +218,9 @@ class SQLiteKit(BaseDbKit):
             raise ValueError("extra_data 长度必须与 vectors 一致")
 
         engine = get_engine(cls.DB_TYPE)
+        # numpy 仅向量方法需要（vec extra），延迟导入保持基础安装可用
+        import numpy as np
+
         with engine.connect() as conn:
             for i, vec in enumerate(vectors):
                 vec_bytes = np.array(vec, dtype=np.float32).tobytes()
@@ -274,6 +276,9 @@ class SQLiteKit(BaseDbKit):
             按距离升序排列的结果列表，每项为 {"id": int, "distance": float, ...额外列}
         """
         engine = get_engine(cls.DB_TYPE)
+        # numpy 仅向量方法需要（vec extra），延迟导入保持基础安装可用
+        import numpy as np
+
         query_bytes = np.array(query_vector, dtype=np.float32).tobytes()
 
         with engine.connect() as conn:

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/doc_kit.py

@@ -41,12 +41,15 @@ import zipfile
 from dataclasses import dataclass
 from pathlib import Path
 
-import anydoc
-from fpdf import FPDF
-from markdown_it import MarkdownIt
-from markdown_it.token import Token
-from pimd import PiMD
-from pimd.exceptions import ConversionError
+try:
+    import anydoc
+    from fpdf import FPDF
+    from markdown_it import MarkdownIt
+    from markdown_it.token import Token
+    from pimd import PiMD
+    from pimd.exceptions import ConversionError
+except ImportError as e:
+    raise ImportError("doc_kit 需要可选依赖，请安装：pip install sdpy-kit[doc]") from e
 
 from kit.config.log_config import get_default_logger
 

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/kit/mineru_kit.py

@@ -45,7 +45,12 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Any
 
-import requests
+try:
+    import requests
+except ImportError as e:
+    raise ImportError(
+        "mineru_kit 需要可选依赖，请安装：pip install sdpy-kit[mineru]"
+    ) from e
 
 from kit.config.kit_config import get_settings
 from kit.config.log_config import get_default_logger

{sdpy_kit-0.1.3 → sdpy_kit-0.1.5}/pyproject.toml

@@ -28,27 +28,60 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Artificial Intelligence",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
+# base + extras 须与主工程 pyproject.toml 的 dependencies 保持一致（双向锚定），
+# publish.py --check-only 会自动校验，主工程缺失即报错。
 dependencies = [
     "pydantic>=2.0",
     "pydantic-settings>=2.0",
-    "numpy>=2.0",
     "sqlalchemy~=2.0.51",
     "sqlmodel>=0.0.39",
-    "pymysql>=1.2.0",
-    "psycopg2-binary>=2.9.12",
-    "redis>=5.0.0",
-    "zvec>=0.6.0",
+]
+dynamic = ["version"]
+
+# 关键节点：可选能力全部按 extras 拆分（0.1.4）。各可选依赖仅在对应 Kit/模块
+# 被实际使用时才需安装，且均为延迟导入——不装 extras 时 import kit 与基础 Kit
+# 全部可用，报错信息会提示安装命令：
+#   pg     → pg_kit（psycopg2）
+#   mysql  → mysql_kit（pymysql）
+#   vec    → SQLiteKit 向量方法（numpy/sqliteai-vector，SQLite 向量扩展，业务按需）
+#   zvec   → zvec_kit（zvec，阿里独立向量库，与 SQLite 向量扩展完全独立）
+#   redis  → redis_kit
+#   mcp    → mcp_kit（fastmcp）
+#   ai     → kit/ai 服务池（httpx）
+#   doc    → doc_kit（firecrawl-anydoc/pimd/markdown-it-py，fpdf2 由 pimd[pdfa] 带入）
+#   mineru → mineru_kit（requests）
+# 基础版 = config/log + kit.db 核心，SQLite 常规操作用标准库 sqlite3，零额外依赖。
+[project.optional-dependencies]
+pg = ["psycopg2-binary>=2.9.12"]
+mysql = ["pymysql>=1.2.0"]
+vec = [
+    "numpy>=2.0",
     "sqliteai-vector>=1.0.0",
+]
+zvec = ["zvec>=0.6.0"]
+redis = ["redis>=5.0.0"]
+mcp = ["fastmcp>=4.0.3"]
+ai = ["httpx>=0.28.1"]
+doc = [
     "firecrawl-anydoc>=0.2.4",
     "pimd[pdfa]>=2.2.5",
     "markdown-it-py>=3.0",
+]
+mineru = ["requests>=2.34.0"]
+all = [
+    "psycopg2-binary>=2.9.12",
+    "pymysql>=1.2.0",
+    "numpy>=2.0",
+    "sqliteai-vector>=1.0.0",
+    "zvec>=0.6.0",
+    "redis>=5.0.0",
     "fastmcp>=4.0.3",
     "httpx>=0.28.1",
+    "firecrawl-anydoc>=0.2.4",
+    "pimd[pdfa]>=2.2.5",
+    "markdown-it-py>=3.0",
     "requests>=2.34.0",
-    "python-dotenv>=1.2.3",
 ]
-dynamic = ["version"]
-
 [tool.hatch.version]
 path = "kit/__init__.py"