dclassql 0.2.0__tar.gz → 0.3.1__tar.gz

{dclassql-0.2.0 → dclassql-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dclassql
-Version: 0.2.0
+Version: 0.3.1
 Summary: A type-safe ORM generator for Python, creating fully type-hinted database clients from plain dataclass definitions.
 Keywords: orm,codegen,sqlite,dataclass,typed
 Author: myuanz
@@ -86,7 +86,7 @@ uv add dclassql
 
 ## 当前状态
 
-DataclassQL 仍在早期开发阶段, 已完成代码生成和 SQLite 支持, 后续将扩展更多数据库与查询功能. 
+DataclassQL 仍在早期开发阶段, 但不是无根浮萍, 我已经在另外两个项目里大量使用, 目前基于其他项目的反馈来更新. 
 
 ## 一份更长的例子
 

{dclassql-0.2.0 → dclassql-0.3.1}/README.md

@@ -65,7 +65,7 @@ uv add dclassql
 
 ## 当前状态
 
-DataclassQL 仍在早期开发阶段, 已完成代码生成和 SQLite 支持, 后续将扩展更多数据库与查询功能. 
+DataclassQL 仍在早期开发阶段, 但不是无根浮萍, 我已经在另外两个项目里大量使用, 目前基于其他项目的反馈来更新. 
 
 ## 一份更长的例子
 

{dclassql-0.2.0 → dclassql-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dclassql"
-version = "0.2.0"
+version = "0.3.1"
 description = "A type-safe ORM generator for Python, creating fully type-hinted database clients from plain dataclass definitions."
 readme = "README.md"
 authors = [
@@ -26,10 +26,10 @@ dependencies = [
 ]
 
 [project.scripts]
-"dql" = "dclassql.cli:main"
+"dclassql" = "dclassql.cli:main"
 
 [build-system]
-requires = ["uv_build>=0.8.22,<0.9.0"]
+requires = ["uv_build>=0.11.6,<0.12.0"]
 build-backend = "uv_build"
 
 [dependency-groups]

{dclassql-0.2.0 → dclassql-0.3.1}/src/dclassql/__init__.py

@@ -10,12 +10,12 @@ from .unwarp import unwarp, unwarp_or, unwarp_or_raise
 class _MissingClient:
     def __init__(self, *args: object, **kwargs: object) -> None:
         raise RuntimeError(
-            "dclassql.Client 尚未生成。请先运行 `dql -m <model.py> generate` 生成客户端后再导入。"
+            "dclassql.Client 尚未生成。请先运行 `dclassql -m <model.py> generate` 生成客户端后再导入。"
         )
 
 try:  # pragma: no cover - exercised in integration tests
     from .client import Client  # type: ignore
-except ModuleNotFoundError:  # pragma: no cover - fallback when未生成
+except (ModuleNotFoundError, ImportError):  # pragma: no cover - fallback when未生成
     Client = _MissingClient  # type: ignore[assignment]
 
 

{dclassql-0.2.0 → dclassql-0.3.1}/src/dclassql/cli.py

@@ -3,9 +3,7 @@ from __future__ import annotations
 import argparse
 import importlib.util
 import re
-import shutil
 import sys
-import warnings
 from pathlib import Path
 from types import ModuleType
 from typing import Any, Callable, Literal, Sequence
@@ -19,7 +17,6 @@ from .runtime.datasource import open_sqlite_connection
 
 DEFAULT_MODEL_FILE = "model.py"
 GENERATED_CLIENT_FILENAME = "client.py"
-GENERATED_MODELS_DIRNAME = "generated_models"
 
 ConfirmRebuildMode = Literal["auto", "prompt"]
 ConfirmCallback = Callable[
@@ -77,43 +74,6 @@ def resolve_asdict_stub_path() -> Path:
     return _find_package_directory() / "asdict.pyi"
 
 
-def resolve_models_directory() -> Path:
-    return _find_package_directory() / GENERATED_MODELS_DIRNAME
-
-
-def _sanitize_name(name: str) -> str:
-    sanitized = re.sub(r"[^0-9a-zA-Z_]+", "_", name).strip("_")
-    return sanitized.lower() or "models"
-
-
-def compute_model_target(module_path: Path) -> tuple[Path, str]:
-    base_dir = resolve_models_directory()
-    base_dir.mkdir(parents=True, exist_ok=True)
-    (base_dir / "__init__.py").touch()
-
-    module_name = _sanitize_name(module_path.stem)
-
-    target_path = base_dir / f"{module_name}.py"
-    import_path = f"dclassql.{GENERATED_MODELS_DIRNAME}.{module_name}"
-    return target_path, import_path
-
-
-def materialize_model_module(module_path: Path) -> str:
-    target_path, import_path = compute_model_target(module_path)
-    if target_path.exists() or target_path.is_symlink():
-        target_path.unlink()
-    try:
-        target_path.symlink_to(module_path.resolve())
-    except OSError as exc:
-        warnings.warn(
-            f"Unable to create symlink for model '{module_path}'; falling back to copy. ({exc})",
-            RuntimeWarning,
-            stacklevel=2,
-        )
-        shutil.copy2(module_path, target_path)
-    return import_path
-
-
 def collect_models(module: ModuleType) -> list[type[Any]]:
     from dataclasses import is_dataclass
 
@@ -205,13 +165,7 @@ def push_database(
 def command_generate(module_path: Path) -> None:
     module = load_module(module_path)
     models = collect_models(module)
-    generated_models_module = materialize_model_module(module_path)
-    original_modules = {model: model.__module__ for model in models}
-    for model in models:
-        model.__module__ = generated_models_module
     generated = generate_client(models)
-    for model, original in original_modules.items():
-        model.__module__ = original
     output_path = resolve_generated_path()
     output_path.parent.mkdir(parents=True, exist_ok=True)
     output_path.write_text(generated.code, encoding="utf-8")