xtr-cli 4.0.4__tar.gz → 4.1.0__tar.gz

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xtr-cli
-Version: 4.0.4
+Version: 4.1.0
 Summary: Scaffolds a new xtr application — a console application or a web application — in one command, and serves it.
 Keywords: scaffold,new project,template,console,web,xtr-dependency-injection
 Author: Xterr
@@ -76,7 +76,7 @@ $ uvx xtr-cli new shop
  …
  Add-ons, comma-separated (empty for none): orm, messenger
  Database drivers for orm — sqlite, postgres, mysql, joined with + (sqlite): sqlite+postgres
- Transports and serializers for messenger — amqp, taskiq, pydantic, joined with +:
+ Transports and serializers for messenger — amqp, pydantic, joined with +:
 
 shop — the webapp template
 --------------------------
@@ -90,7 +90,7 @@ The same, with no question asked:
  Create it? [y/n] (y):
 write pyproject.toml
 …
-run   uv add -- 'xtr-dependency-injection[fastapi]>=4.0,<5' …
+run   uv add -- 'xtr-dependency-injection>=4.0,<5' …
 run   uv add --dev -- 'xtr-recipes>=4.0,<5' pytest httpx ruff basedpyright ty
 run   uv run xtr-recipes recipes:sync
 run   git init --quiet
@@ -188,8 +188,8 @@ application's shutdown hooks run.
 
 | Template | Packages | Scripts |
 |---|---|---|
-| `cli` | `xtr-dependency-injection`, `xtr-console[di]`, `xtr-dotenv[di,console]`, `xtr-logging[di]` | `<name>` |
-| `webapp` | the same, `xtr-dependency-injection[fastapi]`, `xtr-http-kernel[logging,console]`, `fastapi`, `uvicorn` | `<name>`, `<name>-web` |
+| `cli` | `xtr-dependency-injection`, `xtr-console`, `xtr-dotenv`, `xtr-logging` | `<name>` |
+| `webapp` | the same, `xtr-http-kernel`, `fastapi`, `uvicorn` | `<name>`, `<name>-web` |
 
 Both write `pyproject.toml` (with ruff, basedpyright, ty and pytest configured), `.python-version`,
 `.gitignore`, `README.md`, `src/<app>/kernel.py`, `src/<app>/__main__.py`, an example
@@ -205,7 +205,7 @@ a test that requests the home page.
 summary = "What it makes, in one line."
 
 [dependencies]
-packages = ["xtr-console[di]"]     # uv add
+packages = ["xtr-console"]         # uv add
 dev = ["xtr-recipes", "pytest"]    # uv add --dev; with xtr-recipes, the recipes are applied
 
 [files]
@@ -229,20 +229,28 @@ way it would for a package added later with `xtr-recipes recipes:add`.
 
 | Add-on | Installs | Variants |
 |---|---|---|
-| `orm` | `xtr-orm[di,console]` | `sqlite` (default), `postgres`, `mysql` |
-| `messenger` | `xtr-messenger[di,console]` | `amqp`, `taskiq`, `pydantic` |
-| `scheduler` | `xtr-scheduler[di,console,cron]` | |
-| `event-dispatcher` | `xtr-event-dispatcher[di,console]` | |
-| `cache` | `xtr-cache[di,console]` | `redis` |
-| `lock` | `xtr-lock[di]` | `redis` |
-| `rate-limiter` | `xtr-rate-limiter[di,cache,lock]` | `redis` |
-| `storage` | `xtr-storage[di]` | `s3`, `gcs` |
-| `security` | `xtr-security[console]` — `webapp` only | |
-| `jwt` | `xtr-security-jwt[console]` — `webapp` only; brings `security` | |
+| `orm` | `xtr-orm` | `sqlite` (default), `postgres`, `mysql` |
+| `messenger` | `xtr-messenger` | `amqp`, `pydantic` |
+| `scheduler` | `xtr-scheduler[cron]` | |
+| `event-dispatcher` | `xtr-event-dispatcher` | |
+| `cache` | `xtr-cache` | `redis` |
+| `lock` | `xtr-lock` | `redis` |
+| `rate-limiter` | `xtr-rate-limiter` | `redis` |
+| `storage` | `xtr-storage` | `s3`, `gcs` |
+| `http-client` | `xtr-http-client` | `http2` |
+| `security` | `xtr-security` — `webapp` only | |
+| `jwt` | `xtr-security-jwt` — `webapp` only; brings `security` | |
+| `oauth2` | `xtr-security-oauth2-server` — `webapp` only; brings `security` and `jwt` | |
+| `webhook` | `xtr-webhook` — `webapp` only; brings `messenger` | |
+
+Variants only pick third-party backends. Integrations between xtr packages turn on when both are
+installed: choose `orm` beside `oauth2` to keep its clients in a database, `http-client` beside
+`webhook` to send webhooks, `rate-limiter` beside `http-client` to pace requests.
 
 `jwt` boots without a key and signs nothing until one is there: run
 `uv run <name> jwt:generate-keypair --kid jwt --output-dir secrets` for development, and mount
 the deployment's own key in production. No key is ever minted for you.
+`oauth2` likewise issues nothing until its key pair, encryption key and issuer are configured.
 
 Variants follow the name after `:`, joined with `+`: `orm:sqlite+postgres`. A name alone takes
 the defaults; `messenger:` picks none. Asked interactively, an add-on with variants is followed by
@@ -294,7 +302,7 @@ Developed in the [python-xtr](https://github.com/xterr/python-xtr) monorepo, und
 `packages/xtr-cli`; run the commands below from there.
 
 ```sh
-uv sync --all-extras
+uv sync
 uv run ruff check && uv run ruff format --check && uv run basedpyright && uv run ty check && uv run pytest
 ```
 

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/README.md

@@ -55,7 +55,7 @@ $ uvx xtr-cli new shop
  …
  Add-ons, comma-separated (empty for none): orm, messenger
  Database drivers for orm — sqlite, postgres, mysql, joined with + (sqlite): sqlite+postgres
- Transports and serializers for messenger — amqp, taskiq, pydantic, joined with +:
+ Transports and serializers for messenger — amqp, pydantic, joined with +:
 
 shop — the webapp template
 --------------------------
@@ -69,7 +69,7 @@ The same, with no question asked:
  Create it? [y/n] (y):
 write pyproject.toml
 …
-run   uv add -- 'xtr-dependency-injection[fastapi]>=4.0,<5' …
+run   uv add -- 'xtr-dependency-injection>=4.0,<5' …
 run   uv add --dev -- 'xtr-recipes>=4.0,<5' pytest httpx ruff basedpyright ty
 run   uv run xtr-recipes recipes:sync
 run   git init --quiet
@@ -167,8 +167,8 @@ application's shutdown hooks run.
 
 | Template | Packages | Scripts |
 |---|---|---|
-| `cli` | `xtr-dependency-injection`, `xtr-console[di]`, `xtr-dotenv[di,console]`, `xtr-logging[di]` | `<name>` |
-| `webapp` | the same, `xtr-dependency-injection[fastapi]`, `xtr-http-kernel[logging,console]`, `fastapi`, `uvicorn` | `<name>`, `<name>-web` |
+| `cli` | `xtr-dependency-injection`, `xtr-console`, `xtr-dotenv`, `xtr-logging` | `<name>` |
+| `webapp` | the same, `xtr-http-kernel`, `fastapi`, `uvicorn` | `<name>`, `<name>-web` |
 
 Both write `pyproject.toml` (with ruff, basedpyright, ty and pytest configured), `.python-version`,
 `.gitignore`, `README.md`, `src/<app>/kernel.py`, `src/<app>/__main__.py`, an example
@@ -184,7 +184,7 @@ a test that requests the home page.
 summary = "What it makes, in one line."
 
 [dependencies]
-packages = ["xtr-console[di]"]     # uv add
+packages = ["xtr-console"]         # uv add
 dev = ["xtr-recipes", "pytest"]    # uv add --dev; with xtr-recipes, the recipes are applied
 
 [files]
@@ -208,20 +208,28 @@ way it would for a package added later with `xtr-recipes recipes:add`.
 
 | Add-on | Installs | Variants |
 |---|---|---|
-| `orm` | `xtr-orm[di,console]` | `sqlite` (default), `postgres`, `mysql` |
-| `messenger` | `xtr-messenger[di,console]` | `amqp`, `taskiq`, `pydantic` |
-| `scheduler` | `xtr-scheduler[di,console,cron]` | |
-| `event-dispatcher` | `xtr-event-dispatcher[di,console]` | |
-| `cache` | `xtr-cache[di,console]` | `redis` |
-| `lock` | `xtr-lock[di]` | `redis` |
-| `rate-limiter` | `xtr-rate-limiter[di,cache,lock]` | `redis` |
-| `storage` | `xtr-storage[di]` | `s3`, `gcs` |
-| `security` | `xtr-security[console]` — `webapp` only | |
-| `jwt` | `xtr-security-jwt[console]` — `webapp` only; brings `security` | |
+| `orm` | `xtr-orm` | `sqlite` (default), `postgres`, `mysql` |
+| `messenger` | `xtr-messenger` | `amqp`, `pydantic` |
+| `scheduler` | `xtr-scheduler[cron]` | |
+| `event-dispatcher` | `xtr-event-dispatcher` | |
+| `cache` | `xtr-cache` | `redis` |
+| `lock` | `xtr-lock` | `redis` |
+| `rate-limiter` | `xtr-rate-limiter` | `redis` |
+| `storage` | `xtr-storage` | `s3`, `gcs` |
+| `http-client` | `xtr-http-client` | `http2` |
+| `security` | `xtr-security` — `webapp` only | |
+| `jwt` | `xtr-security-jwt` — `webapp` only; brings `security` | |
+| `oauth2` | `xtr-security-oauth2-server` — `webapp` only; brings `security` and `jwt` | |
+| `webhook` | `xtr-webhook` — `webapp` only; brings `messenger` | |
+
+Variants only pick third-party backends. Integrations between xtr packages turn on when both are
+installed: choose `orm` beside `oauth2` to keep its clients in a database, `http-client` beside
+`webhook` to send webhooks, `rate-limiter` beside `http-client` to pace requests.
 
 `jwt` boots without a key and signs nothing until one is there: run
 `uv run <name> jwt:generate-keypair --kid jwt --output-dir secrets` for development, and mount
 the deployment's own key in production. No key is ever minted for you.
+`oauth2` likewise issues nothing until its key pair, encryption key and issuer are configured.
 
 Variants follow the name after `:`, joined with `+`: `orm:sqlite+postgres`. A name alone takes
 the defaults; `messenger:` picks none. Asked interactively, an add-on with variants is followed by
@@ -273,7 +281,7 @@ Developed in the [python-xtr](https://github.com/xterr/python-xtr) monorepo, und
 `packages/xtr-cli`; run the commands below from there.
 
 ```sh
-uv sync --all-extras
+uv sync
 uv run ruff check && uv run ruff format --check && uv run basedpyright && uv run ty check && uv run pytest
 ```
 

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xtr-cli"
-version = "4.0.4"
+version = "4.1.0"
 description = "Scaffolds a new xtr application — a console application or a web application — in one command, and serves it."
 readme = "README.md"
 requires-python = ">=3.11"

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "xtr-cli"
-version = "4.0.4"
+version = "4.1.0"
 description = "Scaffolds a new xtr application — a console application or a web application — in one command, and serves it."
 readme = "README.md"
 requires-python = ">=3.11"

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/src/xtr_cli/add_on.py

@@ -23,7 +23,8 @@ class AddOn:
         name: What ``--with`` calls it.
         summary: One line on what it brings, shown when the add-ons are offered.
         distribution: The package it installs.
-        extras: The extras always installed with it — its bundle's among them.
+        extras: The extras always installed with it, such as a backend every
+            project taking it needs.
         variants: The further extras a project picks between, such as database
             drivers; written after the name as ``orm:sqlite+postgres``.
         default_variants: The variants chosen when the name is given alone.

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/src/xtr_cli/add_on_catalog.py

@@ -20,7 +20,7 @@ _SHIPPED = (
         "orm",
         "Database engines, sessions per unit of work and versioned migrations.",
         "xtr-orm",
-        ("di", "console"),
+        (),
         ("sqlite", "postgres", "mysql"),
         ("sqlite",),
         "database drivers",
@@ -29,8 +29,8 @@ _SHIPPED = (
         "messenger",
         "A message bus: handlers, middleware, transports and consumers.",
         "xtr-messenger",
-        ("di", "console"),
-        ("amqp", "taskiq", "pydantic"),
+        (),
+        ("amqp", "pydantic"),
         (),
         "transports and serializers",
     ),
@@ -38,29 +38,28 @@ _SHIPPED = (
         "scheduler",
         "Recurring messages on the bus: cron and intervals.",
         "xtr-scheduler",
-        ("di", "console", "cron"),
+        ("cron",),
     ),
     AddOn(
         "event-dispatcher",
         "Events dispatched to listeners and subscribers by priority.",
         "xtr-event-dispatcher",
-        ("di", "console"),
     ),
     AddOn(
         "cache",
         "Cache pools in memory, in files or in Redis.",
         "xtr-cache",
-        ("di", "console"),
+        (),
         ("redis",),
         (),
         "backends",
     ),
-    AddOn("lock", "Locks around shared resources.", "xtr-lock", ("di",), ("redis",), (), "stores"),
+    AddOn("lock", "Locks around shared resources.", "xtr-lock", (), ("redis",), (), "stores"),
     AddOn(
         "rate-limiter",
         "Limits on how often anything may happen.",
         "xtr-rate-limiter",
-        ("di", "cache", "lock"),
+        (),
         ("redis",),
         (),
         "stores",
@@ -69,23 +68,40 @@ _SHIPPED = (
         "storage",
         "Files on local disk, in memory or in object stores.",
         "xtr-storage",
-        ("di",),
+        (),
         ("s3", "gcs"),
         (),
         "object stores",
     ),
+    AddOn(
+        "http-client",
+        "An async HTTP client: scoped clients, retries, a pace and a private-network guard.",
+        "xtr-http-client",
+        (),
+        ("http2",),
+    ),
     AddOn(
         "security",
         "Firewalls, authenticators, voters and password hashing.",
         "xtr-security",
-        ("console",),
         templates=_WEBAPP,
     ),
     AddOn(
         "jwt",
         "Self-issued JSON Web Tokens: a token manager and a firewall authenticator.",
         "xtr-security-jwt",
-        ("console",),
+        templates=_WEBAPP,
+    ),
+    AddOn(
+        "oauth2",
+        "An OAuth 2.0 authorization server and a resource-server authenticator.",
+        "xtr-security-oauth2-server",
+        templates=_WEBAPP,
+    ),
+    AddOn(
+        "webhook",
+        "Webhooks received, verified and turned into events; and sent, signed.",
+        "xtr-webhook",
         templates=_WEBAPP,
     ),
 )

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/src/xtr_cli/template.py

@@ -40,8 +40,8 @@ class Template:
         summary = "A console application."
 
         [dependencies]
-        packages = ["xtr-console[di]"]   # installed with `uv add`
-        dev = ["xtr-recipes"]            # installed with `uv add --dev`
+        packages = ["xtr-console"]   # installed with `uv add`
+        dev = ["xtr-recipes"]        # installed with `uv add --dev`
 
         [files]
         # destination in the project = template under this directory

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/src/xtr_cli/templates/cli/files/README.md.tmpl

@@ -27,7 +27,7 @@ src/${app}/
 ## Add a package
 
 ```sh
-uv run xtr-recipes recipes:add "xtr-messenger[di,console]"
+uv run xtr-recipes recipes:add xtr-messenger
 ```
 
 It installs the package and applies its recipe — the bundle, its configuration file, its

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/src/xtr_cli/templates/cli/template.toml

@@ -4,9 +4,9 @@ summary = "A console application: a kernel, its commands, the layered .env files
 [dependencies]
 packages = [
     "xtr-dependency-injection",
-    "xtr-console[di]",
-    "xtr-dotenv[di,console]",
-    "xtr-logging[di]",
+    "xtr-console",
+    "xtr-dotenv",
+    "xtr-logging",
 ]
 dev = ["xtr-recipes", "pytest", "ruff", "basedpyright", "ty"]
 

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/src/xtr_cli/templates/webapp/files/README.md.tmpl

@@ -32,7 +32,7 @@ src/${app}/
 ## Add a package
 
 ```sh
-uv run xtr-recipes recipes:add "xtr-messenger[di,console]"
+uv run xtr-recipes recipes:add xtr-messenger
 ```
 
 It installs the package and applies its recipe — the bundle, its configuration file, its

{xtr_cli-4.0.4 → xtr_cli-4.1.0}/src/xtr_cli/templates/webapp/template.toml

@@ -4,11 +4,11 @@ summary = "A web application: FastAPI served from the kernel, with the console b
 
 [dependencies]
 packages = [
-    "xtr-dependency-injection[fastapi]",
-    "xtr-console[di]",
-    "xtr-dotenv[di,console]",
-    "xtr-logging[di]",
-    "xtr-http-kernel[logging,console]",
+    "xtr-dependency-injection",
+    "xtr-console",
+    "xtr-dotenv",
+    "xtr-logging",
+    "xtr-http-kernel",
     "fastapi",
     "uvicorn",
 ]