openwiki-server 0.3.2__tar.gz → 0.3.4__tar.gz

{openwiki_server-0.3.2 → openwiki_server-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: openwiki-server
-Version: 0.3.2
+Version: 0.3.4
 Summary: Lightweight SDK + Server for OpenWiki — wiki engine as standalone service with HTTP/gRPC/Celery/MCP/CLI interfaces and application integration SDK.
 Author-email: shark8848 <admin@sharky-ai.com>
 License: MIT

{openwiki_server-0.3.2 → openwiki_server-0.3.4}/openwiki_engine/__init__.py

@@ -1,3 +1,3 @@
 """OpenWiki-backed wiki engine: HTTP/gRPC/Celery/MCP/CLI 五面接口。"""
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"

{openwiki_server-0.3.2 → openwiki_server-0.3.4}/openwiki_engine/adapters/openwiki.py

@@ -16,6 +16,7 @@ import os
 import re
 import shutil
 import subprocess
+from datetime import date, datetime
 from pathlib import Path
 from typing import Any
 
@@ -30,6 +31,19 @@ MD_LINK_RE = re.compile(r"\[([^\]]+)\]\(([^)]+\.md)\)")
 FIELD_RE = re.compile(r"^\s*([\u4e00-\u9fa5\w]+)[：:]\s*(.+?)\s*$")
 
 
+def _json_safe(value: Any) -> Any:
+    """YAML front matter 的日期/时间归一化为 ISO 字符串，避免响应序列化失败。"""
+    if isinstance(value, datetime):
+        return value.isoformat()
+    if isinstance(value, date):
+        return value.isoformat()
+    if isinstance(value, list):
+        return [_json_safe(item) for item in value]
+    if isinstance(value, dict):
+        return {key: _json_safe(item) for key, item in value.items()}
+    return value
+
+
 def openwiki_bin(settings: Settings | None = None) -> str:
     settings = settings or Settings()
     return settings.openwiki_bin_resolved()
@@ -55,6 +69,7 @@ def run_update(
     settings: Settings | None = None,
 ) -> dict[str, Any]:
     """运行 `openwiki personal --update <message>`（非交互，stdin 关闭自动退出）。"""
+    wiki_root = os.path.abspath(wiki_root)
     binary = openwiki_bin(settings)
     cmd = [binary, "personal", "--update"]
     if message:
@@ -106,6 +121,7 @@ def run_ingest(
     timeout: int = 600,
 ) -> dict[str, Any]:
     """运行 `openwiki ingest <connector>`。"""
+    wiki_root = os.path.abspath(wiki_root)
     binary = openwiki_bin(settings)
     cmd = [binary, "ingest", connector]
     env = dict(os.environ)
@@ -217,6 +233,7 @@ def parse_okf_pages(wiki_dir: str, *, kb_id: str = "") -> list[dict[str, Any]]:
             for key, value in front.items()
             if str(key) not in ("title", "type", "generated", "tags", "sources", "status", "stale_after", "stableKey")
         }
+        fields = {key: _json_safe(value) for key, value in fields.items()}
         status = str(front.get("status") or "active").strip().lower()
         if status not in ("active", "deprecated"):
             status = "active"

{openwiki_server-0.3.2 → openwiki_server-0.3.4}/openwiki_engine/config.py

@@ -98,13 +98,18 @@ class Settings:
     def resolved_db_path(self) -> str:
         if self.db_path:
             return self.db_path
-        data_dir = Path(self.data_dir)
+        data_dir = Path(self.resolved_data_dir)
         data_dir.mkdir(parents=True, exist_ok=True)
         return str(data_dir / "engine.db")
 
+    @property
+    def resolved_data_dir(self) -> str:
+        """数据目录绝对路径（openwiki 子进程 HOME/cwd 必须为绝对路径）。"""
+        return str(Path(self.data_dir).expanduser().resolve())
+
     def wiki_root(self, wiki_id: str) -> str:
         """wiki 实例根目录：{data_dir}/wikis/{wiki_id}/（含 .openwiki/wiki 与 sources/）。"""
-        root = Path(self.data_dir) / "wikis" / wiki_id
+        root = Path(self.resolved_data_dir) / "wikis" / wiki_id
         root.mkdir(parents=True, exist_ok=True)
         (root / ".openwiki" / "wiki").mkdir(parents=True, exist_ok=True)
         (root / "sources").mkdir(parents=True, exist_ok=True)

{openwiki_server-0.3.2 → openwiki_server-0.3.4}/openwiki_engine/interfaces/http_app.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import json
+from datetime import date, datetime
 from typing import Any
 
 from fastapi import FastAPI, Query, Request
@@ -14,13 +16,26 @@ from ..protocol import TRACE_ID_HEADER, error, new_trace_id, ok
 from ..runtime import get_service
 
 
+def _json_default(value: Any) -> str:
+    if isinstance(value, (datetime, date)):
+        return value.isoformat()
+    return str(value)
+
+
+class _JsonResponse(JSONResponse):
+    """响应序列化兜底：datetime/date 等非标准类型转字符串，避免业务数据 500。"""
+
+    def render(self, content: Any) -> bytes:
+        return json.dumps(content, ensure_ascii=False, default=_json_default).encode("utf-8")
+
+
 def _trace(request: Request) -> str:
     return request.headers.get(TRACE_ID_HEADER) or new_trace_id()
 
 
 def _handle(trace_id: str, fn) -> JSONResponse:
     try:
-        return JSONResponse(ok(trace_id, fn()))
+        return _JsonResponse(ok(trace_id, fn()))
     except OpenWikiError as exc:
         status = (
             400
@@ -31,16 +46,16 @@ def _handle(trace_id: str, fn) -> JSONResponse:
             if exc.code == "200409"
             else 500
         )
-        return JSONResponse(error(trace_id, exc), status_code=status)
+        return _JsonResponse(error(trace_id, exc), status_code=status)
     except Exception as exc:  # pragma: no cover
-        return JSONResponse(error(trace_id, exc), status_code=500)
+        return _JsonResponse(error(trace_id, exc), status_code=500)
 
 
 def create_app(service: Any | None = None) -> FastAPI:
     settings = Settings()
     configure_logging(level=settings.log_level, log_center=settings.log_center)
     svc = service or get_service()
-    app = FastAPI(title="OpenWiki Server", version="0.3.2")
+    app = FastAPI(title="OpenWiki Server", version="0.3.4")
 
     @app.get("/health")
     def health() -> dict[str, Any]:

{openwiki_server-0.3.2 → openwiki_server-0.3.4}/openwiki_engine/persistence/sqlite_store.py

@@ -88,7 +88,7 @@ class SqliteWikiStore:
     # ---------- wiki 文件根目录 ----------
 
     def wiki_root(self, wiki_id: str) -> str:
-        root = Path(self.data_dir) / "wikis" / wiki_id
+        root = Path(self.data_dir).expanduser().resolve() / "wikis" / wiki_id
         root.mkdir(parents=True, exist_ok=True)
         (root / ".openwiki" / "wiki").mkdir(parents=True, exist_ok=True)
         (root / "sources").mkdir(parents=True, exist_ok=True)

{openwiki_server-0.3.2 → openwiki_server-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "openwiki-server"
-version = "0.3.2"
+version = "0.3.4"
 description = "Lightweight SDK + Server for OpenWiki — wiki engine as standalone service with HTTP/gRPC/Celery/MCP/CLI interfaces and application integration SDK."
 readme = "README.md"
 requires-python = ">=3.10"