mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
834 commits from the Tor onion-service branch against 299 of ours, from merge base7b646bdece: 127 conflicted files, 3506 files changed. The two sides are largely orthogonal. Theirs adds svc-net-tor and a `tor` service across the role tree, plus two sweeping refactors: shipped scripts sorted by language (files/ruby/, files/python/, files/shell/, scripts/lint/*.sh) and the unit suite moved under tests/unit/python/. Ours is requirement 036, the native AI gateway, plus the MCP role work. Most conflicts were both sides appending to the same service map, resolved as unions. Resolutions that were not unions: Credentials moved namespace. Theirs renamed meta/schema.yml to meta/secrets.yml and re-addressed credentials as secrets.credentials.<name>. Git carried our litellm_api_key blocks through the rename, but every consumer we added still read 'credentials.<name>', which no longer resolves. All 45 call sites are migrated. plugins/filter/container_volumes.py is deleted by theirs and relocated to plugins/lookup/container_volumes.py, where it carries the same tmpfs defect ourf85996b43had just fixed: a hard-coded {"size": ...} that silently drops a per mount `mode`. The fix is re-applied in the relocated file, as that commit's merge note anticipated. compose.yml keeps only INFINITO_PLAYWRIGHT_REPORTS_BASE_DIR. Theirs also forwards INFINITO_PLAYWRIGHT_STAGE_BASE_DIR; that line is deliberately dropped, per the analysis recorded in45804e9ad-- STAGE has a drift-proof role-vars fallback, while forwarding it promotes a setdefault-pinnable .env value above that SPOT. tasks/stages/01_constructor.yml takes their include, ./tasks/utils/setup/group.yml, because their refactor removed tasks/groups/*-roles.yml, leaving our include target nonexistent. Our task name is kept, since svc-virt is in the loop. Makefile swarm-zombie is a union: their validate plus teardown, then our lab_subnet cleanup, which their side dropped while leaving lab_subnet.sh as the only orphaned reference in the file. 01_bootstrap.sh keeps our deterministic --ip pinning, which distinguishes an already-attached node from a real failure, over their `|| true`. Their language-sorted layout orphaned references our side still held: zammad's two scripts/apply/*.rb, jenkins' java-with-ca-trust.sh, and the notify topics their handlers renamed to hyphenated form. All corrected. roles/sys-svc-compose/files/shell/swarm/stack_ready.sh gains our latched-update block: paused, rollback_paused, rollback_started and rollback_completed exit 2 rather than polling a state that cannot resolve without another deploy. config_from_run is unioned to (title, logged, jobs); the production caller in trigger/__main__.py now passes jobs, without which our suite suppression would have been inert. READMEs are regenerated rather than hand-merged: 15 LiteLLM rows and 91 Tor rows now derive from the merged metadata, which is itself evidence the meta merge is coherent. Verified: 5161 unit tests pass. The single failure, test_query.py TestSortSpec, also fails on fork/feature/svc-net-tor atb51d2f9919, measured in a baseline worktree -- so this merge introduces no new unit-test failure. Two modules are excluded from that run because `baudolo`, a dependency their branch introduces, is not installed on this host. Not verified: no deploy has run against the merged tree, and make quality has not been run end to end here. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
85 lines
3.7 KiB
JavaScript
85 lines
3.7 KiB
JavaScript
const { test, expect } = require("@playwright/test");
|
|
const { resolveTimeout } = require("../timeouts");
|
|
const { skipUnlessAddonEnabled } = require("../addon-gating");
|
|
const shared = require("../_shared");
|
|
const { gotoOnion } = require("../personas");
|
|
|
|
test.use({ ignoreHTTPSErrors: true });
|
|
|
|
const expectApiKey =
|
|
String(process.env.INTEGRATION_OPENAI_EXPECT_API_KEY || "").toLowerCase() === "true";
|
|
|
|
test("integration integration_openai: Nextcloud is configured and coupled to the openwebui/litellm backend", async ({ browser }) => {
|
|
skipUnlessAddonEnabled("integration_openai");
|
|
test.setTimeout(resolveTimeout(120_000));
|
|
|
|
const context = await browser.newContext({ ignoreHTTPSErrors: true });
|
|
const page = await context.newPage();
|
|
|
|
try {
|
|
await shared.loginToStandaloneNextcloud(page);
|
|
|
|
await gotoOnion(page,
|
|
new URL("settings/admin/ai", shared.env.nextcloudBaseUrl).toString(),
|
|
{ waitUntil: "domcontentloaded", timeout: resolveTimeout(60_000) }
|
|
);
|
|
await shared.dismissBlockingNextcloudModals(page, page);
|
|
|
|
const openaiSection = page.locator("#openai_prefs").first();
|
|
await expect(
|
|
openaiSection,
|
|
"the integration_openai admin section (#openai_prefs) must render on settings/admin/ai when the addon is enabled — its absence means the app was never installed/enabled and the coupling failed to provision"
|
|
).toBeVisible({ timeout: resolveTimeout(60_000) });
|
|
|
|
const serviceUrlField = openaiSection
|
|
.locator("#openai-url")
|
|
.or(openaiSection.getByRole("textbox", { name: /service url/i }))
|
|
.first();
|
|
await expect(
|
|
serviceUrlField,
|
|
"the integration_openai admin section must expose the Service URL field (#openai-url)"
|
|
).toBeVisible({ timeout: resolveTimeout(60_000) });
|
|
|
|
const configuredUrl = ((await serviceUrlField.inputValue().catch(() => "")) || "").trim();
|
|
expect(
|
|
configuredUrl.length,
|
|
"the Service URL must be populated from config:app:set so the openwebui/litellm partner endpoint is wired"
|
|
).toBeGreaterThan(0);
|
|
|
|
expect(
|
|
configuredUrl,
|
|
"the Service URL must be a valid http(s) URL pointing at the OpenAI-compatible AI backend (web-app-openwebui base URL or the svc-ai-litellm in-cluster endpoint)"
|
|
).toMatch(/^https?:\/\/.+/i);
|
|
|
|
const configuredHost = new URL(configuredUrl).host;
|
|
expect(
|
|
configuredHost,
|
|
"the Service URL host must be the AI backend partner (openwebui chat.ai.* or the in-cluster litellm gateway), proving the config:app:set actually wired the partner endpoint rather than a placeholder"
|
|
).toMatch(/^(chat\.ai\.|litellm(:\d+)?$)/i);
|
|
expect(
|
|
configuredHost,
|
|
"the Service URL must point at the partner backend, distinct from the Nextcloud host — proving real cross-host coupling, not a self-pointing/unconfigured value"
|
|
).not.toBe(new URL(shared.env.nextcloudBaseUrl).host);
|
|
|
|
if (expectApiKey) {
|
|
const apiKeyField = openaiSection
|
|
.locator("#openai-api-key")
|
|
.or(openaiSection.getByRole("textbox", { name: /api key/i }))
|
|
.first();
|
|
await expect(
|
|
apiKeyField,
|
|
"the integration_openai admin section must expose the API key field (#openai-api-key)"
|
|
).toBeVisible({ timeout: resolveTimeout(60_000) });
|
|
|
|
const configuredApiKey = ((await apiKeyField.inputValue().catch(() => "")) || "").trim();
|
|
expect(
|
|
configuredApiKey.length,
|
|
"the API key must be provisioned (config:app:set integration_openai api_key) so the virtual-key-protected svc-ai-litellm /v1 endpoint authenticates instead of returning 401"
|
|
).toBeGreaterThan(0);
|
|
}
|
|
} finally {
|
|
await page.close().catch(() => {});
|
|
await context.close().catch(() => {});
|
|
}
|
|
});
|