python-ddd-framework 0.5.1__py3-none-any.whl → 0.7.0__py3-none-any.whl

python_ddd_framework/application_services/module.py

@@ -25,15 +25,16 @@ from ..services.convention_contracts import (
     ConventionDiscoveryKind,
     _ServiceDefinition,
 )
+from ..services.relocation import _BindingRelocation
 from ..settings.module import SettingsModule
 from ..unit_of_work.module import UnitOfWorkModule
 from .bindings import (
     _bind_application_services,
-    _runtime_providers,
     _validate_application_service_bindings,
     _validate_application_service_dependencies,
 )
 from .catalog import (
+    _APPLICATION_SERVICE_COMPONENT,
     ApplicationServiceCatalog,
     _build_application_service_catalog,
     _DiscoveredApplicationService,
@@ -130,10 +131,20 @@ class ApplicationServicesModule(AppModule):
             context.modules.instance(InvocationModule).rules,
             context.modules.instance(ExtensionsModule).catalog,
         )
-        # 只重定位仲裁后的原生绑定，保留其他能力已经生成的目录 Provider。
-        for provider in context.arbitration.providers:
-            context._providers.remove(provider)
-        context._providers[0:0] = _runtime_providers(context.arbitration, bound)
+        # 能力只决定私有实现 key；来源、工厂搬迁和贡献指纹仍由 services 管理。
+        context._relocate_bindings(
+            tuple(
+                _BindingRelocation(
+                    item.winner,
+                    DependencyKey(
+                        item.binding.discovery.definition.contract
+                        or item.binding.discovery.service_type,
+                        _APPLICATION_SERVICE_COMPONENT,
+                    ),
+                )
+                for item in bound
+            )
+        )
         provider = Provider()
         provider.provide(lambda: self.catalog, provides=ApplicationServiceCatalog, scope=Scope.APP)
         provider.provide(_ApplicationServiceDispatcher, scope=Scope.REQUEST)

python_ddd_framework/authorization/checking.py

@@ -0,0 +1,35 @@
+"""所有调用与持续访问边界共用的授权规则；不拥有传输或调用 scope。"""
+
+from collections.abc import Callable
+
+from dishka import AsyncContainer
+from dishka.exceptions import NoFactoryError
+
+from ..options import Options
+from .contracts import CurrentUser, PermissionChecker, _AuthorizationRequirement
+from .errors import PermissionCheckerUnavailableError, PermissionDeniedError, UnauthenticatedError
+from .options import AuthorizationOptions
+
+
+async def _check_authorization(
+    container: AsyncContainer,
+    get_user: Callable[[], CurrentUser],
+    requirement: _AuthorizationRequirement,
+) -> None:
+    if requirement.allows_anonymous or not requirement.requires_authenticated_user:
+        return
+    if (await container.get(Options[AuthorizationOptions])).value.always_allow:
+        return
+    # 认证阶段也可调用无需授权的服务；只有实际校验身份时才读取最终 CurrentUser。
+    user = get_user()
+    if not user.is_authenticated:
+        raise UnauthenticatedError
+    if not requirement.permissions:
+        return
+    try:
+        checker = await container.get(PermissionChecker)
+    except NoFactoryError:
+        raise PermissionCheckerUnavailableError from None
+    for permission in requirement.permissions:
+        if not await checker.is_granted(user, permission):
+            raise PermissionDeniedError(permission=str(permission))

python_ddd_framework/authorization/module.py

@@ -2,8 +2,8 @@
 
 from dishka import Provider, Scope
 
-from ..application_services.invocation import _InvocationRuntime
 from ..invocation.module import InvocationModule
+from ..invocation.runtime import _InvocationRuntime
 from ..lifecycle import ConfigureContext
 from ..modularity import AppModule
 from ..services.composition import (

python_ddd_framework/background_jobs/execution.py

@@ -12,9 +12,9 @@ from uuid import uuid4
 from dishka import AsyncContainer, Scope
 from pydantic import BaseModel, ValidationError
 
-from ..application_services.invocation import _InvocationRuntime
 from ..authorization import CurrentUser
 from ..invocation import BackgroundSystemCaller
+from ..invocation.runtime import _InvocationRuntime
 from ..observability.context import invocation_span
 from .catalog import BackgroundJobCatalog
 from .contracts import BackgroundJobContext, BackgroundJobDefinition

python_ddd_framework/background_jobs/pgqueuer/enqueue.py

@@ -8,7 +8,7 @@ from typing import Any, TypeVar
 import asyncpg  # type: ignore[import-untyped]
 from pydantic import BaseModel
 
-from ...application_services.invocation import _InvocationRuntime
+from ...invocation.runtime import _InvocationRuntime
 from ...observability.context import capture_trace_context
 from ...options import Options
 from ...sqlalchemy import SqlAlchemySessionProvider

python_ddd_framework/background_workers/execution.py

@@ -10,10 +10,10 @@ from uuid import uuid4
 from dishka import AsyncContainer, Scope
 
 from ..application_services.errors import ApplicationInvocationRejectedError
-from ..application_services.invocation import _InvocationRuntime
 from ..authorization import CurrentUser
 from ..background_execution.lifecycle import _TaskExecution
 from ..invocation import BackgroundSystemCaller
+from ..invocation.runtime import _InvocationRuntime
 from ..unit_of_work.options import _DEFAULT_CONNECTION_NAME
 from .contracts import BackgroundWorkerContext, BackgroundWorkerDefinition
 

python_ddd_framework/background_workers/runtime.py

@@ -9,7 +9,6 @@ from collections.abc import Mapping
 from dishka import AsyncContainer
 
 from ..application.build_spec import _ApplicationBuildSpec
-from ..application_services.invocation import _InvocationRuntime
 from ..background_execution import (
     BackgroundExecutionMode,
     BackgroundJobOptions,
@@ -27,6 +26,7 @@ from ..background_execution.processes import _ProcessSlot
 from ..background_jobs import BackgroundJobCatalog
 from ..errors.lifecycle import ApplicationRuntimeError
 from ..invocation import BackgroundSystemCaller
+from ..invocation.runtime import _InvocationRuntime
 from ..lifecycle import RuntimeParticipant, ShutdownReason
 from .catalog import BackgroundWorkerCatalog
 from .contracts import BackgroundExecutionOptions, BackgroundExecutionProfile

python_ddd_framework/caching/unit_of_work.py

@@ -21,6 +21,7 @@ class _CachePending:
     async def after_commit(self) -> None:
         failures: list[Exception] = []
         try:
+            # 普通错误继续后项，取消立即传播；逐项 await 保留尚未发送命令的边界。
             for _, apply in self.writes.values():
                 try:
                     await apply()
@@ -40,7 +41,4 @@ class _CacheLifecycleFactory:
 
 
 def _pending(work: UnitOfWork) -> _CachePending:
-    for lifecycle in work._lifecycles:
-        if isinstance(lifecycle, _CachePending):
-            return lifecycle
-    raise RuntimeError("Caching lifecycle is not configured for this UnitOfWork")
+    return work._lifecycle(_CachePending)

python_ddd_framework/cli/project.py

@@ -18,6 +18,16 @@ from .errors import CommandError
 
 HOST_ENTRY_POINT_GROUP = "python_ddd_framework.hosts"
 MODULE_ENTRY_POINT_GROUP = "python_ddd_framework.modules"
+_PROJECT_ENVIRONMENT_OVERRIDES = (
+    "VIRTUAL_ENV",
+    "PYTHONPATH",
+    "PYTHONHOME",
+    "UV_PROJECT_ENVIRONMENT",
+    "UV_PROJECT",
+    "UV_WORKING_DIR",
+    "UV_WORKING_DIRECTORY",
+    "UV_PYTHON",
+)
 
 
 def read_project(path: Path) -> dict[str, Any]:
@@ -117,15 +127,6 @@ class Project:
 def project_environment() -> dict[str, str]:
     # 父进程可能来自 ROS、uv tool 或另一个项目；后端环境由本项目声明和 uv 选择。
     environment = dict(os.environ)
-    for key in (
-        "VIRTUAL_ENV",
-        "PYTHONPATH",
-        "PYTHONHOME",
-        "UV_PROJECT_ENVIRONMENT",
-        "UV_PROJECT",
-        "UV_WORKING_DIR",
-        "UV_WORKING_DIRECTORY",
-        "UV_PYTHON",
-    ):
+    for key in _PROJECT_ENVIRONMENT_OVERRIDES:
         environment.pop(key, None)
     return environment

python_ddd_framework/developer_kit/generation.py

@@ -26,6 +26,7 @@ from ..cli import ENVIRONMENT_VARIABLE
 from ..cli.errors import CommandError
 from ..cli.project import Project, project_environment, read_project
 from .project_metadata import add_module_metadata
+from .publication import _ModulePublication
 from .source import framework_source
 from .wiring import add_dependency
 
@@ -41,8 +42,11 @@ def _name(value: str) -> tuple[str, str]:
     return package, "".join(part.capitalize() for part in package.split("_"))
 
 
-def _render(template: str, context: dict[str, Any]) -> Path:
-    staging = Path(tempfile.mkdtemp(prefix="python-ddd-framework-generation-"))
+def _render(template: str, context: dict[str, Any], *, staging: Path | None = None) -> Path:
+    if staging is None:
+        staging = Path(tempfile.mkdtemp(prefix="python-ddd-framework-generation-"))
+    else:
+        staging.mkdir()
     root = resources.files(__package__).joinpath("templates").joinpath(template)
     with resources.as_file(root) as template_path:
         # Cookiecutter 用相对路径加载；安装目录较深时先复制到短 staging，避免 Windows MAX_PATH。
@@ -152,6 +156,26 @@ def new_project(
 def add_module(name: str, dry_run: bool, *, template: Literal["basic", "ddd"] = "ddd") -> None:
     package, class_prefix = _name(name)
     project = Project.current()
+    if dry_run:
+        _add_module(project, package, class_prefix, template, None)
+    else:
+        with _ModulePublication(project.root, package, template) as publication:
+            _add_module(project, package, class_prefix, template, publication)
+
+
+def _add_module(
+    project: Project,
+    package: str,
+    class_prefix: str,
+    template: Literal["basic", "ddd"],
+    publication: _ModulePublication | None,
+) -> None:
+    destination = project.root / "src" / "modules" / package
+    if destination.exists() or destination.is_symlink():
+        raise CommandError(
+            f"Module destination already exists: {destination}; review retained operations in "
+            f"{project.root / '.python-ddd-framework' / 'generation'}"
+        )
     application = project.host("application").load()(environment="development")
     if not isinstance(application, Application):
         raise CommandError("The application entry point must return Application")
@@ -166,11 +190,8 @@ def add_module(name: str, dry_run: bool, *, template: Literal["basic", "ddd"] =
         raise CommandError(
             "Startup Module source must belong to the current project's src directory"
         )
-    modules = project.root / "src" / "modules"
-    destination = modules / package
-    if destination.exists():
-        raise CommandError(f"Module destination already exists: {destination}")
-    source = source_path.read_text(encoding="utf-8")
+    source_bytes = source_path.read_bytes()
+    source = source_bytes.decode("utf-8")
     updated = source
     entries = (
         ((f"modules.{package}.module", class_prefix + "Module"),)
@@ -187,49 +208,29 @@ def add_module(name: str, dry_run: bool, *, template: Literal["basic", "ddd"] =
     for import_path, class_name in entries:
         updated = add_dependency(updated, startup.__name__, import_path, class_name)
     metadata_path = project.root / "pyproject.toml"
-    metadata_source = metadata_path.read_text(encoding="utf-8")
+    metadata_bytes = metadata_path.read_bytes()
+    metadata_source = metadata_bytes.decode("utf-8")
     alias_path, alias_class = entries[0 if template == "basic" else 1]
     updated_metadata = add_module_metadata(metadata_source, package, f"{alias_path}:{alias_class}")
     ast.parse(updated)
-    if dry_run:
+    if publication is None:
         print(
             f"Would add {destination}, wire modules into {source_path} and update {metadata_path}"
         )
         return
     context = {"module_name": package, "class_prefix": class_prefix}
-    if template == "ddd":
-        from ..fastapi.application_services import _operation_id, _service_path
-
-        # HTTP 身份由正式约定推导；basic 不读取或生成传输层配置。
-        http_identity = type(class_prefix + "ApplicationService", (), {})
-        context.update(
-            http_service_path=_service_path("", http_identity),
-            http_operation_prefix=_operation_id(http_identity, ""),
+    with publication.step("render"):
+        staged = _render(
+            "basic" if template == "basic" else "module", context, staging=publication.rendering
         )
-    staged = _render(
-        "basic" if template == "basic" else "module",
-        context,
-    )
-    # 先验证全部新文件和接线；已有 startup 文件仅在内容仍等于读取快照时替换。
-    if (
-        source_path.read_text(encoding="utf-8") != source
-        or metadata_path.read_text(encoding="utf-8") != metadata_source
-    ):
-        raise CommandError("Startup source changed during generation; retry after reviewing it")
-    modules.mkdir(exist_ok=True)
-    if not modules.joinpath("__init__.py").exists():
-        modules.joinpath("__init__.py").touch()
-    shutil.copytree(staged, destination)
-    with tempfile.NamedTemporaryFile(
-        mode="w", encoding="utf-8", dir=source_path.parent, delete=False
-    ) as pending:
-        pending.write(updated)
-    Path(pending.name).replace(source_path)
-    metadata_path.write_text(updated_metadata, encoding="utf-8")
-    subprocess.run(
-        ["uv", "sync", "--directory", str(project.root)],
-        cwd=project.root,
-        env=project_environment(),
-        check=True,
-    )
+    with publication.step("prepare"):
+        publication.prepare(
+            staged,
+            (
+                ("startup", source_path, source_bytes, updated.encode("utf-8")),
+                ("metadata", metadata_path, metadata_bytes, updated_metadata.encode("utf-8")),
+            ),
+        )
+    publication.publish(staged)
+    publication.sync()
     print(f"Added {package}; staging retained at {staged}")