Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
467c2199dc
|
||
|
|
01309ddfe9 | ||
|
|
de04965cd7
|
||
|
|
61e6f809f1
|
||
|
|
8e8a5c59cd | ||
|
|
87835961f4
|
||
|
|
c3a828c1c3
|
||
|
|
de215f8ff9
|
||
|
|
9e1bda8dae
|
||
|
|
907d943f8d
|
||
|
|
5e1c213fd6 | ||
|
|
1a65aa2257 | ||
|
|
17c376c5b1
|
||
|
|
2e90fbdc5d
|
||
|
|
6a26a7d4fa
|
||
|
|
1d66154bd2 | ||
|
|
57673131ff
|
||
|
|
c27994c432
|
||
|
|
1947688c34
|
||
|
|
c487c87051
|
||
|
|
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 |
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/
|
||||
@@ -29,6 +29,8 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
|
||||
## Modules
|
||||
|
||||
- `qbit-assistant-provider-api`: standalone provider SPI/value types and `engine.ModelPricing` (original package names); only Jackson annotations in production. Provider validation takes unresolved `ProviderSettings`, not an entity.
|
||||
|
||||
- `qbit-assistant` (`com.kingsrook.qbits.assistant`):
|
||||
- `AssistantQBitProducer`, `AssistantQBitConfig` (with `AssistantModelRouting` and `AssistantBudgets`), `AssistantRuntime`, `AssistantSecurity`.
|
||||
- `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.
|
||||
@@ -37,11 +39,16 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
- `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.
|
||||
- `provider/`: runtime-backed `RegistryModelProvider`, plus `fake/ScriptedModelProvider` for tests, evals and demos. The SPI lives in `qbit-assistant-provider-api`.
|
||||
- `developer/`: the record Developer-screen panel, on the core developer-panel contract.
|
||||
- `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.
|
||||
|
||||
- `qbit-assistant-rag-pgvector`: JDBC vector storage; depends on the runtime RAG interfaces (`VectorStore`, `ChunkVector`).
|
||||
|
||||
## Invariants (do not break)
|
||||
|
||||
@@ -90,4 +97,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 seven modules and the parent POM publish. The flatten plugin resolves `${revision}`.
|
||||
@@ -1,9 +1,85 @@
|
||||
# Changelog
|
||||
|
||||
## Unreleased - Provider API extraction (#30)
|
||||
|
||||
- Extract provider SPI/value types and `engine.ModelPricing` into `qbit-assistant-provider-api`, preserving package names. Its only production dependency is Jackson annotations.
|
||||
- Move Anthropic, OpenAI, Bedrock and Vertex main dependencies to the API; retain runtime fixtures in test scope. Pgvector still needs runtime RAG interfaces.
|
||||
- Provider-specific validation now takes unresolved `ProviderSettings` instead of `AssistantProvider`; add an ArchUnit boundary and standalone coverage gates.
|
||||
## Unreleased - P-g
|
||||
|
||||
- Add admin Scheduled tasks, owner-locked run history, Quartz cron/timezones,
|
||||
and a 60-second QQQ scheduled process using the host's scheduler context.
|
||||
- Log in through the loopback UI API with a separately allow-listed credential
|
||||
environment reference; verify the designated user before starting a normal turn.
|
||||
- Add Review/Result Approve write mode, Revoke write mode and Run now actions.
|
||||
Approval binds the task definition; scheduled writes always await confirmation.
|
||||
- Attribute scheduled UI API requests and tool logs, apply per-run STOP caps,
|
||||
and send optional Alerts notifications to the designated user. HIPAA summaries
|
||||
contain only `see conversation`.
|
||||
- Add unique schedule-slot claims, fixed-clock fixture integration tests and
|
||||
additive Postgres DDL. No API routes or provider modules change.
|
||||
|
||||
## Unreleased - P-f
|
||||
|
||||
- Add OpenAI-compatible embeddings (including Azure), explicit CHAT/EMBEDDING
|
||||
model kinds, editable discovery hints, and budgeted EMBED usage.
|
||||
- Add admin Knowledge sources with streamed Review/Result Index now and Clear
|
||||
index actions. Indexing uses the clicking admin's UI API session, chunks text,
|
||||
skips unchanged hashes and reconciles disappeared records.
|
||||
- Add content-free in-memory and optional JDBC pgvector stores, per-instance
|
||||
schemas, HNSW cosine search and transactional record replacement.
|
||||
- Add permission-filtered `search_knowledge`, fresh UI API reads, existing
|
||||
masking/redaction, PHI embedding guards, classification propagation and citations.
|
||||
- Add embedding HTTP contracts, real UI API RAG security/golden tests and
|
||||
always-on JDBC contracts; the pgvector container test skips without Docker.
|
||||
## 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).
|
||||
@@ -13,6 +89,11 @@ Phase 0/1 of the QQQ Assistant: read-only Q&A and navigation. Requires QQQ 4.1 w
|
||||
- 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`.
|
||||
@@ -32,7 +113,7 @@ Phase 0/1 of the QQQ Assistant: read-only Q&A and navigation. Requires QQQ 4.1 w
|
||||
|
||||
### 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`.
|
||||
- **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.
|
||||
|
||||
@@ -29,6 +29,8 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
|
||||
## Modules
|
||||
|
||||
- `qbit-assistant-provider-api`: standalone provider SPI/value types and `engine.ModelPricing` (original package names); only Jackson annotations in production. Provider validation takes unresolved `ProviderSettings`, not an entity.
|
||||
|
||||
- `qbit-assistant` (`com.kingsrook.qbits.assistant`):
|
||||
- `AssistantQBitProducer`, `AssistantQBitConfig` (with `AssistantModelRouting` and `AssistantBudgets`), `AssistantRuntime`, `AssistantSecurity`.
|
||||
- `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.
|
||||
@@ -37,19 +39,26 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
- `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.
|
||||
- `provider/`: runtime-backed `RegistryModelProvider`, plus `fake/ScriptedModelProvider` for tests, evals and demos. The SPI lives in `qbit-assistant-provider-api`.
|
||||
- `developer/`: the record Developer-screen panel, on the core developer-panel contract.
|
||||
- `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.
|
||||
|
||||
- `qbit-assistant-rag-pgvector`: optional host-supplied JDBC vector store, isolated by instance schema; depends on runtime RAG interfaces (`VectorStore`, `ChunkVector`), with no QQQ RDBMS internals.
|
||||
|
||||
## Invariants (do not break)
|
||||
|
||||
- **Sessions:**
|
||||
- Scheduled runs log in as the designated user through `POST /qqq/v1/manageSession`; resolve only its returned UUID, verify the user id, and never construct or elevate a session. The QQQ-supplied scheduler context touches only assistant bookkeeping.
|
||||
- Never use `QSystemUserSession` or construct a `QSession` in main code (ArchUnit).
|
||||
- Every route uses `ExecutorSessionUtils.setupSession` (the user's own session).
|
||||
- `AssistantSecurity` only ever adds the user's OWN id key, or the all-access key for `assistant.admin` holders.
|
||||
- **Data access:**
|
||||
- The vector index stores no record content: only source/table/key/field/chunk, content hash and embedding. Retrieval re-reads every hit through the UI API as the asking user, then applies the existing get_record exposure/masking path.
|
||||
- Only `persistence/` calls QueryAction, InsertAction and the other data actions (ArchUnit).
|
||||
- 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.
|
||||
@@ -61,9 +70,15 @@ Always use the wrapper: Maven 3.10 cannot read the parent POM. The committed def
|
||||
- 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.
|
||||
- Scheduled task `credentialEnvName` is a separately allow-listed environment variable NAME. Tokens never enter rows, model context or logs. `credentialStatus` is computed and stripped on save.
|
||||
- Scheduled write approval is invalidated by changes to prompt, run-as user, credential reference, profile or write request. Scheduled writes always require the designated user's panel confirmation.
|
||||
- **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
|
||||
@@ -92,4 +107,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 seven modules and the parent POM publish. The flatten plugin resolves `${revision}`.
|
||||
@@ -4,12 +4,92 @@ An in-app AI assistant for any QQQ application. The user asks a question in a ch
|
||||
|
||||
Design spec: `QRun-IO/qqq` `docs/specs/2026-10-11-qqq-assistant-qbit-design.md`.
|
||||
|
||||
## Modules
|
||||
|
||||
| Artifact | What it is |
|
||||
|---|---|
|
||||
| `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-api` | Provider SPI, connection settings, messages, usage and pricing types; only Jackson annotations at runtime. |
|
||||
| `com.kingsrook.qbits:qbit-assistant` | The QBit: conversation tables, turn engine, `/qqq/v1/assistant` routes (JSON + Server-Sent Events), budgets, kill switch, the provider registry, 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. |
|
||||
| `com.kingsrook.qbits:qbit-assistant-provider-openai` | OpenAI-compatible chat and embedding providers. |
|
||||
| `com.kingsrook.qbits:qbit-assistant-provider-bedrock` | Claude through AWS Bedrock. |
|
||||
| `com.kingsrook.qbits:qbit-assistant-provider-vertex` | Claude and Gemini through Google Vertex AI. |
|
||||
| `com.kingsrook.qbits:qbit-assistant-rag-pgvector` | JDBC vector store; retains the runtime dependency for `VectorStore` and `ChunkVector`. |
|
||||
|
||||
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.
|
||||
### Implementing a provider outside qbit-assistant
|
||||
|
||||
Depend on `com.kingsrook.qbits:qbit-assistant-provider-api` at the same version as
|
||||
QBit Assistant, and implement `AssistantModelProvider` and optionally
|
||||
`AssistantProviderType`. No assistant runtime dependency is needed. Existing
|
||||
`com.kingsrook.qbits.assistant.provider.*` imports and
|
||||
`com.kingsrook.qbits.assistant.engine.ModelPricing` stay the same.
|
||||
`AssistantProviderType.validate(ProviderSettings)` receives unresolved settings
|
||||
(including `apiKeyEnvName`), without a database entity or resolved credentials.
|
||||
Hosts register providers through `AssistantQBitConfig` in `qbit-assistant`.
|
||||
|
||||
Data tools use the QQQ UI API (`/qqq/v1`) with the signed-in user's session. The UI API enforces permissions and record locks; assistant data-access policy and field exposure can only narrow access. Only record-free navigation and help use the core AI tool kernel. Every tool result reaches the model wrapped as untrusted data.
|
||||
|
||||
## RAG setup
|
||||
|
||||
Knowledge retrieval is optional. The vector index stores **no record content**:
|
||||
only source/table/key/field/chunk identifiers, SHA-256 hashes and embeddings.
|
||||
Indexing reads through the UI API as the clicking administrator. Retrieval
|
||||
re-reads each hit through that same API as the asking user, silently filters
|
||||
403/404 results, applies `get_record` field exposure/masking/redaction and returns
|
||||
fresh snippets with `/app/...` citations. `search_knowledge` follows `allowedTools`
|
||||
and is offered only with an enabled source the user may read in the UI.
|
||||
|
||||
1. Register the OpenAI-compatible provider module and configure the embedding
|
||||
endpoint through the existing provider settings/URL allowlist. Discover or add
|
||||
a model, set **Model kind = EMBEDDING** and its dimensions. Known discovery
|
||||
defaults are `bge-m3` (1024) and `nomic-embed-text` (768); these remain editable.
|
||||
CHAT models cannot be selected for embedding, and EMBEDDING models cannot answer
|
||||
chat turns. Each embedding batch contains at most 64 inputs.
|
||||
2. Use the default `InMemoryVectorStore` for tests/small hosts, or add
|
||||
`com.kingsrook.qbits:qbit-assistant-rag-pgvector` at the QBit's version for
|
||||
persistence. The host supplies its JDBC driver and DataSource; this module
|
||||
does not depend on QQQ RDBMS internals.
|
||||
3. For pgvector, have the DBA install the extension once in the chosen database:
|
||||
`CREATE EXTENSION IF NOT EXISTS vector`. Give the application a distinct schema
|
||||
per QQQ instance. Configure the store before producing the QBit:
|
||||
|
||||
```java
|
||||
PgVectorStore vectors = new PgVectorStore(dataSource, 1024)
|
||||
.withSchema("assistant_rag_my_instance");
|
||||
vectors.ensureSchema();
|
||||
config.withVectorStore(vectors);
|
||||
config.withUiApiBaseUrl("http://127.0.0.1:8000");
|
||||
```
|
||||
|
||||
The UI API URL is this server's own listening address. Configure it explicitly
|
||||
so Index now works before any chat request has taught the runtime its local
|
||||
port. The store creates a content-free `assistant_rag_chunk` table and an HNSW
|
||||
cosine index. Its fixed dimension must match every source using the store;
|
||||
different models are searched separately. No credentials go in source rows.
|
||||
See the [pgvector installation/index documentation](https://github.com/pgvector/pgvector)
|
||||
and the reference DDL in [schema-postgres.sql](docs/schema-postgres.sql).
|
||||
4. Open **Assistant → Knowledge sources** as an `assistant.admin`. Add the table,
|
||||
comma-separated text fields, optional title field and QQQ query-filter JSON,
|
||||
embedding model, and chunk size/overlap (defaults 1500/200). Tables with AI data
|
||||
access NONE, `assistant_*` tables, and fields with NONE/METADATA_ONLY exposure
|
||||
are refused. MASKED fields are masked before embedding and in snippets.
|
||||
5. Select **Index now**. Review makes no embedding calls; Result reports records
|
||||
seen, chunks embedded, unchanged, removed and errors. Re-running unchanged
|
||||
content sends no embeddings. A complete successful scan removes disappeared
|
||||
records; failed scans preserve unvisited entries. **Clear index** removes only
|
||||
that source's vectors. Changes after indexing are read fresh, but semantic
|
||||
ranking becomes current only after re-indexing.
|
||||
|
||||
Embedding usage has purpose `EMBED`, counts toward budgets, and observes the kill
|
||||
switch and provider concurrency limits. PHI sources and queries in PHI
|
||||
conversations require an eligible embedding provider; the eligibility flag is an
|
||||
operator assertion, as for chat. Automatic budget downgrades cannot change an
|
||||
embedding model's vector space, so an incompatible downgrade stops the call.
|
||||
|
||||
Scheduling is deferred to P-g. Its designated-user runner can call
|
||||
`RagService.index` within that user's authenticated context; P-f creates no system
|
||||
session, stored admin credentials, scheduler or background content crawler.
|
||||
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
|
||||
|
||||
@@ -203,6 +283,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`
|
||||
@@ -253,6 +334,289 @@ 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.
|
||||
|
||||
## Scheduled tasks
|
||||
|
||||
Administrators configure recurring prompts in **Assistant → Scheduled tasks**.
|
||||
Tasks use Quartz cron syntax (for example `0 0 8 * * ?`) and an IANA timezone
|
||||
(for example `America/Chicago`; default `UTC`). Tasks start disabled.
|
||||
|
||||
```java
|
||||
config.withUiApiBaseUrl("http://127.0.0.1:8000")
|
||||
.withScheduledTasksSchedulerName("hostScheduler")
|
||||
.withAllowedScheduledCredentialEnvNames(Set.of("ASSISTANT_SCHEDULED_TOKEN"));
|
||||
```
|
||||
|
||||
Provide a long-lived access token accepted by the host's authentication provider
|
||||
in that environment variable. Store only its **name** on the task and set
|
||||
`runAsUserId` to the corresponding QQQ user id. The runner posts the token to
|
||||
`/qqq/v1/manageSession`, reads its session cookie and verifies the returned
|
||||
session's user before starting a new conversation. No system session reads user
|
||||
data. Configure the loopback URL at startup; a scheduled job cannot rely on a
|
||||
browser having visited first.
|
||||
|
||||
For kof22, provision a designated Authentik account with the intended application
|
||||
permissions, obtain a token that kof22's QQQ authentication provider accepts as an
|
||||
`accessToken`, and inject it through the existing secret-manager/ExternalSecret
|
||||
pipeline. An Authentik management API token is suitable only if the host's auth
|
||||
adapter explicitly accepts it. Rotate the token in the secret manager, never in
|
||||
the task table. This feature does not provision an account or token.
|
||||
|
||||
**Run now**, **Approve write mode** and **Revoke write mode** are Review/Result
|
||||
record actions. Write approval names the designated user and displays the exact
|
||||
prompt SHA-256. Changing prompt, user, credential reference, profile or write-mode
|
||||
request clears approval. Scheduled writes always wait for that user's panel
|
||||
confirmation, even if normal policy disables confirmation.
|
||||
|
||||
Each run keeps an owner-locked audit row and a normal conversation. RECORD adds
|
||||
no notification; NOTIFICATION and BOTH also notify the designated user through
|
||||
the optional Alerts QBit SPI. Without Alerts, notification delivery is log-only.
|
||||
HIPAA summaries are always `see conversation`. Cost caps stop at dispatch
|
||||
boundaries, so the last completed call can cross the cap; no further call starts.
|
||||
Apply the [P-g migration](UPGRADE.md#p-g-scheduled-tasks) before enabling jobs.
|
||||
### 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,5 +1,205 @@
|
||||
# Upgrading qbit-assistant
|
||||
|
||||
## Provider API extraction (#30)
|
||||
|
||||
Hosts that depend on `qbit-assistant` keep working: it now brings in
|
||||
`qbit-assistant-provider-api` transitively. Package names are unchanged, including
|
||||
`com.kingsrook.qbits.assistant.engine.ModelPricing`. No schema migration is needed.
|
||||
|
||||
External providers and applications using only provider/pricing types should
|
||||
replace their `qbit-assistant` dependency with
|
||||
`com.kingsrook.qbits:qbit-assistant-provider-api` at the same version. This removes
|
||||
the assistant runtime and QQQ from that dependency path; only Jackson annotations
|
||||
are required by the API. Anthropic, OpenAI, Bedrock and Vertex adapters use this
|
||||
split; pgvector retains `qbit-assistant` for its runtime RAG interfaces.
|
||||
|
||||
Recompile custom provider types that override `validate(AssistantProvider)` and
|
||||
change the signature to `validate(ProviderSettings)`. The settings carry the
|
||||
configured kind, URL, API version, region, project, CA bundle name, timeouts and
|
||||
`apiKeyEnvName`; the key and bearer-token supplier are not resolved for validation.
|
||||
Providers using the default validator need no source change. Keep the runtime and
|
||||
provider artifacts on the same version; old validator overrides must be rebuilt.
|
||||
## P-g: scheduled tasks
|
||||
|
||||
Apply the **P-g** DDL in [docs/schema-postgres.sql](docs/schema-postgres.sql)
|
||||
before deploying. The unique `(task_id, scheduled_for)` constraint is required
|
||||
for multi-replica safety; retain run rows as schedule-slot claim history.
|
||||
Existing conversations default to channel `panel`. Tasks start disabled.
|
||||
|
||||
Set `withScheduledTasksSchedulerName(...)` to an existing QQQ scheduler and
|
||||
configure `withUiApiBaseUrl(...)` with this replica's own listener URL. The runner
|
||||
polls every 60 seconds. QQQ must supply a scheduler session able to manage the
|
||||
assistant tables; this QBit never creates that session. The configured backend
|
||||
must enforce unique keys atomically (Postgres does).
|
||||
|
||||
Allow only designated credential references with
|
||||
`withAllowedScheduledCredentialEnvNames(Set.of("ASSISTANT_SCHEDULED_TOKEN"))`.
|
||||
Provide that variable through the host's secret manager. It must hold a token
|
||||
accepted by the host's `manageSession` authentication provider for `runAsUserId`.
|
||||
The runner fails closed on missing/disallowed credentials or an identity mismatch.
|
||||
See [scheduled-task setup](README.md#scheduled-tasks) for kof22 provisioning.
|
||||
|
||||
QQQ RC.5 has no conditional UpdateInput. The runner uses a database-unique
|
||||
schedule-slot insertion as its optimistic claim, then advances `nextRunAt`
|
||||
before starting work. Crashes can skip a slot; they never retry it. No ArchUnit
|
||||
exception or fabricated session is introduced. Core client-channel enforcement
|
||||
arrives with the client-channel RC; the header and tool audit are already sent.
|
||||
|
||||
Notifications use the optional Alerts QBit notification SPI with a single-user
|
||||
audience. Without it, delivery logs run id/status only. All output modes retain
|
||||
the owner-locked audit row and conversation. HIPAA run summaries never copy the
|
||||
answer; they contain only `see conversation`.
|
||||
|
||||
## P-f: knowledge retrieval
|
||||
|
||||
Apply the **P-f** assistant-table DDL in
|
||||
[docs/schema-postgres.sql](docs/schema-postgres.sql) before deployment. It adds
|
||||
`assistant_model.model_kind` (existing rows default to CHAT),
|
||||
`embedding_dimensions`, and the admin-only `assistant_rag_source` table.
|
||||
No sources are seeded. Existing chat selections remain unchanged; explicitly
|
||||
EMBEDDING models are excluded from chat, classifier, fallback and downgrade
|
||||
selection. Correct discovery's kind/dimensions if a model name is ambiguous.
|
||||
|
||||
For persistent vectors, add `qbit-assistant-rag-pgvector` at the same version as
|
||||
the QBit, supply the host's JDBC DataSource/driver, and install pgvector in the
|
||||
database. A DBA runs `CREATE EXTENSION IF NOT EXISTS vector`; the application
|
||||
role needs schema creation rights for initial setup (or a DBA-created schema),
|
||||
then normal DML rights. `ensureSchema()` checks for an existing extension first
|
||||
and does not require extension installation privileges when it is already present.
|
||||
The optional pgvector DDL is a **commented reference block**, separate from the
|
||||
assistant-table migration. See [RAG setup](README.md#rag-setup).
|
||||
|
||||
Use a distinct validated schema for each QQQ instance. `vector(N)` fixes dimensions
|
||||
for that store; changing dimensions requires a new schema and re-indexing.
|
||||
Sources can use different models with that dimension; ranking is restricted to
|
||||
sources using the query's model. If the weights behind an unchanged model id
|
||||
change, clear and rebuild its sources. Editing source chunk/filter/model settings
|
||||
or registry model identity/dimensions automatically clears affected vectors.
|
||||
|
||||
Every indexing batch produces EMBED usage and updates existing budget rollups.
|
||||
PHI source content and PHI conversation queries require a HIPAA-eligible embedding
|
||||
provider. No background runner or designated credentials are installed in P-f.
|
||||
The default in-memory store is lost on restart and must be indexed again.
|
||||
|
||||
## P-e: profile routing and provider fallback
|
||||
|
||||
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):
|
||||
@@ -111,10 +311,100 @@ Deploy RC.3 and run the statements above in the same maintenance window. Until t
|
||||
## 0.1.0-RC.6: tools through the UI API
|
||||
|
||||
Database (see `docs/schema-postgres.sql`):
|
||||
- new tables `assistant_data_access` and `assistant_pending_action`;
|
||||
- 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.
|
||||
@@ -114,7 +114,20 @@ Owner: *"the agent should have to go through the same API that the UIUX does. th
|
||||
- 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. All other open questions in this section were decided as recommended (shared rule: "all recommendations accepted").
|
||||
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)
|
||||
|
||||
@@ -204,6 +217,361 @@ A confirmed write adds its own row. The rows are a child list on conversations,
|
||||
|
||||
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.
|
||||
|
||||
### P-f as built
|
||||
|
||||
- `AssistantModelProvider.embed` is optional and unsupported by default. The
|
||||
OpenAI-compatible implementation shares chat's JDK HTTP authentication, TLS,
|
||||
Azure deployment paths, timeout and sanitized error mapping. A request accepts
|
||||
1–64 inputs; `EmbeddingService` batches larger jobs and records each call as
|
||||
EMBED, including daily rollups and provider/model budget accounting.
|
||||
- Registry rows have CHAT/EMBEDDING kinds and embedding dimensions. Legacy rows
|
||||
remain CHAT. Discovery suggests EMBEDDING for ids containing embed, bge, e5,
|
||||
gte or nomic; administrators can correct it. Chat routing/fallback/downgrades
|
||||
cannot select an embedding model. Embedding resolution is explicit and checks
|
||||
fresh provider enablement and HIPAA eligibility before dispatch.
|
||||
- `assistant_rag_source` is an admin-only navigation table. Its text fields must
|
||||
exist and allow VALUES/MASKED exposure; application data access must allow READ.
|
||||
Index now and Clear index are standard streamed ETL record actions with Review
|
||||
and Result, never navigation entries. Indexing pages the UI API as the clicking
|
||||
admin, reuses get_record's masking path, chunks deterministically and compares
|
||||
hashes. Complete scans alone prune disappeared records; per-record replacement
|
||||
also removes obsolete field chunks. Configuration/model identity changes clear
|
||||
stale vectors. No source text is saved on a source or vector row.
|
||||
- `VectorStore` supplies upsert/delete/search/count plus content-free chunk
|
||||
reconciliation and atomic record replacement. The in-memory implementation uses
|
||||
exact cosine; the optional pgvector module uses host JDBC, a validated instance
|
||||
schema, bound values and an HNSW cosine index. Sources from other embedding
|
||||
models are excluded before ranking. The DBA installs pgvector; existing
|
||||
installations do not require extension-installation privileges on startup.
|
||||
- `KnowledgeTool` is separate from the unchanged `UiApiToolbox`. A small
|
||||
ContextBuilder hook adds it only for an enabled source, policy permission and
|
||||
UI-readable source table. Search embeds the question, requests 4× the result
|
||||
limit, then re-reads each hit through get_record with the asking user's session.
|
||||
403/404 hits contribute only to the filtered count. Safe current values produce
|
||||
snippets and `/app` citations; record refs propagate touched tables into P-c
|
||||
classification and the normal tool-call log. The citation instruction is in
|
||||
the static rules block. The result limit is capped at eight.
|
||||
- PHI source content and PHI conversation queries only reach eligible embedding
|
||||
providers. Embedding budgets, kill switch and provider concurrency checks apply
|
||||
to each batch. A budget downgrade into another vector space stops embedding.
|
||||
- Tests exercise real fixture UI API reads, denials, record locks, field masking,
|
||||
PHI refusal, classification, reconciliation, embedding wire contracts and a
|
||||
golden cited answer. JDBC shape/transaction tests always run; a pgvector:pg16
|
||||
Testcontainers test skips on hosts without Docker.
|
||||
- P-g may invoke the manual service within a designated user's authenticated
|
||||
context. P-f supplies no scheduled runner or stored/elevated session. Multiple
|
||||
replicas should serialize manual re-indexing of a source at the host level;
|
||||
per-record pgvector replacement is transactional, while scan reconciliation is
|
||||
not a snapshot of concurrently changing application data.
|
||||
|
||||
### P-g as built
|
||||
|
||||
- `assistant_scheduled_task` is admin-only, AI exposure NONE, and appears as
|
||||
Scheduled tasks. The owner-locked, read-only `assistant_scheduled_run` child
|
||||
list retains run status, accounting and a bounded summary. Conversations gain
|
||||
read-only `scheduledTaskId` and `channel` (`panel` or `assistant/scheduled`).
|
||||
Task and run timestamps use the runtime clock; cron uses Quartz and a validated
|
||||
ZoneId, including DST. Enablement and schedule edits recompute `nextRunAt`.
|
||||
- Credentials are references, never stored tokens. `credentialEnvName` must
|
||||
match `[A-Z_][A-Z0-9_]*` and the dedicated
|
||||
`allowedScheduledCredentialEnvNames` allowlist. The existing secret resolver
|
||||
supplies its value. Read-only `credentialStatus` reports presence without
|
||||
exposing token characters and is stripped on every save.
|
||||
- A run sends JSON `{accessToken: ...}` to the same loopback base URL's
|
||||
`POST /qqq/v1/manageSession`. RC.5 with HTTP-only cookies returns the UUID in
|
||||
`Set-Cookie: sessionUUID`; legacy JSON `uuid` is also accepted. Only then does
|
||||
the runner resolve that UUID through the host authentication module, exactly
|
||||
the UUID lookup used by the UI request pipeline. No direct token authentication,
|
||||
automated-user session or constructed QSession exists in assistant code.
|
||||
The resolved user id must equal `runAsUserId` before any model call. MOCK in
|
||||
the integration fixture maps test tokens to the existing user-prefix sessions;
|
||||
that token adapter is test code only.
|
||||
- kof22 provisions an Authentik designated account with normal QQQ permissions
|
||||
and injects an accepted long-lived token through its secret manager and
|
||||
ExternalSecret into an allow-listed environment variable. The task holds the
|
||||
variable name and QQQ user id. Host authentication must accept that token type
|
||||
as `accessToken`; an Authentik management API token is not automatically an
|
||||
application access token. Neither account nor credential is provisioned here.
|
||||
- `assistantScheduledTasksRunner` registers a 60-second QScheduleMetaData when
|
||||
`scheduledTasksSchedulerName` names a host scheduler. QQQ supplies its normal
|
||||
scheduler context for assistant-table bookkeeping; no ArchUnit exception is
|
||||
necessary. Configure `uiApiBaseUrl` at startup. No browser visit is required.
|
||||
- **Claim compatibility:** RC.5 UpdateInput cannot express a conditional
|
||||
`WHERE next_run_at = expected`. AssistantStore therefore claims the expected
|
||||
schedule slot using the database-enforced unique `(taskId, scheduledFor)` run
|
||||
key and advances `nextRunAt` before login/dispatch. This is a unique-insert
|
||||
optimistic claim rather than a conditional update. The memory fixture also
|
||||
serializes claim operations on its instance. The database constraint, not
|
||||
that monitor, prevents cross-replica duplicate execution. Do not remove claim
|
||||
history or deploy to a backend without atomic unique keys. A crash can lose a
|
||||
run; it never retries a claimed slot. A later tick advances an already-claimed
|
||||
slot left behind by a crash between claim and schedule update.
|
||||
- The unchanged AssistantApi starts a new normal turn under the logged-in
|
||||
designated user, preserving start gates, rate limiting, P-c classification,
|
||||
P-d budgets and P-e routing/fallback. An internal context supplies the task's
|
||||
selected profile and additional cost cap. Cost includes chat, classifier,
|
||||
failed calls and knowledge-query embeddings. STOP is checked at dispatch
|
||||
boundaries; an in-flight call can exceed the cap, and no next call is sent.
|
||||
- Every scheduled UI API request, including metadata and knowledge retrieval,
|
||||
carries `X-QQQ-Client: assistant/scheduled/<taskId>`. The only uiapi change is
|
||||
additive `LoopbackUiApiGateway.invokeWithClient`; custom gateways currently
|
||||
fail closed for scheduled requests because their channel contract is unknown.
|
||||
Tool-call rows also record `clientChannel`. Core channel deny enforcement
|
||||
remains pending the client-channel RC; existing AI exposure/data-access
|
||||
restrictions continue to apply on RC.5.
|
||||
- Approve write mode, Revoke write mode and Run now are admin record actions
|
||||
using standard streamed ETL Review/Result. Review shows the exact prompt's
|
||||
SHA-256 and run-as user. Result rereads and compares the complete reviewed
|
||||
definition before recording the actual administrator's user id and time.
|
||||
A persisted approval hash additionally binds prompt, run-as user, credential
|
||||
reference, profile and requested mode. Editing any of these clears approval;
|
||||
ordinary saves cannot set approval or computed bookkeeping fields.
|
||||
- This base has create/update/delete tools, but no W1 conversation mode/policy
|
||||
switch. Scheduled runs explicitly narrow the existing tool policy: write tools
|
||||
require both request and matching approval, a READ_WRITE table and the policy's
|
||||
allowed-tools list. All scheduled writes require panel confirmation, including
|
||||
when normal policy allows immediate writes. A pending proposal adds a waiting
|
||||
notice to the run summary; the scheduler never confirms it.
|
||||
- RECORD keeps the run and conversation; NOTIFICATION and BOTH also submit an
|
||||
Alerts notification with `NotificationAudience.user(runAsUserId)` and an
|
||||
`/app/...` conversation link. Reflection targets the installed Alerts QBit's
|
||||
RC.5 notification SPI/sink, following WebhooksAlerts' optional-dependency
|
||||
pattern. Without it, a log contains run id and status only. Notification text
|
||||
contains no answer data. In HIPAA mode run summaries contain exactly
|
||||
`see conversation`; conversation payloads retain the existing encryption.
|
||||
The existing record URL is an admin-screen link. Non-admin owners can read
|
||||
their scheduled conversations in the panel's conversation list; opening a
|
||||
particular existing conversation from a notification still needs a frontend
|
||||
deep-link contract (the current panel only supports open/new-prompt links).
|
||||
This phase does not broaden existing conversation record-screen permissions.
|
||||
- Failures close the run as FAILED or BLOCKED with sanitized errors and wait
|
||||
until the next schedule. All output modes retain their audit record. Tests
|
||||
exercise real manageSession and UI API requests with a fixed clock, designated
|
||||
permissions and owner locks, headers, competing runners, approval invalidation,
|
||||
notification modes, PHI refusal, encrypted HIPAA storage and cost STOP.
|
||||
|
||||
### 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:**
|
||||
@@ -211,3 +579,36 @@ The golden and red-team evals now run through the UI API too.
|
||||
- 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,7 +98,7 @@ 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),
|
||||
@@ -173,10 +176,22 @@ CREATE TABLE assistant_provider
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(100) NOT NULL UNIQUE,
|
||||
provider_type VARCHAR(50) NOT NULL,
|
||||
model VARCHAR(100),
|
||||
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),
|
||||
@@ -185,12 +200,38 @@ CREATE TABLE assistant_provider
|
||||
last_test_at TIMESTAMP WITH TIME ZONE,
|
||||
last_test_status VARCHAR(16),
|
||||
last_test_latency_ms INTEGER,
|
||||
last_test_model VARCHAR(100),
|
||||
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,
|
||||
@@ -215,7 +256,7 @@ CREATE TABLE assistant_usage
|
||||
turn_id INTEGER,
|
||||
provider_id INTEGER,
|
||||
provider_type VARCHAR(50),
|
||||
model VARCHAR(100),
|
||||
model VARCHAR(200),
|
||||
purpose VARCHAR(16),
|
||||
status VARCHAR(16),
|
||||
error_kind VARCHAR(32),
|
||||
@@ -275,10 +316,10 @@ CREATE TABLE assistant_pending_action
|
||||
table_name VARCHAR(128),
|
||||
record_id VARCHAR(128),
|
||||
params_json TEXT,
|
||||
summary VARCHAR(500),
|
||||
summary TEXT,
|
||||
status VARCHAR(16),
|
||||
http_status INTEGER,
|
||||
result_summary VARCHAR(500),
|
||||
result_summary TEXT,
|
||||
expires_at TIMESTAMP WITH TIME ZONE,
|
||||
decided_at TIMESTAMP WITH TIME ZONE,
|
||||
create_date TIMESTAMP WITH TIME ZONE,
|
||||
@@ -286,3 +327,250 @@ CREATE TABLE assistant_pending_action
|
||||
);
|
||||
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);
|
||||
|
||||
|
||||
-- P-f: embedding registry and admin-only knowledge-source configuration.
|
||||
ALTER TABLE assistant_model ADD COLUMN model_kind VARCHAR(16) DEFAULT 'CHAT'
|
||||
CHECK (model_kind IN ('CHAT', 'EMBEDDING'));
|
||||
ALTER TABLE assistant_model ADD COLUMN embedding_dimensions INTEGER
|
||||
CHECK (embedding_dimensions > 0);
|
||||
|
||||
CREATE TABLE assistant_rag_source (
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(200) NOT NULL,
|
||||
enabled BOOLEAN DEFAULT TRUE,
|
||||
table_name VARCHAR(200) NOT NULL,
|
||||
field_names VARCHAR(500) NOT NULL,
|
||||
title_field_name VARCHAR(200),
|
||||
filter_json TEXT,
|
||||
embedding_model_id INTEGER NOT NULL REFERENCES assistant_model(id),
|
||||
chunk_chars INTEGER DEFAULT 1500 CHECK (chunk_chars BETWEEN 100 AND 16000),
|
||||
chunk_overlap_chars INTEGER DEFAULT 200 CHECK (chunk_overlap_chars >= 0 AND chunk_overlap_chars < chunk_chars),
|
||||
last_indexed_at TIMESTAMPTZ,
|
||||
last_index_status VARCHAR(200),
|
||||
last_index_error VARCHAR(500),
|
||||
indexed_record_count INTEGER,
|
||||
indexed_chunk_count INTEGER,
|
||||
create_date TIMESTAMPTZ,
|
||||
modify_date TIMESTAMPTZ
|
||||
);
|
||||
|
||||
-- Optional pgvector part: reference only. Run the extension step as a DBA.
|
||||
-- PgVectorStore.ensureSchema() performs the remainder for the host's schema/N.
|
||||
-- Use a distinct schema per QQQ instance; match N to the embedding model.
|
||||
-- CREATE EXTENSION IF NOT EXISTS vector;
|
||||
-- CREATE SCHEMA IF NOT EXISTS assistant_rag;
|
||||
-- CREATE TABLE IF NOT EXISTS assistant_rag.assistant_rag_chunk (
|
||||
-- id BIGSERIAL PRIMARY KEY,
|
||||
-- source_id INT NOT NULL,
|
||||
-- table_name TEXT NOT NULL,
|
||||
-- record_pk TEXT NOT NULL,
|
||||
-- field_name TEXT NOT NULL,
|
||||
-- chunk_index INT NOT NULL,
|
||||
-- content_hash CHAR(64) NOT NULL,
|
||||
-- embedding vector(1024) NOT NULL,
|
||||
-- indexed_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
-- UNIQUE(source_id, table_name, record_pk, field_name, chunk_index)
|
||||
-- );
|
||||
-- CREATE INDEX IF NOT EXISTS assistant_rag_chunk_cosine
|
||||
-- ON assistant_rag.assistant_rag_chunk USING hnsw (embedding vector_cosine_ops);
|
||||
|
||||
-- P-g: designated-user scheduled assistant tasks. Install before enabling jobs.
|
||||
CREATE TABLE assistant_scheduled_task (
|
||||
id SERIAL PRIMARY KEY,
|
||||
name VARCHAR(200) NOT NULL,
|
||||
enabled BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
prompt TEXT NOT NULL CHECK (char_length(prompt) BETWEEN 1 AND 4000),
|
||||
run_as_user_id VARCHAR(200) NOT NULL,
|
||||
credential_env_name VARCHAR(200) NOT NULL,
|
||||
credential_status VARCHAR(200), -- computed; always NULL in stored rows
|
||||
profile_id INTEGER REFERENCES assistant_profile(id),
|
||||
cron_expression VARCHAR(200) NOT NULL,
|
||||
timezone VARCHAR(100) NOT NULL DEFAULT 'UTC',
|
||||
next_run_at TIMESTAMPTZ,
|
||||
output_mode VARCHAR(20) NOT NULL DEFAULT 'RECORD' CHECK (output_mode IN ('RECORD', 'NOTIFICATION', 'BOTH')),
|
||||
write_mode_requested BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
write_mode_approved_by VARCHAR(200),
|
||||
write_mode_approved_at TIMESTAMPTZ,
|
||||
write_mode_approval_hash VARCHAR(64),
|
||||
max_cost_usd_per_run NUMERIC(18,6) CHECK (max_cost_usd_per_run >= 0),
|
||||
last_run_at TIMESTAMPTZ,
|
||||
last_run_status VARCHAR(20),
|
||||
last_run_error VARCHAR(500),
|
||||
create_date TIMESTAMPTZ,
|
||||
modify_date TIMESTAMPTZ
|
||||
);
|
||||
CREATE INDEX assistant_scheduled_task_due ON assistant_scheduled_task(next_run_at) WHERE enabled;
|
||||
|
||||
ALTER TABLE assistant_conversation ADD COLUMN scheduled_task_id INTEGER REFERENCES assistant_scheduled_task(id);
|
||||
ALTER TABLE assistant_conversation ADD COLUMN channel VARCHAR(64) NOT NULL DEFAULT 'panel';
|
||||
ALTER TABLE assistant_tool_call ADD COLUMN client_channel VARCHAR(64);
|
||||
|
||||
CREATE TABLE assistant_scheduled_run (
|
||||
id SERIAL PRIMARY KEY,
|
||||
task_id INTEGER NOT NULL REFERENCES assistant_scheduled_task(id),
|
||||
user_id VARCHAR(200) NOT NULL,
|
||||
scheduled_for TIMESTAMPTZ NOT NULL,
|
||||
started_at TIMESTAMPTZ,
|
||||
ended_at TIMESTAMPTZ,
|
||||
status VARCHAR(20) NOT NULL CHECK (status IN ('RUNNING', 'OK', 'FAILED', 'SKIPPED', 'BLOCKED')),
|
||||
conversation_id INTEGER REFERENCES assistant_conversation(id) ON DELETE SET NULL,
|
||||
turn_id INTEGER REFERENCES assistant_turn(id) ON DELETE SET NULL,
|
||||
summary VARCHAR(2000),
|
||||
cost_micros BIGINT,
|
||||
error VARCHAR(500),
|
||||
create_date TIMESTAMPTZ,
|
||||
modify_date TIMESTAMPTZ,
|
||||
UNIQUE (task_id, scheduled_for)
|
||||
);
|
||||
CREATE INDEX assistant_scheduled_run_owner ON assistant_scheduled_run(user_id, started_at);
|
||||
@@ -10,3 +10,33 @@ Light and dark, 390 and 1440 px:
|
||||
- `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.
|
||||
|
||||
Answer presentation (owner priority, 2026-10-13), taken against `OpenAiDemoServer` with the Next UI build of QRun-IO/qqq-frontend-next#111 (`next dev` proxied to the demo). The demo's OpenAI-compatible mock answers "How many images do I have by type?" the way a model would through the real adapter: five `count_records` calls through the UI API, then `present_results`.
|
||||
|
||||
Light and dark, 390 and 1440 px:
|
||||
- `panel-presentation-*`: the summary line, an Images metric, the "Media by type" table (counts and the server-computed 80.2% and 19.8%, each row a filtered-list link), the pie chart, two filter links (Open JPEG media, Open PNG media) and a follow-up action.
|
||||
|
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: 112 KiB |
|
After Width: | Height: | Size: 46 KiB |
|
After Width: | Height: | Size: 113 KiB |
|
After Width: | Height: | Size: 47 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: 124 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 126 KiB |
|
After Width: | Height: | Size: 42 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: 82 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 83 KiB |
|
After Width: | Height: | Size: 36 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 |
@@ -50,8 +50,13 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<modules>
|
||||
<module>qbit-assistant-provider-api</module>
|
||||
<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>
|
||||
<module>qbit-assistant-rag-pgvector</module>
|
||||
</modules>
|
||||
|
||||
<licenses>
|
||||
@@ -81,6 +86,26 @@
|
||||
|
||||
<dependencyManagement>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant-provider-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
<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 +126,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 +200,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 +212,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>
|
||||
|
||||
@@ -32,9 +32,14 @@
|
||||
<url>https://github.com/QRun-IO/qbit-assistant</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant-provider-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qbits</groupId>
|
||||
<artifactId>qbit-assistant</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.kingsrook.qqq</groupId>
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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;
|
||||
@@ -342,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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -108,6 +108,24 @@ class AnthropicRequestContractTest
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** 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.
|
||||
|
||||
@@ -129,6 +129,22 @@ public class AssistantDemoServer extends AbstractQQQApplication
|
||||
"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");
|
||||
@@ -144,6 +160,15 @@ public class AssistantDemoServer extends AbstractQQQApplication
|
||||
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);
|
||||
|
||||
@@ -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,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,116 @@
|
||||
<?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-api</artifactId>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>QBit Assistant - Provider API</name>
|
||||
<description>Provider SPI and pricing value types, independent of the assistant runtime</description>
|
||||
<url>https://github.com/QRun-IO/qbit-assistant</url>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-annotations</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.fasterxml.jackson.core</groupId>
|
||||
<artifactId>jackson-databind</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>
|
||||
<dependency>
|
||||
<groupId>com.tngtech.archunit</groupId>
|
||||
<artifactId>archunit-junit5</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<configuration>
|
||||
<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>
|
||||
@@ -20,7 +20,6 @@ package com.kingsrook.qbits.assistant.engine;
|
||||
import java.io.Serializable;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import com.kingsrook.qbits.assistant.AssistantModelRouting;
|
||||
import com.kingsrook.qbits.assistant.provider.ModelUsage;
|
||||
|
||||
|
||||
@@ -63,9 +62,9 @@ public class ModelPricing implements Serializable
|
||||
public static Map<String, ModelPricing> defaults()
|
||||
{
|
||||
Map<String, ModelPricing> map = new LinkedHashMap<>();
|
||||
map.put(AssistantModelRouting.SONNET_5_5, of(2.0, 10.0, 0.1));
|
||||
map.put(AssistantModelRouting.OPUS_5_5, of(4.0, 20.0, 0.05));
|
||||
map.put(AssistantModelRouting.HAIKU_5_5, of(0.10, 0.50, 0.1));
|
||||
map.put("claude-sonnet-5-5", of(2.0, 10.0, 0.1));
|
||||
map.put("claude-opus-5-5", of(4.0, 20.0, 0.05));
|
||||
map.put("claude-haiku-5-5", of(0.10, 0.50, 0.1));
|
||||
map.put("claude-fable-5-1", of(10.0, 50.0, 0.025));
|
||||
map.put("claude-fable-5", of(10.0, 50.0, 0.1));
|
||||
map.put("claude-opus-5", of(5.0, 25.0, 0.1));
|
||||
@@ -58,4 +58,14 @@ public interface AssistantModelProvider
|
||||
return (null);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Optional embedding capability. Unsupported adapters fail before transport.
|
||||
*******************************************************************************/
|
||||
default EmbeddingResponse embed(EmbeddingRequest request) throws ModelProviderException
|
||||
{
|
||||
throw (new ModelProviderException(ModelProviderException.Kind.INVALID_REQUEST, null, "Embeddings are unsupported by this provider."));
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,161 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A kind of model provider an admin can configure in the assistant_provider
|
||||
** table (Anthropic now; OpenAI-compatible, Bedrock and others plug in the
|
||||
** same way). Hosts register types with AssistantQBitConfig.withProviderType;
|
||||
** the provider settings screen offers the registered types and their models.
|
||||
**
|
||||
** create() receives the API key already resolved from its reference; it must
|
||||
** never log the key or put it in toString or exception messages.
|
||||
*******************************************************************************/
|
||||
public interface AssistantProviderType
|
||||
{
|
||||
|
||||
/*******************************************************************************
|
||||
** The type's id, stored in assistant_provider.providerType (e.g. "anthropic").
|
||||
*******************************************************************************/
|
||||
String getType();
|
||||
|
||||
/*******************************************************************************
|
||||
** A label for the settings screen.
|
||||
*******************************************************************************/
|
||||
String getLabel();
|
||||
|
||||
/*******************************************************************************
|
||||
** The models offered for this type, best default first.
|
||||
*******************************************************************************/
|
||||
List<String> getModels();
|
||||
|
||||
/*******************************************************************************
|
||||
** The environment variable that holds the key by default (e.g.
|
||||
** ANTHROPIC_API_KEY).
|
||||
*******************************************************************************/
|
||||
String getDefaultApiKeyEnvName();
|
||||
|
||||
/*******************************************************************************
|
||||
** The provider's own API base URL (shown when no override is set).
|
||||
*******************************************************************************/
|
||||
String getDefaultBaseUrl();
|
||||
|
||||
/*******************************************************************************
|
||||
** Build a provider. apiKey is the resolved secret (never null or empty);
|
||||
** baseUrl is null for the type's default.
|
||||
*******************************************************************************/
|
||||
AssistantModelProvider create(String apiKey, String baseUrl);
|
||||
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Backward-compatible provider registry extension.
|
||||
*******************************************************************************/
|
||||
default List<String> getKinds()
|
||||
{
|
||||
return (List.of(getType().toUpperCase(java.util.Locale.ROOT).replace('-', '_')));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Backward-compatible provider registry extension.
|
||||
*******************************************************************************/
|
||||
default String getDefaultBaseUrl(String kind)
|
||||
{
|
||||
return (getDefaultBaseUrl());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Backward-compatible provider registry extension.
|
||||
*******************************************************************************/
|
||||
default String getDefaultApiKeyEnvName(String kind)
|
||||
{
|
||||
return (getDefaultApiKeyEnvName());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Backward-compatible provider registry extension.
|
||||
*******************************************************************************/
|
||||
default String getDefaultLocation(String kind)
|
||||
{
|
||||
return ("CLOUD");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Backward-compatible provider registry extension.
|
||||
*******************************************************************************/
|
||||
default AssistantModelProvider create(ProviderSettings settings)
|
||||
{
|
||||
return (create(settings.getApiKey(), settings.getBaseUrl()));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Backward-compatible provider registry extension.
|
||||
*******************************************************************************/
|
||||
default List<DiscoveredModel> discoverModels(ProviderSettings settings) throws ModelProviderException
|
||||
{
|
||||
return (getModels().stream().map(id -> new DiscoveredModel(id, id, null, null)).toList());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Backward-compatible provider registry extension.
|
||||
*******************************************************************************/
|
||||
default HealthResult checkHealth(ProviderSettings settings)
|
||||
{
|
||||
return (new HealthResult(null, null, "Health check not supported"));
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Additional settings errors, without resolving credentials or doing I/O.
|
||||
** Settings contain configured values and apiKeyEnvName; apiKey, the bearer
|
||||
** token supplier and SSLContext are not resolved for validation.
|
||||
*******************************************************************************/
|
||||
default List<String> validate(ProviderSettings settings)
|
||||
{
|
||||
return (List.of());
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Whether this kind needs an explicit URL when it has no fixed default.
|
||||
** Cloud SDKs can instead derive their endpoint from region and project.
|
||||
*******************************************************************************/
|
||||
default boolean requiresBaseUrl(String kind)
|
||||
{
|
||||
return (getDefaultBaseUrl(kind) == null);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -79,20 +79,29 @@ public class CompletableStreamHandle implements StreamHandle
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Finish with a response.
|
||||
** Finish with a response (ignored once cancelled: cancel() answers with a
|
||||
** cancelled response, and closing the stream may wake the worker first).
|
||||
*******************************************************************************/
|
||||
public void complete(ModelResponse response)
|
||||
{
|
||||
if(cancelled.get())
|
||||
{
|
||||
return;
|
||||
}
|
||||
future.complete(response);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Finish with an error.
|
||||
** Finish with an error (ignored once cancelled, see complete()).
|
||||
*******************************************************************************/
|
||||
public void fail(ModelProviderException exception)
|
||||
{
|
||||
if(cancelled.get())
|
||||
{
|
||||
return;
|
||||
}
|
||||
future.completeExceptionally(exception);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A model advertised by the provider, without inferred capabilities.
|
||||
*******************************************************************************/
|
||||
public record DiscoveredModel(String modelId, String displayName, Integer contextWindowTokens, String ownedBy)
|
||||
{
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** One embedding batch. Providers accept at most 64 inputs per request.
|
||||
*******************************************************************************/
|
||||
public record EmbeddingRequest(String model, List<String> input)
|
||||
{
|
||||
/*******************************************************************************
|
||||
** Snapshot the inputs and reject empty or oversized batches before transport.
|
||||
*******************************************************************************/
|
||||
public EmbeddingRequest
|
||||
{
|
||||
input = List.copyOf(input);
|
||||
if(model == null || model.isBlank() || input.isEmpty() || input.size() > 64)
|
||||
{
|
||||
throw (new IllegalArgumentException("An embedding request needs a model and 1 to 64 inputs."));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Ordered vectors and billable usage. No input text is retained in the response.
|
||||
*******************************************************************************/
|
||||
public record EmbeddingResponse(List<float[]> vectors, ModelUsage usage, String requestId)
|
||||
{
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** A health probe result; null healthy means unsupported.
|
||||
*******************************************************************************/
|
||||
public record HealthResult(Boolean healthy, Long latencyMs, String message)
|
||||
{
|
||||
/*******************************************************************************
|
||||
** Sanitize provider diagnostics.
|
||||
*******************************************************************************/
|
||||
public HealthResult
|
||||
{
|
||||
message = ModelProviderException.sanitizeProviderMessage(message, 300);
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,16 @@ package com.kingsrook.qbits.assistant.provider;
|
||||
*******************************************************************************/
|
||||
public class ModelCapabilities
|
||||
{
|
||||
|
||||
private Boolean vision = false;
|
||||
|
||||
|
||||
private Boolean streaming = true;
|
||||
|
||||
|
||||
private Boolean reasoningEffort = false;
|
||||
|
||||
|
||||
private Boolean tools = true;
|
||||
private Boolean parallelToolCalls = true;
|
||||
private Boolean promptCaching = false;
|
||||
@@ -182,4 +192,98 @@ public class ModelCapabilities
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for vision
|
||||
*******************************************************************************/
|
||||
public Boolean getVision()
|
||||
{
|
||||
return (this.vision);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for vision
|
||||
*******************************************************************************/
|
||||
public void setVision(Boolean vision)
|
||||
{
|
||||
this.vision = vision;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for vision
|
||||
*******************************************************************************/
|
||||
public ModelCapabilities withVision(Boolean vision)
|
||||
{
|
||||
this.vision = vision;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for streaming
|
||||
*******************************************************************************/
|
||||
public Boolean getStreaming()
|
||||
{
|
||||
return (this.streaming);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for streaming
|
||||
*******************************************************************************/
|
||||
public void setStreaming(Boolean streaming)
|
||||
{
|
||||
this.streaming = streaming;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for streaming
|
||||
*******************************************************************************/
|
||||
public ModelCapabilities withStreaming(Boolean streaming)
|
||||
{
|
||||
this.streaming = streaming;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for reasoningEffort
|
||||
*******************************************************************************/
|
||||
public Boolean getReasoningEffort()
|
||||
{
|
||||
return (this.reasoningEffort);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for reasoningEffort
|
||||
*******************************************************************************/
|
||||
public void setReasoningEffort(Boolean reasoningEffort)
|
||||
{
|
||||
this.reasoningEffort = reasoningEffort;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for reasoningEffort
|
||||
*******************************************************************************/
|
||||
public ModelCapabilities withReasoningEffort(Boolean reasoningEffort)
|
||||
{
|
||||
this.reasoningEffort = reasoningEffort;
|
||||
return (this);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -32,6 +32,11 @@ import java.util.List;
|
||||
*******************************************************************************/
|
||||
public class ModelRequest
|
||||
{
|
||||
|
||||
private ModelCapabilities capabilities;
|
||||
|
||||
|
||||
private Boolean streaming = true;
|
||||
private String model;
|
||||
private String effort;
|
||||
private Integer maxTokens;
|
||||
@@ -48,7 +53,9 @@ public class ModelRequest
|
||||
public ModelRequest copy()
|
||||
{
|
||||
return (new ModelRequest()
|
||||
.withStreaming(streaming)
|
||||
.withModel(model)
|
||||
.withCapabilities(capabilities)
|
||||
.withEffort(effort)
|
||||
.withMaxTokens(maxTokens)
|
||||
.withParallelToolCalls(parallelToolCalls)
|
||||
@@ -274,4 +281,57 @@ public class ModelRequest
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for capabilities
|
||||
*******************************************************************************/
|
||||
public ModelCapabilities getCapabilities()
|
||||
{
|
||||
return (this.capabilities);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for capabilities
|
||||
*******************************************************************************/
|
||||
public void setCapabilities(ModelCapabilities capabilities)
|
||||
{
|
||||
this.capabilities = capabilities;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for capabilities
|
||||
*******************************************************************************/
|
||||
public ModelRequest withCapabilities(ModelCapabilities capabilities)
|
||||
{
|
||||
this.capabilities = capabilities;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Whether to request streaming transport (classifiers use one JSON reply).
|
||||
*******************************************************************************/
|
||||
public Boolean getStreaming()
|
||||
{
|
||||
return (streaming);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Select streaming transport independently of model capability.
|
||||
*******************************************************************************/
|
||||
public ModelRequest withStreaming(Boolean streaming)
|
||||
{
|
||||
this.streaming = streaming;
|
||||
return (this);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,432 @@
|
||||
/*
|
||||
* 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;
|
||||
|
||||
|
||||
import java.util.function.Supplier;
|
||||
import javax.net.ssl.SSLContext;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Resolved connection settings. API keys and bearer-token suppliers are never
|
||||
** included in diagnostics. A supplier resolves a fresh token for each request.
|
||||
*******************************************************************************/
|
||||
public class ProviderSettings
|
||||
{
|
||||
@JsonIgnore
|
||||
private Supplier<String> bearerTokenSupplier;
|
||||
|
||||
private String cloudProject;
|
||||
|
||||
private String tlsCaBundle;
|
||||
@JsonIgnore
|
||||
private transient SSLContext sslContext;
|
||||
private String apiKeyEnvName;
|
||||
private String kind;
|
||||
private String apiKey;
|
||||
private String baseUrl;
|
||||
private String apiVersion;
|
||||
private String region;
|
||||
private Integer connectTimeoutSeconds = 10;
|
||||
private Integer requestTimeoutSeconds = 120;
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for kind
|
||||
*******************************************************************************/
|
||||
public String getKind()
|
||||
{
|
||||
return (this.kind);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for kind
|
||||
*******************************************************************************/
|
||||
public void setKind(String kind)
|
||||
{
|
||||
this.kind = kind;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for kind
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withKind(String kind)
|
||||
{
|
||||
this.kind = kind;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for apiKey
|
||||
*******************************************************************************/
|
||||
public String getApiKey()
|
||||
{
|
||||
return (this.apiKey);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for apiKey
|
||||
*******************************************************************************/
|
||||
public void setApiKey(String apiKey)
|
||||
{
|
||||
this.apiKey = apiKey;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for apiKey
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withApiKey(String apiKey)
|
||||
{
|
||||
this.apiKey = apiKey;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for baseUrl
|
||||
*******************************************************************************/
|
||||
public String getBaseUrl()
|
||||
{
|
||||
return (this.baseUrl);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for baseUrl
|
||||
*******************************************************************************/
|
||||
public void setBaseUrl(String baseUrl)
|
||||
{
|
||||
this.baseUrl = baseUrl;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for baseUrl
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withBaseUrl(String baseUrl)
|
||||
{
|
||||
this.baseUrl = baseUrl;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for apiVersion
|
||||
*******************************************************************************/
|
||||
public String getApiVersion()
|
||||
{
|
||||
return (this.apiVersion);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for apiVersion
|
||||
*******************************************************************************/
|
||||
public void setApiVersion(String apiVersion)
|
||||
{
|
||||
this.apiVersion = apiVersion;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for apiVersion
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withApiVersion(String apiVersion)
|
||||
{
|
||||
this.apiVersion = apiVersion;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for region
|
||||
*******************************************************************************/
|
||||
public String getRegion()
|
||||
{
|
||||
return (this.region);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for region
|
||||
*******************************************************************************/
|
||||
public void setRegion(String region)
|
||||
{
|
||||
this.region = region;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for region
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withRegion(String region)
|
||||
{
|
||||
this.region = region;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for connectTimeoutSeconds
|
||||
*******************************************************************************/
|
||||
public Integer getConnectTimeoutSeconds()
|
||||
{
|
||||
return (this.connectTimeoutSeconds);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for connectTimeoutSeconds
|
||||
*******************************************************************************/
|
||||
public void setConnectTimeoutSeconds(Integer connectTimeoutSeconds)
|
||||
{
|
||||
this.connectTimeoutSeconds = connectTimeoutSeconds;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for connectTimeoutSeconds
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withConnectTimeoutSeconds(Integer connectTimeoutSeconds)
|
||||
{
|
||||
this.connectTimeoutSeconds = connectTimeoutSeconds;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for requestTimeoutSeconds
|
||||
*******************************************************************************/
|
||||
public Integer getRequestTimeoutSeconds()
|
||||
{
|
||||
return (this.requestTimeoutSeconds);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for requestTimeoutSeconds
|
||||
*******************************************************************************/
|
||||
public void setRequestTimeoutSeconds(Integer requestTimeoutSeconds)
|
||||
{
|
||||
this.requestTimeoutSeconds = requestTimeoutSeconds;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for requestTimeoutSeconds
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withRequestTimeoutSeconds(Integer requestTimeoutSeconds)
|
||||
{
|
||||
this.requestTimeoutSeconds = requestTimeoutSeconds;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Safe diagnostic representation.
|
||||
*******************************************************************************/
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
return ("ProviderSettings[kind=" + kind + "]");
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for tlsCaBundle
|
||||
*******************************************************************************/
|
||||
public String getTlsCaBundle()
|
||||
{
|
||||
return (this.tlsCaBundle);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for tlsCaBundle
|
||||
*******************************************************************************/
|
||||
public void setTlsCaBundle(String tlsCaBundle)
|
||||
{
|
||||
this.tlsCaBundle = tlsCaBundle;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for tlsCaBundle
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withTlsCaBundle(String tlsCaBundle)
|
||||
{
|
||||
this.tlsCaBundle = tlsCaBundle;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for sslContext
|
||||
*******************************************************************************/
|
||||
@JsonIgnore
|
||||
public SSLContext getSslContext()
|
||||
{
|
||||
return (this.sslContext);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for sslContext
|
||||
*******************************************************************************/
|
||||
public void setSslContext(SSLContext sslContext)
|
||||
{
|
||||
this.sslContext = sslContext;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for sslContext
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withSslContext(SSLContext sslContext)
|
||||
{
|
||||
this.sslContext = sslContext;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for cloudProject
|
||||
*******************************************************************************/
|
||||
public String getCloudProject()
|
||||
{
|
||||
return (this.cloudProject);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for cloudProject
|
||||
*******************************************************************************/
|
||||
public void setCloudProject(String cloudProject)
|
||||
{
|
||||
this.cloudProject = cloudProject;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for cloudProject
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withCloudProject(String cloudProject)
|
||||
{
|
||||
this.cloudProject = cloudProject;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Getter for bearerTokenSupplier
|
||||
*******************************************************************************/
|
||||
@JsonIgnore
|
||||
public Supplier<String> getBearerTokenSupplier()
|
||||
{
|
||||
return (this.bearerTokenSupplier);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for bearerTokenSupplier
|
||||
*******************************************************************************/
|
||||
public void setBearerTokenSupplier(Supplier<String> bearerTokenSupplier)
|
||||
{
|
||||
this.bearerTokenSupplier = bearerTokenSupplier;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for bearerTokenSupplier
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withBearerTokenSupplier(Supplier<String> bearerTokenSupplier)
|
||||
{
|
||||
this.bearerTokenSupplier = bearerTokenSupplier;
|
||||
return (this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** The configured environment variable name, never its secret value.
|
||||
*******************************************************************************/
|
||||
public String getApiKeyEnvName()
|
||||
{
|
||||
return (this.apiKeyEnvName);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Setter for apiKeyEnvName
|
||||
*******************************************************************************/
|
||||
public void setApiKeyEnvName(String apiKeyEnvName)
|
||||
{
|
||||
this.apiKeyEnvName = apiKeyEnvName;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*******************************************************************************
|
||||
** Fluent setter for apiKeyEnvName
|
||||
*******************************************************************************/
|
||||
public ProviderSettings withApiKeyEnvName(String apiKeyEnvName)
|
||||
{
|
||||
this.apiKeyEnvName = apiKeyEnvName;
|
||||
return (this);
|
||||
}
|
||||
}
|
||||