simplecadapi 2.0.2__tar.gz → 2.0.3__tar.gz

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simplecadapi
-Version: 2.0.2
+Version: 2.0.3
 Summary: A simplified CAD modeling Python API based on CADQuery
 Project-URL: Homepage, https://github.com/NiJingzhe/SimpleCADAPI
 Project-URL: Repository, https://github.com/NiJingzhe/SimpleCADAPI
@@ -385,7 +385,7 @@ SimpleCADAPI 是一个基于 CADQuery 的命令式 CAD 建模 Python 包，目
 
 ## 包安装（Python 包管理器）
 
-当前包名：`simplecadapi`，版本：`2.0.2`（见 `pyproject.toml`）。
+当前包名：`simplecadapi`，版本：`2.0.3`（见 `pyproject.toml`）。
 
 ### 方式 A：用 pip 从包仓库安装
 
@@ -418,7 +418,7 @@ uv add simplecadapi
 仓库内已有示例构建产物（`dist/`）：
 
 ```bash
-pip install dist/simplecadapi-2.0.2-py3-none-any.whl
+pip install dist/simplecadapi-2.0.3-py3-none-any.whl
 ```
 
 如果你需要重新构建：

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/README.md

@@ -9,7 +9,7 @@ SimpleCADAPI 是一个基于 CADQuery 的命令式 CAD 建模 Python 包，目
 
 ## 包安装（Python 包管理器）
 
-当前包名：`simplecadapi`，版本：`2.0.2`（见 `pyproject.toml`）。
+当前包名：`simplecadapi`，版本：`2.0.3`（见 `pyproject.toml`）。
 
 ### 方式 A：用 pip 从包仓库安装
 
@@ -42,7 +42,7 @@ uv add simplecadapi
 仓库内已有示例构建产物（`dist/`）：
 
 ```bash
-pip install dist/simplecadapi-2.0.2-py3-none-any.whl
+pip install dist/simplecadapi-2.0.3-py3-none-any.whl
 ```
 
 如果你需要重新构建：

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "simplecadapi"
-version = "2.0.2"
+version = "2.0.3"
 description = "A simplified CAD modeling Python API based on CADQuery"
 readme = "README.md"
 license = { file = "LICENSE" }

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/skills/simplecad-self-evolve/SKILL.md

@@ -5,9 +5,9 @@ license: MIT
 compatibility: Requires Python 3.10+, active virtual environment, and network access for package installation.
 metadata:
   project: simplecadapi
-  version: 2.0.2
+  version: 2.0.3
   runtime-package: simplecadapi
-  runtime-spec: simplecadapi==2.0.2
+  runtime-spec: simplecadapi==2.0.3
   cases-module: simplecad_self_evolve_cases
 ---
 
@@ -29,7 +29,7 @@ metadata:
 ## Install behavior
 - Preferred: run `scripts/install.sh` once when skill is installed/activated.
 - Runtime wrappers auto-install on demand if `simplecadapi` is missing.
-- Package installed by default: `simplecadapi==2.0.2`
+- Package installed by default: `simplecadapi==2.0.3`
 - Wrappers install only into a virtual environment interpreter (set `PYTHON_BIN` when needed).
 
 ## Interpreter selection

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/skills/simplecad-self-evolve/references/PROJECT_OVERVIEW.md

@@ -1,8 +1,8 @@
 # Project Overview
 
 - Project: `simplecadapi`
-- Version: `2.0.2`
-- Runtime package: `simplecadapi==2.0.2`
+- Version: `2.0.3`
+- Runtime package: `simplecadapi==2.0.3`
 - Skill cases module: `simplecad_self_evolve_cases`
 
 ## What this skill bundles

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/skills/simplecad-self-evolve/references/PROJECT_README.md

@@ -9,7 +9,7 @@ SimpleCADAPI 是一个基于 CADQuery 的命令式 CAD 建模 Python 包，目
 
 ## 包安装（Python 包管理器）
 
-当前包名：`simplecadapi`，版本：`2.0.2`（见 `pyproject.toml`）。
+当前包名：`simplecadapi`，版本：`2.0.3`（见 `pyproject.toml`）。
 
 ### 方式 A：用 pip 从包仓库安装
 
@@ -42,7 +42,7 @@ uv add simplecadapi
 仓库内已有示例构建产物（`dist/`）：
 
 ```bash
-pip install dist/simplecadapi-2.0.2-py3-none-any.whl
+pip install dist/simplecadapi-2.0.3-py3-none-any.whl
 ```
 
 如果你需要重新构建：

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/skills/simplecad-self-evolve/references/RUNTIME_INSTALL.md

@@ -6,7 +6,7 @@
 PYTHON_BIN=.venv/bin/python scripts/install.sh
 ```
 
-This installs `simplecadapi==2.0.2` to the active Python environment.
+This installs `simplecadapi==2.0.3` to the active Python environment.
 If `PYTHON_BIN` is not set, wrappers default to `python3` (fallback `python`).
 Installation is intentionally blocked for non-venv/system interpreters.
 

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/skills/simplecad-self-evolve/scripts/install.sh

@@ -32,7 +32,7 @@ export SIMPLECAD_RUNTIME_PACKAGE="simplecadapi"
 export SIMPLECAD_CASES_ROOT="${SKILL_ROOT}/cases"
 export SIMPLECAD_CASES_MODULE="simplecad_self_evolve_cases"
 
-PACKAGE_SPEC="simplecadapi==2.0.2"
+PACKAGE_SPEC="simplecadapi==2.0.3"
 JUPYTER_DEPS=("jupyterlab>=4.5.5" "ipykernel>=6.29.5")
 INSTALL_JUPYTER=0
 INSTALL_ARGS=()
@@ -85,4 +85,4 @@ print("simplecadapi import OK")
 print(getattr(scad, "__description__", ""))
 PY
 
-echo "Runtime install completed for simplecadapi 2.0.2."
+echo "Runtime install completed for simplecadapi 2.0.3."

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/skills/simplecad-self-evolve/scripts/repl_bootstrap.py

@@ -10,7 +10,7 @@ import sys
 from pathlib import Path
 
 
-PACKAGE_SPEC = "simplecadapi==2.0.2"
+PACKAGE_SPEC = "simplecadapi==2.0.3"
 CASES_MODULE = "simplecad_self_evolve_cases"
 
 

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/src/simplecadapi/auto_tools/skill_pack.py

@@ -16,16 +16,16 @@ import sys
 import tarfile
 import textwrap
 from dataclasses import dataclass
+from email import message_from_string
 from pathlib import Path
+from typing import Sequence, cast
 
 try:
-    import tomllib  # Python 3.11+
+    import tomllib  # Python 3.11+  # type: ignore[import-not-found]
 except ModuleNotFoundError:  # pragma: no cover
     tomllib = None  # type: ignore[assignment]
 
-
-PROJECT_ROOT = Path(__file__).resolve().parents[3]
-DEFAULT_OUTPUT_ROOT = PROJECT_ROOT / "skills"
+DEFAULT_PACKAGE_NAME = "simplecadapi"
 DEFAULT_SKILL_NAME = "simplecad-self-evolve"
 DEFAULT_LICENSE = "MIT"
 DEFAULT_JUPYTER_DEPS: tuple[str, ...] = (
@@ -40,6 +40,111 @@ LICENSE_PATH = Path("LICENSE")
 SKILL_NAME_PATTERN = re.compile(r"^(?!-)(?!.*--)[a-z0-9]+(?:-[a-z0-9]+)*$")
 
 
+def _package_root_from(module_file: Path | str | None = None) -> Path:
+    target = Path(module_file) if module_file is not None else Path(__file__)
+    return target.resolve().parents[1]
+
+
+def _is_source_checkout_root(project_root: Path) -> bool:
+    return (project_root / "pyproject.toml").exists() and (
+        project_root / "src" / DEFAULT_PACKAGE_NAME
+    ).exists()
+
+
+def _source_checkout_root(package_root: Path) -> Path | None:
+    src_dir = package_root.parent
+    project_root = src_dir.parent
+
+    if src_dir.name != "src":
+        return None
+    if not _is_source_checkout_root(project_root):
+        return None
+    return project_root
+
+
+def _default_project_root(module_file: Path | str | None = None) -> Path:
+    package_root = _package_root_from(module_file)
+    return _source_checkout_root(package_root) or package_root.parent
+
+
+def _default_output_root(project_root: Path, cwd: Path | None = None) -> Path:
+    if _is_source_checkout_root(project_root):
+        return (project_root / "skills").resolve()
+    return ((cwd if cwd is not None else Path.cwd()) / "skills").resolve()
+
+
+def _first_existing_path(candidates: Sequence[Path]) -> Path | None:
+    for path in candidates:
+        if path.exists():
+            return path
+    return None
+
+
+def _docs_root_for(project_root: Path) -> Path:
+    docs_root = _first_existing_path(
+        (
+            project_root / DOCS_PATH,
+            project_root / "src" / DOCS_PATH,
+        )
+    )
+    return docs_root or (project_root / DOCS_PATH)
+
+
+def _readme_path_for(project_root: Path) -> Path | None:
+    return _first_existing_path(
+        (
+            project_root / README_PATH,
+            project_root / "src" / README_PATH,
+        )
+    )
+
+
+def _normalize_dist_name(name: str) -> str:
+    return re.sub(r"[-_.]+", "_", name).lower()
+
+
+def _dist_info_dir(project_root: Path, package_name: str) -> Path | None:
+    candidates: list[Path] = []
+    patterns = (
+        f"{package_name}-*.dist-info",
+        f"{package_name.replace('-', '_')}-*.dist-info",
+        f"{_normalize_dist_name(package_name)}-*.dist-info",
+    )
+
+    for pattern in patterns:
+        for path in sorted(project_root.glob(pattern)):
+            if path not in candidates:
+                candidates.append(path)
+
+    return candidates[0] if candidates else None
+
+
+def _license_path_for(project_root: Path, package_name: str) -> Path | None:
+    dist_info_dir = _dist_info_dir(project_root, package_name)
+    candidates = [project_root / LICENSE_PATH]
+    if dist_info_dir is not None:
+        candidates.extend(
+            [
+                dist_info_dir / "licenses" / LICENSE_PATH.name,
+                dist_info_dir / LICENSE_PATH.name,
+            ]
+        )
+    return _first_existing_path(tuple(candidates))
+
+
+def _auto_docs_script_path_for(project_root: Path) -> Path | None:
+    return _first_existing_path(
+        (
+            project_root
+            / "src"
+            / DEFAULT_PACKAGE_NAME
+            / "auto_tools"
+            / "auto_docs_gen.py",
+            project_root / DEFAULT_PACKAGE_NAME / "auto_tools" / "auto_docs_gen.py",
+        )
+    )
+
+
 @dataclass(frozen=True)
 class ProjectMetadata:
     """Project metadata used for skill rendering."""
@@ -47,6 +152,7 @@ class ProjectMetadata:
     name: str
     version: str
     description: str
+    readme_text: str | None = None
 
 
 @dataclass(frozen=True)
@@ -57,10 +163,12 @@ class BuildResult:
     archive_path: Path | None
 
 
-def _load_project_metadata(project_root: Path) -> ProjectMetadata:
+def _load_project_metadata(
+    project_root: Path,
+    default_name: str = DEFAULT_PACKAGE_NAME,
+) -> ProjectMetadata:
     pyproject_path = project_root / "pyproject.toml"
 
-    default_name = project_root.name.lower()
     default_version = "0.0.0"
     default_desc = "SimpleCAD skill runtime installer and docs"
 
@@ -75,6 +183,7 @@ def _load_project_metadata(project_root: Path) -> ProjectMetadata:
                 name=str(project.get("name") or default_name),
                 version=str(project.get("version") or default_version),
                 description=str(project.get("description") or default_desc),
+                readme_text=None,
             )
         except Exception:
             pass
@@ -104,6 +213,32 @@ def _load_project_metadata(project_root: Path) -> ProjectMetadata:
             if description_match
             else default_desc
         ),
+        readme_text=None,
+    )
+
+
+def _load_installed_metadata(
+    project_root: Path,
+    package_name: str = DEFAULT_PACKAGE_NAME,
+) -> ProjectMetadata | None:
+    dist_info_dir = _dist_info_dir(project_root, package_name)
+    if dist_info_dir is None:
+        return None
+
+    metadata_path = dist_info_dir / "METADATA"
+    if not metadata_path.exists():
+        return None
+
+    message = message_from_string(metadata_path.read_text(encoding="utf-8"))
+    payload = cast(str, message.get_payload())
+    readme_text = payload.strip() or None
+    return ProjectMetadata(
+        name=message.get("Name", package_name),
+        version=message.get("Version", "0.0.0"),
+        description=message.get(
+            "Summary", "SimpleCAD skill runtime installer and docs"
+        ),
+        readme_text=readme_text,
     )
 
 
@@ -152,10 +287,26 @@ class SkillPackager:
         self.cases_module = self._cases_module_name()
         self.cases_module_dir = self.cases_root / self.cases_module
 
-        self.metadata = _load_project_metadata(self.project_root)
+        self.source_checkout = _is_source_checkout_root(self.project_root)
+        default_package_name = package_name or DEFAULT_PACKAGE_NAME
+        self.metadata = _load_project_metadata(
+            self.project_root,
+            default_name=default_package_name,
+        )
+        if self.metadata.version == "0.0.0":
+            installed_metadata = _load_installed_metadata(
+                self.project_root,
+                package_name=default_package_name,
+            )
+            if installed_metadata is not None:
+                self.metadata = installed_metadata
+
         self.package_name = package_name or self.metadata.name
         self.package_version = package_version or self.metadata.version
         self.jupyter_deps = jupyter_deps
+        self.source_docs = _docs_root_for(self.project_root)
+        self.source_readme = _readme_path_for(self.project_root)
+        self.source_license = _license_path_for(self.project_root, self.package_name)
 
     def log(self, message: str) -> None:
         if not self.quiet:
@@ -187,19 +338,33 @@ class SkillPackager:
             )
 
         required = (
-            self.project_root / DOCS_PATH,
-            self.project_root / DOCS_PATH / "api",
-            self.project_root / DOCS_PATH / "core",
-            self.project_root / README_PATH,
-            self.project_root / LICENSE_PATH,
+            self.source_docs,
+            self.source_docs / "api",
+            self.source_docs / "core",
         )
         for path in required:
             if not path.exists():
                 raise FileNotFoundError(f"Missing required path: {path}")
 
+        if self.source_readme is None and not self.metadata.readme_text:
+            raise FileNotFoundError(
+                "Missing required project README content in both project files and dist-info metadata"
+            )
+
+        if self.source_license is None:
+            raise FileNotFoundError(
+                "Missing required license file in both project files and dist-info metadata"
+            )
+
     def _refresh_api_docs(self) -> None:
-        script_path = self.project_root / "src/simplecadapi/auto_tools/auto_docs_gen.py"
-        if not script_path.exists():
+        if not self.source_checkout:
+            self.log(
+                "Using packaged docs from installed simplecadapi; skipped --refresh-docs outside source checkout."
+            )
+            return
+
+        script_path = _auto_docs_script_path_for(self.project_root)
+        if script_path is None:
             raise FileNotFoundError(f"Cannot refresh docs, missing: {script_path}")
 
         self.log("Refreshing API docs before packaging...")
@@ -225,21 +390,27 @@ class SkillPackager:
 
     def _copy_reference_docs(self) -> None:
         self.log("Copying reference docs...")
-        source_docs = self.project_root / DOCS_PATH
         target_docs = self.docs_dir
         shutil.copytree(
-            source_docs,
+            self.source_docs,
             target_docs,
             dirs_exist_ok=True,
             ignore=_ignore_common_noise,
         )
 
-        shutil.copy2(
-            self.project_root / README_PATH, self.references_dir / "PROJECT_README.md"
-        )
-        shutil.copy2(
-            self.project_root / LICENSE_PATH, self.references_dir / "LICENSE.txt"
-        )
+        if self.source_readme is not None:
+            shutil.copy2(self.source_readme, self.references_dir / "PROJECT_README.md")
+        else:
+            (self.references_dir / "PROJECT_README.md").write_text(
+                self.metadata.readme_text or "",
+                encoding="utf-8",
+            )
+
+        if self.source_license is None:
+            raise FileNotFoundError(
+                "Missing required license file in both project files and dist-info metadata"
+            )
+        shutil.copy2(self.source_license, self.references_dir / "LICENSE.txt")
 
     def _write_skill_markdown(self) -> None:
         self.log("Generating SKILL.md...")
@@ -1371,14 +1542,14 @@ def _parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--project-root",
         type=Path,
-        default=PROJECT_ROOT,
-        help="Project root (default: repository root)",
+        default=None,
+        help="Project root (default: source checkout root, or installed environment root)",
     )
     parser.add_argument(
         "--output-root",
         type=Path,
-        default=DEFAULT_OUTPUT_ROOT,
-        help="Output directory for generated skill bundle (default: ./skills)",
+        default=None,
+        help="Output directory for generated skill bundle (default: repo skills/ in source checkout, otherwise ./skills)",
     )
     parser.add_argument(
         "--skill-name",
@@ -1425,10 +1596,20 @@ def _parse_args() -> argparse.Namespace:
 
 def main() -> None:
     args = _parse_args()
+    project_root = (
+        args.project_root.resolve()
+        if args.project_root is not None
+        else _default_project_root()
+    )
+    output_root = (
+        args.output_root.resolve()
+        if args.output_root is not None
+        else _default_output_root(project_root)
+    )
 
     packager = SkillPackager(
-        project_root=args.project_root,
-        output_root=args.output_root,
+        project_root=project_root,
+        output_root=output_root,
         skill_name=args.skill_name,
         license_name=args.license_name,
         package_name=args.package_name,

simplecadapi-2.0.3/test/test_skill_pack.py

@@ -0,0 +1,141 @@
+import importlib.util
+import sys
+import tempfile
+import unittest
+from pathlib import Path
+
+
+MODULE_PATH = (
+    Path(__file__).resolve().parents[1] / "src/simplecadapi/auto_tools/skill_pack.py"
+)
+MODULE_SPEC = importlib.util.spec_from_file_location(
+    "simplecadapi_skill_pack",
+    MODULE_PATH,
+)
+if MODULE_SPEC is None or MODULE_SPEC.loader is None:
+    raise RuntimeError(f"Unable to load module spec for {MODULE_PATH}")
+
+skill_pack = importlib.util.module_from_spec(MODULE_SPEC)
+sys.modules[MODULE_SPEC.name] = skill_pack
+MODULE_SPEC.loader.exec_module(skill_pack)
+
+
+class TestSkillPackPathResolution(unittest.TestCase):
+    def test_default_project_root_from_source_checkout(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            project_root = Path(tmp_dir)
+            (project_root / "pyproject.toml").write_text(
+                "[project]\nname = 'simplecadapi'\n",
+                encoding="utf-8",
+            )
+            package_root = project_root / "src/simplecadapi"
+            module_file = package_root / "auto_tools/skill_pack.py"
+            module_file.parent.mkdir(parents=True, exist_ok=True)
+            module_file.write_text("", encoding="utf-8")
+
+            resolved = skill_pack._default_project_root(module_file)
+
+            self.assertEqual(resolved, project_root.resolve())
+
+    def test_default_project_root_from_site_packages_install(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            site_packages = Path(tmp_dir) / ".venv/lib/python3.12/site-packages"
+            module_file = site_packages / "simplecadapi/auto_tools/skill_pack.py"
+            module_file.parent.mkdir(parents=True, exist_ok=True)
+            module_file.write_text("", encoding="utf-8")
+
+            resolved = skill_pack._default_project_root(module_file)
+
+            self.assertEqual(resolved, site_packages.resolve())
+
+    def test_default_output_root_from_source_checkout(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            project_root = Path(tmp_dir)
+            (project_root / "pyproject.toml").write_text(
+                "[project]\nname = 'simplecadapi'\n",
+                encoding="utf-8",
+            )
+            (project_root / "src/simplecadapi").mkdir(parents=True, exist_ok=True)
+
+            resolved = skill_pack._default_output_root(project_root)
+
+            self.assertEqual(resolved, (project_root / "skills").resolve())
+
+    def test_default_output_root_from_site_packages_install(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            tmp_path = Path(tmp_dir)
+            site_packages = tmp_path / ".venv/lib/python3.12/site-packages"
+            site_packages.mkdir(parents=True, exist_ok=True)
+            workspace_root = tmp_path / "workspace"
+            workspace_root.mkdir()
+
+            resolved = skill_pack._default_output_root(
+                site_packages,
+                cwd=workspace_root,
+            )
+
+            self.assertEqual(resolved, (workspace_root / "skills").resolve())
+
+    def test_build_from_site_packages_layout_uses_metadata_readme(self):
+        with tempfile.TemporaryDirectory() as tmp_dir:
+            tmp_path = Path(tmp_dir)
+            site_packages = tmp_path / ".venv/lib/python3.12/site-packages"
+            docs_api = site_packages / "docs/api"
+            docs_core = site_packages / "docs/core"
+            docs_api.mkdir(parents=True, exist_ok=True)
+            docs_core.mkdir(parents=True, exist_ok=True)
+            (docs_api / "README.md").write_text("# API Docs\n", encoding="utf-8")
+            (docs_core / "README.md").write_text("# Core Docs\n", encoding="utf-8")
+
+            dist_info = site_packages / "simplecadapi-2.0.2.dist-info"
+            (dist_info / "licenses").mkdir(parents=True, exist_ok=True)
+            (dist_info / "METADATA").write_text(
+                "Metadata-Version: 2.1\n"
+                "Name: simplecadapi\n"
+                "Version: 2.0.2\n"
+                "Summary: Demo package\n"
+                "\n"
+                "# Demo README\n"
+                "\n"
+                "Installed package readme body.\n",
+                encoding="utf-8",
+            )
+            (dist_info / "licenses/LICENSE").write_text(
+                "MIT License\n",
+                encoding="utf-8",
+            )
+
+            output_root = tmp_path / "workspace/skills"
+            packager = skill_pack.SkillPackager(
+                project_root=site_packages,
+                output_root=output_root,
+                skill_name="simplecad-self-evolve",
+                license_name="MIT",
+                package_name="simplecadapi",
+                package_version="2.0.2",
+                refresh_docs=True,
+                quiet=True,
+            )
+
+            result = packager.build()
+
+            self.assertTrue((result.skill_root / "SKILL.md").exists())
+            self.assertTrue(
+                (result.skill_root / "references/docs/api/README.md").exists()
+            )
+            self.assertEqual(
+                (result.skill_root / "references/PROJECT_README.md").read_text(
+                    encoding="utf-8"
+                ),
+                "# Demo README\n\nInstalled package readme body.",
+            )
+            self.assertEqual(
+                (result.skill_root / "references/LICENSE.txt").read_text(
+                    encoding="utf-8"
+                ),
+                "MIT License\n",
+            )
+
+
+if __name__ == "__main__":
+    unittest.main()

{simplecadapi-2.0.2 → simplecadapi-2.0.3}/uv.lock

@@ -3546,7 +3546,7 @@ wheels = [
 
 [[package]]
 name = "simplecadapi"
-version = "2.0.2"
+version = "2.0.3"
 source = { editable = "." }
 dependencies = [
     { name = "cadquery" },