Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
57673131ff
|
||
|
|
c27994c432
|
||
|
|
14bd4e377c | ||
|
|
cb7d5d4d5a
|
||
|
|
51e0692f46 | ||
|
|
6f80dcaff4
|
||
|
|
55804d9059
|
||
|
|
73159e536e | ||
|
|
c05c606745
|
||
|
|
51fcfa6a33
|
||
|
|
8a7c10fde4 | ||
|
|
d15c7dce12
|
||
|
|
e8c202ace6 | ||
|
|
95f0040748
|
||
|
|
9dbb44b8c2 | ||
|
|
34b0f67670
|
||
|
|
88e1081396
|
||
|
|
c9ccd4c79b
|
||
|
|
311c37c23d
|
||
|
|
a7be39db0f
|
||
|
|
8d869f65cd
|
||
|
|
4532098e6b | ||
|
|
f2eb20a8bc
|
||
|
|
3721a69637 | ||
|
|
501d067415 | ||
|
|
0f34c8a1dc
|
||
|
|
5f5d6c5b38 | ||
|
|
b0a6b648bf
|
||
|
|
af811c99c2
|
||
|
|
6634d88286
|
||
|
|
b5484bace8 | ||
|
|
0babaa7022
|
||
|
|
96426ec95a | ||
|
|
01cc719c5b
|
||
|
|
1080a8b1ba | ||
|
|
38bb123140
|
||
|
|
bb62e4a7a0 | ||
|
|
e54de89a49
|
||
|
|
fbe2241fc4 | ||
|
|
e9a5980dec
|
||
|
|
73f4b3a640 | ||
|
|
a598fc022f | ||
|
|
7898ea5340 | ||
|
|
59c01dff3e | ||
|
|
45db9e2e87
|
||
|
|
c95e1403c5
|
No files matched your search
@@ -22,7 +22,7 @@ workflows:
|
||||
context: [qqq-maven-registry-credentials]
|
||||
filters:
|
||||
branches:
|
||||
ignore: /(develop|release\/.*|hotfix\/.*)/
|
||||
ignore: /(develop|release\/.*)/
|
||||
|
||||
publish_snapshot:
|
||||
jobs:
|
||||
@@ -58,14 +58,3 @@ workflows:
|
||||
ignore: /.*/
|
||||
tags:
|
||||
only: [/^v\d+\.\d+\.\d+$/]
|
||||
|
||||
publish_hotfix_release:
|
||||
jobs:
|
||||
- qqq-orb/mvn_publish:
|
||||
pre-steps:
|
||||
- configure-package-install
|
||||
context: [qqq-maven-registry-credentials]
|
||||
branch_type: hotfix
|
||||
filters:
|
||||
branches:
|
||||
only: [/hotfix\/.*/]
|
||||
@@ -0,0 +1,25 @@
|
||||
# Cut the next release candidate (QRun-IO/qqq docs/QRUN-QBIT-REPO-STANDARD.md, C6):
|
||||
# run this workflow by hand, or merge a develop PR labelled `release:rc`. It merges develop into
|
||||
# the release line and the release/* push runs CircleCI publish_release_candidate.
|
||||
name: Release candidate
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
dry_run:
|
||||
description: Print the plan without merging or creating branches
|
||||
type: boolean
|
||||
default: false
|
||||
pull_request:
|
||||
types: [closed]
|
||||
branches: [develop]
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
||||
jobs:
|
||||
release-rc:
|
||||
if: github.event_name == 'workflow_dispatch' || (github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release:rc'))
|
||||
uses: QRun-IO/.github/.github/workflows/qbit-release-rc.yml@main
|
||||
with:
|
||||
dry_run: ${{ github.event_name == 'workflow_dispatch' && inputs.dry_run }}
|
||||
@@ -19,3 +19,6 @@ dependency-reduced-pom.xml
|
||||
/.env.local
|
||||
/.cache/
|
||||
.claude/settings.local.json
|
||||
|
||||
# Runtime output from every provider module
|
||||
log/
|
||||
@@ -31,15 +31,20 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
|
||||
- `qbit-assistant` (`com.kingsrook.qbits.assistant`):
|
||||
- `AssistantQBitProducer`, `AssistantQBitConfig` (with `AssistantModelRouting` and `AssistantBudgets`), `AssistantRuntime`, `AssistantSecurity`.
|
||||
- `metadata/`: tables, owner key type, the Assistant Admin app, the retention process, and the `assistant.admin` custom permission checker.
|
||||
- `metadata/`: tables, owner key type, the Assistant app (home + main tables in the nav), the retention process, the settings customizer (key-reference checks, masked key status), and the `assistant.admin` custom permission checker.
|
||||
- `home/`: the app home widget (`AssistantHomeData` loads, `AssistantHomeView` renders flow-layout HTML).
|
||||
- `model/`: entities for the `assistant*` tables.
|
||||
- `persistence/AssistantStore`: the **only** code that calls QQQ data actions, and only on the QBit's own tables, under the user's session.
|
||||
- `engine/`: `TurnEngine` (the loop), `ContextBuilder` (cache-prefix order), `SystemPrompt`, `PolicyService` (policy row, budgets), `RateLimiter`, the `TurnEvent` / `TurnEventLog` stream, and `MessageParts`.
|
||||
- `api/`: `AssistantApi` (transport-free) and `AssistantRouteProvider` (Javalin, SSE).
|
||||
- `provider/`: the provider-neutral SPI, plus `fake/ScriptedModelProvider` for tests, evals and demos.
|
||||
- `developer/`: the record Developer-screen panel, on the core developer-panel contract.
|
||||
- `processes/AssistantRetentionStep`.
|
||||
- `processes/`: `AssistantRetentionStep` and `TestConnectionProcess` (record action on `assistant_provider`).
|
||||
- `engine/ProviderService` (active provider from `assistant_provider` rows, key references, prices), `UsageRecorder` (one `assistant_usage` row per model call), `ConnectionTest`.
|
||||
- `qbit-assistant-provider-anthropic`: `AnthropicModelProvider` and `AnthropicMapping` (anthropic-java streaming).
|
||||
- `qbit-assistant-provider-openai`: OpenAI-compatible Chat Completions, model discovery and health using JDK HTTP and Jackson.
|
||||
- `qbit-assistant-provider-bedrock`: Claude through the Anthropic Bedrock backend, AWS default credentials and SigV4; IRSA/web-identity hosts supply STS.
|
||||
- `qbit-assistant-provider-vertex`: Claude through the Anthropic Vertex backend and Gemini through OpenAI-compatible Chat Completions, with refreshed Google ADC tokens.
|
||||
|
||||
## Invariants (do not break)
|
||||
|
||||
@@ -56,6 +61,7 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
- Parallel tool results go back in ONE user message, in call order.
|
||||
- Errors (DENIED, NOT_FOUND, INVALID_INPUT, ERROR) are `is_error` results.
|
||||
- Unknown tools and over-limit calls also get error results.
|
||||
- **Keys:** never stored in a table. `assistant_provider.apiKeyEnvName` holds only an allowed environment variable NAME; `apiKeyStatus` is computed on read (last 4 at most) and stripped on save.
|
||||
- **Logging:** never log message content, prompts, tool results or keys. Structured end-of-turn log only.
|
||||
- **Thinking:** thinking is never streamed or stored. The Anthropic adapter keeps the raw assistant message (with signatures) only in memory, as `providerState`, for the tool loop.
|
||||
- **Links:** only `/app` or `/app/...` hrefs are emitted (`TurnEngine.isAppHref`).
|
||||
@@ -87,4 +93,4 @@ QQQ style:
|
||||
- `develop` publishes SNAPSHOTs.
|
||||
- `release/*` publishes RCs; the orb bumps `<revision>` in the root POM.
|
||||
- `v*` tags publish releases.
|
||||
- Both modules and the parent POM publish. The flatten plugin resolves `${revision}`.
|
||||
- All five modules and the parent POM publish. The flatten plugin resolves `${revision}`.
|
||||
@@ -1,14 +1,99 @@
|
||||
# Changelog
|
||||
|
||||
## Unreleased - Answer presentation
|
||||
|
||||
- Add `present_results`: server-formatted metrics, tables, computed percentages,
|
||||
charts and validated in-app filter/record/action links.
|
||||
- Persist and stream presentation parts with a multi-line GFM fallback and
|
||||
record-data retention; add a static default presentation skill.
|
||||
- Add the owner's 81 JPEG / 20 PNG golden example, shared live eval coverage,
|
||||
permission/formatting/input tests and strict-schema budget coverage.
|
||||
|
||||
## Unreleased - P-e
|
||||
|
||||
- Add per-profile heuristic/classifier model routing, with budgeted ROUTE usage.
|
||||
- Add bounded cross-provider fallback chains, PHI-safe selection, neutral history
|
||||
rebuilding, and a 60-second connection circuit breaker with cached local probes.
|
||||
- Show provider health, fallback totals and turn routing; include additive schema
|
||||
migration and admin record-screen controls.
|
||||
|
||||
|
||||
## Unreleased - P-d
|
||||
|
||||
- Require QQQ RC.5 and send budget alerts directly through core QAlerts, with admin-visible alert type metadata and core sink tests.
|
||||
|
||||
- Admin budgets, expiring overrides, deduplicated warning/downgrade/stop events.
|
||||
- Per-dispatch limits preserving PHI routing and existing caps.
|
||||
- Home budget cards, 30-day cost/token bars and provider breakdowns.
|
||||
|
||||
|
||||
## Unreleased — P-c
|
||||
|
||||
- Add configurable table/field classification, persistent turn/conversation maxima,
|
||||
and PHI routing checks before every model call, with a safe blocked-turn reason.
|
||||
- Add HIPAA mode, eligible-provider enforcement, AES-256-GCM conversation storage,
|
||||
provider diagnostic redaction, and independent PHI conversation retention.
|
||||
- Add owner-locked, admin read-only data routing audits and HIPAA status on the home.
|
||||
- Keep QQQ RC.4 compatibility with a classification stand-in and core #1142 adapter seam.
|
||||
|
||||
All notable changes to this project are documented here. The format follows Keep a Changelog, and versions follow semantic versioning.
|
||||
|
||||
## [0.1.0] - Unreleased
|
||||
|
||||
- Add optional AWS Bedrock (Claude) and Google Vertex (Claude/Gemini) adapters using server credentials, static model discovery and allow-listed endpoint overrides. AWS IRSA/web-identity hosts supply STS themselves; no additional dependency is bundled.
|
||||
- Add the provider `cloudProject` column, cloud settings validation, injected Anthropic clients and per-request OpenAI bearer-token suppliers. Vertex Gemini prefixes model ids and omits strict tools.
|
||||
- Add localhost cloud contract tests and golden tool turns, including AWS binary event-stream framing, SigV4, token refresh and cloud HTTP error mapping.
|
||||
|
||||
- Add named, server-only CA bundles for HTTPS providers, additive JVM trust and sanitized TLS diagnostics; tolerate repeated/missing streamed tool identities and invalid arguments, with a golden tool round-trip test.
|
||||
- Add the provider/model registry, per-model capabilities and prices, keyless local providers, discovery and health, and provider/model connection tests.
|
||||
- Add the optional JDK HTTP OpenAI-compatible adapter for OpenAI, Azure, OpenRouter, Ollama, LM Studio, vLLM and llama.cpp, with strict-schema safeguards and localhost contract tests.
|
||||
|
||||
Phase 0/1 of the QQQ Assistant: read-only Q&A and navigation. Requires QQQ 4.1 with:
|
||||
- the AI tool kernel (`qqq-backend-core` `actions.ai`, QRun-IO/qqq#1078)
|
||||
- the developer-panel contract (QRun-IO/qqq#1076).
|
||||
|
||||
### Changed (0.1.0-RC.2)
|
||||
### Changed (0.1.0-RC.6): tools go through the UI API (owner decision 2026-10-13)
|
||||
- **Every data tool runs a spec'd `/qqq/v1` operation with the user's own session** (`UiApiGateway`, loopback HTTP with the `sessionUUID` cookie): the same authentication, permissions, record locks, validation, audit and errors as the UI. A user without a permission gets the identical denial through the assistant. `navigate` and `search_help` (no records) stay on the core kernel. `LoopbackUiApiGateway` is a stand-in for core's `UiApiInvoker` (QRun-IO/qqq#1128).
|
||||
- Tools: `list_tables`, `describe_table`, `query_records`, `count_records`, `get_record`, `search_records`, `render_widget`, `get_record_history`, and new **`create_record`, `update_record`, `delete_record`**.
|
||||
|
||||
### Added (0.1.0-RC.6)
|
||||
- **Profiles** (`assistant_profile`, nav "Profiles"): display name, icon, personality (≤ 2,000 chars, appended to the per-user system block), greeting, starter prompts; one default, optional app / permission scope. `/assistant/config` returns `profile`.
|
||||
- **Skills** (`assistant_skill`, nav "Skills", linked through `assistant_profile_skill`, a child list on profiles): admin-written Markdown instructions read only when relevant (keywords / apps), ≤ 6,000 chars each and 12,000 per question. Instructions only: they never grant tools, endpoints or access (ArchUnit-enforced).
|
||||
- **Explain access**: `GET /qqq/v1/assistant/access?table=&prompt=` and the `assistantAccess` home widget: per table and tool, allowed or the reason.
|
||||
- **Recent denials** card on the Assistant home.
|
||||
- `AssistantStore` refuses any table that is not `assistant_*`; ArchUnit forbids the tool / UI API / access packages from using QQQ actions, the AI kernel or the profile and skill classes.
|
||||
- **Data access** (`assistant_data_access`, nav table "Data access"): NONE / READ / READ_WRITE per table or process. Default: NONE for sensitive tables (AI exposure NONE; cannot be raised), READ for other tables, NONE for processes. It only narrows the UI API.
|
||||
- **Pending actions** (`assistant_pending_action`): with confirmation on (the default), a write only proposes; `POST /qqq/v1/assistant/actions/{id}/confirm` runs it through the UI API with the confirming user's session, once; `.../reject`; `GET .../actions/{id}`. Child list on conversations.
|
||||
- **Policy columns** on `assistant_policy`: `writesRequireConfirmation`, `allowedTools`, `maxRowsPerCall`, `redactPii`.
|
||||
- **Tool-call log columns** on `assistant_tool_call`: `uiApiOperation`, `httpStatus`, `auditHref`, `pendingActionId`; tool inputs are stored with secrets redacted.
|
||||
- Config: `uiApiBaseUrl`, `withUiApiGateway`, `pendingActionTtlSeconds`. `/assistant/config` reports `features.writes` (some table is READ_WRITE) and `features.pendingActions`.
|
||||
|
||||
### Fixed (0.1.0-RC.5)
|
||||
- **Every turn failed with "The AI service could not answer this request."** Anthropic refused the request with 400 `invalid_request_error` "The compiled grammar is too large ... reduce the number of strict tools": all ten read tools were sent with `strict: true`, and the API compiles every strict schema of a request into one grammar. Tools are now **not strict by default**. The kernel already validates every tool input and answers `INVALID_INPUT`. A host can opt individual tools in with `withStrictToolNames(...)`.
|
||||
- If a provider still refuses the strict schemas, the turn **retries once without strict tools** and logs a warning (`ModelProviderException.isStrictSchemaRejected`).
|
||||
- Provider errors now carry the **API's own error type, a sanitized message** (one line, capped, key-like tokens redacted) and the **request id**:
|
||||
- they are logged at WARN for 4xx;
|
||||
- they are recorded in the `assistant_usage` row's request id;
|
||||
- they are shown to `assistant.admin` holders in the panel and in Test connection.
|
||||
Before this, a 400 was logged as "INVALID_REQUEST httpStatus=400" with no reason.
|
||||
- A turn that hits a JVM `Error` (for example a linkage problem) now ends as `ERROR` with a log line, instead of being swallowed by the executor and ending as an empty `COMPLETE` answer.
|
||||
- `AnthropicRequestContractTest` checks the exact request against the Messages API constraints and a conservative strict-tool budget.
|
||||
|
||||
### Added (0.1.0-RC.4)
|
||||
- **Provider settings** (`assistant_provider`): type (registered `AssistantProviderType`s; `AnthropicProviderType` in the Anthropic module), model, enabled, default, base URL override, monthly cost cap, max output tokens per request, max concurrent requests, and the last connection test. The default enabled row is the active provider; with no rows the provider registered in code is used, so existing hosts keep working.
|
||||
- **Key handling:** the key is never stored. A row names the environment variable that holds it (`apiKeyEnvName`, allow-listed); `apiKeyStatus` is computed on read (`Set • …abcd`) and dropped on save. A pasted key, an unrelated variable or an unlisted base URL is refused. New config: `withProviderType`, `allowedApiKeyEnvNames`, `allowedBaseUrls`, `withSecretResolver`, `providerTestTimeoutSeconds`.
|
||||
- **Test connection**, a record action on providers (standard streamed ETL Review and Result lines): one short live call, result saved on the row and recorded as a `TEST` usage row.
|
||||
- **Per-call usage** (`assistant_usage`): one row per model call (turn steps and tests) with provider, model, status, error kind, HTTP status, latency, tokens and cost. Child list on conversations and providers.
|
||||
- **Model prices** (`assistant_model_price`), editable, used for every call's cost; the reference DDL seeds the Anthropic list prices of 2026-10. The built-in `pricing` defaults now cover every current Claude model.
|
||||
- **The app home** (`assistantHome` widget): health, providers, usage by day, costs against caps, by user, top tools and recent failures, from real rows with empty states.
|
||||
- `ModelResponse.model`: the model that answered (set by the Anthropic adapter).
|
||||
|
||||
### Changed (0.1.0-RC.4)
|
||||
- The app is labelled **Assistant** (name `assistantAdmin` unchanged). Its nav lists the home and the main tables only (Providers, Conversations, Model prices, Policy); other tables are child lists. `assistantRetention` is a table action on conversations instead of a nav entry.
|
||||
- Every `assistant_*` table has AI exposure `NONE`, so the assistant never reads its own settings or audit tables (before, only the `assistant.admin` permission kept them out).
|
||||
- `AssistantMetaDataBuilder.buildAdminApp(tables)` no longer takes the retention process.
|
||||
|
||||
### Changed (0.1.0-RC.3)
|
||||
- **Snake_case names** (QRun-IO naming rule, 2026-10-12). Metadata only; the physical tables were already `assistant_*`:
|
||||
- tables `assistantConversation` ... `assistantUsageDaily` are now `assistant_conversation`, `assistant_message`, `assistant_turn`, `assistant_turn_event`, `assistant_tool_call`, `assistant_feedback`, `assistant_policy` and `assistant_usage_daily`; the conversation possible-value source follows the table name
|
||||
- permissions are unchanged: `assistant.hasAccess` keeps QQQ's standard `hasAccess` suffix, and `assistant.admin` stays as is
|
||||
@@ -60,3 +145,7 @@ Phase 0/1 of the QQQ Assistant: read-only Q&A and navigation. Requires QQQ 4.1 w
|
||||
- **Limits.** Page-context scalars are capped (strings up to 512 characters, at most 100 selected ids). Conversation lists are limited to 200, running turns to 50, and replay is paged at 500 events.
|
||||
- **Ordering.** Terminal events (`usage`, `error`, `message.end`) are persisted before the turn's status becomes final.
|
||||
- **Supplemental meta-data.** The `assistant` supplemental instance meta-data is registered when the QBit is enabled.
|
||||
|
||||
## [0.1.0-RC.2] - 2026-10-12
|
||||
|
||||
**Do not use.** 0.1.0-RC.2 on Maven Central is an accidental republish of the RC.1 code by a tag build; do not use it. The next real candidate is 0.1.0-RC.3. (Cause: QRun-IO/qqq-orb#20; the `publish_release` workflow now runs on GA tags only.)
|
||||
@@ -11,10 +11,10 @@ This file provides guidance to Claude Code when working with code in this reposi
|
||||
- budgets, rate limits and the kill switch
|
||||
- the model-provider SPI.
|
||||
|
||||
The panel UI lives in `qqq-frontend-next`. Data access goes only through the **AI tool kernel in QQQ core** (`com.kingsrook.qqq.backend.core.actions.ai.AiToolKernel`).
|
||||
The panel UI lives in `qqq-frontend-next`. Data access goes only through the **QQQ UI API** (`/qqq/v1`, spec'd operations, the user's own session) via `uiapi/UiApiGateway` and `tools/UiApiToolbox`; only `navigate` and `search_help` (no records) use the core AI tool kernel.
|
||||
|
||||
- Design spec: `QRun-IO/qqq` `docs/specs/2026-10-11-qqq-assistant-qbit-design.md`. The owner decisions D1 to D6 at its top are binding.
|
||||
- Phase 1 is read and navigate only: no write tools and no approval cards.
|
||||
- Writes (create/update/delete) are offered only for tables an admin set to READ_WRITE in `assistant_data_access`, and by default wait for the user's confirmation (pending action card).
|
||||
|
||||
## Build Commands
|
||||
|
||||
@@ -31,15 +31,20 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
|
||||
- `qbit-assistant` (`com.kingsrook.qbits.assistant`):
|
||||
- `AssistantQBitProducer`, `AssistantQBitConfig` (with `AssistantModelRouting` and `AssistantBudgets`), `AssistantRuntime`, `AssistantSecurity`.
|
||||
- `metadata/`: tables, owner key type, the Assistant Admin app, the retention process, and the `assistant.admin` custom permission checker.
|
||||
- `metadata/`: tables, owner key type, the Assistant app (home + main tables in the nav), the retention process, the settings customizer (key-reference checks, masked key status), and the `assistant.admin` custom permission checker.
|
||||
- `home/`: the app home widget (`AssistantHomeData` loads, `AssistantHomeView` renders flow-layout HTML).
|
||||
- `model/`: entities for the `assistant_*` tables.
|
||||
- `persistence/AssistantStore`: the **only** code that calls QQQ data actions, and only on the QBit's own tables, under the user's session.
|
||||
- `engine/`: `TurnEngine` (the loop), `ContextBuilder` (cache-prefix order), `SystemPrompt`, `PolicyService` (policy row, budgets), `RateLimiter`, the `TurnEvent` / `TurnEventLog` stream, and `MessageParts`.
|
||||
- `api/`: `AssistantApi` (transport-free) and `AssistantRouteProvider` (Javalin, SSE).
|
||||
- `provider/`: the provider-neutral SPI, plus `fake/ScriptedModelProvider` for tests, evals and demos.
|
||||
- `developer/`: the record Developer-screen panel, on the core developer-panel contract.
|
||||
- `processes/AssistantRetentionStep`.
|
||||
- `processes/`: `AssistantRetentionStep` and `TestConnectionProcess` (record action on `assistant_provider`).
|
||||
- `engine/ProviderService` (active provider from `assistant_provider` rows, key references, prices), `UsageRecorder` (one `assistant_usage` row per model call), `ConnectionTest`.
|
||||
- `qbit-assistant-provider-anthropic`: `AnthropicModelProvider` and `AnthropicMapping` (anthropic-java streaming).
|
||||
- `qbit-assistant-provider-openai`: OpenAI-compatible Chat Completions, model discovery and health using JDK HTTP and Jackson.
|
||||
- `qbit-assistant-provider-bedrock`: Claude through the Anthropic Bedrock backend, AWS default credentials and SigV4; IRSA/web-identity hosts supply STS.
|
||||
- `qbit-assistant-provider-vertex`: Claude through the Anthropic Vertex backend and Gemini through OpenAI-compatible Chat Completions, with refreshed Google ADC tokens.
|
||||
|
||||
## Invariants (do not break)
|
||||
|
||||
@@ -49,16 +54,23 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
- `AssistantSecurity` only ever adds the user's OWN id key, or the all-access key for `assistant.admin` holders.
|
||||
- **Data access:**
|
||||
- Only `persistence/` calls QueryAction, InsertAction and the other data actions (ArchUnit).
|
||||
- Tools run only through `AiToolKernel.execute`.
|
||||
- Data tools run only through `UiApiToolbox` → `UiApiGateway` (spec'd `/qqq/v1` operations with the user's `sessionUUID`); never core data actions for user data. Only `navigate` and `search_help` use `AiToolKernel.execute`.
|
||||
- Data access (`DataAccessService`) and the policy only ever narrow what the UI API allows; a table whose AI exposure is NONE stays NONE.
|
||||
- A write runs only after the owner confirms its pending action (unless the policy turns confirmation off), with the confirming request's session, once.
|
||||
- Panel API queries also filter `userId = me`, so an admin's all-access key never mixes other users' conversations into the panel.
|
||||
- **Caching:** the request prefix stays byte-stable. The order is tools (kernel-sorted), then system block 1 (rules + primer + app digest, LONG/1h), then system block 2 (user digest + date, SHORT/5m), then messages. Exactly one SHORT hint goes on the newest message. Don't put timestamps or ids in the system prompt.
|
||||
- **Tool results:**
|
||||
- Parallel tool results go back in ONE user message, in call order.
|
||||
- Errors (DENIED, NOT_FOUND, INVALID_INPUT, ERROR) are `is_error` results.
|
||||
- Unknown tools and over-limit calls also get error results.
|
||||
- **Keys:** never stored in a table. `assistant_provider.apiKeyEnvName` holds only an allowed environment variable NAME; `apiKeyStatus` is computed on read (last 4 at most) and stripped on save.
|
||||
- **Logging:** never log message content, prompts, tool results or keys. Structured end-of-turn log only.
|
||||
- **Thinking:** thinking is never streamed or stored. The Anthropic adapter keeps the raw assistant message (with signatures) only in memory, as `providerState`, for the tool loop.
|
||||
- **Links:** only `/app` or `/app/...` hrefs are emitted (`TurnEngine.isAppHref`).
|
||||
- **PHI routing:** PHI only to `hipaaEligible` providers; checked before every model call. Conversation classification never decreases.
|
||||
- **HIPAA storage:** Conversation storage encrypted in HIPAA mode, only in `AssistantStore`; encryption keys are environment references and never logged or stored in tables.
|
||||
- **Fallback:** fallback never crosses the PHI rule; never local-to-cloud by default. No retry after partial output from that call; provider switches rebuild neutral history without providerState.
|
||||
- **Budgets:** budgets are checked before every model call; downgrade never crosses the PHI rule.
|
||||
- **Kill switch:** read fresh before every model call and every tool step.
|
||||
|
||||
## Tests
|
||||
@@ -87,4 +99,4 @@ QQQ style:
|
||||
- `develop` publishes SNAPSHOTs.
|
||||
- `release/*` publishes RCs; the orb bumps `<revision>` in the root POM.
|
||||
- `v*` tags publish releases.
|
||||
- Both modules and the parent POM publish. The flatten plugin resolves `${revision}`.
|
||||
- All five modules and the parent POM publish. The flatten plugin resolves `${revision}`.
|
||||
@@ -9,7 +9,7 @@ Design spec: `QRun-IO/qqq` `docs/specs/2026-10-11-qqq-assistant-qbit-design.md`.
|
||||
| `com.kingsrook.qbits:qbit-assistant` | The QBit: conversation tables, turn engine, `/qqq/v1/assistant` routes (JSON + Server-Sent Events), budgets, kill switch, the provider SPI, and a scripted provider for tests and demos. |
|
||||
| `com.kingsrook.qbits:qbit-assistant-provider-anthropic` | The Claude provider (`com.anthropic:anthropic-java`). Add it to use Claude. The core QBit has no LLM SDK dependency. |
|
||||
|
||||
The data access itself is done by the AI tool kernel in QQQ core (`com.kingsrook.qqq.backend.core.actions.ai.AiToolKernel`). The kernel checks table permissions and exposure rules, applies record security, and caps and redacts what the model sees. Every tool result reaches the model wrapped as untrusted data.
|
||||
Data tools call the QQQ UI API through `UiApiToolbox` and `UiApiGateway` with the signed-in user's session. The UI enforces permissions and record security; the assistant further narrows access and caps and redacts returned values. Data tool results reach the model wrapped as untrusted data. Only record-free navigation and help use the core AI tool kernel.
|
||||
|
||||
## Requirements
|
||||
|
||||
@@ -37,14 +37,15 @@ The data access itself is done by the AI tool kernel in QQQ core (`com.kingsrook
|
||||
AssistantQBitConfig config = new AssistantQBitConfig()
|
||||
.withBackendName("rdbms") // where the assistant_* tables live
|
||||
.withTableMetaDataCustomizer(snakeCaseCustomizer) // optional: backend names for your schema
|
||||
.withModelProvider(AnthropicModelProvider.fromEnvironment()); // key from ANTHROPIC_API_KEY
|
||||
.withModelProvider(AnthropicModelProvider.fromEnvironment()) // fallback while no provider row exists
|
||||
.withProviderType(new AnthropicProviderType()); // offered on the Providers settings screen
|
||||
|
||||
new AssistantQBitProducer().withQBitConfig(config).produce(qInstance);
|
||||
```
|
||||
|
||||
`produce` does the following:
|
||||
- Registers the QBit.
|
||||
- Adds the tables, the `assistant_user_id` security key type, the `assistantRetention` process and the **Assistant Admin** app.
|
||||
- Adds the tables, the `assistant_user_id` security key type, the `assistantRetention` and **Test connection** processes, and the **Assistant** app with its home.
|
||||
- Builds the runtime.
|
||||
- Registers the `/qqq/v1/assistant/*` routes when Javalin is on the classpath.
|
||||
- Registers the record Developer-screen panel when QQQ core has the developer-panel contract.
|
||||
@@ -53,12 +54,48 @@ Create the tables in your database: see [Tables](#tables). Then grant the permis
|
||||
|
||||
### The API key
|
||||
|
||||
The key never goes in config, tables or logs. There are two ways to supply it:
|
||||
- `AnthropicModelProvider.fromEnvironment()` reads `ANTHROPIC_API_KEY`.
|
||||
- `AnthropicModelProvider.builder().apiKey(valueFromYourSecretStore).build()` takes the key from your own secret store. It also accepts the reference form `"${env.NAME}"`.
|
||||
The key never goes in config, tables or logs. It lives in the application's secret store and reaches the server as an environment variable (for kof22: Infisical, then an ExternalSecret, then the pod env).
|
||||
|
||||
- **Provider settings rows** (recommended) name the variable: `assistant_provider.apiKeyEnvName`, default the type's own (`ANTHROPIC_API_KEY`). The server reads the variable when it builds the client.
|
||||
- Without a row, the provider registered in code is used: `AnthropicModelProvider.fromEnvironment()` reads `ANTHROPIC_API_KEY`, and `AnthropicModelProvider.builder().apiKey(valueFromYourSecretStore).build()` takes the key from your own secret store (it also accepts `"${env.NAME}"`).
|
||||
|
||||
The provider's `toString` never contains the key. Its errors carry only the HTTP status and the API error type.
|
||||
|
||||
## Provider settings (the Providers table)
|
||||
|
||||
Admins set up providers on the **Providers** screen (`assistant_provider`), a standard QQQ table:
|
||||
|
||||
| Field | Meaning |
|
||||
|---|---|
|
||||
| Name, Type, Model | The type is one of the registered provider types (`withProviderType`; Anthropic now, others plug in the same way). The model list comes from the type and the price table. An empty model uses the policy's main model. |
|
||||
| Enabled, Default | The assistant uses the default enabled provider, else the first enabled one. Marking one default unmarks the others. With no enabled row, the provider registered in code is used. |
|
||||
| API Key Variable | The **name** of the environment variable that holds the key, never the key. Only allowed names are accepted: each registered type's default plus `allowedApiKeyEnvNames`. A pasted key (or `DATABASE_PASSWORD`) is refused and nothing is stored. |
|
||||
| API Key | Read-only, computed on every read: `Set • …abcd (from ANTHROPIC_API_KEY)` or `Not set (...)`. It shows the last four characters at most. No read path (screen, API, query, export) returns the key. |
|
||||
| Base URL Override | Empty uses the provider's own API. Any other URL must be listed in `allowedBaseUrls`, so a row cannot send the key to a host of an admin's choosing. |
|
||||
| Monthly Cost Cap (USD) | When this provider's cost this month (UTC) reaches the cap, new requests are refused (429 `BUDGET`) and a running answer stops before its next model call. |
|
||||
| Max Output Tokens Per Request, Max Concurrent Requests | Caps one model call's output, and how many calls run at once on this server. |
|
||||
| Last test | Status, time, latency, the model that answered, and the error text, from **Test connection**. |
|
||||
|
||||
**Why a reference and not an encrypted column.** QQQ core has no encrypted or secret field type. The key-provider and cipher work in the QQQ 4.1.0-RC.6 batch (QRun-IO/qqq#1123, #1107) encrypts backup artifacts, not table columns, and is not released. The design spec (§2.8) also says keys never go in tables. A reference keeps the key in the secret store that already holds it, so rotating it there is the "replace key" step, and the database never holds one.
|
||||
|
||||
**Test connection** is a record action on a provider (select one or more). It is a standard streamed ETL: Review lists what will be called and anything wrong with the row (missing key, disallowed variable or URL) before any call. Result has one line per provider: `connected to claude-sonnet-5-5 in 812 ms`, or the error with its kind and HTTP status. It makes one short live call (a 1-sentence prompt, at most 32 output tokens, effort low), saves the result on the row, and records the call in `assistant_usage` with purpose `TEST`.
|
||||
|
||||
## The app home
|
||||
|
||||
The **Assistant** app's home is the one place for the assistant's health, usage and cost (no other dashboard repeats it). All of it comes from the tables below, read as the viewing admin; an empty table gives an empty state, never sample data.
|
||||
|
||||
- **Health:** is it answering (kill switch, default provider, key present, last test), the 7-day error rate of model calls, cost and requests this month against the instance's monthly limit.
|
||||
- **Providers:** one row per provider: type, model, masked key status, last test, cost this month against its cap, limits, and any problem with its settings.
|
||||
- **Usage, last 30 days:** bars of model requests per day, totals (conversations, requests, tokens in and out, cost) and the last 7 days in words.
|
||||
- **Costs this month:** month to date against the policy limit and each provider cap, then by model. Cost is tokens times the model's price from **Model prices**.
|
||||
- **By user, this month**, **Top tools** (calls, failures, average time) and **Recent failures** (model calls and tool calls, linked).
|
||||
|
||||
The nav lists the home and the main tables: **Providers**, **Conversations**, **Model prices** and **Policy**. Messages, turns, tool calls, feedback and model calls are child lists on a conversation; model calls are also listed on their provider. Retention and Test connection are table and record actions, never nav entries.
|
||||
|
||||
## Model prices
|
||||
|
||||
`assistant_model_price` holds USD per million tokens per provider type and model: input, output, cache read, and cache writes (5 minute and 1 hour). Empty cache prices default to 0.1x, 1.25x and 2x the input price. The reference DDL seeds the Anthropic list prices of 2026-10. Edit a row to change what later calls cost; past rows keep the cost they were recorded with. A model with no row uses the `pricing` config map, else costs 0.
|
||||
|
||||
## Configuration
|
||||
|
||||
| Setting | Default | Meaning |
|
||||
@@ -82,6 +119,13 @@ The provider's `toString` never contains the key. Its errors carry only the HTTP
|
||||
| `hiddenWidgetNames` | none | Widgets that are never rendered, even when allowed. |
|
||||
| `customRedactionPatterns` | none | Extra regular expressions the kernel redacts from tool results. |
|
||||
| `killSwitchPollMillis` | 2000 | How often a running turn re-checks the kill switch while it waits on the model. |
|
||||
| `providerTypes` | none | `withProviderType(...)`: the types the Providers screen offers (`AnthropicProviderType`). |
|
||||
| `allowedApiKeyEnvNames` | none | Extra environment variable names a provider row may name as its key. Each type's default is always allowed. |
|
||||
| `allowedBaseUrls` | none | Base URL overrides a provider row may use. The type's own URL is always allowed. |
|
||||
| `secretResolver` | `System::getenv` | How a key variable name becomes the key (a host secret store, or tests). |
|
||||
| `providerTestTimeoutSeconds` | 30 | How long Test connection waits for the model. |
|
||||
| `homeMaxRows` | 20000 | Rows per table the app home reads for its period; it says when totals are partial. |
|
||||
| `tablePathPrefix` | `/app` | The front of the links the app home makes to tables and records. |
|
||||
|
||||
At runtime, an admin can override the kill switch, the main model and effort, and the budgets in the single **`assistant_policy`** row.
|
||||
|
||||
@@ -96,7 +140,7 @@ When a turn sees the switch on, it cancels every turn running on that replica. I
|
||||
| Permission | Grants |
|
||||
|---|---|
|
||||
| `assistant.hasAccess` | Use the panel. It grants **no data access**: the assistant reads only what the user can read anyway. |
|
||||
| `assistant.admin` | The Assistant Admin app, its tables and the retention process. |
|
||||
| `assistant.admin` | The Assistant app (home, settings and audit tables), Test connection and the retention process. |
|
||||
|
||||
There is no assistant-specific data permission. Everything the kernel reads is checked against the user's normal table permissions and record locks. The QBit never uses a system session (an ArchUnit test enforces this).
|
||||
|
||||
@@ -106,7 +150,7 @@ When the QBit is enabled, it registers the supplemental instance meta-data `assi
|
||||
|
||||
Conversation data belongs to its user. Every user-owned table has a record lock on `userId` with key type `assistant_user_id`:
|
||||
- The panel routes add the user's own id to their session, so users only ever see their own rows.
|
||||
- Admins see everyone's rows in the Assistant Admin app through the key type's all-access key, `assistant_user_id_all_access`. Grant that key to `assistant.admin` holders from your authentication customizer:
|
||||
- Admins see everyone's rows in the Assistant app through the key type's all-access key, `assistant_user_id_all_access`. Grant that key to `assistant.admin` holders from your authentication customizer:
|
||||
|
||||
```java
|
||||
// in your QAuthenticationModuleCustomizerInterface.customizeSession(...)
|
||||
@@ -159,6 +203,7 @@ Base path `/qqq/v1/assistant`. Every request is authenticated through the app's
|
||||
The stream sends these events, each with a `seq`:
|
||||
- `message.start`, `text.delta`
|
||||
- `tool.start`, `tool.result` (with `render` and `recordRefs`)
|
||||
- `presentation` (`messageId`, `part`: summary, blocks and server-built GFM markdown)
|
||||
- `ui.navigate`, `notice`
|
||||
- `usage`, `message.end`
|
||||
- `error`
|
||||
@@ -174,7 +219,7 @@ The stream ends after `message.end`. Thinking is never streamed.
|
||||
|
||||
## Tables
|
||||
|
||||
All of these are standard, visible QQQ tables in the Assistant Admin app:
|
||||
All of these are standard, visible QQQ tables in the Assistant app. The model never reads any of them (AI exposure `NONE`).
|
||||
|
||||
| Table | Holds |
|
||||
|---|---|
|
||||
@@ -186,6 +231,9 @@ All of these are standard, visible QQQ tables in the Assistant Admin app:
|
||||
| `assistant_feedback` | Feedback on answers. |
|
||||
| `assistant_policy` | The kill switch and overrides. |
|
||||
| `assistant_usage_daily` | Usage rollups: per user per day, plus an instance row whose `userId` is null. |
|
||||
| `assistant_provider` | Provider settings: type, model, key variable (never the key), limits, last connection test. |
|
||||
| `assistant_model_price` | USD per million tokens per model, used for every call's cost. |
|
||||
| `assistant_usage` | One row per model call (a turn step or a connection test): user, conversation, turn, provider, model, status, latency, tokens, cost. Locked to its user like the other audit tables. |
|
||||
|
||||
Table names follow the QRun-IO naming rule: lowercase snake_case with the `assistant_` prefix, the same as the physical tables in `docs/schema-postgres.sql` (the reference DDL). Field names are camelCase. Map them to your columns with a table customizer. Upgrading from 0.1.0-RC.1, which used camelCase table names and the `assistantUserId` key type: see [UPGRADE.md](UPGRADE.md).
|
||||
|
||||
@@ -206,6 +254,250 @@ The **live** evals run the same golden tasks against Claude. They are skipped un
|
||||
ANTHROPIC_API_KEY=... ./mvnw verify -Dassistant.live=true -Dtest.excludedGroups= -Dgroups=live -Djacoco.skip=true -pl qbit-assistant-provider-anthropic -am
|
||||
```
|
||||
|
||||
## Providers
|
||||
|
||||
Add `com.kingsrook.qbits:qbit-assistant-provider-openai` at the same version as
|
||||
the QBit and register the adapter alongside any Anthropic adapter:
|
||||
|
||||
```java
|
||||
config.withProviderType(new OpenAiCompatibleProviderType());
|
||||
```
|
||||
|
||||
`OpenAiCompatibleProviderType` is in
|
||||
`com.kingsrook.qbits.assistant.provider.openai`. Its installed type id is
|
||||
`openai-compatible`; provider rows choose OPENAI, AZURE_OPENAI, OPENROUTER,
|
||||
OLLAMA, LM_STUDIO, VLLM, LLAMA_CPP or OPENAI_COMPATIBLE as their kind.
|
||||
|
||||
- Local kinds use their localhost endpoint by default and need no key. Leave
|
||||
`apiKeyEnvName` empty. An auth proxy can use an explicitly allowed key env name.
|
||||
- Cloud defaults use `OPENAI_API_KEY`, `AZURE_OPENAI_API_KEY` or
|
||||
`OPENROUTER_API_KEY`. Values stay in the host's secret store.
|
||||
- An override must match an entry in `config.withAllowedBaseUrls(Set.of(...))`.
|
||||
Azure and OPENAI_COMPATIBLE have no default URL and always require an entry.
|
||||
Redirects are not followed. Azure uses the deployment model id and defaults
|
||||
`apiVersion` to `2024-10-21`.
|
||||
- **Discover models** adds a provider's Models child list; existing edits survive.
|
||||
Large cloud catalogs (over 20 models) start disabled. **Test connection** is
|
||||
available on both providers and models and records a TEST usage row.
|
||||
- A selected registered model must be enabled. With no model selected, the first
|
||||
enabled registry model wins; providers with no model rows retain legacy selection.
|
||||
Registry prices override type/model prices, then configured prices. Unpriced
|
||||
local models cost zero. Capabilities can be adjusted per registered model.
|
||||
|
||||
For Ollama behind a TLS proxy with a private CA and bearer authentication:
|
||||
|
||||
```java
|
||||
config.withProviderType(new OpenAiCompatibleProviderType())
|
||||
.withAllowedBaseUrls(Set.of("https://llm.example.lan:8443/v1"))
|
||||
.withAllowedApiKeyEnvNames(Set.of("LOCAL_LLM_API_KEY"))
|
||||
.withTrustedCaBundleFile("local-llm", Path.of("/etc/app/llm-root-ca.pem"));
|
||||
```
|
||||
|
||||
Set `LOCAL_LLM_API_KEY` in the server environment from your secret store. In the
|
||||
provider record choose kind `OLLAMA`, base URL `https://llm.example.lan:8443/v1`,
|
||||
`apiKeyEnvName = LOCAL_LLM_API_KEY`, and `tlsCaBundle = local-llm`. Only the names
|
||||
are stored. `withTrustedCaBundle("local-llm", pem)` also accepts one or more PEM
|
||||
certificates directly at startup. Invalid PEM fails configuration immediately.
|
||||
The named bundle adds to the JVM roots; hostname verification stays enabled.
|
||||
Leave `tlsCaBundle` empty to use JVM trust alone. Restart after changing a CA file.
|
||||
|
||||
Default tests use localhost mocks. To exercise an existing development server,
|
||||
set `ASSISTANT_LIVE_OPENAI_BASE_URL` and `ASSISTANT_LIVE_OPENAI_MODEL`, optionally
|
||||
`ASSISTANT_LIVE_OPENAI_KIND` (default OLLAMA), `ASSISTANT_LIVE_OPENAI_KEY_ENV`
|
||||
(the variable name containing the key), and `ASSISTANT_LIVE_OPENAI_CA_FILE`
|
||||
(a PEM bundle path). Unset or unreachable endpoints, including TLS failures, skip
|
||||
the live test. Run:
|
||||
|
||||
```sh
|
||||
./mvnw verify -pl qbit-assistant-provider-openai -am -Dtest.excludedGroups= -Dgroups=live -Djacoco.skip=true
|
||||
```
|
||||
|
||||
### AWS Bedrock (Claude)
|
||||
|
||||
Add `com.kingsrook.qbits:qbit-assistant-provider-bedrock` at the QBit version and
|
||||
register `com.kingsrook.qbits.assistant.provider.bedrock.BedrockProviderType`:
|
||||
|
||||
```java
|
||||
config.withProviderType(new BedrockProviderType());
|
||||
```
|
||||
|
||||
Create a provider row with type `bedrock`, kind `BEDROCK`, and the required AWS
|
||||
`region` (for example `us-east-1`). Leave `apiKeyEnvName` empty. The server uses
|
||||
the AWS default credential chain: environment variables, profiles and container
|
||||
credentials (ECS/EKS Pod Identity) work with the transitive dependencies.
|
||||
**For IRSA / web-identity credentials, the host application must add
|
||||
`software.amazon.awssdk:sts` to its runtime classpath**, matching the transitive
|
||||
AWS SDK version. The default chain picks it up when present; this adapter does
|
||||
not include STS or the full AWS SDK. Credentials are never stored in tables.
|
||||
|
||||
Leave the base URL empty for the SDK's
|
||||
`https://bedrock-runtime.<region>.amazonaws.com` endpoint. Overrides, including
|
||||
VPC endpoints, must be listed in `withAllowedBaseUrls`. Model ids are Bedrock
|
||||
Claude ids or inference profile ids, for example
|
||||
`us.anthropic.claude-sonnet-4-5-20250929-v1:0`. The model must be available to the
|
||||
server's AWS role in that region.
|
||||
|
||||
### Google Vertex AI (Claude, Gemini)
|
||||
|
||||
Add `com.kingsrook.qbits:qbit-assistant-provider-vertex` at the QBit version and
|
||||
register `com.kingsrook.qbits.assistant.provider.vertex.VertexProviderType`:
|
||||
|
||||
```java
|
||||
config.withProviderType(new VertexProviderType());
|
||||
```
|
||||
|
||||
Create a row with type `vertex`, kind `VERTEX`, required `region` (for example
|
||||
`us-east5`) and `cloudProject` (the GCP project id). Leave `apiKeyEnvName` empty.
|
||||
The server uses Google Application Default Credentials, such as
|
||||
`GOOGLE_APPLICATION_CREDENTIALS` or workload identity. Access tokens are refreshed
|
||||
when expired, held only in memory, and obtained afresh for each Gemini request.
|
||||
|
||||
Models beginning `claude-` (for example `claude-sonnet-4-5@20250929`) use the
|
||||
Anthropic Vertex backend's `streamRawPredict` API. All other model ids use Vertex's
|
||||
OpenAI-compatible endpoint:
|
||||
|
||||
```text
|
||||
https://{region}-aiplatform.googleapis.com/v1/projects/{project}/locations/{region}/endpoints/openapi
|
||||
```
|
||||
|
||||
Unprefixed ids, such as `gemini-2.5-flash`, are sent as `google/gemini-2.5-flash`;
|
||||
already-prefixed ids are preserved. Gemini requests omit `strict`, including when
|
||||
a tool opts in. An allow-listed base URL overrides the Claude API origin or the
|
||||
complete OpenAI-compatible base URL, according to the selected model. Use separate
|
||||
provider rows when an override needs different URL prefixes for the two APIs.
|
||||
|
||||
Both cloud types default to CLOUD and expose a short static model catalog.
|
||||
**Discover models** returns those defaults; it does not call Bedrock's
|
||||
`ListFoundationModels` (which needs the control-plane SDK) or Vertex Model Garden.
|
||||
Health probes are unsupported; **Test connection** performs the existing one-shot
|
||||
completion. Model access and availability depend on the configured region/project.
|
||||
`hipaaEligible` is an administrator-recorded fact: a BAA and the associated legal
|
||||
and operational requirements remain owner responsibilities. The flag does not
|
||||
establish eligibility or implement PHI routing.
|
||||
|
||||
The default build tests both clouds using localhost only, fake credentials, AWS
|
||||
binary event-stream framing, Claude SSE and Gemini Chat Completions, including
|
||||
engine/tool golden turns. No cloud credentials or live endpoints are required.
|
||||
|
||||
## License
|
||||
|
||||
Apache 2.0.
|
||||
|
||||
|
||||
## Data classification and HIPAA mode
|
||||
|
||||
On QQQ 4.1.0-RC.5, classify application tables/fields in the host configuration:
|
||||
|
||||
```java
|
||||
import com.kingsrook.qbits.assistant.classification.DataClassification;
|
||||
|
||||
AssistantQBitConfig config = new AssistantQBitConfig()
|
||||
.withDataClassification("patient", DataClassification.PHI)
|
||||
.withDataClassification("patient", "id", DataClassification.PUBLIC)
|
||||
.withDataClassification("patient", "email", DataClassification.PII)
|
||||
.withDataClassification("patient", "status", DataClassification.PUBLIC)
|
||||
.withHipaaMode(true)
|
||||
.withHipaaRetentionDays(2190)
|
||||
.withConversationEncryptionKeyEnvName("ASSISTANT_CONVERSATION_KEY");
|
||||
```
|
||||
|
||||
Set that environment variable through your secret manager to a base64-encoded,
|
||||
random 256-bit (32-byte) key. Supply only its **name** in config, never the key.
|
||||
The existing server-side `withSecretResolver` hook also resolves this reference.
|
||||
Startup validates the key. HIPAA mode defaults off; encryption can also be enabled
|
||||
with the key reference while HIPAA mode is off.
|
||||
|
||||
The qbit `DataClassification` enum is a stand-in for core QRun-IO/qqq#1142, with
|
||||
PUBLIC < CONFIDENTIAL < PII < PHI. Unconfigured tables default to PUBLIC; a field
|
||||
falls back to its table unless explicitly overridden. A field subset uses its
|
||||
selected fields; unrestricted reads and record page contexts use the highest
|
||||
classification across the table and its fields. Returned columns and record-label
|
||||
fields also count: tools include a primary key even for subsets, so classify it
|
||||
explicitly if the host considers it safe for that subset. Cross-table results with unknown
|
||||
tables use the highest classification anywhere. Metadata-only tools remain PUBLIC.
|
||||
The assistant's own tables remain denied to tools.
|
||||
|
||||
Hosts can supply `withClassificationSource(ClassificationSource)` instead. When
|
||||
upgrading to an RC containing core #1142, implement that interface with
|
||||
`AiDataClassifications`/`AiTableMetaData`/`AiFieldMetaData` (map enum names), then
|
||||
replace the stand-in once the qbit's minimum core version includes it.
|
||||
|
||||
PHI is sent only to a persisted provider row explicitly marked `hipaaEligible`.
|
||||
Every model dispatch rechecks eligibility, including calls after tools and strict
|
||||
schema retries. Blocks end the turn with `PHI_BLOCKED` or `HIPAA_PROVIDER`; the
|
||||
PHI tool result is never sent to that provider. There is no automatic fallback.
|
||||
A conversation keeps its highest classification, so moving to a PUBLIC page does
|
||||
not make existing PHI history safe for a non-eligible provider.
|
||||
|
||||
HIPAA mode also refuses non-eligible providers at resolution and when enabling
|
||||
settings rows, disables code-only fallback, requires encrypted conversation
|
||||
storage, and suppresses provider error details in logs and turn errors. The app
|
||||
home displays HIPAA mode and PHI retention. The eligibility flag records the
|
||||
operator's decision (including any applicable BAA); it does not establish one.
|
||||
|
||||
Both modes audit each PII/PHI model call and every routing block in
|
||||
`assistant_data_audit` (admin read-only, owner-locked, on the conversation screen).
|
||||
PHI conversations use `hipaaRetentionDays` even with HIPAA mode off. A null value
|
||||
uses normal retention; tool-result/replay cleanup remains independently configured.
|
||||
See [UPGRADE.md](UPGRADE.md) for schema changes, plaintext migration, and key handling.
|
||||
|
||||
## Data-driven budgets
|
||||
|
||||
Admins configure **Assistant > Budgets** for UTC DAY or MONTH allowances in USD or
|
||||
TOKENS, scoped to INSTANCE, USER, ROLE (a permission), PROVIDER or MODEL. Provider
|
||||
and model scope values are registry record ids. Warnings default to 80%; at 100%
|
||||
the default action is DOWNGRADE, and the hard ceiling defaults to 120% (always
|
||||
STOP). Multiple budgets apply together and STOP wins.
|
||||
|
||||
An explicit downgrade model is optional. Otherwise the cheapest enabled usable
|
||||
model is selected, preferring LOCAL providers. PHI never goes to a provider that
|
||||
is not HIPAA-eligible. No eligible target means STOP. Administrators can grant
|
||||
extra allowance or temporary unlimited use from the budget's Overrides child list,
|
||||
with a required reason and expiry; the session sets the grantor.
|
||||
|
||||
Budget state changes appear once per scope/period/state in the Events child list,
|
||||
as panel notices and, through core QAlerts, bell alerts when an alerts sink is installed (logging otherwise).
|
||||
The Assistant home shows budgets, overrides, daily cost and tokens, and breakdowns
|
||||
by user, model, provider and tool. Existing `AssistantBudgets`/policy limits and
|
||||
provider monthly caps continue to apply independently of these rows and overrides.
|
||||
See [UPGRADE.md](UPGRADE.md) for the required additive schema.
|
||||
|
||||
|
||||
### Profile routing and provider fallback
|
||||
|
||||
On an Assistant Profile, **Model routing** defaults to OFF. HEURISTIC selects the
|
||||
complex slot for long questions (>600 characters), two mentioned app tables,
|
||||
analysis/comparison/explanation/trend/planning requests, pending writes, more than
|
||||
eight previous turns, or a previous tool limit; otherwise it selects the simple
|
||||
slot. CLASSIFIER uses an optional registry model with just the question and a
|
||||
fixed instruction, four output tokens and a three-second timeout. An invalid reply,
|
||||
error, unavailable classifier or PHI-ineligible classifier uses HEURISTIC. ROUTE
|
||||
usage counts toward budgets. Empty model slots keep the provider/policy default;
|
||||
budgets may downgrade either choice. Without a profile, enabled code-level
|
||||
`AssistantModelRouting.escalation*` supplies the complex default.
|
||||
|
||||
A model's **Fallback model** points to its next candidate, including another
|
||||
provider. Chains are cycle-free and bounded to four hops. Only retryable failures
|
||||
before any text or tool start from that call permit fallback. Disabled, down,
|
||||
PHI-ineligible or budget-blocked candidates are skipped. Without explicit links,
|
||||
only another LOCAL model in the same adapter family is eligible; local requests
|
||||
never automatically move to cloud. Provider state/signatures are removed when
|
||||
switching, preserving neutral tool history. Each attempted call is audited as usage.
|
||||
|
||||
NETWORK/TIMEOUT marks a provider DOWN for 60 seconds; success marks it UP. Local
|
||||
health is probed when unknown/stale with a two-second timeout. Provider cards show
|
||||
health and down-until, failures show fallback totals, and turn records show the
|
||||
route and final destination. See [UPGRADE.md](UPGRADE.md) for the additive schema.
|
||||
|
||||
### Answer presentation
|
||||
|
||||
The always-available `present_results` tool turns retrieved results into metrics,
|
||||
tables, charts and actionable in-app links. The server validates the user's UI API
|
||||
visibility, formats field values, computes shares and builds all links. It emits
|
||||
and stores a `presentation` part with a complete GFM Markdown fallback. Profile
|
||||
skills can extend the built-in presentation instructions. See the
|
||||
[part, stream and input contract](docs/answer-presentation.md).
|
||||
|
||||
The image-breakdown golden task also runs in the existing opt-in live provider suite:
|
||||
`./mvnw verify -Dassistant.live=true -Dtest.excludedGroups= -Dgroups=live -Djacoco.skip=true -pl qbit-assistant-provider-anthropic -am`
|
||||
(with `ANTHROPIC_API_KEY` set). Live calls are excluded from normal verification.
|
||||
@@ -1,12 +1,147 @@
|
||||
# Upgrading qbit-assistant
|
||||
|
||||
## 0.1.0-RC.1 to 0.1.0-RC.2: snake_case names
|
||||
## P-e: profile routing and provider fallback
|
||||
|
||||
RC.2 applies the QRun-IO naming rule (owner decision, 2026-10-12): *"table names should always be lowercase and use _, and qbits should always be prefixed with their name"*. The QQQ table names, the owner security key type and the possible-value source change. Permissions do not. **This is a metadata-only change**: no table, column or index in your database changes, and no Liquibase or DDL step is needed.
|
||||
Apply the additive **P-e** ALTER TABLE statements at the end of
|
||||
[docs/schema-postgres.sql](docs/schema-postgres.sql) before deploying. Existing
|
||||
profiles default to OFF; optional model references and health columns start null.
|
||||
No routing or fallback configuration is seeded. Existing turns retain unknown
|
||||
routing/final-provider values; fallback_count defaults to zero.
|
||||
|
||||
Profiles now have a **Model routing** section. Select HEURISTIC or CLASSIFIER,
|
||||
then optional simple/complex registry models and a classifier model. Empty route
|
||||
slots retain provider/policy selection. CLASSIFIER with no usable classifier
|
||||
uses HEURISTIC. OFF preserves prior provider selection. With no effective profile,
|
||||
code-configured escalation supplies the complex model/effort when enabled.
|
||||
|
||||
Set a model's **Fallback model** to opt into a cross-provider chain. Saves reject
|
||||
cycles, more than four edges, or disabled/missing targets. Provider health is
|
||||
read-only; NETWORK/TIMEOUT opens a 60-second circuit, and successful calls close
|
||||
it. Local endpoints with stale health get a bounded two-second probe. Automatic
|
||||
fallback without an explicit link is confined to local models of the same adapter
|
||||
family. PHI/HIPAA eligibility and budgets apply to every destination.
|
||||
|
||||
Classifier usage is recorded with purpose ROUTE and included in budgets. Reports
|
||||
that filter usage purpose should include ROUTE. Turn screens show route decision,
|
||||
source, fallback count and final provider; the home shows health and fallback totals.
|
||||
All configuration remains assistant.admin-only, with AI exposure NONE.
|
||||
|
||||
## P-d: data-driven budgets
|
||||
|
||||
Requires QQQ 4.1.0-RC.5 for the core Alerts API and alert type metadata.
|
||||
|
||||
Create `assistant_budget`, `assistant_budget_override`, `assistant_budget_event`
|
||||
and `assistant_budget_usage`
|
||||
using the P-d DDL in [schema-postgres.sql](docs/schema-postgres.sql) before deploying.
|
||||
The event unique key is required: it deduplicates each state per budget, scope and
|
||||
UTC period across replicas. Do not remove it or truncate events during a period.
|
||||
|
||||
Budgets appear in Assistant navigation. Overrides and immutable events are child
|
||||
lists. All four tables require `assistant.admin` and have AI exposure NONE.
|
||||
Overrides record the actual session grantor and require a reason and expiry.
|
||||
The standard host QQQ audit configuration applies to budget and override edits.
|
||||
`assistant_budget_usage` is a private accounting projection populated from persisted
|
||||
usage writes. It copies only counters, time, user, provider and model, with no owner
|
||||
lock, so shared INSTANCE/PROVIDER/MODEL sums can run under the caller's own session.
|
||||
The source usage table retains its owner locks. The projection is read-only, has no
|
||||
nav entry and no AI exposure. **Pause usage writes during migration and run the DDL's
|
||||
backfill before restarting**; otherwise shared totals would omit pre-upgrade usage.
|
||||
Keep accounting rows through their budget periods even if detail rows are removed.
|
||||
ROLE budgets give each permission holder a separate allowance, checked with their
|
||||
current session. Override scopeValue, when set, narrows the allowance to one user id.
|
||||
|
||||
Existing policy/config budgets and provider monthly caps remain additional limits;
|
||||
an override of a budget row does not waive those existing caps.
|
||||
|
||||
Provider and MODEL scope values are numeric provider/model registry row ids;
|
||||
USER is a user id and ROLE is a permission name. INSTANCE has no scope value.
|
||||
Periods reset at midnight UTC or the first of the month UTC. Token usage includes
|
||||
input, output, cache-read and cache-write tokens; USD uses the recorded micro-dollar
|
||||
cost, not today's model price. No default budget rows are seeded.
|
||||
|
||||
## P-c: classification, PHI routing and encrypted storage
|
||||
|
||||
Apply these additive schema changes before deploying P-c (adjust column mappings
|
||||
for your backend). New conversations/turns record `PUBLIC`, `CONFIDENTIAL`, `PII`
|
||||
or `PHI`; legacy null classifications read as PUBLIC. Backfill known historical
|
||||
PHI conversations to PHI before allowing their history to be used with a provider.
|
||||
|
||||
```sql
|
||||
ALTER TABLE assistant_conversation ADD COLUMN max_classification VARCHAR(16);
|
||||
ALTER TABLE assistant_turn ADD COLUMN classification VARCHAR(16);
|
||||
ALTER TABLE assistant_turn ADD COLUMN classification_tables VARCHAR(500);
|
||||
ALTER TABLE assistant_conversation ALTER COLUMN title TYPE TEXT;
|
||||
ALTER TABLE assistant_tool_call ALTER COLUMN result_summary TYPE TEXT;
|
||||
ALTER TABLE assistant_pending_action ALTER COLUMN summary TYPE TEXT;
|
||||
ALTER TABLE assistant_pending_action ALTER COLUMN result_summary TYPE TEXT;
|
||||
CREATE TABLE assistant_data_audit
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
user_id VARCHAR(255),
|
||||
conversation_id INTEGER,
|
||||
turn_id INTEGER,
|
||||
provider_id INTEGER,
|
||||
provider_name VARCHAR(200),
|
||||
model VARCHAR(200),
|
||||
hipaa_eligible BOOLEAN,
|
||||
classification VARCHAR(16),
|
||||
tables VARCHAR(500),
|
||||
decision VARCHAR(16),
|
||||
reason VARCHAR(1000),
|
||||
create_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
CREATE INDEX assistant_data_audit_user_id ON assistant_data_audit (user_id);
|
||||
CREATE INDEX assistant_data_audit_conversation_id ON assistant_data_audit (conversation_id);
|
||||
CREATE INDEX assistant_data_audit_turn_id ON assistant_data_audit (turn_id);
|
||||
```
|
||||
|
||||
`assistant_data_audit` is an admin read-only, owner-locked child list on a
|
||||
conversation, outside navigation. It records each model call carrying PII/PHI and
|
||||
each routing block, without record values. It expires with the conversation.
|
||||
PHI conversations use `hipaaRetentionDays` (2190 by default), even outside HIPAA
|
||||
mode; null uses normal retention. Existing tool-result/replay cleanup still uses
|
||||
`toolResultRetentionDays`.
|
||||
|
||||
Before enabling HIPAA mode, mark the permitted provider rows `hipaaEligible = true`
|
||||
and provision `conversationEncryptionKeyEnvName` with a base64-encoded 32-byte
|
||||
key. Startup refuses missing or invalid keys. A code-only provider is not eligible.
|
||||
The flag records the operator's eligibility decision; it does not establish a BAA.
|
||||
|
||||
New/updated message parts, titles, conversation context, tool payloads/redactions
|
||||
and summaries, replay data, and pending-action payloads/summaries use
|
||||
`enc:v1:<base64(iv|ciphertext|tag)>` (AES-256-GCM, random 12-byte IV, 16-byte tag).
|
||||
Only `AssistantStore` decrypts; direct backend/admin record views show ciphertext.
|
||||
String columns holding encrypted summaries/titles must be TEXT to allow expansion.
|
||||
Legacy plaintext reads are supported; existing rows are not automatically rewritten.
|
||||
For an existing deployment, migrate legacy payloads through AssistantStore under
|
||||
the appropriate owner/admin session before treating the whole archive as encrypted.
|
||||
Keep the key available for the lifetime of encrypted data and backups. Changing the
|
||||
key requires a controlled decrypt/re-encrypt migration; P-c has no key rotation job.
|
||||
Corrupt ciphertext, a wrong key, and encrypted data without a key fail closed.
|
||||
|
||||
## 0.1.0-RC.3 to 0.1.0-RC.4: provider settings, prices, per-call usage, app home
|
||||
|
||||
Three new tables. Create them before you deploy (see `docs/schema-postgres.sql`, which also seeds the Anthropic prices):
|
||||
- `assistant_provider` (with the `api_key_status` column: it is filled on read and never written, but the backend selects it)
|
||||
- `assistant_model_price`
|
||||
- `assistant_usage`
|
||||
|
||||
Then, to keep answering exactly as before:
|
||||
1. Register the provider type: `config.withProviderType(new AnthropicProviderType())`. Keep `withModelProvider(AnthropicModelProvider.fromEnvironment())` as the fallback.
|
||||
2. Add one provider row (or seed it in your migration): type `anthropic`, model = your current main model, enabled, default, `apiKeyEnvName` = `ANTHROPIC_API_KEY` (or leave it empty for the default). No key value is ever written.
|
||||
3. Run **Test connection** on it.
|
||||
|
||||
Until a row exists, the provider registered in code answers, as in RC.3. Other changes: the app label is **Assistant**; the nav no longer lists the retention process (it is a table action on conversations) or the audit tables (they are child lists). Grants on `assistant.admin` cover everything new.
|
||||
|
||||
## 0.1.0-RC.1 to 0.1.0-RC.3: snake_case names
|
||||
|
||||
The rename shipped in 0.1.0-RC.3. 0.1.0-RC.2 on Maven Central is an accidental republish of the RC.1 code (see CHANGELOG.md), so upgrading from RC.2 is the same as upgrading from RC.1.
|
||||
|
||||
RC.3 applies the QRun-IO naming rule (owner decision, 2026-10-12): *"table names should always be lowercase and use _, and qbits should always be prefixed with their name"*. The QQQ table names, the owner security key type and the possible-value source change. Permissions do not. **This is a metadata-only change**: no table, column or index in your database changes, and no Liquibase or DDL step is needed.
|
||||
|
||||
### What changed
|
||||
|
||||
| Kind | RC.1 name | RC.2 name |
|
||||
| Kind | RC.1 (and RC.2) name | RC.3 name |
|
||||
|---|---|---|
|
||||
| Table | `assistantConversation` | `assistant_conversation` |
|
||||
| Table | `assistantMessage` | `assistant_message` |
|
||||
@@ -84,10 +219,111 @@ QQQ stores table names, permission names and key names outside this qbit. Update
|
||||
'assistantToolCall', 'assistantFeedback', 'assistantPolicy', 'assistantUsageDaily');
|
||||
```
|
||||
|
||||
If a new-name row was already created (the app ran RC.2 before this update), repoint `audit.audit_table_id` from the old row to the new one first, then delete the old row.
|
||||
If a new-name row was already created (the app ran RC.3 before this update), repoint `audit.audit_table_id` from the old row to the new one first, then delete the old row.
|
||||
|
||||
4. **Anything else that stores a table name**: frontend links or bookmarks to `/app/.../assistantConversation`, Quick Search index rows (`quick_search_index.table_name`; reindex instead of editing), ESB topics or reports you configured by table name.
|
||||
|
||||
### Order
|
||||
|
||||
Deploy RC.2 and run the statements above in the same maintenance window. Until the update runs, saved views and reports on the assistant tables do not open, and admins who get the all-access key from their own customizer only see their own rows.
|
||||
Deploy RC.3 and run the statements above in the same maintenance window. Until the update runs, saved views and reports on the assistant tables do not open, and admins who get the all-access key from their own customizer only see their own rows.
|
||||
|
||||
## 0.1.0-RC.6: tools through the UI API
|
||||
|
||||
Database (see `docs/schema-postgres.sql`):
|
||||
- new tables `assistant_data_access`, `assistant_pending_action`, `assistant_profile`, `assistant_skill` and `assistant_profile_skill`;
|
||||
- new columns `assistant_tool_call.ui_api_operation`, `http_status`, `audit_href`, `pending_action_id`;
|
||||
- new columns `assistant_policy.writes_require_confirmation`, `allowed_tools`, `max_rows_per_call`, `redact_pii`.
|
||||
|
||||
Runtime: the tools call this server's own `/qqq/v1` on `127.0.0.1` and the port the first assistant request arrived on. If the server is not reachable that way (a different bind address, a TLS-only listener), set `withUiApiBaseUrl(...)`. Grant `assistant.admin` holders the new tables through the qbit's existing admin permission (no new permission names).
|
||||
|
||||
Behavior: nothing is writable until an admin adds a READ_WRITE data access row; before that the assistant reads exactly what it did before, now through the UI API.
|
||||
|
||||
## P-a: provider and model registry
|
||||
|
||||
Before starting the new version, database-backed hosts add the provider columns
|
||||
and model sub-table below. Memory-backed hosts need no migration. Existing rows
|
||||
derive kind and location from the adapter and keep their model behavior until
|
||||
models are registered. Keys remain environment-variable references.
|
||||
|
||||
```sql
|
||||
ALTER TABLE assistant_provider
|
||||
ADD COLUMN kind VARCHAR(30),
|
||||
ADD COLUMN tls_ca_bundle VARCHAR(100),
|
||||
ADD COLUMN location VARCHAR(10),
|
||||
ADD COLUMN hipaa_eligible BOOLEAN DEFAULT FALSE,
|
||||
ADD COLUMN region VARCHAR(50),
|
||||
ADD COLUMN api_version VARCHAR(30),
|
||||
ADD COLUMN connect_timeout_seconds INTEGER DEFAULT 10 CHECK (connect_timeout_seconds BETWEEN 1 AND 600),
|
||||
ADD COLUMN request_timeout_seconds INTEGER DEFAULT 120 CHECK (request_timeout_seconds BETWEEN 1 AND 600),
|
||||
ADD COLUMN last_discovery_at TIMESTAMP WITH TIME ZONE,
|
||||
ADD COLUMN last_discovery_status VARCHAR(16),
|
||||
ADD COLUMN last_discovery_error VARCHAR(500);
|
||||
ALTER TABLE assistant_provider ALTER COLUMN model TYPE VARCHAR(200);
|
||||
ALTER TABLE assistant_provider ALTER COLUMN last_test_model TYPE VARCHAR(200);
|
||||
ALTER TABLE assistant_usage ALTER COLUMN model TYPE VARCHAR(200);
|
||||
ALTER TABLE assistant_message ALTER COLUMN model TYPE VARCHAR(200);
|
||||
ALTER TABLE assistant_turn ALTER COLUMN model TYPE VARCHAR(200);
|
||||
|
||||
CREATE TABLE assistant_model
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
provider_id INTEGER NOT NULL REFERENCES assistant_provider(id),
|
||||
model_id VARCHAR(200) NOT NULL,
|
||||
display_name VARCHAR(200),
|
||||
enabled BOOLEAN,
|
||||
supports_tools BOOLEAN,
|
||||
supports_vision BOOLEAN,
|
||||
supports_streaming BOOLEAN,
|
||||
supports_reasoning_effort BOOLEAN,
|
||||
context_window_tokens INTEGER,
|
||||
max_output_tokens INTEGER,
|
||||
input_usd_per_m_tok NUMERIC(12, 4),
|
||||
output_usd_per_m_tok NUMERIC(12, 4),
|
||||
source VARCHAR(16),
|
||||
discovered_at TIMESTAMP WITH TIME ZONE,
|
||||
last_test_at TIMESTAMP WITH TIME ZONE,
|
||||
last_test_status VARCHAR(16),
|
||||
last_test_latency_ms INTEGER,
|
||||
last_test_error VARCHAR(500),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE,
|
||||
UNIQUE (provider_id, model_id)
|
||||
);
|
||||
```
|
||||
|
||||
Register the optional `qbit-assistant-provider-openai` module and
|
||||
`OpenAiCompatibleProviderType` to offer its kinds. Azure and generic endpoints
|
||||
require an explicit `allowedBaseUrls` entry; local defaults may be keyless.
|
||||
Discover models preserves existing rows. Cloud catalogs larger than 20 are added
|
||||
disabled; enable the models to offer before leaving the provider's model empty.
|
||||
HIPAA eligibility records an administrator's fact; P-a does not implement PHI routing.
|
||||
|
||||
Custom CA bundles are server configuration, never database content. Register them
|
||||
with `withTrustedCaBundle(name, pem)` or `withTrustedCaBundleFile(name, path)` at
|
||||
startup, then set the HTTPS provider row's `tlsCaBundle` to that name. Empty
|
||||
references retain JVM default trust. The bundle adds trust without replacing JVM
|
||||
roots; hostname verification remains enabled. If the P-a columns were already
|
||||
applied, add only `tls_ca_bundle VARCHAR(100)` to `assistant_provider`.
|
||||
|
||||
|
||||
## P-b: AWS Bedrock and Google Vertex
|
||||
|
||||
Before starting this version, database-backed hosts that already applied P-a add:
|
||||
|
||||
```sql
|
||||
ALTER TABLE assistant_provider ADD COLUMN cloud_project VARCHAR(100);
|
||||
```
|
||||
|
||||
Fresh installations use `docs/schema-postgres.sql`; memory-backed hosts need no
|
||||
migration. Existing providers leave the new column null. Vertex requires the GCP
|
||||
project id in `cloudProject`; Bedrock and Vertex both require `region` and reject
|
||||
`apiKeyEnvName`. They default to CLOUD; `hipaaEligible` remains a manual admin fact.
|
||||
|
||||
Add the optional `qbit-assistant-provider-bedrock` and/or
|
||||
`qbit-assistant-provider-vertex` module at the QBit version and register
|
||||
`BedrockProviderType` / `VertexProviderType`. Credentials come from the server's
|
||||
AWS default chain / Google Application Default Credentials. No credentials are
|
||||
stored in provider rows. Hosts using AWS IRSA or web identity supply
|
||||
`software.amazon.awssdk:sts` on their own runtime classpath (matching the
|
||||
transitive AWS SDK version); this QBit does not add it. See README Providers for
|
||||
configuration, endpoint overrides and static discovery limitations.
|
||||
@@ -0,0 +1,481 @@
|
||||
# qbit-assistant: settings, usage and app home (design)
|
||||
|
||||
The assistant's overall design is the QQQ spec `QRun-IO/qqq` `docs/specs/2026-10-11-qqq-assistant-qbit-design.md` (owner decisions D1 to D7). This note covers what 0.1.0-RC.4 adds on top of it: provider settings, per-call usage, prices and the app home.
|
||||
|
||||
Owner request (2026-10-13): *"it needs a good homepage for the app for it, and it needs a settings screen where you setup the API keys, provider, test connectivity etc. and the app homepage should show health, usage, costs, etc."*
|
||||
|
||||
## Data
|
||||
|
||||
All of it is in standard QQQ tables with full record screens (D6), prefixed `assistant_`, secured by `assistant.admin` and, for user-owned rows, the `assistant_user_id` record lock. Every `assistant_*` table has AI exposure `NONE`.
|
||||
|
||||
| Table | Written by | Purpose |
|
||||
|---|---|---|
|
||||
| `assistant_provider` | admins | Which provider and model answer, the key reference, limits, the last connection test. |
|
||||
| `assistant_model_price` | admins (seeded) | USD per million tokens per model. |
|
||||
| `assistant_usage` | the qbit only | One row per model call: turn steps (`TURN`) and connection tests (`TEST`). |
|
||||
|
||||
`assistant_turn` keeps the per-turn totals and `assistant_usage_daily` the budget rollups, as before. `assistant_usage` adds the per-call detail the home needs: the provider, the failures and latency.
|
||||
|
||||
## API keys
|
||||
|
||||
Decision: **reference, not storage.** A provider row holds the NAME of an environment variable (`apiKeyEnvName`); `ProviderService` resolves it through `config.getSecretResolver()` (default `System::getenv`) when it builds a client.
|
||||
|
||||
Why:
|
||||
- QQQ core has no encrypted or secret field type. The key-provider SPI and Tink cipher in the RC.6 batch (qqq#1123, #1107) encrypt streamed backup artifacts, not columns, and are not released.
|
||||
- Spec §2.8: keys are `${env.*}` secrets and are never stored in tables.
|
||||
- Deployments already hold the key in a secret store (kof22: Infisical, then an ExternalSecret, then the pod env). Rotating it there is the "replace key" step; the database never has a copy to leak through a backup, an export or the API.
|
||||
|
||||
Guards:
|
||||
- Only allow-listed names: each registered type's default (`ANTHROPIC_API_KEY`) plus `allowedApiKeyEnvNames`. Otherwise an admin could aim a row at `DATABASE_PASSWORD` and send it to a provider.
|
||||
- A base URL override must be in `allowedBaseUrls`. Otherwise an admin could send the real key to their own host.
|
||||
- The variable name must look like one (`[A-Z_][A-Z0-9_]*`), so a key pasted into the field is refused before it is stored. The error never echoes the value.
|
||||
- `apiKeyStatus` is a real, read-only column filled by the post-query customizer: `Set • …abcd (from VAR)` (no characters for keys under 12) or `Not set`. Saves drop it, so it is always null in the database. (A virtual field cannot sit in a base section in QQQ 4.1, hence the column.)
|
||||
- Clients are cached by row settings and a SHA-256 of the key. Keys are never logged, and neither `toString` nor the errors contain one.
|
||||
|
||||
## Choosing the provider
|
||||
|
||||
`ProviderService.resolve(policyModel)`:
|
||||
1. The enabled row marked default (marking one default unmarks the others), else the first enabled row.
|
||||
2. With no enabled row, the provider registered in code (`withModelProvider`) and the policy's main model: hosts that never add a row keep working.
|
||||
3. A row that cannot be used (no key, a disallowed name or URL, an uninstalled type) makes the assistant report `NOT_CONFIGURED` rather than fall back silently.
|
||||
|
||||
The model is the row's, else the policy's main model. The rows and prices are cached for `policyCacheSeconds` and dropped on any change.
|
||||
|
||||
## Limits
|
||||
|
||||
- **Monthly cost cap (USD):** checked when a turn starts (429 `BUDGET`) and before each model call of a running turn, from the provider's `assistant_usage` cost since the 1st (UTC).
|
||||
- **Max output tokens per request:** lowers the request's `max_tokens`.
|
||||
- **Max concurrent requests:** a per-provider semaphore around each model call on this replica.
|
||||
|
||||
These sit next to the existing policy budgets (per user per day, per instance per month), which still apply.
|
||||
|
||||
## Test connection
|
||||
|
||||
A record action on `assistant_provider`, as a standard streamed ETL with Review and Result summary lines and no custom form.
|
||||
- **Review** lists the providers, the masked key status and every settings problem, without calling anything.
|
||||
- **Result** makes one call per provider: the prompt "Connection test. Reply with the single word OK.", at most 32 output tokens, effort low. It reports `connected to <model> in <n> ms`, or a hint, the kind, the HTTP status and the provider's own credential-free message.
|
||||
|
||||
The result goes on the row (`lastTest*`) and into `assistant_usage` (`TEST`), so a test's cost is counted like any other call.
|
||||
|
||||
## Cost
|
||||
|
||||
`cost = input × in + output × out + cacheRead × read + cacheWrite5m × w5 + cacheWrite1h × w1`, in micro-dollars, rounded up (`ModelPricing.costMicros`).
|
||||
|
||||
Prices come from the `assistant_model_price` row for (type, model). Empty cache prices are 0.1x, 1.25x and 2x the input price. A model without a row uses the `pricing` config map, else costs 0. A price change affects later calls only; each usage row keeps the cost it was recorded with.
|
||||
|
||||
## App home
|
||||
|
||||
One HTML widget (`assistantHome`) on the Assistant app. It is the only place this data is summarized: no other dashboard repeats it, and the developer panel stays per-record.
|
||||
|
||||
`AssistantHomeData` reads the tables as the viewing admin, at most `homeMaxRows` rows each, for the last 30 days (UTC) and the current month, and says when totals are partial. `AssistantHomeView` renders it in flow and grid layout only:
|
||||
- no tables, fixed widths or inner scroll areas
|
||||
- inherited text colors, so light and dark both work
|
||||
- a status row, one row per provider, then cards for usage by day, costs, users, tools and failures.
|
||||
|
||||
Every section has an empty state; nothing is invented.
|
||||
|
||||
The nav is the home plus the main tables: Providers, Conversations, Model prices, Policy. Messages, turns, tool calls, feedback and model calls are child lists on a conversation, and model calls also on a provider. Processes are actions on their tables.
|
||||
|
||||
## Strict tools (0.1.0-RC.5)
|
||||
|
||||
**Incident (kof22, 2026-10-13).** Every turn failed on its first model call with 400 `invalid_request_error`: "The compiled grammar is too large, which would cause performance issues. Simplify your tool schemas or reduce the number of strict tools."
|
||||
- The request sent all ten read tools with `strict: true`.
|
||||
- Anthropic compiles every strict schema in a request into one grammar.
|
||||
- The request was inside every documented limit: 20 strict tools, 24 optional parameters, 16 union parameters. The real limit is not published.
|
||||
- The log line only said `INVALID_REQUEST httpStatus=400`, so the reason was invisible.
|
||||
|
||||
**Decision.**
|
||||
- **No tool is strict by default.** `AssistantQBitConfig.strictToolNames` opts tools in.
|
||||
- Strict mode only guaranteed schema-valid input. The kernel already validates every input and returns `INVALID_INPUT` results, and the UI-API tools (below) go through the same validation as the UI.
|
||||
- If a provider still refuses strict schemas (`ModelProviderException.isStrictSchemaRejected`), the turn retries once with no strict tools and logs a WARN.
|
||||
|
||||
**Budget.**
|
||||
- `AnthropicRequestContractTest` fails the build when the strict tools of the default request exceed 3 tools, 6 optional parameters or 2 union parameters. These budgets are far below the shape that failed.
|
||||
- It also checks the documented request rules:
|
||||
- adaptive thinking without `budget_tokens`, and no sampling parameters;
|
||||
- a valid effort, and no forced `tool_choice`;
|
||||
- at most 4 cache breakpoints, with longer TTLs first;
|
||||
- a user-first, user-last message order;
|
||||
- strict-schema keywords.
|
||||
|
||||
**Real-API check (dev).** `ANTHROPIC_API_KEY=... ./mvnw verify -Dassistant.live=true -Dtest.excludedGroups= -Dgroups=live -Djacoco.skip=true -pl qbit-assistant-provider-anthropic -am` runs the live golden evals. They send exactly this request shape.
|
||||
|
||||
**Diagnostics.** On a 4xx the provider's error type, sanitized message and request id are:
|
||||
- logged at WARN;
|
||||
- recorded as the `assistant_usage` request id;
|
||||
- shown to `assistant.admin` holders, in the panel's error and in Test connection.
|
||||
|
||||
## Owner decisions (2026-10-13)
|
||||
|
||||
Owner: *"the agent should have to go through the same API that the UIUX does. that way it is held to the same security boundaries etc"*, plus the ability to configure the assistant and verify its security and data access.
|
||||
|
||||
1. **Tools via the UI API.** Every tool that reads or writes data, or runs a process, report or widget, runs a spec'd `/qqq/v1` operation with the calling user's own session. That means the UI's authentication, permission checks, record locks, validation, audit and error mapping. There are no direct core data actions and no elevated sessions.
|
||||
2. **Data access is configured and verifiable in the UI.**
|
||||
- Each table and process has an AI data access setting: NONE, READ or READ_WRITE. Sensitive tables default to NONE.
|
||||
- Admins can see what the assistant could do for a given user, and why.
|
||||
3. **Writes need confirmation.** A write tool only *proposes* the change, as a pending action card. Nothing changes until the user confirms in the panel, unless the policy turns confirmation off.
|
||||
4. **Persona and skills, never more access** (owner, 2026-10-13): *"in the config for the AI settings, we should be able to set a name and personality and extra skills etc for the agent - and again - the agent should be limited to only using our UIUX API and being able to only do the things that the currently logged in user could do with the same UIUX API via the UIUX"*.
|
||||
- **Profiles** (`assistant_profile`, admin-edited): display name, icon, personality (tone instructions, at most 2,000 characters), greeting and up to 6 starter prompts.
|
||||
- One profile is the default. Others are scoped to an app, to users holding a permission (a role), or to both. The most specific profile wins.
|
||||
- `/assistant/config` returns the profile for the panel header, the greeting and the starter prompts.
|
||||
- **Skills** (`assistant_skill`, linked to profiles through `assistant_profile_skill`): named Markdown instruction packs of at most 6,000 characters, with a description, an enabled flag, trigger keywords and apps.
|
||||
- A skill is read only when relevant: a keyword appears in the question, the user is in one of its apps, or it has neither, in which case it is always read.
|
||||
- All skills read for one question total at most 12,000 characters.
|
||||
- Profile and skill text goes into the per-user system block, framed as "tone and know-how only". The rules come first, and rule 10 says these can never override the rules or give other tools, data or permissions.
|
||||
- **Hard guarantee:**
|
||||
- Every data, process, report or widget capability is a `/qqq/v1` operation, called through the gateway (core `UiApiInvoker` once it is released) with the CURRENT user's session.
|
||||
- The tool list is the spec'd operations ∩ data access ∩ policy. Profiles and skills are never read when tools are built or run.
|
||||
- It is enforced by ArchUnit: the tool, UI API and access code may not use QQQ table, process, report, dashboard or async actions, the core AI kernel, or the profile and skill classes. It is also enforced by a runtime guard: `AssistantStore` refuses any table that is not `assistant_*`.
|
||||
- `UiApiToolsSecurityTest.testDenialMatrix` checks that a user without permission gets the identical status and message from the UI API and through the assistant for query, get, insert, update and delete. The assistant has no process or report tool, and process data access defaults to NONE.
|
||||
5. All other open questions in this section were decided as recommended (shared rule: "all recommendations accepted").
|
||||
|
||||
## Tools through the UI API (0.1.0-RC.6)
|
||||
|
||||
### Transport: loopback HTTP with the user's session
|
||||
|
||||
`UiApiGateway.invoke(UiApiCall)` makes an HTTP request to this server's own `/qqq/v1`, carrying the user's `sessionUUID` cookie and `X-QQQ-Invoked-By: assistant`.
|
||||
- Only operations defined by `MiddlewareVersionV1`'s endpoint specs can be called. Anything else, including the assistant's own raw routes, is refused before a request is made.
|
||||
- A call without a session is also refused.
|
||||
|
||||
**Why loopback rather than calling the spec handlers in process.** The spec's `buildInput(Context)`, session setup, the version's `preExecute`, Javalin filters, permission checks and error mapping all hang off the Javalin request pipeline.
|
||||
- Calling the executors directly would skip some of these and drift over time.
|
||||
- Building a synthetic Javalin `Context` relies on internal API.
|
||||
- A request to the server's own port runs the identical pipeline by construction. It costs one local hop, which is milliseconds next to a model call.
|
||||
|
||||
This matches core's design (`docs/UI-API-EXTENSIONS.md` §5, `UiApiInvoker`, QRun-IO/qqq#1128).
|
||||
- `LoopbackUiApiGateway` is the stand-in until a QQQ release has the invoker. Then an adapter over `UiApiInvoker.forServer(server)` replaces it (or a host injects one with `withUiApiGateway`), and nothing else changes.
|
||||
- The base URL is `uiApiBaseUrl` if configured. Otherwise it is `127.0.0.1` plus the local port the first assistant request arrived on, so in a multi-replica deployment the call stays on the replica that holds the session's process state.
|
||||
|
||||
### The tools
|
||||
|
||||
| tool | `/qqq/v1` operation |
|
||||
|---|---|
|
||||
| `list_tables` | `GET /metaData` (tables with the user's read/insert/edit/delete flags) |
|
||||
| `describe_table` | `GET /metaData/table/{tableName}` |
|
||||
| `query_records` | `POST /table/{tableName}/query` (plus `.../count` when there are more rows) |
|
||||
| `count_records` | `POST /table/{tableName}/count` |
|
||||
| `get_record` | `GET /table/{tableName}/{primaryKey}` |
|
||||
| `search_records` | `POST /search` |
|
||||
| `render_widget` | `POST /widget/{widgetName}` |
|
||||
| `get_record_history` | `GET /table/{tableName}/{primaryKey}`, then `POST /table/{tableName}/query` on `audit_table`, `audit` and `audit_detail` |
|
||||
| `create_record` / `update_record` / `delete_record` | `POST /table/{tableName}` / `PATCH /table/{tableName}/{primaryKey}` / `DELETE /table/{tableName}/{primaryKey}` |
|
||||
|
||||
`navigate` and `search_help` stay on the core kernel because they read no records:
|
||||
- `navigate` only builds an `/app` link, and the page enforces permissions when it opens.
|
||||
- `search_help` reads help text from metadata.
|
||||
|
||||
Running processes and reports through the assistant (`/processes/...`, `/reports/...`) is not offered yet. Process data access rows are stored so that the screens can already show and set them.
|
||||
|
||||
### Layers (each one can only narrow the one before)
|
||||
|
||||
1. **The user's own permissions and record locks**, enforced by the UI API itself. A user who cannot do something in the UI gets the identical status and message through the assistant: the tool result is `DENIED`/`NOT_FOUND`/`INVALID_INPUT` with `"<operation> answered HTTP <status>: <message>"`.
|
||||
2. **Data access** (`assistant_data_access`, editable by `assistant.admin`). A row sets NONE, READ or READ_WRITE per table (`TABLE`) or process (`PROCESS`). Without a row:
|
||||
- tables whose AI exposure is NONE (the `assistant_*` tables, sessions, OAuth, and any table whose metadata says so) are NONE, and a row cannot raise them;
|
||||
- other tables are READ, so the assistant never writes unless an admin allows it;
|
||||
- processes are NONE.
|
||||
The write tools are offered only when some table is READ_WRITE.
|
||||
3. **Policy** (`assistant_policy`):
|
||||
- `writesRequireConfirmation` (default true);
|
||||
- `allowedTools` (empty allows all);
|
||||
- `maxRowsPerCall` (default 50, ceiling 200);
|
||||
- `redactPii` (default true: secrets, card numbers and SSNs are redacted, with the core `AiRedactor`).
|
||||
4. **AI field exposure** from table metadata:
|
||||
- NONE and METADATA_ONLY values never reach the model;
|
||||
- MASKED values are masked;
|
||||
- only VALUES fields can be filtered or sorted on.
|
||||
|
||||
### Writes and confirmation
|
||||
|
||||
With confirmation on, a write tool validates the table's data access and the fields. It then inserts an `assistant_pending_action` row (owner-locked, `PENDING`, expiring after `pendingActionTtlSeconds`, default 15 minutes) and returns a `pending_action` render, which the panel shows as a card. The model is told the change is not done.
|
||||
- `POST /qqq/v1/assistant/actions/{id}/confirm` claims the action (`RUNNING`, so a double click cannot run it twice). It then runs the stored operation through the UI API **with the confirming request's session** and records the outcome as `EXECUTED` or `FAILED`.
|
||||
- `POST /qqq/v1/assistant/actions/{id}/reject` runs nothing.
|
||||
- `GET /qqq/v1/assistant/actions/{id}` reads the action's state.
|
||||
- Only the user who proposed an action can see or decide it.
|
||||
|
||||
### Tool-call log
|
||||
|
||||
Each `assistant_tool_call` row records:
|
||||
- the user and the tool;
|
||||
- the parameters, with secrets redacted;
|
||||
- the UI API operation and the HTTP status the UI would have seen;
|
||||
- the rows touched and the outcome;
|
||||
- the pending action, if there is one;
|
||||
- an in-app link to the written record, whose page shows its audit entries.
|
||||
|
||||
A confirmed write adds its own row. The rows are a child list on conversations, and pending actions are another one.
|
||||
|
||||
### Tests
|
||||
|
||||
`UiApiToolsSecurityTest` runs the fixture app on a real QQQ application server. For each case it makes the UI's own request (a direct `/qqq/v1` call with the user's cookie) next to the assistant's tool call:
|
||||
- read denied: the same 403 and message;
|
||||
- write denied without the insert permission, even with READ_WRITE and no confirmation;
|
||||
- data access only narrows: NONE, READ, and sensitive tables that cannot be raised;
|
||||
- a confirmed write runs once, through the UI API, and is logged;
|
||||
- only the owner can decide an action;
|
||||
- only spec'd operations can be called, and never without a session;
|
||||
- the policy narrows the tools and caps rows.
|
||||
|
||||
The golden and red-team evals now run through the UI API too.
|
||||
|
||||
## Explain access and recent denials (0.1.0-RC.6)
|
||||
|
||||
- **Explain access:**
|
||||
- `GET /qqq/v1/assistant/access?table=&prompt=` returns, for the calling user and each table (or only the named table, or only the tables a prompt mentions):
|
||||
- the user's UI permissions, from `GET /qqq/v1/metaData` with their own session;
|
||||
- the assistant's data access and where it comes from (setting, default, or sensitive table);
|
||||
- each tool's operation, with allowed or the reason it would be denied (policy, data access, not visible in the UI, or no read/insert/edit/delete permission).
|
||||
- The `assistantAccess` widget on the Assistant home renders the same thing for the viewing admin.
|
||||
- Choosing *another* user would need that user's permissions without their session. QQQ core has no API to evaluate another user's permissions, and the assistant never builds or borrows a session. That part waits for a core API, so the report is always computed with the requester's own session.
|
||||
- **Recent denials:** the home's "Recent denials" card lists the newest tool calls the UI API, data access or the policy refused, with who, the table, the operation and the HTTP status, or the assistant setting that refused it.
|
||||
|
||||
## Owner decisions (2026-10-13), continued: write mode, the hard wall, audit attribution, providers
|
||||
|
||||
These were added on the same day. All recommendations below are accepted; we adjust once they can be seen working.
|
||||
|
||||
### W. Write mode: the assistant is just a UI client
|
||||
Owner: *"the assistant should be able to go into 'write mode' too - with a user selection or preference? allowing it to do things like create and schedule a report for you, or update a record. it should ALWAYS only have access via the UIUX API (the assistant is just a UI) and all permissions that the user has via the UIUX should always hard apply at a layer above the assistant. All auditing needs to be aware of this too and audit accordingly"*
|
||||
|
||||
- **Mode per conversation.** A panel toggle switches between **Read-only** (the default) and **Write**.
|
||||
- The default comes from the user's preference (`assistant_user_preference.default_write_mode`).
|
||||
- An admin policy can disable write mode globally (`assistant_policy.write_mode_allowed`), per role (`write_mode_permission`: only holders may switch to Write), or per table or process (data access READ or NONE).
|
||||
- **Read-only:** the write tools are not in the tool list at all. This is decided when the request is built, not by the model.
|
||||
- **Write:** every write is still a pending-action card that the user confirms.
|
||||
- A user may set "auto-confirm low-risk writes" only when the policy allows it (`auto_confirm_allowed`).
|
||||
- Low-risk means a single-record insert or update on a table the admin marked `auto_confirm_ok`.
|
||||
- Deletes, bulk operations, processes, report schedules and notifications are never auto-confirmed.
|
||||
- **What counts as a write.** All of these are `/qqq/v1` UI API operations:
|
||||
- insert, update and delete records;
|
||||
- run a process (`/processes/{name}/init` and steps; every step is a confirmed action);
|
||||
- create, save or schedule a report or saved view (through the saved-report and scheduled-job tables' own insert operations);
|
||||
- create a notification.
|
||||
- **Enforcement is beneath the assistant.** The UI API and core permission layer decide, exactly as for Next UI. The assistant only forwards the user's credentials (`UiApiInvoker`, `UiApiCredentials`, qqq#1128).
|
||||
- The ArchUnit rule (no core actions from the tool code) and the denial matrix stay.
|
||||
- The matrix is extended to every write operation, in both modes.
|
||||
|
||||
### X. The hard wall between the assistant and its configuration
|
||||
Owner: *"there should also be a hard wall between the assistant and the configuration for the assistant. he should never be able to see his own configuration tables etc."*
|
||||
|
||||
AI exposure NONE is not enough, because the assistant acts as the user and an admin user can edit the configuration. The wall is enforced in core, beneath the assistant, by client channel (UI API 1.2.x, approved design):
|
||||
|
||||
- Every `/qqq/v1` request the assistant makes carries `X-QQQ-Client: assistant/<turnId>`. It is set server-side by `UiApiInvoker.forServer(server, "assistant")` and `withClientDetail(turnId)`, and the invoker drops any client-supplied value. Core stores it as `QSession.getClientChannel()`.
|
||||
- **Deny rules:**
|
||||
- `ClientChannelsMetaData.withDeniedPattern("assistant", "assistant_*")`, plus core's defaults: `authentik_*`, `audit*`, `*api_key*`, `*apiKey*`, `*credential*`, `*secret*` and `webhooks_*secret*`;
|
||||
- `QPermissionRules.withDeniedClients(Set.of("assistant"))` on every assistant process (retention, test connection) and widget.
|
||||
|
||||
The rules are enforced in `PermissionsHelper`: the object is left out of metadata, and calls get 403, failing closed.
|
||||
- The qbit registers **every** `assistant_*` table, process and widget in the deny set. A **startup check** fails the instance if any `assistant_*` object is not denied to the `assistant` channel.
|
||||
- Profiles and skills reach the model only as server-assembled instructions. No tool reads or edits them (this is already enforced by ArchUnit), so a prompt injection can never persist itself.
|
||||
- The current conversation's context is read by internal code (`AssistantStore`, assistant tables only), never by a tool.
|
||||
- **Tests:** an admin through the assistant is denied on every configuration table and process (403, and absent from `list_tables` and `/metaData`), while the same admin through Next UI is allowed.
|
||||
|
||||
### Y. Audit attribution
|
||||
- Every action records the human user as the actor **and** the client channel: `actor=james@kof22.com via=assistant/<turnId>`, versus `via=next-ui`.
|
||||
- Core writes `clientChannel` on `audit` (`AuditsMetaDataProvider.withClientChannelField(true)`, filled by `DMLAuditAction`), so audit screens can filter by channel.
|
||||
- `assistant_tool_call` keeps the turn, conversation and model, and links to the audit rows (`auditHref`), so `via=assistant/<turnId>` leads to the conversation, the turn and the model.
|
||||
- **Tests:** an assistant write produces audit rows with the human actor and `via=assistant/<turnId>`; the same write from the UI produces `via=next-ui`.
|
||||
- kof22 needs a feature-named changeset (`changesets/features/...`) for the audit column.
|
||||
|
||||
### P. Providers, local models, HIPAA routing, budgets
|
||||
1. **Providers and models as data, any number, each with an enabled toggle.**
|
||||
- Kinds:
|
||||
- Anthropic (exists);
|
||||
- **OpenAI-compatible**, one adapter for OpenAI, Azure OpenAI, OpenRouter, Ollama, LM Studio, vLLM and the llama.cpp server;
|
||||
- **AWS Bedrock** (Claude and others);
|
||||
- **Google Vertex** (Claude and Gemini).
|
||||
- `assistant_provider` gains: kind, base URL, key env reference (unchanged pattern, no stored secrets), local or cloud, `hipaa_eligible` and region.
|
||||
- The new **`assistant_model`** table holds: provider, model id, display name, capabilities (tools, context window, vision, streaming), price in and out per million tokens (0 or a configured compute cost for local models), and an enabled flag.
|
||||
- Test connection works for every provider and every model.
|
||||
- Tool calling follows each provider's rules. The strict-grammar lesson applies: strict only where supported, and a fallback when it is refused.
|
||||
2. **Local models** (Mac Studio, and the workstation "lora" with an RTX A5000 24 GB, running Ollama, LM Studio or vLLM; another agent sets up the hosts). Any OpenAI-compatible endpoint is supported, with health checks, model discovery (`GET /v1/models` fills `assistant_model`) and per-provider timeouts.
|
||||
3. **HIPAA/PHI routing:**
|
||||
- A data classification on tables and fields in metadata: PHI, PII, CONFIDENTIAL or PUBLIC.
|
||||
- Each turn tracks the highest classification its context and tool results touched.
|
||||
- The policy allows PHI only to `hipaa_eligible` providers (local, or cloud under a BAA). Otherwise it blocks, with a clear reason.
|
||||
- A per-instance **HIPAA mode** (on for MHP, off for kof22) also enforces:
|
||||
- PHI redaction in logs;
|
||||
- encrypted conversation storage;
|
||||
- a separate retention period;
|
||||
- a full audit (who, which classification, which model);
|
||||
- no non-eligible providers.
|
||||
- **BAAs are an owner and legal step**: the flag records a fact; it does not create one.
|
||||
4. **Budgets:**
|
||||
- daily and monthly cost and token budgets per user, group or role, provider or model, and instance;
|
||||
- default behaviour: warn at 80% (bell and alert, through the Alerts SPI when present), downgrade to a cheaper or local model at 100%, and stop at a configurable ceiling;
|
||||
- admins can override;
|
||||
- usage and cost over time on the app home, by user, model, provider and tool.
|
||||
5. **Extras:**
|
||||
- model routing (simple versus complex, per profile) and fallback chains across providers;
|
||||
- **RAG** over the instance's content: a local embedding model, pgvector, and retrieval filtered by permissions through the UI API as the user;
|
||||
- **scheduled assistant tasks**: recurring prompts that run as a designated user (with that user's stored credentials through the UI API, never a system session) and post results as notifications or records.
|
||||
6. Everything goes through the `/qqq/v1` UI API, as the user, with the guarantees above.
|
||||
|
||||
### P-a as built
|
||||
|
||||
- Per-provider `tlsCaBundle` references startup-parsed, transient server CA bundles. OpenAI-compatible chat, health and discovery trust JVM roots plus the bundle, retain hostname verification, and report sanitized NETWORK errors with a trust hint.
|
||||
- `assistant_provider` records kind, location, HIPAA eligibility, region, API
|
||||
version, timeouts and discovery status. `assistant_model` is its admin-only
|
||||
child list: enablement, capabilities, prices and test status, unique per provider/model.
|
||||
- `ProviderSettings`, discovery and health extend the provider SPI through default
|
||||
methods. Legacy `create(apiKey, baseUrl)` implementations keep working.
|
||||
- The OpenAI-compatible module uses JDK HTTP and Jackson, Chat Completions with
|
||||
SSE or single JSON replies, Azure deployment URLs and api-key auth, and keyless
|
||||
local endpoints. Keys and URL overrides pass the existing allowlists first.
|
||||
- Strict tools require explicit opt-in, OpenAI or Azure, and recursively strict
|
||||
object schemas. A strict/schema/grammar 400 signals the existing one-retry fallback.
|
||||
- Discovery only adds missing models; it preserves edits and disables catalogs
|
||||
larger than 20 for cloud providers. Health uses a short models request. Provider
|
||||
tests probe health then complete; model tests can probe a disabled model before
|
||||
enabling it. Completion tests record TEST usage.
|
||||
- Registry prices and capabilities override adapter/type defaults. Empty provider
|
||||
model selects the first enabled registry model; an explicitly disabled selection
|
||||
is a setup error. Rows without models retain the prior behavior.
|
||||
- Localhost contract tests cover dialects, fragmented parallel tool calls, usage,
|
||||
errors, timeouts, cancellation, discovery and a golden tool round trip. The live
|
||||
smoke is environment-driven and excluded by default.
|
||||
|
||||
### P-b as built
|
||||
|
||||
- Optional Bedrock and Vertex modules reuse the Anthropic mapping and streaming
|
||||
adapter through an injected SDK client. Bedrock retains SDK SigV4 and binary
|
||||
event-stream decoding; a small Backend delegate supplies allow-listed endpoints
|
||||
because SDK 2.71.0 has no Bedrock endpoint setter.
|
||||
- Bedrock uses the server's AWS default credential chain; IRSA/web-identity hosts
|
||||
supply STS on their runtime classpath. No STS or control-plane SDK is bundled.
|
||||
- Vertex uses scoped Google ADC. `claude-*` routes to the Anthropic backend; other
|
||||
ids route to the OpenAI-compatible endpoint with a per-request token supplier,
|
||||
`google/` for unprefixed ids, and no strict tools.
|
||||
- Both types require region, reject key references and default to CLOUD. Vertex
|
||||
additionally requires `cloudProject` (`cloud_project VARCHAR(100)`); it is part
|
||||
of resolved settings and the provider cache key. Type hooks own validation.
|
||||
- Discovery is a static catalog, health is unsupported, and Test connection uses
|
||||
the existing completion. HIPAA eligibility remains an admin fact, not a BAA.
|
||||
- Localhost contract tests cover wire paths, authentication, text/tools/usage,
|
||||
expired-token refresh, errors, allowlists and golden turns for all three routes.
|
||||
|
||||
### P-c as built
|
||||
|
||||
- The qbit classification enum is a stand-in for core #1142 until a released RC
|
||||
includes it. Configured table/field overrides are the default; hosts can supply
|
||||
a `ClassificationSource` over core metadata, mapping enum names, then replace
|
||||
the stand-in when the minimum QQQ version advances.
|
||||
- Turn/page/tool classification is monotonic, persisted on the turn and retained
|
||||
on the conversation. Field subsets use overrides; unknown cross-table results
|
||||
conservatively use the highest configured level. Metadata tools stay PUBLIC.
|
||||
- Small engine hooks check a fresh provider row before every model dispatch,
|
||||
including strict retries. PHI requires explicit row eligibility; HIPAA mode
|
||||
requires it for all calls. Blocks withhold results, explain the rule without
|
||||
values, and write an audit. `ProviderService.eligibleAlternative` is an empty
|
||||
seam for P-e; P-c never changes providers automatically.
|
||||
- HIPAA mode refuses non-eligible settings/selection and requires a valid key
|
||||
reference at startup. AssistantStore alone encrypts/decrypts conversation
|
||||
payloads using AES-256-GCM; legacy plaintext reads remain supported and corrupt
|
||||
ciphertext fails closed. No key is persisted. Provider diagnostic text is
|
||||
suppressed in HIPAA logs and turn errors.
|
||||
- Admin read-only, owner-locked `assistant_data_audit` records each PII/PHI model
|
||||
dispatch and each block, outside navigation. PHI conversation retention defaults
|
||||
to 2190 days in either mode; shorter tool-result/replay cleanup is unchanged.
|
||||
The app home shows HIPAA mode and PHI retention.
|
||||
|
||||
### P-d as built
|
||||
|
||||
- ROLE allowances are per permission holder. Shared scopes sum a private immutable
|
||||
accounting projection of usage counters; owner-locked source rows stay locked.
|
||||
Migration backfills existing usage before writes resume. No sessions are elevated.
|
||||
|
||||
- Standard admin budget rows add daily/monthly cost or token allowances above the
|
||||
existing config/policy budgets and provider monthly caps. Overrides carry a
|
||||
reason, session grantor and expiry; they never waive the other limit layers.
|
||||
- Start-turn checks use the existing 429 BUDGET path through PolicyService.
|
||||
Every dispatch, including strict retries, evaluates current usage and overrides.
|
||||
Events deduplicate WARNED, DOWNGRADED and STOPPED.
|
||||
- QQQ RC.5 core QAlerts sends budget signals alongside panel notices, with three
|
||||
admin-visible alert types and a default logging sink. Resolution awaits active
|
||||
alert/recurrence tracking so overrides cannot clear shared alerts incorrectly.
|
||||
- Explicit registry model selection leaves provider defaults untouched. Automatic
|
||||
downgrades prefer LOCAL, then price. PHI eligibility and destination provider caps
|
||||
still apply; a missing eligible target stops the turn.
|
||||
- The home owns the budget cards and 30-day cost/token bars, with user, model,
|
||||
provider and tool breakdowns, inherited colors and empty states.
|
||||
|
||||
### P-e as built
|
||||
|
||||
- Profiles select OFF (the migration default), HEURISTIC or CLASSIFIER and optional
|
||||
simple/complex/classifier registry models. Selection uses ProfileService's existing
|
||||
specificity. Without a profile, enabled escalation config supplies the complex
|
||||
model and effort. Empty slots retain provider row/default/policy selection.
|
||||
- The documented heuristic is a pure rule table: >600 characters, two distinct app
|
||||
table names, complexity keywords, pending write context, >8 previous turns or a
|
||||
previous tool limit. This branch has no conversation write-mode field.
|
||||
- Classifier transport is non-streaming, bounded to four output tokens/three seconds,
|
||||
and contains only the fixed instruction and user question. PHI guards apply before
|
||||
dispatch. Errors/unexpected replies use the heuristic. ROUTE usage enters budget
|
||||
accounting; normal dispatch budgets may override the selected route.
|
||||
- FallbackChain follows at most four edges on retryable failures, only before any
|
||||
text/tool start of that call. Candidates are checked for enablement, health,
|
||||
PHI/HIPAA eligibility and budgets. Without explicit links only the same LOCAL
|
||||
adapter family is considered. Provider switches rebuild neutral messages and
|
||||
discard providerState; failed attempts remain visible in usage.
|
||||
- ProviderHealth persists UP/DOWN, checked-at and a 60-second connection-failure
|
||||
circuit. Local stale/unknown health uses a bounded two-second probe. Successful
|
||||
completions close the breaker. Turn rows persist route/source, fallback count and
|
||||
final provider/model; notices name only the unavailable and answering providers.
|
||||
- Admin record screens, additive Postgres DDL and the flow-layout home expose these
|
||||
settings and counters without granting AI access to assistant configuration.
|
||||
|
||||
### Phases (each a green PR)
|
||||
| | Scope | Depends on |
|
||||
|---|---|---|
|
||||
| d | Spec'd `/assistant` endpoints, tools on `UiApiInvoker` (#19) | QQQ RC.6 |
|
||||
| W1 | Write mode: conversation toggle, user preference, policy (global, role, table), tool list by mode, auto-confirm rules, write matrix in both modes; Next toggle | — |
|
||||
| X1 | Client channel `assistant/<turnId>` on every call, deny registration for all `assistant_*` objects and the security surfaces, startup check, admin-denied tests | core client-channel PR (UI API 1.2.x) |
|
||||
| Y1 | Audit attribution tests and `auditHref` to audit rows filtered by channel | core audit column |
|
||||
| W2 | Process, report-schedule, saved-view and notification writes as confirmed UI API operations | W1, X1 |
|
||||
| P-a | Provider and model registry, OpenAI-compatible adapter, discovery and health | — |
|
||||
| P-b | Bedrock and Vertex | P-a |
|
||||
| P-c | Classification, HIPAA routing and mode | P-a, core metadata |
|
||||
| P-d | Budgets and dashboards | P-a |
|
||||
| P-e | Routing and fallback chains | P-a |
|
||||
| P-f | RAG (embeddings, pgvector, UI-API-filtered retrieval) | P-a |
|
||||
| P-g | Scheduled assistant tasks | W1, X1 |
|
||||
|
||||
|
||||
## Next phases
|
||||
|
||||
- **(c) Data access screens:**
|
||||
- the Data Access table, in the nav;
|
||||
- an "Explain access" action (for a user, and a table or a prompt, which operations the assistant could call and which it would be denied, with the reason);
|
||||
- a recent-denials widget on the app home.
|
||||
- **(d) Spec'd assistant endpoints:** move `/qqq/v1/assistant/...` (conversations, turns, events, feedback, cancel, config, actions) onto `AbstractEndpointSpec`s through the qbit spec extension point (`MiddlewareSpecExtension`, established prefix `/assistant`, QRun-IO/qqq#1128). The SSE turn and events streams stay raw routes until the spec layer can describe a stream.
|
||||
|
||||
## Answer presentation (owner priority 2026-10-13)
|
||||
|
||||
`present_results` is always offered and reads no records. It takes a direct answer,
|
||||
metrics, a table, an optional table-derived chart, filtered list links, record links
|
||||
and next-step actions. The server validates metadata and the user's UI API table
|
||||
visibility once per turn, formats values using QQQ field types/display formats,
|
||||
computes percentages and builds every `/app` href. Unknown or denied items are
|
||||
dropped with an explanation. The assistant must still retrieve every fact through
|
||||
data tools before presenting it.
|
||||
|
||||
The [presentation part and SSE contract](answer-presentation.md) defines `summary`,
|
||||
`blocks` and the complete server-built GFM `markdown` fallback. Each successful
|
||||
call emits `presentation` with `{messageId, part}` and persists that part; the tool
|
||||
response tells the model not to repeat its tables or links. Audit rows contain
|
||||
only accepted presentation data. Normal record-data retention removes these parts.
|
||||
|
||||
The built-in Presentation skill is compact static prompt text in the cached rules
|
||||
block. It asks for a one-sentence answer first, metrics for single numbers, tables
|
||||
for breakdowns/comparisons, charts for useful shares/trends and actual filter links
|
||||
whenever offering a list. Administrator profile skills append after it as before
|
||||
and extend it; there is no replacement boolean or extra permission surface.
|
||||
|
||||
The owner's one-line table was a frontend parsing defect: Next's `AssistantMarkdown`
|
||||
used react-markdown without `remark-gfm`, so table lines became a paragraph.
|
||||
The renderer fix belongs to `qqq-frontend-next`; this worktree preserves real
|
||||
newlines and provides structured blocks plus a proper multi-line GFM fallback.
|
||||
The frontend change is maintained separately and is not verified by this build.
|
||||
|
||||
The shared golden task asks "How many images do I have by type?": five UI count
|
||||
calls establish 81 JPEG, 20 PNG and zero other configured types, then a presentation
|
||||
with two rows, 80.2%/19.8% shares, two pie points and working MIME filter links.
|
||||
The same task is included in the opt-in `live` Anthropic eval suite.
|
||||
@@ -0,0 +1,56 @@
|
||||
# Assistant answer presentation contract (v1)
|
||||
|
||||
Owner priority (2026-10-13): answers must ALWAYS be easy to read and act on. Bad example the owner saw, rendered on ONE line:
|
||||
"| Type | Count | |---|---| | JPEG (image/jpeg) | 81 | | PNG (image/png) | 20 | | WebP, GIF, SVG | 0 |" followed by "You can open the lists filtered by JPEG or PNG" with NO links.
|
||||
|
||||
Root cause found in Next: `AssistantMarkdown` uses react-markdown WITHOUT `remark-gfm`, so GFM tables are not parsed and the table's lines collapse into one paragraph (soft line breaks). Backend streaming preserves `\n` (events are JSON).
|
||||
|
||||
## New message part: `presentation`
|
||||
|
||||
An assistant message's `parts` (persisted in `assistant_message.parts_json`, streamed as an SSE event, returned by the conversation API) may contain, besides `text`, `notice`, `tool`/`render` parts etc., ONE part per `present_results` call:
|
||||
|
||||
```json
|
||||
{
|
||||
"type": "presentation",
|
||||
"summary": "101 media files are images: 81 JPEG and 20 PNG.",
|
||||
"markdown": "<server-built GFM fallback of the whole presentation, for clients that do not render blocks (CLI/TUI)>",
|
||||
"blocks": [
|
||||
{ "kind": "metrics", "items": [ { "label": "Images", "value": 101, "display": "101", "href": "/app/media?filter=..." } ] },
|
||||
{ "kind": "table", "title": "Media by type",
|
||||
"columns": [ { "key": "type", "label": "Type", "align": "left" },
|
||||
{ "key": "count", "label": "Count", "align": "right" },
|
||||
{ "key": "share", "label": "Share", "align": "right" } ],
|
||||
"rows": [ { "cells": { "type": "JPEG (image/jpeg)", "count": 81, "share": 0.802 },
|
||||
"display": { "type": "JPEG (image/jpeg)", "count": "81", "share": "80.2%" },
|
||||
"href": "/app/media?filter=..." } ] },
|
||||
{ "kind": "chart", "chartType": "pie", "title": "Share by type",
|
||||
"points": [ { "label": "JPEG", "value": 81, "display": "81", "href": "/app/media?filter=..." },
|
||||
{ "label": "PNG", "value": 20, "display": "20", "href": "/app/media?filter=..." } ] },
|
||||
{ "kind": "filterLinks", "items": [ { "label": "Open JPEG media (81)", "tableName": "media", "href": "/app/media?filter=..." } ] },
|
||||
{ "kind": "recordLinks", "items": [ { "label": "Sunset.jpg", "tableName": "media", "recordId": "12", "href": "/app/media/12" } ] },
|
||||
{ "kind": "actions", "items": [ { "label": "Show the PNG files", "prompt": "Show me the PNG media files" },
|
||||
{ "label": "Open media", "href": "/app/media" } ] }
|
||||
]
|
||||
}
|
||||
```
|
||||
|
||||
Rules:
|
||||
- `summary` is required, one sentence, the direct answer first.
|
||||
- `chartType` ∈ `bar`, `pie`, `line`; ≤ 12 points; values are numbers.
|
||||
- Every `href` is built SERVER-SIDE from metadata and is an `/app` path (same rules as `TurnEngine.isAppHref`). Filtered list links are `/app/<tableName>?filter=<URL-encoded JSON {"criteria":[{"fieldName":..,"operator":..,"values":[..]}],"booleanOperator":"AND"}>`, which Next's `deserializeFilter` accepts (JSON starting with `{`). The model never writes URLs.
|
||||
- `display` strings are formatted server-side from field metadata (`displayFormat`, e.g. `%,d`, `$%,.2f`; percent columns as `80.2%`); clients show `display` when present, else the raw value.
|
||||
- `actions` items have either `prompt` (send as the user's next message) or `href` (navigate), never both.
|
||||
- Unknown `kind`s must be ignored by clients (forward compatible); clients that do not render blocks render `markdown`.
|
||||
- The SSE event is `presentation` with `{ "messageId": <id>, "part": <the part above> }`; Next's reducer appends it to the assistant message's parts.
|
||||
|
||||
## Tool input and implementation
|
||||
|
||||
The input schema is [present-results.schema.json](../qbit-assistant/src/main/resources/present-results.schema.json). `table.rowKeys` supplies one raw filter value per row; `table.rowFilter` names the table, field and optional operator (EQUALS by default). Columns receive stable server keys `c0`, `c1`, etc. Input cells remain raw scalars; each row has a parallel display map. The example keys above are illustrative.
|
||||
|
||||
`PresentResultsTool` is instantiated per turn. It caches `GET /metaData` with that turn's session, checks table read visibility and instance fields, validates QQQ criteria operators and builds paths using RC.5 `AiLinkBuilder`. Filter links use URL-encoded JSON accepted by Next. Record ids are encoded as opaque path segments. Metadata denial or invalid item drops that item (an invalid table drops its table/chart), with a short explanation to the model; other items survive. No data query or permission elevation happens here.
|
||||
|
||||
Limits: summary 300 characters, display text 2,000 characters, table 20 columns/200 rows, chart 12 points, item lists 100 entries, filters 20 criteria/200 values. Chart truncation is reported to the model. Percent columns reference a raw numeric column; a zero total yields 0.0%. Numbers still must originate in earlier data tool results; presentation is formatting, not a new source of facts.
|
||||
|
||||
The schema uses small named, nonrecursive definitions to avoid deeply inlined structures. Each object component is at most two levels of inline containers; the resolved table/criteria structure necessarily has the nesting shown in the owner contract. Strict is off by default. Opting `present_results` into strict mode requires all properties (empty arrays/strings, empty table and -1 for unused percentage indexes), removes provider-unsupported length constraints, and retains server validation. This has zero optional parameters and one shared scalar union in the existing strict-budget test.
|
||||
|
||||
Presentation parts are persisted with the assistant message and replayed as `presentation` events with `{messageId, part}` (plus the standard event sequence). They are removed by record-data retention along with tool renders. Model history and text-only consumers can use the server-built Markdown. Unknown block kinds should be ignored. Plain labels must be rendered as text, never parsed as links or HTML; fallback Markdown escapes them. Tool audit input records the accepted presentation only, excluding dropped values.
|
||||
@@ -6,7 +6,8 @@ CREATE TABLE assistant_conversation
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
user_id VARCHAR(255),
|
||||
title VARCHAR(255),
|
||||
title TEXT,
|
||||
max_classification VARCHAR(16),
|
||||
status VARCHAR(16),
|
||||
pinned BOOLEAN,
|
||||
last_message_at TIMESTAMP WITH TIME ZONE,
|
||||
@@ -30,7 +31,7 @@ CREATE TABLE assistant_message
|
||||
status VARCHAR(16),
|
||||
turn_id INTEGER,
|
||||
seq INTEGER,
|
||||
model VARCHAR(64),
|
||||
model VARCHAR(200),
|
||||
parts_json TEXT,
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE
|
||||
@@ -46,10 +47,12 @@ CREATE TABLE assistant_turn
|
||||
user_message_id INTEGER,
|
||||
assistant_message_id INTEGER,
|
||||
status VARCHAR(16),
|
||||
classification VARCHAR(16),
|
||||
classification_tables VARCHAR(500),
|
||||
stop_reason VARCHAR(64),
|
||||
error_code VARCHAR(32),
|
||||
cancel_reason VARCHAR(64),
|
||||
model VARCHAR(64),
|
||||
model VARCHAR(200),
|
||||
started_at TIMESTAMP WITH TIME ZONE,
|
||||
ended_at TIMESTAMP WITH TIME ZONE,
|
||||
tool_call_count INTEGER,
|
||||
@@ -95,9 +98,13 @@ CREATE TABLE assistant_tool_call
|
||||
widget_name VARCHAR(128),
|
||||
row_count INTEGER,
|
||||
duration_ms BIGINT,
|
||||
result_summary VARCHAR(500),
|
||||
result_summary TEXT,
|
||||
result_json TEXT,
|
||||
redactions_json TEXT,
|
||||
ui_api_operation VARCHAR(255),
|
||||
http_status INTEGER,
|
||||
audit_href VARCHAR(500),
|
||||
pending_action_id INTEGER,
|
||||
create_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
CREATE INDEX assistant_tool_call_user_id ON assistant_tool_call (user_id);
|
||||
@@ -134,6 +141,10 @@ CREATE TABLE assistant_policy
|
||||
instance_monthly_tokens_hard BIGINT,
|
||||
instance_monthly_cost_micros_soft BIGINT,
|
||||
instance_monthly_cost_micros_hard BIGINT,
|
||||
writes_require_confirmation BOOLEAN,
|
||||
allowed_tools VARCHAR(1000),
|
||||
max_rows_per_call INTEGER,
|
||||
redact_pii BOOLEAN,
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
@@ -155,3 +166,314 @@ CREATE TABLE assistant_usage_daily
|
||||
);
|
||||
CREATE INDEX assistant_usage_daily_user_id ON assistant_usage_daily (user_id);
|
||||
CREATE INDEX assistant_usage_daily_date ON assistant_usage_daily (usage_date, scope);
|
||||
|
||||
-- 0.1.0-RC.4: provider settings, model prices and per-call usage.
|
||||
-- api_key_status is filled when a row is read (never written); the API key itself
|
||||
-- is never stored: api_key_env_name holds only the NAME of an environment variable.
|
||||
|
||||
CREATE TABLE assistant_provider
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(100) NOT NULL UNIQUE,
|
||||
provider_type VARCHAR(50) NOT NULL,
|
||||
kind VARCHAR(30),
|
||||
location VARCHAR(10),
|
||||
hipaa_eligible BOOLEAN DEFAULT FALSE,
|
||||
region VARCHAR(50),
|
||||
cloud_project VARCHAR(100),
|
||||
api_version VARCHAR(30),
|
||||
connect_timeout_seconds INTEGER DEFAULT 10 CHECK (connect_timeout_seconds BETWEEN 1 AND 600),
|
||||
request_timeout_seconds INTEGER DEFAULT 120 CHECK (request_timeout_seconds BETWEEN 1 AND 600),
|
||||
last_discovery_at TIMESTAMP WITH TIME ZONE,
|
||||
last_discovery_status VARCHAR(16),
|
||||
last_discovery_error VARCHAR(500),
|
||||
model VARCHAR(200),
|
||||
enabled BOOLEAN,
|
||||
is_default BOOLEAN,
|
||||
base_url VARCHAR(255),
|
||||
tls_ca_bundle VARCHAR(100),
|
||||
api_key_env_name VARCHAR(100),
|
||||
api_key_status VARCHAR(200),
|
||||
monthly_cost_cap_usd NUMERIC(12, 2),
|
||||
max_output_tokens_per_request INTEGER,
|
||||
max_concurrent_requests INTEGER,
|
||||
last_test_at TIMESTAMP WITH TIME ZONE,
|
||||
last_test_status VARCHAR(16),
|
||||
last_test_latency_ms INTEGER,
|
||||
last_test_model VARCHAR(200),
|
||||
last_test_error VARCHAR(500),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
|
||||
CREATE TABLE assistant_model
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
provider_id INTEGER NOT NULL REFERENCES assistant_provider(id),
|
||||
model_id VARCHAR(200) NOT NULL,
|
||||
display_name VARCHAR(200),
|
||||
enabled BOOLEAN,
|
||||
supports_tools BOOLEAN,
|
||||
supports_vision BOOLEAN,
|
||||
supports_streaming BOOLEAN,
|
||||
supports_reasoning_effort BOOLEAN,
|
||||
context_window_tokens INTEGER,
|
||||
max_output_tokens INTEGER,
|
||||
input_usd_per_m_tok NUMERIC(12, 4),
|
||||
output_usd_per_m_tok NUMERIC(12, 4),
|
||||
source VARCHAR(16),
|
||||
discovered_at TIMESTAMP WITH TIME ZONE,
|
||||
last_test_at TIMESTAMP WITH TIME ZONE,
|
||||
last_test_status VARCHAR(16),
|
||||
last_test_latency_ms INTEGER,
|
||||
last_test_error VARCHAR(500),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE,
|
||||
UNIQUE (provider_id, model_id)
|
||||
);
|
||||
|
||||
CREATE TABLE assistant_model_price
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
provider_type VARCHAR(50) NOT NULL,
|
||||
model VARCHAR(100) NOT NULL,
|
||||
input_usd_per_m_tok NUMERIC(12, 4) NOT NULL,
|
||||
output_usd_per_m_tok NUMERIC(12, 4) NOT NULL,
|
||||
cache_read_usd_per_m_tok NUMERIC(12, 4),
|
||||
cache_write5m_usd_per_m_tok NUMERIC(12, 4),
|
||||
cache_write1h_usd_per_m_tok NUMERIC(12, 4),
|
||||
notes VARCHAR(255),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE,
|
||||
UNIQUE (provider_type, model)
|
||||
);
|
||||
|
||||
CREATE TABLE assistant_usage
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
user_id VARCHAR(255),
|
||||
conversation_id INTEGER,
|
||||
turn_id INTEGER,
|
||||
provider_id INTEGER,
|
||||
provider_type VARCHAR(50),
|
||||
model VARCHAR(200),
|
||||
purpose VARCHAR(16),
|
||||
status VARCHAR(16),
|
||||
error_kind VARCHAR(32),
|
||||
http_status INTEGER,
|
||||
latency_ms INTEGER,
|
||||
input_tokens BIGINT,
|
||||
output_tokens BIGINT,
|
||||
cache_read_tokens BIGINT,
|
||||
cache_write_tokens BIGINT,
|
||||
cost_micros BIGINT,
|
||||
request_id VARCHAR(100),
|
||||
create_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
CREATE INDEX assistant_usage_create_date ON assistant_usage (create_date);
|
||||
CREATE INDEX assistant_usage_provider ON assistant_usage (provider_id, create_date);
|
||||
CREATE INDEX assistant_usage_conversation ON assistant_usage (conversation_id);
|
||||
CREATE INDEX assistant_usage_user_id ON assistant_usage (user_id);
|
||||
|
||||
-- Anthropic list prices, USD per million tokens (cached 2026-10-06). Cache writes:
|
||||
-- 1.25x input (5 minute) and 2x input (1 hour). Re-check before budgeting.
|
||||
INSERT INTO assistant_model_price (provider_type, model, input_usd_per_m_tok, output_usd_per_m_tok, cache_read_usd_per_m_tok, cache_write5m_usd_per_m_tok, cache_write1h_usd_per_m_tok, notes, create_date, modify_date)
|
||||
VALUES
|
||||
('anthropic', 'claude-sonnet-5-5', 2.00, 10.00, 0.20, 2.50, 4.00, 'Anthropic list price, 2026-10', NOW(), NOW()),
|
||||
('anthropic', 'claude-opus-5-5', 4.00, 20.00, 0.20, 5.00, 8.00, 'Anthropic list price, 2026-10', NOW(), NOW()),
|
||||
('anthropic', 'claude-haiku-5-5', 0.10, 0.50, 0.01, 0.125, 0.20, 'Anthropic list price, 2026-10 (prompts up to 100K tokens)', NOW(), NOW()),
|
||||
('anthropic', 'claude-fable-5-1', 10.00, 50.00, 0.25, 12.50, 20.00, 'Anthropic list price, 2026-10', NOW(), NOW()),
|
||||
('anthropic', 'claude-opus-5', 5.00, 25.00, 0.50, 6.25, 10.00, 'Anthropic list price, 2026-10', NOW(), NOW()),
|
||||
('anthropic', 'claude-sonnet-5', 2.00, 10.00, 0.20, 2.50, 4.00, 'Anthropic list price, 2026-10', NOW(), NOW()),
|
||||
('anthropic', 'claude-opus-4-8', 5.00, 25.00, 0.50, 6.25, 10.00, 'Anthropic list price, 2026-10', NOW(), NOW()),
|
||||
('anthropic', 'claude-sonnet-4-6', 3.00, 15.00, 0.30, 3.75, 6.00, 'Anthropic list price, 2026-10', NOW(), NOW()),
|
||||
('anthropic', 'claude-haiku-4-5', 1.00, 5.00, 0.10, 1.25, 2.00, 'Anthropic list price, 2026-10', NOW(), NOW());
|
||||
|
||||
-- 0.1.0-RC.6: the assistant's data access per table / process, and writes waiting
|
||||
-- for the user's confirmation. Existing databases: add the tool-call and policy
|
||||
-- columns above with ALTER TABLE ... ADD COLUMN IF NOT EXISTS.
|
||||
CREATE TABLE assistant_data_access
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
object_type VARCHAR(16) NOT NULL,
|
||||
object_name VARCHAR(128) NOT NULL,
|
||||
mode VARCHAR(16) NOT NULL,
|
||||
notes VARCHAR(500),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE,
|
||||
CONSTRAINT assistant_data_access_object UNIQUE (object_type, object_name)
|
||||
);
|
||||
|
||||
CREATE TABLE assistant_pending_action
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
conversation_id INTEGER,
|
||||
turn_id INTEGER,
|
||||
user_id VARCHAR(255),
|
||||
tool_call_id VARCHAR(128),
|
||||
tool_name VARCHAR(64),
|
||||
ui_api_operation VARCHAR(255),
|
||||
table_name VARCHAR(128),
|
||||
record_id VARCHAR(128),
|
||||
params_json TEXT,
|
||||
summary TEXT,
|
||||
status VARCHAR(16),
|
||||
http_status INTEGER,
|
||||
result_summary TEXT,
|
||||
expires_at TIMESTAMP WITH TIME ZONE,
|
||||
decided_at TIMESTAMP WITH TIME ZONE,
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
CREATE INDEX assistant_pending_action_user_id ON assistant_pending_action (user_id);
|
||||
CREATE INDEX assistant_pending_action_conversation_id ON assistant_pending_action (conversation_id);
|
||||
|
||||
-- 0.1.0-RC.6: profiles (persona) and skills. Text the model reads; never tools or access.
|
||||
CREATE TABLE assistant_profile
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(64) NOT NULL UNIQUE,
|
||||
display_name VARCHAR(64) NOT NULL,
|
||||
icon VARCHAR(64),
|
||||
personality TEXT,
|
||||
greeting VARCHAR(500),
|
||||
starter_prompts TEXT,
|
||||
is_default BOOLEAN,
|
||||
enabled BOOLEAN,
|
||||
app_name VARCHAR(128),
|
||||
permission_name VARCHAR(128),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
|
||||
CREATE TABLE assistant_skill
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(64) NOT NULL UNIQUE,
|
||||
description VARCHAR(500),
|
||||
instructions TEXT NOT NULL,
|
||||
enabled BOOLEAN,
|
||||
trigger_keywords VARCHAR(500),
|
||||
app_names VARCHAR(500),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
|
||||
CREATE TABLE assistant_profile_skill
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
profile_id INTEGER NOT NULL,
|
||||
skill_id INTEGER NOT NULL,
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE,
|
||||
CONSTRAINT assistant_profile_skill_pair UNIQUE (profile_id, skill_id)
|
||||
);
|
||||
|
||||
CREATE TABLE assistant_data_audit
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
user_id VARCHAR(255),
|
||||
conversation_id INTEGER,
|
||||
turn_id INTEGER,
|
||||
provider_id INTEGER,
|
||||
provider_name VARCHAR(200),
|
||||
model VARCHAR(200),
|
||||
hipaa_eligible BOOLEAN,
|
||||
classification VARCHAR(16),
|
||||
tables VARCHAR(500),
|
||||
decision VARCHAR(16),
|
||||
reason VARCHAR(1000),
|
||||
create_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
CREATE INDEX assistant_data_audit_user_id ON assistant_data_audit (user_id);
|
||||
CREATE INDEX assistant_data_audit_conversation_id ON assistant_data_audit (conversation_id);
|
||||
CREATE INDEX assistant_data_audit_turn_id ON assistant_data_audit (turn_id);
|
||||
|
||||
-- P-d: data-driven budgets (UTC periods, USD or whole-token allowances).
|
||||
CREATE TABLE assistant_budget
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(200) NOT NULL,
|
||||
enabled BOOLEAN DEFAULT TRUE,
|
||||
scope_type VARCHAR(16) NOT NULL,
|
||||
scope_value VARCHAR(200),
|
||||
period VARCHAR(16) NOT NULL,
|
||||
metric VARCHAR(16) NOT NULL,
|
||||
limit_value NUMERIC NOT NULL CHECK (limit_value > 0),
|
||||
warn_percent INTEGER DEFAULT 80 CHECK (warn_percent >= 0 AND warn_percent < 100),
|
||||
at_limit_action VARCHAR(16) DEFAULT 'DOWNGRADE',
|
||||
downgrade_model_id INTEGER REFERENCES assistant_model(id),
|
||||
hard_ceiling_percent INTEGER DEFAULT 120 CHECK (hard_ceiling_percent >= 100),
|
||||
notes VARCHAR(2000),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE
|
||||
);
|
||||
CREATE TABLE assistant_budget_override
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
budget_id INTEGER NOT NULL REFERENCES assistant_budget(id),
|
||||
scope_value VARCHAR(200),
|
||||
extra_value NUMERIC,
|
||||
unlimited_until TIMESTAMP WITH TIME ZONE,
|
||||
reason VARCHAR(1000) NOT NULL,
|
||||
granted_by VARCHAR(200),
|
||||
expires_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
modify_date TIMESTAMP WITH TIME ZONE,
|
||||
CHECK ((extra_value > 0 AND unlimited_until IS NULL) OR (extra_value IS NULL AND unlimited_until IS NOT NULL))
|
||||
);
|
||||
CREATE INDEX assistant_budget_override_budget_id ON assistant_budget_override(budget_id);
|
||||
CREATE TABLE assistant_budget_event
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
budget_id INTEGER NOT NULL REFERENCES assistant_budget(id),
|
||||
scope_key VARCHAR(400) NOT NULL,
|
||||
period_start TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
state VARCHAR(16) NOT NULL,
|
||||
used_value NUMERIC,
|
||||
limit_value NUMERIC,
|
||||
user_id VARCHAR(200),
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
UNIQUE (budget_id, scope_key, period_start, state)
|
||||
);
|
||||
CREATE INDEX assistant_usage_budget_period ON assistant_usage(create_date, user_id, provider_id, model);
|
||||
|
||||
-- Private projection: standard admin permissions, AI NONE, no owner lock.
|
||||
-- No conversation identifiers, text, request ids or credentials are copied.
|
||||
CREATE TABLE assistant_budget_usage
|
||||
(
|
||||
id SERIAL PRIMARY KEY,
|
||||
usage_id INTEGER NOT NULL UNIQUE,
|
||||
user_id VARCHAR(255),
|
||||
provider_id INTEGER,
|
||||
model VARCHAR(200),
|
||||
occurred_at TIMESTAMP WITH TIME ZONE NOT NULL,
|
||||
cost_micros BIGINT,
|
||||
input_tokens BIGINT,
|
||||
output_tokens BIGINT,
|
||||
cache_read_tokens BIGINT,
|
||||
cache_write_tokens BIGINT
|
||||
);
|
||||
CREATE INDEX assistant_budget_usage_period ON assistant_budget_usage(occurred_at, provider_id, model);
|
||||
-- Run once before enabling P-d, with writes paused, to include existing usage.
|
||||
INSERT INTO assistant_budget_usage
|
||||
(usage_id, user_id, provider_id, model, occurred_at, cost_micros, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens)
|
||||
SELECT id, user_id, provider_id, model, create_date, cost_micros, input_tokens, output_tokens, cache_read_tokens, cache_write_tokens
|
||||
FROM assistant_usage
|
||||
ON CONFLICT (usage_id) DO NOTHING;
|
||||
|
||||
|
||||
-- P-e: profile routing, bounded fallback chains, provider health and turn outcome.
|
||||
ALTER TABLE assistant_profile ADD COLUMN routing_mode VARCHAR(16) DEFAULT 'OFF'
|
||||
CHECK (routing_mode IN ('OFF', 'HEURISTIC', 'CLASSIFIER'));
|
||||
ALTER TABLE assistant_profile ADD COLUMN simple_model_id INTEGER REFERENCES assistant_model(id);
|
||||
ALTER TABLE assistant_profile ADD COLUMN complex_model_id INTEGER REFERENCES assistant_model(id);
|
||||
ALTER TABLE assistant_profile ADD COLUMN classifier_model_id INTEGER REFERENCES assistant_model(id);
|
||||
ALTER TABLE assistant_model ADD COLUMN fallback_model_id INTEGER REFERENCES assistant_model(id);
|
||||
ALTER TABLE assistant_provider ADD COLUMN health_state VARCHAR(8) CHECK (health_state IN ('UP', 'DOWN'));
|
||||
ALTER TABLE assistant_provider ADD COLUMN health_checked_at TIMESTAMP WITH TIME ZONE;
|
||||
ALTER TABLE assistant_provider ADD COLUMN down_until TIMESTAMP WITH TIME ZONE;
|
||||
ALTER TABLE assistant_turn ADD COLUMN route_decision VARCHAR(16);
|
||||
ALTER TABLE assistant_turn ADD COLUMN route_source VARCHAR(16);
|
||||
ALTER TABLE assistant_turn ADD COLUMN fallback_count INTEGER DEFAULT 0;
|
||||
ALTER TABLE assistant_turn ADD COLUMN provider_id INTEGER REFERENCES assistant_provider(id);
|
||||
@@ -0,0 +1,37 @@
|
||||
# Assistant app home and provider settings screenshots
|
||||
|
||||
Taken 2026-10-13 against the local `AssistantDemoServer` (qbit-assistant-provider-anthropic test sources), never production.
|
||||
- Memory backend and the Next UI 1.0.0-RC.16 jar.
|
||||
- The Anthropic API is the recorded test server: real HTTP through the real adapter, engine, Test connection and usage recording, with canned answers and no key.
|
||||
|
||||
Light and dark, 390 and 1440 px:
|
||||
- `home-*`: the Assistant app home.
|
||||
- `provider-*`: the provider settings screen, with the masked key and the model-call child list.
|
||||
- `provider-not-set-*`: a provider whose key variable is not set.
|
||||
- `provider-edit-*`: the edit form.
|
||||
- `prices-*`: the model price table.
|
||||
|
||||
0.1.0-RC.6 additions, taken 2026-10-13 with the same demo server and the Next UI 1.0.0-RC.17 jar. The demo seeds a profile ("Ada"), two skills, and data access rows (page READ_WRITE, media NONE). Its tools run through the `/qqq/v1` UI API.
|
||||
|
||||
Light and dark, 390 and 1440 px:
|
||||
- `home-denials-*`: the home's "Recent denials" card. The analyst's `count_records` on Blog Post got HTTP 403 from `POST /table/{tableName}/count`.
|
||||
- `home-access-*`: the "Data access: what the assistant can do for you" widget (Explain access), with each table's access and each tool allowed or denied, with the reason.
|
||||
- `data-access-*`: the Data access table.
|
||||
- `profile-*`: a profile (persona), with its personality, its scope and its Skills child list.
|
||||
- `skill-*`: a skill: its instructions and when it is used.
|
||||
- `policy-*`: the policy, with its "Tools and data" section.
|
||||
- `panel-persona-*`: the panel with the configured persona. This is the Next UI build of qqq-frontend-next#94; the demo's admin matches the permission-scoped "Ada (analytics)" profile.
|
||||
- `panel-pending-*`: the assistant proposed `update_record` on page 12, which is READ_WRITE. The card shows the change with Save and Cancel; nothing is saved yet.
|
||||
- `panel-confirmed-*`: after Save, the write ran once through `PATCH /qqq/v1/table/page/12` with the user's session. The card says Done, and the record screen behind the panel shows the new value.
|
||||
|
||||
Planned P-a provider registry additions, taken against `OpenAiDemoServer` in the
|
||||
OpenAI provider's test sources with the Next UI **1.0.0-RC.18** jar. See that
|
||||
[demo's run instructions](../../qbit-assistant-provider-openai/src/test/java/com/kingsrook/qbits/assistant/provider/openai/demo/README.md).
|
||||
Discovery and connection-test status, TEST usage and the assistant turn are real
|
||||
executions against the localhost mock; replies/token counts are synthetic, not
|
||||
live GPU measurements. No screenshots in this group have been added yet.
|
||||
|
||||
Light and dark, 390 and 1440 px:
|
||||
- `p-provider-local-*`: Local GPU (Ollama), keyless LOCAL settings, discovery/test results and discovered models.
|
||||
- `p-model-*`: a discovered model's capabilities, compute prices and connection-test result.
|
||||
- `p-home-providers-*`: the home's provider summary and usage from the executed demo calls, including disabled OpenRouter with its key Not set.
|
||||
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 11 KiB |
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 46 KiB |
|
After Width: | Height: | Size: 113 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 147 KiB |
|
After Width: | Height: | Size: 136 KiB |
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 46 KiB |
|
After Width: | Height: | Size: 113 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 150 KiB |
|
After Width: | Height: | Size: 138 KiB |
|
After Width: | Height: | Size: 95 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 97 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 76 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 77 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 98 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 100 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 86 KiB |
|
After Width: | Height: | Size: 43 KiB |
|
After Width: | Height: | Size: 86 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 81 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 82 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 84 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 68 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 68 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 87 KiB |
|
After Width: | Height: | Size: 126 KiB |
|
After Width: | Height: | Size: 87 KiB |
|
After Width: | Height: | Size: 124 KiB |
|
After Width: | Height: | Size: 82 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 83 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 102 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 88 KiB |
|
After Width: | Height: | Size: 99 KiB |
|
After Width: | Height: | Size: 88 KiB |
|
After Width: | Height: | Size: 99 KiB |
|
After Width: | Height: | Size: 103 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 91 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 92 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 67 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 68 KiB |
|
After Width: | Height: | Size: 30 KiB |
@@ -52,6 +52,9 @@
|
||||
<modules>
|
||||
<module>qbit-assistant</module>
|
||||
<module>qbit-assistant-provider-anthropic</module>
|
||||
<module>qbit-assistant-provider-openai</module>
|
||||
<module>qbit-assistant-provider-bedrock</module>
|
||||
<module>qbit-assistant-provider-vertex</module>
|
||||
</modules>
|
||||
|
||||
<licenses>
|
||||
@@ -81,6 +84,21 @@
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant-provider-anthropic</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.anthropic</groupId>
|
||||
<artifactId>anthropic-java-bedrock</artifactId>
|
||||
<version>${anthropic.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.anthropic</groupId>
|
||||
<artifactId>anthropic-java-vertex</artifactId>
|
||||
<version>${anthropic.version}</version>
|
||||
</dependency>
|
||||
<!-- QQQ 4.1 is built on Jackson 2.21; the Anthropic SDK asks for 2.19. -->
|
||||
<!-- Pin the newer one so both resolve to the same line. -->
|
||||
<dependency>
|
||||
@@ -101,6 +119,11 @@
|
||||
<version>${revision}</version>
|
||||
<type>test-jar</type>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant-provider-openai</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.anthropic</groupId>
|
||||
<artifactId>anthropic-java</artifactId>
|
||||
@@ -170,7 +193,7 @@
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<!-- The assistant needs QQQ 4.1.0-RC.4: the AI tool kernel (package -->
|
||||
<!-- The assistant needs QQQ 4.1.0-RC.5: the AI tool kernel (package -->
|
||||
<!-- actions.ai, qqq#1078) and the developer panels (qqq#1076). Until -->
|
||||
<!-- qbit-build-parent imports the 4.1 BOM, this -->
|
||||
<!-- profile is active by default and imports qqq-bom-pom ahead of the -->
|
||||
@@ -182,7 +205,7 @@
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<properties>
|
||||
<qqq.snapshot.version>4.1.0-RC.4</qqq.snapshot.version>
|
||||
<qqq.snapshot.version>4.1.0-RC.5</qqq.snapshot.version>
|
||||
</properties>
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
|
||||
@@ -264,6 +264,7 @@ public class AnthropicMapping
|
||||
.withStopReason(message.stopReason().map(s -> s.asString()).orElse(ModelResponse.STOP_END_TURN))
|
||||
.withUsage(toUsage(message.usage()))
|
||||
.withRequestId(message.id())
|
||||
.withModel(message.model().asString())
|
||||
.withProviderState(message.toParam()));
|
||||
}
|
||||
|
||||
@@ -312,8 +313,51 @@ public class AnthropicMapping
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Map an SDK error to a provider error. The message holds the status and
|
||||
** the API error type only - never request or response bodies.
|
||||
** Whether a 400 message says the strict tool schemas are the problem:
|
||||
** "The compiled grammar is too large ... reduce the number of strict tools"
|
||||
** or "Schema is too complex for compilation".
|
||||
*******************************************************************************/
|
||||
static boolean isStrictSchemaMessage(String message)
|
||||
{
|
||||
if(message == null)
|
||||
{
|
||||
return (false);
|
||||
}
|
||||
String lower = message.toLowerCase(java.util.Locale.ROOT);
|
||||
return (lower.contains("grammar") || lower.contains("too complex for compilation") || lower.contains("strict tool"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The API's own error message ({"error": {"message": ...}}), or null. The
|
||||
** caller sanitizes it; Anthropic's messages name parameters, not content.
|
||||
*******************************************************************************/
|
||||
static String errorMessage(AnthropicServiceException service)
|
||||
{
|
||||
try
|
||||
{
|
||||
Map<String, Object> body = service.body() == null ? null : service.body().convert(new TypeReference<Map<String, Object>>() {});
|
||||
if(body != null && body.get("error") instanceof Map<?, ?> error && error.get("message") instanceof String message)
|
||||
{
|
||||
return (message);
|
||||
}
|
||||
}
|
||||
catch(RuntimeException e)
|
||||
{
|
||||
//////////////////////////////////////////////
|
||||
// not JSON / not the documented error shape //
|
||||
//////////////////////////////////////////////
|
||||
}
|
||||
return (null);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Map an SDK error to a provider error. The message holds the status, the
|
||||
** API error type and the API's own (sanitized) error message - never request
|
||||
** bodies, prompts or keys.
|
||||
*******************************************************************************/
|
||||
public static ModelProviderException toProviderException(Throwable throwable)
|
||||
{
|
||||
@@ -347,7 +391,11 @@ public class AnthropicMapping
|
||||
{
|
||||
kind = "overloaded_error".equals(type) ? ModelProviderException.Kind.OVERLOADED : ModelProviderException.Kind.OTHER;
|
||||
}
|
||||
return (new ModelProviderException(kind, status >= 400 ? status : null, "Anthropic API error" + (status >= 400 ? " (HTTP " + status + ")" : "") + (type == null ? "" : " " + type)));
|
||||
String apiMessage = errorMessage(service);
|
||||
String requestId = service.headers() == null ? null : service.headers().values("request-id").stream().findFirst().orElse(null);
|
||||
ModelProviderException exception = new ModelProviderException(kind, status >= 400 ? status : null, "Anthropic API error" + (status >= 400 ? " (HTTP " + status + ")" : "") + (type == null ? "" : " " + type)
|
||||
+ (apiMessage == null ? "" : ": " + ModelProviderException.sanitizeProviderMessage(apiMessage, ModelProviderException.MAX_PROVIDER_MESSAGE_CHARS)));
|
||||
return (exception.withProviderDetails(type, apiMessage, requestId).withStrictSchemaRejected(status == 400 && isStrictSchemaMessage(apiMessage)));
|
||||
}
|
||||
if(throwable instanceof AnthropicIoException)
|
||||
{
|
||||
|
||||
@@ -98,15 +98,16 @@ public class AnthropicModelProvider implements AssistantModelProvider
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Builds the provider. apiKey is required (a literal from a secret store,
|
||||
** or "${env.NAME}").
|
||||
** Builds the provider. Unless a client is supplied, apiKey is required
|
||||
** (a literal from a secret store, or "${env.NAME}").
|
||||
*******************************************************************************/
|
||||
public static class Builder
|
||||
{
|
||||
private String apiKey;
|
||||
private String baseUrl;
|
||||
private Duration timeout = Duration.ofMinutes(10);
|
||||
private Integer maxRetries = 2;
|
||||
private String apiKey;
|
||||
private AnthropicClient client;
|
||||
private String baseUrl;
|
||||
private Duration timeout = Duration.ofMinutes(10);
|
||||
private Integer maxRetries = 2;
|
||||
|
||||
|
||||
|
||||
@@ -121,6 +122,19 @@ public class AnthropicModelProvider implements AssistantModelProvider
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Use an already configured client, including a cloud backend. The provider
|
||||
** owns and closes this client; key, URL, timeout and retry builder options
|
||||
** apply only when the builder creates its own client.
|
||||
*******************************************************************************/
|
||||
public Builder client(AnthropicClient client)
|
||||
{
|
||||
this.client = client;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Another API base URL (a gateway, or a test server).
|
||||
*******************************************************************************/
|
||||
@@ -159,6 +173,10 @@ public class AnthropicModelProvider implements AssistantModelProvider
|
||||
*******************************************************************************/
|
||||
public AnthropicModelProvider build()
|
||||
{
|
||||
if(client != null)
|
||||
{
|
||||
return (new AnthropicModelProvider(client, baseUrl));
|
||||
}
|
||||
String key = resolveSecret(apiKey);
|
||||
if(!StringUtils.hasContent(key))
|
||||
{
|
||||
@@ -260,6 +278,26 @@ public class AnthropicModelProvider implements AssistantModelProvider
|
||||
return (handle);
|
||||
}
|
||||
|
||||
if(Boolean.FALSE.equals(request.getStreaming()))
|
||||
{
|
||||
java.util.concurrent.Future<?> completion = executor.submit(() ->
|
||||
{
|
||||
try
|
||||
{
|
||||
handle.complete(AnthropicMapping.toResponse(client.messages().create(params)));
|
||||
}
|
||||
catch(Throwable error)
|
||||
{
|
||||
if(!handle.isCancelled())
|
||||
{
|
||||
handle.fail(AnthropicMapping.toProviderException(error));
|
||||
}
|
||||
}
|
||||
});
|
||||
handle.setOnCancel(() -> completion.cancel(true));
|
||||
return (handle);
|
||||
}
|
||||
|
||||
AtomicReference<ModelUsage> seen = new AtomicReference<>();
|
||||
handle.setPartialUsage(seen::get);
|
||||
|
||||
@@ -297,7 +335,21 @@ public class AnthropicModelProvider implements AssistantModelProvider
|
||||
if(!handle.isCancelled())
|
||||
{
|
||||
ModelProviderException exception = AnthropicMapping.toProviderException(t).withPartialUsage(seen.get());
|
||||
LOG.info("Anthropic stream failed", logPair("kind", exception.getKind()), logPair("httpStatus", exception.getHttpStatus()), logPair("model", request.getModel()));
|
||||
///////////////////////////////////////////////////////////////////
|
||||
// a 4xx is a request or account problem an operator must see: //
|
||||
// log the API's error type, its (sanitized) message and the //
|
||||
// request id - never the prompt //
|
||||
///////////////////////////////////////////////////////////////////
|
||||
if(exception.getHttpStatus() != null && exception.getHttpStatus() >= 400 && exception.getHttpStatus() < 500)
|
||||
{
|
||||
LOG.warn("Anthropic stream failed", logPair("kind", exception.getKind()), logPair("httpStatus", exception.getHttpStatus()), logPair("model", request.getModel()),
|
||||
logPair("errorType", exception.getProviderErrorType()), logPair("errorMessage", exception.getProviderMessage()), logPair("requestId", exception.getRequestId()));
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG.info("Anthropic stream failed", logPair("kind", exception.getKind()), logPair("httpStatus", exception.getHttpStatus()), logPair("model", request.getModel()),
|
||||
logPair("errorType", exception.getProviderErrorType()), logPair("requestId", exception.getRequestId()));
|
||||
}
|
||||
handle.fail(exception);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
/*
|
||||
* Copyright 2026 Kingsrook, LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.kingsrook.qbits.assistant.provider.anthropic;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
|
||||
import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The Anthropic (Claude) provider type for the assistant_provider settings
|
||||
** table. Register it with AssistantQBitConfig.withProviderType(new
|
||||
** AnthropicProviderType()). The key comes from the row's key variable
|
||||
** (default ANTHROPIC_API_KEY).
|
||||
*******************************************************************************/
|
||||
public class AnthropicProviderType implements AssistantProviderType
|
||||
{
|
||||
public static final String DEFAULT_BASE_URL = "https://api.anthropic.com";
|
||||
|
||||
/*******************************************************************************
|
||||
** The current Claude models, the default (Sonnet 5.5) first.
|
||||
*******************************************************************************/
|
||||
public static final List<String> MODELS = List.of(
|
||||
"claude-sonnet-5-5", "claude-opus-5-5", "claude-haiku-5-5", "claude-fable-5-1",
|
||||
"claude-opus-5", "claude-sonnet-5", "claude-opus-4-8", "claude-sonnet-4-6", "claude-haiku-4-5");
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
return (AnthropicModelProvider.NAME);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getLabel()
|
||||
{
|
||||
return ("Anthropic (Claude)");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public List<String> getModels()
|
||||
{
|
||||
return (MODELS);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getDefaultApiKeyEnvName()
|
||||
{
|
||||
return (AnthropicModelProvider.API_KEY_ENV);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getDefaultBaseUrl()
|
||||
{
|
||||
return (DEFAULT_BASE_URL);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A provider with the resolved key (passed as a literal, never logged).
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public AssistantModelProvider create(String apiKey, String baseUrl)
|
||||
{
|
||||
AnthropicModelProvider.Builder builder = AnthropicModelProvider.builder().apiKey(apiKey);
|
||||
if(baseUrl != null)
|
||||
{
|
||||
builder.baseUrl(baseUrl);
|
||||
}
|
||||
return (builder.build());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -51,6 +51,39 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
*******************************************************************************/
|
||||
class AnthropicModelProviderTest
|
||||
{
|
||||
/*******************************************************************************
|
||||
** Routing requests use a single JSON reply without text deltas.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void nonStreamingClassifier() throws Exception
|
||||
{
|
||||
server.thenError(200, "classifier-response.json");
|
||||
ModelRequest request = new ModelRequest().withModel("claude-sonnet-5-5").withMaxTokens(4).withStreaming(false)
|
||||
.withMessages(List.of(ModelMessage.user("hello")));
|
||||
List<String> deltas = new ArrayList<>();
|
||||
ModelResponse response = provider.stream(request, deltas::add).await(Duration.ofSeconds(3));
|
||||
assertThat(response.getText()).isEqualTo("SIMPLE");
|
||||
assertThat(response.getUsage().getOutputTokens()).isEqualTo(1L);
|
||||
assertThat(deltas).isEmpty();
|
||||
assertThat(sentBody(0).get("stream")).isIn(null, false);
|
||||
assertThat(sentBody(0).get("max_tokens")).isEqualTo(4);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Non-streaming errors retain the normal exception mapping.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void nonStreamingError() throws Exception
|
||||
{
|
||||
server.thenError(401, "unauthorized.json");
|
||||
assertThatThrownBy(() -> provider.stream(request().withStreaming(false), new StringBuilder()::append).await(Duration.ofSeconds(3)))
|
||||
.isInstanceOfSatisfying(ModelProviderException.class, error -> assertThat(error.getKind()).isEqualTo(ModelProviderException.Kind.AUTHENTICATION));
|
||||
}
|
||||
|
||||
|
||||
|
||||
private static final String TEST_KEY = "sk-ant-test-0000000000000000000000";
|
||||
|
||||
private RecordedAnthropicServer server;
|
||||
@@ -265,7 +298,10 @@ class AnthropicModelProviderTest
|
||||
{
|
||||
assertThat(e.getKind()).isEqualTo(ModelProviderException.Kind.AUTHENTICATION);
|
||||
assertThat(e.getHttpStatus()).isEqualTo(401);
|
||||
assertThat(e.getMessage()).doesNotContain(TEST_KEY).doesNotContain("invalid x-api-key");
|
||||
assertThat(e.getMessage()).doesNotContain(TEST_KEY).contains("authentication_error");
|
||||
assertThat(e.getProviderErrorType()).isEqualTo("authentication_error");
|
||||
assertThat(e.getProviderMessage()).isEqualTo("invalid x-api-key");
|
||||
assertThat(e.isStrictSchemaRejected()).isFalse();
|
||||
});
|
||||
|
||||
assertThatThrownBy(() -> provider.stream(request(), t -> { }).await(Duration.ofSeconds(10)))
|
||||
@@ -339,4 +375,28 @@ class AnthropicModelProviderTest
|
||||
.hasMessageContaining("ANTHROPIC_API_KEY");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** An injected cloud-capable client wins over the key and HTTP builder options.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void injectedClientTakesPrecedence() throws Exception
|
||||
{
|
||||
server.thenStream("text-with-thinking.sse", 0);
|
||||
var client = com.anthropic.client.okhttp.AnthropicOkHttpClient.builder().apiKey(TEST_KEY).baseUrl(server.baseUrl()).maxRetries(0).build();
|
||||
var injected = AnthropicModelProvider.builder().client(client).apiKey(null).baseUrl("https://unused.invalid").build();
|
||||
try
|
||||
{
|
||||
var response = injected.stream(request(), delta -> {}).await(Duration.ofSeconds(10));
|
||||
assertThat(response.getText()).isEqualTo("There are 4 published posts.");
|
||||
assertThat(server.getRequests()).hasSize(1);
|
||||
assertThat(server.getRequests().getFirst().get("apiKey")).isEqualTo(TEST_KEY);
|
||||
}
|
||||
finally
|
||||
{
|
||||
injected.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,174 @@
|
||||
/*
|
||||
* Copyright 2026 Kingsrook, LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.kingsrook.qbits.assistant.provider.anthropic;
|
||||
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import com.kingsrook.qbits.assistant.AssistantQBitConfig;
|
||||
import com.kingsrook.qbits.assistant.engine.ConnectionTest;
|
||||
import com.kingsrook.qbits.assistant.model.AssistantProvider;
|
||||
import com.kingsrook.qbits.assistant.model.AssistantUsage;
|
||||
import com.kingsrook.qbits.assistant.provider.fake.ScriptedModelProvider;
|
||||
import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
|
||||
import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
|
||||
import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
|
||||
import com.kingsrook.qqq.backend.core.context.QContext;
|
||||
import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
|
||||
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
|
||||
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
|
||||
import com.kingsrook.qqq.backend.core.model.data.QRecord;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The Anthropic provider type with Test connection against a recorded HTTP
|
||||
** server (no live calls): the key from the row's variable reaches the API as
|
||||
** x-api-key, the result and the TEST usage row are saved, and a 401 becomes
|
||||
** an admin-readable error without the key.
|
||||
*******************************************************************************/
|
||||
class AnthropicProviderTypeTest
|
||||
{
|
||||
private static final String KEY = "sk-ant-test-0000000000000000-abcd";
|
||||
|
||||
private AssistantQBitConfig config;
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@AfterEach
|
||||
void tearDown()
|
||||
{
|
||||
if(config != null && config.getRuntime() != null)
|
||||
{
|
||||
config.getRuntime().close();
|
||||
}
|
||||
QContext.clear();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** An instance with the Anthropic type allowed to use the recorded server.
|
||||
*******************************************************************************/
|
||||
private QInstance instance(String baseUrl) throws Exception
|
||||
{
|
||||
config = new AssistantQBitConfig()
|
||||
.withProviderName(ScriptedModelProvider.DEFAULT_NAME)
|
||||
.withModelProvider(new ScriptedModelProvider())
|
||||
.withProviderType(new AnthropicProviderType())
|
||||
.withAllowedBaseUrls(Set.of(baseUrl))
|
||||
.withSecretResolver(Map.of(AnthropicModelProvider.API_KEY_ENV, KEY)::get);
|
||||
QInstance qInstance = AssistantTestFixture.build(config);
|
||||
QContext.init(qInstance, AssistantTestFixture.sessionFor(AssistantTestFixture.ADMIN));
|
||||
return (qInstance);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
private AssistantProvider insertProvider(String baseUrl) throws Exception
|
||||
{
|
||||
QRecord record = new InsertAction().execute(new InsertInput(AssistantProvider.TABLE_NAME).withRecord(new QRecord()
|
||||
.withValue("name", "Claude").withValue("providerType", "anthropic").withValue("model", "claude-sonnet-5-5")
|
||||
.withValue("enabled", true).withValue("isDefault", true).withValue("baseUrl", baseUrl))).getRecords().get(0);
|
||||
assertThat(record.getErrors()).isEmpty();
|
||||
return (config.getRuntime().getStore().getProvider(record.getValueInteger("id")));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A good connection.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testConnectionOk() throws Exception
|
||||
{
|
||||
try(RecordedAnthropicServer server = new RecordedAnthropicServer())
|
||||
{
|
||||
instance(server.baseUrl());
|
||||
server.thenStream("text-with-thinking.sse", 0);
|
||||
AssistantProvider row = insertProvider(server.baseUrl());
|
||||
assertThat(row.getApiKeyStatus()).isEqualTo("Set • …abcd (from ANTHROPIC_API_KEY)");
|
||||
|
||||
ConnectionTest.Result result = ConnectionTest.run(config.getRuntime(), row, AssistantTestFixture.ADMIN);
|
||||
assertThat(result.ok()).as(result.error()).isTrue();
|
||||
assertThat(result.model()).isEqualTo("claude-sonnet-5-5");
|
||||
assertThat(server.getRequests()).hasSize(1);
|
||||
assertThat(server.getRequests().get(0).get("apiKey")).isEqualTo(KEY);
|
||||
assertThat(server.getRequests().get(0).get("body")).contains("\"max_tokens\":" + ConnectionTest.PING_MAX_TOKENS);
|
||||
|
||||
AssistantProvider saved = config.getRuntime().getStore().getProvider(row.getId());
|
||||
assertThat(saved.getLastTestStatus()).isEqualTo("OK");
|
||||
assertThat(saved.getLastTestModel()).isEqualTo("claude-sonnet-5-5");
|
||||
|
||||
QRecord usage = new QueryAction().execute(new QueryInput(AssistantUsage.TABLE_NAME).withFilter(new QQueryFilter())).getRecords().get(0);
|
||||
assertThat(usage.getValueString("purpose")).isEqualTo("TEST");
|
||||
assertThat(usage.getValueString("status")).isEqualTo("OK");
|
||||
assertThat(usage.getValueLong("inputTokens")).isPositive();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A refused key.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testConnectionUnauthorized() throws Exception
|
||||
{
|
||||
try(RecordedAnthropicServer server = new RecordedAnthropicServer())
|
||||
{
|
||||
instance(server.baseUrl());
|
||||
server.thenError(401, "unauthorized.json");
|
||||
AssistantProvider row = insertProvider(server.baseUrl());
|
||||
|
||||
ConnectionTest.Result result = ConnectionTest.run(config.getRuntime(), row, AssistantTestFixture.ADMIN);
|
||||
assertThat(result.ok()).isFalse();
|
||||
assertThat(result.error()).contains("API key was refused").contains("HTTP 401").doesNotContain(KEY);
|
||||
|
||||
AssistantProvider saved = config.getRuntime().getStore().getProvider(row.getId());
|
||||
assertThat(saved.getLastTestStatus()).isEqualTo("ERROR");
|
||||
assertThat(saved.getLastTestError()).doesNotContain(KEY);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The type itself.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testType()
|
||||
{
|
||||
AnthropicProviderType type = new AnthropicProviderType();
|
||||
assertThat(type.getType()).isEqualTo("anthropic");
|
||||
assertThat(type.getModels().get(0)).isEqualTo("claude-sonnet-5-5");
|
||||
assertThat(type.getDefaultApiKeyEnvName()).isEqualTo("ANTHROPIC_API_KEY");
|
||||
assertThat(type.getDefaultBaseUrl()).isEqualTo("https://api.anthropic.com");
|
||||
assertThat(type.getLabel()).contains("Anthropic");
|
||||
assertThat(type.create(KEY, null).toString()).doesNotContain(KEY);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,461 @@
|
||||
/*
|
||||
* Copyright 2026 Kingsrook, LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.kingsrook.qbits.assistant.provider.anthropic;
|
||||
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import com.anthropic.core.ObjectMappers;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.kingsrook.qbits.assistant.AssistantQBitConfig;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelProviderException;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelRequest;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
|
||||
import com.kingsrook.qbits.assistant.provider.fake.ScriptedModelProvider;
|
||||
import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
|
||||
import com.kingsrook.qbits.assistant.testing.TurnRunner;
|
||||
import com.kingsrook.qqq.backend.core.context.QContext;
|
||||
import com.kingsrook.qqq.backend.core.utils.JsonUtils;
|
||||
import org.junit.jupiter.api.AfterEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The exact Messages API request the turn engine sends, checked against the
|
||||
** API's documented constraints, plus a conservative budget for strict tools.
|
||||
**
|
||||
** Why the budget: Anthropic compiles every strict tool schema of a request
|
||||
** into one grammar and refuses the request when that grammar is too large
|
||||
** (400 invalid_request_error "The compiled grammar is too large ... reduce the
|
||||
** number of strict tools"). With all ten read tools strict (0.1.0-RC.3 to
|
||||
** RC.4) every kof22 turn failed that way, though the request stayed inside
|
||||
** the documented limits (20 strict tools, 24 optional parameters, 16 union
|
||||
** parameters). The real limit is not published, so the budget below is far
|
||||
** under the shape that failed (10 tools / 12 optional / 3 unions). A real-API
|
||||
** check is in docs/DESIGN.md ("Strict tools") for dev use with a key.
|
||||
*******************************************************************************/
|
||||
class AnthropicRequestContractTest
|
||||
{
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
// conservative strict-tool budget (see the class comment) //
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
static final int MAX_STRICT_TOOLS = 3;
|
||||
static final int MAX_STRICT_OPTIONAL_PARAMS = 6;
|
||||
static final int MAX_STRICT_UNION_PARAMS = 2;
|
||||
|
||||
private static final Set<String> EFFORTS = Set.of("low", "medium", "high", "xhigh", "max");
|
||||
private static final Set<String> UNSUPPORTED_STRICT = Set.of("minimum", "maximum", "exclusiveMinimum", "exclusiveMaximum", "multipleOf", "minLength", "maxLength",
|
||||
"maxItems", "uniqueItems", "oneOf", "not", "if", "then", "else", "patternProperties");
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@AfterEach
|
||||
void tearDown()
|
||||
{
|
||||
QContext.clear();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The request body for the fixture app, as the SDK serializes it.
|
||||
*******************************************************************************/
|
||||
static Map<String, Object> requestBody(AssistantQBitConfig config) throws Exception
|
||||
{
|
||||
QContext.init(AssistantTestFixture.build(config), AssistantTestFixture.sessionFor(AssistantTestFixture.ADMIN));
|
||||
ModelRequest request = config.getRuntime().getContextBuilder().build(QContext.getQSession(), config.getModels().getMainModel(), config.getModels().getMainEffort(),
|
||||
List.of(), "How many published posts are there?", Map.of("tableName", "blog_post"));
|
||||
String json = ObjectMappers.jsonMapper().writeValueAsString(AnthropicMapping.toParams(request)._body());
|
||||
return (JsonUtils.toObject(json, new TypeReference<Map<String, Object>>() {}));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The default request meets every documented constraint and the budget.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testDefaultRequestMeetsTheApiContract() throws Exception
|
||||
{
|
||||
Map<String, Object> body = requestBody(new AssistantQBitConfig().withModelProvider(new ScriptedModelProvider()));
|
||||
assertThat(violations(body)).isEmpty();
|
||||
assertThat(strictBudgetViolations(body)).isEmpty();
|
||||
assertThat(tools(body)).hasSizeGreaterThanOrEqualTo(8).allSatisfy(tool -> assertThat(tool.get("strict")).isNotEqualTo(true));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Presentation remains inside the actual serialized strict request budget.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testPresentationStrictOptIn() throws Exception
|
||||
{
|
||||
Map<String, Object> body = requestBody(new AssistantQBitConfig().withModelProvider(new ScriptedModelProvider()).withStrictToolNames(Set.of("present_results")));
|
||||
assertThat(violations(body)).isEmpty();
|
||||
assertThat(strictBudgetViolations(body)).isEmpty();
|
||||
assertThat(tools(body)).anySatisfy(tool ->
|
||||
{
|
||||
assertThat(tool.get("name")).isEqualTo("present_results");
|
||||
assertThat(tool.get("strict")).isEqualTo(true);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The RC.3 shape (every tool strict) is recognized as over budget, and a
|
||||
** host can still opt a few tools in.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testStrictBudget() throws Exception
|
||||
{
|
||||
AssistantQBitConfig probe = new AssistantQBitConfig().withModelProvider(new ScriptedModelProvider());
|
||||
Set<String> all = new LinkedHashSet<>();
|
||||
requestBody(probe);
|
||||
for(ModelToolDefinition tool : probe.getRuntime().getContextBuilder().tools())
|
||||
{
|
||||
all.add(tool.getName());
|
||||
}
|
||||
QContext.clear();
|
||||
|
||||
Map<String, Object> rc3 = requestBody(new AssistantQBitConfig().withModelProvider(new ScriptedModelProvider()).withStrictToolNames(all));
|
||||
assertThat(violations(rc3)).isEmpty();
|
||||
assertThat(strictBudgetViolations(rc3)).isNotEmpty();
|
||||
QContext.clear();
|
||||
|
||||
Map<String, Object> few = requestBody(new AssistantQBitConfig().withModelProvider(new ScriptedModelProvider()).withStrictToolNames(Set.of("get_record", "describe_table")));
|
||||
assertThat(violations(few)).isEmpty();
|
||||
assertThat(strictBudgetViolations(few)).isEmpty();
|
||||
assertThat(tools(few).stream().filter(t -> Boolean.TRUE.equals(t.get("strict"))).map(t -> t.get("name"))).containsExactlyInAnyOrder("get_record", "describe_table");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A 400 about the grammar is flagged as a strict-schema rejection, carries
|
||||
** the API's message and request id, and never the key.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testGrammarRejectionIsRecognized() throws Exception
|
||||
{
|
||||
try(RecordedAnthropicServer server = new RecordedAnthropicServer())
|
||||
{
|
||||
server.thenError(400, "grammar-too-large.json");
|
||||
AnthropicModelProvider provider = AnthropicModelProvider.builder().apiKey("sk-ant-test-0000000000000000000000").baseUrl(server.baseUrl()).maxRetries(0).build();
|
||||
assertThatThrownBy(() -> provider.stream(AnthropicModelProviderTest.request(), t -> { }).await(Duration.ofSeconds(10)))
|
||||
.isInstanceOfSatisfying(ModelProviderException.class, e ->
|
||||
{
|
||||
assertThat(e.getKind()).isEqualTo(ModelProviderException.Kind.INVALID_REQUEST);
|
||||
assertThat(e.isStrictSchemaRejected()).isTrue();
|
||||
assertThat(e.getProviderErrorType()).isEqualTo("invalid_request_error");
|
||||
assertThat(e.getProviderMessage()).startsWith("The compiled grammar is too large");
|
||||
assertThat(e.getMessage()).contains("compiled grammar").doesNotContain("sk-ant-test");
|
||||
});
|
||||
provider.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** End to end: when the provider refuses strict schemas, the turn retries
|
||||
** once without strict tools and answers.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void testTurnRetriesWithoutStrictTools() throws Exception
|
||||
{
|
||||
try(RecordedAnthropicServer server = new RecordedAnthropicServer())
|
||||
{
|
||||
server.thenError(400, "grammar-too-large.json").thenStream("text-with-thinking.sse", 0);
|
||||
AnthropicModelProvider provider = AnthropicModelProvider.builder().apiKey("sk-ant-test-0000000000000000000000").baseUrl(server.baseUrl()).maxRetries(0).build();
|
||||
AssistantQBitConfig config = new AssistantQBitConfig().withModelProvider(provider).withStrictToolNames(Set.of("get_record", "count_records", "query_records"));
|
||||
TurnRunner runner = new TurnRunner(AssistantTestFixture.build(config), config);
|
||||
|
||||
TurnRunner.Outcome outcome = runner.run(AssistantTestFixture.EDITOR, "How many published posts are there?");
|
||||
assertThat(outcome.end().get("status")).isEqualTo("COMPLETE");
|
||||
assertThat(server.getRequests()).hasSize(2);
|
||||
assertThat(server.getRequests().get(0).get("body")).contains("\"strict\":true");
|
||||
assertThat(server.getRequests().get(1).get("body")).doesNotContain("\"strict\":true");
|
||||
provider.close();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Documented request constraints (Messages API, claude-sonnet-5-5 family).
|
||||
*******************************************************************************/
|
||||
@SuppressWarnings("unchecked")
|
||||
static List<String> violations(Map<String, Object> body)
|
||||
{
|
||||
List<String> errors = new ArrayList<>();
|
||||
if(!(body.get("model") instanceof String model) || !model.matches("claude-[a-z]+-[0-9]+(-[0-9]+)?"))
|
||||
{
|
||||
errors.add("model id " + body.get("model"));
|
||||
}
|
||||
if(!(body.get("max_tokens") instanceof Number max) || max.intValue() < 1 || max.intValue() > 128_000)
|
||||
{
|
||||
errors.add("max_tokens " + body.get("max_tokens"));
|
||||
}
|
||||
for(String sampling : List.of("temperature", "top_p", "top_k"))
|
||||
{
|
||||
if(body.containsKey(sampling))
|
||||
{
|
||||
errors.add(sampling + " is rejected with thinking on current models");
|
||||
}
|
||||
}
|
||||
Map<String, Object> thinking = (Map<String, Object>) body.get("thinking");
|
||||
if(thinking != null && (!"adaptive".equals(thinking.get("type")) || thinking.containsKey("budget_tokens")))
|
||||
{
|
||||
errors.add("thinking must be adaptive without budget_tokens: " + thinking);
|
||||
}
|
||||
Map<String, Object> outputConfig = (Map<String, Object>) body.get("output_config");
|
||||
if(outputConfig != null && outputConfig.get("effort") != null && !EFFORTS.contains(outputConfig.get("effort")))
|
||||
{
|
||||
errors.add("effort " + outputConfig.get("effort"));
|
||||
}
|
||||
Map<String, Object> toolChoice = (Map<String, Object>) body.get("tool_choice");
|
||||
if(toolChoice != null && !"auto".equals(toolChoice.get("type")) && !"none".equals(toolChoice.get("type")))
|
||||
{
|
||||
errors.add("forced tool_choice is rejected: " + toolChoice);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////
|
||||
// cache breakpoints: at most 4, longer TTLs before shorter ones //
|
||||
///////////////////////////////////////////////////////////////////
|
||||
List<String> ttls = new ArrayList<>();
|
||||
collectCacheTtls(body.get("tools"), ttls);
|
||||
collectCacheTtls(body.get("system"), ttls);
|
||||
collectCacheTtls(body.get("messages"), ttls);
|
||||
if(ttls.size() > 4)
|
||||
{
|
||||
errors.add("more than 4 cache breakpoints: " + ttls);
|
||||
}
|
||||
for(int i = 1; i < ttls.size(); i++)
|
||||
{
|
||||
if("1h".equals(ttls.get(i)) && "5m".equals(ttls.get(i - 1)))
|
||||
{
|
||||
errors.add("a 1h cache entry after a 5m one: " + ttls);
|
||||
}
|
||||
}
|
||||
|
||||
List<Map<String, Object>> messages = (List<Map<String, Object>>) body.get("messages");
|
||||
if(messages == null || messages.isEmpty() || !"user".equals(messages.get(0).get("role")))
|
||||
{
|
||||
errors.add("messages must start with a user message");
|
||||
}
|
||||
else if(!"user".equals(messages.get(messages.size() - 1).get("role")))
|
||||
{
|
||||
errors.add("no assistant prefill on current models");
|
||||
}
|
||||
for(Map<String, Object> message : messages == null ? List.<Map<String, Object>>of() : messages)
|
||||
{
|
||||
for(Map<String, Object> block : (List<Map<String, Object>>) message.get("content"))
|
||||
{
|
||||
if("text".equals(block.get("type")) && (!(block.get("text") instanceof String text) || text.isBlank()))
|
||||
{
|
||||
errors.add("empty text block");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Set<String> names = new LinkedHashSet<>();
|
||||
for(Map<String, Object> tool : tools(body))
|
||||
{
|
||||
String name = String.valueOf(tool.get("name"));
|
||||
if(!name.matches("[a-zA-Z0-9_-]{1,64}") || !names.add(name))
|
||||
{
|
||||
errors.add("tool name " + name);
|
||||
}
|
||||
Map<String, Object> schema = (Map<String, Object>) tool.get("input_schema");
|
||||
if(schema == null || !"object".equals(schema.get("type")))
|
||||
{
|
||||
errors.add(name + ": input_schema must be an object schema");
|
||||
continue;
|
||||
}
|
||||
if(Boolean.TRUE.equals(tool.get("strict")))
|
||||
{
|
||||
checkStrictSchema(name, schema, errors);
|
||||
}
|
||||
}
|
||||
return (errors);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The strict-tool budget: count, optional parameters and unions across all
|
||||
** strict schemas.
|
||||
*******************************************************************************/
|
||||
@SuppressWarnings("unchecked")
|
||||
static List<String> strictBudgetViolations(Map<String, Object> body)
|
||||
{
|
||||
int[] counts = new int[2];
|
||||
int strict = 0;
|
||||
for(Map<String, Object> tool : tools(body))
|
||||
{
|
||||
if(Boolean.TRUE.equals(tool.get("strict")))
|
||||
{
|
||||
strict++;
|
||||
countOptionalAndUnions(tool.get("input_schema"), counts);
|
||||
}
|
||||
}
|
||||
List<String> errors = new ArrayList<>();
|
||||
if(strict > MAX_STRICT_TOOLS)
|
||||
{
|
||||
errors.add(strict + " strict tools (budget " + MAX_STRICT_TOOLS + ")");
|
||||
}
|
||||
if(counts[0] > MAX_STRICT_OPTIONAL_PARAMS)
|
||||
{
|
||||
errors.add(counts[0] + " optional parameters in strict tools (budget " + MAX_STRICT_OPTIONAL_PARAMS + ")");
|
||||
}
|
||||
if(counts[1] > MAX_STRICT_UNION_PARAMS)
|
||||
{
|
||||
errors.add(counts[1] + " union parameters in strict tools (budget " + MAX_STRICT_UNION_PARAMS + ")");
|
||||
}
|
||||
return (errors);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@SuppressWarnings("unchecked")
|
||||
private static List<Map<String, Object>> tools(Map<String, Object> body)
|
||||
{
|
||||
return (body.get("tools") instanceof List<?> list ? (List<Map<String, Object>>) list : List.of());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Strict schemas: additionalProperties false on every object, no
|
||||
** unsupported keywords, minItems 0 or 1 only, no recursive $ref.
|
||||
*******************************************************************************/
|
||||
@SuppressWarnings("unchecked")
|
||||
private static void checkStrictSchema(String path, Object node, List<String> errors)
|
||||
{
|
||||
if(node instanceof Map<?, ?> map)
|
||||
{
|
||||
Map<String, Object> schema = (Map<String, Object>) map;
|
||||
if(("object".equals(schema.get("type")) || schema.containsKey("properties")) && !Boolean.FALSE.equals(schema.get("additionalProperties")))
|
||||
{
|
||||
errors.add(path + ": additionalProperties must be false");
|
||||
}
|
||||
for(String keyword : UNSUPPORTED_STRICT)
|
||||
{
|
||||
if(schema.containsKey(keyword))
|
||||
{
|
||||
errors.add(path + ": unsupported keyword " + keyword);
|
||||
}
|
||||
}
|
||||
if(schema.get("minItems") instanceof Number minItems && minItems.intValue() > 1)
|
||||
{
|
||||
errors.add(path + ": minItems above 1");
|
||||
}
|
||||
if(schema.get("$defs") instanceof Map<?, ?> defs)
|
||||
{
|
||||
for(Map.Entry<?, ?> def : defs.entrySet())
|
||||
{
|
||||
if(JsonUtils.toJson(def.getValue()).contains("\"#/$defs/" + def.getKey() + "\""))
|
||||
{
|
||||
errors.add(path + ": recursive $defs/" + def.getKey());
|
||||
}
|
||||
}
|
||||
}
|
||||
schema.forEach((key, value) -> checkStrictSchema(path + "/" + key, value, errors));
|
||||
}
|
||||
else if(node instanceof List<?> list)
|
||||
{
|
||||
list.forEach(value -> checkStrictSchema(path, value, errors));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@SuppressWarnings("unchecked")
|
||||
private static void countOptionalAndUnions(Object node, int[] counts)
|
||||
{
|
||||
if(node instanceof Map<?, ?> map)
|
||||
{
|
||||
Map<String, Object> schema = (Map<String, Object>) map;
|
||||
if(schema.get("properties") instanceof Map<?, ?> properties)
|
||||
{
|
||||
List<Object> required = schema.get("required") instanceof List<?> r ? (List<Object>) r : List.of();
|
||||
for(Object name : properties.keySet())
|
||||
{
|
||||
if(!required.contains(name))
|
||||
{
|
||||
counts[0]++;
|
||||
}
|
||||
}
|
||||
}
|
||||
if(schema.get("type") instanceof List<?> || schema.containsKey("anyOf"))
|
||||
{
|
||||
counts[1]++;
|
||||
}
|
||||
schema.values().forEach(value -> countOptionalAndUnions(value, counts));
|
||||
}
|
||||
else if(node instanceof List<?> list)
|
||||
{
|
||||
list.forEach(value -> countOptionalAndUnions(value, counts));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@SuppressWarnings("unchecked")
|
||||
private static void collectCacheTtls(Object node, List<String> ttls)
|
||||
{
|
||||
if(node instanceof Map<?, ?> map)
|
||||
{
|
||||
if(map.get("cache_control") instanceof Map<?, ?> cache)
|
||||
{
|
||||
ttls.add(cache.get("ttl") == null ? "5m" : String.valueOf(cache.get("ttl")));
|
||||
}
|
||||
for(Map.Entry<?, ?> entry : map.entrySet())
|
||||
{
|
||||
if(!"cache_control".equals(entry.getKey()) && !"input_schema".equals(entry.getKey()))
|
||||
{
|
||||
collectCacheTtls(entry.getValue(), ttls);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(node instanceof List<?> list)
|
||||
{
|
||||
list.forEach(value -> collectCacheTtls(value, ttls));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,197 @@
|
||||
/*
|
||||
* Copyright 2026 Kingsrook, LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.kingsrook.qbits.assistant.provider.anthropic.demo;
|
||||
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import com.kingsrook.qbits.assistant.AssistantQBitConfig;
|
||||
import com.kingsrook.qbits.assistant.engine.ConnectionTest;
|
||||
import com.kingsrook.qbits.assistant.engine.ModelPricing;
|
||||
import com.kingsrook.qbits.assistant.metadata.AssistantMetaDataBuilder;
|
||||
import com.kingsrook.qbits.assistant.model.AssistantModelPrice;
|
||||
import com.kingsrook.qbits.assistant.model.AssistantProvider;
|
||||
import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicModelProvider;
|
||||
import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicProviderType;
|
||||
import com.kingsrook.qbits.assistant.provider.anthropic.RecordedAnthropicServer;
|
||||
import com.kingsrook.qbits.assistant.provider.fake.ScriptedModelProvider;
|
||||
import com.kingsrook.qbits.assistant.testing.AssistantTestFixture;
|
||||
import com.kingsrook.qbits.assistant.testing.TurnRunner;
|
||||
import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
|
||||
import com.kingsrook.qqq.backend.core.context.QContext;
|
||||
import com.kingsrook.qqq.backend.core.exceptions.QException;
|
||||
import com.kingsrook.qqq.backend.core.instances.AbstractQQQApplication;
|
||||
import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
|
||||
import com.kingsrook.qqq.backend.core.model.data.QRecord;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.authentication.QAuthenticationMetaData;
|
||||
import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
|
||||
import com.kingsrook.qqq.backend.core.model.session.QSession;
|
||||
import com.kingsrook.qqq.backend.core.modules.authentication.QAuthenticationModuleCustomizerInterface;
|
||||
import com.kingsrook.qqq.middleware.javalin.QApplicationJavalinServer;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Local demo of the Assistant app home and provider settings, for
|
||||
** screenshots (never against production). The Anthropic API is the
|
||||
** recorded test server, so every call is a real HTTP call through the real
|
||||
** adapter, engine, Test connection and usage recording - with canned
|
||||
** answers and no key. Everyone is an admin.
|
||||
**
|
||||
** Run with the test classpath plus the qqq-frontend-next jar; open
|
||||
** http://localhost:8099/ and the Assistant app.
|
||||
*******************************************************************************/
|
||||
public class AssistantDemoServer extends AbstractQQQApplication
|
||||
{
|
||||
private static QInstance instance;
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Every browser session is an admin with the all-access key.
|
||||
*******************************************************************************/
|
||||
public static class DemoSessionCustomizer implements QAuthenticationModuleCustomizerInterface
|
||||
{
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public void customizeSession(QInstance qInstance, QSession qSession, Map<String, Object> context)
|
||||
{
|
||||
QSession admin = AssistantTestFixture.sessionFor("admin-demo");
|
||||
qSession.setUser(admin.getUser());
|
||||
qSession.setPermissions(admin.getPermissions());
|
||||
qSession.withSecurityKeyValue(AssistantMetaDataBuilder.allAccessKeyName(AssistantQBitConfig.DEFAULT_OWNER_KEY_TYPE), true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public QInstance defineQInstance() throws QException
|
||||
{
|
||||
return (instance);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Build, run real traffic against the recorded API, then serve.
|
||||
*******************************************************************************/
|
||||
public static void main(String[] args) throws Exception
|
||||
{
|
||||
int port = args.length > 0 ? Integer.parseInt(args[0]) : 8099;
|
||||
|
||||
RecordedAnthropicServer api = new RecordedAnthropicServer();
|
||||
AssistantQBitConfig config = new AssistantQBitConfig()
|
||||
.withProviderName(ScriptedModelProvider.DEFAULT_NAME)
|
||||
.withModelProvider(new ScriptedModelProvider())
|
||||
.withProviderType(new AnthropicProviderType())
|
||||
.withAllowedBaseUrls(Set.of(api.baseUrl()))
|
||||
.withAllowedApiKeyEnvNames(Set.of("ANTHROPIC_API_KEY_STAGING"))
|
||||
.withSecretResolver(Map.of(AnthropicModelProvider.API_KEY_ENV, "sk-ant-demo-not-a-real-key-7f3a")::get)
|
||||
.withAllowedWidgetNames(Set.of());
|
||||
instance = AssistantTestFixture.build(config);
|
||||
|
||||
QContext.init(instance, AssistantTestFixture.sessionFor("admin-1"));
|
||||
Integer production = insert(AssistantProvider.TABLE_NAME, Map.of("name", "Claude (production)", "providerType", "anthropic", "model", "claude-sonnet-5-5",
|
||||
"enabled", true, "isDefault", true, "baseUrl", api.baseUrl(), "monthlyCostCapUsd", new BigDecimal("25.00"),
|
||||
"maxOutputTokensPerRequest", 16000, "maxConcurrentRequests", 4));
|
||||
Integer staging = insert(AssistantProvider.TABLE_NAME, Map.of("name", "Claude (staging key)", "providerType", "anthropic", "model", "claude-haiku-5-5",
|
||||
"enabled", false, "isDefault", false, "apiKeyEnvName", "ANTHROPIC_API_KEY_STAGING"));
|
||||
for(Map.Entry<String, ModelPricing> price : ModelPricing.defaults().entrySet())
|
||||
{
|
||||
ModelPricing p = price.getValue();
|
||||
insert(AssistantModelPrice.TABLE_NAME, Map.of("providerType", "anthropic", "model", price.getKey(),
|
||||
"inputUsdPerMTok", BigDecimal.valueOf(p.getInputUsdPerMTok()), "outputUsdPerMTok", BigDecimal.valueOf(p.getOutputUsdPerMTok()),
|
||||
"cacheReadUsdPerMTok", BigDecimal.valueOf(p.getCacheReadUsdPerMTok()), "cacheWrite5mUsdPerMTok", BigDecimal.valueOf(p.getCacheWrite5mUsdPerMTok()),
|
||||
"cacheWrite1hUsdPerMTok", BigDecimal.valueOf(p.getCacheWrite1hUsdPerMTok()), "notes", "Anthropic list price, 2026-10"));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////
|
||||
// persona, a skill, and data access (page READ_WRITE, media NONE) //
|
||||
////////////////////////////////////////////////////////////////////
|
||||
Integer ada = insert("assistant_profile", Map.of("name", "default", "displayName", "Ada", "icon", "school", "isDefault", true,
|
||||
"personality", "Friendly and brief. Use plain words and short lists.", "greeting", "Hi, I'm Ada. Ask me about your posts and pages.",
|
||||
"starterPrompts", "How many published posts are there?\nWhat changed on page 12 this week?\nWhich posts have no excerpt?"));
|
||||
insert("assistant_profile", Map.of("name", "analysts", "displayName", "Ada (analytics)", "icon", "insights", "permissionName", "analytics_daily_stat.read",
|
||||
"personality", "Lead with the number, then one sentence of context."));
|
||||
Integer style = insert("assistant_skill", Map.of("name", "blog-style-guide", "description", "House style for titles and excerpts",
|
||||
"instructions", "## Blog style\n- Titles: sentence case, at most 60 characters.\n- Excerpts: one sentence, no links.", "triggerKeywords", "title, excerpt, headline"));
|
||||
insert("assistant_skill", Map.of("name", "seo-basics", "description", "Meta description rules", "instructions", "Meta descriptions are 120 to 155 characters.",
|
||||
"triggerKeywords", "seo, meta description", "enabled", true));
|
||||
insert("assistant_profile_skill", Map.of("profileId", ada, "skillId", style));
|
||||
insert("assistant_data_access", Map.of("objectType", "TABLE", "objectName", "page", "mode", "READ_WRITE", "notes", "Editors may let the assistant draft page changes (confirmed in the panel)."));
|
||||
insert("assistant_data_access", Map.of("objectType", "TABLE", "objectName", "media", "mode", "NONE", "notes", "Not needed for content questions."));
|
||||
|
||||
api.thenStream("text-with-thinking.sse", 0);
|
||||
ConnectionTest.run(config.getRuntime(), config.getRuntime().getStore().getProvider(production), "admin-1");
|
||||
ConnectionTest.run(config.getRuntime(), config.getRuntime().getStore().getProvider(staging), "admin-1");
|
||||
QContext.clear();
|
||||
|
||||
TurnRunner runner = new TurnRunner(instance, config);
|
||||
api.thenStream("parallel-tools.sse", 0).thenStream("text-with-thinking.sse", 0);
|
||||
runner.run(AssistantTestFixture.EDITOR, "How many published posts are there, and what tables can I see?");
|
||||
api.thenStream("text-with-thinking.sse", 0);
|
||||
runner.run(AssistantTestFixture.EDITOR, "Summarize this week's page changes.");
|
||||
api.thenStream("parallel-tools.sse", 0).thenStream("text-with-thinking.sse", 0);
|
||||
runner.run(AssistantTestFixture.ANALYST, "What were the pageviews yesterday?");
|
||||
api.thenError(529, "overloaded.json").thenError(529, "overloaded.json").thenError(529, "overloaded.json");
|
||||
runner.run(AssistantTestFixture.OTHER_EDITOR, "Draft a post outline.");
|
||||
|
||||
///////////////////////////////////////////////////////////////////
|
||||
// the first question asked in the panel proposes a page change //
|
||||
// (page is READ_WRITE): the panel shows the confirmation card //
|
||||
///////////////////////////////////////////////////////////////////
|
||||
for(int i = 0; i < 8; i++)
|
||||
{
|
||||
api.thenStream("propose-page-update.sse", 0).thenStream("proposed-answer.sse", 0);
|
||||
}
|
||||
|
||||
instance.withInstanceDefaultAuthentication(new QAuthenticationMetaData().withName("mock").withType(QAuthenticationType.MOCK)
|
||||
.withCustomizer(new QCodeReference(DemoSessionCustomizer.class)));
|
||||
instance.setHomeAppName(AssistantMetaDataBuilder.APP_NAME);
|
||||
|
||||
new QApplicationJavalinServer(new AssistantDemoServer()).withPort(port).withServeFrontendNext(true).start();
|
||||
System.out.println("Assistant demo on http://localhost:" + port + "/");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
**
|
||||
*******************************************************************************/
|
||||
private static Integer insert(String table, Map<String, Serializable> values) throws QException
|
||||
{
|
||||
QRecord record = new QRecord();
|
||||
record.setValues(new LinkedHashMap<>(values));
|
||||
QRecord inserted = new InsertAction().execute(new InsertInput(table).withRecord(record)).getRecords().get(0);
|
||||
if(!inserted.getErrors().isEmpty())
|
||||
{
|
||||
throw (new QException("Demo insert failed: " + inserted.getErrors()));
|
||||
}
|
||||
return (inserted.getValueInteger("id"));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
{"id":"msg_classify","type":"message","role":"assistant","model":"claude-sonnet-5-5","content":[{"type":"text","text":"SIMPLE"}],"stop_reason":"end_turn","stop_sequence":null,"usage":{"input_tokens":18,"output_tokens":1}}
|
||||
@@ -0,0 +1 @@
|
||||
{"type":"error","error":{"type":"invalid_request_error","message":"The compiled grammar is too large, which would cause performance issues. Simplify your tool schemas or reduce the number of strict tools."},"request_id":"req_test_grammar"}
|
||||
@@ -0,0 +1,39 @@
|
||||
event: message_start
|
||||
data: {"type":"message_start","message":{"id":"msg_tools_01","type":"message","role":"assistant","model":"claude-sonnet-5-5","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":300,"output_tokens":1,"cache_creation_input_tokens":0,"cache_read_input_tokens":5000}}}
|
||||
|
||||
event: content_block_start
|
||||
data: {"type":"content_block_start","index":0,"content_block":{"type":"thinking","thinking":"","signature":""}}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":0,"delta":{"type":"signature_delta","signature":"sig-tools-1"}}
|
||||
|
||||
event: content_block_stop
|
||||
data: {"type":"content_block_stop","index":0}
|
||||
|
||||
event: content_block_start
|
||||
data: {"type":"content_block_start","index":1,"content_block":{"type":"text","text":""}}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":1,"delta":{"type":"text_delta","text":"I can draft that page change for you."}}
|
||||
|
||||
event: content_block_stop
|
||||
data: {"type":"content_block_stop","index":1}
|
||||
|
||||
event: content_block_start
|
||||
data: {"type":"content_block_start","index":2,"content_block":{"type":"tool_use","id":"toolu_W","name":"update_record","input":{}}}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":2,"delta":{"type":"input_json_delta","partial_json":"{\"table\": \"page\", \"id\": \"12\", "}}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":2,"delta":{"type":"input_json_delta","partial_json":"\"values\": {\"metaDescription\": \"Who I am, what I build, and the home lab behind it.\"}}"}}
|
||||
|
||||
event: content_block_stop
|
||||
data: {"type":"content_block_stop","index":2}
|
||||
|
||||
event: message_delta
|
||||
data: {"type":"message_delta","delta":{"stop_reason":"tool_use","stop_sequence":null},"usage":{"output_tokens":60}}
|
||||
|
||||
event: message_stop
|
||||
data: {"type":"message_stop"}
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
event: message_start
|
||||
data: {"type":"message_start","message":{"id":"msg_text_01","type":"message","role":"assistant","model":"claude-sonnet-5-5","content":[],"stop_reason":null,"stop_sequence":null,"usage":{"input_tokens":120,"output_tokens":1,"cache_creation_input_tokens":2048,"cache_read_input_tokens":0,"cache_creation":{"ephemeral_5m_input_tokens":48,"ephemeral_1h_input_tokens":2000}}}}
|
||||
|
||||
event: content_block_start
|
||||
data: {"type":"content_block_start","index":0,"content_block":{"type":"thinking","thinking":"","signature":""}}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":0,"delta":{"type":"thinking_delta","thinking":"SECRET_THINKING_TEXT"}}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":0,"delta":{"type":"signature_delta","signature":"sig-abc-123"}}
|
||||
|
||||
event: content_block_stop
|
||||
data: {"type":"content_block_stop","index":0}
|
||||
|
||||
event: content_block_start
|
||||
data: {"type":"content_block_start","index":1,"content_block":{"type":"text","text":""}}
|
||||
|
||||
event: ping
|
||||
data: {"type":"ping"}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":1,"delta":{"type":"text_delta","text":""}}
|
||||
|
||||
event: content_block_delta
|
||||
data: {"type":"content_block_delta","index":1,"delta":{"type":"text_delta","text":"I proposed the new meta description for page 12. Confirm it in the card to save it."}}
|
||||
|
||||
event: content_block_stop
|
||||
data: {"type":"content_block_stop","index":1}
|
||||
|
||||
event: message_delta
|
||||
data: {"type":"message_delta","delta":{"stop_reason":"end_turn","stop_sequence":null},"usage":{"output_tokens":42}}
|
||||
|
||||
event: message_stop
|
||||
data: {"type":"message_stop"}
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
~ Copyright 2026 Kingsrook, LLC
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant-parent</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>qbit-assistant-provider-bedrock</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>QBit Assistant - Bedrock provider</name>
|
||||
<description>Bedrock provider using the Anthropic cloud backend</description>
|
||||
<url>https://github.com/QRun-IO/qbit-assistant</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.anthropic</groupId>
|
||||
<artifactId>anthropic-java-bedrock</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant-provider-anthropic</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qqq</groupId>
|
||||
<artifactId>qqq-backend-core</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant</artifactId>
|
||||
<type>test-jar</type>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qqq</groupId>
|
||||
<artifactId>qqq-middleware-javalin</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.junit.jupiter</groupId>
|
||||
<artifactId>junit-jupiter</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.assertj</groupId>
|
||||
<artifactId>assertj-core</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<!-- live evals call the real API: opt-in only -->
|
||||
<excludedGroups>${test.excludedGroups}</excludedGroups>
|
||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>prepare-agent</id>
|
||||
<goals>
|
||||
<goal>prepare-agent</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>report</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>report</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>check</id>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<rules>
|
||||
<rule>
|
||||
<element>BUNDLE</element>
|
||||
<limits>
|
||||
<limit>
|
||||
<counter>INSTRUCTION</counter>
|
||||
<value>COVEREDRATIO</value>
|
||||
<minimum>0.70</minimum>
|
||||
</limit>
|
||||
<limit>
|
||||
<counter>CLASS</counter>
|
||||
<value>COVEREDRATIO</value>
|
||||
<minimum>0.90</minimum>
|
||||
</limit>
|
||||
</limits>
|
||||
</rule>
|
||||
</rules>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
@@ -0,0 +1,73 @@
|
||||
/*
|
||||
* Copyright 2026 Kingsrook, LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.kingsrook.qbits.assistant.provider.bedrock;
|
||||
|
||||
|
||||
import com.anthropic.backends.Backend;
|
||||
import com.anthropic.core.http.HttpRequest;
|
||||
import com.anthropic.core.http.HttpResponse;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** SDK 2.71 has no Bedrock endpoint setter. Override only the endpoint, keeping
|
||||
** the SDK's request conversion, SigV4 signing of that endpoint, and decoding.
|
||||
** The caller must validate the URL against the host's allowlist first.
|
||||
*******************************************************************************/
|
||||
record BedrockEndpointBackend(Backend delegate, String baseUrl) implements Backend
|
||||
{
|
||||
/*******************************************************************************
|
||||
** Preserve the Bedrock model-path and body conversion.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public HttpRequest prepareRequest(HttpRequest request)
|
||||
{
|
||||
return (delegate.prepareRequest(request));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Sign the actual request URL, including the overridden host.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public HttpRequest authorizeRequest(HttpRequest request)
|
||||
{
|
||||
return (delegate.authorizeRequest(request));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Decode the AWS event stream through the SDK.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public HttpResponse prepareResponse(HttpResponse response)
|
||||
{
|
||||
return (delegate.prepareResponse(response));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Release the SDK's stream conversion resources.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public void close()
|
||||
{
|
||||
delegate.close();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,185 @@
|
||||
/*
|
||||
* Copyright 2026 Kingsrook, LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.kingsrook.qbits.assistant.provider.bedrock;
|
||||
|
||||
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import com.anthropic.backends.Backend;
|
||||
import com.anthropic.bedrock.backends.BedrockBackend;
|
||||
import com.anthropic.client.okhttp.AnthropicOkHttpClient;
|
||||
import com.anthropic.core.Timeout;
|
||||
import com.kingsrook.qbits.assistant.model.AssistantProvider;
|
||||
import com.kingsrook.qbits.assistant.provider.AssistantModelProvider;
|
||||
import com.kingsrook.qbits.assistant.provider.AssistantProviderType;
|
||||
import com.kingsrook.qbits.assistant.provider.DiscoveredModel;
|
||||
import com.kingsrook.qbits.assistant.provider.ProviderSettings;
|
||||
import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicModelProvider;
|
||||
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
|
||||
import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
|
||||
import software.amazon.awssdk.regions.Region;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** AWS Bedrock (Claude), using server credentials and region-derived endpoints.
|
||||
** Environment, profile and container (ECS/EKS Pod Identity) credentials use
|
||||
** the transitive SDK dependencies. Hosts using IRSA / web identity must add
|
||||
** software.amazon.awssdk:sts to their runtime classpath; the default credential
|
||||
** chain discovers it when present. This adapter does not depend on STS.
|
||||
*******************************************************************************/
|
||||
public class BedrockProviderType implements AssistantProviderType
|
||||
{
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Provider registry contract.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
return ("bedrock");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Provider registry contract.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getLabel()
|
||||
{
|
||||
return ("AWS Bedrock (Claude)");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Provider registry contract.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public List<String> getModels()
|
||||
{
|
||||
return (List.of("us.anthropic.claude-sonnet-4-5-20250929-v1:0", "us.anthropic.claude-haiku-4-5-20251001-v1:0"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Provider registry contract.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getDefaultApiKeyEnvName()
|
||||
{
|
||||
return (null);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Provider registry contract.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String getDefaultBaseUrl()
|
||||
{
|
||||
return (null);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Provider registry contract.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public boolean requiresBaseUrl(String kind)
|
||||
{
|
||||
return (false);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Validate cloud settings without loading credentials.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public List<String> validate(AssistantProvider row)
|
||||
{
|
||||
List<String> errors = new ArrayList<>();
|
||||
if(row.getRegion() == null || row.getRegion().isBlank())
|
||||
{
|
||||
errors.add("Region is required for BEDROCK.");
|
||||
}
|
||||
if(row.getApiKeyEnvName() != null && !row.getApiKeyEnvName().isBlank())
|
||||
{
|
||||
errors.add("Leave API key variable empty: AWS Bedrock (Claude) uses the AWS default credential chain (environment, profile or server role).");
|
||||
}
|
||||
return (errors);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Cloud providers require resolved region/project settings.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public AssistantModelProvider create(String apiKey, String baseUrl)
|
||||
{
|
||||
throw (new IllegalArgumentException("Use ProviderSettings with the required cloud region."));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Static defaults: ListFoundationModels requires the Bedrock control-plane SDK,
|
||||
** which this adapter deliberately does not add.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public List<DiscoveredModel> discoverModels(ProviderSettings settings)
|
||||
{
|
||||
return (getModels().stream().map(id -> new DiscoveredModel(id, id, null, null)).toList());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Create the provider with server credentials.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public AssistantModelProvider create(ProviderSettings settings)
|
||||
{
|
||||
return (create(settings, DefaultCredentialsProvider.builder().build()));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Credential injection for contract tests; no credential values are stored.
|
||||
*******************************************************************************/
|
||||
AnthropicModelProvider create(ProviderSettings settings, AwsCredentialsProvider credentials)
|
||||
{
|
||||
Backend backend = BedrockBackend.builder().region(Region.of(settings.getRegion())).awsCredentialsProvider(credentials).build();
|
||||
if(settings.getBaseUrl() != null)
|
||||
{
|
||||
backend = new BedrockEndpointBackend(backend, settings.getBaseUrl());
|
||||
}
|
||||
var client = AnthropicOkHttpClient.builder().backend(backend)
|
||||
.timeout(Timeout.builder().connect(Duration.ofSeconds(settings.getConnectTimeoutSeconds()))
|
||||
.request(Duration.ofSeconds(settings.getRequestTimeoutSeconds())).build());
|
||||
return (AnthropicModelProvider.builder().client(client.build()).build());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,213 @@
|
||||
/*
|
||||
* Copyright 2026 Kingsrook, LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.kingsrook.qbits.assistant.provider.bedrock;
|
||||
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.time.Clock;
|
||||
import java.time.Duration;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import com.kingsrook.qbits.assistant.AssistantQBitConfig;
|
||||
import com.kingsrook.qbits.assistant.engine.ProviderService;
|
||||
import com.kingsrook.qbits.assistant.model.AssistantProvider;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelEventListener;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelMessage;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelProviderException;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelRequest;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelToolDefinition;
|
||||
import com.kingsrook.qbits.assistant.provider.ProviderSettings;
|
||||
import com.kingsrook.qbits.assistant.provider.anthropic.AnthropicModelProvider;
|
||||
import com.kingsrook.qbits.assistant.testing.CloudProviderTestServer;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.CsvSource;
|
||||
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
|
||||
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
|
||||
import static com.kingsrook.qbits.assistant.testing.CloudProviderTestServer.JSON;
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Real Anthropic Bedrock SDK against signed loopback requests and binary streams.
|
||||
*******************************************************************************/
|
||||
class BedrockContractTest
|
||||
{
|
||||
static final String MODEL = "us.anthropic.claude-sonnet-4-5-20250929-v1:0";
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Explicit fake credentials avoid all default-chain network lookup in tests.
|
||||
*******************************************************************************/
|
||||
static AnthropicModelProvider provider(CloudProviderTestServer server)
|
||||
{
|
||||
return (new BedrockProviderType().create(new ProviderSettings().withRegion("us-east-1").withBaseUrl(server.url())
|
||||
.withConnectTimeoutSeconds(2).withRequestTimeoutSeconds(5),
|
||||
StaticCredentialsProvider.create(AwsBasicCredentials.create("AKIDEXAMPLE", "synthetic-secret"))));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Engine-shaped request with an opted-in strict tool.
|
||||
*******************************************************************************/
|
||||
static ModelRequest request()
|
||||
{
|
||||
return (new ModelRequest().withModel(MODEL).withMaxTokens(1024).withMessages(List.of(ModelMessage.user("Count posts")))
|
||||
.withTools(List.of(new ModelToolDefinition().withName("count_records").withDescription("Count records").withStrict(true)
|
||||
.withInputSchema(Map.of("type", "object", "properties", Map.of("table", Map.of("type", "string")), "required", List.of("table"), "additionalProperties", false)))));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Binary chunk framing, SigV4, request rewriting, text, tools and usage.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void streamingContract() throws Exception
|
||||
{
|
||||
try(CloudProviderTestServer server = new CloudProviderTestServer())
|
||||
{
|
||||
server.enqueue(200, "application/vnd.amazon.eventstream", BedrockEventStream.encode(CloudProviderTestServer.anthropicEvents(MODEL, "Checking.", Map.of("table", "blog_post"))));
|
||||
AnthropicModelProvider provider = provider(server);
|
||||
try
|
||||
{
|
||||
StringBuilder text = new StringBuilder();
|
||||
List<String> tools = new ArrayList<>();
|
||||
var response = provider.stream(request(), new ModelEventListener()
|
||||
{
|
||||
/*******************************************************************************
|
||||
** Capture only visible text.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public void onTextDelta(String delta)
|
||||
{
|
||||
text.append(delta);
|
||||
}
|
||||
|
||||
/*******************************************************************************
|
||||
** Confirm tool-start callbacks pass through the reused adapter.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public void onToolUseStart(String id, String name)
|
||||
{
|
||||
tools.add(id + ":" + name);
|
||||
}
|
||||
}).await(Duration.ofSeconds(10));
|
||||
assertThat(text.toString()).isEqualTo("Checking.");
|
||||
assertThat(response.getText()).isEqualTo("Checking.");
|
||||
assertThat(tools).containsExactly("count:count_records");
|
||||
assertThat(response.getToolUses()).singleElement().satisfies(tool ->
|
||||
{
|
||||
assertThat(tool.getToolUseId()).isEqualTo("count");
|
||||
assertThat(tool.getInput()).containsEntry("table", "blog_post");
|
||||
});
|
||||
assertThat(response.getStopReason()).isEqualTo("tool_use");
|
||||
assertThat(response.getUsage().getInputTokens()).isEqualTo(12);
|
||||
assertThat(response.getUsage().getOutputTokens()).isEqualTo(7);
|
||||
var sent = server.requests.getFirst();
|
||||
assertThat(sent.path()).isEqualTo("/model/" + MODEL + "/invoke-with-response-stream");
|
||||
assertThat(sent.authorization()).startsWith("AWS4-HMAC-SHA256 Credential=AKIDEXAMPLE/").contains("/us-east-1/bedrock/aws4_request", "Signature=");
|
||||
var body = JSON.readTree(sent.body());
|
||||
assertThat(body.path("anthropic_version").asText()).isEqualTo("bedrock-2023-05-31");
|
||||
assertThat(body.has("model")).isFalse();
|
||||
assertThat(body.has("stream")).isFalse();
|
||||
assertThat(body.path("max_tokens").asInt()).isEqualTo(1024);
|
||||
assertThat(body.path("messages").get(0).path("role").asText()).isEqualTo("user");
|
||||
assertThat(body.path("tools").get(0).path("strict").asBoolean()).isTrue();
|
||||
}
|
||||
finally
|
||||
{
|
||||
provider.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The cloud backend keeps the Anthropic adapter's HTTP error mapping.
|
||||
*******************************************************************************/
|
||||
@ParameterizedTest
|
||||
@CsvSource({ "403,AUTHENTICATION", "429,RATE_LIMITED", "500,SERVER" })
|
||||
void errors(Integer status, ModelProviderException.Kind kind) throws Exception
|
||||
{
|
||||
try(CloudProviderTestServer server = new CloudProviderTestServer())
|
||||
{
|
||||
for(int attempt = 0; attempt < 3; attempt++)
|
||||
{
|
||||
server.enqueue(status, "application/json", "{\"message\":\"Synthetic failure\"}".getBytes(StandardCharsets.UTF_8));
|
||||
}
|
||||
AnthropicModelProvider provider = provider(server);
|
||||
try
|
||||
{
|
||||
assertThatThrownBy(() -> provider.stream(request(), delta -> {}).await(Duration.ofSeconds(20)))
|
||||
.isInstanceOfSatisfying(ModelProviderException.class, error ->
|
||||
{
|
||||
assertThat(error.getKind()).isEqualTo(kind);
|
||||
assertThat(error.getHttpStatus()).isEqualTo(status);
|
||||
});
|
||||
}
|
||||
finally
|
||||
{
|
||||
provider.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Registry defaults and validation run without resolving AWS credentials.
|
||||
*******************************************************************************/
|
||||
@Test
|
||||
void settingsValidationAndDefaults() throws Exception
|
||||
{
|
||||
var type = new BedrockProviderType();
|
||||
var config = new AssistantQBitConfig().withProviderType(type).withAllowedBaseUrls(Set.of("http://127.0.0.1:1234"));
|
||||
var service = new ProviderService(config, null, Clock.systemUTC());
|
||||
var row = new AssistantProvider().withProviderType("bedrock");
|
||||
assertThat(service.validate(row)).anyMatch(error -> error.contains("Region is required"));
|
||||
row.withRegion(" ");
|
||||
assertThat(service.validate(row)).anyMatch(error -> error.contains("Region is required"));
|
||||
row.withRegion("us-east-1");
|
||||
assertThat(service.validate(row)).isEmpty();
|
||||
row.withApiKeyEnvName("AWS_API_KEY");
|
||||
assertThat(service.validate(row)).anyMatch(error -> error.contains("default credential chain"));
|
||||
row.withApiKeyEnvName(" ").withBaseUrl("https://unlisted.example");
|
||||
assertThat(service.validate(row)).anyMatch(error -> error.contains("not allowed"));
|
||||
row.withBaseUrl("http://127.0.0.1:1234");
|
||||
assertThat(service.validate(row)).isEmpty();
|
||||
assertThat(type.getType()).isEqualTo("bedrock");
|
||||
assertThat(type.getKinds()).containsExactly("BEDROCK");
|
||||
assertThat(type.getLabel()).isEqualTo("AWS Bedrock (Claude)");
|
||||
assertThat(type.getDefaultLocation("BEDROCK")).isEqualTo("CLOUD");
|
||||
assertThat(type.getDefaultApiKeyEnvName()).isNull();
|
||||
assertThat(type.getDefaultBaseUrl()).isNull();
|
||||
assertThat(type.discoverModels(new ProviderSettings())).extracting(model -> model.modelId()).containsExactlyElementsOf(type.getModels());
|
||||
assertThat(type.checkHealth(new ProviderSettings()).healthy()).isNull();
|
||||
assertThatThrownBy(() -> type.create("key", null)).isInstanceOf(IllegalArgumentException.class);
|
||||
// Client creation is lazy: no credentials are resolved and no request sent.
|
||||
var defaultChain = (AnthropicModelProvider) type.create(new ProviderSettings().withRegion("us-east-1"));
|
||||
defaultChain.close();
|
||||
}
|
||||
}
|
||||
|
||||