xtr-orm 4.0.4__tar.gz → 5.0.0__tar.gz

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtr-orm
-Version: 4.0.4
+Version: 5.0.0
 Summary: Databases for async applications: engines, sessions and versioned schema migrations, configured once per connection.
 Keywords: orm,database,migrations,sqlalchemy,alembic,asyncio
 Author: Xterr
@@ -20,18 +20,11 @@ Requires-Dist: advanced-alchemy>=1.11
 Requires-Dist: alembic>=1.20
 Requires-Dist: sqlalchemy[asyncio]>=2.0.41
 Requires-Dist: typing-extensions>=4.4
-Requires-Dist: xtr-logging-contracts>=4.0,<5
-Requires-Dist: xtr-console>=4.0,<5 ; extra == 'console'
-Requires-Dist: xtr-dependency-injection>=4.0,<5 ; extra == 'di'
-Requires-Dist: xtr-service-contracts>=4.0,<5 ; extra == 'di'
-Requires-Dist: xtr-messenger>=4.0,<5 ; extra == 'messenger'
+Requires-Dist: xtr-logging-contracts>=5.0,<6
 Requires-Dist: asyncmy>=0.2.9 ; extra == 'mysql'
 Requires-Dist: asyncpg>=0.29 ; extra == 'postgres'
 Requires-Dist: aiosqlite>=0.20 ; extra == 'sqlite'
 Requires-Python: >=3.11
-Provides-Extra: console
-Provides-Extra: di
-Provides-Extra: messenger
 Provides-Extra: mysql
 Provides-Extra: postgres
 Provides-Extra: sqlite
@@ -78,16 +71,22 @@ its engine and session options, where its revisions live — and get:
 ## Install
 
 ```sh
-uv add "xtr-orm[postgres]"                        # asyncpg
-uv add "xtr-orm[di,console,messenger,sqlite]"     # everything, on SQLite
+uv add "xtr-orm[postgres]"                            # asyncpg
+uv add "xtr-orm[postgres]" xtr-dependency-injection   # + the container, for the OrmBundle
+uv add xtr-console                                    # beside it: the orm:* commands
+uv add xtr-messenger                                  # beside it: the message bus middleware
 ```
 
 | Extra | Brings | For |
 |---|---|---|
 | `postgres` / `mysql` / `sqlite` | `asyncpg` / `asyncmy` / `aiosqlite` | The async driver of your database |
-| `di` | `xtr-dependency-injection` | The `OrmBundle`: engines, sessions, migrators from one configuration |
-| `console` | `xtr-console` | The `orm:*` commands |
-| `messenger` | `xtr-messenger` | The [message bus middleware](#message-bus-middleware) |
+
+No xtr package is an extra, and the container is not a dependency: the `OrmBundle` — engines,
+sessions, migrators from one configuration — is used when
+[xtr-dependency-injection](../xtr-dependency-injection) is installed beside the package, and a
+`Migrator` works without it, as the [Quick start](#quick-start) shows. Installed beside it too,
+[xtr-console](../xtr-console) brings the `orm:*` commands and [xtr-messenger](../xtr-messenger)
+the [message bus middleware](#message-bus-middleware).
 
 ## Quick start
 
@@ -199,9 +198,10 @@ Everything adding this package to an application on
 [xtr-dependency-injection](../xtr-dependency-injection) takes — and, read backwards, what
 removing it undoes.
 
-- **Install** — `uv add "xtr-orm[di,console,postgres]"`; `mysql` or `sqlite` instead of
-  `postgres` for those databases; drop `console` to go without the commands; add `messenger`
-  for the [message bus middleware](#message-bus-middleware).
+- **Install** — `uv add "xtr-orm[postgres]" xtr-dependency-injection`: the bundle needs the
+  container installed beside it, never as an extra; `mysql` or `sqlite` instead of `postgres` for
+  those databases. Install xtr-console beside it for the `orm:*` commands, and xtr-messenger for
+  the [message bus middleware](#message-bus-middleware).
 - **Recipe** — `uv run xtr-recipes recipes:sync` does the *Activate*, *Configure* and
   *Environment* steps below: it lists `OrmBundle`, writes a starting `<app>/config/orm.py` with the
   `default` connection, and `DATABASE_URL` in `.env`. It prints the middleware step, which a recipe
@@ -227,6 +227,10 @@ removing it undoes.
 
 ## Kernel / bundle
 
+With [xtr-dependency-injection](../xtr-dependency-injection) installed beside the package — it is
+not a dependency, and nothing outside `xtr_orm.bundle` needs it — list the bundle and name the
+connections:
+
 ```python
 # app/bundles.py
 from xtr_orm.bundle import OrmBundle
@@ -455,8 +459,8 @@ migrate = MigrationsMigrateCommand(registry)
 
 ## Message bus middleware
 
-With the `messenger` extra and a kernel running both bundles, a message handler asks for a
-session the way any service does, and three middleware — registered by name — decide what
+With xtr-messenger installed beside it and a kernel running both bundles, a message handler asks
+for a session the way any service does, and three middleware — registered by name — decide what
 happens to it. Nothing is added to a bus by itself: the bus lists the ones it wants.
 
 ```python

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/README.md

@@ -39,16 +39,22 @@ its engine and session options, where its revisions live — and get:
 ## Install
 
 ```sh
-uv add "xtr-orm[postgres]"                        # asyncpg
-uv add "xtr-orm[di,console,messenger,sqlite]"     # everything, on SQLite
+uv add "xtr-orm[postgres]"                            # asyncpg
+uv add "xtr-orm[postgres]" xtr-dependency-injection   # + the container, for the OrmBundle
+uv add xtr-console                                    # beside it: the orm:* commands
+uv add xtr-messenger                                  # beside it: the message bus middleware
 ```
 
 | Extra | Brings | For |
 |---|---|---|
 | `postgres` / `mysql` / `sqlite` | `asyncpg` / `asyncmy` / `aiosqlite` | The async driver of your database |
-| `di` | `xtr-dependency-injection` | The `OrmBundle`: engines, sessions, migrators from one configuration |
-| `console` | `xtr-console` | The `orm:*` commands |
-| `messenger` | `xtr-messenger` | The [message bus middleware](#message-bus-middleware) |
+
+No xtr package is an extra, and the container is not a dependency: the `OrmBundle` — engines,
+sessions, migrators from one configuration — is used when
+[xtr-dependency-injection](../xtr-dependency-injection) is installed beside the package, and a
+`Migrator` works without it, as the [Quick start](#quick-start) shows. Installed beside it too,
+[xtr-console](../xtr-console) brings the `orm:*` commands and [xtr-messenger](../xtr-messenger)
+the [message bus middleware](#message-bus-middleware).
 
 ## Quick start
 
@@ -160,9 +166,10 @@ Everything adding this package to an application on
 [xtr-dependency-injection](../xtr-dependency-injection) takes — and, read backwards, what
 removing it undoes.
 
-- **Install** — `uv add "xtr-orm[di,console,postgres]"`; `mysql` or `sqlite` instead of
-  `postgres` for those databases; drop `console` to go without the commands; add `messenger`
-  for the [message bus middleware](#message-bus-middleware).
+- **Install** — `uv add "xtr-orm[postgres]" xtr-dependency-injection`: the bundle needs the
+  container installed beside it, never as an extra; `mysql` or `sqlite` instead of `postgres` for
+  those databases. Install xtr-console beside it for the `orm:*` commands, and xtr-messenger for
+  the [message bus middleware](#message-bus-middleware).
 - **Recipe** — `uv run xtr-recipes recipes:sync` does the *Activate*, *Configure* and
   *Environment* steps below: it lists `OrmBundle`, writes a starting `<app>/config/orm.py` with the
   `default` connection, and `DATABASE_URL` in `.env`. It prints the middleware step, which a recipe
@@ -188,6 +195,10 @@ removing it undoes.
 
 ## Kernel / bundle
 
+With [xtr-dependency-injection](../xtr-dependency-injection) installed beside the package — it is
+not a dependency, and nothing outside `xtr_orm.bundle` needs it — list the bundle and name the
+connections:
+
 ```python
 # app/bundles.py
 from xtr_orm.bundle import OrmBundle
@@ -416,8 +427,8 @@ migrate = MigrationsMigrateCommand(registry)
 
 ## Message bus middleware
 
-With the `messenger` extra and a kernel running both bundles, a message handler asks for a
-session the way any service does, and three middleware — registered by name — decide what
+With xtr-messenger installed beside it and a kernel running both bundles, a message handler asks
+for a session the way any service does, and three middleware — registered by name — decide what
 happens to it. Nothing is added to a bus by itself: the bus lists the ones it wants.
 
 ```python

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xtr-orm"
-version = "4.0.4"
+version = "5.0.0"
 description = "Databases for async applications: engines, sessions and versioned schema migrations, configured once per connection."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -30,7 +30,7 @@ dependencies = [
     "alembic>=1.20",
     "sqlalchemy[asyncio]>=2.0.41",
     "typing-extensions>=4.4",
-    "xtr-logging-contracts>=4.0,<5",
+    "xtr-logging-contracts>=5.0,<6",
 ]
 
 [[project.authors]]
@@ -41,12 +41,6 @@ email = "me@xterr.dev"
 postgres = ["asyncpg>=0.29"]
 sqlite = ["aiosqlite>=0.20"]
 mysql = ["asyncmy>=0.2.9"]
-di = [
-    "xtr-dependency-injection>=4.0,<5",
-    "xtr-service-contracts>=4.0,<5",
-]
-console = ["xtr-console>=4.0,<5"]
-messenger = ["xtr-messenger>=4.0,<5"]
 
 [project.entry-points."xtr_dependency_injection.bundles"]
 orm = "xtr_orm.bundle:OrmBundle"
@@ -63,11 +57,11 @@ dev = [
     "anyio>=4.0",
     "ty>=0.0.83",
     "aiosqlite>=0.20",
-    "xtr-console>=4.0,<5",
-    "xtr-dependency-injection>=4.0,<5",
-    "xtr-logging>=4.0,<5",
-    "xtr-messenger>=4.0,<5",
-    "xtr-service-contracts>=4.0,<5",
+    "xtr-console>=5.0,<6",
+    "xtr-dependency-injection>=5.0,<6",
+    "xtr-logging>=5.0,<6",
+    "xtr-messenger>=5.0,<6",
+    "xtr-service-contracts>=5.0,<6",
 ]
 
 [build-system]

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "xtr-orm"
-version = "4.0.4"
+version = "5.0.0"
 description = "Databases for async applications: engines, sessions and versioned schema migrations, configured once per connection."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -26,7 +26,7 @@ dependencies = [
     "alembic>=1.20",
     "sqlalchemy[asyncio]>=2.0.41",
     "typing-extensions>=4.4",
-    "xtr-logging-contracts>=4.0,<5",
+    "xtr-logging-contracts>=5.0,<6",
 ]
 
 [project.optional-dependencies]
@@ -39,16 +39,6 @@ sqlite = [
 mysql = [
     "asyncmy>=0.2.9",
 ]
-di = [
-    "xtr-dependency-injection>=4.0,<5",
-    "xtr-service-contracts>=4.0,<5",
-]
-console = [
-    "xtr-console>=4.0,<5",
-]
-messenger = [
-    "xtr-messenger>=4.0,<5",
-]
 
 # Advertises the bundle so debug:bundles can name it when installed but not listed.
 # Advertising activates nothing: an application lists the bundles it wants.
@@ -69,11 +59,11 @@ dev = [
     "ty>=0.0.83",
     # Every test runs on SQLite files under the test's own directory: no server.
     "aiosqlite>=0.20",
-    "xtr-console>=4.0,<5",
-    "xtr-dependency-injection>=4.0,<5",
-    "xtr-logging>=4.0,<5",
-    "xtr-messenger>=4.0,<5",
-    "xtr-service-contracts>=4.0,<5",
+    "xtr-console>=5.0,<6",
+    "xtr-dependency-injection>=5.0,<6",
+    "xtr-logging>=5.0,<6",
+    "xtr-messenger>=5.0,<6",
+    "xtr-service-contracts>=5.0,<6",
 ]
 
 [build-system]

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/src/xtr_orm/.agents/skills/xtr-orm/SKILL.md

@@ -20,6 +20,9 @@ connection's name. Everything is async; there is no sync counterpart.
 - Write a revision from your models: `orm:migrations:diff --message "add invoices"`. Apply:
   `orm:migrations:migrate`. Read it: `orm:migrations:status`.
 - Without a container: `Migrator(engine, MigrationsConfig(directory="migrations"), Base.metadata)`.
+- In an application, with xtr-dependency-injection installed beside the package (it is not a
+  dependency): activate `OrmBundle` and inject what it registers. Only `xtr_orm.bundle` needs the
+  container.
 - A library bringing its own tables registers an `OrmMappingsPass` from its bundle's `build`; its
   driver's `load_metadata` must be idempotent.
 - One transaction per message: list `orm_transaction` in the bus's `middleware`; handlers never
@@ -187,8 +190,9 @@ tables and returns the names it added. Subclassing it has the type checker hold
 
 ## Console commands
 
-Needs the `console` extra. Every command takes `--connection NAME`, defaulting to
-`OrmConfig.default_connection`. The ones that change the database ask first; `-n` answers yes.
+Needs xtr-console installed beside the package. Every command takes `--connection NAME`,
+defaulting to `OrmConfig.default_connection`. The ones that change the database ask first; `-n`
+answers yes.
 
 | Command | Does |
 |---|---|
@@ -224,8 +228,10 @@ migrate = MigrationsMigrateCommand(registry)
 writes a starting `config/orm.py` with the `default` connection, and `DATABASE_URL` in `.env`. That
 is the steps below a recipe can do; the middleware it prints for you to add.
 
-1. **Install** — `uv add "xtr-orm[di,console,postgres]"`; `mysql` or `sqlite` instead of
-   `postgres`; drop `console` to go without the commands; add `messenger` for the bus middleware.
+1. **Install** — `uv add "xtr-orm[postgres]" xtr-dependency-injection`: the bundle needs the
+   container installed beside it, never as an extra; `mysql` or `sqlite` instead of `postgres`.
+   Install xtr-console beside it for the `orm:*` commands, and xtr-messenger for the bus
+   middleware.
 2. **Activate** — `OrmBundle: {"all": True}` in `BUNDLES` in `<app>/bundles.py`
    (`from xtr_orm.bundle import OrmBundle`).
 3. **Brings along** — the logging and console bundles when those packages are installed, each
@@ -277,8 +283,8 @@ directory; a non-default connection defaults to `%kernel.project_dir%/migrations
 
 ## One transaction per message
 
-With the `messenger` extra and both bundles active, three middleware are registered by name.
-Nothing is added to a bus by itself — the bus lists what it wants, and order matters.
+With xtr-messenger installed beside it and both bundles active, three middleware are registered
+by name. Nothing is added to a bus by itself — the bus lists what it wants, and order matters.
 
 ```python
 # <app>/config/messenger.py

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/src/xtr_orm/.agents/skills/xtr-orm/references/commands.md

@@ -1,7 +1,8 @@
 # The `orm:*` console commands
 
-Needs the `console` extra: `uv add "xtr-orm[console]"`. With a container, the bundle declares them
-when the console bundle is active, and each acts on the connections the bundle registered.
+Needs xtr-console installed beside xtr-orm: `uv add xtr-console`. With a container, the bundle
+declares them when the console bundle is active, and each acts on the connections the bundle
+registered.
 
 Every command takes `--connection NAME`; the default connection is used without it. The ones that
 change the database ask first, and `-n` answers yes. `--message` names the revision and its file.

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/src/xtr_orm/.agents/skills/xtr-orm/references/messenger.md

@@ -1,8 +1,8 @@
 # Message bus middleware
 
-Needs the `messenger` extra: `uv add "xtr-orm[messenger]"`. With both bundles active, importing
-`xtr_orm.messenger` is done for you and each middleware is registered under its name for a bus
-configuration to list.
+Needs xtr-messenger installed beside xtr-orm: `uv add xtr-messenger`. With both bundles active,
+importing `xtr_orm.messenger` is done for you and each middleware is registered under its name for
+a bus configuration to list.
 
 | Name | Class | Does | Arguments |
 |---|---|---|---|

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/src/xtr_orm/command/__init__.py

@@ -17,7 +17,7 @@ registry.register("default", engine=engine, migrator=migrator, database=database
 command = MigrationsMigrateCommand(registry)
 ```
 
-Needs the ``console`` extra: ``xtr-orm[console]``.
+Needs xtr-console installed beside this package.
 """
 
 from __future__ import annotations

{xtr_orm-4.0.4 → xtr_orm-5.0.0}/src/xtr_orm/messenger/__init__.py

@@ -7,7 +7,7 @@ messenger bundle is active, and the messenger bundle registers each by that
 name. Without one, build them with a :class:`~xtr_orm.ConnectionRegistry`
 and put the instances in the configuration.
 
-Needs the ``messenger`` extra: ``xtr-orm[messenger]``.
+Needs xtr-messenger installed beside this package.
 """
 
 from __future__ import annotations