core-framework 2.2.0__tar.gz → 2.3.1__tar.gz

core_framework-2.2.0/.cursor/rules/alembic-revision-ids.mdc → core_framework-2.3.1/.cursor/rules/alembic-migrations.mdc

@@ -1,14 +1,16 @@
 ---
-description: Alembic revision id format — short random hex, not descriptive slugs
+description: Alembic migrations — revision id format and index DDL conventions
 globs: alembic/**/alembic/versions/*.py
 alwaysApply: false
 ---
 
-# Alembic revision IDs
+# Alembic migrations
+
+## Revision IDs
 
 `alembic_version.version_num` is a **32-character** string. Revision ids must stay well under that limit.
 
-## New revisions (required)
+### New revisions (required)
 
 - Set `revision` to a **12-character lowercase hex** string (Alembic default), e.g. `a56bc6b7f799`.
 - Generate with `python -c "import secrets; print(secrets.token_hex(6))"` or `alembic revision`.
@@ -30,10 +32,29 @@ revision: str = "120bf6be81eb"
 revision: str = "post_tombstone_status_model"
 ```
 
-## Exceptions
+### Exceptions
 
 - Collapsed **`v1_*_init`** baseline revisions keep their stable names (`v1_post_init`, etc.) — do not rename shipped baselines.
 
-## Do not rename shipped revision ids
+### Do not rename shipped revision ids
 
 If a revision may already be applied in any environment, **do not** change its `revision` string. Add a forward migration instead.
+
+## Index DDL
+
+### New index migrations (required)
+
+In **`upgrade()`**, create indexes with **`IF NOT EXISTS`** so migrations succeed when an index was already applied manually in production:
+
+```python
+op.execute("""
+    create index if not exists idx_example_created_at
+    on example_table (created_at);
+""")
+```
+
+Use **`drop index if exists`** in **`downgrade()`**.
+
+### Do not retrofit index DDL
+
+Do **not** edit shipped migrations only to add `if not exists` — those revisions may already be applied. New forward migrations follow this rule; legacy `create index` without `if not exists` stays as-is.

{core_framework-2.2.0 → core_framework-2.3.1}/.cursor/rules/postgres-config-conventions.mdc

@@ -45,3 +45,12 @@ Use explicit write/read configuration and keep schema names shared.
   - `read_postgres`
 - Domain dependencies pass `(write, read, strong)` explicitly to repositories.
 - Until a dedicated strong instance exists, use write instance for the strong argument intentionally.
+
+## Schema names in SQL
+
+- Schema names come only from `settings.postgres_schemas` (see **Settings Model** above).
+- Domain `dependencies.py` passes unquoted `schema=runtime.settings.postgres_schemas.schema_<domain>` into repositories (keyword-only `__init__`).
+- Repositories cache `self.schema_sql = quote_postgres_identifier(schema)` and use `{self.schema_sql}.table` in f-string SQL — never hard-coded `"post".` literals.
+- Outbox producer adapter is wired per domain with `schema` at construction; consumer adapter receives unquoted `schema` per call and caches quoted SQL.
+
+Repository isolation rules (no cross-domain schema access): **`repository-schema-isolation.mdc`**.

{core_framework-2.2.0 → core_framework-2.3.1}/.cursor/rules/repository-schema-isolation.mdc

@@ -11,10 +11,19 @@ Each domain repository may only read/write tables in **its own** Postgres schema
 
 Canonical rule: `docs/platform/layers-and-boundaries.md` — *no cross-domain schema reads, writes, joins, or foreign keys*.
 
+## Schema qualification
+
+Repositories receive unquoted `schema` from `runtime.settings.postgres_schemas` in `dependencies.py` (keyword-only `__init__` arg). In `__init__`:
+
+- `self.schema` — config schema name (e.g. `post`)
+- `self.schema_sql` — `quote_postgres_identifier(schema)` for SQL interpolation
+
+Use `{self.schema_sql}.table` in f-string SQL — not hard-coded `"post".` literals.
+
 ## Allowed in a repository
 
-- SQL qualified with that domain's schema only (e.g. `"post".posts` in `PostRepository`).
-- **Within-schema** policy gates (e.g. `insert_post_like` checks `"post".posts.status = active`).
+- SQL qualified with that domain's schema only (e.g. `{self.schema_sql}.posts` in `PostRepository`).
+- **Within-schema** policy gates (e.g. `insert_post_like` checks `{self.schema_sql}.posts.status = active`).
 - **Lookup mirrors** in the same schema (`user_blocks_lookup`, `user_restrictions_lookup`, `user_followers_lookup`) — synced by application flows; mirrors are not authoritative.
 
 ## Forbidden in a repository
@@ -23,18 +32,18 @@ Canonical rule: `docs/platform/layers-and-boundaries.md` — *no cross-domain sc
 - Importing another domain's `service`, `repository`, or models to enforce policy.
 
 ```python
-# ❌ moderation/repository.py — cross-domain EXISTS
-insert into "moderation".post_reports (...)
+# ❌ moderation/repository.py — cross-domain EXISTS (illustrative schema literals)
+insert into {moderation_schema_sql}.post_reports (...)
 select $1, $2, $3, $4
 where exists (
-    select 1 from "post".posts
+    select 1 from {post_schema_sql}.posts
     where id = $2 and status = 'active'
 )
 
 # ❌ notification/repository.py — cross-domain mute gate
-insert into "notification".notification_mutes (...)
+insert into {notification_schema_sql}.notification_mutes (...)
 select ...
-where exists (select 1 from "comment".comments where ...)
+where exists (select 1 from {comment_schema_sql}.comments where ...)
 ```
 
 ## Alembic migrations (different convention)
@@ -69,4 +78,8 @@ Before adding a repository write that depends on another domain's row state:
 
 ## Self-check (repositories only)
 
-In `domains/<name>/repository.py`, every `"<schema>".` qualifier in SQL must be `<name>` (or that domain's documented mirror tables in the same schema).
+In `domains/<name>/repository.py`:
+
+- Every table/type qualifier in SQL must use `{self.schema_sql}.…` (that domain's schema only).
+- Do not hard-code `"user".`, `"post".`, etc. — use `self.schema` / `self.schema_sql` from config.
+- Mirror lookup tables (`user_blocks_lookup`, etc.) still live under `{self.schema_sql}` when they belong to that domain's schema.

{core_framework-2.2.0 → core_framework-2.3.1}/.cursor/skills/add-domain/SKILL.md

@@ -192,7 +192,7 @@ Worker `startup` and API `init_app` already call `configure_application_dependen
 
 Do this in a **separate step/PR** when you have DDL to apply.
 
-1. Add **`alembic/<domain>/alembic/versions/*.py`** (at least one revision); `upgrade()` may create schema/tables/enums as designed. Use a **12-character lowercase hex** `revision` id (see **`alembic-revision-ids`**); put the descriptive slug in the filename only.
+1. Add **`alembic/<domain>/alembic/versions/*.py`** (at least one revision); `upgrade()` may create schema/tables/enums as designed. Use a **12-character lowercase hex** `revision` id (see **`alembic-migrations`**); put the descriptive slug in the filename only.
 1. **Append** `<domain>` to `ALEMBIC_DOMAINS` in `core_framework/bundled_alembic.py` **in the same change** as the first revision (so `cf-alembic` / CI stay green).
 1. `make alembic` and deploy’s `cf-alembic` step pick up the new domain automatically — no makefile or `_deploy.yml` edits needed.
 

{core_framework-2.2.0 → core_framework-2.3.1}/.github/workflows/_deploy.yml

@@ -61,6 +61,7 @@ jobs:
           LOG_LEVEL: ${{ vars.LOG_LEVEL }}
           CORS_ALLOWED_ORIGINS: ${{ vars.CORS_ALLOWED_ORIGINS }}
           RETENTION_POST_VIEWS_DAYS: ${{ vars.RETENTION_POST_VIEWS_DAYS }}
+          ANALYTICS_REFRESH_INTERVAL_SECONDS: ${{ vars.ANALYTICS_REFRESH_INTERVAL_SECONDS }}
         run: |
           set -euo pipefail
 

{core_framework-2.2.0 → core_framework-2.3.1}/CHANGELOG.md

@@ -4,6 +4,38 @@ Notable changes to **core-framework** (import **`core_framework`**). Format foll
 
 ## [Unreleased]
 
+## [2.3.1] - 2026-07-03
+
+### Added
+
+- **Partial admin user deletions:** `tombstone_authored_posts_only` and `tombstone_authored_comments_only` on `POST /admin/users/{user_id}/deletions` — moderator tombstone of authored posts or comments while keeping the account. See **`docs/domains/deletion/users.md`**.
+- **`docs/testing.md`** — usage-focused pytest plugin guide for host adopters (wiring, fixtures, tiers, troubleshooting). Design reference remains **`docs/library/testing-plugin-design.md`**.
+- **Post/comment attachment integration tests:** v1.1 create/edit coverage — best-effort attach (unknown or already-linked assets), attach before worker publish, edit-budget enforcement, clear-all patch, and tombstone finals cleanup. See **`tests/integration/api/posts/post_attachments_integration_test.py`** and **`tests/integration/api/comments/comment_attachments_integration_test.py`**.
+- **Analytics rollup:** `retrieve_daily_fact_kind_totals_for_range` on `AnalyticsService` and `retrieve_analytics_kind_totals_for_range` in `application/analytics/read_service` — sum `daily_fact` counts per `kind` over an inclusive UTC day range (for host catalog and similar reads).
+
+### Fixed
+
+- **Admin outbox schemas:** rename response field `schema` to `producing_schema` with JSON alias `schema` so Pydantic no longer warns about shadowing `BaseModel.schema`.
+
+## [2.3.0] - 2026-07-03
+
+Analytics rollup domain (materialized daily activity counts), admin read API, and retention prune. Hosts must add **`[analytics]`** and **`schema_analytics`**, run **`cf-alembic`**, and run the worker for rollup refresh and daily-fact prune.
+
+### Added
+
+- **Analytics rollup (Phase 1):** `analytics` domain scaffold, `schema_analytics`, `[analytics].refresh_interval_seconds` (required on **`Settings`**; core **`config.toml`** ships **300**), Alembic tree with `daily_fact` table (PK only), and activity source registry shell. See **`docs/platform/analytics-rollup-design.md`**.
+- **Analytics rollup (Phase 2):** `AnalyticsService.list_refreshable_days` and `is_final_bucket_refresh` (planner inputs), `refresh_daily_fact_bucket` (single-bucket executor), optional `refresh_all_open_buckets` for tests; transactional `replace_daily_fact_bucket`; admin read helpers.
+- **Analytics rollup (Phase 3):** `post` / `created` activity source, planner (`enqueue_refresh_analytics_buckets`) and executor (`refresh_analytics_bucket`) application entrypoints, `schedule_refresh_analytics` + `process_refresh_analytics_bucket` worker (cron from `refresh_interval_seconds`).
+- **Analytics rollup (Phase 4):** `comment` / `created`, `user` / `registered`, and `post` / `viewed` activity sources with domain UTC-day count accessors and registry registration.
+- **Analytics rollup (Phase 5):** admin read API — `GET /admin/analytics/daily/range` and `GET /admin/analytics/daily/day` via `read_service` and Phase 2 domain read helpers.
+- **Analytics rollup (Phase 6):** one-year `daily_fact` retention prune (`schedule_prune_analytics_daily_facts`, daily **05:10 UTC**); `idx_daily_fact_day` migration. Source-feed `created_at` indexes for refresh counts already exist on `posts`, `comments`, `users`, and `post_views`.
+- **Analytics rollup (Phase 7):** integration tests for refresh planner/executor, admin read API, and retention prune.
+
+### Breaking
+
+- **Breaking (hosts — config):** Add **`[analytics]`** with **`refresh_interval_seconds`** (required on **`Settings`**; core **`config.toml`** ships **300**). Deploy variable **`ANALYTICS_REFRESH_INTERVAL_SECONDS`**. Add **`schema_analytics`** under **`[postgres_schemas]`** (default **`analytics`**).
+- **Breaking (hosts — migration):** When upgrading to a release that includes analytics rollup, run **`cf-alembic`** so the **`analytics`** migration stream applies **`analytics_daily_fact`** (`analytics.daily_fact`) and **`analytics_daily_fact_day_index`** (`idx_daily_fact_day`). The worker must run **`schedule_refresh_analytics`** and **`schedule_prune_analytics_daily_facts`** (registered in core worker schedules) for rollup materialization and one-year retention prune.
+
 ## [2.2.0] - 2026-06-30
 
 Transactional outbox (block, follow, restriction), post views retention, and incremental view-count aggregation. Hosts must update **`config.toml`**, run **`cf-alembic`**, and run the worker for mirror fanout and retention jobs.

{core_framework-2.2.0 → core_framework-2.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: core-framework
-Version: 2.2.0
+Version: 2.3.1
 Summary: Core framework package (import as core_framework)
 Project-URL: Homepage, https://github.com/NepNepFFXIV/core-framework
 Project-URL: Repository, https://github.com/NepNepFFXIV/core-framework

core_framework-2.3.1/alembic/analytics/alembic/env.py

@@ -0,0 +1,74 @@
+import asyncio
+from logging.config import fileConfig
+
+from sqlalchemy import pool, text
+from sqlalchemy.engine import Connection
+from sqlalchemy.ext.asyncio import async_engine_from_config
+
+from alembic import context
+from core_framework.core.settings import load_default_settings
+
+settings = load_default_settings()
+
+config = context.config
+
+if config.config_file_name is not None:
+    fileConfig(config.config_file_name)
+
+target_metadata = None
+
+config.set_main_option("sqlalchemy.url", settings.write_postgres.alembic_postgres_url)
+
+
+def run_migrations_offline() -> None:
+    """Run migrations in 'offline' mode."""
+    url = config.get_main_option("sqlalchemy.url")
+    context.configure(
+        url=url,
+        target_metadata=target_metadata,
+        literal_binds=True,
+        dialect_opts={"paramstyle": "named"},
+    )
+
+    quoted_schema_name = f'"{settings.postgres_schemas.schema_analytics.replace('"', '""')}"'
+
+    with context.begin_transaction():
+        context.execute(text(f"set search_path to {quoted_schema_name}"))
+        context.run_migrations()
+
+
+def do_run_migrations(connection: Connection) -> None:
+    quoted_schema_name = f'"{settings.postgres_schemas.schema_analytics.replace('"', '""')}"'
+
+    connection.execute(text(f"create schema if not exists {quoted_schema_name}"))
+    connection.execute(text(f"set search_path to {quoted_schema_name}"))
+    connection.commit()
+
+    context.configure(connection=connection, target_metadata=target_metadata)
+
+    with context.begin_transaction():
+        context.run_migrations()
+
+
+async def run_async_migrations() -> None:
+    """Run migrations in 'online' mode."""
+    connectable = async_engine_from_config(
+        config.get_section(config.config_ini_section, {}),
+        prefix="sqlalchemy.",
+        poolclass=pool.NullPool,
+    )
+
+    async with connectable.connect() as connection:
+        await connection.run_sync(do_run_migrations)
+
+    await connectable.dispose()
+
+
+def run_migrations_online() -> None:
+    asyncio.run(run_async_migrations())
+
+
+if context.is_offline_mode():
+    run_migrations_offline()
+else:
+    run_migrations_online()

core_framework-2.3.1/alembic/analytics/alembic/versions/5b9ac98bb150_analytics_daily_fact.py

@@ -0,0 +1,33 @@
+"""analytics daily_fact
+
+Revision ID: 5b9ac98bb150
+Revises:
+Create Date: 2026-07-01 12:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+from alembic import op
+
+revision: str = "5b9ac98bb150"
+down_revision: str | Sequence[str] | None = None
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.execute("""
+        create table daily_fact (
+            subject_type   text   not null,
+            activity_type  text   not null,
+            day            date   not null,
+            kind           text   not null default '',
+            count          bigint not null default 0,
+            primary key (subject_type, activity_type, day, kind)
+        );
+    """)
+
+
+def downgrade() -> None:
+    op.execute("drop table if exists daily_fact;")

core_framework-2.3.1/alembic/analytics/alembic/versions/7f2a9c1d4e8b_analytics_daily_fact_day_index.py

@@ -0,0 +1,27 @@
+"""analytics daily_fact day index for retention prune
+
+Revision ID: 7f2a9c1d4e8b
+Revises: 5b9ac98bb150
+Create Date: 2026-07-02 12:00:00.000000
+
+"""
+
+from collections.abc import Sequence
+
+from alembic import op
+
+revision: str = "7f2a9c1d4e8b"
+down_revision: str | Sequence[str] | None = "5b9ac98bb150"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.execute("""
+        create index if not exists idx_daily_fact_day
+        on daily_fact (day);
+    """)
+
+
+def downgrade() -> None:
+    op.execute("drop index if exists idx_daily_fact_day;")

core_framework-2.3.1/alembic/notification/alembic.ini

@@ -0,0 +1,52 @@
+# A generic, single database configuration.
+
+[alembic]
+# path to migration scripts.
+# this is typically a path given in POSIX (e.g. forward slashes)
+# format, relative to the token %(here)s which refers to the location of this
+# ini file
+script_location = %(here)s/alembic
+
+# sys.path path, will be prepended to sys.path if present.
+prepend_sys_path = .
+
+path_separator = os
+
+sqlalchemy.url = driver://user:pass@localhost/dbname
+
+
+[post_write_hooks]
+
+[loggers]
+keys = root,sqlalchemy,alembic
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = WARNING
+handlers = console
+qualname =
+
+[logger_sqlalchemy]
+level = WARNING
+handlers =
+qualname = sqlalchemy.engine
+
+[logger_alembic]
+level = INFO
+handlers =
+qualname = alembic
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(levelname)-5.5s [%(name)s] %(message)s
+datefmt = %H:%M:%S

core_framework-2.3.1/alembic/user/alembic/README

@@ -0,0 +1 @@
+Generic single-database configuration with an async dbapi.

core_framework-2.3.1/alembic/user/alembic/script.py.mako

@@ -0,0 +1,28 @@
+"""${message}
+
+Revision ID: ${up_revision}
+Revises: ${down_revision | comma,n}
+Create Date: ${create_date}
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+${imports if imports else ""}
+
+# revision identifiers, used by Alembic.
+revision: str = ${repr(up_revision)}
+down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
+branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
+depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    ${upgrades if upgrades else "pass"}
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    ${downgrades if downgrades else "pass"}

{core_framework-2.2.0 → core_framework-2.3.1}/config.toml

@@ -25,18 +25,21 @@ avatar_host_domain = "avatar.core-framework.com"
 default_avatar_image = "default.webp"
 publish_root = "/var/www/sites/avatar"
 public_path_prefix = "avatar"
+extension = "webp"
 
 [banner]
 banner_host_domain = "banner.core-framework.com"
 default_banner_image = "default.webp"
 publish_root = "/var/www/sites/banner"
 public_path_prefix = "banner"
+extension = "webp"
 
 [attachment]
 attachment_host_domain = "attachment.core-framework.com"
 default_attachment_image = "default.webp"
 publish_root = "/var/www/sites/attachment"
 public_path_prefix = "attachment"
+extension = "webp"
 
 [image_server]
 host = "127.0.0.1"
@@ -113,6 +116,9 @@ max_tries = 2
 [retention]
 post_views_retention_days = 90
 
+[analytics]
+refresh_interval_seconds = 300
+
 [postgres_schemas]
 schema_extension = "extension"
 schema_user = "user"
@@ -121,6 +127,7 @@ schema_post = "post"
 schema_comment = "comment"
 schema_notification = "notification"
 schema_media = "media"
+schema_analytics = "analytics"
 
 [redis]
 host = "127.0.0.1"

{core_framework-2.2.0 → core_framework-2.3.1}/config.toml.template

@@ -14,18 +14,21 @@ avatar_host_domain = "$AVATAR_HOST_DOMAIN"
 default_avatar_image = "$AVATAR_DEFAULT_IMAGE"
 publish_root = "$AVATAR_PUBLISH_ROOT"
 public_path_prefix = "avatar"
+extension = "webp"
 
 [banner]
 banner_host_domain = "$BANNER_HOST_DOMAIN"
 default_banner_image = "$BANNER_DEFAULT_IMAGE"
 publish_root = "$BANNER_PUBLISH_ROOT"
 public_path_prefix = "banner"
+extension = "webp"
 
 [attachment]
 attachment_host_domain = "$ATTACHMENT_HOST_DOMAIN"
 default_attachment_image = "$ATTACHMENT_DEFAULT_IMAGE"
 publish_root = "$ATTACHMENT_PUBLISH_ROOT"
 public_path_prefix = "attachment"
+extension = "webp"
 
 [image_server]
 host = "$IMAGE_SERVER_HOST"
@@ -97,6 +100,9 @@ max_tries = 2
 [retention]
 post_views_retention_days = $RETENTION_POST_VIEWS_DAYS
 
+[analytics]
+refresh_interval_seconds = $ANALYTICS_REFRESH_INTERVAL_SECONDS
+
 [postgres_schemas]
 schema_extension = "extension"
 schema_user = "user"
@@ -105,6 +111,7 @@ schema_post = "post"
 schema_comment = "comment"
 schema_notification = "notification"
 schema_media = "media"
+schema_analytics = "analytics"
 
 [redis]
 host = "$REDIS_HOST"

core_framework-2.3.1/core_framework/api/admin/analytics/router.py

@@ -0,0 +1,44 @@
+from typing import Annotated, Any
+
+from fastapi import APIRouter, Query
+
+from core_framework.api.admin.analytics.schemas import (
+    AnalyticsDailyBucketsResponse,
+    AnalyticsDailyDayQueryParams,
+    AnalyticsDailyRangeQueryParams,
+    AnalyticsDailyTotalsResponse,
+)
+from core_framework.application.analytics.read_service import (
+    retrieve_analytics_daily_day,
+    retrieve_analytics_daily_range,
+)
+
+router = APIRouter(
+    prefix="/analytics",
+    tags=["analytics - admin"],
+)
+
+
+@router.get("/daily/range", response_model=AnalyticsDailyTotalsResponse)
+async def get_analytics_daily_range(
+    query: Annotated[AnalyticsDailyRangeQueryParams, Query()],
+) -> Any:
+    return await retrieve_analytics_daily_range(
+        subject_type=query.subject_type,
+        activity_type=query.activity_type,
+        from_day=query.from_day,
+        to_day=query.to_day,
+        kind=query.kind,
+    )
+
+
+@router.get("/daily/day", response_model=AnalyticsDailyBucketsResponse)
+async def get_analytics_daily_day(
+    query: Annotated[AnalyticsDailyDayQueryParams, Query()],
+) -> Any:
+    return await retrieve_analytics_daily_day(
+        subject_type=query.subject_type,
+        activity_type=query.activity_type,
+        day=query.day,
+        kind=query.kind,
+    )

core_framework-2.3.1/core_framework/api/admin/analytics/schemas.py

@@ -0,0 +1,59 @@
+from datetime import date
+from typing import Annotated, Self
+
+from pydantic import BaseModel, ConfigDict, Field, model_validator
+
+from core_framework.domains.analytics import DAILY_FACT_RETENTION_DAYS
+
+AnalyticsSubjectType = Annotated[str, Field(min_length=1, max_length=128)]
+AnalyticsActivityType = Annotated[str, Field(min_length=1, max_length=128)]
+AnalyticsKind = Annotated[str, Field(max_length=128)]
+
+
+class AnalyticsDailyRangeQueryParams(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
+    subject_type: AnalyticsSubjectType
+    activity_type: AnalyticsActivityType
+    from_day: Annotated[date, Field(alias="from")]
+    to_day: Annotated[date, Field(alias="to")]
+    kind: AnalyticsKind | None = None
+
+    @model_validator(mode="after")
+    def validate_day_window(self) -> Self:
+        if self.to_day < self.from_day:
+            raise ValueError("to must be on or after from")
+        inclusive_day_count = (self.to_day - self.from_day).days + 1
+        if inclusive_day_count > DAILY_FACT_RETENTION_DAYS:
+            raise ValueError(f"range must not exceed {DAILY_FACT_RETENTION_DAYS} days inclusive")
+        return self
+
+
+class AnalyticsDailyDayQueryParams(BaseModel):
+    subject_type: AnalyticsSubjectType
+    activity_type: AnalyticsActivityType
+    day: date
+    kind: AnalyticsKind | None = None
+
+
+class AnalyticsDailyDayTotalItem(BaseModel):
+    day: date
+    count: Annotated[int, Field(ge=0)]
+
+
+class AnalyticsDailyBucketItem(BaseModel):
+    kind: str
+    count: Annotated[int, Field(ge=0)]
+
+
+class AnalyticsDailyTotalsResponse(BaseModel):
+    subject_type: str
+    activity_type: str
+    items: list[AnalyticsDailyDayTotalItem]
+
+
+class AnalyticsDailyBucketsResponse(BaseModel):
+    subject_type: str
+    activity_type: str
+    day: date
+    items: list[AnalyticsDailyBucketItem]

{core_framework-2.2.0 → core_framework-2.3.1}/core_framework/api/admin/outbox/schemas.py

@@ -2,7 +2,7 @@ from datetime import datetime
 from typing import Annotated, Any
 
 from fastapi import Path, Query
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict, Field
 
 OutboxRowId = Annotated[
     int,
@@ -34,7 +34,9 @@ class OutboxOldestPendingRow(BaseModel):
 
 
 class OutboxSummaryResponse(BaseModel):
-    schema: str
+    model_config = ConfigDict(populate_by_name=True)
+
+    producing_schema: str = Field(alias="schema")
     total_pending: int
     total_dead: int
     pending_by_event: list[OutboxEventCountItem]
@@ -43,8 +45,10 @@ class OutboxSummaryResponse(BaseModel):
 
 
 class OutboxDeadRowResponse(BaseModel):
+    model_config = ConfigDict(populate_by_name=True)
+
     id: int
-    schema: str
+    producing_schema: str = Field(alias="schema")
     event_name: str
     aggregate_type: str
     aggregate_id: str

{core_framework-2.2.0 → core_framework-2.3.1}/core_framework/api/admin/router.py

@@ -1,5 +1,6 @@
 from fastapi import APIRouter, Depends
 
+from core_framework.api.admin.analytics.router import router as analytics_router
 from core_framework.api.admin.cache.router import router as cache_router
 from core_framework.api.admin.comments.router import router as comments_router
 from core_framework.api.admin.moderation.router import router as moderation_router
@@ -14,6 +15,7 @@ router = APIRouter(
 )
 
 router.include_router(cache_router)
+router.include_router(analytics_router)
 router.include_router(outbox_router)
 router.include_router(users_router)
 router.include_router(moderation_router)