Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 sam
|
972ae502ac |
@@ -1,44 +0,0 @@
|
|||||||
name: CI
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: ['**']
|
|
||||||
tags-ignore: ['v*']
|
|
||||||
pull_request:
|
|
||||||
branches: ['**']
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build-and-test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: '1.26'
|
|
||||||
|
|
||||||
- name: Cache Go modules
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.cache/go-build
|
|
||||||
~/go/pkg/mod
|
|
||||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-go-
|
|
||||||
|
|
||||||
- name: Download dependencies
|
|
||||||
run: go mod download
|
|
||||||
|
|
||||||
- name: Tidy modules
|
|
||||||
run: go mod tidy
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: go test ./...
|
|
||||||
|
|
||||||
- name: Build amcs-server
|
|
||||||
run: go build -o /dev/null ./cmd/amcs-server
|
|
||||||
|
|
||||||
- name: Build amcs-cli
|
|
||||||
run: go build -o /dev/null ./cmd/amcs-cli
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
name: Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v*.*.*'
|
|
||||||
workflow_dispatch:
|
|
||||||
inputs:
|
|
||||||
tag:
|
|
||||||
description: 'Tag to release (e.g. v1.2.3)'
|
|
||||||
required: true
|
|
||||||
|
|
||||||
env:
|
|
||||||
GITEA_SERVER: https://git.warky.dev
|
|
||||||
GITEA_REPO: wdevs/amcs
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: '1.26'
|
|
||||||
|
|
||||||
- name: Cache Go modules
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.cache/go-build
|
|
||||||
~/go/pkg/mod
|
|
||||||
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-go-
|
|
||||||
|
|
||||||
- name: Download dependencies
|
|
||||||
run: go mod download
|
|
||||||
|
|
||||||
- name: Set up Node
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: 'lts/*'
|
|
||||||
|
|
||||||
- name: Install pnpm
|
|
||||||
run: npm install -g pnpm
|
|
||||||
|
|
||||||
- name: Build UI
|
|
||||||
run: |
|
|
||||||
cd ui
|
|
||||||
pnpm install --frozen-lockfile
|
|
||||||
pnpm run build
|
|
||||||
|
|
||||||
- name: Set build vars
|
|
||||||
id: vars
|
|
||||||
run: |
|
|
||||||
TAG="${{ github.event.inputs.tag || github.ref_name }}"
|
|
||||||
echo "VERSION=${TAG}" >> $GITHUB_OUTPUT
|
|
||||||
echo "COMMIT=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
|
|
||||||
echo "BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Build release binaries
|
|
||||||
run: |
|
|
||||||
VERSION="${{ steps.vars.outputs.VERSION }}"
|
|
||||||
COMMIT="${{ steps.vars.outputs.COMMIT }}"
|
|
||||||
BUILD_DATE="${{ steps.vars.outputs.BUILD_DATE }}"
|
|
||||||
LDFLAGS="-s -w -X git.warky.dev/wdevs/amcs/internal/buildinfo.Version=${VERSION} -X git.warky.dev/wdevs/amcs/internal/buildinfo.TagName=${VERSION} -X git.warky.dev/wdevs/amcs/internal/buildinfo.Commit=${COMMIT} -X git.warky.dev/wdevs/amcs/internal/buildinfo.BuildDate=${BUILD_DATE}"
|
|
||||||
mkdir -p dist
|
|
||||||
for BINARY in amcs-server amcs-cli; do
|
|
||||||
CMD="./cmd/${BINARY}"
|
|
||||||
for PLATFORM in linux/amd64 linux/arm64 darwin/amd64 darwin/arm64 windows/amd64; do
|
|
||||||
OS="${PLATFORM%/*}"
|
|
||||||
ARCH="${PLATFORM#*/}"
|
|
||||||
EXT=""
|
|
||||||
[ "$OS" = "windows" ] && EXT=".exe"
|
|
||||||
OUTPUT="dist/${BINARY}-${OS}-${ARCH}${EXT}"
|
|
||||||
echo "Building ${OUTPUT}..."
|
|
||||||
GOOS=$OS GOARCH=$ARCH go build -ldflags "${LDFLAGS}" -o "${OUTPUT}" "${CMD}"
|
|
||||||
done
|
|
||||||
done
|
|
||||||
cd dist && sha256sum * > checksums.txt && cd ..
|
|
||||||
|
|
||||||
- name: Create Gitea Release
|
|
||||||
id: create_release
|
|
||||||
run: |
|
|
||||||
export VERSION="${{ steps.vars.outputs.VERSION }}"
|
|
||||||
BODY=$(python3 <<'PY'
|
|
||||||
import json, subprocess, os
|
|
||||||
version = os.environ['VERSION']
|
|
||||||
commit = subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD'], text=True).strip()
|
|
||||||
body = f"## {version}\n\nBuilt from commit {commit}.\n\nSee `checksums.txt` to verify downloads."
|
|
||||||
print(json.dumps({
|
|
||||||
'tag_name': version,
|
|
||||||
'name': version,
|
|
||||||
'body': body,
|
|
||||||
'draft': False,
|
|
||||||
'prerelease': False,
|
|
||||||
}))
|
|
||||||
PY
|
|
||||||
)
|
|
||||||
RESPONSE=$(curl -fsS -X POST "${{ env.GITEA_SERVER }}/api/v1/repos/${{ env.GITEA_REPO }}/releases" \
|
|
||||||
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-d "$BODY")
|
|
||||||
RELEASE_ID=$(printf '%s' "$RESPONSE" | python3 -c 'import sys,json; print(json.load(sys.stdin)["id"])')
|
|
||||||
echo "RELEASE_ID=${RELEASE_ID}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Upload release assets
|
|
||||||
run: |
|
|
||||||
RELEASE_ID="${{ steps.create_release.outputs.RELEASE_ID }}"
|
|
||||||
for f in dist/*; do
|
|
||||||
name=$(basename "$f")
|
|
||||||
echo "Uploading ${name}..."
|
|
||||||
curl -fsS -X POST \
|
|
||||||
"${{ env.GITEA_SERVER }}/api/v1/repos/${{ env.GITEA_REPO }}/releases/${RELEASE_ID}/assets?name=${name}" \
|
|
||||||
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
|
|
||||||
-H "Content-Type: application/octet-stream" \
|
|
||||||
--data-binary @"${f}"
|
|
||||||
done
|
|
||||||
@@ -31,8 +31,3 @@ cmd/amcs-server/__debug_*
|
|||||||
bin/
|
bin/
|
||||||
.cache/
|
.cache/
|
||||||
OB1/
|
OB1/
|
||||||
ui/node_modules/
|
|
||||||
ui/.svelte-kit/
|
|
||||||
internal/app/ui/dist/*
|
|
||||||
!internal/app/ui/dist/placeholder.txt
|
|
||||||
.codex
|
|
||||||
|
|||||||
@@ -1,101 +0,0 @@
|
|||||||
## What This Project Is
|
|
||||||
|
|
||||||
AMCS (Avalon Memory Control Service) is an MCP server written in Go that provides memory, knowledge, and task management for AI agents. It exposes 56+ tools via HTTP/SSE MCP transport and includes a Svelte 5 admin UI embedded in the binary.
|
|
||||||
|
|
||||||
# Agent Rules
|
|
||||||
|
|
||||||
Keep your answers short. Question everything, never assume or guess. Ask the user if you are unsure about anything.
|
|
||||||
You must use the AMCS MCP system tools. Set Origin as the active project and always capture summaries of what was done as thoughts using the capture_thought tool. If amcs is not available write files to doc/llm/log/yyyymmdd_hh.md
|
|
||||||
When working on postgresql use the postgresql skill. On go/api/backend the go-skill and for the frontend the "svelte-architect" skill.
|
|
||||||
|
|
||||||
## Commands
|
|
||||||
|
|
||||||
### Build & Run
|
|
||||||
```bash
|
|
||||||
make build # Build server binary (outputs to bin/amcs-server), embeds UI
|
|
||||||
make build-cli # Build CLI binary (bin/amcs-cli)
|
|
||||||
make clean # Remove bin/
|
|
||||||
|
|
||||||
# Run locally (builds UI then starts server)
|
|
||||||
./scripts/run-local.sh configs/dev.yaml
|
|
||||||
|
|
||||||
# UI hot-reload dev server (proxy to backend on :8080)
|
|
||||||
make ui-dev # http://localhost:5173
|
|
||||||
```
|
|
||||||
|
|
||||||
### Testing
|
|
||||||
```bash
|
|
||||||
make test # All tests (svelte-check + go test ./...)
|
|
||||||
go test ./internal/tools -run TestFunctionName -v # Single test
|
|
||||||
go test ./internal/tools -v # Package tests
|
|
||||||
```
|
|
||||||
|
|
||||||
### Database
|
|
||||||
```bash
|
|
||||||
make migrate # Apply SQL migrations
|
|
||||||
make check-schema-drift # Verify no drift between DBML and SQL
|
|
||||||
```
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
### Key Pattern: Store → Tool → MCP Handler
|
|
||||||
|
|
||||||
Every tool domain follows the same three-layer pattern:
|
|
||||||
|
|
||||||
1. **Store** (`internal/store/`) — database access via BUN ORM + pgx. One file per domain (e.g., `thoughts.go`, `plans.go`).
|
|
||||||
2. **Tool** (`internal/tools/`) — MCP tool handler structs with a `Handle(ctx, req, input)` method. Input/output types are plain Go structs; JSON schemas are auto-generated from struct tags.
|
|
||||||
3. **Registration** (`internal/mcpserver/handlers.go`) — each domain has a `registerXxxTools(server, logger, ts)` function called from `NewHandlers`.
|
|
||||||
|
|
||||||
### Adding a New Tool Domain
|
|
||||||
|
|
||||||
Follow the checklist in `internal/tools/` (see `project_conventions.md` in memory, or look at any existing domain like `skills.go` as a reference):
|
|
||||||
- Define input/output structs with `jsonschema` tags
|
|
||||||
- Implement a struct with `Handle` method
|
|
||||||
- Add the struct to `ToolSet` in `mcpserver/handlers.go`
|
|
||||||
- Wire the store in `internal/store/db.go`
|
|
||||||
- Add a `registerXxxTools` call in `NewHandlers`
|
|
||||||
|
|
||||||
### AI Provider Architecture
|
|
||||||
|
|
||||||
Configured in YAML under `ai.providers`. Each role (embeddings, metadata extraction) supports a primary provider and a fallback chain. Providers are named references (litellm, ollama, openrouter) that resolve to OpenAI-compatible endpoints. Health tracking per provider with cooldown on transient failures.
|
|
||||||
|
|
||||||
### Error Handling
|
|
||||||
|
|
||||||
All tool errors return structured `mcperrors.RPCError` with:
|
|
||||||
- `data.type` — machine-readable category (`invalid_input`, `project_required`, `entity_not_found`, etc.)
|
|
||||||
- `data.field` / `data.detail` / `data.hint` — structured validation data
|
|
||||||
|
|
||||||
Use helpers in `internal/mcperrors/` rather than raw errors.
|
|
||||||
|
|
||||||
### Authentication
|
|
||||||
|
|
||||||
- API key via `x-brain-key` header (dev/simple deployments)
|
|
||||||
- OAuth 2.0 client credentials for production
|
|
||||||
- Session store tracks active project per client connection
|
|
||||||
|
|
||||||
### Database Schema
|
|
||||||
|
|
||||||
DBML files in `schema/` are the source of truth for the database schema. Never edit the generated SQL or Go models directly — always edit the DBML, then regenerate:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
make generate-migrations # DBML → SQL migration files
|
|
||||||
make generate-models # DBML → Go model structs
|
|
||||||
make migrate # Apply pending migrations to the database
|
|
||||||
```
|
|
||||||
|
|
||||||
All primary keys are `bigserial int64` (migrated from UUID in migration 015).
|
|
||||||
|
|
||||||
### Frontend
|
|
||||||
|
|
||||||
Svelte 5 + Tailwind + Skeleton UI in `ui/`. Built via pnpm and embedded into the Go binary as a static filesystem. The Vite dev server proxies API calls to the backend on `:8080`.
|
|
||||||
|
|
||||||
The UI uses **resolvespec-js** for admin CRUD views. The backend API for the UI follows the **ResolveSpec** convention — resource endpoints, filtering, and pagination are structured according to that spec.
|
|
||||||
|
|
||||||
## Configuration
|
|
||||||
|
|
||||||
YAML config with schema `version: 2`. Key env var overrides:
|
|
||||||
- `DATABASE_URL` — PostgreSQL connection string
|
|
||||||
- `AMCS_LITELLM_API_KEY`, `AMCS_OPENROUTER_API_KEY` — AI provider keys
|
|
||||||
- `AMCS_SERVER_PORT` — defaults to 8080
|
|
||||||
|
|
||||||
See `configs/config.example.yaml` for the full schema. Config auto-migrates v1→v2 on startup.
|
|
||||||
+1
-21
@@ -1,14 +1,3 @@
|
|||||||
FROM node:22-bookworm AS ui-builder
|
|
||||||
|
|
||||||
RUN npm install -g pnpm
|
|
||||||
WORKDIR /src/ui
|
|
||||||
|
|
||||||
COPY ui/package.json ui/pnpm-lock.yaml ./
|
|
||||||
RUN pnpm install --frozen-lockfile
|
|
||||||
|
|
||||||
COPY ui/ ./
|
|
||||||
RUN pnpm run build
|
|
||||||
|
|
||||||
FROM golang:1.26.1-bookworm AS builder
|
FROM golang:1.26.1-bookworm AS builder
|
||||||
|
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
@@ -17,7 +6,6 @@ COPY go.mod go.sum ./
|
|||||||
RUN go mod download
|
RUN go mod download
|
||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
COPY --from=ui-builder /src/internal/app/ui/dist ./internal/app/ui/dist
|
|
||||||
|
|
||||||
RUN set -eu; \
|
RUN set -eu; \
|
||||||
VERSION_TAG="$(git describe --tags --exact-match 2>/dev/null || echo dev)"; \
|
VERSION_TAG="$(git describe --tags --exact-match 2>/dev/null || echo dev)"; \
|
||||||
@@ -29,14 +17,7 @@ RUN set -eu; \
|
|||||||
-X git.warky.dev/wdevs/amcs/internal/buildinfo.TagName=${VERSION_TAG} \
|
-X git.warky.dev/wdevs/amcs/internal/buildinfo.TagName=${VERSION_TAG} \
|
||||||
-X git.warky.dev/wdevs/amcs/internal/buildinfo.Commit=${COMMIT_SHA} \
|
-X git.warky.dev/wdevs/amcs/internal/buildinfo.Commit=${COMMIT_SHA} \
|
||||||
-X git.warky.dev/wdevs/amcs/internal/buildinfo.BuildDate=${BUILD_DATE}" \
|
-X git.warky.dev/wdevs/amcs/internal/buildinfo.BuildDate=${BUILD_DATE}" \
|
||||||
-o /out/amcs-server ./cmd/amcs-server; \
|
-o /out/amcs-server ./cmd/amcs-server
|
||||||
CGO_ENABLED=0 GOOS=linux go build -trimpath \
|
|
||||||
-ldflags="-s -w \
|
|
||||||
-X git.warky.dev/wdevs/amcs/internal/buildinfo.Version=${VERSION_TAG} \
|
|
||||||
-X git.warky.dev/wdevs/amcs/internal/buildinfo.TagName=${VERSION_TAG} \
|
|
||||||
-X git.warky.dev/wdevs/amcs/internal/buildinfo.Commit=${COMMIT_SHA} \
|
|
||||||
-X git.warky.dev/wdevs/amcs/internal/buildinfo.BuildDate=${BUILD_DATE}" \
|
|
||||||
-o /out/amcs-migrate-config ./cmd/amcs-migrate-config
|
|
||||||
|
|
||||||
FROM debian:bookworm-slim
|
FROM debian:bookworm-slim
|
||||||
|
|
||||||
@@ -48,7 +29,6 @@ RUN apt-get update \
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY --from=builder /out/amcs-server /app/amcs-server
|
COPY --from=builder /out/amcs-server /app/amcs-server
|
||||||
COPY --from=builder /out/amcs-migrate-config /app/amcs-migrate-config
|
|
||||||
COPY --chown=appuser:appuser configs /app/configs
|
COPY --chown=appuser:appuser configs /app/configs
|
||||||
|
|
||||||
USER appuser
|
USER appuser
|
||||||
|
|||||||
@@ -3,65 +3,25 @@ GO_CACHE_DIR := $(CURDIR)/.cache/go-build
|
|||||||
SERVER_BIN := $(BIN_DIR)/amcs-server
|
SERVER_BIN := $(BIN_DIR)/amcs-server
|
||||||
CMD_SERVER := ./cmd/amcs-server
|
CMD_SERVER := ./cmd/amcs-server
|
||||||
BUILDINFO_PKG := git.warky.dev/wdevs/amcs/internal/buildinfo
|
BUILDINFO_PKG := git.warky.dev/wdevs/amcs/internal/buildinfo
|
||||||
UI_DIR := $(CURDIR)/ui
|
|
||||||
AMCS_UI_BACKEND ?= http://127.0.0.1:8080
|
|
||||||
PATCH_INCREMENT ?= 1
|
PATCH_INCREMENT ?= 1
|
||||||
RELEASE_VERSION ?=
|
|
||||||
RELEASE_REMOTE ?= origin
|
|
||||||
VERSION_TAG ?= $(shell git describe --tags --exact-match 2>/dev/null || echo dev)
|
VERSION_TAG ?= $(shell git describe --tags --exact-match 2>/dev/null || echo dev)
|
||||||
COMMIT_SHA ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo unknown)
|
COMMIT_SHA ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo unknown)
|
||||||
BUILD_DATE ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
|
BUILD_DATE ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
|
||||||
RELSPEC ?= $(shell command -v relspec 2>/dev/null || echo $(HOME)/go/bin/relspec)
|
|
||||||
#RELSPEC = /mnt/vault/relspecgo/build/relspec
|
|
||||||
SCHEMA_FILES := $(sort $(wildcard schema/*.dbml))
|
|
||||||
MERGE_TARGET_TMP := $(CURDIR)/.cache/schema.merge-target.dbml
|
|
||||||
GENERATED_SCHEMA_MIGRATION := migrations/020_generated_schema.sql
|
|
||||||
GENERATED_MODELS_DIR := internal/generatedmodels
|
|
||||||
PNPM ?= pnpm
|
|
||||||
LDFLAGS := -s -w \
|
LDFLAGS := -s -w \
|
||||||
-X $(BUILDINFO_PKG).Version=$(VERSION_TAG) \
|
-X $(BUILDINFO_PKG).Version=$(VERSION_TAG) \
|
||||||
-X $(BUILDINFO_PKG).TagName=$(VERSION_TAG) \
|
-X $(BUILDINFO_PKG).TagName=$(VERSION_TAG) \
|
||||||
-X $(BUILDINFO_PKG).Commit=$(COMMIT_SHA) \
|
-X $(BUILDINFO_PKG).Commit=$(COMMIT_SHA) \
|
||||||
-X $(BUILDINFO_PKG).BuildDate=$(BUILD_DATE)
|
-X $(BUILDINFO_PKG).BuildDate=$(BUILD_DATE)
|
||||||
|
|
||||||
.PHONY: all build clean migrate release-version release-build test generate-migrations generate-models check-schema-drift build-cli ui-install ui-build ui-dev ui-check help
|
.PHONY: all build clean migrate release-version test
|
||||||
|
|
||||||
all: build
|
all: build
|
||||||
|
|
||||||
help:
|
build:
|
||||||
@echo "Available targets:"
|
|
||||||
@echo " build Build server binary (includes UI build)"
|
|
||||||
@echo " build-cli Build CLI binary"
|
|
||||||
@echo " test Run all tests (includes UI check)"
|
|
||||||
@echo " clean Remove build artifacts"
|
|
||||||
@echo " migrate Run database migrations"
|
|
||||||
@echo " release-version Tag and push a release (auto patch bump or RELEASE_VERSION=vX.Y.Z)"
|
|
||||||
@echo " release-build Build with a specific release tag (RELEASE_VERSION=vX.Y.Z)"
|
|
||||||
@echo " generate-migrations Generate SQL migration from DBML schema files"
|
|
||||||
@echo " generate-models Generate Go models from DBML schema"
|
|
||||||
@echo " check-schema-drift Verify generated migration matches current schema"
|
|
||||||
@echo " ui-install Install UI dependencies"
|
|
||||||
@echo " ui-build Build UI assets"
|
|
||||||
@echo " ui-dev Start UI dev server with local API proxy"
|
|
||||||
@echo " ui-check Run UI type checks"
|
|
||||||
|
|
||||||
build: ui-build
|
|
||||||
@mkdir -p $(BIN_DIR)
|
@mkdir -p $(BIN_DIR)
|
||||||
go build -ldflags "$(LDFLAGS)" -o $(SERVER_BIN) $(CMD_SERVER)
|
go build -ldflags "$(LDFLAGS)" -o $(SERVER_BIN) $(CMD_SERVER)
|
||||||
|
|
||||||
ui-install:
|
test:
|
||||||
cd $(UI_DIR) && $(PNPM) install --frozen-lockfile
|
|
||||||
|
|
||||||
ui-build: ui-install
|
|
||||||
cd $(UI_DIR) && $(PNPM) run build
|
|
||||||
|
|
||||||
ui-dev: ui-install
|
|
||||||
cd $(UI_DIR) && VITE_API_URL=/api AMCS_UI_BACKEND=$(AMCS_UI_BACKEND) $(PNPM) run dev
|
|
||||||
|
|
||||||
ui-check: ui-install
|
|
||||||
cd $(UI_DIR) && $(PNPM) run check
|
|
||||||
|
|
||||||
test: ui-check
|
|
||||||
@mkdir -p $(GO_CACHE_DIR)
|
@mkdir -p $(GO_CACHE_DIR)
|
||||||
GOCACHE=$(GO_CACHE_DIR) go test ./...
|
GOCACHE=$(GO_CACHE_DIR) go test ./...
|
||||||
|
|
||||||
@@ -69,76 +29,24 @@ release-version:
|
|||||||
@case "$(PATCH_INCREMENT)" in \
|
@case "$(PATCH_INCREMENT)" in \
|
||||||
''|*[!0-9]*|0) echo "PATCH_INCREMENT must be a positive integer" >&2; exit 1 ;; \
|
''|*[!0-9]*|0) echo "PATCH_INCREMENT must be a positive integer" >&2; exit 1 ;; \
|
||||||
esac
|
esac
|
||||||
@if ! git diff --quiet || ! git diff --cached --quiet; then \
|
@latest=$$(git tag --list 'v[0-9]*.[0-9]*.[0-9]*' --sort=-v:refname | head -n 1); \
|
||||||
echo "Refusing to release from a dirty working tree. Commit or stash changes first." >&2; \
|
if [ -z "$$latest" ]; then latest="v0.0.0"; fi; \
|
||||||
exit 1; \
|
version=$${latest#v}; \
|
||||||
fi
|
major=$${version%%.*}; \
|
||||||
@next_tag="$(RELEASE_VERSION)"; \
|
rest=$${version#*.}; \
|
||||||
if [ -z "$$next_tag" ]; then \
|
minor=$${rest%%.*}; \
|
||||||
latest=$$(git tag --list 'v[0-9]*.[0-9]*.[0-9]*' --sort=-v:refname | head -n 1); \
|
patch=$${rest##*.}; \
|
||||||
if [ -z "$$latest" ]; then latest="v0.0.0"; fi; \
|
next_patch=$$((patch + $(PATCH_INCREMENT))); \
|
||||||
version=$${latest#v}; \
|
next_tag="v$$major.$$minor.$$next_patch"; \
|
||||||
major=$${version%%.*}; \
|
|
||||||
rest=$${version#*.}; \
|
|
||||||
minor=$${rest%%.*}; \
|
|
||||||
patch=$${rest##*.}; \
|
|
||||||
next_patch=$$((patch + $(PATCH_INCREMENT))); \
|
|
||||||
next_tag="v$$major.$$minor.$$next_patch"; \
|
|
||||||
fi; \
|
|
||||||
case "$$next_tag" in \
|
|
||||||
v[0-9]*.[0-9]*.[0-9]*) ;; \
|
|
||||||
*) echo "RELEASE_VERSION must look like vX.Y.Z (got '$$next_tag')" >&2; exit 1 ;; \
|
|
||||||
esac; \
|
|
||||||
if git rev-parse -q --verify "refs/tags/$$next_tag" >/dev/null; then \
|
if git rev-parse -q --verify "refs/tags/$$next_tag" >/dev/null; then \
|
||||||
echo "$$next_tag already exists" >&2; \
|
echo "$$next_tag already exists" >&2; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
fi; \
|
fi; \
|
||||||
git tag -a "$$next_tag" -m "Release $$next_tag"; \
|
git tag -a "$$next_tag" -m "Release $$next_tag"; \
|
||||||
git push $(RELEASE_REMOTE) "$$next_tag"; \
|
echo "$$next_tag"
|
||||||
$(MAKE) release-build RELEASE_VERSION="$$next_tag"; \
|
|
||||||
echo "Released $$next_tag"
|
|
||||||
|
|
||||||
release-build:
|
|
||||||
@case "$(RELEASE_VERSION)" in \
|
|
||||||
v[0-9]*.[0-9]*.[0-9]*) ;; \
|
|
||||||
*) echo "RELEASE_VERSION must look like vX.Y.Z" >&2; exit 1 ;; \
|
|
||||||
esac
|
|
||||||
@$(MAKE) build build-cli VERSION_TAG="$(RELEASE_VERSION)"
|
|
||||||
|
|
||||||
migrate:
|
migrate:
|
||||||
./scripts/migrate.sh
|
./scripts/migrate.sh
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -rf $(BIN_DIR)
|
rm -rf $(BIN_DIR)
|
||||||
|
|
||||||
generate-migrations:
|
|
||||||
@test -n "$(SCHEMA_FILES)" || (echo "No DBML schema files found in schema/" >&2; exit 1)
|
|
||||||
@command -v $(RELSPEC) >/dev/null 2>&1 || (echo "relspec not found; install git.warky.dev/wdevs/relspecgo/cmd/relspec@latest" >&2; exit 1)
|
|
||||||
@mkdir -p $(dir $(MERGE_TARGET_TMP))
|
|
||||||
@: > $(MERGE_TARGET_TMP)
|
|
||||||
@schema_list=$$(printf '%s\n' $(SCHEMA_FILES) | paste -sd, -); \
|
|
||||||
$(RELSPEC) merge --target dbml --target-path $(MERGE_TARGET_TMP) --source dbml --from-list "$$schema_list" --output pgsql --output-path $(GENERATED_SCHEMA_MIGRATION)
|
|
||||||
|
|
||||||
generate-models:
|
|
||||||
@test -n "$(SCHEMA_FILES)" || (echo "No DBML schema files found in schema/" >&2; exit 1)
|
|
||||||
@./scripts/generate-models.sh
|
|
||||||
|
|
||||||
check-schema-drift:
|
|
||||||
@test -f $(GENERATED_SCHEMA_MIGRATION) || (echo "$(GENERATED_SCHEMA_MIGRATION) is missing; run make generate-migrations" >&2; exit 1)
|
|
||||||
@command -v $(RELSPEC) >/dev/null 2>&1 || (echo "relspec not found; install git.warky.dev/wdevs/relspecgo/cmd/relspec@latest" >&2; exit 1)
|
|
||||||
@mkdir -p $(dir $(MERGE_TARGET_TMP))
|
|
||||||
@tmpfile=$$(mktemp); \
|
|
||||||
: > $(MERGE_TARGET_TMP); \
|
|
||||||
schema_list=$$(printf '%s\n' $(SCHEMA_FILES) | paste -sd, -); \
|
|
||||||
$(RELSPEC) merge --target dbml --target-path $(MERGE_TARGET_TMP) --source dbml --from-list "$$schema_list" --output pgsql --output-path $$tmpfile; \
|
|
||||||
if ! cmp -s $$tmpfile $(GENERATED_SCHEMA_MIGRATION); then \
|
|
||||||
echo "Schema drift detected between schema/*.dbml and $(GENERATED_SCHEMA_MIGRATION)" >&2; \
|
|
||||||
diff -u $(GENERATED_SCHEMA_MIGRATION) $$tmpfile || true; \
|
|
||||||
rm -f $$tmpfile; \
|
|
||||||
exit 1; \
|
|
||||||
fi; \
|
|
||||||
rm -f $$tmpfile
|
|
||||||
|
|
||||||
build-cli:
|
|
||||||
@mkdir -p $(BIN_DIR)
|
|
||||||
go build -o $(BIN_DIR)/amcs-cli ./cmd/amcs-cli
|
|
||||||
|
|||||||
@@ -1,18 +1,24 @@
|
|||||||
# AMCS Directory
|
# Avalon Memory Crystal Server (amcs)
|
||||||
|
|
||||||
This is the AMCS (Avalon Memory Control Service) directory.
|
|
||||||
|
|
||||||
## Purpose
|
A Go MCP server for capturing and retrieving thoughts, memory, and project context. Exposes tools over Streamable HTTP, backed by Postgres with pgvector for semantic search.
|
||||||
|
|
||||||
The AMCS directory is used to store configuration and code for the Avalon Memory Control Service, which handles...
|
## What it does
|
||||||
|
|
||||||
## Structure
|
- **Capture** thoughts with automatic embedding and metadata extraction
|
||||||
|
- **Search** thoughts semantically via vector similarity
|
||||||
|
- **Organise** thoughts into projects and retrieve full project context
|
||||||
|
- **Summarise** and recall memory across topics and time windows
|
||||||
|
- **Link** related thoughts and traverse relationships
|
||||||
|
|
||||||
- `configs/` - Configuration files
|
## Stack
|
||||||
- `scripts/` - Scripts for managing the system
|
|
||||||
- `assets/` - Asset files
|
|
||||||
|
|
||||||
## Next Steps
|
- Go — MCP server over Streamable HTTP
|
||||||
|
- Postgres + pgvector — storage and vector search
|
||||||
|
- LiteLLM — primary hosted AI provider (embeddings + metadata extraction)
|
||||||
|
- OpenRouter — default upstream behind LiteLLM
|
||||||
|
- Ollama — supported local or self-hosted OpenAI-compatible provider
|
||||||
|
|
||||||
## Tools
|
## Tools
|
||||||
|
|
||||||
@@ -31,9 +37,6 @@ The AMCS directory is used to store configuration and code for the Avalon Memory
|
|||||||
| `get_project_context` | Recent + semantic context for a project; uses explicit `project` or the active session project |
|
| `get_project_context` | Recent + semantic context for a project; uses explicit `project` or the active session project |
|
||||||
| `set_active_project` | Set session project scope; requires a stateful MCP session |
|
| `set_active_project` | Set session project scope; requires a stateful MCP session |
|
||||||
| `get_active_project` | Get current session project |
|
| `get_active_project` | Get current session project |
|
||||||
| `add_learning` | Create a curated learning record distinct from raw thoughts |
|
|
||||||
| `get_learning` | Retrieve a structured learning by ID |
|
|
||||||
| `list_learnings` | List structured learnings by project/category/area/status/priority/tag/query |
|
|
||||||
| `summarize_thoughts` | LLM prose summary over a filtered set |
|
| `summarize_thoughts` | LLM prose summary over a filtered set |
|
||||||
| `recall_context` | Semantic + recency context block for injection |
|
| `recall_context` | Semantic + recency context block for injection |
|
||||||
| `link_thoughts` | Create a typed relationship between thoughts |
|
| `link_thoughts` | Create a typed relationship between thoughts |
|
||||||
@@ -43,66 +46,21 @@ The AMCS directory is used to store configuration and code for the Avalon Memory
|
|||||||
| `load_file` | Retrieve a stored file by ID; returns metadata, base64 content, and an embedded MCP binary resource |
|
| `load_file` | Retrieve a stored file by ID; returns metadata, base64 content, and an embedded MCP binary resource |
|
||||||
| `list_files` | Browse stored files by thought, project, or kind |
|
| `list_files` | Browse stored files by thought, project, or kind |
|
||||||
| `backfill_embeddings` | Generate missing embeddings for stored thoughts |
|
| `backfill_embeddings` | Generate missing embeddings for stored thoughts |
|
||||||
| `reparse_thought_metadata` | Re-extract metadata from thought content |
|
| `reparse_thought_metadata` | Re-extract and normalize metadata for stored thoughts |
|
||||||
| `retry_failed_metadata` | Retry pending/failed metadata extraction |
|
| `retry_failed_metadata` | Retry metadata extraction for thoughts still pending or failed |
|
||||||
| `add_maintenance_task` | Create a recurring or one-time home maintenance task |
|
| `add_skill` | Store a reusable agent skill (behavioural instruction or capability prompt) |
|
||||||
| `log_maintenance` | Log completed maintenance; updates next due date |
|
|
||||||
| `get_upcoming_maintenance` | List maintenance tasks due within the next N days |
|
|
||||||
| `search_maintenance_history` | Search the maintenance log by task name, category, or date range |
|
|
||||||
| `save_chat_history` | Save chat messages with optional title, summary, channel, agent, and project |
|
|
||||||
| `get_chat_history` | Fetch chat history by UUID or session_id |
|
|
||||||
| `list_chat_histories` | List chat histories; filter by project, channel, agent_id, session_id, or days |
|
|
||||||
| `delete_chat_history` | Delete a chat history by id |
|
|
||||||
| `add_skill` | Store an agent skill (instruction or capability prompt) |
|
|
||||||
| `remove_skill` | Delete an agent skill by id |
|
| `remove_skill` | Delete an agent skill by id |
|
||||||
| `list_skills` | List all agent skills, optionally filtered by tag |
|
| `list_skills` | List all agent skills, optionally filtered by tag |
|
||||||
| `add_guardrail` | Store an agent guardrail (constraint or safety rule) |
|
| `add_guardrail` | Store a reusable agent guardrail (constraint or safety rule) |
|
||||||
| `remove_guardrail` | Delete an agent guardrail by id |
|
| `remove_guardrail` | Delete an agent guardrail by id |
|
||||||
| `list_guardrails` | List all agent guardrails, optionally filtered by tag or severity |
|
| `list_guardrails` | List all agent guardrails, optionally filtered by tag or severity |
|
||||||
| `add_project_skill` | Link a skill to a project; pass `project` if client is stateless |
|
| `add_project_skill` | Link an agent skill to a project; pass `project` explicitly if your client does not preserve MCP sessions |
|
||||||
| `remove_project_skill` | Unlink a skill from a project; pass `project` if client is stateless |
|
| `remove_project_skill` | Unlink an agent skill from a project; pass `project` explicitly if your client does not preserve MCP sessions |
|
||||||
| `list_project_skills` | Skills for a project; pass `project` if client is stateless |
|
| `list_project_skills` | List all skills linked to a project; pass `project` explicitly if your client does not preserve MCP sessions |
|
||||||
| `add_project_guardrail` | Link a guardrail to a project; pass `project` if client is stateless |
|
| `add_project_guardrail` | Link an agent guardrail to a project; pass `project` explicitly if your client does not preserve MCP sessions |
|
||||||
| `remove_project_guardrail` | Unlink a guardrail from a project; pass `project` if client is stateless |
|
| `remove_project_guardrail` | Unlink an agent guardrail from a project; pass `project` explicitly if your client does not preserve MCP sessions |
|
||||||
| `list_project_guardrails` | Guardrails for a project; pass `project` if client is stateless |
|
| `list_project_guardrails` | List all guardrails linked to a project; pass `project` explicitly if your client does not preserve MCP sessions |
|
||||||
| `get_version_info` | Build version, commit, and date |
|
| `get_version_info` | Return the server build version information, including version, tag name, commit, and build date |
|
||||||
| `describe_tools` | List all available MCP tools with names, descriptions, categories, and model-authored usage notes; call this at the start of a session to orient yourself |
|
|
||||||
| `annotate_tool` | Persist your own usage notes for a specific tool; notes are returned by `describe_tools` in future sessions |
|
|
||||||
|
|
||||||
## Learnings
|
|
||||||
|
|
||||||
Learnings are curated, structured memory records for durable insights you want to keep distinct from raw thoughts. Use them for normalized lessons, decisions, and evidence-backed findings that should be easy to retrieve and review over time.
|
|
||||||
|
|
||||||
Compared with `capture_thought`, learnings are more explicit and reviewable: they include a required `summary`, optional `details`, and structured fields like `category`, `area`, `status`, `priority`, `confidence`, and `tags`, plus optional links to a `project`, `related_thought_id`, or `related_skill_id`.
|
|
||||||
|
|
||||||
Use:
|
|
||||||
- `add_learning` to create a curated learning.
|
|
||||||
- `get_learning` to fetch one by ID.
|
|
||||||
- `list_learnings` to filter curated learnings across project and status dimensions.
|
|
||||||
|
|
||||||
## Self-Documenting Tools
|
|
||||||
|
|
||||||
AMCS includes a built-in tool directory that models can read and annotate.
|
|
||||||
|
|
||||||
**`describe_tools`** returns every registered tool with its name, description, category, and any model-written notes. Call it with no arguments to get the full list, or filter by category:
|
|
||||||
|
|
||||||
```json
|
|
||||||
{ "category": "thoughts" }
|
|
||||||
```
|
|
||||||
|
|
||||||
Available categories: `system`, `thoughts`, `projects`, `files`, `admin`, `maintenance`, `skills`, `chat`, `meta`.
|
|
||||||
|
|
||||||
**`annotate_tool`** lets a model write persistent usage notes against a tool name. Notes survive across sessions and are returned by `describe_tools`:
|
|
||||||
|
|
||||||
```json
|
|
||||||
{ "tool_name": "capture_thought", "notes": "Always pass project explicitly — session state is not reliable in this client." }
|
|
||||||
```
|
|
||||||
|
|
||||||
Pass an empty string to clear notes. The intended workflow is:
|
|
||||||
|
|
||||||
1. At the start of a session, call `describe_tools` to discover tools and read accumulated notes.
|
|
||||||
2. As you learn something non-obvious about a tool — a gotcha, a workflow pattern, a required field ordering — call `annotate_tool` to record it.
|
|
||||||
3. Future sessions receive the annotation automatically via `describe_tools`.
|
|
||||||
|
|
||||||
## MCP Error Contract
|
## MCP Error Contract
|
||||||
|
|
||||||
@@ -252,25 +210,12 @@ Link existing skills and guardrails to a project so they are automatically avail
|
|||||||
Config is YAML-driven. Copy `configs/config.example.yaml` and set:
|
Config is YAML-driven. Copy `configs/config.example.yaml` and set:
|
||||||
|
|
||||||
- `database.url` — Postgres connection string
|
- `database.url` — Postgres connection string
|
||||||
- `auth.keys` — static API keys for MCP access via `x-brain-key` or `Authorization: Bearer <key>`
|
- `auth.mode` — `api_keys` or `oauth_client_credentials`
|
||||||
- `auth.oauth.clients` — optional OAuth client credentials registry
|
- `auth.keys` — API keys for MCP access via `x-brain-key` or `Authorization: Bearer <key>` when `auth.mode=api_keys`
|
||||||
- `ai.providers` — named provider definitions (`litellm`, `ollama`, `openrouter`)
|
- `auth.oauth.clients` — client registry when `auth.mode=oauth_client_credentials`
|
||||||
- `ai.embeddings.primary` / `ai.metadata.primary` — primary role targets (`provider` + `model`)
|
|
||||||
- `ai.embeddings.fallbacks` / `ai.metadata.fallbacks` — sequential fallback targets
|
|
||||||
- `mcp.version` is build-generated and should not be set in config
|
- `mcp.version` is build-generated and should not be set in config
|
||||||
|
|
||||||
Config schema is versioned. Current schema version is `2`.
|
**OAuth Client Credentials flow** (`auth.mode=oauth_client_credentials`):
|
||||||
|
|
||||||
Use the migration helper to rewrite legacy configs in-place:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
go run ./cmd/amcs-migrate-config --config ./configs/dev.yaml
|
|
||||||
```
|
|
||||||
|
|
||||||
Use `--dry-run` to print migrated YAML without writing.
|
|
||||||
Server startup migrates older config formats in memory only and does not write files.
|
|
||||||
|
|
||||||
**OAuth Client Credentials flow**:
|
|
||||||
|
|
||||||
1. Obtain a token — `POST /oauth/token` (public, no auth required):
|
1. Obtain a token — `POST /oauth/token` (public, no auth required):
|
||||||
```
|
```
|
||||||
@@ -288,11 +233,10 @@ Server startup migrates older config formats in memory only and does not write f
|
|||||||
```
|
```
|
||||||
|
|
||||||
Alternatively, pass `client_id` and `client_secret` as body parameters instead of `Authorization: Basic`. Direct `Authorization: Basic` credential validation on the MCP endpoint is also supported as a fallback (no token required).
|
Alternatively, pass `client_id` and `client_secret` as body parameters instead of `Authorization: Basic`. Direct `Authorization: Basic` credential validation on the MCP endpoint is also supported as a fallback (no token required).
|
||||||
- `AMCS_LITELLM_BASE_URL` / `AMCS_LITELLM_API_KEY` override all configured LiteLLM providers
|
- `ai.litellm.base_url` and `ai.litellm.api_key` — LiteLLM proxy
|
||||||
- `AMCS_OLLAMA_BASE_URL` / `AMCS_OLLAMA_API_KEY` override all configured Ollama providers
|
- `ai.ollama.base_url` and `ai.ollama.api_key` — Ollama local or remote server
|
||||||
- `AMCS_OPENROUTER_API_KEY` overrides all configured OpenRouter providers
|
|
||||||
|
|
||||||
See `llm/plan.md` for an audited high-level status summary of the original implementation plan, and `llm/todo.md` for the audited backfill/fallback follow-up status.
|
See `llm/plan.md` for full architecture and implementation plan.
|
||||||
|
|
||||||
## Backfill
|
## Backfill
|
||||||
|
|
||||||
@@ -555,110 +499,13 @@ Recommended Apache settings:
|
|||||||
- `ProxyTimeout 600` and `ProxyPass ... timeout=600` give Apache enough time to wait for the Go backend.
|
- `ProxyTimeout 600` and `ProxyPass ... timeout=600` give Apache enough time to wait for the Go backend.
|
||||||
- If another proxy or load balancer sits in front of Apache, align its size and timeout settings too.
|
- If another proxy or load balancer sits in front of Apache, align its size and timeout settings too.
|
||||||
|
|
||||||
## CLI
|
|
||||||
|
|
||||||
`amcs-cli` is a pre-built CLI client for the AMCS MCP server. Download it from https://git.warky.dev/wdevs/amcs/releases
|
|
||||||
|
|
||||||
The primary purpose is to give agents and MCP clients a ready-made bridge to the AMCS server so they do not need to implement their own HTTP MCP client. Configure it once and any stdio-based MCP client can use AMCS immediately.
|
|
||||||
|
|
||||||
### Commands
|
|
||||||
|
|
||||||
| Command | Purpose |
|
|
||||||
|---|---|
|
|
||||||
| `amcs-cli tools` | List all tools available on the remote server |
|
|
||||||
| `amcs-cli call <tool>` | Call a tool by name with `--arg key=value` flags |
|
|
||||||
| `amcs-cli stdio` | Start a stdio MCP bridge backed by the remote server |
|
|
||||||
|
|
||||||
`stdio` is the main integration point. It connects to the remote HTTP MCP server, discovers all its tools, and re-exposes them over stdio. Register it as a stdio MCP server in your agent config and it proxies every tool call through to AMCS.
|
|
||||||
|
|
||||||
### Configuration
|
|
||||||
|
|
||||||
Config file: `~/.config/amcs/config.yaml`
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
server: https://your-amcs-server
|
|
||||||
token: your-bearer-token
|
|
||||||
```
|
|
||||||
|
|
||||||
Env vars override the config file: `AMCS_SERVER` (preferred), `AMCS_URL` (legacy alias), and `AMCS_TOKEN`. Flags `--server` and `--token` override env vars.
|
|
||||||
|
|
||||||
### stdio MCP client setup
|
|
||||||
|
|
||||||
#### Claude Code
|
|
||||||
|
|
||||||
```bash
|
|
||||||
claude mcp add --transport stdio amcs amcs-cli stdio
|
|
||||||
```
|
|
||||||
|
|
||||||
With inline credentials (no config file):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
claude mcp add --transport stdio amcs amcs-cli stdio \
|
|
||||||
--env AMCS_SERVER=https://your-amcs-server \
|
|
||||||
--env AMCS_TOKEN=your-bearer-token
|
|
||||||
```
|
|
||||||
|
|
||||||
#### Output format
|
|
||||||
|
|
||||||
`call` outputs JSON by default. Pass `--output yaml` for YAML.
|
|
||||||
|
|
||||||
## Development
|
## Development
|
||||||
|
|
||||||
Run the SQL migrations against a local database with:
|
Run the SQL migrations against a local database with:
|
||||||
|
|
||||||
`DATABASE_URL=postgres://... make migrate`
|
`DATABASE_URL=postgres://... make migrate`
|
||||||
|
|
||||||
### Backend + embedded UI build
|
LLM integration instructions are served at `/llm`.
|
||||||
|
|
||||||
The web UI now lives in the top-level `ui/` module and is embedded into the Go binary at build time with `go:embed`.
|
|
||||||
|
|
||||||
### Admin UI deployment model
|
|
||||||
|
|
||||||
AMCS uses a **lightweight embedded SPA panel** model:
|
|
||||||
|
|
||||||
- the Svelte admin app is compiled to static assets
|
|
||||||
- assets are embedded in the server binary and served from `/`
|
|
||||||
- backend APIs (`/api/status`, `/api/rs/*`, admin action routes, OAuth endpoints) stay on the same origin
|
|
||||||
- auth is enforced server-side for all sensitive API routes
|
|
||||||
|
|
||||||
This keeps deployment simple (single binary/container) while preserving SPA ergonomics for operator workflows.
|
|
||||||
|
|
||||||
### UI stack baseline
|
|
||||||
|
|
||||||
The admin frontend baseline is:
|
|
||||||
|
|
||||||
- Svelte 5 for the app shell and pages
|
|
||||||
- ResolveSpec-backed APIs for data access
|
|
||||||
- `@warkypublic/svelix` for admin UX components (including `GridlerFull` and form controllers)
|
|
||||||
- `@warkypublic/artemis-kit` as the default JavaScript tooling dependency baseline in `ui/package.json`
|
|
||||||
|
|
||||||
**Use `pnpm` for all UI work in this repo.**
|
|
||||||
|
|
||||||
- `make build` — runs the real UI build first, then compiles the Go server
|
|
||||||
- `make test` — runs `svelte-check` for the frontend and `go test ./...` for the backend
|
|
||||||
- `make ui-install` — installs frontend dependencies with `pnpm install --frozen-lockfile`
|
|
||||||
- `make ui-build` — builds only the frontend bundle
|
|
||||||
- `make ui-dev` — starts the Vite dev server with hot reload on `http://localhost:5173`
|
|
||||||
- `make ui-check` — runs the frontend type and Svelte checks
|
|
||||||
|
|
||||||
### Local UI workflow
|
|
||||||
|
|
||||||
For the normal production-style local flow:
|
|
||||||
|
|
||||||
1. Start the backend: `./scripts/run-local.sh configs/dev.yaml`
|
|
||||||
2. Open `http://localhost:8080`
|
|
||||||
|
|
||||||
For frontend iteration with hot reload and no Go rebuilds:
|
|
||||||
|
|
||||||
1. Start the backend once: `go run ./cmd/amcs-server --config configs/dev.yaml`
|
|
||||||
2. In another shell start the UI dev server: `make ui-dev`
|
|
||||||
3. Open `http://localhost:5173`
|
|
||||||
|
|
||||||
The Vite dev server proxies backend routes such as `/api/status`, `/llm`, `/healthz`, `/readyz`, `/files`, `/mcp`, and the OAuth endpoints back to the Go server on `http://127.0.0.1:8080` by default. Override that target with `AMCS_UI_BACKEND` if needed.
|
|
||||||
|
|
||||||
The root page (`/`) is now the Svelte frontend. It preserves the existing landing-page content and status information by fetching data from `GET /api/status`.
|
|
||||||
|
|
||||||
LLM integration instructions are still served at `/llm`.
|
|
||||||
|
|
||||||
## Containers
|
## Containers
|
||||||
|
|
||||||
@@ -683,50 +530,29 @@ Notes:
|
|||||||
- Database migrations `001` through `005` run automatically when the Postgres volume is created for the first time.
|
- Database migrations `001` through `005` run automatically when the Postgres volume is created for the first time.
|
||||||
- `migrations/006_rls_and_grants.sql` is intentionally skipped during container bootstrap because it contains deployment-specific grants for a role named `amcs_user`.
|
- `migrations/006_rls_and_grants.sql` is intentionally skipped during container bootstrap because it contains deployment-specific grants for a role named `amcs_user`.
|
||||||
|
|
||||||
### Run config migration with Compose
|
|
||||||
|
|
||||||
The container image now includes `/app/amcs-migrate-config`.
|
|
||||||
|
|
||||||
Dry-run (prints migrated YAML, does not write files):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose --profile tools run --rm migrate-config --config /app/configs/dev.yaml --dry-run
|
|
||||||
```
|
|
||||||
|
|
||||||
Apply migration in-place (writes file + creates backup):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose --profile tools run --rm migrate-config --config /app/configs/dev.yaml
|
|
||||||
```
|
|
||||||
|
|
||||||
## Ollama
|
## Ollama
|
||||||
|
|
||||||
Set your role targets to an Ollama provider to use a local or self-hosted Ollama server through its OpenAI-compatible API.
|
Set `ai.provider: "ollama"` to use a local or self-hosted Ollama server through its OpenAI-compatible API.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
```yaml
|
```yaml
|
||||||
ai:
|
ai:
|
||||||
providers:
|
provider: "ollama"
|
||||||
local:
|
|
||||||
type: "ollama"
|
|
||||||
base_url: "http://localhost:11434/v1"
|
|
||||||
api_key: "ollama"
|
|
||||||
request_headers: {}
|
|
||||||
embeddings:
|
embeddings:
|
||||||
|
model: "nomic-embed-text"
|
||||||
dimensions: 768
|
dimensions: 768
|
||||||
primary:
|
|
||||||
provider: "local"
|
|
||||||
model: "nomic-embed-text"
|
|
||||||
metadata:
|
metadata:
|
||||||
|
model: "llama3.2"
|
||||||
temperature: 0.1
|
temperature: 0.1
|
||||||
primary:
|
ollama:
|
||||||
provider: "local"
|
base_url: "http://localhost:11434/v1"
|
||||||
model: "llama3.2"
|
api_key: "ollama"
|
||||||
|
request_headers: {}
|
||||||
```
|
```
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
|
|
||||||
- For remote Ollama servers, point `ai.providers.<name>.base_url` at the remote `/v1` endpoint.
|
- For remote Ollama servers, point `ai.ollama.base_url` at the remote `/v1` endpoint.
|
||||||
- The client always sends Bearer auth; Ollama ignores it locally, so `api_key: "ollama"` is a safe default.
|
- The client always sends Bearer auth; Ollama ignores it locally, so `api_key: "ollama"` is a safe default.
|
||||||
- `ai.embeddings.dimensions` must match the embedding model you actually use, or startup will fail the database vector-dimension check.
|
- `ai.embeddings.dimensions` must match the embedding model you actually use, or startup will fail the database vector-dimension check.
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 285 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.3 KiB |
@@ -1,90 +0,0 @@
|
|||||||
# Changelog
|
|
||||||
|
|
||||||
## 2026-04-21
|
|
||||||
|
|
||||||
### 2026-04-21 21h - Config Schema v2 Introduced
|
|
||||||
|
|
||||||
- Refactored configuration to schema version `2` with named AI providers and role-based model chains.
|
|
||||||
- Added support for per-role primary and fallback targets for embeddings and metadata.
|
|
||||||
- Added optional background role overrides for backfill and metadata retry workers.
|
|
||||||
|
|
||||||
### 2026-04-21 21h - Automatic v1 -> v2 Migration
|
|
||||||
|
|
||||||
- Added config migration framework with explicit schema versioning.
|
|
||||||
- Implemented `v1 -> v2` migration to transform legacy provider blocks into named providers + role chains.
|
|
||||||
- Loader now auto-migrates older config files, rewrites migrated YAML, and creates timestamped backups.
|
|
||||||
|
|
||||||
### 2026-04-21 21h - AI Registry and Role Runners
|
|
||||||
|
|
||||||
- Added `ai.Registry` to build provider clients from named provider config entries.
|
|
||||||
- Added `EmbeddingRunner` and `MetadataRunner` with sequential fallback execution.
|
|
||||||
- Added target health tracking with cooldowns for transient/permanent/empty-response failures.
|
|
||||||
|
|
||||||
### 2026-04-21 21h - App and Tool Wiring Updates
|
|
||||||
|
|
||||||
- Rewired app startup to use provider registry + role runners for foreground and background flows.
|
|
||||||
- Updated capture, search, summarize, context, recall, backfill, metadata retry, and reparse paths to use new runners.
|
|
||||||
- Preserved environment override behavior for provider credentials/endpoints across matching provider types.
|
|
||||||
|
|
||||||
### 2026-04-21 21h - Migrate Config CLI Added
|
|
||||||
|
|
||||||
- Added `cmd/amcs-migrate-config` CLI to migrate config files to the current schema version.
|
|
||||||
- Supports dry-run output and in-place write mode with automatic backup file creation.
|
|
||||||
|
|
||||||
### 2026-04-21 21h - Tests and Documentation Updated
|
|
||||||
|
|
||||||
- Added focused tests for config migration, AI registry behavior, and runner fallback behavior.
|
|
||||||
- Updated `configs/config.example.yaml` to the new v2 schema.
|
|
||||||
- Updated README configuration sections and migration guidance to reflect v2 and `amcs-migrate-config` usage.
|
|
||||||
|
|
||||||
### 2026-04-21 21h - Uncommitted File Change List
|
|
||||||
|
|
||||||
- Modified: `.gitignore`
|
|
||||||
- Modified: `README.md`
|
|
||||||
- Modified: `configs/config.example.yaml`
|
|
||||||
- Modified: `internal/ai/compat/client.go`
|
|
||||||
- Modified: `internal/ai/compat/client_test.go`
|
|
||||||
- Modified: `internal/app/app.go`
|
|
||||||
- Modified: `internal/config/config.go`
|
|
||||||
- Modified: `internal/config/loader.go`
|
|
||||||
- Modified: `internal/config/loader_test.go`
|
|
||||||
- Modified: `internal/config/validate.go`
|
|
||||||
- Modified: `internal/config/validate_test.go`
|
|
||||||
- Modified: `internal/mcpserver/server.go`
|
|
||||||
- Modified: `internal/mcpserver/streamable_integration_test.go`
|
|
||||||
- Modified: `internal/tools/backfill.go`
|
|
||||||
- Modified: `internal/tools/capture.go`
|
|
||||||
- Modified: `internal/tools/context.go`
|
|
||||||
- Modified: `internal/tools/enrichment_retry.go`
|
|
||||||
- Modified: `internal/tools/links.go`
|
|
||||||
- Modified: `internal/tools/metadata_retry.go`
|
|
||||||
- Modified: `internal/tools/recall.go`
|
|
||||||
- Modified: `internal/tools/reparse_metadata.go`
|
|
||||||
- Modified: `internal/tools/retrieval.go`
|
|
||||||
- Modified: `internal/tools/search.go`
|
|
||||||
- Modified: `internal/tools/summarize.go`
|
|
||||||
- Modified: `internal/tools/update.go`
|
|
||||||
- Deleted: `internal/ai/factory.go`
|
|
||||||
- Deleted: `internal/ai/factory_test.go`
|
|
||||||
- Deleted: `internal/ai/litellm/client.go`
|
|
||||||
- Deleted: `internal/ai/ollama/client.go`
|
|
||||||
- Deleted: `internal/ai/openrouter/client.go`
|
|
||||||
- Deleted: `internal/ai/provider.go`
|
|
||||||
- New: `changelog.md`
|
|
||||||
- New: `cmd/amcs-migrate-config/main.go`
|
|
||||||
- New: `internal/ai/registry.go`
|
|
||||||
- New: `internal/ai/registry_test.go`
|
|
||||||
- New: `internal/ai/runner.go`
|
|
||||||
- New: `internal/ai/runner_test.go`
|
|
||||||
- New: `internal/config/migrate.go`
|
|
||||||
- New: `internal/config/migrate_test.go`
|
|
||||||
|
|
||||||
### 2026-04-21 21h - Docker Support for Config Migration CLI
|
|
||||||
- Added `amcs-migrate-config` binary to the Docker image build output.
|
|
||||||
- Added `migrate-config` service in `docker-compose.yml` under the `tools` profile.
|
|
||||||
- Documented compose-based migration commands (dry-run and in-place apply) in the README.
|
|
||||||
|
|
||||||
### 2026-04-21 21h - Startup Migration Write Disabled
|
|
||||||
- Changed config loading to migrate legacy schemas in memory only during startup.
|
|
||||||
- Removed automatic file rewrite and backup creation from the startup config loader.
|
|
||||||
- Added loader log hint to use `amcs-migrate-config` when persistent conversion is needed.
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
)
|
|
||||||
|
|
||||||
var argFlags []string
|
|
||||||
|
|
||||||
var callCmd = &cobra.Command{
|
|
||||||
Use: "call <tool>",
|
|
||||||
Short: "Call a remote AMCS tool",
|
|
||||||
Args: cobra.ExactArgs(1),
|
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
|
||||||
toolName := args[0]
|
|
||||||
toolArgs, err := parseArgs(argFlags)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
session, err := connectRemote(cmd.Context())
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer func() { _ = session.Close() }()
|
|
||||||
|
|
||||||
res, err := session.CallTool(cmd.Context(), &mcp.CallToolParams{Name: toolName, Arguments: toolArgs})
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("call tool %q: %w", toolName, err)
|
|
||||||
}
|
|
||||||
return printOutput(res)
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
callCmd.Flags().StringArrayVar(&argFlags, "arg", nil, "Tool argument in key=value format (repeatable)")
|
|
||||||
rootCmd.AddCommand(callCmd)
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseArgs(items []string) (map[string]any, error) {
|
|
||||||
result := make(map[string]any, len(items))
|
|
||||||
for _, item := range items {
|
|
||||||
key, value, ok := strings.Cut(item, "=")
|
|
||||||
if !ok || strings.TrimSpace(key) == "" {
|
|
||||||
return nil, fmt.Errorf("invalid --arg %q: want key=value", item)
|
|
||||||
}
|
|
||||||
result[key] = parseScalar(value)
|
|
||||||
}
|
|
||||||
return result, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseScalar(s string) any {
|
|
||||||
if s == "true" || s == "false" {
|
|
||||||
b, _ := strconv.ParseBool(s)
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
if i, err := strconv.ParseInt(s, 10, 64); err == nil {
|
|
||||||
return i
|
|
||||||
}
|
|
||||||
if f, err := strconv.ParseFloat(s, 64); err == nil && strings.ContainsAny(s, ".eE") {
|
|
||||||
return f
|
|
||||||
}
|
|
||||||
var v any
|
|
||||||
if err := json.Unmarshal([]byte(s), &v); err == nil {
|
|
||||||
switch v.(type) {
|
|
||||||
case map[string]any, []any, float64, bool, nil:
|
|
||||||
return v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
|
|
||||||
func printOutput(v any) error {
|
|
||||||
switch outputFlag {
|
|
||||||
case "yaml":
|
|
||||||
data, err := yaml.Marshal(v)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("marshal yaml: %w", err)
|
|
||||||
}
|
|
||||||
_, err = os.Stdout.Write(data)
|
|
||||||
return err
|
|
||||||
default:
|
|
||||||
data, err := json.MarshalIndent(v, "", " ")
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("marshal json: %w", err)
|
|
||||||
}
|
|
||||||
data = append(data, '\n')
|
|
||||||
_, err = os.Stdout.Write(data)
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"path/filepath"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
)
|
|
||||||
|
|
||||||
type Config struct {
|
|
||||||
Server string `yaml:"server"`
|
|
||||||
Token string `yaml:"token"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func defaultConfigPath() (string, error) {
|
|
||||||
home, err := os.UserHomeDir()
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("resolve home dir: %w", err)
|
|
||||||
}
|
|
||||||
return filepath.Join(home, ".config", "amcs", "config.yaml"), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func resolveConfigPath(path string) (string, error) {
|
|
||||||
if strings.TrimSpace(path) != "" {
|
|
||||||
return path, nil
|
|
||||||
}
|
|
||||||
return defaultConfigPath()
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadConfigFile(path string) (Config, error) {
|
|
||||||
var cfg Config
|
|
||||||
data, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
if errors.Is(err, os.ErrNotExist) {
|
|
||||||
return cfg, nil
|
|
||||||
}
|
|
||||||
return cfg, fmt.Errorf("read config: %w", err)
|
|
||||||
}
|
|
||||||
if err := yaml.Unmarshal(data, &cfg); err != nil {
|
|
||||||
return cfg, fmt.Errorf("parse config: %w", err)
|
|
||||||
}
|
|
||||||
return cfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func saveConfigFile(path string, cfg Config) error {
|
|
||||||
if err := os.MkdirAll(filepath.Dir(path), 0o700); err != nil {
|
|
||||||
return fmt.Errorf("create config dir: %w", err)
|
|
||||||
}
|
|
||||||
data, err := yaml.Marshal(cfg)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("marshal config: %w", err)
|
|
||||||
}
|
|
||||||
if err := os.WriteFile(path, data, 0o600); err != nil {
|
|
||||||
return fmt.Errorf("write config: %w", err)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
@@ -1,151 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"net/http"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
cfgFile string
|
|
||||||
serverFlag string
|
|
||||||
tokenFlag string
|
|
||||||
outputFlag string
|
|
||||||
verbose bool
|
|
||||||
cfg Config
|
|
||||||
)
|
|
||||||
|
|
||||||
const cliUserAgent = "amcs-cli/0.0.1"
|
|
||||||
|
|
||||||
var rootCmd = &cobra.Command{
|
|
||||||
Use: "amcs-cli",
|
|
||||||
Short: "CLI for connecting to a remote AMCS MCP server",
|
|
||||||
SilenceUsage: true,
|
|
||||||
SilenceErrors: true,
|
|
||||||
PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
|
|
||||||
return loadConfig()
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func Execute() {
|
|
||||||
if err := rootCmd.Execute(); err != nil {
|
|
||||||
fmt.Fprintln(os.Stderr, err)
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "Path to config file")
|
|
||||||
rootCmd.PersistentFlags().StringVar(&serverFlag, "server", "", "AMCS server URL")
|
|
||||||
rootCmd.PersistentFlags().StringVar(&tokenFlag, "token", "", "AMCS bearer token")
|
|
||||||
rootCmd.PersistentFlags().StringVar(&outputFlag, "output", "json", "Output format: json or yaml")
|
|
||||||
rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "Enable verbose logging to stderr")
|
|
||||||
}
|
|
||||||
|
|
||||||
func loadConfig() error {
|
|
||||||
path, err := resolveConfigPath(cfgFile)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
loaded, err := loadConfigFile(path)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
cfg = loaded
|
|
||||||
if v := strings.TrimSpace(os.Getenv("AMCS_SERVER")); v != "" {
|
|
||||||
cfg.Server = v
|
|
||||||
}
|
|
||||||
if v := strings.TrimSpace(os.Getenv("AMCS_URL")); v != "" {
|
|
||||||
cfg.Server = v
|
|
||||||
}
|
|
||||||
if v := strings.TrimSpace(os.Getenv("AMCS_TOKEN")); v != "" {
|
|
||||||
cfg.Token = v
|
|
||||||
}
|
|
||||||
if v := strings.TrimSpace(serverFlag); v != "" {
|
|
||||||
cfg.Server = v
|
|
||||||
}
|
|
||||||
if v := strings.TrimSpace(tokenFlag); v != "" {
|
|
||||||
cfg.Token = v
|
|
||||||
}
|
|
||||||
outputFlag = strings.ToLower(strings.TrimSpace(outputFlag))
|
|
||||||
if outputFlag != "json" && outputFlag != "yaml" {
|
|
||||||
return fmt.Errorf("invalid --output %q: must be json or yaml", outputFlag)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func requireServer() error {
|
|
||||||
if strings.TrimSpace(cfg.Server) == "" {
|
|
||||||
return fmt.Errorf("server URL is required; set --server, AMCS_SERVER, AMCS_URL, or config server")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func endpointURL() string {
|
|
||||||
base := strings.TrimRight(strings.TrimSpace(cfg.Server), "/")
|
|
||||||
if strings.HasSuffix(base, "/mcp") {
|
|
||||||
return base
|
|
||||||
}
|
|
||||||
return base + "/mcp"
|
|
||||||
}
|
|
||||||
|
|
||||||
func newHTTPClient() *http.Client {
|
|
||||||
return &http.Client{
|
|
||||||
Timeout: 0,
|
|
||||||
Transport: &bearerTransport{
|
|
||||||
base: http.DefaultTransport,
|
|
||||||
token: cfg.Token,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
type bearerTransport struct {
|
|
||||||
base http.RoundTripper
|
|
||||||
token string
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *bearerTransport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
||||||
base := t.base
|
|
||||||
if base == nil {
|
|
||||||
base = http.DefaultTransport
|
|
||||||
}
|
|
||||||
clone := req.Clone(req.Context())
|
|
||||||
if strings.TrimSpace(clone.Header.Get("User-Agent")) == "" {
|
|
||||||
clone.Header.Set("User-Agent", cliUserAgent)
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(t.token) != "" {
|
|
||||||
clone.Header.Set("Authorization", "Bearer "+t.token)
|
|
||||||
}
|
|
||||||
return base.RoundTrip(clone)
|
|
||||||
}
|
|
||||||
|
|
||||||
func connectRemote(ctx context.Context) (*mcp.ClientSession, error) {
|
|
||||||
if err := requireServer(); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
verboseLogf("connecting to %s", endpointURL())
|
|
||||||
client := mcp.NewClient(&mcp.Implementation{Name: "amcs-cli", Version: "0.0.1"}, nil)
|
|
||||||
transport := &mcp.StreamableClientTransport{
|
|
||||||
Endpoint: endpointURL(),
|
|
||||||
HTTPClient: newHTTPClient(),
|
|
||||||
DisableStandaloneSSE: true,
|
|
||||||
}
|
|
||||||
session, err := client.Connect(ctx, transport, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("connect to AMCS server: %w", err)
|
|
||||||
}
|
|
||||||
verboseLogf("connected to %s", endpointURL())
|
|
||||||
return session, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func verboseLogf(format string, args ...any) {
|
|
||||||
if !verbose {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
_, _ = fmt.Fprintf(os.Stderr, "[amcs-cli] "+format+"\n", args...)
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestBearerTransportFormatsBearerToken(t *testing.T) {
|
|
||||||
const want = "Bearer X"
|
|
||||||
const wantUA = "amcs-cli/0.0.1"
|
|
||||||
|
|
||||||
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if got := r.Header.Get("Authorization"); got != want {
|
|
||||||
t.Fatalf("Authorization header = %q, want %q", got, want)
|
|
||||||
}
|
|
||||||
if got := r.Header.Get("User-Agent"); got != wantUA {
|
|
||||||
t.Fatalf("User-Agent header = %q, want %q", got, wantUA)
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}))
|
|
||||||
defer ts.Close()
|
|
||||||
|
|
||||||
client := &http.Client{Transport: &bearerTransport{token: "X"}}
|
|
||||||
req, err := http.NewRequest(http.MethodGet, ts.URL, nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewRequest() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
res, err := client.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("client.Do() error = %v", err)
|
|
||||||
}
|
|
||||||
_ = res.Body.Close()
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var sseCmd = &cobra.Command{
|
|
||||||
Use: "sse",
|
|
||||||
Short: "Run a stdio MCP bridge backed by a remote AMCS server using SSE transport (widely supported by hosted MCP clients)",
|
|
||||||
RunE: func(cmd *cobra.Command, _ []string) error {
|
|
||||||
ctx := cmd.Context()
|
|
||||||
|
|
||||||
if err := requireServer(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
client := mcp.NewClient(&mcp.Implementation{Name: "amcs-cli", Version: "0.0.1"}, nil)
|
|
||||||
transport := &mcp.SSEClientTransport{
|
|
||||||
Endpoint: sseEndpointURL(),
|
|
||||||
HTTPClient: newHTTPClient(),
|
|
||||||
}
|
|
||||||
|
|
||||||
verboseLogf("connecting to SSE endpoint %s", sseEndpointURL())
|
|
||||||
remote, err := client.Connect(ctx, transport, nil)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("connect to AMCS SSE endpoint: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = remote.Close() }()
|
|
||||||
verboseLogf("connected to SSE endpoint %s", sseEndpointURL())
|
|
||||||
|
|
||||||
tools, err := remote.ListTools(ctx, nil)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("load remote tools: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
server := mcp.NewServer(&mcp.Implementation{
|
|
||||||
Name: "amcs-cli",
|
|
||||||
Title: "AMCS CLI Bridge (SSE)",
|
|
||||||
Version: "0.0.1",
|
|
||||||
}, nil)
|
|
||||||
|
|
||||||
for _, tool := range tools.Tools {
|
|
||||||
remoteTool := tool
|
|
||||||
server.AddTool(&mcp.Tool{
|
|
||||||
Name: remoteTool.Name,
|
|
||||||
Description: remoteTool.Description,
|
|
||||||
InputSchema: remoteTool.InputSchema,
|
|
||||||
OutputSchema: remoteTool.OutputSchema,
|
|
||||||
Annotations: remoteTool.Annotations,
|
|
||||||
}, func(ctx context.Context, req *mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
|
||||||
return remote.CallTool(ctx, &mcp.CallToolParams{
|
|
||||||
Name: req.Params.Name,
|
|
||||||
Arguments: req.Params.Arguments,
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
session, err := server.Connect(ctx, &mcp.StdioTransport{}, nil)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("start stdio bridge: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = session.Close() }()
|
|
||||||
verboseLogf("sse stdio bridge ready")
|
|
||||||
verboseLogf("waiting for MCP commands on stdin")
|
|
||||||
|
|
||||||
<-ctx.Done()
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func sseEndpointURL() string {
|
|
||||||
base := strings.TrimRight(strings.TrimSpace(cfg.Server), "/")
|
|
||||||
if strings.HasSuffix(base, "/mcp") {
|
|
||||||
base = strings.TrimSuffix(base, "/mcp")
|
|
||||||
}
|
|
||||||
if strings.HasSuffix(base, "/sse") {
|
|
||||||
return base
|
|
||||||
}
|
|
||||||
return base + "/sse"
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(sseCmd)
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var stdioCmd = &cobra.Command{
|
|
||||||
Use: "stdio",
|
|
||||||
Short: "Run a stdio MCP bridge backed by a remote AMCS server",
|
|
||||||
RunE: func(cmd *cobra.Command, _ []string) error {
|
|
||||||
ctx := cmd.Context()
|
|
||||||
remote, err := connectRemote(ctx)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer func() { _ = remote.Close() }()
|
|
||||||
|
|
||||||
tools, err := remote.ListTools(ctx, nil)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("load remote tools: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
server := mcp.NewServer(&mcp.Implementation{
|
|
||||||
Name: "amcs-cli",
|
|
||||||
Title: "AMCS CLI Bridge",
|
|
||||||
Version: "0.0.1",
|
|
||||||
}, nil)
|
|
||||||
|
|
||||||
for _, tool := range tools.Tools {
|
|
||||||
remoteTool := tool
|
|
||||||
server.AddTool(&mcp.Tool{
|
|
||||||
Name: remoteTool.Name,
|
|
||||||
Description: remoteTool.Description,
|
|
||||||
InputSchema: remoteTool.InputSchema,
|
|
||||||
OutputSchema: remoteTool.OutputSchema,
|
|
||||||
Annotations: remoteTool.Annotations,
|
|
||||||
}, func(ctx context.Context, req *mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
|
||||||
return remote.CallTool(ctx, &mcp.CallToolParams{
|
|
||||||
Name: req.Params.Name,
|
|
||||||
Arguments: req.Params.Arguments,
|
|
||||||
})
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
session, err := server.Connect(ctx, &mcp.StdioTransport{}, nil)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("start stdio bridge: %w", err)
|
|
||||||
}
|
|
||||||
defer func() { _ = session.Close() }()
|
|
||||||
verboseLogf("stdio bridge connected to remote AMCS and ready")
|
|
||||||
verboseLogf("waiting for MCP commands on stdin")
|
|
||||||
|
|
||||||
<-ctx.Done()
|
|
||||||
return nil
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(stdioCmd)
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
package cmd
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"os"
|
|
||||||
"strings"
|
|
||||||
"text/tabwriter"
|
|
||||||
|
|
||||||
"github.com/spf13/cobra"
|
|
||||||
)
|
|
||||||
|
|
||||||
var toolsCmd = &cobra.Command{
|
|
||||||
Use: "tools",
|
|
||||||
Short: "List tools available on the remote AMCS server",
|
|
||||||
RunE: func(cmd *cobra.Command, _ []string) error {
|
|
||||||
session, err := connectRemote(cmd.Context())
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
defer func() { _ = session.Close() }()
|
|
||||||
|
|
||||||
res, err := session.ListTools(cmd.Context(), nil)
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("list tools: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
|
|
||||||
fmt.Fprintln(w, "NAME\tDESCRIPTION")
|
|
||||||
for _, tool := range res.Tools {
|
|
||||||
fmt.Fprintf(w, "%s\t%s\n", tool.Name, strings.TrimSpace(tool.Description))
|
|
||||||
}
|
|
||||||
return w.Flush()
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
rootCmd.AddCommand(toolsCmd)
|
|
||||||
}
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import "git.warky.dev/wdevs/amcs/cmd/amcs-cli/cmd"
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
cmd.Execute()
|
|
||||||
}
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
package main
|
|
||||||
|
|
||||||
import (
|
|
||||||
"flag"
|
|
||||||
"fmt"
|
|
||||||
"log"
|
|
||||||
"os"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
func main() {
|
|
||||||
var (
|
|
||||||
configPath string
|
|
||||||
dryRun bool
|
|
||||||
toVersion int
|
|
||||||
)
|
|
||||||
flag.StringVar(&configPath, "config", "", "Path to the YAML config file (default: $AMCS_CONFIG or ./configs/dev.yaml)")
|
|
||||||
flag.BoolVar(&dryRun, "dry-run", false, "Print the migrated config to stdout instead of writing it back")
|
|
||||||
flag.IntVar(&toVersion, "to-version", config.CurrentConfigVersion, "Stop migrating after reaching this version")
|
|
||||||
flag.Parse()
|
|
||||||
|
|
||||||
if toVersion <= 0 || toVersion > config.CurrentConfigVersion {
|
|
||||||
log.Fatalf("invalid -to-version %d (must be between 1 and %d)", toVersion, config.CurrentConfigVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
path := config.ResolvePath(configPath)
|
|
||||||
original, err := os.ReadFile(path)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("read config %q: %v", path, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
raw := map[string]any{}
|
|
||||||
if err := yaml.Unmarshal(original, &raw); err != nil {
|
|
||||||
log.Fatalf("decode config %q: %v", path, err)
|
|
||||||
}
|
|
||||||
if raw == nil {
|
|
||||||
raw = map[string]any{}
|
|
||||||
}
|
|
||||||
|
|
||||||
applied, err := migrateUpTo(raw, toVersion)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("migrate: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(applied) == 0 {
|
|
||||||
fmt.Fprintf(os.Stderr, "%s already at version %d; nothing to do\n", path, currentVersion(raw))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
out, err := yaml.Marshal(raw)
|
|
||||||
if err != nil {
|
|
||||||
log.Fatalf("marshal migrated config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, step := range applied {
|
|
||||||
fmt.Fprintf(os.Stderr, "applied migration v%d -> v%d: %s\n", step.From, step.To, step.Describe)
|
|
||||||
}
|
|
||||||
|
|
||||||
if dryRun {
|
|
||||||
_, _ = os.Stdout.Write(out)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
backup := fmt.Sprintf("%s.bak.%d", path, time.Now().Unix())
|
|
||||||
if err := os.WriteFile(backup, original, 0o600); err != nil {
|
|
||||||
log.Fatalf("write backup %q: %v", backup, err)
|
|
||||||
}
|
|
||||||
if err := os.WriteFile(path, out, 0o600); err != nil {
|
|
||||||
log.Fatalf("write migrated config %q: %v", path, err)
|
|
||||||
}
|
|
||||||
fmt.Fprintf(os.Stderr, "wrote migrated config to %s (backup: %s)\n", path, backup)
|
|
||||||
}
|
|
||||||
|
|
||||||
// migrateUpTo runs the migration ladder but stops at the requested version.
|
|
||||||
func migrateUpTo(raw map[string]any, target int) ([]config.ConfigMigration, error) {
|
|
||||||
if currentVersion(raw) >= target {
|
|
||||||
return nil, nil
|
|
||||||
}
|
|
||||||
if target == config.CurrentConfigVersion {
|
|
||||||
return config.Migrate(raw)
|
|
||||||
}
|
|
||||||
// Partial migrations are rare; for now reject anything other than the
|
|
||||||
// current version target since the migration ladder is short.
|
|
||||||
return nil, fmt.Errorf("partial migration to v%d is not supported (use -to-version=%d)", target, config.CurrentConfigVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
func currentVersion(raw map[string]any) int {
|
|
||||||
v, ok := raw["version"]
|
|
||||||
if !ok {
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
switch n := v.(type) {
|
|
||||||
case int:
|
|
||||||
return n
|
|
||||||
case int64:
|
|
||||||
return int(n)
|
|
||||||
case float64:
|
|
||||||
return int(n)
|
|
||||||
}
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
+23
-51
@@ -1,5 +1,3 @@
|
|||||||
version: 2
|
|
||||||
|
|
||||||
server:
|
server:
|
||||||
host: "0.0.0.0"
|
host: "0.0.0.0"
|
||||||
port: 8080
|
port: 8080
|
||||||
@@ -11,7 +9,6 @@ server:
|
|||||||
|
|
||||||
mcp:
|
mcp:
|
||||||
path: "/mcp"
|
path: "/mcp"
|
||||||
sse_path: "/sse"
|
|
||||||
server_name: "amcs"
|
server_name: "amcs"
|
||||||
transport: "streamable_http"
|
transport: "streamable_http"
|
||||||
session_timeout: "10m"
|
session_timeout: "10m"
|
||||||
@@ -29,7 +26,7 @@ auth:
|
|||||||
- id: "oauth-client"
|
- id: "oauth-client"
|
||||||
client_id: ""
|
client_id: ""
|
||||||
client_secret: ""
|
client_secret: ""
|
||||||
description: "optional OAuth client credentials"
|
description: "used when auth.mode=oauth_client_credentials"
|
||||||
|
|
||||||
database:
|
database:
|
||||||
url: "postgres://postgres:postgres@localhost:5432/amcs?sslmode=disable"
|
url: "postgres://postgres:postgres@localhost:5432/amcs?sslmode=disable"
|
||||||
@@ -39,58 +36,33 @@ database:
|
|||||||
max_conn_idle_time: "10m"
|
max_conn_idle_time: "10m"
|
||||||
|
|
||||||
ai:
|
ai:
|
||||||
providers:
|
provider: "litellm"
|
||||||
default:
|
|
||||||
type: "litellm"
|
|
||||||
base_url: "http://localhost:4000/v1"
|
|
||||||
api_key: "replace-me"
|
|
||||||
request_headers: {}
|
|
||||||
|
|
||||||
ollama_local:
|
|
||||||
type: "ollama"
|
|
||||||
base_url: "http://localhost:11434/v1"
|
|
||||||
api_key: "ollama"
|
|
||||||
request_headers: {}
|
|
||||||
|
|
||||||
openrouter:
|
|
||||||
type: "openrouter"
|
|
||||||
base_url: "https://openrouter.ai/api/v1"
|
|
||||||
api_key: "replace-me"
|
|
||||||
app_name: "amcs"
|
|
||||||
site_url: ""
|
|
||||||
request_headers: {}
|
|
||||||
|
|
||||||
embeddings:
|
embeddings:
|
||||||
|
model: "openai/text-embedding-3-small"
|
||||||
dimensions: 1536
|
dimensions: 1536
|
||||||
primary:
|
|
||||||
provider: "default"
|
|
||||||
model: "openai/text-embedding-3-small"
|
|
||||||
fallbacks:
|
|
||||||
- provider: "ollama_local"
|
|
||||||
model: "nomic-embed-text"
|
|
||||||
|
|
||||||
metadata:
|
metadata:
|
||||||
|
model: "gpt-4o-mini"
|
||||||
|
fallback_models: []
|
||||||
temperature: 0.1
|
temperature: 0.1
|
||||||
log_conversations: false
|
log_conversations: false
|
||||||
timeout: "10s"
|
litellm:
|
||||||
primary:
|
base_url: "http://localhost:4000/v1"
|
||||||
provider: "default"
|
api_key: "replace-me"
|
||||||
model: "gpt-4o-mini"
|
use_responses_api: false
|
||||||
fallbacks:
|
request_headers: {}
|
||||||
- provider: "openrouter"
|
embedding_model: "openrouter/openai/text-embedding-3-small"
|
||||||
model: "openai/gpt-4.1-mini"
|
metadata_model: "gpt-4o-mini"
|
||||||
|
fallback_metadata_models: []
|
||||||
# Optional overrides for background jobs (backfill_embeddings,
|
ollama:
|
||||||
# retry_failed_metadata, reparse_thought_metadata).
|
base_url: "http://localhost:11434/v1"
|
||||||
background:
|
api_key: "ollama"
|
||||||
embeddings:
|
request_headers: {}
|
||||||
primary:
|
openrouter:
|
||||||
provider: "default"
|
base_url: "https://openrouter.ai/api/v1"
|
||||||
model: "openai/text-embedding-3-small"
|
api_key: ""
|
||||||
metadata:
|
app_name: "amcs"
|
||||||
primary:
|
site_url: ""
|
||||||
provider: "default"
|
extra_headers: {}
|
||||||
model: "gpt-4o-mini"
|
|
||||||
|
|
||||||
capture:
|
capture:
|
||||||
source: "mcp"
|
source: "mcp"
|
||||||
|
|||||||
+2
-3
@@ -9,7 +9,6 @@ server:
|
|||||||
|
|
||||||
mcp:
|
mcp:
|
||||||
path: "/mcp"
|
path: "/mcp"
|
||||||
sse_path: "/sse"
|
|
||||||
server_name: "amcs"
|
server_name: "amcs"
|
||||||
transport: "streamable_http"
|
transport: "streamable_http"
|
||||||
session_timeout: "10m"
|
session_timeout: "10m"
|
||||||
@@ -25,8 +24,8 @@ auth:
|
|||||||
oauth:
|
oauth:
|
||||||
clients:
|
clients:
|
||||||
- id: "oauth-client"
|
- id: "oauth-client"
|
||||||
client_id: "test_aab32200464910ab697efbd760e7ed2c"
|
client_id: ""
|
||||||
client_secret: "test_135369559a422b4b93fcb534a4aed2c9"
|
client_secret: ""
|
||||||
description: "used when auth.mode=oauth_client_credentials"
|
description: "used when auth.mode=oauth_client_credentials"
|
||||||
|
|
||||||
database:
|
database:
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ server:
|
|||||||
|
|
||||||
mcp:
|
mcp:
|
||||||
path: "/mcp"
|
path: "/mcp"
|
||||||
sse_path: "/sse"
|
|
||||||
server_name: "amcs"
|
server_name: "amcs"
|
||||||
transport: "streamable_http"
|
transport: "streamable_http"
|
||||||
session_timeout: "10m"
|
session_timeout: "10m"
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
Completed personas UI reachability and fixed the missing backend ResolveSpec registrations that blocked it.
|
|
||||||
|
|
||||||
- Added Personas navigation/page wiring in the Svelte admin shell.
|
|
||||||
- Added a personas overview page with tabs for personas, parts, and traits.
|
|
||||||
- Expanded the persona inspector to load linked parts, traits, skills, guardrails, and arc state.
|
|
||||||
- Found that `/api/rs/public/agent_parts` and related persona routes were missing because `internal/app/resolvespec_admin.go` manually whitelists ResolveSpec models.
|
|
||||||
- Registered persona-related ResolveSpec models: `agent_personas`, `agent_parts`, `agent_traits`, persona join tables, arc tables, and `persona_arc`.
|
|
||||||
- Allowed ResolveSpec mutations for `agent_personas`, `agent_parts`, and `agent_traits`.
|
|
||||||
- Verified the `internal/app` package still compiles with `env GOCACHE=/tmp/amcs-go-cache go test -run '^$' ./internal/app`.
|
|
||||||
|
|
||||||
Follow-up:
|
|
||||||
|
|
||||||
- Automated ResolveSpec model registration generation with `relspec templ`.
|
|
||||||
- Added `scripts/templates/resolvespec_models.tmpl`.
|
|
||||||
- Updated `scripts/generate-models.sh` to generate `internal/app/resolvespec_models_generated.go`.
|
|
||||||
- Removed the handwritten `resolveSpecModels()` from `internal/app/resolvespec_admin.go`.
|
|
||||||
- Extended `scripts/patch-generated-models.sh` to fix current relspec output quirks:
|
|
||||||
- incorrect `persona_arc` primary-key cast
|
|
||||||
- unused `resolvespec_common` imports in join-table models
|
|
||||||
- Added focused tests covering persona entity presence and persona mutation allowlisting.
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
Fixed the Gitea build break caused by `go:embed` requiring `internal/app/ui/dist` to exist in a clean checkout.
|
|
||||||
|
|
||||||
Changes made:
|
|
||||||
- Added `internal/app/ui/dist/placeholder.txt` so the embedded UI directory is always present in source control.
|
|
||||||
- Updated `internal/mcpserver/server_test.go` to derive expected tool names from `BuildToolCatalog()` instead of a stale hard-coded list.
|
|
||||||
- Removed stale maintenance tool entries from `internal/mcpserver/server.go` because those tools are not currently registered.
|
|
||||||
|
|
||||||
Verification:
|
|
||||||
- `env GOCACHE=/tmp/go-build go test ./internal/mcpserver -run TestNewListsAllRegisteredTools -v` passes.
|
|
||||||
- A broader `go test ./internal/app ./cmd/amcs-server` compile check was started, but it did not finish before this log entry was written.
|
|
||||||
|
|
||||||
Migration follow-up:
|
|
||||||
- Fixed `migrations/020_generated_schema.sql` after PostgreSQL failed with `operator does not exist: name[] = text[]`.
|
|
||||||
- Root cause: `pg_attribute.attname` is type `name`, so `ARRAY(SELECT a.attname ...)` produced `name[]`, which was compared against `text[]` literals.
|
|
||||||
- Updated each repeated primary-key introspection block to use `SELECT a.attname::text`, keeping the existing `ARRAY[]::text[]` and `ARRAY['id']` / `ARRAY['persona_id']` comparisons valid.
|
|
||||||
@@ -36,18 +36,6 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "8080:8080"
|
||||||
|
|
||||||
migrate-config:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
profiles: ["tools"]
|
|
||||||
restart: "no"
|
|
||||||
volumes:
|
|
||||||
- ./configs:/app/configs
|
|
||||||
environment:
|
|
||||||
AMCS_CONFIG: /app/configs/docker.yaml
|
|
||||||
entrypoint: ["/app/amcs-migrate-config"]
|
|
||||||
command: ["--config", "/app/configs/docker.yaml", "--dry-run"]
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres_data:
|
postgres_data:
|
||||||
|
|
||||||
|
|||||||
@@ -3,85 +3,26 @@ module git.warky.dev/wdevs/amcs
|
|||||||
go 1.26.1
|
go 1.26.1
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/bitechdev/ResolveSpec v1.0.87
|
|
||||||
github.com/google/jsonschema-go v0.4.2
|
github.com/google/jsonschema-go v0.4.2
|
||||||
github.com/google/uuid v1.6.0
|
github.com/google/uuid v1.6.0
|
||||||
github.com/jackc/pgx/v5 v5.9.1
|
github.com/jackc/pgx/v5 v5.9.1
|
||||||
github.com/modelcontextprotocol/go-sdk v1.4.1
|
github.com/modelcontextprotocol/go-sdk v1.4.1
|
||||||
github.com/pgvector/pgvector-go v0.3.0
|
github.com/pgvector/pgvector-go v0.3.0
|
||||||
github.com/spf13/cobra v1.10.2
|
golang.org/x/sync v0.17.0
|
||||||
github.com/uptrace/bun v1.2.16
|
|
||||||
github.com/uptrace/bun/dialect/pgdialect v1.2.16
|
|
||||||
github.com/uptrace/bun/driver/pgdriver v1.1.12
|
|
||||||
github.com/uptrace/bunrouter v1.0.23
|
|
||||||
golang.org/x/sync v0.19.0
|
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/beorn7/perks v1.0.1 // indirect
|
|
||||||
github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf // indirect
|
|
||||||
github.com/cespare/xxhash/v2 v2.3.0 // indirect
|
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
|
|
||||||
github.com/fsnotify/fsnotify v1.9.0 // indirect
|
|
||||||
github.com/getsentry/sentry-go v0.40.0 // indirect
|
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
|
|
||||||
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
|
|
||||||
github.com/golang-sql/sqlexp v0.1.0 // indirect
|
|
||||||
github.com/gorilla/mux v1.8.1 // indirect
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 // indirect
|
|
||||||
github.com/jackc/pgpassfile v1.0.0 // indirect
|
github.com/jackc/pgpassfile v1.0.0 // indirect
|
||||||
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
|
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
|
||||||
github.com/jackc/puddle/v2 v2.2.2 // indirect
|
github.com/jackc/puddle/v2 v2.2.2 // indirect
|
||||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
github.com/kr/text v0.2.0 // indirect
|
||||||
github.com/jinzhu/now v1.1.5 // indirect
|
|
||||||
github.com/mattn/go-sqlite3 v1.14.33 // indirect
|
|
||||||
github.com/microsoft/go-mssqldb v1.9.5 // indirect
|
|
||||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
|
||||||
github.com/prometheus/client_golang v1.23.2 // indirect
|
|
||||||
github.com/prometheus/client_model v0.6.2 // indirect
|
|
||||||
github.com/prometheus/common v0.67.4 // indirect
|
|
||||||
github.com/prometheus/procfs v0.19.2 // indirect
|
|
||||||
github.com/puzpuzpuz/xsync/v3 v3.5.1 // indirect
|
|
||||||
github.com/redis/go-redis/v9 v9.17.2 // indirect
|
|
||||||
github.com/rogpeppe/go-internal v1.14.1 // indirect
|
github.com/rogpeppe/go-internal v1.14.1 // indirect
|
||||||
github.com/sagikazarmark/locafero v0.12.0 // indirect
|
|
||||||
github.com/segmentio/asm v1.1.3 // indirect
|
github.com/segmentio/asm v1.1.3 // indirect
|
||||||
github.com/segmentio/encoding v0.5.4 // indirect
|
github.com/segmentio/encoding v0.5.4 // indirect
|
||||||
github.com/shopspring/decimal v1.4.0 // indirect
|
|
||||||
github.com/spf13/afero v1.15.0 // indirect
|
|
||||||
github.com/spf13/cast v1.10.0 // indirect
|
|
||||||
github.com/spf13/pflag v1.0.10 // indirect
|
|
||||||
github.com/spf13/viper v1.21.0 // indirect
|
|
||||||
github.com/stretchr/testify v1.11.1 // indirect
|
|
||||||
github.com/subosito/gotenv v1.6.0 // indirect
|
|
||||||
github.com/tidwall/gjson v1.18.0 // indirect
|
|
||||||
github.com/tidwall/match v1.2.0 // indirect
|
|
||||||
github.com/tidwall/pretty v1.2.1 // indirect
|
|
||||||
github.com/tidwall/sjson v1.2.5 // indirect
|
|
||||||
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
|
|
||||||
github.com/uptrace/bun/dialect/mssqldialect v1.2.16 // indirect
|
|
||||||
github.com/uptrace/bun/dialect/sqlitedialect v1.2.16 // indirect
|
|
||||||
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
|
|
||||||
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
|
|
||||||
github.com/x448/float16 v0.8.4 // indirect
|
github.com/x448/float16 v0.8.4 // indirect
|
||||||
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
|
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
|
||||||
go.uber.org/multierr v1.11.0 // indirect
|
|
||||||
go.uber.org/zap v1.27.1 // indirect
|
|
||||||
go.yaml.in/yaml/v2 v2.4.3 // indirect
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4 // indirect
|
|
||||||
golang.org/x/crypto v0.46.0 // indirect
|
|
||||||
golang.org/x/mod v0.31.0 // indirect
|
|
||||||
golang.org/x/oauth2 v0.34.0 // indirect
|
golang.org/x/oauth2 v0.34.0 // indirect
|
||||||
golang.org/x/sys v0.40.0 // indirect
|
golang.org/x/sys v0.40.0 // indirect
|
||||||
golang.org/x/text v0.32.0 // indirect
|
golang.org/x/text v0.29.0 // indirect
|
||||||
google.golang.org/protobuf v1.36.11 // indirect
|
|
||||||
gorm.io/driver/postgres v1.6.0 // indirect
|
|
||||||
gorm.io/driver/sqlite v1.6.0 // indirect
|
|
||||||
gorm.io/driver/sqlserver v1.6.3 // indirect
|
|
||||||
gorm.io/gorm v1.31.1 // indirect
|
|
||||||
mellium.im/sasl v0.3.1 // indirect
|
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -1,131 +1,21 @@
|
|||||||
dario.cat/mergo v1.0.2 h1:85+piFYR1tMbRrLcDwR18y4UKJ3aH1Tbzi24VRW1TK8=
|
|
||||||
dario.cat/mergo v1.0.2/go.mod h1:E/hbnu0NxMFBjpMIE34DRGLWqDy0g5FuKDhCb31ngxA=
|
|
||||||
entgo.io/ent v0.14.3 h1:wokAV/kIlH9TeklJWGGS7AYJdVckr0DloWjIcO9iIIQ=
|
entgo.io/ent v0.14.3 h1:wokAV/kIlH9TeklJWGGS7AYJdVckr0DloWjIcO9iIIQ=
|
||||||
entgo.io/ent v0.14.3/go.mod h1:aDPE/OziPEu8+OWbzy4UlvWmD2/kbRuWfK2A40hcxJM=
|
entgo.io/ent v0.14.3/go.mod h1:aDPE/OziPEu8+OWbzy4UlvWmD2/kbRuWfK2A40hcxJM=
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1/go.mod h1:a6xsAQUZg+VsS3TJ05SRp524Hs4pZ/AeFSr5ENf0Yjo=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1/go.mod h1:uE9zaUfEQT/nbQjVi2IblCG9iaLtZsuYZ8ne+PuQ02M=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0/go.mod h1:9kIvujWAA58nmPmWB1m23fyWic1kYZMxD9CxaWn4Qpg=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1/go.mod h1:JdM5psgjfBf5fo2uWOZhflPWyDBZ/O/CNAH9CtsuZE4=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2/go.mod h1:yInRyqWXAuaPrgI7p70+lDDgh3mlBohis29jGMISnmc=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0/go.mod h1:4OG6tQ9EOP/MT0NMjDlRzWoVFxfu9rN9B2X+tlSVktg=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 h1:FPKJS1T+clwv+OLGt13a8UjqeRuh0O4SJ3lUriThc+4=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1/go.mod h1:j2chePtV91HrC22tGoRX3sGY42uF13WzmmV80/OdVAA=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1 h1:Wgf5rZba3YZqeTNJPtvqZoBu1sBN/L4sry+u2U3Y75w=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.1/go.mod h1:xxCBG/f/4Vbmh2XQJBsOmNdxWUY5j/s27jujKPbQf14=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1 h1:bFWuoEKg+gImo7pvkiQEFAc8ocibADgXeiLAxWhWmkI=
|
|
||||||
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.1/go.mod h1:Vih/3yc6yac2JzU4hzpaDupBJP0Flaia9rXXrU8xyww=
|
|
||||||
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
|
|
||||||
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
|
|
||||||
github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
|
|
||||||
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
|
|
||||||
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
|
|
||||||
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
|
|
||||||
github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU=
|
|
||||||
github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU=
|
|
||||||
github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
|
|
||||||
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
|
|
||||||
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
|
|
||||||
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
|
|
||||||
github.com/bitechdev/ResolveSpec v1.0.86 h1:a4yFMMDizrmvDOV61cj/+kD+mEtKL/5EIHY2GcP3uJU=
|
|
||||||
github.com/bitechdev/ResolveSpec v1.0.86/go.mod h1:YZOY2YCD0Kmb+pjAMhOqPh4q82Hij57F/CLlCMkzT78=
|
|
||||||
github.com/bitechdev/ResolveSpec v1.0.87 h1:zLiHynLK8LLpXIfCZOjL5Iy1COBS6YZcWE1BHKfYqbA=
|
|
||||||
github.com/bitechdev/ResolveSpec v1.0.87/go.mod h1:YZOY2YCD0Kmb+pjAMhOqPh4q82Hij57F/CLlCMkzT78=
|
|
||||||
github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf h1:TqhNAT4zKbTdLa62d2HDBFdvgSbIGB3eJE8HqhgiL9I=
|
|
||||||
github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c=
|
|
||||||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
|
|
||||||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
|
|
||||||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
|
|
||||||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
|
|
||||||
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
|
|
||||||
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
|
|
||||||
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
|
|
||||||
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
|
|
||||||
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
|
|
||||||
github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
|
|
||||||
github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
|
|
||||||
github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
|
|
||||||
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
|
|
||||||
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
|
|
||||||
github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
|
|
||||||
github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
|
|
||||||
github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
|
|
||||||
github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
|
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
|
|
||||||
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
|
|
||||||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
|
|
||||||
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
|
|
||||||
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
|
|
||||||
github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
|
|
||||||
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
|
|
||||||
github.com/docker/docker v28.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM=
|
|
||||||
github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
|
||||||
github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
|
|
||||||
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
|
|
||||||
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
|
|
||||||
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
|
|
||||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
|
||||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
|
||||||
github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
|
|
||||||
github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
|
|
||||||
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
|
|
||||||
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
|
|
||||||
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
|
|
||||||
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
|
|
||||||
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
|
|
||||||
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
|
|
||||||
github.com/getsentry/sentry-go v0.40.0 h1:VTJMN9zbTvqDqPwheRVLcp0qcUcM+8eFivvGocAaSbo=
|
|
||||||
github.com/getsentry/sentry-go v0.40.0/go.mod h1:eRXCoh3uvmjQLY6qu63BjUZnaBu5L5WhMV1RwYO8W5s=
|
|
||||||
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
|
|
||||||
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
|
|
||||||
github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
|
|
||||||
github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
|
|
||||||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
|
|
||||||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
|
|
||||||
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
|
|
||||||
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
|
|
||||||
github.com/go-pg/pg/v10 v10.11.0 h1:CMKJqLgTrfpE/aOVeLdybezR2om071Vh38OLZjsyMI0=
|
github.com/go-pg/pg/v10 v10.11.0 h1:CMKJqLgTrfpE/aOVeLdybezR2om071Vh38OLZjsyMI0=
|
||||||
github.com/go-pg/pg/v10 v10.11.0/go.mod h1:4BpHRoxE61y4Onpof3x1a2SQvi9c+q1dJnrNdMjsroA=
|
github.com/go-pg/pg/v10 v10.11.0/go.mod h1:4BpHRoxE61y4Onpof3x1a2SQvi9c+q1dJnrNdMjsroA=
|
||||||
github.com/go-pg/zerochecker v0.2.0 h1:pp7f72c3DobMWOb2ErtZsnrPaSvHd2W4o9//8HtF4mU=
|
github.com/go-pg/zerochecker v0.2.0 h1:pp7f72c3DobMWOb2ErtZsnrPaSvHd2W4o9//8HtF4mU=
|
||||||
github.com/go-pg/zerochecker v0.2.0/go.mod h1:NJZ4wKL0NmTtz0GKCoJ8kym6Xn/EQzXRl2OnAe7MmDo=
|
github.com/go-pg/zerochecker v0.2.0/go.mod h1:NJZ4wKL0NmTtz0GKCoJ8kym6Xn/EQzXRl2OnAe7MmDo=
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
|
|
||||||
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
|
|
||||||
github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
|
||||||
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
|
github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
|
||||||
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
|
||||||
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
|
|
||||||
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
|
|
||||||
github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
|
|
||||||
github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
|
|
||||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
|
||||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||||
github.com/google/jsonschema-go v0.4.2 h1:tmrUohrwoLZZS/P3x7ex0WAVknEkBZM46iALbcqoRA8=
|
github.com/google/jsonschema-go v0.4.2 h1:tmrUohrwoLZZS/P3x7ex0WAVknEkBZM46iALbcqoRA8=
|
||||||
github.com/google/jsonschema-go v0.4.2/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
|
github.com/google/jsonschema-go v0.4.2/go.mod h1:r5quNTdLOYEz95Ru18zA0ydNbBuYoo9tgaYcxEYhJVE=
|
||||||
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
|
||||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||||
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
|
|
||||||
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
|
|
||||||
github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
|
|
||||||
github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
|
|
||||||
github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
|
||||||
github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
|
|
||||||
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
|
|
||||||
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
|
||||||
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
|
||||||
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
|
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
|
||||||
@@ -134,181 +24,47 @@ github.com/jackc/pgx/v5 v5.9.1 h1:uwrxJXBnx76nyISkhr33kQLlUqjv7et7b9FjCen/tdc=
|
|||||||
github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
|
github.com/jackc/pgx/v5 v5.9.1/go.mod h1:mal1tBGAFfLHvZzaYh77YS/eC6IX9OWbRV1QIIM0Jn4=
|
||||||
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
|
github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
|
||||||
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
|
github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
|
||||||
github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
|
|
||||||
github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
|
|
||||||
github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
|
|
||||||
github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
|
|
||||||
github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
|
|
||||||
github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
|
|
||||||
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
||||||
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
||||||
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
|
||||||
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
||||||
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
|
||||||
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
|
||||||
github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk=
|
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
|
||||||
github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4=
|
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
|
||||||
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
|
|
||||||
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
|
|
||||||
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
|
|
||||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
|
||||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
|
||||||
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
|
||||||
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
|
||||||
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
|
|
||||||
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
|
|
||||||
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
|
||||||
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
|
|
||||||
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
|
|
||||||
github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
|
|
||||||
github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
|
|
||||||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
|
|
||||||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
|
|
||||||
github.com/mattn/go-sqlite3 v1.14.33 h1:A5blZ5ulQo2AtayQ9/limgHEkFreKj1Dv226a1K73s0=
|
|
||||||
github.com/mattn/go-sqlite3 v1.14.33/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
|
|
||||||
github.com/microsoft/go-mssqldb v1.8.2/go.mod h1:vp38dT33FGfVotRiTmDo3bFyaHq+p3LektQrjTULowo=
|
|
||||||
github.com/microsoft/go-mssqldb v1.9.5 h1:orwya0X/5bsL1o+KasupTkk2eNTNFkTQG0BEe/HxCn0=
|
|
||||||
github.com/microsoft/go-mssqldb v1.9.5/go.mod h1:VCP2a0KEZZtGLRHd1PsLavLFYy/3xX2yJUPycv3Sr2Q=
|
|
||||||
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
|
|
||||||
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
|
|
||||||
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
|
|
||||||
github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
|
|
||||||
github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
|
|
||||||
github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
|
|
||||||
github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
|
|
||||||
github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
|
|
||||||
github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
|
|
||||||
github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
|
|
||||||
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
|
|
||||||
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
|
|
||||||
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
|
|
||||||
github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
|
|
||||||
github.com/modelcontextprotocol/go-sdk v1.4.1 h1:M4x9GyIPj+HoIlHNGpK2hq5o3BFhC+78PkEaldQRphc=
|
github.com/modelcontextprotocol/go-sdk v1.4.1 h1:M4x9GyIPj+HoIlHNGpK2hq5o3BFhC+78PkEaldQRphc=
|
||||||
github.com/modelcontextprotocol/go-sdk v1.4.1/go.mod h1:Bo/mS87hPQqHSRkMv4dQq1XCu6zv4INdXnFZabkNU6s=
|
github.com/modelcontextprotocol/go-sdk v1.4.1/go.mod h1:Bo/mS87hPQqHSRkMv4dQq1XCu6zv4INdXnFZabkNU6s=
|
||||||
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
|
|
||||||
github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
|
|
||||||
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
|
|
||||||
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
|
|
||||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
|
|
||||||
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
|
|
||||||
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
|
|
||||||
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
|
||||||
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
|
||||||
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
|
|
||||||
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
|
|
||||||
github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
|
||||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
|
||||||
github.com/pgvector/pgvector-go v0.3.0 h1:Ij+Yt78R//uYqs3Zk35evZFvr+G0blW0OUN+Q2D1RWc=
|
github.com/pgvector/pgvector-go v0.3.0 h1:Ij+Yt78R//uYqs3Zk35evZFvr+G0blW0OUN+Q2D1RWc=
|
||||||
github.com/pgvector/pgvector-go v0.3.0/go.mod h1:duFy+PXWfW7QQd5ibqutBO4GxLsUZ9RVXhFZGIBsWSA=
|
github.com/pgvector/pgvector-go v0.3.0/go.mod h1:duFy+PXWfW7QQd5ibqutBO4GxLsUZ9RVXhFZGIBsWSA=
|
||||||
github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
|
|
||||||
github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
|
|
||||||
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
|
|
||||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
|
|
||||||
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
|
|
||||||
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
|
|
||||||
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
|
|
||||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
|
|
||||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
|
|
||||||
github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
|
|
||||||
github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
|
|
||||||
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
|
|
||||||
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
|
|
||||||
github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc=
|
|
||||||
github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI=
|
|
||||||
github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws=
|
|
||||||
github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw=
|
|
||||||
github.com/puzpuzpuz/xsync/v3 v3.5.1 h1:GJYJZwO6IdxN/IKbneznS6yPkVC+c3zyY/j19c++5Fg=
|
|
||||||
github.com/puzpuzpuz/xsync/v3 v3.5.1/go.mod h1:VjzYrABPabuM4KyBh1Ftq6u8nhwY5tBPKP9jpmh0nnA=
|
|
||||||
github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI=
|
|
||||||
github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370=
|
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
|
||||||
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
|
|
||||||
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
|
|
||||||
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
|
||||||
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
|
||||||
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
|
|
||||||
github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=
|
|
||||||
github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
|
|
||||||
github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
|
github.com/segmentio/asm v1.1.3 h1:WM03sfUOENvvKexOLp+pCqgb/WDjsi7EK8gIsICtzhc=
|
||||||
github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
|
github.com/segmentio/asm v1.1.3/go.mod h1:Ld3L4ZXGNcSLRg4JBsZ3//1+f/TjYl0Mzen/DQy1EJg=
|
||||||
github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0=
|
github.com/segmentio/encoding v0.5.4 h1:OW1VRern8Nw6ITAtwSZ7Idrl3MXCFwXHPgqESYfvNt0=
|
||||||
github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0=
|
github.com/segmentio/encoding v0.5.4/go.mod h1:HS1ZKa3kSN32ZHVZ7ZLPLXWvOVIiZtyJnO1gPH1sKt0=
|
||||||
github.com/shirou/gopsutil/v4 v4.25.6 h1:kLysI2JsKorfaFPcYmcJqbzROzsBWEOAtw6A7dIfqXs=
|
|
||||||
github.com/shirou/gopsutil/v4 v4.25.6/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c=
|
|
||||||
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
|
|
||||||
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
|
|
||||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
|
||||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
|
||||||
github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
|
|
||||||
github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
|
|
||||||
github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
|
|
||||||
github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
|
|
||||||
github.com/spf13/cobra v1.10.2 h1:DMTTonx5m65Ic0GOoRY2c16WCbHxOOw6xxezuLaBpcU=
|
|
||||||
github.com/spf13/cobra v1.10.2/go.mod h1:7C1pvHqHw5A4vrJfjNwvOdzYu0Gml16OCs2GRiTUUS4=
|
|
||||||
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
|
||||||
github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
|
|
||||||
github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
|
|
||||||
github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
|
|
||||||
github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
|
|
||||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
|
||||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
|
||||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
|
||||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||||
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
|
|
||||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
|
||||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
|
||||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
|
||||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
|
||||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
|
||||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||||
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
|
|
||||||
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
|
|
||||||
github.com/testcontainers/testcontainers-go v0.40.0 h1:pSdJYLOVgLE8YdUY2FHQ1Fxu+aMnb6JfVz1mxk7OeMU=
|
|
||||||
github.com/testcontainers/testcontainers-go v0.40.0/go.mod h1:FSXV5KQtX2HAMlm7U3APNyLkkap35zNLxukw9oBi/MY=
|
|
||||||
github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
|
||||||
github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
|
|
||||||
github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
|
|
||||||
github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
|
|
||||||
github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM=
|
|
||||||
github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
|
|
||||||
github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
|
|
||||||
github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
|
|
||||||
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
|
|
||||||
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
|
|
||||||
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
|
|
||||||
github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
|
|
||||||
github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
|
|
||||||
github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
|
|
||||||
github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
|
|
||||||
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
|
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc h1:9lRDQMhESg+zvGYmW5DyG0UqvY96Bu5QYsTLvCHdrgo=
|
||||||
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
|
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc/go.mod h1:bciPuU6GHm1iF1pBvUfxfsH0Wmnc2VbpgvbI9ZWuIRs=
|
||||||
github.com/uptrace/bun v1.2.16 h1:QlObi6ZIK5Ao7kAALnh91HWYNZUBbVwye52fmlQM9kc=
|
github.com/uptrace/bun v1.1.12 h1:sOjDVHxNTuM6dNGaba0wUuz7KvDE1BmNu9Gqs2gJSXQ=
|
||||||
github.com/uptrace/bun v1.2.16/go.mod h1:jMoNg2n56ckaawi/O/J92BHaECmrz6IRjuMWqlMaMTM=
|
github.com/uptrace/bun v1.1.12/go.mod h1:NPG6JGULBeQ9IU6yHp7YGELRa5Agmd7ATZdz4tGZ6z0=
|
||||||
github.com/uptrace/bun/dialect/mssqldialect v1.2.16 h1:rKv0cKPNBviXadB/+2Y/UedA/c1JnwGzUWZkdN5FdSQ=
|
github.com/uptrace/bun/dialect/pgdialect v1.1.12 h1:m/CM1UfOkoBTglGO5CUTKnIKKOApOYxkcP2qn0F9tJk=
|
||||||
github.com/uptrace/bun/dialect/mssqldialect v1.2.16/go.mod h1:J5U7tGKWDsx2Q7MwDZF2417jCdpD6yD/ZMFJcCR80bk=
|
github.com/uptrace/bun/dialect/pgdialect v1.1.12/go.mod h1:Ij6WIxQILxLlL2frUBxUBOZJtLElD2QQNDcu/PWDHTc=
|
||||||
github.com/uptrace/bun/dialect/pgdialect v1.2.16 h1:KFNZ0LxAyczKNfK/IJWMyaleO6eI9/Z5tUv3DE1NVL4=
|
|
||||||
github.com/uptrace/bun/dialect/pgdialect v1.2.16/go.mod h1:IJdMeV4sLfh0LDUZl7TIxLI0LipF1vwTK3hBC7p5qLo=
|
|
||||||
github.com/uptrace/bun/dialect/sqlitedialect v1.2.16 h1:6wVAiYLj1pMibRthGwy4wDLa3D5AQo32Y8rvwPd8CQ0=
|
|
||||||
github.com/uptrace/bun/dialect/sqlitedialect v1.2.16/go.mod h1:Z7+5qK8CGZkDQiPMu+LSdVuDuR1I5jcwtkB1Pi3F82E=
|
|
||||||
github.com/uptrace/bun/driver/pgdriver v1.1.12 h1:3rRWB1GK0psTJrHwxzNfEij2MLibggiLdTqjTtfHc1w=
|
github.com/uptrace/bun/driver/pgdriver v1.1.12 h1:3rRWB1GK0psTJrHwxzNfEij2MLibggiLdTqjTtfHc1w=
|
||||||
github.com/uptrace/bun/driver/pgdriver v1.1.12/go.mod h1:ssYUP+qwSEgeDDS1xm2XBip9el1y9Mi5mTAvLoiADLM=
|
github.com/uptrace/bun/driver/pgdriver v1.1.12/go.mod h1:ssYUP+qwSEgeDDS1xm2XBip9el1y9Mi5mTAvLoiADLM=
|
||||||
github.com/uptrace/bun/driver/sqliteshim v1.2.16 h1:M6Dh5kkDWFbUWBrOsIE1g1zdZ5JbSytTD4piFRBOUAI=
|
|
||||||
github.com/uptrace/bun/driver/sqliteshim v1.2.16/go.mod h1:iKdJ06P3XS+pwKcONjSIK07bbhksH3lWsw3mpfr0+bY=
|
|
||||||
github.com/uptrace/bunrouter v1.0.23 h1:Bi7NKw3uCQkcA/GUCtDNPq5LE5UdR9pe+UyWbjHB/wU=
|
|
||||||
github.com/uptrace/bunrouter v1.0.23/go.mod h1:O3jAcl+5qgnF+ejhgkmbceEk0E/mqaK+ADOocdNpY8M=
|
|
||||||
github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
|
github.com/vmihailenco/bufpool v0.1.11 h1:gOq2WmBrq0i2yW5QJ16ykccQ4wH9UyEsgLm6czKAd94=
|
||||||
github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
|
github.com/vmihailenco/bufpool v0.1.11/go.mod h1:AFf/MOy3l2CFTKbxwt0mp2MwnqjNEs5H/UxrkA5jxTQ=
|
||||||
github.com/vmihailenco/msgpack/v5 v5.4.1 h1:cQriyiUvjTwOHg8QZaPihLWeRAAVoCpE00IUPn0Bjt8=
|
github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
|
||||||
github.com/vmihailenco/msgpack/v5 v5.4.1/go.mod h1:GaZTsDaehaPpQVyxrf5mtQlH+pc21PIudVV/E3rRQok=
|
github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
|
||||||
github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
|
github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
|
||||||
github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
|
github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
|
||||||
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
|
github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
|
||||||
@@ -317,171 +73,27 @@ github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
|
|||||||
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg=
|
||||||
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
|
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
|
||||||
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
|
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
|
||||||
github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
|
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
|
||||||
github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
|
|
||||||
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
|
|
||||||
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
|
|
||||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
|
|
||||||
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
|
|
||||||
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
|
|
||||||
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
|
|
||||||
go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
|
|
||||||
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
|
|
||||||
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
|
|
||||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
|
||||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
|
||||||
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
|
|
||||||
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
|
||||||
go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
|
|
||||||
go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
|
|
||||||
go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0=
|
|
||||||
go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8=
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
|
|
||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
|
||||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
|
||||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
|
||||||
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
|
|
||||||
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
|
|
||||||
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
|
|
||||||
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
|
|
||||||
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
|
|
||||||
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
|
|
||||||
golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
|
|
||||||
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
|
|
||||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
|
||||||
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
|
|
||||||
golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
|
|
||||||
golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
|
|
||||||
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
|
|
||||||
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
|
|
||||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
|
||||||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
|
||||||
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
|
||||||
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
|
|
||||||
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
|
||||||
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
|
|
||||||
golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
|
|
||||||
golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
|
|
||||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
|
||||||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
|
|
||||||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
|
|
||||||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
|
||||||
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
|
|
||||||
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
|
|
||||||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
|
||||||
golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
|
|
||||||
golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
|
|
||||||
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
|
||||||
golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
|
|
||||||
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
|
|
||||||
golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
|
|
||||||
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
|
|
||||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
|
||||||
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
|
|
||||||
golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
|
|
||||||
golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
|
|
||||||
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
|
golang.org/x/oauth2 v0.34.0 h1:hqK/t4AKgbqWkdkcAeI8XLmbK+4m4G5YeQRrmiotGlw=
|
||||||
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
|
golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
|
||||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
|
||||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
||||||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
|
||||||
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
|
||||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
|
||||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
|
||||||
golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
|
||||||
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
|
|
||||||
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
|
|
||||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
|
||||||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
|
||||||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
||||||
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
|
||||||
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
|
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
|
||||||
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk=
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4=
|
||||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
|
||||||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
|
|
||||||
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
|
|
||||||
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
|
|
||||||
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
|
|
||||||
golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
|
|
||||||
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
|
|
||||||
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
|
|
||||||
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
|
|
||||||
golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
|
|
||||||
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
|
|
||||||
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
|
|
||||||
golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0=
|
|
||||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
|
||||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
|
||||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
|
||||||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
|
|
||||||
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
|
||||||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
|
|
||||||
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
|
||||||
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
|
||||||
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
|
||||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
|
||||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
|
||||||
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
|
||||||
golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
|
|
||||||
golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
|
|
||||||
golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
|
|
||||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
|
||||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
|
||||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
|
||||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
|
||||||
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
|
||||||
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
|
||||||
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
|
golang.org/x/tools v0.41.0 h1:a9b8iMweWG+S0OBnlU36rzLp20z1Rp10w+IY2czHTQc=
|
||||||
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
|
golang.org/x/tools v0.41.0/go.mod h1:XSY6eDqxVNiYgezAVqqCeihT4j1U2CCsqvH3WhQpnlg=
|
||||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
|
||||||
google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
|
|
||||||
google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
|
||||||
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
|
||||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4=
|
gorm.io/driver/postgres v1.5.4 h1:Iyrp9Meh3GmbSuyIAGyjkN+n9K+GHX9b9MqsTL4EJCo=
|
||||||
gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo=
|
gorm.io/driver/postgres v1.5.4/go.mod h1:Bgo89+h0CRcdA33Y6frlaHHVuTdOf87pmyzwW9C/BH0=
|
||||||
gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ=
|
gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
|
||||||
gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8=
|
gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
|
||||||
gorm.io/driver/sqlserver v1.6.3 h1:UR+nWCuphPnq7UxnL57PSrlYjuvs+sf1N59GgFX7uAI=
|
|
||||||
gorm.io/driver/sqlserver v1.6.3/go.mod h1:VZeNn7hqX1aXoN5TPAFGWvxWG90xtA8erGn2gQmpc6U=
|
|
||||||
gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE=
|
|
||||||
gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg=
|
|
||||||
gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs=
|
|
||||||
mellium.im/sasl v0.3.1 h1:wE0LW6g7U83vhvxjC1IY8DnXM+EU095yeo8XClvCdfo=
|
mellium.im/sasl v0.3.1 h1:wE0LW6g7U83vhvxjC1IY8DnXM+EU095yeo8XClvCdfo=
|
||||||
mellium.im/sasl v0.3.1/go.mod h1:xm59PUYpZHhgQ9ZqoJ5QaCqzWMi8IeS49dhp6plPCzw=
|
mellium.im/sasl v0.3.1/go.mod h1:xm59PUYpZHhgQ9ZqoJ5QaCqzWMi8IeS49dhp6plPCzw=
|
||||||
modernc.org/libc v1.67.4 h1:zZGmCMUVPORtKv95c2ReQN5VDjvkoRm9GWPTEPuvlWg=
|
|
||||||
modernc.org/libc v1.67.4/go.mod h1:QvvnnJ5P7aitu0ReNpVIEyesuhmDLQ8kaEoyMjIFZJA=
|
|
||||||
modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
|
|
||||||
modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
|
|
||||||
modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
|
|
||||||
modernc.org/memory v1.11.0/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
|
|
||||||
modernc.org/sqlite v1.42.2 h1:7hkZUNJvJFN2PgfUdjni9Kbvd4ef4mNLOu0B9FGxM74=
|
|
||||||
modernc.org/sqlite v1.42.2/go.mod h1:+VkC6v3pLOAE0A0uVucQEcbVW0I5nHCeDaBf+DpsQT8=
|
|
||||||
|
|||||||
+318
-120
@@ -14,6 +14,7 @@ import (
|
|||||||
"regexp"
|
"regexp"
|
||||||
"slices"
|
"slices"
|
||||||
"strings"
|
"strings"
|
||||||
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
thoughttypes "git.warky.dev/wdevs/amcs/internal/types"
|
thoughttypes "git.warky.dev/wdevs/amcs/internal/types"
|
||||||
@@ -35,39 +36,36 @@ Rules:
|
|||||||
- If unsure, prefer "observation".
|
- If unsure, prefer "observation".
|
||||||
- Do not include any text outside the JSON object.`
|
- Do not include any text outside the JSON object.`
|
||||||
|
|
||||||
// Client is a low-level OpenAI-compatible HTTP client. It knows nothing about
|
|
||||||
// role chains, fallbacks, or health — those concerns belong to ai.Runner. Each
|
|
||||||
// method takes the model name per-call so a single Client instance can service
|
|
||||||
// many different models on the same base URL.
|
|
||||||
type Client struct {
|
type Client struct {
|
||||||
name string
|
name string
|
||||||
baseURL string
|
baseURL string
|
||||||
apiKey string
|
apiKey string
|
||||||
headers map[string]string
|
embeddingModel string
|
||||||
httpClient *http.Client
|
metadataModel string
|
||||||
log *slog.Logger
|
fallbackMetadataModels []string
|
||||||
|
temperature float64
|
||||||
|
headers map[string]string
|
||||||
|
httpClient *http.Client
|
||||||
|
log *slog.Logger
|
||||||
|
dimensions int
|
||||||
|
logConversations bool
|
||||||
|
modelHealthMu sync.Mutex
|
||||||
|
modelHealth map[string]modelHealthState
|
||||||
}
|
}
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Name string
|
Name string
|
||||||
BaseURL string
|
BaseURL string
|
||||||
APIKey string
|
APIKey string
|
||||||
Headers map[string]string
|
EmbeddingModel string
|
||||||
HTTPClient *http.Client
|
MetadataModel string
|
||||||
Log *slog.Logger
|
FallbackMetadataModels []string
|
||||||
}
|
Temperature float64
|
||||||
|
Headers map[string]string
|
||||||
// MetadataOptions control a single ExtractMetadataWith call.
|
HTTPClient *http.Client
|
||||||
type MetadataOptions struct {
|
Log *slog.Logger
|
||||||
Model string
|
Dimensions int
|
||||||
Temperature float64
|
LogConversations bool
|
||||||
LogConversations bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// SummarizeOptions control a single SummarizeWith call.
|
|
||||||
type SummarizeOptions struct {
|
|
||||||
Model string
|
|
||||||
Temperature float64
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type embeddingsRequest struct {
|
type embeddingsRequest struct {
|
||||||
@@ -129,38 +127,65 @@ type providerError struct {
|
|||||||
|
|
||||||
const maxMetadataAttempts = 3
|
const maxMetadataAttempts = 3
|
||||||
|
|
||||||
// ErrEmptyResponse and ErrNoJSONObject are sentinel errors callers can inspect
|
const (
|
||||||
// to classify metadata failures (e.g. bump empty-response health counters).
|
emptyResponseCircuitThreshold = 3
|
||||||
var (
|
emptyResponseCircuitTTL = 5 * time.Minute
|
||||||
ErrEmptyResponse = errors.New("metadata empty response")
|
permanentModelFailureTTL = 24 * time.Hour
|
||||||
ErrNoJSONObject = errors.New("metadata response contains no JSON object")
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
errMetadataEmptyResponse = errors.New("metadata empty response")
|
||||||
|
errMetadataNoJSONObject = errors.New("metadata response contains no JSON object")
|
||||||
|
)
|
||||||
|
|
||||||
|
type modelHealthState struct {
|
||||||
|
consecutiveEmpty int
|
||||||
|
unhealthyUntil time.Time
|
||||||
|
}
|
||||||
|
|
||||||
func New(cfg Config) *Client {
|
func New(cfg Config) *Client {
|
||||||
|
fallbacks := make([]string, 0, len(cfg.FallbackMetadataModels))
|
||||||
|
seen := make(map[string]struct{}, len(cfg.FallbackMetadataModels))
|
||||||
|
for _, model := range cfg.FallbackMetadataModels {
|
||||||
|
model = strings.TrimSpace(model)
|
||||||
|
if model == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := seen[model]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[model] = struct{}{}
|
||||||
|
fallbacks = append(fallbacks, model)
|
||||||
|
}
|
||||||
|
|
||||||
return &Client{
|
return &Client{
|
||||||
name: cfg.Name,
|
name: cfg.Name,
|
||||||
baseURL: cfg.BaseURL,
|
baseURL: cfg.BaseURL,
|
||||||
apiKey: cfg.APIKey,
|
apiKey: cfg.APIKey,
|
||||||
headers: cfg.Headers,
|
embeddingModel: cfg.EmbeddingModel,
|
||||||
httpClient: cfg.HTTPClient,
|
metadataModel: cfg.MetadataModel,
|
||||||
log: cfg.Log,
|
fallbackMetadataModels: fallbacks,
|
||||||
|
temperature: cfg.Temperature,
|
||||||
|
headers: cfg.Headers,
|
||||||
|
httpClient: cfg.HTTPClient,
|
||||||
|
log: cfg.Log,
|
||||||
|
dimensions: cfg.Dimensions,
|
||||||
|
logConversations: cfg.LogConversations,
|
||||||
|
modelHealth: make(map[string]modelHealthState),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) Name() string { return c.name }
|
func (c *Client) Embed(ctx context.Context, input string) ([]float32, error) {
|
||||||
|
|
||||||
// EmbedWith generates an embedding for the given input using model.
|
|
||||||
func (c *Client) EmbedWith(ctx context.Context, model, input string) ([]float32, error) {
|
|
||||||
input = strings.TrimSpace(input)
|
input = strings.TrimSpace(input)
|
||||||
if input == "" {
|
if input == "" {
|
||||||
return nil, fmt.Errorf("%s embed: input must not be empty", c.name)
|
return nil, fmt.Errorf("%s embed: input must not be empty", c.name)
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(model) == "" {
|
|
||||||
return nil, fmt.Errorf("%s embed: model is required", c.name)
|
|
||||||
}
|
|
||||||
|
|
||||||
var resp embeddingsResponse
|
var resp embeddingsResponse
|
||||||
err := c.doJSON(ctx, "/embeddings", embeddingsRequest{Input: input, Model: model}, &resp)
|
err := c.doJSON(ctx, "/embeddings", embeddingsRequest{
|
||||||
|
Input: input,
|
||||||
|
Model: c.embeddingModel,
|
||||||
|
}, &resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
@@ -170,34 +195,141 @@ func (c *Client) EmbedWith(ctx context.Context, model, input string) ([]float32,
|
|||||||
if len(resp.Data) == 0 {
|
if len(resp.Data) == 0 {
|
||||||
return nil, fmt.Errorf("%s embed: no embedding returned", c.name)
|
return nil, fmt.Errorf("%s embed: no embedding returned", c.name)
|
||||||
}
|
}
|
||||||
|
if c.dimensions > 0 && len(resp.Data[0].Embedding) != c.dimensions {
|
||||||
|
return nil, fmt.Errorf("%s embed: expected %d dimensions, got %d", c.name, c.dimensions, len(resp.Data[0].Embedding))
|
||||||
|
}
|
||||||
|
|
||||||
return resp.Data[0].Embedding, nil
|
return resp.Data[0].Embedding, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ExtractMetadataWith extracts structured metadata for input using opts.Model.
|
func (c *Client) ExtractMetadata(ctx context.Context, input string) (thoughttypes.ThoughtMetadata, error) {
|
||||||
// Returns compat.ErrEmptyResponse / ErrNoJSONObject wrapped when the model
|
|
||||||
// produces unusable output so callers can classify the failure.
|
|
||||||
func (c *Client) ExtractMetadataWith(ctx context.Context, opts MetadataOptions, input string) (thoughttypes.ThoughtMetadata, error) {
|
|
||||||
input = strings.TrimSpace(input)
|
input = strings.TrimSpace(input)
|
||||||
if input == "" {
|
if input == "" {
|
||||||
return thoughttypes.ThoughtMetadata{}, fmt.Errorf("%s extract metadata: input must not be empty", c.name)
|
return thoughttypes.ThoughtMetadata{}, fmt.Errorf("%s extract metadata: input must not be empty", c.name)
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(opts.Model) == "" {
|
|
||||||
return thoughttypes.ThoughtMetadata{}, fmt.Errorf("%s extract metadata: model is required", c.name)
|
start := time.Now()
|
||||||
|
if c.log != nil {
|
||||||
|
c.log.Info("metadata client started",
|
||||||
|
slog.String("provider", c.name),
|
||||||
|
slog.String("model", c.metadataModel),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
logCompletion := func(model string, err error) {
|
||||||
|
if c.log == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
attrs := []any{
|
||||||
|
slog.String("provider", c.name),
|
||||||
|
slog.String("model", model),
|
||||||
|
slog.String("duration", formatLogDuration(time.Since(start))),
|
||||||
|
}
|
||||||
|
if err != nil {
|
||||||
|
attrs = append(attrs, slog.String("error", err.Error()))
|
||||||
|
c.log.Error("metadata client completed", attrs...)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
c.log.Info("metadata client completed", attrs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
result, err := c.extractMetadataWithModel(ctx, input, c.metadataModel)
|
||||||
|
if errors.Is(err, errMetadataEmptyResponse) {
|
||||||
|
c.noteEmptyResponse(c.metadataModel)
|
||||||
|
}
|
||||||
|
if isPermanentModelError(err) {
|
||||||
|
c.notePermanentModelFailure(c.metadataModel, err)
|
||||||
|
}
|
||||||
|
if err == nil {
|
||||||
|
c.noteModelSuccess(c.metadataModel)
|
||||||
|
logCompletion(c.metadataModel, nil)
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, fallbackModel := range c.fallbackMetadataModels {
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
if fallbackModel == "" || fallbackModel == c.metadataModel {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if c.shouldBypassModel(fallbackModel) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if c.log != nil {
|
||||||
|
c.log.Warn("metadata extraction failed, trying fallback model",
|
||||||
|
slog.String("provider", c.name),
|
||||||
|
slog.String("primary_model", c.metadataModel),
|
||||||
|
slog.String("fallback_model", fallbackModel),
|
||||||
|
slog.String("error", err.Error()),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
fallbackResult, fallbackErr := c.extractMetadataWithModel(ctx, input, fallbackModel)
|
||||||
|
if errors.Is(fallbackErr, errMetadataEmptyResponse) {
|
||||||
|
c.noteEmptyResponse(fallbackModel)
|
||||||
|
}
|
||||||
|
if isPermanentModelError(fallbackErr) {
|
||||||
|
c.notePermanentModelFailure(fallbackModel, fallbackErr)
|
||||||
|
}
|
||||||
|
if fallbackErr == nil {
|
||||||
|
c.noteModelSuccess(fallbackModel)
|
||||||
|
logCompletion(fallbackModel, nil)
|
||||||
|
return fallbackResult, nil
|
||||||
|
}
|
||||||
|
err = fallbackErr
|
||||||
|
}
|
||||||
|
|
||||||
|
if ctx.Err() != nil {
|
||||||
|
err = fmt.Errorf("%s metadata: %w", c.name, ctx.Err())
|
||||||
|
logCompletion(c.metadataModel, err)
|
||||||
|
return thoughttypes.ThoughtMetadata{}, err
|
||||||
|
}
|
||||||
|
|
||||||
|
heuristic := heuristicMetadataFromInput(input)
|
||||||
|
if c.log != nil {
|
||||||
|
c.log.Warn("metadata extraction failed for all models, using heuristic fallback",
|
||||||
|
slog.String("provider", c.name),
|
||||||
|
slog.String("error", err.Error()),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
logCompletion(c.metadataModel, nil)
|
||||||
|
return heuristic, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func formatLogDuration(d time.Duration) string {
|
||||||
|
if d < 0 {
|
||||||
|
d = -d
|
||||||
|
}
|
||||||
|
|
||||||
|
totalMilliseconds := d.Milliseconds()
|
||||||
|
minutes := totalMilliseconds / 60000
|
||||||
|
seconds := (totalMilliseconds / 1000) % 60
|
||||||
|
milliseconds := totalMilliseconds % 1000
|
||||||
|
return fmt.Sprintf("%02d:%02d:%03d", minutes, seconds, milliseconds)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) extractMetadataWithModel(ctx context.Context, input, model string) (thoughttypes.ThoughtMetadata, error) {
|
||||||
|
if c.shouldBypassModel(model) {
|
||||||
|
return thoughttypes.ThoughtMetadata{}, fmt.Errorf("%s metadata: model %q temporarily bypassed after repeated empty responses", c.name, model)
|
||||||
}
|
}
|
||||||
|
|
||||||
stream := true
|
stream := true
|
||||||
req := chatCompletionsRequest{
|
req := chatCompletionsRequest{
|
||||||
Model: opts.Model,
|
Model: model,
|
||||||
Temperature: opts.Temperature,
|
Temperature: c.temperature,
|
||||||
ResponseFormat: &responseType{Type: "json_object"},
|
ResponseFormat: &responseType{
|
||||||
Stream: &stream,
|
Type: "json_object",
|
||||||
|
},
|
||||||
|
Stream: &stream,
|
||||||
Messages: []chatMessage{
|
Messages: []chatMessage{
|
||||||
{Role: "system", Content: metadataSystemPrompt},
|
{Role: "system", Content: metadataSystemPrompt},
|
||||||
{Role: "user", Content: input},
|
{Role: "user", Content: input},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
metadata, err := c.extractMetadataWithRequest(ctx, req, input, opts)
|
metadata, err := c.extractMetadataWithRequest(ctx, req, input, model)
|
||||||
if err == nil || !shouldRetryWithoutJSONMode(err) {
|
if err == nil || !shouldRetryWithoutJSONMode(err) {
|
||||||
return metadata, err
|
return metadata, err
|
||||||
}
|
}
|
||||||
@@ -205,22 +337,23 @@ func (c *Client) ExtractMetadataWith(ctx context.Context, opts MetadataOptions,
|
|||||||
if c.log != nil {
|
if c.log != nil {
|
||||||
c.log.Warn("metadata json mode failed, retrying without response_format",
|
c.log.Warn("metadata json mode failed, retrying without response_format",
|
||||||
slog.String("provider", c.name),
|
slog.String("provider", c.name),
|
||||||
slog.String("model", opts.Model),
|
slog.String("model", model),
|
||||||
slog.String("error", err.Error()),
|
slog.String("error", err.Error()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
req.ResponseFormat = nil
|
req.ResponseFormat = nil
|
||||||
return c.extractMetadataWithRequest(ctx, req, input, opts)
|
return c.extractMetadataWithRequest(ctx, req, input, model)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) extractMetadataWithRequest(ctx context.Context, req chatCompletionsRequest, input string, opts MetadataOptions) (thoughttypes.ThoughtMetadata, error) {
|
func (c *Client) extractMetadataWithRequest(ctx context.Context, req chatCompletionsRequest, input, model string) (thoughttypes.ThoughtMetadata, error) {
|
||||||
|
|
||||||
var lastErr error
|
var lastErr error
|
||||||
for attempt := 1; attempt <= maxMetadataAttempts; attempt++ {
|
for attempt := 1; attempt <= maxMetadataAttempts; attempt++ {
|
||||||
if opts.LogConversations && c.log != nil {
|
if c.logConversations && c.log != nil {
|
||||||
c.log.Info("metadata conversation request",
|
c.log.Info("metadata conversation request",
|
||||||
slog.String("provider", c.name),
|
slog.String("provider", c.name),
|
||||||
slog.String("model", opts.Model),
|
slog.String("model", model),
|
||||||
slog.Int("attempt", attempt),
|
slog.Int("attempt", attempt),
|
||||||
slog.String("system", metadataSystemPrompt),
|
slog.String("system", metadataSystemPrompt),
|
||||||
slog.String("input", input),
|
slog.String("input", input),
|
||||||
@@ -240,10 +373,10 @@ func (c *Client) extractMetadataWithRequest(ctx context.Context, req chatComplet
|
|||||||
|
|
||||||
rawResponse := extractChoiceText(resp.Choices[0].Message, resp.Choices[0].Text)
|
rawResponse := extractChoiceText(resp.Choices[0].Message, resp.Choices[0].Text)
|
||||||
|
|
||||||
if opts.LogConversations && c.log != nil {
|
if c.logConversations && c.log != nil {
|
||||||
c.log.Info("metadata conversation response",
|
c.log.Info("metadata conversation response",
|
||||||
slog.String("provider", c.name),
|
slog.String("provider", c.name),
|
||||||
slog.String("model", opts.Model),
|
slog.String("model", model),
|
||||||
slog.Int("attempt", attempt),
|
slog.Int("attempt", attempt),
|
||||||
slog.String("response", rawResponse),
|
slog.String("response", rawResponse),
|
||||||
)
|
)
|
||||||
@@ -254,13 +387,13 @@ func (c *Client) extractMetadataWithRequest(ctx context.Context, req chatComplet
|
|||||||
metadataText = stripCodeFence(metadataText)
|
metadataText = stripCodeFence(metadataText)
|
||||||
metadataText = extractJSONObject(metadataText)
|
metadataText = extractJSONObject(metadataText)
|
||||||
if metadataText == "" {
|
if metadataText == "" {
|
||||||
lastErr = fmt.Errorf("%s metadata: %w", c.name, ErrNoJSONObject)
|
lastErr = fmt.Errorf("%s metadata: %w", c.name, errMetadataNoJSONObject)
|
||||||
if strings.TrimSpace(rawResponse) == "" && attempt < maxMetadataAttempts && ctx.Err() == nil {
|
if strings.TrimSpace(rawResponse) == "" && attempt < maxMetadataAttempts && ctx.Err() == nil {
|
||||||
lastErr = fmt.Errorf("%s metadata: %w", c.name, ErrEmptyResponse)
|
lastErr = fmt.Errorf("%s metadata: %w", c.name, errMetadataEmptyResponse)
|
||||||
if c.log != nil {
|
if c.log != nil {
|
||||||
c.log.Warn("metadata response empty, waiting and retrying",
|
c.log.Warn("metadata response empty, waiting and retrying",
|
||||||
slog.String("provider", c.name),
|
slog.String("provider", c.name),
|
||||||
slog.String("model", opts.Model),
|
slog.String("model", model),
|
||||||
slog.Int("attempt", attempt+1),
|
slog.Int("attempt", attempt+1),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -270,7 +403,7 @@ func (c *Client) extractMetadataWithRequest(ctx context.Context, req chatComplet
|
|||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if strings.TrimSpace(rawResponse) == "" {
|
if strings.TrimSpace(rawResponse) == "" {
|
||||||
lastErr = fmt.Errorf("%s metadata: %w", c.name, ErrEmptyResponse)
|
lastErr = fmt.Errorf("%s metadata: %w", c.name, errMetadataEmptyResponse)
|
||||||
}
|
}
|
||||||
return thoughttypes.ThoughtMetadata{}, lastErr
|
return thoughttypes.ThoughtMetadata{}, lastErr
|
||||||
}
|
}
|
||||||
@@ -287,17 +420,13 @@ func (c *Client) extractMetadataWithRequest(ctx context.Context, req chatComplet
|
|||||||
if lastErr != nil {
|
if lastErr != nil {
|
||||||
return thoughttypes.ThoughtMetadata{}, lastErr
|
return thoughttypes.ThoughtMetadata{}, lastErr
|
||||||
}
|
}
|
||||||
return thoughttypes.ThoughtMetadata{}, fmt.Errorf("%s metadata: %w", c.name, ErrNoJSONObject)
|
return thoughttypes.ThoughtMetadata{}, fmt.Errorf("%s metadata: %w", c.name, errMetadataNoJSONObject)
|
||||||
}
|
}
|
||||||
|
|
||||||
// SummarizeWith runs a chat-completion summarisation using opts.Model.
|
func (c *Client) Summarize(ctx context.Context, systemPrompt, userPrompt string) (string, error) {
|
||||||
func (c *Client) SummarizeWith(ctx context.Context, opts SummarizeOptions, systemPrompt, userPrompt string) (string, error) {
|
|
||||||
if strings.TrimSpace(opts.Model) == "" {
|
|
||||||
return "", fmt.Errorf("%s summarize: model is required", c.name)
|
|
||||||
}
|
|
||||||
req := chatCompletionsRequest{
|
req := chatCompletionsRequest{
|
||||||
Model: opts.Model,
|
Model: c.metadataModel,
|
||||||
Temperature: opts.Temperature,
|
Temperature: 0.2,
|
||||||
Messages: []chatMessage{
|
Messages: []chatMessage{
|
||||||
{Role: "system", Content: systemPrompt},
|
{Role: "system", Content: systemPrompt},
|
||||||
{Role: "user", Content: userPrompt},
|
{Role: "user", Content: userPrompt},
|
||||||
@@ -318,49 +447,12 @@ func (c *Client) SummarizeWith(ctx context.Context, opts SummarizeOptions, syste
|
|||||||
return extractChoiceText(resp.Choices[0].Message, resp.Choices[0].Text), nil
|
return extractChoiceText(resp.Choices[0].Message, resp.Choices[0].Text), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsPermanentModelError reports whether err indicates the model itself is
|
func (c *Client) Name() string {
|
||||||
// invalid or missing (vs. a transient outage). Runners use this to mark a
|
return c.name
|
||||||
// target unhealthy for longer.
|
|
||||||
func IsPermanentModelError(err error) bool {
|
|
||||||
if err == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
lower := strings.ToLower(err.Error())
|
|
||||||
for _, marker := range []string{
|
|
||||||
"invalid model name",
|
|
||||||
"model_not_found",
|
|
||||||
"model not found",
|
|
||||||
"unknown model",
|
|
||||||
"no such model",
|
|
||||||
"does not exist",
|
|
||||||
} {
|
|
||||||
if strings.Contains(lower, marker) {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// HeuristicMetadataFromInput produces best-effort metadata from the note text
|
func (c *Client) EmbeddingModel() string {
|
||||||
// when every model in the chain has failed. Exported so ai.Runner can use it.
|
return c.embeddingModel
|
||||||
func HeuristicMetadataFromInput(input string) thoughttypes.ThoughtMetadata {
|
|
||||||
text := strings.TrimSpace(input)
|
|
||||||
lower := strings.ToLower(text)
|
|
||||||
|
|
||||||
metadata := thoughttypes.ThoughtMetadata{
|
|
||||||
People: heuristicPeople(text),
|
|
||||||
ActionItems: heuristicActionItems(text),
|
|
||||||
DatesMentioned: heuristicDates(text),
|
|
||||||
Topics: heuristicTopics(lower),
|
|
||||||
Type: heuristicType(lower),
|
|
||||||
}
|
|
||||||
if len(metadata.Topics) == 0 {
|
|
||||||
metadata.Topics = []string{"uncategorized"}
|
|
||||||
}
|
|
||||||
if metadata.Type == "" {
|
|
||||||
metadata.Type = "observation"
|
|
||||||
}
|
|
||||||
return metadata
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *Client) doJSON(ctx context.Context, path string, requestBody any, dest any) error {
|
func (c *Client) doJSON(ctx context.Context, path string, requestBody any, dest any) error {
|
||||||
@@ -632,6 +724,8 @@ func isRetryableChatResponseError(err error) bool {
|
|||||||
return strings.Contains(lower, "read response") || strings.Contains(lower, "read stream response")
|
return strings.Contains(lower, "read response") || strings.Contains(lower, "read stream response")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// extractJSONObject finds the first complete {...} block in s.
|
||||||
|
// It handles models that prepend prose to a JSON response despite json_object mode.
|
||||||
func extractJSONObject(s string) string {
|
func extractJSONObject(s string) string {
|
||||||
for start := 0; start < len(s); start++ {
|
for start := 0; start < len(s); start++ {
|
||||||
if s[start] != '{' {
|
if s[start] != '{' {
|
||||||
@@ -674,6 +768,10 @@ func extractJSONObject(s string) string {
|
|||||||
return ""
|
return ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// stripThinkingBlocks removes <think>...</think> and <thinking>...</thinking>
|
||||||
|
// blocks produced by reasoning models (DeepSeek R1, QwQ, etc.) so that the
|
||||||
|
// remaining text can be parsed as JSON without interference from thinking content
|
||||||
|
// that may itself contain braces.
|
||||||
func stripThinkingBlocks(s string) string {
|
func stripThinkingBlocks(s string) string {
|
||||||
for _, tag := range []string{"think", "thinking"} {
|
for _, tag := range []string{"think", "thinking"} {
|
||||||
open := "<" + tag + ">"
|
open := "<" + tag + ">"
|
||||||
@@ -759,6 +857,7 @@ func extractTextFromAny(value any) string {
|
|||||||
}
|
}
|
||||||
return strings.Join(parts, "\n")
|
return strings.Join(parts, "\n")
|
||||||
case map[string]any:
|
case map[string]any:
|
||||||
|
// Common provider shapes for chat content parts.
|
||||||
for _, key := range []string{"text", "output_text", "content", "value"} {
|
for _, key := range []string{"text", "output_text", "content", "value"} {
|
||||||
if nested, ok := typed[key]; ok {
|
if nested, ok := typed[key]; ok {
|
||||||
if text := strings.TrimSpace(extractTextFromAny(nested)); text != "" {
|
if text := strings.TrimSpace(extractTextFromAny(nested)); text != "" {
|
||||||
@@ -776,6 +875,28 @@ var (
|
|||||||
wordPattern = regexp.MustCompile(`[a-zA-Z][a-zA-Z0-9_/-]{2,}`)
|
wordPattern = regexp.MustCompile(`[a-zA-Z][a-zA-Z0-9_/-]{2,}`)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
func heuristicMetadataFromInput(input string) thoughttypes.ThoughtMetadata {
|
||||||
|
text := strings.TrimSpace(input)
|
||||||
|
lower := strings.ToLower(text)
|
||||||
|
|
||||||
|
metadata := thoughttypes.ThoughtMetadata{
|
||||||
|
People: heuristicPeople(text),
|
||||||
|
ActionItems: heuristicActionItems(text),
|
||||||
|
DatesMentioned: heuristicDates(text),
|
||||||
|
Topics: heuristicTopics(lower),
|
||||||
|
Type: heuristicType(lower),
|
||||||
|
Source: "",
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(metadata.Topics) == 0 {
|
||||||
|
metadata.Topics = []string{"uncategorized"}
|
||||||
|
}
|
||||||
|
if metadata.Type == "" {
|
||||||
|
metadata.Type = "observation"
|
||||||
|
}
|
||||||
|
return metadata
|
||||||
|
}
|
||||||
|
|
||||||
func heuristicType(lower string) string {
|
func heuristicType(lower string) string {
|
||||||
switch {
|
switch {
|
||||||
case strings.Contains(lower, "preferred name"), strings.Contains(lower, "personal profile"), strings.Contains(lower, "wife:"), strings.Contains(lower, "daughter:"), strings.Contains(lower, "born:"):
|
case strings.Contains(lower, "preferred name"), strings.Contains(lower, "personal profile"), strings.Contains(lower, "wife:"), strings.Contains(lower, "daughter:"), strings.Contains(lower, "born:"):
|
||||||
@@ -934,7 +1055,7 @@ func shouldRetryWithoutJSONMode(err error) bool {
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
if errors.Is(err, ErrEmptyResponse) || errors.Is(err, ErrNoJSONObject) {
|
if errors.Is(err, errMetadataEmptyResponse) || errors.Is(err, errMetadataNoJSONObject) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -942,6 +1063,27 @@ func shouldRetryWithoutJSONMode(err error) bool {
|
|||||||
return strings.Contains(lower, "parse json")
|
return strings.Contains(lower, "parse json")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func isPermanentModelError(err error) bool {
|
||||||
|
if err == nil {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
lower := strings.ToLower(err.Error())
|
||||||
|
for _, marker := range []string{
|
||||||
|
"invalid model name",
|
||||||
|
"model_not_found",
|
||||||
|
"model not found",
|
||||||
|
"unknown model",
|
||||||
|
"no such model",
|
||||||
|
"does not exist",
|
||||||
|
} {
|
||||||
|
if strings.Contains(lower, marker) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
func sleepRetry(ctx context.Context, attempt int, log *slog.Logger, provider string) error {
|
func sleepRetry(ctx context.Context, attempt int, log *slog.Logger, provider string) error {
|
||||||
delay := time.Duration(attempt*attempt) * 200 * time.Millisecond
|
delay := time.Duration(attempt*attempt) * 200 * time.Millisecond
|
||||||
if log != nil {
|
if log != nil {
|
||||||
@@ -968,3 +1110,59 @@ func sleepMetadataRetry(ctx context.Context, attempt int) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) shouldBypassModel(model string) bool {
|
||||||
|
c.modelHealthMu.Lock()
|
||||||
|
defer c.modelHealthMu.Unlock()
|
||||||
|
|
||||||
|
state, ok := c.modelHealth[model]
|
||||||
|
if !ok {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return !state.unhealthyUntil.IsZero() && time.Now().Before(state.unhealthyUntil)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) noteEmptyResponse(model string) {
|
||||||
|
c.modelHealthMu.Lock()
|
||||||
|
defer c.modelHealthMu.Unlock()
|
||||||
|
|
||||||
|
state := c.modelHealth[model]
|
||||||
|
state.consecutiveEmpty++
|
||||||
|
if state.consecutiveEmpty >= emptyResponseCircuitThreshold {
|
||||||
|
state.unhealthyUntil = time.Now().Add(emptyResponseCircuitTTL)
|
||||||
|
if c.log != nil {
|
||||||
|
c.log.Warn("metadata model marked temporarily unhealthy after repeated empty responses",
|
||||||
|
slog.String("provider", c.name),
|
||||||
|
slog.String("model", model),
|
||||||
|
slog.Time("until", state.unhealthyUntil),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
c.modelHealth[model] = state
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) noteModelSuccess(model string) {
|
||||||
|
c.modelHealthMu.Lock()
|
||||||
|
defer c.modelHealthMu.Unlock()
|
||||||
|
|
||||||
|
delete(c.modelHealth, model)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) notePermanentModelFailure(model string, err error) {
|
||||||
|
c.modelHealthMu.Lock()
|
||||||
|
defer c.modelHealthMu.Unlock()
|
||||||
|
|
||||||
|
state := c.modelHealth[model]
|
||||||
|
state.consecutiveEmpty = emptyResponseCircuitThreshold
|
||||||
|
state.unhealthyUntil = time.Now().Add(permanentModelFailureTTL)
|
||||||
|
c.modelHealth[model] = state
|
||||||
|
|
||||||
|
if c.log != nil {
|
||||||
|
c.log.Warn("metadata model marked unhealthy after permanent failure",
|
||||||
|
slog.String("provider", c.name),
|
||||||
|
slog.String("model", model),
|
||||||
|
slog.String("error", err.Error()),
|
||||||
|
slog.Time("until", state.unhealthyUntil),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -11,17 +11,6 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
|
|
||||||
func newTestClient(t *testing.T, url string) *Client {
|
|
||||||
t.Helper()
|
|
||||||
return New(Config{
|
|
||||||
Name: "litellm",
|
|
||||||
BaseURL: url,
|
|
||||||
APIKey: "test-key",
|
|
||||||
HTTPClient: http.DefaultClient,
|
|
||||||
Log: slog.New(slog.NewTextHandler(io.Discard, nil)),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestExtractMetadataFromStreamingResponse(t *testing.T) {
|
func TestExtractMetadataFromStreamingResponse(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
@@ -37,9 +26,6 @@ func TestExtractMetadataFromStreamingResponse(t *testing.T) {
|
|||||||
if req.Stream == nil || !*req.Stream {
|
if req.Stream == nil || !*req.Stream {
|
||||||
t.Fatalf("stream flag = %v, want true", req.Stream)
|
t.Fatalf("stream flag = %v, want true", req.Stream)
|
||||||
}
|
}
|
||||||
if req.Model != "qwen3.5:latest" {
|
|
||||||
t.Fatalf("model = %q, want qwen3.5:latest", req.Model)
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "text/event-stream")
|
w.Header().Set("Content-Type", "text/event-stream")
|
||||||
_, _ = io.WriteString(w, "data: {\"choices\":[{\"delta\":{\"content\":\"{\\\"people\\\":[],\"}}]}\n\n")
|
_, _ = io.WriteString(w, "data: {\"choices\":[{\"delta\":{\"content\":\"{\\\"people\\\":[],\"}}]}\n\n")
|
||||||
@@ -49,13 +35,20 @@ func TestExtractMetadataFromStreamingResponse(t *testing.T) {
|
|||||||
}))
|
}))
|
||||||
defer server.Close()
|
defer server.Close()
|
||||||
|
|
||||||
client := newTestClient(t, server.URL)
|
client := New(Config{
|
||||||
metadata, err := client.ExtractMetadataWith(context.Background(), MetadataOptions{
|
Name: "litellm",
|
||||||
Model: "qwen3.5:latest",
|
BaseURL: server.URL,
|
||||||
Temperature: 0.1,
|
APIKey: "test-key",
|
||||||
}, "Project idea: Build an Android companion app.")
|
MetadataModel: "qwen3.5:latest",
|
||||||
|
Temperature: 0.1,
|
||||||
|
HTTPClient: server.Client(),
|
||||||
|
Log: slog.New(slog.NewTextHandler(io.Discard, nil)),
|
||||||
|
EmbeddingModel: "unused",
|
||||||
|
})
|
||||||
|
|
||||||
|
metadata, err := client.ExtractMetadata(context.Background(), "Project idea: Build an Android companion app.")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("ExtractMetadataWith() error = %v", err)
|
t.Fatalf("ExtractMetadata() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if metadata.Type != "idea" {
|
if metadata.Type != "idea" {
|
||||||
@@ -101,13 +94,20 @@ func TestExtractMetadataRetriesWithoutJSONMode(t *testing.T) {
|
|||||||
}))
|
}))
|
||||||
defer server.Close()
|
defer server.Close()
|
||||||
|
|
||||||
client := newTestClient(t, server.URL)
|
client := New(Config{
|
||||||
metadata, err := client.ExtractMetadataWith(context.Background(), MetadataOptions{
|
Name: "litellm",
|
||||||
Model: "qwen3.5:latest",
|
BaseURL: server.URL,
|
||||||
Temperature: 0.1,
|
APIKey: "test-key",
|
||||||
}, "Project idea: Build an Android companion app.")
|
MetadataModel: "qwen3.5:latest",
|
||||||
|
Temperature: 0.1,
|
||||||
|
HTTPClient: server.Client(),
|
||||||
|
Log: slog.New(slog.NewTextHandler(io.Discard, nil)),
|
||||||
|
EmbeddingModel: "unused",
|
||||||
|
})
|
||||||
|
|
||||||
|
metadata, err := client.ExtractMetadata(context.Background(), "Project idea: Build an Android companion app.")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatalf("ExtractMetadataWith() error = %v", err)
|
t.Fatalf("ExtractMetadata() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if metadata.Type != "idea" {
|
if metadata.Type != "idea" {
|
||||||
@@ -127,33 +127,71 @@ func TestExtractMetadataRetriesWithoutJSONMode(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestIsPermanentModelError(t *testing.T) {
|
func TestExtractMetadataBypassesInvalidFallbackModelAfterFirstFailure(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
cases := []struct {
|
var mu sync.Mutex
|
||||||
name string
|
primaryCalls := 0
|
||||||
err error
|
invalidFallbackCalls := 0
|
||||||
want bool
|
|
||||||
}{
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
{"nil", nil, false},
|
defer func() {
|
||||||
{"invalid model", errMsg("Invalid model name passed in model=qwen3"), true},
|
_ = r.Body.Close()
|
||||||
{"model not found", errMsg("model_not_found"), true},
|
}()
|
||||||
{"no such model", errMsg("no such model"), true},
|
|
||||||
{"transient", errMsg("connection refused"), false},
|
var req chatCompletionsRequest
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
||||||
|
t.Fatalf("decode request: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
switch req.Model {
|
||||||
|
case "empty-primary":
|
||||||
|
_, _ = io.WriteString(w, `{"choices":[{"message":{"role":"assistant","content":""}}]}`)
|
||||||
|
case "qwen3.5:latest":
|
||||||
|
mu.Lock()
|
||||||
|
primaryCalls++
|
||||||
|
mu.Unlock()
|
||||||
|
_, _ = io.WriteString(w, `{"choices":[{"message":{"role":"assistant","content":"{\"people\":[],\"action_items\":[],\"dates_mentioned\":[],\"topics\":[\"metadata\"],\"type\":\"observation\",\"source\":\"primary\"}"}}]}`)
|
||||||
|
case "qwen3":
|
||||||
|
mu.Lock()
|
||||||
|
invalidFallbackCalls++
|
||||||
|
mu.Unlock()
|
||||||
|
w.WriteHeader(http.StatusBadRequest)
|
||||||
|
_, _ = io.WriteString(w, "{\"error\":{\"message\":\"{'error': '/chat/completions: Invalid model name passed in model=qwen3. Call `/v1/models` to view available models for your key.'}\"}}")
|
||||||
|
default:
|
||||||
|
t.Fatalf("unexpected model %q", req.Model)
|
||||||
|
}
|
||||||
|
}))
|
||||||
|
defer server.Close()
|
||||||
|
|
||||||
|
client := New(Config{
|
||||||
|
Name: "litellm",
|
||||||
|
BaseURL: server.URL,
|
||||||
|
APIKey: "test-key",
|
||||||
|
MetadataModel: "empty-primary",
|
||||||
|
FallbackMetadataModels: []string{"qwen3", "qwen3.5:latest"},
|
||||||
|
Temperature: 0.1,
|
||||||
|
HTTPClient: server.Client(),
|
||||||
|
Log: slog.New(slog.NewTextHandler(io.Discard, nil)),
|
||||||
|
EmbeddingModel: "unused",
|
||||||
|
})
|
||||||
|
|
||||||
|
for i := 0; i < 2; i++ {
|
||||||
|
metadata, err := client.ExtractMetadata(context.Background(), "A short note about metadata.")
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("ExtractMetadata() error = %v", err)
|
||||||
|
}
|
||||||
|
if metadata.Source != "primary" {
|
||||||
|
t.Fatalf("metadata source = %q, want primary", metadata.Source)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, tc := range cases {
|
mu.Lock()
|
||||||
tc := tc
|
defer mu.Unlock()
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
if invalidFallbackCalls != 1 {
|
||||||
if got := IsPermanentModelError(tc.err); got != tc.want {
|
t.Fatalf("invalid fallback calls = %d, want 1", invalidFallbackCalls)
|
||||||
t.Fatalf("IsPermanentModelError(%v) = %v, want %v", tc.err, got, tc.want)
|
}
|
||||||
}
|
if primaryCalls != 2 {
|
||||||
})
|
t.Fatalf("valid fallback calls = %d, want 2", primaryCalls)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type stringError string
|
|
||||||
|
|
||||||
func (s stringError) Error() string { return string(s) }
|
|
||||||
|
|
||||||
func errMsg(s string) error { return stringError(s) }
|
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package ai
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/ai/litellm"
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/ai/ollama"
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/ai/openrouter"
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewProvider(cfg config.AIConfig, httpClient *http.Client, log *slog.Logger) (Provider, error) {
|
||||||
|
switch cfg.Provider {
|
||||||
|
case "litellm":
|
||||||
|
return litellm.New(cfg, httpClient, log)
|
||||||
|
case "ollama":
|
||||||
|
return ollama.New(cfg, httpClient, log)
|
||||||
|
case "openrouter":
|
||||||
|
return openrouter.New(cfg, httpClient, log)
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("unsupported ai.provider: %s", cfg.Provider)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
package ai
|
||||||
|
|
||||||
|
import (
|
||||||
|
"io"
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestNewProviderSupportsOllama(t *testing.T) {
|
||||||
|
provider, err := NewProvider(config.AIConfig{
|
||||||
|
Provider: "ollama",
|
||||||
|
Embeddings: config.AIEmbeddingConfig{
|
||||||
|
Model: "nomic-embed-text",
|
||||||
|
Dimensions: 768,
|
||||||
|
},
|
||||||
|
Metadata: config.AIMetadataConfig{
|
||||||
|
Model: "llama3.2",
|
||||||
|
},
|
||||||
|
Ollama: config.OllamaConfig{
|
||||||
|
BaseURL: "http://localhost:11434/v1",
|
||||||
|
APIKey: "ollama",
|
||||||
|
},
|
||||||
|
}, &http.Client{}, slog.New(slog.NewTextHandler(io.Discard, nil)))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("NewProvider() error = %v", err)
|
||||||
|
}
|
||||||
|
if provider.Name() != "ollama" {
|
||||||
|
t.Fatalf("provider name = %q, want ollama", provider.Name())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,30 @@
|
|||||||
|
package litellm
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/ai/compat"
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func New(cfg config.AIConfig, httpClient *http.Client, log *slog.Logger) (*compat.Client, error) {
|
||||||
|
fallbacks := cfg.LiteLLM.EffectiveFallbackMetadataModels()
|
||||||
|
if len(fallbacks) == 0 {
|
||||||
|
fallbacks = cfg.Metadata.EffectiveFallbackModels()
|
||||||
|
}
|
||||||
|
return compat.New(compat.Config{
|
||||||
|
Name: "litellm",
|
||||||
|
BaseURL: cfg.LiteLLM.BaseURL,
|
||||||
|
APIKey: cfg.LiteLLM.APIKey,
|
||||||
|
EmbeddingModel: cfg.LiteLLM.EmbeddingModel,
|
||||||
|
MetadataModel: cfg.LiteLLM.MetadataModel,
|
||||||
|
FallbackMetadataModels: fallbacks,
|
||||||
|
Temperature: cfg.Metadata.Temperature,
|
||||||
|
Headers: cfg.LiteLLM.RequestHeaders,
|
||||||
|
HTTPClient: httpClient,
|
||||||
|
Log: log,
|
||||||
|
Dimensions: cfg.Embeddings.Dimensions,
|
||||||
|
LogConversations: cfg.Metadata.LogConversations,
|
||||||
|
}), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package ollama
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/ai/compat"
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func New(cfg config.AIConfig, httpClient *http.Client, log *slog.Logger) (*compat.Client, error) {
|
||||||
|
return compat.New(compat.Config{
|
||||||
|
Name: "ollama",
|
||||||
|
BaseURL: cfg.Ollama.BaseURL,
|
||||||
|
APIKey: cfg.Ollama.APIKey,
|
||||||
|
EmbeddingModel: cfg.Embeddings.Model,
|
||||||
|
MetadataModel: cfg.Metadata.Model,
|
||||||
|
FallbackMetadataModels: cfg.Metadata.EffectiveFallbackModels(),
|
||||||
|
Temperature: cfg.Metadata.Temperature,
|
||||||
|
Headers: cfg.Ollama.RequestHeaders,
|
||||||
|
HTTPClient: httpClient,
|
||||||
|
Log: log,
|
||||||
|
Dimensions: cfg.Embeddings.Dimensions,
|
||||||
|
LogConversations: cfg.Metadata.LogConversations,
|
||||||
|
}), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package openrouter
|
||||||
|
|
||||||
|
import (
|
||||||
|
"log/slog"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/ai/compat"
|
||||||
|
"git.warky.dev/wdevs/amcs/internal/config"
|
||||||
|
)
|
||||||
|
|
||||||
|
func New(cfg config.AIConfig, httpClient *http.Client, log *slog.Logger) (*compat.Client, error) {
|
||||||
|
headers := make(map[string]string, len(cfg.OpenRouter.ExtraHeaders)+2)
|
||||||
|
for key, value := range cfg.OpenRouter.ExtraHeaders {
|
||||||
|
headers[key] = value
|
||||||
|
}
|
||||||
|
if cfg.OpenRouter.SiteURL != "" {
|
||||||
|
headers["HTTP-Referer"] = cfg.OpenRouter.SiteURL
|
||||||
|
}
|
||||||
|
if cfg.OpenRouter.AppName != "" {
|
||||||
|
headers["X-Title"] = cfg.OpenRouter.AppName
|
||||||
|
}
|
||||||
|
|
||||||
|
return compat.New(compat.Config{
|
||||||
|
Name: "openrouter",
|
||||||
|
BaseURL: cfg.OpenRouter.BaseURL,
|
||||||
|
APIKey: cfg.OpenRouter.APIKey,
|
||||||
|
EmbeddingModel: cfg.Embeddings.Model,
|
||||||
|
MetadataModel: cfg.Metadata.Model,
|
||||||
|
FallbackMetadataModels: cfg.Metadata.EffectiveFallbackModels(),
|
||||||
|
Temperature: cfg.Metadata.Temperature,
|
||||||
|
Headers: headers,
|
||||||
|
HTTPClient: httpClient,
|
||||||
|
Log: log,
|
||||||
|
Dimensions: cfg.Embeddings.Dimensions,
|
||||||
|
LogConversations: cfg.Metadata.LogConversations,
|
||||||
|
}), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package ai
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
|
||||||
|
thoughttypes "git.warky.dev/wdevs/amcs/internal/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
type Provider interface {
|
||||||
|
Embed(ctx context.Context, input string) ([]float32, error)
|
||||||
|
ExtractMetadata(ctx context.Context, input string) (thoughttypes.ThoughtMetadata, error)
|
||||||
|
Summarize(ctx context.Context, systemPrompt, userPrompt string) (string, error)
|
||||||
|
Name() string
|
||||||
|
EmbeddingModel() string
|
||||||
|
}
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
package ai
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/ai/compat"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Registry holds one compat.Client per named provider. Runners look up clients
|
|
||||||
// by provider name when walking a role chain.
|
|
||||||
type Registry struct {
|
|
||||||
clients map[string]*compat.Client
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewRegistry builds a Registry from the configured providers. Each provider
|
|
||||||
// type maps onto a compat.Client with type-specific header plumbing (e.g.
|
|
||||||
// openrouter's HTTP-Referer / X-Title).
|
|
||||||
func NewRegistry(providers map[string]config.ProviderConfig, httpClient *http.Client, log *slog.Logger) (*Registry, error) {
|
|
||||||
if httpClient == nil {
|
|
||||||
return nil, fmt.Errorf("ai registry: http client is required")
|
|
||||||
}
|
|
||||||
if len(providers) == 0 {
|
|
||||||
return nil, fmt.Errorf("ai registry: no providers configured")
|
|
||||||
}
|
|
||||||
|
|
||||||
clients := make(map[string]*compat.Client, len(providers))
|
|
||||||
for name, p := range providers {
|
|
||||||
headers, err := providerHeaders(p)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("ai registry: provider %q: %w", name, err)
|
|
||||||
}
|
|
||||||
clients[name] = compat.New(compat.Config{
|
|
||||||
Name: name,
|
|
||||||
BaseURL: p.BaseURL,
|
|
||||||
APIKey: p.APIKey,
|
|
||||||
Headers: headers,
|
|
||||||
HTTPClient: httpClient,
|
|
||||||
Log: log,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
return &Registry{clients: clients}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Client returns the compat.Client registered under name.
|
|
||||||
func (r *Registry) Client(name string) (*compat.Client, error) {
|
|
||||||
c, ok := r.clients[name]
|
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("ai registry: provider %q is not configured", name)
|
|
||||||
}
|
|
||||||
return c, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Names returns the registered provider names.
|
|
||||||
func (r *Registry) Names() []string {
|
|
||||||
names := make([]string, 0, len(r.clients))
|
|
||||||
for name := range r.clients {
|
|
||||||
names = append(names, name)
|
|
||||||
}
|
|
||||||
return names
|
|
||||||
}
|
|
||||||
|
|
||||||
func providerHeaders(p config.ProviderConfig) (map[string]string, error) {
|
|
||||||
switch p.Type {
|
|
||||||
case "litellm", "ollama":
|
|
||||||
return cloneHeaders(p.RequestHeaders), nil
|
|
||||||
case "openrouter":
|
|
||||||
headers := cloneHeaders(p.RequestHeaders)
|
|
||||||
if headers == nil {
|
|
||||||
headers = map[string]string{}
|
|
||||||
}
|
|
||||||
if s := strings.TrimSpace(p.SiteURL); s != "" {
|
|
||||||
headers["HTTP-Referer"] = s
|
|
||||||
}
|
|
||||||
if s := strings.TrimSpace(p.AppName); s != "" {
|
|
||||||
headers["X-Title"] = s
|
|
||||||
}
|
|
||||||
return headers, nil
|
|
||||||
default:
|
|
||||||
return nil, fmt.Errorf("unsupported provider type %q", p.Type)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func cloneHeaders(in map[string]string) map[string]string {
|
|
||||||
if len(in) == 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
out := make(map[string]string, len(in))
|
|
||||||
for k, v := range in {
|
|
||||||
out[k] = v
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
@@ -1,80 +0,0 @@
|
|||||||
package ai
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/ai/compat"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestNewRegistryOpenRouterHeaders(t *testing.T) {
|
|
||||||
var (
|
|
||||||
gotReferer string
|
|
||||||
gotTitle string
|
|
||||||
gotCustom string
|
|
||||||
)
|
|
||||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
gotReferer = r.Header.Get("HTTP-Referer")
|
|
||||||
gotTitle = r.Header.Get("X-Title")
|
|
||||||
gotCustom = r.Header.Get("X-Custom")
|
|
||||||
_ = json.NewEncoder(w).Encode(map[string]any{
|
|
||||||
"choices": []map[string]any{{"message": map[string]any{"role": "assistant", "content": "ok"}}},
|
|
||||||
})
|
|
||||||
}))
|
|
||||||
defer srv.Close()
|
|
||||||
|
|
||||||
providers := map[string]config.ProviderConfig{
|
|
||||||
"router": {
|
|
||||||
Type: "openrouter",
|
|
||||||
BaseURL: srv.URL,
|
|
||||||
APIKey: "secret",
|
|
||||||
RequestHeaders: map[string]string{
|
|
||||||
"X-Custom": "value",
|
|
||||||
},
|
|
||||||
AppName: "amcs",
|
|
||||||
SiteURL: "https://example.com",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
reg, err := NewRegistry(providers, srv.Client(), nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewRegistry() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
client, err := reg.Client("router")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Client(router) error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if _, err := client.SummarizeWith(context.Background(), compat.SummarizeOptions{Model: "gpt-4.1-mini"}, "system", "user"); err != nil {
|
|
||||||
t.Fatalf("SummarizeWith() error = %v", err)
|
|
||||||
}
|
|
||||||
if gotReferer != "https://example.com" {
|
|
||||||
t.Fatalf("HTTP-Referer = %q, want https://example.com", gotReferer)
|
|
||||||
}
|
|
||||||
if gotTitle != "amcs" {
|
|
||||||
t.Fatalf("X-Title = %q, want amcs", gotTitle)
|
|
||||||
}
|
|
||||||
if gotCustom != "value" {
|
|
||||||
t.Fatalf("X-Custom = %q, want value", gotCustom)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestNewRegistryRejectsUnsupportedProviderType(t *testing.T) {
|
|
||||||
providers := map[string]config.ProviderConfig{
|
|
||||||
"bad": {
|
|
||||||
Type: "unknown",
|
|
||||||
BaseURL: "http://localhost:4000/v1",
|
|
||||||
APIKey: "secret",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
_, err := NewRegistry(providers, &http.Client{}, nil)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatal("NewRegistry() error = nil, want unsupported provider type error")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,367 +0,0 @@
|
|||||||
package ai
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
"log/slog"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/ai/compat"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
|
||||||
thoughttypes "git.warky.dev/wdevs/amcs/internal/types"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Health TTLs per failure class. These are short enough that a healed target
|
|
||||||
// gets retried without manual intervention, but long enough to avoid hammering
|
|
||||||
// a broken provider every call.
|
|
||||||
const (
|
|
||||||
transientCooldown = 30 * time.Second
|
|
||||||
permanentCooldown = 10 * time.Minute
|
|
||||||
emptyResponseThreshold = 3
|
|
||||||
emptyResponseCooldown = 2 * time.Minute
|
|
||||||
dimensionMismatchWarning = "embedding dimension mismatch"
|
|
||||||
)
|
|
||||||
|
|
||||||
// EmbedResult carries the vector plus the (provider, model) that produced it —
|
|
||||||
// callers store the actual model so later searches against that row use the
|
|
||||||
// matching query embedding.
|
|
||||||
type EmbedResult struct {
|
|
||||||
Vector []float32
|
|
||||||
Provider string
|
|
||||||
Model string
|
|
||||||
}
|
|
||||||
|
|
||||||
// EmbeddingRunner executes the embeddings role chain with sequential fallback.
|
|
||||||
type EmbeddingRunner struct {
|
|
||||||
registry *Registry
|
|
||||||
chain []config.RoleTarget
|
|
||||||
dimensions int
|
|
||||||
health *healthTracker
|
|
||||||
log *slog.Logger
|
|
||||||
}
|
|
||||||
|
|
||||||
// MetadataRunner executes the metadata role chain with sequential fallback and
|
|
||||||
// a heuristic fallthrough when every target is unhealthy or fails.
|
|
||||||
type MetadataRunner struct {
|
|
||||||
registry *Registry
|
|
||||||
chain []config.RoleTarget
|
|
||||||
opts metadataRunOpts
|
|
||||||
health *healthTracker
|
|
||||||
log *slog.Logger
|
|
||||||
}
|
|
||||||
|
|
||||||
type metadataRunOpts struct {
|
|
||||||
temperature float64
|
|
||||||
logConversations bool
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewEmbeddingRunner builds a runner for the embeddings role. chain must be
|
|
||||||
// non-empty and every target must be registered.
|
|
||||||
func NewEmbeddingRunner(registry *Registry, chain []config.RoleTarget, dimensions int, log *slog.Logger) (*EmbeddingRunner, error) {
|
|
||||||
if registry == nil {
|
|
||||||
return nil, fmt.Errorf("embedding runner: registry is required")
|
|
||||||
}
|
|
||||||
if len(chain) == 0 {
|
|
||||||
return nil, fmt.Errorf("embedding runner: chain is empty")
|
|
||||||
}
|
|
||||||
if dimensions <= 0 {
|
|
||||||
return nil, fmt.Errorf("embedding runner: dimensions must be > 0")
|
|
||||||
}
|
|
||||||
for i, t := range chain {
|
|
||||||
if _, err := registry.Client(t.Provider); err != nil {
|
|
||||||
return nil, fmt.Errorf("embedding runner: chain[%d]: %w", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return &EmbeddingRunner{
|
|
||||||
registry: registry,
|
|
||||||
chain: chain,
|
|
||||||
dimensions: dimensions,
|
|
||||||
health: newHealthTracker(),
|
|
||||||
log: log,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewMetadataRunner builds a runner for the metadata role.
|
|
||||||
func NewMetadataRunner(registry *Registry, chain []config.RoleTarget, temperature float64, logConversations bool, log *slog.Logger) (*MetadataRunner, error) {
|
|
||||||
if registry == nil {
|
|
||||||
return nil, fmt.Errorf("metadata runner: registry is required")
|
|
||||||
}
|
|
||||||
if len(chain) == 0 {
|
|
||||||
return nil, fmt.Errorf("metadata runner: chain is empty")
|
|
||||||
}
|
|
||||||
for i, t := range chain {
|
|
||||||
if _, err := registry.Client(t.Provider); err != nil {
|
|
||||||
return nil, fmt.Errorf("metadata runner: chain[%d]: %w", i, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return &MetadataRunner{
|
|
||||||
registry: registry,
|
|
||||||
chain: chain,
|
|
||||||
opts: metadataRunOpts{
|
|
||||||
temperature: temperature,
|
|
||||||
logConversations: logConversations,
|
|
||||||
},
|
|
||||||
health: newHealthTracker(),
|
|
||||||
log: log,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// PrimaryProvider returns the first provider in the chain.
|
|
||||||
func (r *EmbeddingRunner) PrimaryProvider() string { return r.chain[0].Provider }
|
|
||||||
|
|
||||||
// PrimaryModel returns the first model in the chain — the one used as the
|
|
||||||
// storage key for search matching.
|
|
||||||
func (r *EmbeddingRunner) PrimaryModel() string { return r.chain[0].Model }
|
|
||||||
|
|
||||||
// Dimensions returns the required vector dimension.
|
|
||||||
func (r *EmbeddingRunner) Dimensions() int { return r.dimensions }
|
|
||||||
|
|
||||||
// Embed walks the chain and returns the first successful embedding. The
|
|
||||||
// returned EmbedResult names the actual (provider, model) that produced the
|
|
||||||
// vector — callers use that when recording the row.
|
|
||||||
func (r *EmbeddingRunner) Embed(ctx context.Context, input string) (EmbedResult, error) {
|
|
||||||
var errs []error
|
|
||||||
for _, target := range r.chain {
|
|
||||||
if r.health.skip(target) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
client, err := r.registry.Client(target.Provider)
|
|
||||||
if err != nil {
|
|
||||||
errs = append(errs, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
vec, err := client.EmbedWith(ctx, target.Model, input)
|
|
||||||
if err != nil {
|
|
||||||
if ctx.Err() != nil {
|
|
||||||
return EmbedResult{}, ctx.Err()
|
|
||||||
}
|
|
||||||
r.classify(target, err)
|
|
||||||
r.logFailure("embed", target, err)
|
|
||||||
errs = append(errs, fmt.Errorf("%s/%s: %w", target.Provider, target.Model, err))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if len(vec) != r.dimensions {
|
|
||||||
dimErr := fmt.Errorf("%s: expected %d, got %d", dimensionMismatchWarning, r.dimensions, len(vec))
|
|
||||||
r.health.markTransient(target)
|
|
||||||
r.logFailure("embed", target, dimErr)
|
|
||||||
errs = append(errs, fmt.Errorf("%s/%s: %w", target.Provider, target.Model, dimErr))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
r.health.markHealthy(target)
|
|
||||||
return EmbedResult{Vector: vec, Provider: target.Provider, Model: target.Model}, nil
|
|
||||||
}
|
|
||||||
return EmbedResult{}, fmt.Errorf("all embedding targets failed: %w", errors.Join(errs...))
|
|
||||||
}
|
|
||||||
|
|
||||||
// EmbedPrimary embeds using only the primary target — used for search queries
|
|
||||||
// so the query vector matches rows stored under the primary model. Falls back
|
|
||||||
// to returning the error without walking the chain.
|
|
||||||
func (r *EmbeddingRunner) EmbedPrimary(ctx context.Context, input string) ([]float32, error) {
|
|
||||||
target := r.chain[0]
|
|
||||||
client, err := r.registry.Client(target.Provider)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
vec, err := client.EmbedWith(ctx, target.Model, input)
|
|
||||||
if err != nil {
|
|
||||||
r.classify(target, err)
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if len(vec) != r.dimensions {
|
|
||||||
return nil, fmt.Errorf("%s: expected %d, got %d", dimensionMismatchWarning, r.dimensions, len(vec))
|
|
||||||
}
|
|
||||||
r.health.markHealthy(target)
|
|
||||||
return vec, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// PrimaryProvider / PrimaryModel for metadata mirror the embedding runner.
|
|
||||||
func (r *MetadataRunner) PrimaryProvider() string { return r.chain[0].Provider }
|
|
||||||
func (r *MetadataRunner) PrimaryModel() string { return r.chain[0].Model }
|
|
||||||
|
|
||||||
// ExtractMetadata walks the chain sequentially. If every target fails or is
|
|
||||||
// unhealthy, it returns a heuristic metadata so capture never hard-fails.
|
|
||||||
func (r *MetadataRunner) ExtractMetadata(ctx context.Context, input string) (thoughttypes.ThoughtMetadata, error) {
|
|
||||||
var errs []error
|
|
||||||
for _, target := range r.chain {
|
|
||||||
if r.health.skip(target) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
client, err := r.registry.Client(target.Provider)
|
|
||||||
if err != nil {
|
|
||||||
errs = append(errs, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
md, err := client.ExtractMetadataWith(ctx, compat.MetadataOptions{
|
|
||||||
Model: target.Model,
|
|
||||||
Temperature: r.opts.temperature,
|
|
||||||
LogConversations: r.opts.logConversations,
|
|
||||||
}, input)
|
|
||||||
if err != nil {
|
|
||||||
if ctx.Err() != nil {
|
|
||||||
return thoughttypes.ThoughtMetadata{}, ctx.Err()
|
|
||||||
}
|
|
||||||
r.classify(target, err)
|
|
||||||
r.logFailure("metadata", target, err)
|
|
||||||
errs = append(errs, fmt.Errorf("%s/%s: %w", target.Provider, target.Model, err))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
r.health.markHealthy(target)
|
|
||||||
return md, nil
|
|
||||||
}
|
|
||||||
if r.log != nil {
|
|
||||||
r.log.Warn("metadata chain exhausted, using heuristic fallback",
|
|
||||||
slog.Int("targets", len(r.chain)),
|
|
||||||
slog.String("error", errors.Join(errs...).Error()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
return compat.HeuristicMetadataFromInput(input), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Summarize walks the chain; unlike metadata, there is no heuristic fallback —
|
|
||||||
// returns the joined error when everything fails.
|
|
||||||
func (r *MetadataRunner) Summarize(ctx context.Context, systemPrompt, userPrompt string) (string, error) {
|
|
||||||
var errs []error
|
|
||||||
for _, target := range r.chain {
|
|
||||||
if r.health.skip(target) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
client, err := r.registry.Client(target.Provider)
|
|
||||||
if err != nil {
|
|
||||||
errs = append(errs, err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
out, err := client.SummarizeWith(ctx, compat.SummarizeOptions{
|
|
||||||
Model: target.Model,
|
|
||||||
Temperature: r.opts.temperature,
|
|
||||||
}, systemPrompt, userPrompt)
|
|
||||||
if err != nil {
|
|
||||||
if ctx.Err() != nil {
|
|
||||||
return "", ctx.Err()
|
|
||||||
}
|
|
||||||
r.classify(target, err)
|
|
||||||
r.logFailure("summarize", target, err)
|
|
||||||
errs = append(errs, fmt.Errorf("%s/%s: %w", target.Provider, target.Model, err))
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
r.health.markHealthy(target)
|
|
||||||
return out, nil
|
|
||||||
}
|
|
||||||
return "", fmt.Errorf("all summarize targets failed: %w", errors.Join(errs...))
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *EmbeddingRunner) classify(target config.RoleTarget, err error) {
|
|
||||||
switch {
|
|
||||||
case compat.IsPermanentModelError(err):
|
|
||||||
r.health.markPermanent(target)
|
|
||||||
default:
|
|
||||||
r.health.markTransient(target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *MetadataRunner) classify(target config.RoleTarget, err error) {
|
|
||||||
switch {
|
|
||||||
case compat.IsPermanentModelError(err):
|
|
||||||
r.health.markPermanent(target)
|
|
||||||
case errors.Is(err, compat.ErrEmptyResponse):
|
|
||||||
r.health.markEmpty(target)
|
|
||||||
default:
|
|
||||||
r.health.markTransient(target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *EmbeddingRunner) logFailure(role string, target config.RoleTarget, err error) {
|
|
||||||
if r.log == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
r.log.Warn("ai target failed",
|
|
||||||
slog.String("role", role),
|
|
||||||
slog.String("provider", target.Provider),
|
|
||||||
slog.String("model", target.Model),
|
|
||||||
slog.String("error", err.Error()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (r *MetadataRunner) logFailure(role string, target config.RoleTarget, err error) {
|
|
||||||
if r.log == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
r.log.Warn("ai target failed",
|
|
||||||
slog.String("role", role),
|
|
||||||
slog.String("provider", target.Provider),
|
|
||||||
slog.String("model", target.Model),
|
|
||||||
slog.String("error", err.Error()),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
// healthTracker records per-(provider, model) failure state. skip returns true
|
|
||||||
// when a target is still inside its cooldown window; the caller then tries the
|
|
||||||
// next target in the chain.
|
|
||||||
type healthTracker struct {
|
|
||||||
mu sync.Mutex
|
|
||||||
states map[config.RoleTarget]*healthState
|
|
||||||
}
|
|
||||||
|
|
||||||
type healthState struct {
|
|
||||||
unhealthyUntil time.Time
|
|
||||||
emptyCount int
|
|
||||||
}
|
|
||||||
|
|
||||||
func newHealthTracker() *healthTracker {
|
|
||||||
return &healthTracker{states: map[config.RoleTarget]*healthState{}}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *healthTracker) skip(target config.RoleTarget) bool {
|
|
||||||
h.mu.Lock()
|
|
||||||
defer h.mu.Unlock()
|
|
||||||
s, ok := h.states[target]
|
|
||||||
if !ok {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return time.Now().Before(s.unhealthyUntil)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *healthTracker) markTransient(target config.RoleTarget) {
|
|
||||||
h.setCooldown(target, transientCooldown)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *healthTracker) markPermanent(target config.RoleTarget) {
|
|
||||||
h.setCooldown(target, permanentCooldown)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *healthTracker) markEmpty(target config.RoleTarget) {
|
|
||||||
h.mu.Lock()
|
|
||||||
defer h.mu.Unlock()
|
|
||||||
s := h.states[target]
|
|
||||||
if s == nil {
|
|
||||||
s = &healthState{}
|
|
||||||
h.states[target] = s
|
|
||||||
}
|
|
||||||
s.emptyCount++
|
|
||||||
if s.emptyCount >= emptyResponseThreshold {
|
|
||||||
s.unhealthyUntil = time.Now().Add(emptyResponseCooldown)
|
|
||||||
s.emptyCount = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *healthTracker) markHealthy(target config.RoleTarget) {
|
|
||||||
h.mu.Lock()
|
|
||||||
defer h.mu.Unlock()
|
|
||||||
if s, ok := h.states[target]; ok {
|
|
||||||
s.unhealthyUntil = time.Time{}
|
|
||||||
s.emptyCount = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *healthTracker) setCooldown(target config.RoleTarget, d time.Duration) {
|
|
||||||
h.mu.Lock()
|
|
||||||
defer h.mu.Unlock()
|
|
||||||
s := h.states[target]
|
|
||||||
if s == nil {
|
|
||||||
s = &healthState{}
|
|
||||||
h.states[target] = s
|
|
||||||
}
|
|
||||||
s.unhealthyUntil = time.Now().Add(d)
|
|
||||||
s.emptyCount = 0
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
package ai
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"sync"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestEmbeddingRunnerFallsBackAndSkipsUnhealthyPrimary(t *testing.T) {
|
|
||||||
var (
|
|
||||||
mu sync.Mutex
|
|
||||||
primaryCalls int
|
|
||||||
)
|
|
||||||
|
|
||||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/embeddings" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var req struct {
|
|
||||||
Model string `json:"model"`
|
|
||||||
}
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
switch req.Model {
|
|
||||||
case "embed-primary":
|
|
||||||
mu.Lock()
|
|
||||||
primaryCalls++
|
|
||||||
mu.Unlock()
|
|
||||||
http.Error(w, "upstream down", http.StatusBadGateway)
|
|
||||||
case "embed-fallback":
|
|
||||||
_ = json.NewEncoder(w).Encode(map[string]any{
|
|
||||||
"data": []map[string]any{{"embedding": []float32{0.1, 0.2, 0.3}}},
|
|
||||||
})
|
|
||||||
default:
|
|
||||||
http.Error(w, "unknown model", http.StatusBadRequest)
|
|
||||||
}
|
|
||||||
}))
|
|
||||||
defer srv.Close()
|
|
||||||
|
|
||||||
reg, err := NewRegistry(map[string]config.ProviderConfig{
|
|
||||||
"p1": {Type: "litellm", BaseURL: srv.URL, APIKey: "k1"},
|
|
||||||
"p2": {Type: "litellm", BaseURL: srv.URL, APIKey: "k2"},
|
|
||||||
}, srv.Client(), nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewRegistry() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
runner, err := NewEmbeddingRunner(reg, []config.RoleTarget{
|
|
||||||
{Provider: "p1", Model: "embed-primary"},
|
|
||||||
{Provider: "p2", Model: "embed-fallback"},
|
|
||||||
}, 3, nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewEmbeddingRunner() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
res, err := runner.Embed(context.Background(), "hello")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Embed() first call error = %v", err)
|
|
||||||
}
|
|
||||||
if res.Provider != "p2" || res.Model != "embed-fallback" {
|
|
||||||
t.Fatalf("Embed() first call target = %s/%s, want p2/embed-fallback", res.Provider, res.Model)
|
|
||||||
}
|
|
||||||
|
|
||||||
res, err = runner.Embed(context.Background(), "hello again")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Embed() second call error = %v", err)
|
|
||||||
}
|
|
||||||
if res.Provider != "p2" || res.Model != "embed-fallback" {
|
|
||||||
t.Fatalf("Embed() second call target = %s/%s, want p2/embed-fallback", res.Provider, res.Model)
|
|
||||||
}
|
|
||||||
|
|
||||||
mu.Lock()
|
|
||||||
calls := primaryCalls
|
|
||||||
mu.Unlock()
|
|
||||||
if calls != 3 {
|
|
||||||
t.Fatalf("primary calls = %d, want 3 (first request retries 3x; second call should skip unhealthy primary)", calls)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMetadataRunnerSummarizeFallsBack(t *testing.T) {
|
|
||||||
srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/chat/completions" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var req struct {
|
|
||||||
Model string `json:"model"`
|
|
||||||
}
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
|
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
switch req.Model {
|
|
||||||
case "sum-primary":
|
|
||||||
http.Error(w, "provider error", http.StatusBadGateway)
|
|
||||||
case "sum-fallback":
|
|
||||||
_ = json.NewEncoder(w).Encode(map[string]any{
|
|
||||||
"choices": []map[string]any{{
|
|
||||||
"message": map[string]any{"role": "assistant", "content": "fallback summary"},
|
|
||||||
}},
|
|
||||||
})
|
|
||||||
default:
|
|
||||||
http.Error(w, "unknown model", http.StatusBadRequest)
|
|
||||||
}
|
|
||||||
}))
|
|
||||||
defer srv.Close()
|
|
||||||
|
|
||||||
reg, err := NewRegistry(map[string]config.ProviderConfig{
|
|
||||||
"p1": {Type: "litellm", BaseURL: srv.URL, APIKey: "k1"},
|
|
||||||
"p2": {Type: "litellm", BaseURL: srv.URL, APIKey: "k2"},
|
|
||||||
}, srv.Client(), nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewRegistry() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
runner, err := NewMetadataRunner(reg, []config.RoleTarget{
|
|
||||||
{Provider: "p1", Model: "sum-primary"},
|
|
||||||
{Provider: "p2", Model: "sum-fallback"},
|
|
||||||
}, 0.1, false, nil)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewMetadataRunner() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
summary, err := runner.Summarize(context.Background(), "system", "user")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Summarize() error = %v", err)
|
|
||||||
}
|
|
||||||
if summary != "fallback summary" {
|
|
||||||
t.Fatalf("summary = %q, want %q", summary, "fallback summary")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/tools"
|
|
||||||
)
|
|
||||||
|
|
||||||
type adminActions struct {
|
|
||||||
backfill *tools.BackfillTool
|
|
||||||
retry *tools.EnrichmentRetryer
|
|
||||||
logger *slog.Logger
|
|
||||||
}
|
|
||||||
|
|
||||||
func newAdminActions(backfill *tools.BackfillTool, retry *tools.EnrichmentRetryer, logger *slog.Logger) *adminActions {
|
|
||||||
return &adminActions{
|
|
||||||
backfill: backfill,
|
|
||||||
retry: retry,
|
|
||||||
logger: logger,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *adminActions) backfillHandler() http.Handler {
|
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.Method != http.MethodPost {
|
|
||||||
w.Header().Set("Allow", http.MethodPost)
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var in tools.BackfillInput
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
|
||||||
http.Error(w, "invalid request body", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
_, out, err := a.backfill.Handle(r.Context(), nil, in)
|
|
||||||
if err != nil {
|
|
||||||
if a.logger != nil {
|
|
||||||
a.logger.Warn("admin backfill failed", slog.String("error", err.Error()))
|
|
||||||
}
|
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
_ = json.NewEncoder(w).Encode(out)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a *adminActions) retryMetadataHandler() http.Handler {
|
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.Method != http.MethodPost {
|
|
||||||
w.Header().Set("Allow", http.MethodPost)
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
var in tools.RetryEnrichmentInput
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&in); err != nil {
|
|
||||||
http.Error(w, "invalid request body", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
_, out, err := a.retry.Handle(r.Context(), nil, in)
|
|
||||||
if err != nil {
|
|
||||||
if a.logger != nil {
|
|
||||||
a.logger.Warn("admin metadata retry failed", slog.String("error", err.Error()))
|
|
||||||
}
|
|
||||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
_ = json.NewEncoder(w).Encode(out)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
@@ -1,268 +0,0 @@
|
|||||||
package app
|
|
||||||
// Legacy admin handlers retired in favor of ResolveSpec-backed routes.
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/store"
|
|
||||||
ext "git.warky.dev/wdevs/amcs/internal/types"
|
|
||||||
|
|
||||||
"github.com/google/uuid"
|
|
||||||
)
|
|
||||||
|
|
||||||
type adminHandlers struct {
|
|
||||||
db *store.DB
|
|
||||||
logger *slog.Logger
|
|
||||||
}
|
|
||||||
|
|
||||||
func newAdminHandlers(db *store.DB, logger *slog.Logger) *adminHandlers {
|
|
||||||
return &adminHandlers{db: db, logger: logger}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *adminHandlers) register(mux *http.ServeMux, middleware func(http.Handler) http.Handler) {
|
|
||||||
handle := func(pattern string, fn http.HandlerFunc) {
|
|
||||||
mux.Handle(pattern, middleware(fn))
|
|
||||||
}
|
|
||||||
|
|
||||||
handle("GET /api/admin/projects", h.listProjects)
|
|
||||||
handle("POST /api/admin/projects", h.createProject)
|
|
||||||
handle("GET /api/admin/thoughts", h.listThoughts)
|
|
||||||
handle("GET /api/admin/thoughts/{id}", h.getThought)
|
|
||||||
handle("DELETE /api/admin/thoughts/{id}", h.deleteThought)
|
|
||||||
handle("POST /api/admin/thoughts/{id}/archive", h.archiveThought)
|
|
||||||
handle("GET /api/admin/skills", h.listSkills)
|
|
||||||
handle("DELETE /api/admin/skills/{id}", h.deleteSkill)
|
|
||||||
handle("GET /api/admin/guardrails", h.listGuardrails)
|
|
||||||
handle("DELETE /api/admin/guardrails/{id}", h.deleteGuardrail)
|
|
||||||
handle("GET /api/admin/files", h.listFiles)
|
|
||||||
handle("GET /api/admin/stats", h.stats)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Projects ---
|
|
||||||
|
|
||||||
func (h *adminHandlers) listProjects(w http.ResponseWriter, r *http.Request) {
|
|
||||||
projects, err := h.db.ListProjects(r.Context())
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "list projects", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, projects)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *adminHandlers) createProject(w http.ResponseWriter, r *http.Request) {
|
|
||||||
var body struct {
|
|
||||||
Name string `json:"name"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
}
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
|
|
||||||
http.Error(w, "invalid request body", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(body.Name) == "" {
|
|
||||||
http.Error(w, "name is required", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
project, err := h.db.CreateProject(r.Context(), body.Name, body.Description)
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "create project", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusCreated)
|
|
||||||
writeJSON(w, project)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Thoughts ---
|
|
||||||
|
|
||||||
func (h *adminHandlers) listThoughts(w http.ResponseWriter, r *http.Request) {
|
|
||||||
q := r.URL.Query()
|
|
||||||
limit := 50
|
|
||||||
if l := q.Get("limit"); l != "" {
|
|
||||||
if n, err := strconv.Atoi(l); err == nil && n > 0 {
|
|
||||||
limit = min(n, 200)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
query := strings.TrimSpace(q.Get("q"))
|
|
||||||
includeArchived := q.Get("include_archived") == "true"
|
|
||||||
|
|
||||||
var projectID *uuid.UUID
|
|
||||||
if pid := q.Get("project_id"); pid != "" {
|
|
||||||
if id, err := uuid.Parse(pid); err == nil {
|
|
||||||
projectID = &id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if query != "" {
|
|
||||||
results, err := h.db.SearchThoughtsText(r.Context(), query, limit, projectID, nil)
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "search thoughts", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, results)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
thoughts, err := h.db.ListThoughts(r.Context(), ext.ListFilter{
|
|
||||||
Limit: limit,
|
|
||||||
ProjectID: projectID,
|
|
||||||
IncludeArchived: includeArchived,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "list thoughts", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, thoughts)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *adminHandlers) getThought(w http.ResponseWriter, r *http.Request) {
|
|
||||||
id, ok := parseUUID(w, r.PathValue("id"))
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
thought, err := h.db.GetThought(r.Context(), id)
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "get thought", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, thought)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *adminHandlers) deleteThought(w http.ResponseWriter, r *http.Request) {
|
|
||||||
id, ok := parseUUID(w, r.PathValue("id"))
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := h.db.DeleteThought(r.Context(), id); err != nil {
|
|
||||||
h.internalError(w, "delete thought", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *adminHandlers) archiveThought(w http.ResponseWriter, r *http.Request) {
|
|
||||||
id, ok := parseUUID(w, r.PathValue("id"))
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := h.db.ArchiveThought(r.Context(), id); err != nil {
|
|
||||||
h.internalError(w, "archive thought", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Skills ---
|
|
||||||
|
|
||||||
func (h *adminHandlers) listSkills(w http.ResponseWriter, r *http.Request) {
|
|
||||||
tag := r.URL.Query().Get("tag")
|
|
||||||
skills, err := h.db.ListSkills(r.Context(), tag)
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "list skills", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, skills)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *adminHandlers) deleteSkill(w http.ResponseWriter, r *http.Request) {
|
|
||||||
id, ok := parseUUID(w, r.PathValue("id"))
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := h.db.RemoveSkill(r.Context(), id); err != nil {
|
|
||||||
h.internalError(w, "delete skill", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Guardrails ---
|
|
||||||
|
|
||||||
func (h *adminHandlers) listGuardrails(w http.ResponseWriter, r *http.Request) {
|
|
||||||
q := r.URL.Query()
|
|
||||||
guardrails, err := h.db.ListGuardrails(r.Context(), q.Get("tag"), q.Get("severity"))
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "list guardrails", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, guardrails)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (h *adminHandlers) deleteGuardrail(w http.ResponseWriter, r *http.Request) {
|
|
||||||
id, ok := parseUUID(w, r.PathValue("id"))
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if err := h.db.RemoveGuardrail(r.Context(), id); err != nil {
|
|
||||||
h.internalError(w, "delete guardrail", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Files ---
|
|
||||||
|
|
||||||
func (h *adminHandlers) listFiles(w http.ResponseWriter, r *http.Request) {
|
|
||||||
q := r.URL.Query()
|
|
||||||
limit := 100
|
|
||||||
if l := q.Get("limit"); l != "" {
|
|
||||||
if n, err := strconv.Atoi(l); err == nil && n > 0 {
|
|
||||||
limit = min(n, 500)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
filter := ext.StoredFileFilter{Limit: limit}
|
|
||||||
if pid := q.Get("project_id"); pid != "" {
|
|
||||||
if id, err := uuid.Parse(pid); err == nil {
|
|
||||||
filter.ProjectID = &id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if tid := q.Get("thought_id"); tid != "" {
|
|
||||||
if id, err := uuid.Parse(tid); err == nil {
|
|
||||||
filter.ThoughtID = &id
|
|
||||||
}
|
|
||||||
}
|
|
||||||
filter.Kind = q.Get("kind")
|
|
||||||
|
|
||||||
files, err := h.db.ListStoredFiles(r.Context(), filter)
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "list files", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, files)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Stats ---
|
|
||||||
|
|
||||||
func (h *adminHandlers) stats(w http.ResponseWriter, r *http.Request) {
|
|
||||||
stats, err := h.db.Stats(r.Context())
|
|
||||||
if err != nil {
|
|
||||||
h.internalError(w, "stats", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
writeJSON(w, stats)
|
|
||||||
}
|
|
||||||
|
|
||||||
// --- Helpers ---
|
|
||||||
|
|
||||||
func (h *adminHandlers) internalError(w http.ResponseWriter, op string, err error) {
|
|
||||||
h.logger.Error("admin handler error", slog.String("op", op), slog.String("error", err.Error()))
|
|
||||||
http.Error(w, "internal server error", http.StatusInternalServerError)
|
|
||||||
}
|
|
||||||
|
|
||||||
func writeJSON(w http.ResponseWriter, v any) {
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
_ = json.NewEncoder(w).Encode(v)
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseUUID(w http.ResponseWriter, s string) (uuid.UUID, bool) {
|
|
||||||
id, err := uuid.Parse(s)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "invalid id", http.StatusBadRequest)
|
|
||||||
return uuid.UUID{}, false
|
|
||||||
}
|
|
||||||
return id, true
|
|
||||||
}
|
|
||||||
+98
-111
@@ -34,7 +34,7 @@ func Run(ctx context.Context, configPath string) error {
|
|||||||
|
|
||||||
logger.Info("loaded configuration",
|
logger.Info("loaded configuration",
|
||||||
slog.String("path", loadedFrom),
|
slog.String("path", loadedFrom),
|
||||||
slog.Int("config_version", cfg.Version),
|
slog.String("provider", cfg.AI.Provider),
|
||||||
slog.String("version", info.Version),
|
slog.String("version", info.Version),
|
||||||
slog.String("tag_name", info.TagName),
|
slog.String("tag_name", info.TagName),
|
||||||
slog.String("build_date", info.BuildDate),
|
slog.String("build_date", info.BuildDate),
|
||||||
@@ -52,37 +52,11 @@ func Run(ctx context.Context, configPath string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
httpClient := &http.Client{Timeout: 30 * time.Second}
|
httpClient := &http.Client{Timeout: 30 * time.Second}
|
||||||
registry, err := ai.NewRegistry(cfg.AI.Providers, httpClient, logger)
|
provider, err := ai.NewProvider(cfg.AI, httpClient, logger)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
foregroundEmbeddings, err := ai.NewEmbeddingRunner(registry, cfg.AI.Embeddings.Chain(), cfg.AI.Embeddings.Dimensions, logger)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
foregroundMetadata, err := ai.NewMetadataRunner(registry, cfg.AI.Metadata.Chain(), cfg.AI.Metadata.Temperature, cfg.AI.Metadata.LogConversations, logger)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
backgroundEmbeddings := foregroundEmbeddings
|
|
||||||
backgroundMetadata := foregroundMetadata
|
|
||||||
if cfg.AI.Background != nil {
|
|
||||||
if cfg.AI.Background.Embeddings != nil {
|
|
||||||
backgroundEmbeddings, err = ai.NewEmbeddingRunner(registry, cfg.AI.Background.Embeddings.AsTargets(), cfg.AI.Embeddings.Dimensions, logger)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if cfg.AI.Background.Metadata != nil {
|
|
||||||
backgroundMetadata, err = ai.NewMetadataRunner(registry, cfg.AI.Background.Metadata.AsTargets(), cfg.AI.Metadata.Temperature, cfg.AI.Metadata.LogConversations, logger)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var keyring *auth.Keyring
|
var keyring *auth.Keyring
|
||||||
var oauthRegistry *auth.OAuthRegistry
|
var oauthRegistry *auth.OAuthRegistry
|
||||||
var tokenStore *auth.TokenStore
|
var tokenStore *auth.TokenStore
|
||||||
@@ -92,24 +66,23 @@ func Run(ctx context.Context, configPath string) error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tokenStore = auth.NewTokenStore(0)
|
|
||||||
if len(cfg.Auth.OAuth.Clients) > 0 {
|
if len(cfg.Auth.OAuth.Clients) > 0 {
|
||||||
oauthRegistry, err = auth.NewOAuthRegistry(cfg.Auth.OAuth.Clients)
|
oauthRegistry, err = auth.NewOAuthRegistry(cfg.Auth.OAuth.Clients)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
tokenStore = auth.NewTokenStore(0)
|
||||||
}
|
}
|
||||||
authCodes := auth.NewAuthCodeStore()
|
authCodes := auth.NewAuthCodeStore()
|
||||||
dynClients := auth.NewPostgresClientStore(db.Pool())
|
dynClients := auth.NewDynamicClientStore()
|
||||||
activeProjects := session.NewActiveProjects()
|
activeProjects := session.NewActiveProjects()
|
||||||
|
|
||||||
logger.Info("ai providers initialised",
|
logger.Info("database connection verified",
|
||||||
slog.String("embedding_primary", foregroundEmbeddings.PrimaryProvider()+"/"+foregroundEmbeddings.PrimaryModel()),
|
slog.String("provider", provider.Name()),
|
||||||
slog.String("metadata_primary", foregroundMetadata.PrimaryProvider()+"/"+foregroundMetadata.PrimaryModel()),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if cfg.Backfill.Enabled && cfg.Backfill.RunOnStartup {
|
if cfg.Backfill.Enabled && cfg.Backfill.RunOnStartup {
|
||||||
go runBackfillPass(ctx, db, backgroundEmbeddings, cfg.Backfill, logger)
|
go runBackfillPass(ctx, db, provider, cfg.Backfill, logger)
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.Backfill.Enabled && cfg.Backfill.Interval > 0 {
|
if cfg.Backfill.Enabled && cfg.Backfill.Interval > 0 {
|
||||||
@@ -121,14 +94,14 @@ func Run(ctx context.Context, configPath string) error {
|
|||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
return
|
return
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
runBackfillPass(ctx, db, backgroundEmbeddings, cfg.Backfill, logger)
|
runBackfillPass(ctx, db, provider, cfg.Backfill, logger)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.MetadataRetry.Enabled && cfg.MetadataRetry.RunOnStartup {
|
if cfg.MetadataRetry.Enabled && cfg.MetadataRetry.RunOnStartup {
|
||||||
go runMetadataRetryPass(ctx, db, backgroundMetadata, cfg, activeProjects, logger)
|
go runMetadataRetryPass(ctx, db, provider, cfg, activeProjects, logger)
|
||||||
}
|
}
|
||||||
|
|
||||||
if cfg.MetadataRetry.Enabled && cfg.MetadataRetry.Interval > 0 {
|
if cfg.MetadataRetry.Enabled && cfg.MetadataRetry.Interval > 0 {
|
||||||
@@ -140,13 +113,13 @@ func Run(ctx context.Context, configPath string) error {
|
|||||||
case <-ctx.Done():
|
case <-ctx.Done():
|
||||||
return
|
return
|
||||||
case <-ticker.C:
|
case <-ticker.C:
|
||||||
runMetadataRetryPass(ctx, db, backgroundMetadata, cfg, activeProjects, logger)
|
runMetadataRetryPass(ctx, db, provider, cfg, activeProjects, logger)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
|
|
||||||
handler, err := routes(logger, cfg, info, db, foregroundEmbeddings, foregroundMetadata, backgroundEmbeddings, backgroundMetadata, keyring, oauthRegistry, tokenStore, authCodes, dynClients, activeProjects)
|
handler, err := routes(logger, cfg, info, db, provider, keyring, oauthRegistry, tokenStore, authCodes, dynClients, activeProjects)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
@@ -183,73 +156,58 @@ func Run(ctx context.Context, configPath string) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func routes(logger *slog.Logger, cfg *config.Config, info buildinfo.Info, db *store.DB, embeddings *ai.EmbeddingRunner, metadata *ai.MetadataRunner, bgEmbeddings *ai.EmbeddingRunner, bgMetadata *ai.MetadataRunner, keyring *auth.Keyring, oauthRegistry *auth.OAuthRegistry, tokenStore *auth.TokenStore, authCodes *auth.AuthCodeStore, dynClients auth.ClientStore, activeProjects *session.ActiveProjects) (http.Handler, error) {
|
func routes(logger *slog.Logger, cfg *config.Config, info buildinfo.Info, db *store.DB, provider ai.Provider, keyring *auth.Keyring, oauthRegistry *auth.OAuthRegistry, tokenStore *auth.TokenStore, authCodes *auth.AuthCodeStore, dynClients *auth.DynamicClientStore, activeProjects *session.ActiveProjects) (http.Handler, error) {
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
accessTracker := auth.NewAccessTracker()
|
authMiddleware := auth.Middleware(cfg.Auth, keyring, oauthRegistry, tokenStore, logger)
|
||||||
oauthEnabled := oauthRegistry != nil
|
|
||||||
authMiddleware := auth.Middleware(cfg.Auth, keyring, oauthRegistry, tokenStore, accessTracker, logger)
|
|
||||||
filesTool := tools.NewFilesTool(db, activeProjects)
|
filesTool := tools.NewFilesTool(db, activeProjects)
|
||||||
enrichmentRetryer := tools.NewEnrichmentRetryer(context.Background(), db, bgMetadata, cfg.Capture, cfg.AI.Metadata.Timeout, activeProjects, logger)
|
metadataRetryer := tools.NewMetadataRetryer(context.Background(), db, provider, cfg.Capture, cfg.AI.Metadata.Timeout, activeProjects, logger)
|
||||||
backfillTool := tools.NewBackfillTool(db, bgEmbeddings, activeProjects, logger)
|
|
||||||
adminActions := newAdminActions(backfillTool, enrichmentRetryer, logger)
|
|
||||||
|
|
||||||
toolSet := mcpserver.ToolSet{
|
toolSet := mcpserver.ToolSet{
|
||||||
Capture: tools.NewCaptureTool(db, embeddings, cfg.Capture, activeProjects, enrichmentRetryer, backfillTool),
|
Capture: tools.NewCaptureTool(db, provider, cfg.Capture, cfg.AI.Metadata.Timeout, activeProjects, metadataRetryer, logger),
|
||||||
Search: tools.NewSearchTool(db, embeddings, cfg.Search, activeProjects),
|
Search: tools.NewSearchTool(db, provider, cfg.Search, activeProjects),
|
||||||
List: tools.NewListTool(db, cfg.Search, activeProjects),
|
List: tools.NewListTool(db, cfg.Search, activeProjects),
|
||||||
Stats: tools.NewStatsTool(db),
|
Stats: tools.NewStatsTool(db),
|
||||||
Get: tools.NewGetTool(db),
|
Get: tools.NewGetTool(db),
|
||||||
Update: tools.NewUpdateTool(db, embeddings, metadata, cfg.Capture, logger),
|
Update: tools.NewUpdateTool(db, provider, cfg.Capture, logger),
|
||||||
Delete: tools.NewDeleteTool(db),
|
Delete: tools.NewDeleteTool(db),
|
||||||
Archive: tools.NewArchiveTool(db),
|
Archive: tools.NewArchiveTool(db),
|
||||||
Projects: tools.NewProjectsTool(db, activeProjects),
|
Projects: tools.NewProjectsTool(db, activeProjects),
|
||||||
Version: tools.NewVersionTool(cfg.MCP.ServerName, info),
|
Version: tools.NewVersionTool(cfg.MCP.ServerName, info),
|
||||||
Learnings: tools.NewLearningsTool(db, activeProjects, cfg.Search),
|
Context: tools.NewContextTool(db, provider, cfg.Search, activeProjects),
|
||||||
Plans: tools.NewPlansTool(db, activeProjects, cfg.Search),
|
Recall: tools.NewRecallTool(db, provider, cfg.Search, activeProjects),
|
||||||
Context: tools.NewContextTool(db, embeddings, cfg.Search, activeProjects),
|
Summarize: tools.NewSummarizeTool(db, provider, cfg.Search, activeProjects),
|
||||||
Recall: tools.NewRecallTool(db, embeddings, cfg.Search, activeProjects),
|
Links: tools.NewLinksTool(db, provider, cfg.Search),
|
||||||
Summarize: tools.NewSummarizeTool(db, embeddings, metadata, cfg.Search, activeProjects),
|
|
||||||
Links: tools.NewLinksTool(db, embeddings, cfg.Search),
|
|
||||||
Files: filesTool,
|
Files: filesTool,
|
||||||
Backfill: backfillTool,
|
Backfill: tools.NewBackfillTool(db, provider, activeProjects, logger),
|
||||||
Reparse: tools.NewReparseMetadataTool(db, bgMetadata, cfg.Capture, activeProjects, logger),
|
Reparse: tools.NewReparseMetadataTool(db, provider, cfg.Capture, activeProjects, logger),
|
||||||
RetryMetadata: tools.NewRetryEnrichmentTool(enrichmentRetryer),
|
RetryMetadata: tools.NewRetryMetadataTool(metadataRetryer),
|
||||||
//Maintenance: tools.NewMaintenanceTool(db),
|
Household: tools.NewHouseholdTool(db),
|
||||||
Skills: tools.NewSkillsTool(db, activeProjects),
|
Maintenance: tools.NewMaintenanceTool(db),
|
||||||
Personas: tools.NewAgentPersonasTool(db),
|
Calendar: tools.NewCalendarTool(db),
|
||||||
ChatHistory: tools.NewChatHistoryTool(db, activeProjects),
|
Meals: tools.NewMealsTool(db),
|
||||||
Describe: tools.NewDescribeTool(db, mcpserver.BuildToolCatalog()),
|
CRM: tools.NewCRMTool(db),
|
||||||
|
Skills: tools.NewSkillsTool(db, activeProjects),
|
||||||
|
ChatHistory: tools.NewChatHistoryTool(db, activeProjects),
|
||||||
}
|
}
|
||||||
|
|
||||||
mcpHandlers, err := mcpserver.NewHandlers(cfg.MCP, logger, toolSet, activeProjects.Clear)
|
mcpHandler, err := mcpserver.New(cfg.MCP, logger, toolSet, activeProjects.Clear)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("build mcp handler: %w", err)
|
return nil, fmt.Errorf("build mcp handler: %w", err)
|
||||||
}
|
}
|
||||||
mux.Handle(cfg.MCP.Path, authMiddleware(mcpHandlers.StreamableHTTP))
|
mux.Handle(cfg.MCP.Path, authMiddleware(mcpHandler))
|
||||||
if mcpHandlers.SSE != nil {
|
|
||||||
mux.Handle(cfg.MCP.SSEPath, authMiddleware(mcpHandlers.SSE))
|
|
||||||
logger.Info("SSE transport enabled", slog.String("sse_path", cfg.MCP.SSEPath))
|
|
||||||
}
|
|
||||||
if err := registerResolveSpecAdminRoutes(mux, db, authMiddleware, logger); err != nil {
|
|
||||||
return nil, fmt.Errorf("setup resolvespec admin routes: %w", err)
|
|
||||||
}
|
|
||||||
mux.Handle("/files", authMiddleware(fileHandler(filesTool)))
|
mux.Handle("/files", authMiddleware(fileHandler(filesTool)))
|
||||||
mux.Handle("/files/{id}", authMiddleware(fileHandler(filesTool)))
|
mux.Handle("/files/{id}", authMiddleware(fileHandler(filesTool)))
|
||||||
mux.HandleFunc("/.well-known/oauth-authorization-server", oauthMetadataHandler())
|
if oauthRegistry != nil && tokenStore != nil {
|
||||||
mux.HandleFunc("/api/oauth/register", oauthRegisterHandler(dynClients, logger))
|
mux.HandleFunc("/.well-known/oauth-authorization-server", oauthMetadataHandler())
|
||||||
mux.HandleFunc("/api/oauth/authorize", oauthAuthorizeHandler(dynClients, authCodes, logger))
|
mux.HandleFunc("/oauth-authorization-server", oauthMetadataHandler())
|
||||||
mux.HandleFunc("/api/oauth/token", oauthTokenHandler(oauthRegistry, tokenStore, authCodes, logger))
|
mux.HandleFunc("/oauth/register", oauthRegisterHandler(dynClients, logger))
|
||||||
mux.Handle("/api/admin/actions/backfill", authMiddleware(adminActions.backfillHandler()))
|
mux.HandleFunc("/authorize", oauthAuthorizeHandler(dynClients, authCodes, logger))
|
||||||
mux.Handle("/api/admin/actions/retry-metadata", authMiddleware(adminActions.retryMetadataHandler()))
|
mux.HandleFunc("/oauth/authorize", oauthAuthorizeHandler(dynClients, authCodes, logger))
|
||||||
|
mux.HandleFunc("/oauth/token", oauthTokenHandler(oauthRegistry, tokenStore, authCodes, logger))
|
||||||
|
}
|
||||||
mux.HandleFunc("/favicon.ico", serveFavicon)
|
mux.HandleFunc("/favicon.ico", serveFavicon)
|
||||||
mux.HandleFunc("/images/project.jpg", serveHomeImage)
|
mux.HandleFunc("/images/project.jpg", serveHomeImage)
|
||||||
mux.HandleFunc("/images/icon.png", serveIcon)
|
|
||||||
mux.HandleFunc("/llm", serveLLMInstructions)
|
mux.HandleFunc("/llm", serveLLMInstructions)
|
||||||
mux.HandleFunc("/llms.txt", serveLLMSTXT)
|
|
||||||
mux.HandleFunc("/.well-known/llms.txt", serveLLMSTXT)
|
|
||||||
mux.HandleFunc("/robots.txt", serveRobotsTXT)
|
|
||||||
mux.Handle("/api/status", authMiddleware(statusAPIHandler(info, accessTracker, oauthEnabled)))
|
|
||||||
mux.HandleFunc("/status", publicStatusHandler(accessTracker))
|
|
||||||
|
|
||||||
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
|
mux.HandleFunc("/healthz", func(w http.ResponseWriter, r *http.Request) {
|
||||||
w.WriteHeader(http.StatusOK)
|
w.WriteHeader(http.StatusOK)
|
||||||
@@ -267,7 +225,59 @@ func routes(logger *slog.Logger, cfg *config.Config, info buildinfo.Info, db *st
|
|||||||
_, _ = w.Write([]byte("ready"))
|
_, _ = w.Write([]byte("ready"))
|
||||||
})
|
})
|
||||||
|
|
||||||
mux.HandleFunc("/", homeHandler(info, accessTracker, oauthEnabled))
|
mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
|
||||||
|
if r.URL.Path != "/" {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
||||||
|
w.Header().Set("Allow", "GET, HEAD")
|
||||||
|
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
const homePage = `<!doctype html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||||
|
<title>AMCS</title>
|
||||||
|
<style>
|
||||||
|
body { margin: 0; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; background: #f5f7fb; color: #172033; }
|
||||||
|
main { max-width: 860px; margin: 48px auto; background: #fff; border-radius: 12px; box-shadow: 0 10px 28px rgba(23, 32, 51, 0.12); overflow: hidden; }
|
||||||
|
.content { padding: 28px; }
|
||||||
|
h1 { margin: 0 0 12px 0; font-size: 2rem; }
|
||||||
|
p { margin: 0; line-height: 1.5; color: #334155; }
|
||||||
|
.actions { margin-top: 18px; }
|
||||||
|
.link { display: inline-block; padding: 10px 14px; border-radius: 8px; background: #172033; color: #fff; text-decoration: none; font-weight: 600; }
|
||||||
|
.link:hover { background: #0f172a; }
|
||||||
|
img { display: block; width: 100%; height: auto; }
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<main>
|
||||||
|
<img src="/images/project.jpg" alt="Avelon Memory Crystal project image">
|
||||||
|
<div class="content">
|
||||||
|
<h1>Avelon Memory Crystal Server (AMCS)</h1>
|
||||||
|
<p>AMCS is a memory server that captures, links, and retrieves structured project thoughts for AI assistants using semantic search, summaries, and MCP tools.</p>
|
||||||
|
<div class="actions">
|
||||||
|
<a class="link" href="/llm">LLM Instructions</a>
|
||||||
|
<a class="link" href="/oauth-authorization-server">OAuth Authorization Server</a>
|
||||||
|
<a class="link" href="/healthz">Health Check</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
</body>
|
||||||
|
</html>`
|
||||||
|
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
if r.Method == http.MethodHead {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
_, _ = w.Write([]byte(homePage))
|
||||||
|
})
|
||||||
|
|
||||||
return observability.Chain(
|
return observability.Chain(
|
||||||
mux,
|
mux,
|
||||||
@@ -278,8 +288,8 @@ func routes(logger *slog.Logger, cfg *config.Config, info buildinfo.Info, db *st
|
|||||||
), nil
|
), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func runMetadataRetryPass(ctx context.Context, db *store.DB, metadataRunner *ai.MetadataRunner, cfg *config.Config, activeProjects *session.ActiveProjects, logger *slog.Logger) {
|
func runMetadataRetryPass(ctx context.Context, db *store.DB, provider ai.Provider, cfg *config.Config, activeProjects *session.ActiveProjects, logger *slog.Logger) {
|
||||||
retryer := tools.NewMetadataRetryer(ctx, db, metadataRunner, cfg.Capture, cfg.AI.Metadata.Timeout, activeProjects, logger)
|
retryer := tools.NewMetadataRetryer(ctx, db, provider, cfg.Capture, cfg.AI.Metadata.Timeout, activeProjects, logger)
|
||||||
_, out, err := retryer.Handle(ctx, nil, tools.RetryMetadataInput{
|
_, out, err := retryer.Handle(ctx, nil, tools.RetryMetadataInput{
|
||||||
Limit: cfg.MetadataRetry.MaxPerRun,
|
Limit: cfg.MetadataRetry.MaxPerRun,
|
||||||
IncludeArchived: cfg.MetadataRetry.IncludeArchived,
|
IncludeArchived: cfg.MetadataRetry.IncludeArchived,
|
||||||
@@ -297,8 +307,8 @@ func runMetadataRetryPass(ctx context.Context, db *store.DB, metadataRunner *ai.
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
func runBackfillPass(ctx context.Context, db *store.DB, embeddings *ai.EmbeddingRunner, cfg config.BackfillConfig, logger *slog.Logger) {
|
func runBackfillPass(ctx context.Context, db *store.DB, provider ai.Provider, cfg config.BackfillConfig, logger *slog.Logger) {
|
||||||
backfiller := tools.NewBackfillTool(db, embeddings, nil, logger)
|
backfiller := tools.NewBackfillTool(db, provider, nil, logger)
|
||||||
_, out, err := backfiller.Handle(ctx, nil, tools.BackfillInput{
|
_, out, err := backfiller.Handle(ctx, nil, tools.BackfillInput{
|
||||||
Limit: cfg.MaxPerRun,
|
Limit: cfg.MaxPerRun,
|
||||||
IncludeArchived: cfg.IncludeArchived,
|
IncludeArchived: cfg.IncludeArchived,
|
||||||
@@ -332,26 +342,3 @@ func serveHomeImage(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
_, _ = w.Write(homeImage)
|
_, _ = w.Write(homeImage)
|
||||||
}
|
}
|
||||||
|
|
||||||
func serveIcon(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if iconImage == nil {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
|
||||||
w.Header().Set("Allow", "GET, HEAD")
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "image/png")
|
|
||||||
w.Header().Set("Cache-Control", "public, max-age=31536000, immutable")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
|
|
||||||
if r.Method == http.MethodHead {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
_, _ = w.Write(iconImage)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
package app
|
package app
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
|
||||||
|
|
||||||
amcsllm "git.warky.dev/wdevs/amcs/llm"
|
amcsllm "git.warky.dev/wdevs/amcs/llm"
|
||||||
)
|
)
|
||||||
@@ -22,74 +20,3 @@ func serveLLMInstructions(w http.ResponseWriter, r *http.Request) {
|
|||||||
}
|
}
|
||||||
_, _ = w.Write(amcsllm.MemoryInstructions)
|
_, _ = w.Write(amcsllm.MemoryInstructions)
|
||||||
}
|
}
|
||||||
|
|
||||||
func serveRobotsTXT(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/robots.txt" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
|
||||||
w.Header().Set("Allow", "GET, HEAD")
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
|
||||||
w.Header().Set("Cache-Control", "public, max-age=300")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
if r.Method == http.MethodHead {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
body := fmt.Sprintf("User-agent: *\nAllow: /\n\n# LLM-friendly docs\nLLM: %s/llm\nLLMS: %s/llms.txt\n", requestBaseURL(r), requestBaseURL(r))
|
|
||||||
_, _ = w.Write([]byte(body))
|
|
||||||
}
|
|
||||||
|
|
||||||
func serveLLMSTXT(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/llms.txt" && r.URL.Path != "/.well-known/llms.txt" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
|
||||||
w.Header().Set("Allow", "GET, HEAD")
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "text/plain; charset=utf-8")
|
|
||||||
w.Header().Set("Cache-Control", "public, max-age=300")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
if r.Method == http.MethodHead {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
base := requestBaseURL(r)
|
|
||||||
body := fmt.Sprintf(
|
|
||||||
"# AMCS\n\n> A memory server for AI assistants (MCP tools, semantic retrieval, and structured project memory).\n\n## Endpoints\n- %s/llm\n- %s/status\n- %s/mcp\n- %s/.well-known/oauth-authorization-server\n",
|
|
||||||
base,
|
|
||||||
base,
|
|
||||||
base,
|
|
||||||
base,
|
|
||||||
)
|
|
||||||
_, _ = w.Write([]byte(body))
|
|
||||||
}
|
|
||||||
|
|
||||||
func requestBaseURL(r *http.Request) string {
|
|
||||||
scheme := "http"
|
|
||||||
if r != nil && r.TLS != nil {
|
|
||||||
scheme = "https"
|
|
||||||
}
|
|
||||||
if r != nil {
|
|
||||||
if proto := strings.TrimSpace(r.Header.Get("X-Forwarded-Proto")); proto != "" {
|
|
||||||
scheme = proto
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
host := "localhost"
|
|
||||||
if r != nil {
|
|
||||||
if v := strings.TrimSpace(r.Host); v != "" {
|
|
||||||
host = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return scheme + "://" + host
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ package app
|
|||||||
import (
|
import (
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"strings"
|
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
amcsllm "git.warky.dev/wdevs/amcs/llm"
|
amcsllm "git.warky.dev/wdevs/amcs/llm"
|
||||||
@@ -30,70 +29,3 @@ func TestServeLLMInstructions(t *testing.T) {
|
|||||||
t.Fatalf("body = %q, want embedded instructions", body)
|
t.Fatalf("body = %q, want embedded instructions", body)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestServeRobotsTXT(t *testing.T) {
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/robots.txt", nil)
|
|
||||||
req.Host = "amcs.example.com"
|
|
||||||
req.Header.Set("X-Forwarded-Proto", "https")
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
serveRobotsTXT(rec, req)
|
|
||||||
|
|
||||||
res := rec.Result()
|
|
||||||
defer func() {
|
|
||||||
_ = res.Body.Close()
|
|
||||||
}()
|
|
||||||
|
|
||||||
if res.StatusCode != http.StatusOK {
|
|
||||||
t.Fatalf("status = %d, want %d", res.StatusCode, http.StatusOK)
|
|
||||||
}
|
|
||||||
if got := res.Header.Get("Content-Type"); got != "text/plain; charset=utf-8" {
|
|
||||||
t.Fatalf("content-type = %q, want %q", got, "text/plain; charset=utf-8")
|
|
||||||
}
|
|
||||||
body := rec.Body.String()
|
|
||||||
if !strings.Contains(body, "LLM: https://amcs.example.com/llm") {
|
|
||||||
t.Fatalf("body = %q, want LLM link", body)
|
|
||||||
}
|
|
||||||
if !strings.Contains(body, "LLMS: https://amcs.example.com/llms.txt") {
|
|
||||||
t.Fatalf("body = %q, want LLMS link", body)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestServeLLMSTXT(t *testing.T) {
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/llms.txt", nil)
|
|
||||||
req.Host = "amcs.example.com"
|
|
||||||
req.Header.Set("X-Forwarded-Proto", "https")
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
serveLLMSTXT(rec, req)
|
|
||||||
|
|
||||||
res := rec.Result()
|
|
||||||
defer func() {
|
|
||||||
_ = res.Body.Close()
|
|
||||||
}()
|
|
||||||
|
|
||||||
if res.StatusCode != http.StatusOK {
|
|
||||||
t.Fatalf("status = %d, want %d", res.StatusCode, http.StatusOK)
|
|
||||||
}
|
|
||||||
if got := res.Header.Get("Content-Type"); got != "text/plain; charset=utf-8" {
|
|
||||||
t.Fatalf("content-type = %q, want %q", got, "text/plain; charset=utf-8")
|
|
||||||
}
|
|
||||||
body := rec.Body.String()
|
|
||||||
if !strings.Contains(body, "https://amcs.example.com/llm") {
|
|
||||||
t.Fatalf("body = %q, want /llm link", body)
|
|
||||||
}
|
|
||||||
if !strings.Contains(body, "https://amcs.example.com/.well-known/oauth-authorization-server") {
|
|
||||||
t.Fatalf("body = %q, want oauth discovery link", body)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestServeLLMSTXTWellKnownPath(t *testing.T) {
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/.well-known/llms.txt", nil)
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
serveLLMSTXT(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusOK)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
+10
-15
@@ -14,7 +14,6 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/auth"
|
"git.warky.dev/wdevs/amcs/internal/auth"
|
||||||
"git.warky.dev/wdevs/amcs/internal/requestip"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// --- JSON types ---
|
// --- JSON types ---
|
||||||
@@ -67,9 +66,9 @@ func oauthMetadataHandler() http.HandlerFunc {
|
|||||||
base := serverBaseURL(r)
|
base := serverBaseURL(r)
|
||||||
meta := oauthServerMetadata{
|
meta := oauthServerMetadata{
|
||||||
Issuer: base,
|
Issuer: base,
|
||||||
AuthorizationEndpoint: base + "/api/oauth/authorize",
|
AuthorizationEndpoint: base + "/authorize",
|
||||||
TokenEndpoint: base + "/api/oauth/token",
|
TokenEndpoint: base + "/oauth/token",
|
||||||
RegistrationEndpoint: base + "/api/oauth/register",
|
RegistrationEndpoint: base + "/oauth/register",
|
||||||
ScopesSupported: []string{"mcp"},
|
ScopesSupported: []string{"mcp"},
|
||||||
ResponseTypesSupported: []string{"code"},
|
ResponseTypesSupported: []string{"code"},
|
||||||
GrantTypesSupported: []string{"authorization_code", "client_credentials"},
|
GrantTypesSupported: []string{"authorization_code", "client_credentials"},
|
||||||
@@ -83,7 +82,7 @@ func oauthMetadataHandler() http.HandlerFunc {
|
|||||||
|
|
||||||
// oauthRegisterHandler serves POST /oauth/register per RFC 7591
|
// oauthRegisterHandler serves POST /oauth/register per RFC 7591
|
||||||
// (OAuth 2.0 Dynamic Client Registration).
|
// (OAuth 2.0 Dynamic Client Registration).
|
||||||
func oauthRegisterHandler(dynClients auth.ClientStore, log *slog.Logger) http.HandlerFunc {
|
func oauthRegisterHandler(dynClients *auth.DynamicClientStore, log *slog.Logger) http.HandlerFunc {
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
if r.Method != http.MethodPost {
|
if r.Method != http.MethodPost {
|
||||||
w.Header().Set("Allow", http.MethodPost)
|
w.Header().Set("Allow", http.MethodPost)
|
||||||
@@ -130,7 +129,7 @@ func oauthRegisterHandler(dynClients auth.ClientStore, log *slog.Logger) http.Ha
|
|||||||
|
|
||||||
// oauthAuthorizeHandler serves GET and POST /oauth/authorize.
|
// oauthAuthorizeHandler serves GET and POST /oauth/authorize.
|
||||||
// GET shows an approval page; POST processes the user's approve/deny action.
|
// GET shows an approval page; POST processes the user's approve/deny action.
|
||||||
func oauthAuthorizeHandler(dynClients auth.ClientStore, authCodes *auth.AuthCodeStore, log *slog.Logger) http.HandlerFunc {
|
func oauthAuthorizeHandler(dynClients *auth.DynamicClientStore, authCodes *auth.AuthCodeStore, log *slog.Logger) http.HandlerFunc {
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
return func(w http.ResponseWriter, r *http.Request) {
|
||||||
switch r.Method {
|
switch r.Method {
|
||||||
case http.MethodGet:
|
case http.MethodGet:
|
||||||
@@ -144,7 +143,7 @@ func oauthAuthorizeHandler(dynClients auth.ClientStore, authCodes *auth.AuthCode
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleAuthorizeGET(w http.ResponseWriter, r *http.Request, dynClients auth.ClientStore) {
|
func handleAuthorizeGET(w http.ResponseWriter, r *http.Request, dynClients *auth.DynamicClientStore) {
|
||||||
q := r.URL.Query()
|
q := r.URL.Query()
|
||||||
clientID := q.Get("client_id")
|
clientID := q.Get("client_id")
|
||||||
redirectURI := q.Get("redirect_uri")
|
redirectURI := q.Get("redirect_uri")
|
||||||
@@ -178,7 +177,7 @@ func handleAuthorizeGET(w http.ResponseWriter, r *http.Request, dynClients auth.
|
|||||||
serveAuthorizePage(w, client.ClientName, clientID, redirectURI, state, codeChallenge, codeChallengeMethod, scope)
|
serveAuthorizePage(w, client.ClientName, clientID, redirectURI, state, codeChallenge, codeChallengeMethod, scope)
|
||||||
}
|
}
|
||||||
|
|
||||||
func handleAuthorizePOST(w http.ResponseWriter, r *http.Request, dynClients auth.ClientStore, authCodes *auth.AuthCodeStore, log *slog.Logger) {
|
func handleAuthorizePOST(w http.ResponseWriter, r *http.Request, dynClients *auth.DynamicClientStore, authCodes *auth.AuthCodeStore, log *slog.Logger) {
|
||||||
if err := r.ParseForm(); err != nil {
|
if err := r.ParseForm(); err != nil {
|
||||||
http.Error(w, "invalid form", http.StatusBadRequest)
|
http.Error(w, "invalid form", http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
@@ -244,10 +243,6 @@ func oauthTokenHandler(oauthRegistry *auth.OAuthRegistry, tokenStore *auth.Token
|
|||||||
|
|
||||||
switch r.FormValue("grant_type") {
|
switch r.FormValue("grant_type") {
|
||||||
case "client_credentials":
|
case "client_credentials":
|
||||||
if oauthRegistry == nil {
|
|
||||||
writeTokenError(w, "unsupported_grant_type", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
handleClientCredentials(w, r, oauthRegistry, tokenStore, log)
|
handleClientCredentials(w, r, oauthRegistry, tokenStore, log)
|
||||||
case "authorization_code":
|
case "authorization_code":
|
||||||
handleAuthorizationCode(w, r, authCodes, tokenStore, log)
|
handleAuthorizationCode(w, r, authCodes, tokenStore, log)
|
||||||
@@ -266,7 +261,7 @@ func handleClientCredentials(w http.ResponseWriter, r *http.Request, oauthRegist
|
|||||||
}
|
}
|
||||||
keyID, ok := oauthRegistry.Lookup(clientID, clientSecret)
|
keyID, ok := oauthRegistry.Lookup(clientID, clientSecret)
|
||||||
if !ok {
|
if !ok {
|
||||||
log.Warn("oauth token: invalid client credentials", slog.String("remote_addr", requestip.FromRequest(r)))
|
log.Warn("oauth token: invalid client credentials", slog.String("remote_addr", r.RemoteAddr))
|
||||||
w.Header().Set("WWW-Authenticate", `Basic realm="oauth"`)
|
w.Header().Set("WWW-Authenticate", `Basic realm="oauth"`)
|
||||||
writeTokenError(w, "invalid_client", http.StatusUnauthorized)
|
writeTokenError(w, "invalid_client", http.StatusUnauthorized)
|
||||||
return
|
return
|
||||||
@@ -295,7 +290,7 @@ func handleAuthorizationCode(w http.ResponseWriter, r *http.Request, authCodes *
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if !verifyPKCE(codeVerifier, entry.CodeChallenge, entry.CodeChallengeMethod) {
|
if !verifyPKCE(codeVerifier, entry.CodeChallenge, entry.CodeChallengeMethod) {
|
||||||
log.Warn("oauth token: PKCE verification failed", slog.String("remote_addr", requestip.FromRequest(r)))
|
log.Warn("oauth token: PKCE verification failed", slog.String("remote_addr", r.RemoteAddr))
|
||||||
writeTokenError(w, "invalid_grant", http.StatusBadRequest)
|
writeTokenError(w, "invalid_grant", http.StatusBadRequest)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -338,7 +333,7 @@ button{padding:.5rem 1.2rem;margin-right:.5rem;cursor:pointer;font-size:1rem}
|
|||||||
<body>
|
<body>
|
||||||
<h2>Authorize Access</h2>
|
<h2>Authorize Access</h2>
|
||||||
<p><strong>%s</strong> is requesting access to this AMCS server.</p>
|
<p><strong>%s</strong> is requesting access to this AMCS server.</p>
|
||||||
<form method=POST action=/api/oauth/authorize>
|
<form method=POST action=/oauth/authorize>
|
||||||
<input type=hidden name=client_id value="%s">
|
<input type=hidden name=client_id value="%s">
|
||||||
<input type=hidden name=redirect_uri value="%s">
|
<input type=hidden name=redirect_uri value="%s">
|
||||||
<input type=hidden name=state value="%s">
|
<input type=hidden name=state value="%s">
|
||||||
|
|||||||
@@ -1,149 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
|
||||||
"strings"
|
|
||||||
|
|
||||||
"github.com/bitechdev/ResolveSpec/pkg/resolvespec"
|
|
||||||
"github.com/uptrace/bunrouter"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/store"
|
|
||||||
)
|
|
||||||
|
|
||||||
func registerResolveSpecAdminRoutes(mux *http.ServeMux, db *store.DB, middleware func(http.Handler) http.Handler, logger *slog.Logger) error {
|
|
||||||
rs := resolvespec.NewHandlerWithBun(db.Bun())
|
|
||||||
registerResolveSpecGuards(rs)
|
|
||||||
for _, model := range resolveSpecModels() {
|
|
||||||
if err := rs.RegisterModel(model.schema, model.entity, model.model); err != nil {
|
|
||||||
return fmt.Errorf("register resolvespec model %s.%s: %w", model.schema, model.entity, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rsRouter := bunrouter.New()
|
|
||||||
resolvespec.SetupBunRouterRoutes(rsRouter, rs, nil)
|
|
||||||
|
|
||||||
rsMount := http.StripPrefix("/api/rs", rsRouter)
|
|
||||||
protectedRSMount := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/" && strings.HasSuffix(r.URL.Path, "/") {
|
|
||||||
trimmed := strings.TrimRight(r.URL.Path, "/")
|
|
||||||
if trimmed == "" {
|
|
||||||
trimmed = "/"
|
|
||||||
}
|
|
||||||
clone := r.Clone(r.Context())
|
|
||||||
clone.URL.Path = trimmed
|
|
||||||
if clone.URL.RawPath != "" {
|
|
||||||
clone.URL.RawPath = strings.TrimRight(clone.URL.RawPath, "/")
|
|
||||||
if clone.URL.RawPath == "" {
|
|
||||||
clone.URL.RawPath = "/"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
r = clone
|
|
||||||
}
|
|
||||||
if r.Method == http.MethodOptions {
|
|
||||||
rsMount.ServeHTTP(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
middleware(rsMount).ServeHTTP(w, r)
|
|
||||||
})
|
|
||||||
|
|
||||||
mux.Handle("/api/rs/", protectedRSMount)
|
|
||||||
mux.Handle("/api/rs", http.RedirectHandler("/api/rs/openapi", http.StatusTemporaryRedirect))
|
|
||||||
|
|
||||||
if logger != nil {
|
|
||||||
logger.Info("resolvespec admin api enabled",
|
|
||||||
slog.String("prefix", "/api/rs"),
|
|
||||||
slog.Int("models", len(resolveSpecModels())),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func registerResolveSpecGuards(rs *resolvespec.Handler) {
|
|
||||||
mutableByEntity := map[string]map[string]struct{}{
|
|
||||||
"projects": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"thoughts": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"plans": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"learnings": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"agent_personas": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"agent_parts": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"agent_traits": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"agent_skills": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"agent_guardrails": {
|
|
||||||
"create": {},
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
"stored_files": {
|
|
||||||
"update": {},
|
|
||||||
"delete": {},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
rs.Hooks().Register(resolvespec.BeforeHandle, func(hookCtx *resolvespec.HookContext) error {
|
|
||||||
switch hookCtx.Operation {
|
|
||||||
case "read", "meta":
|
|
||||||
return nil
|
|
||||||
case "create", "update", "delete":
|
|
||||||
allowedOps, ok := mutableByEntity[hookCtx.Entity]
|
|
||||||
if !ok {
|
|
||||||
hookCtx.Abort = true
|
|
||||||
hookCtx.AbortCode = http.StatusForbidden
|
|
||||||
hookCtx.AbortMessage = fmt.Sprintf("operation %q is not allowed for %s.%s", hookCtx.Operation, hookCtx.Schema, hookCtx.Entity)
|
|
||||||
return fmt.Errorf("forbidden operation")
|
|
||||||
}
|
|
||||||
if _, ok := allowedOps[hookCtx.Operation]; !ok {
|
|
||||||
hookCtx.Abort = true
|
|
||||||
hookCtx.AbortCode = http.StatusForbidden
|
|
||||||
hookCtx.AbortMessage = fmt.Sprintf("operation %q is not allowed for %s.%s", hookCtx.Operation, hookCtx.Schema, hookCtx.Entity)
|
|
||||||
return fmt.Errorf("forbidden operation")
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
default:
|
|
||||||
hookCtx.Abort = true
|
|
||||||
hookCtx.AbortCode = http.StatusBadRequest
|
|
||||||
hookCtx.AbortMessage = fmt.Sprintf("unsupported operation %q", hookCtx.Operation)
|
|
||||||
return fmt.Errorf("unsupported operation")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
type resolveSpecModel struct {
|
|
||||||
schema string
|
|
||||||
entity string
|
|
||||||
model any
|
|
||||||
}
|
|
||||||
@@ -1,206 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"io"
|
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/auth"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
|
||||||
|
|
||||||
"github.com/bitechdev/ResolveSpec/pkg/resolvespec"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestResolveSpecAuthRequiresValidCredentials(t *testing.T) {
|
|
||||||
keyring, err := auth.NewKeyring([]config.APIKey{{ID: "operator", Value: "secret"}})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewKeyring() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
|
|
||||||
protected := auth.Middleware(config.AuthConfig{}, keyring, nil, nil, nil, logger)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/api/rs/public/projects" {
|
|
||||||
t.Fatalf("path = %q, want /api/rs/public/projects", r.URL.Path)
|
|
||||||
}
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}))
|
|
||||||
|
|
||||||
t.Run("missing credentials are rejected", func(t *testing.T) {
|
|
||||||
req := httptest.NewRequest(http.MethodPost, "/api/rs/public/projects", strings.NewReader(`{"operation":"read"}`))
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
protected.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusUnauthorized {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusUnauthorized)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("valid API key is accepted", func(t *testing.T) {
|
|
||||||
req := httptest.NewRequest(http.MethodPost, "/api/rs/public/projects", strings.NewReader(`{"operation":"read"}`))
|
|
||||||
req.Header.Set("x-brain-key", "secret")
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
protected.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusNoContent {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusNoContent)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestResolveSpecGuardAllowsSupportedMutations(t *testing.T) {
|
|
||||||
rs := resolvespec.NewHandler(nil, nil)
|
|
||||||
registerResolveSpecGuards(rs)
|
|
||||||
|
|
||||||
cases := []struct {
|
|
||||||
name string
|
|
||||||
entity string
|
|
||||||
operation string
|
|
||||||
}{
|
|
||||||
{name: "learnings read", entity: "learnings", operation: "read"},
|
|
||||||
{name: "projects create", entity: "projects", operation: "create"},
|
|
||||||
{name: "projects update", entity: "projects", operation: "update"},
|
|
||||||
{name: "projects delete", entity: "projects", operation: "delete"},
|
|
||||||
{name: "plans create", entity: "plans", operation: "create"},
|
|
||||||
{name: "plans update", entity: "plans", operation: "update"},
|
|
||||||
{name: "plans delete", entity: "plans", operation: "delete"},
|
|
||||||
{name: "learnings create", entity: "learnings", operation: "create"},
|
|
||||||
{name: "learnings update", entity: "learnings", operation: "update"},
|
|
||||||
{name: "learnings delete", entity: "learnings", operation: "delete"},
|
|
||||||
{name: "thoughts create", entity: "thoughts", operation: "create"},
|
|
||||||
{name: "thoughts update", entity: "thoughts", operation: "update"},
|
|
||||||
{name: "thoughts delete", entity: "thoughts", operation: "delete"},
|
|
||||||
{name: "agent_skills create", entity: "agent_skills", operation: "create"},
|
|
||||||
{name: "agent_skills update", entity: "agent_skills", operation: "update"},
|
|
||||||
{name: "agent_skills delete", entity: "agent_skills", operation: "delete"},
|
|
||||||
{name: "agent_guardrails create", entity: "agent_guardrails", operation: "create"},
|
|
||||||
{name: "agent_guardrails update", entity: "agent_guardrails", operation: "update"},
|
|
||||||
{name: "agent_guardrails delete", entity: "agent_guardrails", operation: "delete"},
|
|
||||||
{name: "agent_personas create", entity: "agent_personas", operation: "create"},
|
|
||||||
{name: "agent_personas update", entity: "agent_personas", operation: "update"},
|
|
||||||
{name: "agent_personas delete", entity: "agent_personas", operation: "delete"},
|
|
||||||
{name: "agent_parts create", entity: "agent_parts", operation: "create"},
|
|
||||||
{name: "agent_parts update", entity: "agent_parts", operation: "update"},
|
|
||||||
{name: "agent_parts delete", entity: "agent_parts", operation: "delete"},
|
|
||||||
{name: "agent_traits create", entity: "agent_traits", operation: "create"},
|
|
||||||
{name: "agent_traits update", entity: "agent_traits", operation: "update"},
|
|
||||||
{name: "agent_traits delete", entity: "agent_traits", operation: "delete"},
|
|
||||||
{name: "stored_files update", entity: "stored_files", operation: "update"},
|
|
||||||
{name: "stored_files delete", entity: "stored_files", operation: "delete"},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range cases {
|
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
|
||||||
hookCtx := &resolvespec.HookContext{
|
|
||||||
Schema: "public",
|
|
||||||
Entity: tc.entity,
|
|
||||||
Operation: tc.operation,
|
|
||||||
}
|
|
||||||
|
|
||||||
err := rs.Hooks().Execute(resolvespec.BeforeHandle, hookCtx)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Execute() error = %v, want nil", err)
|
|
||||||
}
|
|
||||||
if hookCtx.Abort {
|
|
||||||
t.Fatalf("Abort = true, want false (code=%d message=%q)", hookCtx.AbortCode, hookCtx.AbortMessage)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestResolveSpecGuardBlocksUnsupportedMutations(t *testing.T) {
|
|
||||||
rs := resolvespec.NewHandler(nil, nil)
|
|
||||||
registerResolveSpecGuards(rs)
|
|
||||||
|
|
||||||
cases := []struct {
|
|
||||||
name string
|
|
||||||
entity string
|
|
||||||
operation string
|
|
||||||
wantCode int
|
|
||||||
wantMessageIn string
|
|
||||||
}{
|
|
||||||
{
|
|
||||||
name: "mutations blocked for non-allowlisted operation",
|
|
||||||
entity: "stored_files",
|
|
||||||
operation: "create",
|
|
||||||
wantCode: http.StatusForbidden,
|
|
||||||
wantMessageIn: `operation "create" is not allowed for public.stored_files`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "mutations blocked for non-allowlisted entity",
|
|
||||||
entity: "maintenance_logs",
|
|
||||||
operation: "delete",
|
|
||||||
wantCode: http.StatusForbidden,
|
|
||||||
wantMessageIn: `operation "delete" is not allowed for public.maintenance_logs`,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "unknown operation is rejected",
|
|
||||||
entity: "projects",
|
|
||||||
operation: "scan",
|
|
||||||
wantCode: http.StatusBadRequest,
|
|
||||||
wantMessageIn: `unsupported operation "scan"`,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, tc := range cases {
|
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
|
||||||
hookCtx := &resolvespec.HookContext{
|
|
||||||
Schema: "public",
|
|
||||||
Entity: tc.entity,
|
|
||||||
Operation: tc.operation,
|
|
||||||
}
|
|
||||||
|
|
||||||
err := rs.Hooks().Execute(resolvespec.BeforeHandle, hookCtx)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatal("Execute() error = nil, want non-nil")
|
|
||||||
}
|
|
||||||
if !hookCtx.Abort {
|
|
||||||
t.Fatal("Abort = false, want true")
|
|
||||||
}
|
|
||||||
if hookCtx.AbortCode != tc.wantCode {
|
|
||||||
t.Fatalf("AbortCode = %d, want %d", hookCtx.AbortCode, tc.wantCode)
|
|
||||||
}
|
|
||||||
if !strings.Contains(hookCtx.AbortMessage, tc.wantMessageIn) {
|
|
||||||
t.Fatalf("AbortMessage = %q, want substring %q", hookCtx.AbortMessage, tc.wantMessageIn)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestResolveSpecModelsIncludeLearnings(t *testing.T) {
|
|
||||||
models := resolveSpecModels()
|
|
||||||
for _, model := range models {
|
|
||||||
if model.schema == "public" && model.entity == "learnings" {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
t.Fatal("resolveSpecModels() missing public.learnings")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestResolveSpecModelsIncludePersonaEntities(t *testing.T) {
|
|
||||||
models := resolveSpecModels()
|
|
||||||
required := map[string]bool{
|
|
||||||
"agent_personas": false,
|
|
||||||
"agent_parts": false,
|
|
||||||
"agent_traits": false,
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, model := range models {
|
|
||||||
if model.schema != "public" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if _, ok := required[model.entity]; ok {
|
|
||||||
required[model.entity] = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for entity, found := range required {
|
|
||||||
if !found {
|
|
||||||
t.Fatalf("resolveSpecModels() missing public.%s", entity)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
// Code generated by relspec templ. DO NOT EDIT.
|
|
||||||
package app
|
|
||||||
|
|
||||||
import "git.warky.dev/wdevs/amcs/internal/generatedmodels"
|
|
||||||
|
|
||||||
func resolveSpecModels() []resolveSpecModel {
|
|
||||||
return []resolveSpecModel{
|
|
||||||
{schema: "public", entity: "agent_guardrails", model: generatedmodels.ModelPublicAgentGuardrails{}},
|
|
||||||
{schema: "public", entity: "agent_parts", model: generatedmodels.ModelPublicAgentParts{}},
|
|
||||||
{schema: "public", entity: "agent_persona_guardrails", model: generatedmodels.ModelPublicAgentPersonaGuardrails{}},
|
|
||||||
{schema: "public", entity: "agent_persona_parts", model: generatedmodels.ModelPublicAgentPersonaParts{}},
|
|
||||||
{schema: "public", entity: "agent_persona_skills", model: generatedmodels.ModelPublicAgentPersonaSkills{}},
|
|
||||||
{schema: "public", entity: "agent_persona_traits", model: generatedmodels.ModelPublicAgentPersonaTraits{}},
|
|
||||||
{schema: "public", entity: "agent_personas", model: generatedmodels.ModelPublicAgentPersonas{}},
|
|
||||||
{schema: "public", entity: "agent_skills", model: generatedmodels.ModelPublicAgentSkills{}},
|
|
||||||
{schema: "public", entity: "agent_traits", model: generatedmodels.ModelPublicAgentTraits{}},
|
|
||||||
{schema: "public", entity: "arc_stage_parts", model: generatedmodels.ModelPublicArcStageParts{}},
|
|
||||||
{schema: "public", entity: "arc_stages", model: generatedmodels.ModelPublicArcStages{}},
|
|
||||||
{schema: "public", entity: "character_arcs", model: generatedmodels.ModelPublicCharacterArcs{}},
|
|
||||||
{schema: "public", entity: "chat_histories", model: generatedmodels.ModelPublicChatHistories{}},
|
|
||||||
{schema: "public", entity: "embeddings", model: generatedmodels.ModelPublicEmbeddings{}},
|
|
||||||
{schema: "public", entity: "learnings", model: generatedmodels.ModelPublicLearnings{}},
|
|
||||||
{schema: "public", entity: "oauth_clients", model: generatedmodels.ModelPublicOauthClients{}},
|
|
||||||
{schema: "public", entity: "persona_arc", model: generatedmodels.ModelPublicPersonaArc{}},
|
|
||||||
{schema: "public", entity: "plan_dependencies", model: generatedmodels.ModelPublicPlanDependencies{}},
|
|
||||||
{schema: "public", entity: "plan_guardrails", model: generatedmodels.ModelPublicPlanGuardrails{}},
|
|
||||||
{schema: "public", entity: "plan_related_plans", model: generatedmodels.ModelPublicPlanRelatedPlans{}},
|
|
||||||
{schema: "public", entity: "plan_skills", model: generatedmodels.ModelPublicPlanSkills{}},
|
|
||||||
{schema: "public", entity: "plans", model: generatedmodels.ModelPublicPlans{}},
|
|
||||||
{schema: "public", entity: "project_guardrails", model: generatedmodels.ModelPublicProjectGuardrails{}},
|
|
||||||
{schema: "public", entity: "project_skills", model: generatedmodels.ModelPublicProjectSkills{}},
|
|
||||||
{schema: "public", entity: "projects", model: generatedmodels.ModelPublicProjects{}},
|
|
||||||
{schema: "public", entity: "stored_files", model: generatedmodels.ModelPublicStoredFiles{}},
|
|
||||||
{schema: "public", entity: "thought_links", model: generatedmodels.ModelPublicThoughtLinks{}},
|
|
||||||
{schema: "public", entity: "thoughts", model: generatedmodels.ModelPublicThoughts{}},
|
|
||||||
{schema: "public", entity: "tool_annotations", model: generatedmodels.ModelPublicToolAnnotations{}},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 285 KiB |
@@ -12,7 +12,6 @@ var (
|
|||||||
|
|
||||||
faviconICO = mustReadStaticFile("favicon.ico")
|
faviconICO = mustReadStaticFile("favicon.ico")
|
||||||
homeImage = mustReadStaticFile("avelonmemorycrystal.jpg")
|
homeImage = mustReadStaticFile("avelonmemorycrystal.jpg")
|
||||||
iconImage = tryReadStaticFile("icon.png")
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func mustReadStaticFile(name string) []byte {
|
func mustReadStaticFile(name string) []byte {
|
||||||
@@ -23,11 +22,3 @@ func mustReadStaticFile(name string) []byte {
|
|||||||
|
|
||||||
return data
|
return data
|
||||||
}
|
}
|
||||||
|
|
||||||
func tryReadStaticFile(name string) []byte {
|
|
||||||
data, err := fs.ReadFile(staticFiles, "static/"+name)
|
|
||||||
if err != nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
return data
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,194 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"io/fs"
|
|
||||||
"net/http"
|
|
||||||
"path"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/auth"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/buildinfo"
|
|
||||||
)
|
|
||||||
|
|
||||||
const connectedWindow = 10 * time.Minute
|
|
||||||
|
|
||||||
type statusAPIResponse struct {
|
|
||||||
Title string `json:"title"`
|
|
||||||
Description string `json:"description"`
|
|
||||||
Version string `json:"version"`
|
|
||||||
BuildDate string `json:"build_date"`
|
|
||||||
Commit string `json:"commit"`
|
|
||||||
ConnectedCount int `json:"connected_count"`
|
|
||||||
TotalKnown int `json:"total_known"`
|
|
||||||
ConnectedWindow string `json:"connected_window"`
|
|
||||||
Entries []auth.AccessSnapshot `json:"entries"`
|
|
||||||
Metrics auth.AccessMetrics `json:"metrics"`
|
|
||||||
OAuthEnabled bool `json:"oauth_enabled"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type publicClientStatus struct {
|
|
||||||
KeyID string `json:"key_id"`
|
|
||||||
RequestCount int `json:"request_count"`
|
|
||||||
LastAccessedAt time.Time `json:"last_accessed_at"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type publicStatusResponse struct {
|
|
||||||
ConnectedCount int `json:"connected_count"`
|
|
||||||
ConnectedWindow string `json:"connected_window"`
|
|
||||||
Entries []publicClientStatus `json:"entries"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func statusSnapshot(info buildinfo.Info, tracker *auth.AccessTracker, oauthEnabled bool, now time.Time) statusAPIResponse {
|
|
||||||
entries := tracker.Snapshot()
|
|
||||||
metrics := tracker.Metrics(20)
|
|
||||||
return statusAPIResponse{
|
|
||||||
Title: "Avelon Memory Crystal Server (AMCS)",
|
|
||||||
Description: "AMCS is a memory server that captures, links, and retrieves structured project thoughts for AI assistants using semantic search, summaries, and MCP tools.",
|
|
||||||
Version: fallback(info.Version, "dev"),
|
|
||||||
BuildDate: fallback(info.BuildDate, "unknown"),
|
|
||||||
Commit: fallback(info.Commit, "unknown"),
|
|
||||||
ConnectedCount: tracker.ConnectedCount(now, connectedWindow),
|
|
||||||
TotalKnown: len(entries),
|
|
||||||
ConnectedWindow: "last 10 minutes",
|
|
||||||
Entries: nil,
|
|
||||||
Metrics: metrics,
|
|
||||||
OAuthEnabled: oauthEnabled,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func fallback(value, defaultValue string) string {
|
|
||||||
if strings.TrimSpace(value) == "" {
|
|
||||||
return defaultValue
|
|
||||||
}
|
|
||||||
return value
|
|
||||||
}
|
|
||||||
|
|
||||||
func statusAPIHandler(info buildinfo.Info, tracker *auth.AccessTracker, oauthEnabled bool) http.HandlerFunc {
|
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/api/status" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
|
||||||
w.Header().Set("Allow", "GET, HEAD")
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
if r.Method == http.MethodHead {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
_ = json.NewEncoder(w).Encode(statusSnapshot(info, tracker, oauthEnabled, time.Now()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func publicStatusHandler(tracker *auth.AccessTracker) http.HandlerFunc {
|
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.URL.Path != "/status" {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
|
||||||
w.Header().Set("Allow", "GET, HEAD")
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
now := time.Now()
|
|
||||||
cutoff := now.UTC().Add(-connectedWindow)
|
|
||||||
snapshot := tracker.Snapshot()
|
|
||||||
entries := make([]publicClientStatus, 0, len(snapshot))
|
|
||||||
for _, item := range snapshot {
|
|
||||||
if item.LastAccessedAt.Before(cutoff) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
entries = append(entries, publicClientStatus{
|
|
||||||
KeyID: item.KeyID,
|
|
||||||
RequestCount: item.RequestCount,
|
|
||||||
LastAccessedAt: item.LastAccessedAt,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json; charset=utf-8")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
if r.Method == http.MethodHead {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
_ = json.NewEncoder(w).Encode(publicStatusResponse{
|
|
||||||
ConnectedCount: len(entries),
|
|
||||||
ConnectedWindow: "last 10 minutes",
|
|
||||||
Entries: entries,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func homeHandler(_ buildinfo.Info, _ *auth.AccessTracker, _ bool) http.HandlerFunc {
|
|
||||||
return func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if r.Method != http.MethodGet && r.Method != http.MethodHead {
|
|
||||||
w.Header().Set("Allow", "GET, HEAD")
|
|
||||||
http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
requestPath := strings.TrimPrefix(path.Clean(r.URL.Path), "/")
|
|
||||||
if requestPath == "." {
|
|
||||||
requestPath = ""
|
|
||||||
}
|
|
||||||
|
|
||||||
if requestPath != "" {
|
|
||||||
if serveUIAsset(w, r, requestPath) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
serveUIIndex(w, r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func serveUIAsset(w http.ResponseWriter, r *http.Request, name string) bool {
|
|
||||||
if uiDistFS == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if strings.Contains(name, "..") {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
file, err := uiDistFS.Open(name)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
|
|
||||||
info, err := file.Stat()
|
|
||||||
if err != nil || info.IsDir() {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := fs.ReadFile(uiDistFS, name)
|
|
||||||
if err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
http.ServeContent(w, r, info.Name(), info.ModTime(), bytes.NewReader(data))
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
func serveUIIndex(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if indexHTML == nil {
|
|
||||||
http.Error(w, "ui assets not built", http.StatusServiceUnavailable)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "text/html; charset=utf-8")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
if r.Method == http.MethodHead {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
_, _ = w.Write(indexHTML)
|
|
||||||
}
|
|
||||||
@@ -1,197 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"io"
|
|
||||||
"log/slog"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"strings"
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/auth"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/buildinfo"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestStatusSnapshotHidesOAuthLinkWhenDisabled(t *testing.T) {
|
|
||||||
tracker := auth.NewAccessTracker()
|
|
||||||
snapshot := statusSnapshot(buildinfo.Info{Version: "v1.2.3", BuildDate: "2026-04-04", Commit: "abc123"}, tracker, false, time.Date(2026, 4, 4, 12, 0, 0, 0, time.UTC))
|
|
||||||
|
|
||||||
if snapshot.OAuthEnabled {
|
|
||||||
t.Fatal("OAuthEnabled = true, want false")
|
|
||||||
}
|
|
||||||
if snapshot.ConnectedCount != 0 {
|
|
||||||
t.Fatalf("ConnectedCount = %d, want 0", snapshot.ConnectedCount)
|
|
||||||
}
|
|
||||||
if snapshot.Title == "" {
|
|
||||||
t.Fatal("Title = empty, want non-empty")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStatusSnapshotShowsTrackedAccess(t *testing.T) {
|
|
||||||
tracker := auth.NewAccessTracker()
|
|
||||||
now := time.Date(2026, 4, 4, 12, 0, 0, 0, time.UTC)
|
|
||||||
tracker.Record("client-a", "/files", "127.0.0.1:1234", "tester", "list_projects", now)
|
|
||||||
|
|
||||||
snapshot := statusSnapshot(buildinfo.Info{Version: "v1.2.3"}, tracker, true, now)
|
|
||||||
|
|
||||||
if !snapshot.OAuthEnabled {
|
|
||||||
t.Fatal("OAuthEnabled = false, want true")
|
|
||||||
}
|
|
||||||
if snapshot.ConnectedCount != 1 {
|
|
||||||
t.Fatalf("ConnectedCount = %d, want 1", snapshot.ConnectedCount)
|
|
||||||
}
|
|
||||||
if len(snapshot.Entries) != 0 {
|
|
||||||
t.Fatalf("len(Entries) = %d, want 0 for counts-only status", len(snapshot.Entries))
|
|
||||||
}
|
|
||||||
if snapshot.Metrics.TotalRequests != 1 {
|
|
||||||
t.Fatalf("Metrics.TotalRequests = %d, want 1", snapshot.Metrics.TotalRequests)
|
|
||||||
}
|
|
||||||
if snapshot.Metrics.UniqueIPs != 1 {
|
|
||||||
t.Fatalf("Metrics.UniqueIPs = %d, want 1", snapshot.Metrics.UniqueIPs)
|
|
||||||
}
|
|
||||||
if snapshot.Metrics.UniqueAgents != 1 {
|
|
||||||
t.Fatalf("Metrics.UniqueAgents = %d, want 1", snapshot.Metrics.UniqueAgents)
|
|
||||||
}
|
|
||||||
if snapshot.Metrics.UniqueTools != 1 {
|
|
||||||
t.Fatalf("Metrics.UniqueTools = %d, want 1", snapshot.Metrics.UniqueTools)
|
|
||||||
}
|
|
||||||
if len(snapshot.Metrics.TopIPs) != 1 || len(snapshot.Metrics.TopAgents) != 1 || len(snapshot.Metrics.TopTools) != 1 {
|
|
||||||
t.Fatalf("Top breakdowns not populated: %+v", snapshot.Metrics)
|
|
||||||
}
|
|
||||||
if len(snapshot.Metrics.RecentLog) != 1 {
|
|
||||||
t.Fatalf("RecentLog len = %d, want 1", len(snapshot.Metrics.RecentLog))
|
|
||||||
}
|
|
||||||
if snapshot.Metrics.RecentLog[0].Tool != "list_projects" {
|
|
||||||
t.Fatalf("RecentLog[0].Tool = %q, want %q", snapshot.Metrics.RecentLog[0].Tool, "list_projects")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStatusAPIHandlerReturnsJSON(t *testing.T) {
|
|
||||||
handler := statusAPIHandler(buildinfo.Info{Version: "v1"}, auth.NewAccessTracker(), true)
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/api/status", nil)
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusOK)
|
|
||||||
}
|
|
||||||
if got := rec.Header().Get("Content-Type"); !strings.Contains(got, "application/json") {
|
|
||||||
t.Fatalf("content-type = %q, want application/json", got)
|
|
||||||
}
|
|
||||||
|
|
||||||
var payload statusAPIResponse
|
|
||||||
if err := json.Unmarshal(rec.Body.Bytes(), &payload); err != nil {
|
|
||||||
t.Fatalf("json.Unmarshal() error = %v", err)
|
|
||||||
}
|
|
||||||
if payload.Version != "v1" {
|
|
||||||
t.Fatalf("version = %q, want %q", payload.Version, "v1")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestStatusAPIHandlerRejectsStatusPath(t *testing.T) {
|
|
||||||
handler := statusAPIHandler(buildinfo.Info{Version: "v1"}, auth.NewAccessTracker(), true)
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/status", nil)
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusNotFound {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusNotFound)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestPublicStatusHandlerReturnsConnectedClientsOnly(t *testing.T) {
|
|
||||||
tracker := auth.NewAccessTracker()
|
|
||||||
now := time.Now().UTC()
|
|
||||||
tracker.Record("recent-client", "/mcp", "127.0.0.1:1234", "tester", "list_projects", now.Add(-2*time.Minute))
|
|
||||||
tracker.Record("stale-client", "/mcp", "127.0.0.1:9999", "tester", "list_projects", now.Add(-30*time.Minute))
|
|
||||||
|
|
||||||
handler := publicStatusHandler(tracker)
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/status", nil)
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusOK)
|
|
||||||
}
|
|
||||||
|
|
||||||
var payload publicStatusResponse
|
|
||||||
if err := json.Unmarshal(rec.Body.Bytes(), &payload); err != nil {
|
|
||||||
t.Fatalf("json.Unmarshal() error = %v", err)
|
|
||||||
}
|
|
||||||
if payload.ConnectedCount != 1 {
|
|
||||||
t.Fatalf("ConnectedCount = %d, want 1", payload.ConnectedCount)
|
|
||||||
}
|
|
||||||
if len(payload.Entries) != 1 {
|
|
||||||
t.Fatalf("len(Entries) = %d, want 1", len(payload.Entries))
|
|
||||||
}
|
|
||||||
if payload.Entries[0].KeyID != "recent-client" {
|
|
||||||
t.Fatalf("Entries[0].KeyID = %q, want %q", payload.Entries[0].KeyID, "recent-client")
|
|
||||||
}
|
|
||||||
if payload.Entries[0].LastAccessedAt.Before(now.Add(-11 * time.Minute)) {
|
|
||||||
t.Fatalf("Entries[0].LastAccessedAt = %v, expected recent timestamp", payload.Entries[0].LastAccessedAt)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHomeHandlerAllowsHead(t *testing.T) {
|
|
||||||
handler := homeHandler(buildinfo.Info{Version: "v1"}, auth.NewAccessTracker(), false)
|
|
||||||
req := httptest.NewRequest(http.MethodHead, "/", nil)
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusOK)
|
|
||||||
}
|
|
||||||
if body := rec.Body.String(); body != "" {
|
|
||||||
t.Fatalf("body = %q, want empty for HEAD", body)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHomeHandlerServesIndex(t *testing.T) {
|
|
||||||
handler := homeHandler(buildinfo.Info{Version: "v1"}, auth.NewAccessTracker(), false)
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/", nil)
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusOK {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusOK)
|
|
||||||
}
|
|
||||||
if !strings.Contains(rec.Body.String(), "<div id=\"app\"></div>") {
|
|
||||||
t.Fatalf("body = %q, want embedded UI index", rec.Body.String())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMiddlewareRecordsAuthenticatedAccess(t *testing.T) {
|
|
||||||
keyring, err := auth.NewKeyring([]config.APIKey{{ID: "client-a", Value: "secret"}})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewKeyring() error = %v", err)
|
|
||||||
}
|
|
||||||
tracker := auth.NewAccessTracker()
|
|
||||||
logger := slog.New(slog.NewTextHandler(io.Discard, nil))
|
|
||||||
handler := auth.Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, tracker, logger)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}))
|
|
||||||
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/files", nil)
|
|
||||||
req.Header.Set("x-brain-key", "secret")
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusNoContent {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusNoContent)
|
|
||||||
}
|
|
||||||
snap := tracker.Snapshot()
|
|
||||||
if len(snap) != 1 {
|
|
||||||
t.Fatalf("len(snapshot) = %d, want 1", len(snap))
|
|
||||||
}
|
|
||||||
if snap[0].KeyID != "client-a" || snap[0].LastPath != "/files" {
|
|
||||||
t.Fatalf("snapshot[0] = %+v, want keyID client-a and path /files", snap[0])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Vendored
-2
@@ -1,2 +0,0 @@
|
|||||||
This placeholder keeps internal/app/ui/dist present in clean source checkouts.
|
|
||||||
The real UI bundle is generated by the frontend build into this directory.
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
package app
|
|
||||||
|
|
||||||
import (
|
|
||||||
"embed"
|
|
||||||
"io/fs"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
//go:embed ui/dist
|
|
||||||
uiFiles embed.FS
|
|
||||||
uiDistFS fs.FS
|
|
||||||
indexHTML []byte
|
|
||||||
)
|
|
||||||
|
|
||||||
func init() {
|
|
||||||
dist, err := fs.Sub(uiFiles, "ui/dist")
|
|
||||||
if err != nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
uiDistFS = dist
|
|
||||||
indexHTML, _ = fs.ReadFile(uiDistFS, "index.html")
|
|
||||||
}
|
|
||||||
@@ -1,204 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net"
|
|
||||||
"sort"
|
|
||||||
"strings"
|
|
||||||
"sync"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
type AccessSnapshot struct {
|
|
||||||
KeyID string `json:"key_id"`
|
|
||||||
LastPath string `json:"last_path"`
|
|
||||||
RemoteAddr string `json:"remote_addr"`
|
|
||||||
UserAgent string `json:"user_agent"`
|
|
||||||
RequestCount int `json:"request_count"`
|
|
||||||
LastAccessedAt time.Time `json:"last_accessed_at"`
|
|
||||||
}
|
|
||||||
|
|
||||||
const maxRecentLog = 100
|
|
||||||
|
|
||||||
type AccessLogEntry struct {
|
|
||||||
Timestamp time.Time `json:"timestamp"`
|
|
||||||
KeyID string `json:"key_id"`
|
|
||||||
IP string `json:"ip"`
|
|
||||||
UserAgent string `json:"user_agent"`
|
|
||||||
Tool string `json:"tool"`
|
|
||||||
Path string `json:"path"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type AccessTracker struct {
|
|
||||||
mu sync.RWMutex
|
|
||||||
entries map[string]AccessSnapshot
|
|
||||||
ipCounts map[string]int
|
|
||||||
agentCounts map[string]int
|
|
||||||
toolCounts map[string]int
|
|
||||||
recentLog []AccessLogEntry
|
|
||||||
totalRequests int
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewAccessTracker() *AccessTracker {
|
|
||||||
return &AccessTracker{
|
|
||||||
entries: make(map[string]AccessSnapshot),
|
|
||||||
ipCounts: make(map[string]int),
|
|
||||||
agentCounts: make(map[string]int),
|
|
||||||
toolCounts: make(map[string]int),
|
|
||||||
recentLog: make([]AccessLogEntry, 0, maxRecentLog),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *AccessTracker) Record(keyID, path, remoteAddr, userAgent, toolName string, now time.Time) {
|
|
||||||
if t == nil || keyID == "" {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
t.mu.Lock()
|
|
||||||
defer t.mu.Unlock()
|
|
||||||
|
|
||||||
normalizedRemoteAddr := normalizeRemoteAddr(remoteAddr)
|
|
||||||
|
|
||||||
entry := t.entries[keyID]
|
|
||||||
entry.KeyID = keyID
|
|
||||||
entry.LastPath = path
|
|
||||||
entry.RemoteAddr = normalizedRemoteAddr
|
|
||||||
entry.UserAgent = userAgent
|
|
||||||
entry.LastAccessedAt = now.UTC()
|
|
||||||
entry.RequestCount++
|
|
||||||
t.entries[keyID] = entry
|
|
||||||
t.totalRequests++
|
|
||||||
|
|
||||||
if normalizedRemoteAddr != "" {
|
|
||||||
t.ipCounts[normalizedRemoteAddr]++
|
|
||||||
}
|
|
||||||
if userAgent != "" {
|
|
||||||
t.agentCounts[userAgent]++
|
|
||||||
}
|
|
||||||
if tool := strings.TrimSpace(toolName); tool != "" {
|
|
||||||
t.toolCounts[tool]++
|
|
||||||
}
|
|
||||||
|
|
||||||
logEntry := AccessLogEntry{
|
|
||||||
Timestamp: now.UTC(),
|
|
||||||
KeyID: keyID,
|
|
||||||
IP: normalizedRemoteAddr,
|
|
||||||
UserAgent: userAgent,
|
|
||||||
Tool: strings.TrimSpace(toolName),
|
|
||||||
Path: path,
|
|
||||||
}
|
|
||||||
t.recentLog = append([]AccessLogEntry{logEntry}, t.recentLog...)
|
|
||||||
if len(t.recentLog) > maxRecentLog {
|
|
||||||
t.recentLog = t.recentLog[:maxRecentLog]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func normalizeRemoteAddr(value string) string {
|
|
||||||
trimmed := strings.TrimSpace(value)
|
|
||||||
if trimmed == "" {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
host, _, err := net.SplitHostPort(trimmed)
|
|
||||||
if err == nil {
|
|
||||||
return host
|
|
||||||
}
|
|
||||||
return trimmed
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *AccessTracker) Snapshot() []AccessSnapshot {
|
|
||||||
if t == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
t.mu.RLock()
|
|
||||||
defer t.mu.RUnlock()
|
|
||||||
|
|
||||||
items := make([]AccessSnapshot, 0, len(t.entries))
|
|
||||||
for _, entry := range t.entries {
|
|
||||||
items = append(items, entry)
|
|
||||||
}
|
|
||||||
|
|
||||||
sort.Slice(items, func(i, j int) bool {
|
|
||||||
return items[i].LastAccessedAt.After(items[j].LastAccessedAt)
|
|
||||||
})
|
|
||||||
|
|
||||||
return items
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *AccessTracker) ConnectedCount(now time.Time, window time.Duration) int {
|
|
||||||
if t == nil {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
cutoff := now.UTC().Add(-window)
|
|
||||||
t.mu.RLock()
|
|
||||||
defer t.mu.RUnlock()
|
|
||||||
|
|
||||||
count := 0
|
|
||||||
for _, entry := range t.entries {
|
|
||||||
if !entry.LastAccessedAt.Before(cutoff) {
|
|
||||||
count++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return count
|
|
||||||
}
|
|
||||||
|
|
||||||
type RequestAggregate struct {
|
|
||||||
Key string `json:"key"`
|
|
||||||
RequestCount int `json:"request_count"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type AccessMetrics struct {
|
|
||||||
TotalRequests int `json:"total_requests"`
|
|
||||||
UniquePrincipals int `json:"unique_principals"`
|
|
||||||
UniqueIPs int `json:"unique_ips"`
|
|
||||||
UniqueAgents int `json:"unique_agents"`
|
|
||||||
UniqueTools int `json:"unique_tools"`
|
|
||||||
TopIPs []RequestAggregate `json:"top_ips"`
|
|
||||||
TopAgents []RequestAggregate `json:"top_agents"`
|
|
||||||
TopTools []RequestAggregate `json:"top_tools"`
|
|
||||||
RecentLog []AccessLogEntry `json:"recent_log"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func (t *AccessTracker) Metrics(topN int) AccessMetrics {
|
|
||||||
if t == nil {
|
|
||||||
return AccessMetrics{}
|
|
||||||
}
|
|
||||||
if topN <= 0 {
|
|
||||||
topN = 10
|
|
||||||
}
|
|
||||||
|
|
||||||
t.mu.RLock()
|
|
||||||
defer t.mu.RUnlock()
|
|
||||||
|
|
||||||
log := make([]AccessLogEntry, len(t.recentLog))
|
|
||||||
copy(log, t.recentLog)
|
|
||||||
|
|
||||||
return AccessMetrics{
|
|
||||||
TotalRequests: t.totalRequests,
|
|
||||||
UniquePrincipals: len(t.entries),
|
|
||||||
UniqueIPs: len(t.ipCounts),
|
|
||||||
UniqueAgents: len(t.agentCounts),
|
|
||||||
UniqueTools: len(t.toolCounts),
|
|
||||||
TopIPs: topAggregates(t.ipCounts, topN),
|
|
||||||
TopAgents: topAggregates(t.agentCounts, topN),
|
|
||||||
TopTools: topAggregates(t.toolCounts, topN),
|
|
||||||
RecentLog: log,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func topAggregates(items map[string]int, topN int) []RequestAggregate {
|
|
||||||
out := make([]RequestAggregate, 0, len(items))
|
|
||||||
for key, count := range items {
|
|
||||||
out = append(out, RequestAggregate{Key: key, RequestCount: count})
|
|
||||||
}
|
|
||||||
sort.Slice(out, func(i, j int) bool {
|
|
||||||
if out[i].RequestCount == out[j].RequestCount {
|
|
||||||
return out[i].Key < out[j].Key
|
|
||||||
}
|
|
||||||
return out[i].RequestCount > out[j].RequestCount
|
|
||||||
})
|
|
||||||
if len(out) > topN {
|
|
||||||
out = out[:topN]
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
@@ -1,96 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestAccessTrackerRecordAndSnapshot(t *testing.T) {
|
|
||||||
tracker := NewAccessTracker()
|
|
||||||
older := time.Date(2026, 4, 4, 10, 0, 0, 0, time.UTC)
|
|
||||||
newer := older.Add(2 * time.Minute)
|
|
||||||
|
|
||||||
tracker.Record("client-a", "/files", "10.0.0.1:1234", "agent-a", "", older)
|
|
||||||
tracker.Record("client-b", "/mcp", "10.0.0.2:1234", "agent-b", "list_projects", newer)
|
|
||||||
tracker.Record("client-a", "/files/1", "10.0.0.1:1234", "agent-a2", "", newer.Add(30*time.Second))
|
|
||||||
|
|
||||||
snap := tracker.Snapshot()
|
|
||||||
if len(snap) != 2 {
|
|
||||||
t.Fatalf("len(snapshot) = %d, want 2", len(snap))
|
|
||||||
}
|
|
||||||
if snap[0].KeyID != "client-a" {
|
|
||||||
t.Fatalf("snapshot[0].KeyID = %q, want client-a", snap[0].KeyID)
|
|
||||||
}
|
|
||||||
if snap[0].RequestCount != 2 {
|
|
||||||
t.Fatalf("snapshot[0].RequestCount = %d, want 2", snap[0].RequestCount)
|
|
||||||
}
|
|
||||||
if snap[0].LastPath != "/files/1" {
|
|
||||||
t.Fatalf("snapshot[0].LastPath = %q, want /files/1", snap[0].LastPath)
|
|
||||||
}
|
|
||||||
if snap[0].UserAgent != "agent-a2" {
|
|
||||||
t.Fatalf("snapshot[0].UserAgent = %q, want agent-a2", snap[0].UserAgent)
|
|
||||||
}
|
|
||||||
if snap[0].RemoteAddr != "10.0.0.1" {
|
|
||||||
t.Fatalf("snapshot[0].RemoteAddr = %q, want 10.0.0.1", snap[0].RemoteAddr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAccessTrackerConnectedCount(t *testing.T) {
|
|
||||||
tracker := NewAccessTracker()
|
|
||||||
now := time.Date(2026, 4, 4, 12, 0, 0, 0, time.UTC)
|
|
||||||
|
|
||||||
tracker.Record("recent", "/mcp", "", "", "", now.Add(-2*time.Minute))
|
|
||||||
tracker.Record("stale", "/mcp", "", "", "", now.Add(-11*time.Minute))
|
|
||||||
|
|
||||||
if got := tracker.ConnectedCount(now, 10*time.Minute); got != 1 {
|
|
||||||
t.Fatalf("ConnectedCount() = %d, want 1", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestAccessTrackerMetrics(t *testing.T) {
|
|
||||||
tracker := NewAccessTracker()
|
|
||||||
now := time.Date(2026, 4, 4, 12, 0, 0, 0, time.UTC)
|
|
||||||
|
|
||||||
tracker.Record("client-a", "/mcp", "10.0.0.1:1234", "agent-a", "list_projects", now)
|
|
||||||
tracker.Record("client-a", "/mcp", "10.0.0.1:1234", "agent-a", "list_projects", now.Add(1*time.Second))
|
|
||||||
tracker.Record("client-b", "/files", "10.0.0.2:5678", "agent-b", "", now.Add(2*time.Second))
|
|
||||||
tracker.Record("client-c", "/files", "10.0.0.2:5678", "agent-b", "search_thoughts", now.Add(3*time.Second))
|
|
||||||
|
|
||||||
metrics := tracker.Metrics(5)
|
|
||||||
if metrics.TotalRequests != 4 {
|
|
||||||
t.Fatalf("TotalRequests = %d, want 4", metrics.TotalRequests)
|
|
||||||
}
|
|
||||||
if metrics.UniquePrincipals != 3 {
|
|
||||||
t.Fatalf("UniquePrincipals = %d, want 3", metrics.UniquePrincipals)
|
|
||||||
}
|
|
||||||
if metrics.UniqueIPs != 2 {
|
|
||||||
t.Fatalf("UniqueIPs = %d, want 2", metrics.UniqueIPs)
|
|
||||||
}
|
|
||||||
if metrics.UniqueAgents != 2 {
|
|
||||||
t.Fatalf("UniqueAgents = %d, want 2", metrics.UniqueAgents)
|
|
||||||
}
|
|
||||||
if metrics.UniqueTools != 2 {
|
|
||||||
t.Fatalf("UniqueTools = %d, want 2", metrics.UniqueTools)
|
|
||||||
}
|
|
||||||
if len(metrics.TopIPs) != 2 {
|
|
||||||
t.Fatalf("len(TopIPs) = %d, want 2", len(metrics.TopIPs))
|
|
||||||
}
|
|
||||||
if metrics.TopIPs[0].RequestCount != 2 || metrics.TopIPs[1].RequestCount != 2 {
|
|
||||||
t.Fatalf("TopIPs counts = %+v, want both counts to be 2", metrics.TopIPs)
|
|
||||||
}
|
|
||||||
if metrics.TopIPs[0].Key != "10.0.0.1" && metrics.TopIPs[0].Key != "10.0.0.2" {
|
|
||||||
t.Fatalf("TopIPs[0].Key = %q, want normalized IP", metrics.TopIPs[0].Key)
|
|
||||||
}
|
|
||||||
if len(metrics.TopAgents) != 2 {
|
|
||||||
t.Fatalf("len(TopAgents) = %d, want 2", len(metrics.TopAgents))
|
|
||||||
}
|
|
||||||
if metrics.TopAgents[0].RequestCount != 2 || metrics.TopAgents[1].RequestCount != 2 {
|
|
||||||
t.Fatalf("TopAgents counts = %+v, want both counts to be 2", metrics.TopAgents)
|
|
||||||
}
|
|
||||||
if len(metrics.TopTools) != 2 {
|
|
||||||
t.Fatalf("len(TopTools) = %d, want 2", len(metrics.TopTools))
|
|
||||||
}
|
|
||||||
if metrics.TopTools[0].Key != "list_projects" || metrics.TopTools[0].RequestCount != 2 {
|
|
||||||
t.Fatalf("TopTools[0] = %+v, want list_projects with count 2", metrics.TopTools[0])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -26,12 +26,6 @@ func (c *DynamicClient) HasRedirectURI(uri string) bool {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// ClientStore is the interface implemented by both DynamicClientStore and PostgresClientStore.
|
|
||||||
type ClientStore interface {
|
|
||||||
Register(name string, redirectURIs []string) (DynamicClient, error)
|
|
||||||
Lookup(clientID string) (DynamicClient, bool)
|
|
||||||
}
|
|
||||||
|
|
||||||
// DynamicClientStore holds dynamically registered OAuth clients in memory.
|
// DynamicClientStore holds dynamically registered OAuth clients in memory.
|
||||||
type DynamicClientStore struct {
|
type DynamicClientStore struct {
|
||||||
mu sync.RWMutex
|
mu sync.RWMutex
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package auth
|
package auth
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"io"
|
"io"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -10,7 +8,6 @@ import (
|
|||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
"git.warky.dev/wdevs/amcs/internal/config"
|
||||||
"git.warky.dev/wdevs/amcs/internal/observability"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func testLogger() *slog.Logger {
|
func testLogger() *slog.Logger {
|
||||||
@@ -42,7 +39,7 @@ func TestMiddlewareAllowsHeaderAuthAndSetsContext(t *testing.T) {
|
|||||||
t.Fatalf("NewKeyring() error = %v", err)
|
t.Fatalf("NewKeyring() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
keyID, ok := KeyIDFromContext(r.Context())
|
keyID, ok := KeyIDFromContext(r.Context())
|
||||||
if !ok || keyID != "client-a" {
|
if !ok || keyID != "client-a" {
|
||||||
t.Fatalf("KeyIDFromContext() = (%q, %v), want (client-a, true)", keyID, ok)
|
t.Fatalf("KeyIDFromContext() = (%q, %v), want (client-a, true)", keyID, ok)
|
||||||
@@ -66,7 +63,7 @@ func TestMiddlewareAllowsBearerAuthAndSetsContext(t *testing.T) {
|
|||||||
t.Fatalf("NewKeyring() error = %v", err)
|
t.Fatalf("NewKeyring() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
keyID, ok := KeyIDFromContext(r.Context())
|
keyID, ok := KeyIDFromContext(r.Context())
|
||||||
if !ok || keyID != "client-a" {
|
if !ok || keyID != "client-a" {
|
||||||
t.Fatalf("KeyIDFromContext() = (%q, %v), want (client-a, true)", keyID, ok)
|
t.Fatalf("KeyIDFromContext() = (%q, %v), want (client-a, true)", keyID, ok)
|
||||||
@@ -93,7 +90,7 @@ func TestMiddlewarePrefersExplicitHeaderOverBearerAuth(t *testing.T) {
|
|||||||
t.Fatalf("NewKeyring() error = %v", err)
|
t.Fatalf("NewKeyring() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
keyID, ok := KeyIDFromContext(r.Context())
|
keyID, ok := KeyIDFromContext(r.Context())
|
||||||
if !ok || keyID != "client-a" {
|
if !ok || keyID != "client-a" {
|
||||||
t.Fatalf("KeyIDFromContext() = (%q, %v), want (client-a, true)", keyID, ok)
|
t.Fatalf("KeyIDFromContext() = (%q, %v), want (client-a, true)", keyID, ok)
|
||||||
@@ -122,7 +119,7 @@ func TestMiddlewareAllowsQueryParamWhenEnabled(t *testing.T) {
|
|||||||
HeaderName: "x-brain-key",
|
HeaderName: "x-brain-key",
|
||||||
QueryParam: "key",
|
QueryParam: "key",
|
||||||
AllowQueryParam: true,
|
AllowQueryParam: true,
|
||||||
}, keyring, nil, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
}, keyring, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
w.WriteHeader(http.StatusNoContent)
|
w.WriteHeader(http.StatusNoContent)
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -141,7 +138,7 @@ func TestMiddlewareRejectsMissingOrInvalidKey(t *testing.T) {
|
|||||||
t.Fatalf("NewKeyring() error = %v", err)
|
t.Fatalf("NewKeyring() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
t.Fatal("next handler should not be called")
|
t.Fatal("next handler should not be called")
|
||||||
}))
|
}))
|
||||||
|
|
||||||
@@ -160,81 +157,3 @@ func TestMiddlewareRejectsMissingOrInvalidKey(t *testing.T) {
|
|||||||
t.Fatalf("invalid key status = %d, want %d", rec.Code, http.StatusUnauthorized)
|
t.Fatalf("invalid key status = %d, want %d", rec.Code, http.StatusUnauthorized)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestMiddlewareRecordsForwardedRemoteAddr(t *testing.T) {
|
|
||||||
keyring, err := NewKeyring([]config.APIKey{{ID: "client-a", Value: "secret"}})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewKeyring() error = %v", err)
|
|
||||||
}
|
|
||||||
tracker := NewAccessTracker()
|
|
||||||
|
|
||||||
handler := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, tracker, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}))
|
|
||||||
|
|
||||||
req := httptest.NewRequest(http.MethodGet, "/mcp", nil)
|
|
||||||
req.RemoteAddr = "10.0.0.5:2222"
|
|
||||||
req.Header.Set("x-brain-key", "secret")
|
|
||||||
req.Header.Set("X-Real-IP", "203.0.113.99")
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusNoContent {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusNoContent)
|
|
||||||
}
|
|
||||||
|
|
||||||
snap := tracker.Snapshot()
|
|
||||||
if len(snap) != 1 {
|
|
||||||
t.Fatalf("len(snapshot) = %d, want 1", len(snap))
|
|
||||||
}
|
|
||||||
if snap[0].RemoteAddr != "203.0.113.99" {
|
|
||||||
t.Fatalf("snapshot remote_addr = %q, want %q", snap[0].RemoteAddr, "203.0.113.99")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMiddlewareRecordsMCPToolUsage(t *testing.T) {
|
|
||||||
keyring, err := NewKeyring([]config.APIKey{{ID: "client-a", Value: "secret"}})
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("NewKeyring() error = %v", err)
|
|
||||||
}
|
|
||||||
tracker := NewAccessTracker()
|
|
||||||
logger := testLogger()
|
|
||||||
|
|
||||||
authenticated := Middleware(config.AuthConfig{HeaderName: "x-brain-key"}, keyring, nil, nil, tracker, logger)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
}))
|
|
||||||
handler := observability.AccessLog(logger)(authenticated)
|
|
||||||
|
|
||||||
payload := map[string]any{
|
|
||||||
"jsonrpc": "2.0",
|
|
||||||
"id": "1",
|
|
||||||
"method": "tools/call",
|
|
||||||
"params": map[string]any{
|
|
||||||
"name": "list_projects",
|
|
||||||
},
|
|
||||||
}
|
|
||||||
body, err := json.Marshal(payload)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("json.Marshal() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
req := httptest.NewRequest(http.MethodPost, "/mcp", bytes.NewReader(body))
|
|
||||||
req.Header.Set("x-brain-key", "secret")
|
|
||||||
rec := httptest.NewRecorder()
|
|
||||||
handler.ServeHTTP(rec, req)
|
|
||||||
|
|
||||||
if rec.Code != http.StatusNoContent {
|
|
||||||
t.Fatalf("status = %d, want %d", rec.Code, http.StatusNoContent)
|
|
||||||
}
|
|
||||||
|
|
||||||
metrics := tracker.Metrics(10)
|
|
||||||
if metrics.UniqueTools != 1 {
|
|
||||||
t.Fatalf("UniqueTools = %d, want 1", metrics.UniqueTools)
|
|
||||||
}
|
|
||||||
if len(metrics.TopTools) != 1 {
|
|
||||||
t.Fatalf("len(TopTools) = %d, want 1", len(metrics.TopTools))
|
|
||||||
}
|
|
||||||
if metrics.TopTools[0].Key != "list_projects" || metrics.TopTools[0].RequestCount != 1 {
|
|
||||||
t.Fatalf("TopTools[0] = %+v, want list_projects with count 1", metrics.TopTools[0])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -6,63 +6,30 @@ import (
|
|||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/config"
|
"git.warky.dev/wdevs/amcs/internal/config"
|
||||||
"git.warky.dev/wdevs/amcs/internal/observability"
|
|
||||||
"git.warky.dev/wdevs/amcs/internal/requestip"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type contextKey string
|
type contextKey string
|
||||||
|
|
||||||
const keyIDContextKey contextKey = "auth.key_id"
|
const keyIDContextKey contextKey = "auth.key_id"
|
||||||
|
|
||||||
// wwwAuthenticate returns the value for a WWW-Authenticate header.
|
func Middleware(cfg config.AuthConfig, keyring *Keyring, oauthRegistry *OAuthRegistry, tokenStore *TokenStore, log *slog.Logger) func(http.Handler) http.Handler {
|
||||||
// It advertises Bearer and, when a public URL is known, the OAuth metadata URL per RFC 9728.
|
|
||||||
func wwwAuthenticate(r *http.Request, publicURL string) string {
|
|
||||||
base := publicURL
|
|
||||||
if base == "" {
|
|
||||||
scheme := "https"
|
|
||||||
if proto := r.Header.Get("X-Forwarded-Proto"); proto != "" {
|
|
||||||
scheme = strings.ToLower(proto)
|
|
||||||
} else if r.TLS == nil {
|
|
||||||
scheme = "http"
|
|
||||||
}
|
|
||||||
base = scheme + "://" + r.Host
|
|
||||||
}
|
|
||||||
return `Bearer resource_metadata="` + base + `/.well-known/oauth-authorization-server"`
|
|
||||||
}
|
|
||||||
|
|
||||||
func Middleware(cfg config.AuthConfig, keyring *Keyring, oauthRegistry *OAuthRegistry, tokenStore *TokenStore, tracker *AccessTracker, log *slog.Logger) func(http.Handler) http.Handler {
|
|
||||||
headerName := cfg.HeaderName
|
headerName := cfg.HeaderName
|
||||||
if headerName == "" {
|
if headerName == "" {
|
||||||
headerName = "x-brain-key"
|
headerName = "x-brain-key"
|
||||||
}
|
}
|
||||||
recordAccess := func(r *http.Request, keyID string) {
|
|
||||||
if tracker != nil {
|
|
||||||
tracker.Record(
|
|
||||||
keyID,
|
|
||||||
r.URL.Path,
|
|
||||||
requestip.FromRequest(r),
|
|
||||||
r.UserAgent(),
|
|
||||||
observability.MCPToolFromContext(r.Context()),
|
|
||||||
time.Now(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return func(next http.Handler) http.Handler {
|
return func(next http.Handler) http.Handler {
|
||||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
remoteAddr := requestip.FromRequest(r)
|
|
||||||
// 1. Custom header → keyring only.
|
// 1. Custom header → keyring only.
|
||||||
if keyring != nil {
|
if keyring != nil {
|
||||||
if token := strings.TrimSpace(r.Header.Get(headerName)); token != "" {
|
if token := strings.TrimSpace(r.Header.Get(headerName)); token != "" {
|
||||||
keyID, ok := keyring.Lookup(token)
|
keyID, ok := keyring.Lookup(token)
|
||||||
if !ok {
|
if !ok {
|
||||||
log.Warn("authentication failed", slog.String("remote_addr", remoteAddr))
|
log.Warn("authentication failed", slog.String("remote_addr", r.RemoteAddr))
|
||||||
http.Error(w, "invalid API key", http.StatusUnauthorized)
|
http.Error(w, "invalid API key", http.StatusUnauthorized)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
recordAccess(r, keyID)
|
|
||||||
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -72,20 +39,17 @@ func Middleware(cfg config.AuthConfig, keyring *Keyring, oauthRegistry *OAuthReg
|
|||||||
if bearer := extractBearer(r); bearer != "" {
|
if bearer := extractBearer(r); bearer != "" {
|
||||||
if tokenStore != nil {
|
if tokenStore != nil {
|
||||||
if keyID, ok := tokenStore.Lookup(bearer); ok {
|
if keyID, ok := tokenStore.Lookup(bearer); ok {
|
||||||
recordAccess(r, keyID)
|
|
||||||
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if keyring != nil {
|
if keyring != nil {
|
||||||
if keyID, ok := keyring.Lookup(bearer); ok {
|
if keyID, ok := keyring.Lookup(bearer); ok {
|
||||||
recordAccess(r, keyID)
|
|
||||||
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.Warn("bearer token rejected", slog.String("remote_addr", remoteAddr))
|
log.Warn("bearer token rejected", slog.String("remote_addr", r.RemoteAddr))
|
||||||
w.Header().Set("WWW-Authenticate", wwwAuthenticate(r, "")+`, error="invalid_token"`)
|
|
||||||
http.Error(w, "invalid token or API key", http.StatusUnauthorized)
|
http.Error(w, "invalid token or API key", http.StatusUnauthorized)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -98,11 +62,10 @@ func Middleware(cfg config.AuthConfig, keyring *Keyring, oauthRegistry *OAuthReg
|
|||||||
}
|
}
|
||||||
keyID, ok := oauthRegistry.Lookup(clientID, clientSecret)
|
keyID, ok := oauthRegistry.Lookup(clientID, clientSecret)
|
||||||
if !ok {
|
if !ok {
|
||||||
log.Warn("oauth client authentication failed", slog.String("remote_addr", remoteAddr))
|
log.Warn("oauth client authentication failed", slog.String("remote_addr", r.RemoteAddr))
|
||||||
http.Error(w, "invalid OAuth client credentials", http.StatusUnauthorized)
|
http.Error(w, "invalid OAuth client credentials", http.StatusUnauthorized)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
recordAccess(r, keyID)
|
|
||||||
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -112,17 +75,15 @@ func Middleware(cfg config.AuthConfig, keyring *Keyring, oauthRegistry *OAuthReg
|
|||||||
if token := strings.TrimSpace(r.URL.Query().Get(cfg.QueryParam)); token != "" {
|
if token := strings.TrimSpace(r.URL.Query().Get(cfg.QueryParam)); token != "" {
|
||||||
keyID, ok := keyring.Lookup(token)
|
keyID, ok := keyring.Lookup(token)
|
||||||
if !ok {
|
if !ok {
|
||||||
log.Warn("authentication failed", slog.String("remote_addr", remoteAddr))
|
log.Warn("authentication failed", slog.String("remote_addr", r.RemoteAddr))
|
||||||
http.Error(w, "invalid API key", http.StatusUnauthorized)
|
http.Error(w, "invalid API key", http.StatusUnauthorized)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
recordAccess(r, keyID)
|
|
||||||
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
next.ServeHTTP(w, r.WithContext(context.WithValue(r.Context(), keyIDContextKey, keyID)))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Header().Set("WWW-Authenticate", wwwAuthenticate(r, ""))
|
|
||||||
http.Error(w, "authentication required", http.StatusUnauthorized)
|
http.Error(w, "authentication required", http.StatusUnauthorized)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ func TestMiddlewareAllowsOAuthBasicAuthAndSetsContext(t *testing.T) {
|
|||||||
t.Fatalf("NewOAuthRegistry() error = %v", err)
|
t.Fatalf("NewOAuthRegistry() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := Middleware(config.AuthConfig{}, nil, oauthRegistry, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Middleware(config.AuthConfig{}, nil, oauthRegistry, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
keyID, ok := KeyIDFromContext(r.Context())
|
keyID, ok := KeyIDFromContext(r.Context())
|
||||||
if !ok || keyID != "oauth-client" {
|
if !ok || keyID != "oauth-client" {
|
||||||
t.Fatalf("KeyIDFromContext() = (%q, %v), want (oauth-client, true)", keyID, ok)
|
t.Fatalf("KeyIDFromContext() = (%q, %v), want (oauth-client, true)", keyID, ok)
|
||||||
@@ -70,7 +70,7 @@ func TestMiddlewareRejectsOAuthMissingOrInvalidCredentials(t *testing.T) {
|
|||||||
t.Fatalf("NewOAuthRegistry() error = %v", err)
|
t.Fatalf("NewOAuthRegistry() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
handler := Middleware(config.AuthConfig{}, nil, oauthRegistry, nil, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
handler := Middleware(config.AuthConfig{}, nil, oauthRegistry, nil, testLogger())(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||||
t.Fatal("next handler should not be called")
|
t.Fatal("next handler should not be called")
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
package auth
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
"crypto/rand"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"github.com/jackc/pgx/v5/pgxpool"
|
|
||||||
)
|
|
||||||
|
|
||||||
// PostgresClientStore persists dynamically registered OAuth clients (RFC 7591) in PostgreSQL.
|
|
||||||
type PostgresClientStore struct {
|
|
||||||
pool *pgxpool.Pool
|
|
||||||
}
|
|
||||||
|
|
||||||
func NewPostgresClientStore(pool *pgxpool.Pool) *PostgresClientStore {
|
|
||||||
return &PostgresClientStore{pool: pool}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *PostgresClientStore) Register(name string, redirectURIs []string) (DynamicClient, error) {
|
|
||||||
b := make([]byte, 16)
|
|
||||||
if _, err := rand.Read(b); err != nil {
|
|
||||||
return DynamicClient{}, err
|
|
||||||
}
|
|
||||||
clientID := fmt.Sprintf("%x-%x-%x-%x-%x", b[0:4], b[4:6], b[6:8], b[8:10], b[10:])
|
|
||||||
|
|
||||||
var client DynamicClient
|
|
||||||
row := s.pool.QueryRow(context.Background(), `
|
|
||||||
insert into oauth_clients (client_id, client_name, redirect_uris)
|
|
||||||
values ($1, $2, $3)
|
|
||||||
returning client_id, client_name, redirect_uris, created_at
|
|
||||||
`, clientID, name, redirectURIs)
|
|
||||||
if err := row.Scan(&client.ClientID, &client.ClientName, &client.RedirectURIs, &client.CreatedAt); err != nil {
|
|
||||||
return DynamicClient{}, fmt.Errorf("register oauth client: %w", err)
|
|
||||||
}
|
|
||||||
return client, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *PostgresClientStore) Lookup(clientID string) (DynamicClient, bool) {
|
|
||||||
var client DynamicClient
|
|
||||||
row := s.pool.QueryRow(context.Background(), `
|
|
||||||
select client_id, client_name, redirect_uris, created_at
|
|
||||||
from oauth_clients
|
|
||||||
where client_id = $1
|
|
||||||
`, clientID)
|
|
||||||
if err := row.Scan(&client.ClientID, &client.ClientName, &client.RedirectURIs, &client.CreatedAt); err != nil {
|
|
||||||
return DynamicClient{}, false
|
|
||||||
}
|
|
||||||
return client, true
|
|
||||||
}
|
|
||||||
+74
-66
@@ -8,7 +8,6 @@ const (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type Config struct {
|
type Config struct {
|
||||||
Version int `yaml:"version"`
|
|
||||||
Server ServerConfig `yaml:"server"`
|
Server ServerConfig `yaml:"server"`
|
||||||
MCP MCPConfig `yaml:"mcp"`
|
MCP MCPConfig `yaml:"mcp"`
|
||||||
Auth AuthConfig `yaml:"auth"`
|
Auth AuthConfig `yaml:"auth"`
|
||||||
@@ -33,13 +32,10 @@ type ServerConfig struct {
|
|||||||
|
|
||||||
type MCPConfig struct {
|
type MCPConfig struct {
|
||||||
Path string `yaml:"path"`
|
Path string `yaml:"path"`
|
||||||
SSEPath string `yaml:"sse_path"`
|
|
||||||
ServerName string `yaml:"server_name"`
|
ServerName string `yaml:"server_name"`
|
||||||
Version string `yaml:"version"`
|
Version string `yaml:"version"`
|
||||||
Transport string `yaml:"transport"`
|
Transport string `yaml:"transport"`
|
||||||
SessionTimeout time.Duration `yaml:"session_timeout"`
|
SessionTimeout time.Duration `yaml:"session_timeout"`
|
||||||
PublicURL string `yaml:"public_url"`
|
|
||||||
Instructions string `yaml:"-"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type AuthConfig struct {
|
type AuthConfig struct {
|
||||||
@@ -75,82 +71,52 @@ type DatabaseConfig struct {
|
|||||||
MaxConnIdleTime time.Duration `yaml:"max_conn_idle_time"`
|
MaxConnIdleTime time.Duration `yaml:"max_conn_idle_time"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// AIConfig (v2): named providers + per-role chains.
|
|
||||||
type AIConfig struct {
|
type AIConfig struct {
|
||||||
Providers map[string]ProviderConfig `yaml:"providers"`
|
Provider string `yaml:"provider"`
|
||||||
Embeddings EmbeddingsRoleConfig `yaml:"embeddings"`
|
Embeddings AIEmbeddingConfig `yaml:"embeddings"`
|
||||||
Metadata MetadataRoleConfig `yaml:"metadata"`
|
Metadata AIMetadataConfig `yaml:"metadata"`
|
||||||
Background *BackgroundRolesConfig `yaml:"background,omitempty"`
|
LiteLLM LiteLLMConfig `yaml:"litellm"`
|
||||||
|
Ollama OllamaConfig `yaml:"ollama"`
|
||||||
|
OpenRouter OpenRouterAIConfig `yaml:"openrouter"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ProviderConfig struct {
|
type AIEmbeddingConfig struct {
|
||||||
Type string `yaml:"type"`
|
Model string `yaml:"model"`
|
||||||
BaseURL string `yaml:"base_url"`
|
Dimensions int `yaml:"dimensions"`
|
||||||
APIKey string `yaml:"api_key"`
|
|
||||||
RequestHeaders map[string]string `yaml:"request_headers,omitempty"`
|
|
||||||
AppName string `yaml:"app_name,omitempty"`
|
|
||||||
SiteURL string `yaml:"site_url,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type RoleTarget struct {
|
type AIMetadataConfig struct {
|
||||||
Provider string `yaml:"provider"`
|
Model string `yaml:"model"`
|
||||||
Model string `yaml:"model"`
|
FallbackModels []string `yaml:"fallback_models"`
|
||||||
}
|
FallbackModel string `yaml:"fallback_model"` // legacy single fallback
|
||||||
|
|
||||||
type RoleChain struct {
|
|
||||||
Primary RoleTarget `yaml:"primary"`
|
|
||||||
Fallbacks []RoleTarget `yaml:"fallbacks,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type EmbeddingsRoleConfig struct {
|
|
||||||
Dimensions int `yaml:"dimensions"`
|
|
||||||
Primary RoleTarget `yaml:"primary"`
|
|
||||||
Fallbacks []RoleTarget `yaml:"fallbacks,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type MetadataRoleConfig struct {
|
|
||||||
Temperature float64 `yaml:"temperature"`
|
Temperature float64 `yaml:"temperature"`
|
||||||
LogConversations bool `yaml:"log_conversations"`
|
LogConversations bool `yaml:"log_conversations"`
|
||||||
Timeout time.Duration `yaml:"timeout"`
|
Timeout time.Duration `yaml:"timeout"`
|
||||||
Primary RoleTarget `yaml:"primary"`
|
|
||||||
Fallbacks []RoleTarget `yaml:"fallbacks,omitempty"`
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// BackgroundRolesConfig overrides the foreground chains for background workers
|
type LiteLLMConfig struct {
|
||||||
// (backfill_embeddings, metadata_retry, reparse_metadata). Either field may be
|
BaseURL string `yaml:"base_url"`
|
||||||
// nil to inherit the foreground role unchanged.
|
APIKey string `yaml:"api_key"`
|
||||||
type BackgroundRolesConfig struct {
|
UseResponsesAPI bool `yaml:"use_responses_api"`
|
||||||
Embeddings *RoleChain `yaml:"embeddings,omitempty"`
|
RequestHeaders map[string]string `yaml:"request_headers"`
|
||||||
Metadata *RoleChain `yaml:"metadata,omitempty"`
|
EmbeddingModel string `yaml:"embedding_model"`
|
||||||
|
MetadataModel string `yaml:"metadata_model"`
|
||||||
|
FallbackMetadataModels []string `yaml:"fallback_metadata_models"`
|
||||||
|
FallbackMetadataModel string `yaml:"fallback_metadata_model"` // legacy single fallback
|
||||||
}
|
}
|
||||||
|
|
||||||
// Chain returns primary followed by fallbacks (deduped, blanks dropped).
|
type OllamaConfig struct {
|
||||||
func (e EmbeddingsRoleConfig) Chain() []RoleTarget {
|
BaseURL string `yaml:"base_url"`
|
||||||
return dedupeTargets(append([]RoleTarget{e.Primary}, e.Fallbacks...))
|
APIKey string `yaml:"api_key"`
|
||||||
|
RequestHeaders map[string]string `yaml:"request_headers"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m MetadataRoleConfig) Chain() []RoleTarget {
|
type OpenRouterAIConfig struct {
|
||||||
return dedupeTargets(append([]RoleTarget{m.Primary}, m.Fallbacks...))
|
BaseURL string `yaml:"base_url"`
|
||||||
}
|
APIKey string `yaml:"api_key"`
|
||||||
|
AppName string `yaml:"app_name"`
|
||||||
func (c RoleChain) AsTargets() []RoleTarget {
|
SiteURL string `yaml:"site_url"`
|
||||||
return dedupeTargets(append([]RoleTarget{c.Primary}, c.Fallbacks...))
|
ExtraHeaders map[string]string `yaml:"extra_headers"`
|
||||||
}
|
|
||||||
|
|
||||||
func dedupeTargets(in []RoleTarget) []RoleTarget {
|
|
||||||
out := make([]RoleTarget, 0, len(in))
|
|
||||||
seen := make(map[RoleTarget]struct{}, len(in))
|
|
||||||
for _, t := range in {
|
|
||||||
if t.Provider == "" || t.Model == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if _, ok := seen[t]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
seen[t] = struct{}{}
|
|
||||||
out = append(out, t)
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type CaptureConfig struct {
|
type CaptureConfig struct {
|
||||||
@@ -195,3 +161,45 @@ type MetadataRetryConfig struct {
|
|||||||
MaxPerRun int `yaml:"max_per_run"`
|
MaxPerRun int `yaml:"max_per_run"`
|
||||||
IncludeArchived bool `yaml:"include_archived"`
|
IncludeArchived bool `yaml:"include_archived"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c AIMetadataConfig) EffectiveFallbackModels() []string {
|
||||||
|
models := make([]string, 0, len(c.FallbackModels)+1)
|
||||||
|
for _, model := range c.FallbackModels {
|
||||||
|
if model != "" {
|
||||||
|
models = append(models, model)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if c.FallbackModel != "" {
|
||||||
|
models = append(models, c.FallbackModel)
|
||||||
|
}
|
||||||
|
return dedupeNonEmpty(models)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c LiteLLMConfig) EffectiveFallbackMetadataModels() []string {
|
||||||
|
models := make([]string, 0, len(c.FallbackMetadataModels)+1)
|
||||||
|
for _, model := range c.FallbackMetadataModels {
|
||||||
|
if model != "" {
|
||||||
|
models = append(models, model)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if c.FallbackMetadataModel != "" {
|
||||||
|
models = append(models, c.FallbackMetadataModel)
|
||||||
|
}
|
||||||
|
return dedupeNonEmpty(models)
|
||||||
|
}
|
||||||
|
|
||||||
|
func dedupeNonEmpty(values []string) []string {
|
||||||
|
seen := make(map[string]struct{}, len(values))
|
||||||
|
out := make([]string, 0, len(values))
|
||||||
|
for _, value := range values {
|
||||||
|
if value == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if _, ok := seen[value]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[value] = struct{}{}
|
||||||
|
out = append(out, value)
|
||||||
|
}
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|||||||
+16
-79
@@ -2,7 +2,6 @@ package config
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"log/slog"
|
|
||||||
"os"
|
"os"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -13,12 +12,6 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func Load(explicitPath string) (*Config, string, error) {
|
func Load(explicitPath string) (*Config, string, error) {
|
||||||
return LoadWithLogger(explicitPath, nil)
|
|
||||||
}
|
|
||||||
|
|
||||||
// LoadWithLogger is Load with a logger surface for migration notices. Passing
|
|
||||||
// nil is fine — migration events will simply not be logged.
|
|
||||||
func LoadWithLogger(explicitPath string, log *slog.Logger) (*Config, string, error) {
|
|
||||||
path := ResolvePath(explicitPath)
|
path := ResolvePath(explicitPath)
|
||||||
|
|
||||||
data, err := os.ReadFile(path)
|
data, err := os.ReadFile(path)
|
||||||
@@ -26,38 +19,10 @@ func LoadWithLogger(explicitPath string, log *slog.Logger) (*Config, string, err
|
|||||||
return nil, path, fmt.Errorf("read config %q: %w", path, err)
|
return nil, path, fmt.Errorf("read config %q: %w", path, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
raw := map[string]any{}
|
cfg := defaultConfig()
|
||||||
if err := yaml.Unmarshal(data, &raw); err != nil {
|
if err := yaml.Unmarshal(data, &cfg); err != nil {
|
||||||
return nil, path, fmt.Errorf("decode config %q: %w", path, err)
|
return nil, path, fmt.Errorf("decode config %q: %w", path, err)
|
||||||
}
|
}
|
||||||
if raw == nil {
|
|
||||||
raw = map[string]any{}
|
|
||||||
}
|
|
||||||
|
|
||||||
applied, err := Migrate(raw)
|
|
||||||
if err != nil {
|
|
||||||
return nil, path, fmt.Errorf("migrate config %q: %w", path, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(applied) > 0 {
|
|
||||||
if log != nil {
|
|
||||||
for _, step := range applied {
|
|
||||||
log.Warn("config migrated in memory",
|
|
||||||
slog.String("path", path),
|
|
||||||
slog.Int("from_version", step.From),
|
|
||||||
slog.Int("to_version", step.To),
|
|
||||||
slog.String("describe", step.Describe),
|
|
||||||
slog.String("hint", "persist with amcs-migrate-config"),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg, err := decodeTyped(raw)
|
|
||||||
if err != nil {
|
|
||||||
return nil, path, fmt.Errorf("decode migrated config %q: %w", path, err)
|
|
||||||
}
|
|
||||||
cfg.Version = CurrentConfigVersion
|
|
||||||
|
|
||||||
applyEnvOverrides(&cfg)
|
applyEnvOverrides(&cfg)
|
||||||
if err := cfg.Validate(); err != nil {
|
if err := cfg.Validate(); err != nil {
|
||||||
@@ -67,18 +32,6 @@ func LoadWithLogger(explicitPath string, log *slog.Logger) (*Config, string, err
|
|||||||
return &cfg, path, nil
|
return &cfg, path, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func decodeTyped(raw map[string]any) (Config, error) {
|
|
||||||
out, err := yaml.Marshal(raw)
|
|
||||||
if err != nil {
|
|
||||||
return Config{}, fmt.Errorf("re-marshal migrated config: %w", err)
|
|
||||||
}
|
|
||||||
cfg := defaultConfig()
|
|
||||||
if err := yaml.Unmarshal(out, &cfg); err != nil {
|
|
||||||
return Config{}, err
|
|
||||||
}
|
|
||||||
return cfg, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func ResolvePath(explicitPath string) string {
|
func ResolvePath(explicitPath string) string {
|
||||||
if path := strings.TrimSpace(explicitPath); path != "" {
|
if path := strings.TrimSpace(explicitPath); path != "" {
|
||||||
if path != ".yaml" && path != ".yml" {
|
if path != ".yaml" && path != ".yml" {
|
||||||
@@ -96,7 +49,6 @@ func ResolvePath(explicitPath string) string {
|
|||||||
func defaultConfig() Config {
|
func defaultConfig() Config {
|
||||||
info := buildinfo.Current()
|
info := buildinfo.Current()
|
||||||
return Config{
|
return Config{
|
||||||
Version: CurrentConfigVersion,
|
|
||||||
Server: ServerConfig{
|
Server: ServerConfig{
|
||||||
Host: "0.0.0.0",
|
Host: "0.0.0.0",
|
||||||
Port: 8080,
|
Port: 8080,
|
||||||
@@ -106,7 +58,6 @@ func defaultConfig() Config {
|
|||||||
},
|
},
|
||||||
MCP: MCPConfig{
|
MCP: MCPConfig{
|
||||||
Path: "/mcp",
|
Path: "/mcp",
|
||||||
SSEPath: "/sse",
|
|
||||||
ServerName: "amcs",
|
ServerName: "amcs",
|
||||||
Version: info.Version,
|
Version: info.Version,
|
||||||
Transport: "streamable_http",
|
Transport: "streamable_http",
|
||||||
@@ -117,14 +68,20 @@ func defaultConfig() Config {
|
|||||||
QueryParam: "key",
|
QueryParam: "key",
|
||||||
},
|
},
|
||||||
AI: AIConfig{
|
AI: AIConfig{
|
||||||
Providers: map[string]ProviderConfig{},
|
Provider: "litellm",
|
||||||
Embeddings: EmbeddingsRoleConfig{
|
Embeddings: AIEmbeddingConfig{
|
||||||
|
Model: "openai/text-embedding-3-small",
|
||||||
Dimensions: 1536,
|
Dimensions: 1536,
|
||||||
},
|
},
|
||||||
Metadata: MetadataRoleConfig{
|
Metadata: AIMetadataConfig{
|
||||||
|
Model: "gpt-4o-mini",
|
||||||
Temperature: 0.1,
|
Temperature: 0.1,
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
},
|
},
|
||||||
|
Ollama: OllamaConfig{
|
||||||
|
BaseURL: "http://localhost:11434/v1",
|
||||||
|
APIKey: "ollama",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
Capture: CaptureConfig{
|
Capture: CaptureConfig{
|
||||||
Source: DefaultSource,
|
Source: DefaultSource,
|
||||||
@@ -160,13 +117,11 @@ func defaultConfig() Config {
|
|||||||
|
|
||||||
func applyEnvOverrides(cfg *Config) {
|
func applyEnvOverrides(cfg *Config) {
|
||||||
overrideString(&cfg.Database.URL, "AMCS_DATABASE_URL")
|
overrideString(&cfg.Database.URL, "AMCS_DATABASE_URL")
|
||||||
overrideString(&cfg.MCP.PublicURL, "AMCS_PUBLIC_URL")
|
overrideString(&cfg.AI.LiteLLM.BaseURL, "AMCS_LITELLM_BASE_URL")
|
||||||
|
overrideString(&cfg.AI.LiteLLM.APIKey, "AMCS_LITELLM_API_KEY")
|
||||||
overrideProviderField(cfg, "AMCS_LITELLM_BASE_URL", "litellm", func(p *ProviderConfig, v string) { p.BaseURL = v })
|
overrideString(&cfg.AI.Ollama.BaseURL, "AMCS_OLLAMA_BASE_URL")
|
||||||
overrideProviderField(cfg, "AMCS_LITELLM_API_KEY", "litellm", func(p *ProviderConfig, v string) { p.APIKey = v })
|
overrideString(&cfg.AI.Ollama.APIKey, "AMCS_OLLAMA_API_KEY")
|
||||||
overrideProviderField(cfg, "AMCS_OLLAMA_BASE_URL", "ollama", func(p *ProviderConfig, v string) { p.BaseURL = v })
|
overrideString(&cfg.AI.OpenRouter.APIKey, "AMCS_OPENROUTER_API_KEY")
|
||||||
overrideProviderField(cfg, "AMCS_OLLAMA_API_KEY", "ollama", func(p *ProviderConfig, v string) { p.APIKey = v })
|
|
||||||
overrideProviderField(cfg, "AMCS_OPENROUTER_API_KEY", "openrouter", func(p *ProviderConfig, v string) { p.APIKey = v })
|
|
||||||
|
|
||||||
if value, ok := os.LookupEnv("AMCS_SERVER_PORT"); ok {
|
if value, ok := os.LookupEnv("AMCS_SERVER_PORT"); ok {
|
||||||
if port, err := strconv.Atoi(strings.TrimSpace(value)); err == nil {
|
if port, err := strconv.Atoi(strings.TrimSpace(value)); err == nil {
|
||||||
@@ -175,24 +130,6 @@ func applyEnvOverrides(cfg *Config) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// overrideProviderField applies an env var to every configured provider of the
|
|
||||||
// given type. This preserves the v1 behaviour where e.g. AMCS_LITELLM_API_KEY
|
|
||||||
// rewrote the single litellm block — in v2 it rewrites every litellm provider.
|
|
||||||
func overrideProviderField(cfg *Config, envKey, providerType string, apply func(*ProviderConfig, string)) {
|
|
||||||
value, ok := os.LookupEnv(envKey)
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
value = strings.TrimSpace(value)
|
|
||||||
for name, p := range cfg.AI.Providers {
|
|
||||||
if p.Type != providerType {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
apply(&p, value)
|
|
||||||
cfg.AI.Providers[name] = p
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func overrideString(target *string, envKey string) {
|
func overrideString(target *string, envKey string) {
|
||||||
if value, ok := os.LookupEnv(envKey); ok {
|
if value, ok := os.LookupEnv(envKey); ok {
|
||||||
*target = strings.TrimSpace(value)
|
*target = strings.TrimSpace(value)
|
||||||
|
|||||||
+20
-114
@@ -3,7 +3,6 @@ package config
|
|||||||
import (
|
import (
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -32,8 +31,9 @@ func TestResolvePathIgnoresBareYAMLExtension(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const v2ConfigYAML = `
|
func TestLoadAppliesEnvOverrides(t *testing.T) {
|
||||||
version: 2
|
configPath := filepath.Join(t.TempDir(), "test.yaml")
|
||||||
|
if err := os.WriteFile(configPath, []byte(`
|
||||||
server:
|
server:
|
||||||
port: 8080
|
port: 8080
|
||||||
mcp:
|
mcp:
|
||||||
@@ -46,30 +46,18 @@ auth:
|
|||||||
database:
|
database:
|
||||||
url: "postgres://from-file"
|
url: "postgres://from-file"
|
||||||
ai:
|
ai:
|
||||||
providers:
|
provider: "litellm"
|
||||||
default:
|
|
||||||
type: "litellm"
|
|
||||||
base_url: "http://localhost:4000/v1"
|
|
||||||
api_key: "file-key"
|
|
||||||
embeddings:
|
embeddings:
|
||||||
dimensions: 1536
|
dimensions: 1536
|
||||||
primary:
|
litellm:
|
||||||
provider: "default"
|
base_url: "http://localhost:4000/v1"
|
||||||
model: "text-embed"
|
api_key: "file-key"
|
||||||
metadata:
|
|
||||||
primary:
|
|
||||||
provider: "default"
|
|
||||||
model: "gpt-4"
|
|
||||||
search:
|
search:
|
||||||
default_limit: 10
|
default_limit: 10
|
||||||
max_limit: 50
|
max_limit: 50
|
||||||
logging:
|
logging:
|
||||||
level: "info"
|
level: "info"
|
||||||
`
|
`), 0o600); err != nil {
|
||||||
|
|
||||||
func TestLoadAppliesEnvOverrides(t *testing.T) {
|
|
||||||
configPath := filepath.Join(t.TempDir(), "test.yaml")
|
|
||||||
if err := os.WriteFile(configPath, []byte(v2ConfigYAML), 0o600); err != nil {
|
|
||||||
t.Fatalf("write config: %v", err)
|
t.Fatalf("write config: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,8 +76,8 @@ func TestLoadAppliesEnvOverrides(t *testing.T) {
|
|||||||
if cfg.Database.URL != "postgres://from-env" {
|
if cfg.Database.URL != "postgres://from-env" {
|
||||||
t.Fatalf("database url = %q, want env override", cfg.Database.URL)
|
t.Fatalf("database url = %q, want env override", cfg.Database.URL)
|
||||||
}
|
}
|
||||||
if cfg.AI.Providers["default"].APIKey != "env-key" {
|
if cfg.AI.LiteLLM.APIKey != "env-key" {
|
||||||
t.Fatalf("litellm api key = %q, want env override", cfg.AI.Providers["default"].APIKey)
|
t.Fatalf("litellm api key = %q, want env override", cfg.AI.LiteLLM.APIKey)
|
||||||
}
|
}
|
||||||
if cfg.Server.Port != 9090 {
|
if cfg.Server.Port != 9090 {
|
||||||
t.Fatalf("server port = %d, want 9090", cfg.Server.Port)
|
t.Fatalf("server port = %d, want 9090", cfg.Server.Port)
|
||||||
@@ -102,12 +90,10 @@ func TestLoadAppliesEnvOverrides(t *testing.T) {
|
|||||||
func TestLoadAppliesOllamaEnvOverrides(t *testing.T) {
|
func TestLoadAppliesOllamaEnvOverrides(t *testing.T) {
|
||||||
configPath := filepath.Join(t.TempDir(), "test.yaml")
|
configPath := filepath.Join(t.TempDir(), "test.yaml")
|
||||||
if err := os.WriteFile(configPath, []byte(`
|
if err := os.WriteFile(configPath, []byte(`
|
||||||
version: 2
|
|
||||||
server:
|
server:
|
||||||
port: 8080
|
port: 8080
|
||||||
mcp:
|
mcp:
|
||||||
path: "/mcp"
|
path: "/mcp"
|
||||||
session_timeout: "10m"
|
|
||||||
auth:
|
auth:
|
||||||
keys:
|
keys:
|
||||||
- id: "test"
|
- id: "test"
|
||||||
@@ -115,20 +101,15 @@ auth:
|
|||||||
database:
|
database:
|
||||||
url: "postgres://from-file"
|
url: "postgres://from-file"
|
||||||
ai:
|
ai:
|
||||||
providers:
|
provider: "ollama"
|
||||||
local:
|
|
||||||
type: "ollama"
|
|
||||||
base_url: "http://localhost:11434/v1"
|
|
||||||
api_key: "ollama"
|
|
||||||
embeddings:
|
embeddings:
|
||||||
|
model: "nomic-embed-text"
|
||||||
dimensions: 768
|
dimensions: 768
|
||||||
primary:
|
|
||||||
provider: "local"
|
|
||||||
model: "nomic-embed-text"
|
|
||||||
metadata:
|
metadata:
|
||||||
primary:
|
model: "llama3.2"
|
||||||
provider: "local"
|
ollama:
|
||||||
model: "llama3.2"
|
base_url: "http://localhost:11434/v1"
|
||||||
|
api_key: "ollama"
|
||||||
search:
|
search:
|
||||||
default_limit: 10
|
default_limit: 10
|
||||||
max_limit: 50
|
max_limit: 50
|
||||||
@@ -146,85 +127,10 @@ logging:
|
|||||||
t.Fatalf("Load() error = %v", err)
|
t.Fatalf("Load() error = %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
p := cfg.AI.Providers["local"]
|
if cfg.AI.Ollama.BaseURL != "https://ollama.example.com/v1" {
|
||||||
if p.BaseURL != "https://ollama.example.com/v1" {
|
t.Fatalf("ollama base url = %q, want env override", cfg.AI.Ollama.BaseURL)
|
||||||
t.Fatalf("ollama base url = %q, want env override", p.BaseURL)
|
|
||||||
}
|
}
|
||||||
if p.APIKey != "remote-key" {
|
if cfg.AI.Ollama.APIKey != "remote-key" {
|
||||||
t.Fatalf("ollama api key = %q, want env override", p.APIKey)
|
t.Fatalf("ollama api key = %q, want env override", cfg.AI.Ollama.APIKey)
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestLoadMigratesV1Config(t *testing.T) {
|
|
||||||
configPath := filepath.Join(t.TempDir(), "v1.yaml")
|
|
||||||
v1 := `
|
|
||||||
server:
|
|
||||||
port: 8080
|
|
||||||
mcp:
|
|
||||||
path: "/mcp"
|
|
||||||
session_timeout: "10m"
|
|
||||||
auth:
|
|
||||||
keys:
|
|
||||||
- id: "test"
|
|
||||||
value: "secret"
|
|
||||||
database:
|
|
||||||
url: "postgres://from-file"
|
|
||||||
ai:
|
|
||||||
provider: "litellm"
|
|
||||||
embeddings:
|
|
||||||
model: "text-embed"
|
|
||||||
dimensions: 1536
|
|
||||||
metadata:
|
|
||||||
model: "gpt-4"
|
|
||||||
temperature: 0.2
|
|
||||||
fallback_models: ["gpt-3.5"]
|
|
||||||
litellm:
|
|
||||||
base_url: "http://localhost:4000/v1"
|
|
||||||
api_key: "file-key"
|
|
||||||
search:
|
|
||||||
default_limit: 10
|
|
||||||
max_limit: 50
|
|
||||||
logging:
|
|
||||||
level: "info"
|
|
||||||
`
|
|
||||||
if err := os.WriteFile(configPath, []byte(v1), 0o600); err != nil {
|
|
||||||
t.Fatalf("write config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
cfg, _, err := Load(configPath)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Load() error = %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.Version != CurrentConfigVersion {
|
|
||||||
t.Fatalf("version = %d, want %d", cfg.Version, CurrentConfigVersion)
|
|
||||||
}
|
|
||||||
if p, ok := cfg.AI.Providers["default"]; !ok || p.Type != "litellm" || p.APIKey != "file-key" {
|
|
||||||
t.Fatalf("providers[default] = %+v, want litellm/file-key", p)
|
|
||||||
}
|
|
||||||
if cfg.AI.Embeddings.Primary.Model != "text-embed" || cfg.AI.Embeddings.Primary.Provider != "default" {
|
|
||||||
t.Fatalf("embeddings.primary = %+v, want default/text-embed", cfg.AI.Embeddings.Primary)
|
|
||||||
}
|
|
||||||
if cfg.AI.Metadata.Primary.Model != "gpt-4" || cfg.AI.Metadata.Primary.Provider != "default" {
|
|
||||||
t.Fatalf("metadata.primary = %+v, want default/gpt-4", cfg.AI.Metadata.Primary)
|
|
||||||
}
|
|
||||||
if len(cfg.AI.Metadata.Fallbacks) != 1 || cfg.AI.Metadata.Fallbacks[0].Model != "gpt-3.5" {
|
|
||||||
t.Fatalf("metadata.fallbacks = %+v, want [default/gpt-3.5]", cfg.AI.Metadata.Fallbacks)
|
|
||||||
}
|
|
||||||
|
|
||||||
entries, err := filepath.Glob(configPath + ".bak.*")
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("glob backups: %v", err)
|
|
||||||
}
|
|
||||||
if len(entries) != 0 {
|
|
||||||
t.Fatalf("backup files = %d, want 0 (load should not rewrite config)", len(entries))
|
|
||||||
}
|
|
||||||
|
|
||||||
originalOnDisk, err := os.ReadFile(configPath)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("read original config: %v", err)
|
|
||||||
}
|
|
||||||
if !strings.Contains(string(originalOnDisk), "provider: \"litellm\"") {
|
|
||||||
t.Fatalf("expected source config to remain unchanged on disk")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,341 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"sort"
|
|
||||||
)
|
|
||||||
|
|
||||||
// CurrentConfigVersion is the schema version this binary expects. Files at a
|
|
||||||
// lower version are migrated automatically when loaded.
|
|
||||||
const CurrentConfigVersion = 2
|
|
||||||
|
|
||||||
// ConfigMigration upgrades a raw YAML map by one version.
|
|
||||||
type ConfigMigration struct {
|
|
||||||
From, To int
|
|
||||||
Describe string
|
|
||||||
Apply func(map[string]any) error
|
|
||||||
}
|
|
||||||
|
|
||||||
// migrations is the ordered ladder of upgrades. Add new entries at the end.
|
|
||||||
var migrations = []ConfigMigration{
|
|
||||||
{From: 1, To: 2, Describe: "named providers + role chains", Apply: migrateV1toV2},
|
|
||||||
}
|
|
||||||
|
|
||||||
// Migrate brings raw up to CurrentConfigVersion in place. Returns the list of
|
|
||||||
// migrations that were applied (may be empty if already current).
|
|
||||||
func Migrate(raw map[string]any) ([]ConfigMigration, error) {
|
|
||||||
if raw == nil {
|
|
||||||
return nil, fmt.Errorf("migrate: raw config is nil")
|
|
||||||
}
|
|
||||||
|
|
||||||
version := readVersion(raw)
|
|
||||||
if version > CurrentConfigVersion {
|
|
||||||
return nil, fmt.Errorf("migrate: config version %d is newer than supported version %d", version, CurrentConfigVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
applied := make([]ConfigMigration, 0)
|
|
||||||
for {
|
|
||||||
if version >= CurrentConfigVersion {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
step, ok := findMigration(version)
|
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("migrate: no migration registered from version %d", version)
|
|
||||||
}
|
|
||||||
if err := step.Apply(raw); err != nil {
|
|
||||||
return nil, fmt.Errorf("migrate v%d->v%d: %w", step.From, step.To, err)
|
|
||||||
}
|
|
||||||
raw["version"] = step.To
|
|
||||||
version = step.To
|
|
||||||
applied = append(applied, step)
|
|
||||||
}
|
|
||||||
return applied, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func findMigration(from int) (ConfigMigration, bool) {
|
|
||||||
for _, m := range migrations {
|
|
||||||
if m.From == from {
|
|
||||||
return m, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return ConfigMigration{}, false
|
|
||||||
}
|
|
||||||
|
|
||||||
// readVersion returns the version from raw. Files without a version field are
|
|
||||||
// treated as version 1 (the original schema).
|
|
||||||
func readVersion(raw map[string]any) int {
|
|
||||||
v, ok := raw["version"]
|
|
||||||
if !ok {
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
switch n := v.(type) {
|
|
||||||
case int:
|
|
||||||
return n
|
|
||||||
case int64:
|
|
||||||
return int(n)
|
|
||||||
case float64:
|
|
||||||
return int(n)
|
|
||||||
}
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
// migrateV1toV2 lifts the single-provider config into the named-providers +
|
|
||||||
// role-chains layout. The pre-v2 config implicitly used one provider for both
|
|
||||||
// embeddings and metadata; we materialise that as a provider named "default".
|
|
||||||
func migrateV1toV2(raw map[string]any) error {
|
|
||||||
aiRaw := mapValue(raw, "ai")
|
|
||||||
if aiRaw == nil {
|
|
||||||
aiRaw = map[string]any{}
|
|
||||||
}
|
|
||||||
|
|
||||||
providerType := stringValue(aiRaw, "provider")
|
|
||||||
if providerType == "" {
|
|
||||||
providerType = "litellm"
|
|
||||||
}
|
|
||||||
|
|
||||||
providers, embeddingModel, metadataModel, fallbackModels := buildV1Provider(aiRaw, providerType)
|
|
||||||
|
|
||||||
embeddingsOld := mapValue(aiRaw, "embeddings")
|
|
||||||
dimensions := intValue(embeddingsOld, "dimensions")
|
|
||||||
if dimensions <= 0 {
|
|
||||||
dimensions = 1536
|
|
||||||
}
|
|
||||||
if embeddingModel == "" {
|
|
||||||
embeddingModel = stringValue(embeddingsOld, "model")
|
|
||||||
}
|
|
||||||
|
|
||||||
metadataOld := mapValue(aiRaw, "metadata")
|
|
||||||
if metadataModel == "" {
|
|
||||||
metadataModel = stringValue(metadataOld, "model")
|
|
||||||
}
|
|
||||||
temperature := floatValue(metadataOld, "temperature")
|
|
||||||
logConversations := boolValue(metadataOld, "log_conversations")
|
|
||||||
timeoutStr := stringValue(metadataOld, "timeout")
|
|
||||||
|
|
||||||
if list := stringListValue(metadataOld, "fallback_models"); len(list) > 0 {
|
|
||||||
fallbackModels = append(fallbackModels, list...)
|
|
||||||
}
|
|
||||||
if v := stringValue(metadataOld, "fallback_model"); v != "" {
|
|
||||||
fallbackModels = append(fallbackModels, v)
|
|
||||||
}
|
|
||||||
|
|
||||||
embeddings := map[string]any{
|
|
||||||
"dimensions": dimensions,
|
|
||||||
"primary": map[string]any{"provider": "default", "model": embeddingModel},
|
|
||||||
}
|
|
||||||
|
|
||||||
metadata := map[string]any{
|
|
||||||
"temperature": temperature,
|
|
||||||
"log_conversations": logConversations,
|
|
||||||
"primary": map[string]any{"provider": "default", "model": metadataModel},
|
|
||||||
}
|
|
||||||
if timeoutStr != "" {
|
|
||||||
metadata["timeout"] = timeoutStr
|
|
||||||
}
|
|
||||||
if fallbacks := chainTargets("default", fallbackModels); len(fallbacks) > 0 {
|
|
||||||
metadata["fallbacks"] = fallbacks
|
|
||||||
}
|
|
||||||
|
|
||||||
raw["ai"] = map[string]any{
|
|
||||||
"providers": providers,
|
|
||||||
"embeddings": embeddings,
|
|
||||||
"metadata": metadata,
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func buildV1Provider(aiRaw map[string]any, providerType string) (map[string]any, string, string, []string) {
|
|
||||||
providers := map[string]any{}
|
|
||||||
defaultEntry := map[string]any{"type": providerType}
|
|
||||||
embedModel := ""
|
|
||||||
metaModel := ""
|
|
||||||
var fallbacks []string
|
|
||||||
|
|
||||||
switch providerType {
|
|
||||||
case "litellm":
|
|
||||||
block := mapValue(aiRaw, "litellm")
|
|
||||||
copyKeys(defaultEntry, block, "base_url", "api_key")
|
|
||||||
copyHeaders(defaultEntry, block, "request_headers")
|
|
||||||
embedModel = stringValue(block, "embedding_model")
|
|
||||||
metaModel = stringValue(block, "metadata_model")
|
|
||||||
if list := stringListValue(block, "fallback_metadata_models"); len(list) > 0 {
|
|
||||||
fallbacks = append(fallbacks, list...)
|
|
||||||
}
|
|
||||||
if v := stringValue(block, "fallback_metadata_model"); v != "" {
|
|
||||||
fallbacks = append(fallbacks, v)
|
|
||||||
}
|
|
||||||
case "ollama":
|
|
||||||
block := mapValue(aiRaw, "ollama")
|
|
||||||
copyKeys(defaultEntry, block, "base_url", "api_key")
|
|
||||||
copyHeaders(defaultEntry, block, "request_headers")
|
|
||||||
case "openrouter":
|
|
||||||
block := mapValue(aiRaw, "openrouter")
|
|
||||||
copyKeys(defaultEntry, block, "base_url", "api_key", "app_name", "site_url")
|
|
||||||
copyHeaders(defaultEntry, block, "extra_headers")
|
|
||||||
// rename: extra_headers → request_headers
|
|
||||||
if hdr, ok := defaultEntry["extra_headers"]; ok {
|
|
||||||
defaultEntry["request_headers"] = hdr
|
|
||||||
delete(defaultEntry, "extra_headers")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
providers["default"] = defaultEntry
|
|
||||||
return providers, embedModel, metaModel, fallbacks
|
|
||||||
}
|
|
||||||
|
|
||||||
func chainTargets(provider string, models []string) []any {
|
|
||||||
out := make([]any, 0, len(models))
|
|
||||||
seen := map[string]struct{}{}
|
|
||||||
for _, m := range models {
|
|
||||||
if m == "" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
key := provider + "|" + m
|
|
||||||
if _, ok := seen[key]; ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
seen[key] = struct{}{}
|
|
||||||
out = append(out, map[string]any{"provider": provider, "model": m})
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
func mapValue(raw map[string]any, key string) map[string]any {
|
|
||||||
if raw == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
v, ok := raw[key]
|
|
||||||
if !ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
switch m := v.(type) {
|
|
||||||
case map[string]any:
|
|
||||||
return m
|
|
||||||
case map[any]any:
|
|
||||||
return convertAnyMap(m)
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func convertAnyMap(in map[any]any) map[string]any {
|
|
||||||
out := make(map[string]any, len(in))
|
|
||||||
keys := make([]string, 0, len(in))
|
|
||||||
for k, v := range in {
|
|
||||||
ks, ok := k.(string)
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
keys = append(keys, ks)
|
|
||||||
out[ks] = v
|
|
||||||
}
|
|
||||||
sort.Strings(keys)
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
func stringValue(raw map[string]any, key string) string {
|
|
||||||
if raw == nil {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
v, ok := raw[key]
|
|
||||||
if !ok {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
if s, ok := v.(string); ok {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
|
|
||||||
func intValue(raw map[string]any, key string) int {
|
|
||||||
if raw == nil {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
switch n := raw[key].(type) {
|
|
||||||
case int:
|
|
||||||
return n
|
|
||||||
case int64:
|
|
||||||
return int(n)
|
|
||||||
case float64:
|
|
||||||
return int(n)
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func floatValue(raw map[string]any, key string) float64 {
|
|
||||||
if raw == nil {
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
switch n := raw[key].(type) {
|
|
||||||
case float64:
|
|
||||||
return n
|
|
||||||
case int:
|
|
||||||
return float64(n)
|
|
||||||
case int64:
|
|
||||||
return float64(n)
|
|
||||||
}
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
|
|
||||||
func boolValue(raw map[string]any, key string) bool {
|
|
||||||
if raw == nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if b, ok := raw[key].(bool); ok {
|
|
||||||
return b
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
func stringListValue(raw map[string]any, key string) []string {
|
|
||||||
if raw == nil {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
v, ok := raw[key]
|
|
||||||
if !ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
list, ok := v.([]any)
|
|
||||||
if !ok {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
out := make([]string, 0, len(list))
|
|
||||||
for _, item := range list {
|
|
||||||
if s, ok := item.(string); ok && s != "" {
|
|
||||||
out = append(out, s)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
func copyKeys(dst, src map[string]any, keys ...string) {
|
|
||||||
if src == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for _, k := range keys {
|
|
||||||
if v, ok := src[k]; ok {
|
|
||||||
dst[k] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func copyHeaders(dst, src map[string]any, key string) {
|
|
||||||
if src == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
v, ok := src[key]
|
|
||||||
if !ok {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
switch headers := v.(type) {
|
|
||||||
case map[string]any:
|
|
||||||
if len(headers) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
dst[key] = headers
|
|
||||||
case map[any]any:
|
|
||||||
if len(headers) == 0 {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
dst[key] = convertAnyMap(headers)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
package config
|
|
||||||
|
|
||||||
import "testing"
|
|
||||||
|
|
||||||
func TestMigrateV1ToV2Litellm(t *testing.T) {
|
|
||||||
raw := map[string]any{
|
|
||||||
"ai": map[string]any{
|
|
||||||
"provider": "litellm",
|
|
||||||
"embeddings": map[string]any{
|
|
||||||
"model": "text-embedding-3-small",
|
|
||||||
"dimensions": 1536,
|
|
||||||
},
|
|
||||||
"metadata": map[string]any{
|
|
||||||
"model": "gpt-4o-mini",
|
|
||||||
"temperature": 0.2,
|
|
||||||
"fallback_models": []any{"gpt-4.1-mini"},
|
|
||||||
},
|
|
||||||
"litellm": map[string]any{
|
|
||||||
"base_url": "http://localhost:4000/v1",
|
|
||||||
"api_key": "secret",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
applied, err := Migrate(raw)
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("Migrate() error = %v", err)
|
|
||||||
}
|
|
||||||
if len(applied) != 1 || applied[0].From != 1 || applied[0].To != 2 {
|
|
||||||
t.Fatalf("applied = %+v, want [v1->v2]", applied)
|
|
||||||
}
|
|
||||||
if got := readVersion(raw); got != CurrentConfigVersion {
|
|
||||||
t.Fatalf("version = %d, want %d", got, CurrentConfigVersion)
|
|
||||||
}
|
|
||||||
|
|
||||||
ai := mapValue(raw, "ai")
|
|
||||||
providers := mapValue(ai, "providers")
|
|
||||||
def := mapValue(providers, "default")
|
|
||||||
if got := stringValue(def, "type"); got != "litellm" {
|
|
||||||
t.Fatalf("providers.default.type = %q, want litellm", got)
|
|
||||||
}
|
|
||||||
if got := stringValue(def, "base_url"); got != "http://localhost:4000/v1" {
|
|
||||||
t.Fatalf("providers.default.base_url = %q", got)
|
|
||||||
}
|
|
||||||
|
|
||||||
emb := mapValue(ai, "embeddings")
|
|
||||||
embPrimary := mapValue(emb, "primary")
|
|
||||||
if stringValue(embPrimary, "provider") != "default" || stringValue(embPrimary, "model") != "text-embedding-3-small" {
|
|
||||||
t.Fatalf("embeddings.primary = %+v, want default/text-embedding-3-small", embPrimary)
|
|
||||||
}
|
|
||||||
|
|
||||||
meta := mapValue(ai, "metadata")
|
|
||||||
metaPrimary := mapValue(meta, "primary")
|
|
||||||
if stringValue(metaPrimary, "provider") != "default" || stringValue(metaPrimary, "model") != "gpt-4o-mini" {
|
|
||||||
t.Fatalf("metadata.primary = %+v, want default/gpt-4o-mini", metaPrimary)
|
|
||||||
}
|
|
||||||
fallbacks, ok := meta["fallbacks"].([]any)
|
|
||||||
if !ok || len(fallbacks) != 1 {
|
|
||||||
t.Fatalf("metadata.fallbacks = %#v, want len=1", meta["fallbacks"])
|
|
||||||
}
|
|
||||||
firstFallback, ok := fallbacks[0].(map[string]any)
|
|
||||||
if !ok {
|
|
||||||
t.Fatalf("metadata.fallbacks[0] type = %T, want map[string]any", fallbacks[0])
|
|
||||||
}
|
|
||||||
if stringValue(firstFallback, "provider") != "default" || stringValue(firstFallback, "model") != "gpt-4.1-mini" {
|
|
||||||
t.Fatalf("metadata fallback = %+v, want default/gpt-4.1-mini", firstFallback)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestMigrateRejectsNewerVersion(t *testing.T) {
|
|
||||||
raw := map[string]any{"version": CurrentConfigVersion + 1}
|
|
||||||
|
|
||||||
_, err := Migrate(raw)
|
|
||||||
if err == nil {
|
|
||||||
t.Fatal("Migrate() error = nil, want error for newer config version")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+32
-68
@@ -33,20 +33,42 @@ func (c Config) Validate() error {
|
|||||||
if strings.TrimSpace(c.MCP.Path) == "" {
|
if strings.TrimSpace(c.MCP.Path) == "" {
|
||||||
return fmt.Errorf("invalid config: mcp.path is required")
|
return fmt.Errorf("invalid config: mcp.path is required")
|
||||||
}
|
}
|
||||||
if c.MCP.SSEPath != "" {
|
|
||||||
if strings.TrimSpace(c.MCP.SSEPath) == "" {
|
|
||||||
return fmt.Errorf("invalid config: mcp.sse_path must not be blank whitespace")
|
|
||||||
}
|
|
||||||
if c.MCP.SSEPath == c.MCP.Path {
|
|
||||||
return fmt.Errorf("invalid config: mcp.sse_path %q must differ from mcp.path", c.MCP.SSEPath)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if c.MCP.SessionTimeout <= 0 {
|
if c.MCP.SessionTimeout <= 0 {
|
||||||
return fmt.Errorf("invalid config: mcp.session_timeout must be greater than zero")
|
return fmt.Errorf("invalid config: mcp.session_timeout must be greater than zero")
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := c.AI.validate(); err != nil {
|
switch c.AI.Provider {
|
||||||
return err
|
case "litellm", "ollama", "openrouter":
|
||||||
|
default:
|
||||||
|
return fmt.Errorf("invalid config: unsupported ai.provider %q", c.AI.Provider)
|
||||||
|
}
|
||||||
|
|
||||||
|
if c.AI.Embeddings.Dimensions <= 0 {
|
||||||
|
return fmt.Errorf("invalid config: ai.embeddings.dimensions must be greater than zero")
|
||||||
|
}
|
||||||
|
|
||||||
|
switch c.AI.Provider {
|
||||||
|
case "litellm":
|
||||||
|
if strings.TrimSpace(c.AI.LiteLLM.BaseURL) == "" {
|
||||||
|
return fmt.Errorf("invalid config: ai.litellm.base_url is required when ai.provider=litellm")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(c.AI.LiteLLM.APIKey) == "" {
|
||||||
|
return fmt.Errorf("invalid config: ai.litellm.api_key is required when ai.provider=litellm")
|
||||||
|
}
|
||||||
|
case "ollama":
|
||||||
|
if strings.TrimSpace(c.AI.Ollama.BaseURL) == "" {
|
||||||
|
return fmt.Errorf("invalid config: ai.ollama.base_url is required when ai.provider=ollama")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(c.AI.Ollama.APIKey) == "" {
|
||||||
|
return fmt.Errorf("invalid config: ai.ollama.api_key is required when ai.provider=ollama")
|
||||||
|
}
|
||||||
|
case "openrouter":
|
||||||
|
if strings.TrimSpace(c.AI.OpenRouter.BaseURL) == "" {
|
||||||
|
return fmt.Errorf("invalid config: ai.openrouter.base_url is required when ai.provider=openrouter")
|
||||||
|
}
|
||||||
|
if strings.TrimSpace(c.AI.OpenRouter.APIKey) == "" {
|
||||||
|
return fmt.Errorf("invalid config: ai.openrouter.api_key is required when ai.provider=openrouter")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if c.Server.Port <= 0 {
|
if c.Server.Port <= 0 {
|
||||||
@@ -78,61 +100,3 @@ func (c Config) Validate() error {
|
|||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a AIConfig) validate() error {
|
|
||||||
if len(a.Providers) == 0 {
|
|
||||||
return fmt.Errorf("invalid config: ai.providers must contain at least one entry")
|
|
||||||
}
|
|
||||||
for name, p := range a.Providers {
|
|
||||||
if strings.TrimSpace(name) == "" {
|
|
||||||
return fmt.Errorf("invalid config: ai.providers contains an entry with an empty name")
|
|
||||||
}
|
|
||||||
switch p.Type {
|
|
||||||
case "litellm", "ollama", "openrouter":
|
|
||||||
default:
|
|
||||||
return fmt.Errorf("invalid config: ai.providers.%s.type %q is not supported", name, p.Type)
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(p.BaseURL) == "" {
|
|
||||||
return fmt.Errorf("invalid config: ai.providers.%s.base_url is required", name)
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(p.APIKey) == "" {
|
|
||||||
return fmt.Errorf("invalid config: ai.providers.%s.api_key is required", name)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if a.Embeddings.Dimensions <= 0 {
|
|
||||||
return fmt.Errorf("invalid config: ai.embeddings.dimensions must be greater than zero")
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := a.validateChain("ai.embeddings", a.Embeddings.Chain()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if err := a.validateChain("ai.metadata", a.Metadata.Chain()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
if a.Background != nil {
|
|
||||||
if a.Background.Embeddings != nil {
|
|
||||||
if err := a.validateChain("ai.background.embeddings", a.Background.Embeddings.AsTargets()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if a.Background.Metadata != nil {
|
|
||||||
if err := a.validateChain("ai.background.metadata", a.Background.Metadata.AsTargets()); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (a AIConfig) validateChain(prefix string, chain []RoleTarget) error {
|
|
||||||
if len(chain) == 0 {
|
|
||||||
return fmt.Errorf("invalid config: %s.primary must reference a configured provider and model", prefix)
|
|
||||||
}
|
|
||||||
for i, target := range chain {
|
|
||||||
if _, ok := a.Providers[target.Provider]; !ok {
|
|
||||||
return fmt.Errorf("invalid config: %s[%d] references unknown provider %q", prefix, i, target.Provider)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -7,23 +7,28 @@ import (
|
|||||||
|
|
||||||
func validConfig() Config {
|
func validConfig() Config {
|
||||||
return Config{
|
return Config{
|
||||||
Version: CurrentConfigVersion,
|
Server: ServerConfig{Port: 8080},
|
||||||
Server: ServerConfig{Port: 8080},
|
MCP: MCPConfig{Path: "/mcp", SessionTimeout: 10 * time.Minute},
|
||||||
MCP: MCPConfig{Path: "/mcp", SessionTimeout: 10 * time.Minute},
|
|
||||||
Auth: AuthConfig{
|
Auth: AuthConfig{
|
||||||
Keys: []APIKey{{ID: "test", Value: "secret"}},
|
Keys: []APIKey{{ID: "test", Value: "secret"}},
|
||||||
},
|
},
|
||||||
Database: DatabaseConfig{URL: "postgres://example"},
|
Database: DatabaseConfig{URL: "postgres://example"},
|
||||||
AI: AIConfig{
|
AI: AIConfig{
|
||||||
Providers: map[string]ProviderConfig{
|
Provider: "litellm",
|
||||||
"default": {Type: "litellm", BaseURL: "http://localhost:4000/v1", APIKey: "key"},
|
Embeddings: AIEmbeddingConfig{
|
||||||
},
|
|
||||||
Embeddings: EmbeddingsRoleConfig{
|
|
||||||
Dimensions: 1536,
|
Dimensions: 1536,
|
||||||
Primary: RoleTarget{Provider: "default", Model: "text-embed"},
|
|
||||||
},
|
},
|
||||||
Metadata: MetadataRoleConfig{
|
LiteLLM: LiteLLMConfig{
|
||||||
Primary: RoleTarget{Provider: "default", Model: "gpt-4"},
|
BaseURL: "http://localhost:4000/v1",
|
||||||
|
APIKey: "key",
|
||||||
|
},
|
||||||
|
Ollama: OllamaConfig{
|
||||||
|
BaseURL: "http://localhost:11434/v1",
|
||||||
|
APIKey: "ollama",
|
||||||
|
},
|
||||||
|
OpenRouter: OpenRouterAIConfig{
|
||||||
|
BaseURL: "https://openrouter.ai/api/v1",
|
||||||
|
APIKey: "key",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
Search: SearchConfig{DefaultLimit: 10, MaxLimit: 50},
|
Search: SearchConfig{DefaultLimit: 10, MaxLimit: 50},
|
||||||
@@ -31,44 +36,29 @@ func validConfig() Config {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestValidateAcceptsSupportedProviderTypes(t *testing.T) {
|
func TestValidateAcceptsSupportedProviders(t *testing.T) {
|
||||||
for _, providerType := range []string{"litellm", "ollama", "openrouter"} {
|
cfg := validConfig()
|
||||||
cfg := validConfig()
|
if err := cfg.Validate(); err != nil {
|
||||||
p := cfg.AI.Providers["default"]
|
t.Fatalf("Validate litellm error = %v", err)
|
||||||
p.Type = providerType
|
}
|
||||||
cfg.AI.Providers["default"] = p
|
|
||||||
if err := cfg.Validate(); err != nil {
|
cfg.AI.Provider = "ollama"
|
||||||
t.Fatalf("Validate %s error = %v", providerType, err)
|
if err := cfg.Validate(); err != nil {
|
||||||
}
|
t.Fatalf("Validate ollama error = %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
cfg.AI.Provider = "openrouter"
|
||||||
|
if err := cfg.Validate(); err != nil {
|
||||||
|
t.Fatalf("Validate openrouter error = %v", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestValidateRejectsInvalidProviderType(t *testing.T) {
|
func TestValidateRejectsInvalidProvider(t *testing.T) {
|
||||||
cfg := validConfig()
|
cfg := validConfig()
|
||||||
p := cfg.AI.Providers["default"]
|
cfg.AI.Provider = "unknown"
|
||||||
p.Type = "unknown"
|
|
||||||
cfg.AI.Providers["default"] = p
|
|
||||||
|
|
||||||
if err := cfg.Validate(); err == nil {
|
if err := cfg.Validate(); err == nil {
|
||||||
t.Fatal("Validate() error = nil, want error for unsupported provider type")
|
t.Fatal("Validate() error = nil, want error for unsupported provider")
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestValidateRejectsChainWithUnknownProvider(t *testing.T) {
|
|
||||||
cfg := validConfig()
|
|
||||||
cfg.AI.Metadata.Primary = RoleTarget{Provider: "does-not-exist", Model: "x"}
|
|
||||||
|
|
||||||
if err := cfg.Validate(); err == nil {
|
|
||||||
t.Fatal("Validate() error = nil, want error for chain referencing unknown provider")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestValidateRejectsEmptyProviders(t *testing.T) {
|
|
||||||
cfg := validConfig()
|
|
||||||
cfg.AI.Providers = map[string]ProviderConfig{}
|
|
||||||
|
|
||||||
if err := cfg.Validate(); err == nil {
|
|
||||||
t.Fatal("Validate() error = nil, want error for empty providers")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentGuardrails struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_guardrails,alias:agent_guardrails"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
Content resolvespec_common.SqlString `bun:"content,type:text,notnull," json:"content"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
Severity resolvespec_common.SqlString `bun:"severity,type:text,default:'medium',notnull," json:"severity"`
|
|
||||||
Tags resolvespec_common.SqlStringArray `bun:"tags,type:text,default:'{}',notnull," json:"tags"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelGuardrailIDPublicAgentPersonaGuardrails []*ModelPublicAgentPersonaGuardrails `bun:"rel:has-many,join:id=guardrail_id" json:"relguardrailidpublicagentpersonaguardrails,omitempty"` // Has many ModelPublicAgentPersonaGuardrails
|
|
||||||
RelGuardrailIDPublicPlanGuardrails []*ModelPublicPlanGuardrails `bun:"rel:has-many,join:id=guardrail_id" json:"relguardrailidpublicplanguardrails,omitempty"` // Has many ModelPublicPlanGuardrails
|
|
||||||
RelGuardrailIDPublicProjectGuardrails []*ModelPublicProjectGuardrails `bun:"rel:has-many,join:id=guardrail_id" json:"relguardrailidpublicprojectguardrails,omitempty"` // Has many ModelPublicProjectGuardrails
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentGuardrails
|
|
||||||
func (m ModelPublicAgentGuardrails) TableName() string {
|
|
||||||
return "public.agent_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentGuardrails
|
|
||||||
func (m ModelPublicAgentGuardrails) TableNameOnly() string {
|
|
||||||
return "agent_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentGuardrails
|
|
||||||
func (m ModelPublicAgentGuardrails) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentGuardrails) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentGuardrails) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentGuardrails) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentGuardrails) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentGuardrails) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentGuardrails) GetPrefix() string {
|
|
||||||
return "AGG"
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentParts struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_parts,alias:agent_parts"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
Content resolvespec_common.SqlString `bun:"content,type:text,default:'',notnull," json:"content"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
PartType resolvespec_common.SqlString `bun:"part_type,type:text,notnull," json:"part_type"`
|
|
||||||
Summary resolvespec_common.SqlString `bun:"summary,type:text,notnull," json:"summary"`
|
|
||||||
Tags resolvespec_common.SqlStringArray `bun:"tags,type:text,default:'{}',notnull," json:"tags"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelPartIDPublicAgentPersonaParts []*ModelPublicAgentPersonaParts `bun:"rel:has-many,join:id=part_id" json:"relpartidpublicagentpersonaparts,omitempty"` // Has many ModelPublicAgentPersonaParts
|
|
||||||
RelPartIDPublicArcStageParts []*ModelPublicArcStageParts `bun:"rel:has-many,join:id=part_id" json:"relpartidpublicarcstageparts,omitempty"` // Has many ModelPublicArcStageParts
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentParts
|
|
||||||
func (m ModelPublicAgentParts) TableName() string {
|
|
||||||
return "public.agent_parts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentParts
|
|
||||||
func (m ModelPublicAgentParts) TableNameOnly() string {
|
|
||||||
return "agent_parts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentParts
|
|
||||||
func (m ModelPublicAgentParts) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentParts) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentParts) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentParts) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentParts) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentParts) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentParts) GetPrefix() string {
|
|
||||||
return "APG"
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentPersonaGuardrails struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_persona_guardrails,alias:agent_persona_guardrails"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
GuardrailID int64 `bun:"guardrail_id,type:bigint,notnull," json:"guardrail_id"`
|
|
||||||
PersonaID int64 `bun:"persona_id,type:bigint,notnull," json:"persona_id"`
|
|
||||||
RelGuardrailID *ModelPublicAgentGuardrails `bun:"rel:has-one,join:guardrail_id=id" json:"relguardrailid,omitempty"` // Has one ModelPublicAgentGuardrails
|
|
||||||
RelPersonaID *ModelPublicAgentPersonas `bun:"rel:has-one,join:persona_id=id" json:"relpersonaid,omitempty"` // Has one ModelPublicAgentPersonas
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentPersonaGuardrails
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) TableName() string {
|
|
||||||
return "public.agent_persona_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentPersonaGuardrails
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) TableNameOnly() string {
|
|
||||||
return "agent_persona_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentPersonaGuardrails
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentPersonaGuardrails) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentPersonaGuardrails) GetPrefix() string {
|
|
||||||
return "APG"
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentPersonaParts struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_persona_parts,alias:agent_persona_parts"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
PartID int64 `bun:"part_id,type:bigint,notnull," json:"part_id"`
|
|
||||||
PartOrder int32 `bun:"part_order,type:int,default:0,notnull," json:"part_order"`
|
|
||||||
PersonaID int64 `bun:"persona_id,type:bigint,notnull," json:"persona_id"`
|
|
||||||
Priority int32 `bun:"priority,type:int,default:0,notnull," json:"priority"`
|
|
||||||
RelPartID *ModelPublicAgentParts `bun:"rel:has-one,join:part_id=id" json:"relpartid,omitempty"` // Has one ModelPublicAgentParts
|
|
||||||
RelPersonaID *ModelPublicAgentPersonas `bun:"rel:has-one,join:persona_id=id" json:"relpersonaid,omitempty"` // Has one ModelPublicAgentPersonas
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentPersonaParts
|
|
||||||
func (m ModelPublicAgentPersonaParts) TableName() string {
|
|
||||||
return "public.agent_persona_parts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentPersonaParts
|
|
||||||
func (m ModelPublicAgentPersonaParts) TableNameOnly() string {
|
|
||||||
return "agent_persona_parts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentPersonaParts
|
|
||||||
func (m ModelPublicAgentPersonaParts) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaParts) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentPersonaParts) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaParts) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentPersonaParts) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentPersonaParts) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentPersonaParts) GetPrefix() string {
|
|
||||||
return "APP"
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentPersonaSkills struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_persona_skills,alias:agent_persona_skills"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
PersonaID int64 `bun:"persona_id,type:bigint,notnull," json:"persona_id"`
|
|
||||||
SkillID int64 `bun:"skill_id,type:bigint,notnull," json:"skill_id"`
|
|
||||||
RelPersonaID *ModelPublicAgentPersonas `bun:"rel:has-one,join:persona_id=id" json:"relpersonaid,omitempty"` // Has one ModelPublicAgentPersonas
|
|
||||||
RelSkillID *ModelPublicAgentSkills `bun:"rel:has-one,join:skill_id=id" json:"relskillid,omitempty"` // Has one ModelPublicAgentSkills
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentPersonaSkills
|
|
||||||
func (m ModelPublicAgentPersonaSkills) TableName() string {
|
|
||||||
return "public.agent_persona_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentPersonaSkills
|
|
||||||
func (m ModelPublicAgentPersonaSkills) TableNameOnly() string {
|
|
||||||
return "agent_persona_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentPersonaSkills
|
|
||||||
func (m ModelPublicAgentPersonaSkills) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaSkills) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentPersonaSkills) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaSkills) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentPersonaSkills) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentPersonaSkills) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentPersonaSkills) GetPrefix() string {
|
|
||||||
return "APS"
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentPersonaTraits struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_persona_traits,alias:agent_persona_traits"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
PersonaID int64 `bun:"persona_id,type:bigint,notnull," json:"persona_id"`
|
|
||||||
TraitID int64 `bun:"trait_id,type:bigint,notnull," json:"trait_id"`
|
|
||||||
RelPersonaID *ModelPublicAgentPersonas `bun:"rel:has-one,join:persona_id=id" json:"relpersonaid,omitempty"` // Has one ModelPublicAgentPersonas
|
|
||||||
RelTraitID *ModelPublicAgentTraits `bun:"rel:has-one,join:trait_id=id" json:"reltraitid,omitempty"` // Has one ModelPublicAgentTraits
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentPersonaTraits
|
|
||||||
func (m ModelPublicAgentPersonaTraits) TableName() string {
|
|
||||||
return "public.agent_persona_traits"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentPersonaTraits
|
|
||||||
func (m ModelPublicAgentPersonaTraits) TableNameOnly() string {
|
|
||||||
return "agent_persona_traits"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentPersonaTraits
|
|
||||||
func (m ModelPublicAgentPersonaTraits) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaTraits) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentPersonaTraits) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentPersonaTraits) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentPersonaTraits) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentPersonaTraits) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentPersonaTraits) GetPrefix() string {
|
|
||||||
return "APT"
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentPersonas struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_personas,alias:agent_personas"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CompiledAt resolvespec_common.SqlTimeStamp `bun:"compiled_at,type:timestamptz,nullzero," json:"compiled_at"`
|
|
||||||
CompiledDetail resolvespec_common.SqlString `bun:"compiled_detail,type:text,default:'',notnull," json:"compiled_detail"`
|
|
||||||
CompiledSummary resolvespec_common.SqlString `bun:"compiled_summary,type:text,default:'',notnull," json:"compiled_summary"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
Detail resolvespec_common.SqlString `bun:"detail,type:text,default:'',notnull," json:"detail"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
Summary resolvespec_common.SqlString `bun:"summary,type:text,notnull," json:"summary"`
|
|
||||||
Tags resolvespec_common.SqlStringArray `bun:"tags,type:text,default:'{}',notnull," json:"tags"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelPersonaIDPublicAgentPersonaParts []*ModelPublicAgentPersonaParts `bun:"rel:has-many,join:id=persona_id" json:"relpersonaidpublicagentpersonaparts,omitempty"` // Has many ModelPublicAgentPersonaParts
|
|
||||||
RelPersonaIDPublicAgentPersonaSkills []*ModelPublicAgentPersonaSkills `bun:"rel:has-many,join:id=persona_id" json:"relpersonaidpublicagentpersonaskills,omitempty"` // Has many ModelPublicAgentPersonaSkills
|
|
||||||
RelPersonaIDPublicAgentPersonaGuardrails []*ModelPublicAgentPersonaGuardrails `bun:"rel:has-many,join:id=persona_id" json:"relpersonaidpublicagentpersonaguardrails,omitempty"` // Has many ModelPublicAgentPersonaGuardrails
|
|
||||||
RelPersonaIDPublicAgentPersonaTraits []*ModelPublicAgentPersonaTraits `bun:"rel:has-many,join:id=persona_id" json:"relpersonaidpublicagentpersonatraits,omitempty"` // Has many ModelPublicAgentPersonaTraits
|
|
||||||
RelPersonaIDPublicPersonaArcs []*ModelPublicPersonaArc `bun:"rel:has-many,join:id=persona_id" json:"relpersonaidpublicpersonaarcs,omitempty"` // Has many ModelPublicPersonaArc
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentPersonas
|
|
||||||
func (m ModelPublicAgentPersonas) TableName() string {
|
|
||||||
return "public.agent_personas"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentPersonas
|
|
||||||
func (m ModelPublicAgentPersonas) TableNameOnly() string {
|
|
||||||
return "agent_personas"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentPersonas
|
|
||||||
func (m ModelPublicAgentPersonas) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentPersonas) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentPersonas) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentPersonas) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentPersonas) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentPersonas) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentPersonas) GetPrefix() string {
|
|
||||||
return "APG"
|
|
||||||
}
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentSkills struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_skills,alias:agent_skills"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
Content resolvespec_common.SqlString `bun:"content,type:text,notnull," json:"content"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
DomainTags resolvespec_common.SqlStringArray `bun:"domain_tags,type:text,default:'{}',notnull," json:"domain_tags"`
|
|
||||||
FrameworkTags resolvespec_common.SqlStringArray `bun:"framework_tags,type:text,default:'{}',notnull," json:"framework_tags"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
LanguageTags resolvespec_common.SqlStringArray `bun:"language_tags,type:text,default:'{}',notnull," json:"language_tags"`
|
|
||||||
LibraryTags resolvespec_common.SqlStringArray `bun:"library_tags,type:text,default:'{}',notnull," json:"library_tags"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
Tags resolvespec_common.SqlStringArray `bun:"tags,type:text,default:'{}',notnull," json:"tags"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelSkillIDPublicAgentPersonaSkills []*ModelPublicAgentPersonaSkills `bun:"rel:has-many,join:id=skill_id" json:"relskillidpublicagentpersonaskills,omitempty"` // Has many ModelPublicAgentPersonaSkills
|
|
||||||
RelRelatedSkillIDPublicLearnings []*ModelPublicLearnings `bun:"rel:has-many,join:id=related_skill_id" json:"relrelatedskillidpubliclearnings,omitempty"` // Has many ModelPublicLearnings
|
|
||||||
RelSkillIDPublicPlanSkills []*ModelPublicPlanSkills `bun:"rel:has-many,join:id=skill_id" json:"relskillidpublicplanskills,omitempty"` // Has many ModelPublicPlanSkills
|
|
||||||
RelSkillIDPublicProjectSkills []*ModelPublicProjectSkills `bun:"rel:has-many,join:id=skill_id" json:"relskillidpublicprojectskills,omitempty"` // Has many ModelPublicProjectSkills
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentSkills
|
|
||||||
func (m ModelPublicAgentSkills) TableName() string {
|
|
||||||
return "public.agent_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentSkills
|
|
||||||
func (m ModelPublicAgentSkills) TableNameOnly() string {
|
|
||||||
return "agent_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentSkills
|
|
||||||
func (m ModelPublicAgentSkills) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentSkills) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentSkills) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentSkills) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentSkills) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentSkills) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentSkills) GetPrefix() string {
|
|
||||||
return "ASG"
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicAgentTraits struct {
|
|
||||||
bun.BaseModel `bun:"table:public.agent_traits,alias:agent_traits"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Instruction resolvespec_common.SqlString `bun:"instruction,type:text,default:'',notnull," json:"instruction"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
Tags resolvespec_common.SqlStringArray `bun:"tags,type:text,default:'{}',notnull," json:"tags"`
|
|
||||||
TraitType resolvespec_common.SqlString `bun:"trait_type,type:text,notnull," json:"trait_type"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelTraitIDPublicAgentPersonaTraits []*ModelPublicAgentPersonaTraits `bun:"rel:has-many,join:id=trait_id" json:"reltraitidpublicagentpersonatraits,omitempty"` // Has many ModelPublicAgentPersonaTraits
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicAgentTraits
|
|
||||||
func (m ModelPublicAgentTraits) TableName() string {
|
|
||||||
return "public.agent_traits"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicAgentTraits
|
|
||||||
func (m ModelPublicAgentTraits) TableNameOnly() string {
|
|
||||||
return "agent_traits"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicAgentTraits
|
|
||||||
func (m ModelPublicAgentTraits) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicAgentTraits) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicAgentTraits) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicAgentTraits) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicAgentTraits) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicAgentTraits) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicAgentTraits) GetPrefix() string {
|
|
||||||
return "ATG"
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicArcStageParts struct {
|
|
||||||
bun.BaseModel `bun:"table:public.arc_stage_parts,alias:arc_stage_parts"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
PartID int64 `bun:"part_id,type:bigint,notnull," json:"part_id"`
|
|
||||||
StageID int64 `bun:"stage_id,type:bigint,notnull," json:"stage_id"`
|
|
||||||
RelPartID *ModelPublicAgentParts `bun:"rel:has-one,join:part_id=id" json:"relpartid,omitempty"` // Has one ModelPublicAgentParts
|
|
||||||
RelStageID *ModelPublicArcStages `bun:"rel:has-one,join:stage_id=id" json:"relstageid,omitempty"` // Has one ModelPublicArcStages
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicArcStageParts
|
|
||||||
func (m ModelPublicArcStageParts) TableName() string {
|
|
||||||
return "public.arc_stage_parts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicArcStageParts
|
|
||||||
func (m ModelPublicArcStageParts) TableNameOnly() string {
|
|
||||||
return "arc_stage_parts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicArcStageParts
|
|
||||||
func (m ModelPublicArcStageParts) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicArcStageParts) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicArcStageParts) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicArcStageParts) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicArcStageParts) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicArcStageParts) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicArcStageParts) GetPrefix() string {
|
|
||||||
return "ASP"
|
|
||||||
}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicArcStages struct {
|
|
||||||
bun.BaseModel `bun:"table:public.arc_stages,alias:arc_stages"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
ArcID int64 `bun:"arc_id,type:bigint,notnull," json:"arc_id"`
|
|
||||||
Condition resolvespec_common.SqlString `bun:"condition,type:text,default:'',notnull," json:"condition"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
StageOrder int32 `bun:"stage_order,type:int,default:0,notnull," json:"stage_order"`
|
|
||||||
RelArcID *ModelPublicCharacterArcs `bun:"rel:has-one,join:arc_id=id" json:"relarcid,omitempty"` // Has one ModelPublicCharacterArcs
|
|
||||||
RelStageIDPublicArcStageParts []*ModelPublicArcStageParts `bun:"rel:has-many,join:id=stage_id" json:"relstageidpublicarcstageparts,omitempty"` // Has many ModelPublicArcStageParts
|
|
||||||
RelCurrentStageIDPublicPersonaArcs []*ModelPublicPersonaArc `bun:"rel:has-many,join:id=current_stage_id" json:"relcurrentstageidpublicpersonaarcs,omitempty"` // Has many ModelPublicPersonaArc
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicArcStages
|
|
||||||
func (m ModelPublicArcStages) TableName() string {
|
|
||||||
return "public.arc_stages"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicArcStages
|
|
||||||
func (m ModelPublicArcStages) TableNameOnly() string {
|
|
||||||
return "arc_stages"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicArcStages
|
|
||||||
func (m ModelPublicArcStages) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicArcStages) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicArcStages) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicArcStages) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicArcStages) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicArcStages) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicArcStages) GetPrefix() string {
|
|
||||||
return "ASR"
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicCharacterArcs struct {
|
|
||||||
bun.BaseModel `bun:"table:public.character_arcs,alias:character_arcs"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
Summary resolvespec_common.SqlString `bun:"summary,type:text,default:'',notnull," json:"summary"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelArcIDPublicArcStages []*ModelPublicArcStages `bun:"rel:has-many,join:id=arc_id" json:"relarcidpublicarcstages,omitempty"` // Has many ModelPublicArcStages
|
|
||||||
RelArcIDPublicPersonaArcs []*ModelPublicPersonaArc `bun:"rel:has-many,join:id=arc_id" json:"relarcidpublicpersonaarcs,omitempty"` // Has many ModelPublicPersonaArc
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicCharacterArcs
|
|
||||||
func (m ModelPublicCharacterArcs) TableName() string {
|
|
||||||
return "public.character_arcs"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicCharacterArcs
|
|
||||||
func (m ModelPublicCharacterArcs) TableNameOnly() string {
|
|
||||||
return "character_arcs"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicCharacterArcs
|
|
||||||
func (m ModelPublicCharacterArcs) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicCharacterArcs) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicCharacterArcs) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicCharacterArcs) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicCharacterArcs) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicCharacterArcs) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicCharacterArcs) GetPrefix() string {
|
|
||||||
return "CAH"
|
|
||||||
}
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicChatHistories struct {
|
|
||||||
bun.BaseModel `bun:"table:public.chat_histories,alias:chat_histories"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
AgentID resolvespec_common.SqlString `bun:"agent_id,type:text,nullzero," json:"agent_id"`
|
|
||||||
Channel resolvespec_common.SqlString `bun:"channel,type:text,nullzero," json:"channel"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Messages resolvespec_common.SqlJSONB `bun:"messages,type:jsonb,default:'',notnull," json:"messages"`
|
|
||||||
Metadata resolvespec_common.SqlJSONB `bun:"metadata,type:jsonb,default:'{}',notnull," json:"metadata"`
|
|
||||||
ProjectID resolvespec_common.SqlInt64 `bun:"project_id,type:bigint,nullzero," json:"project_id"`
|
|
||||||
SessionID resolvespec_common.SqlString `bun:"session_id,type:text,notnull," json:"session_id"`
|
|
||||||
Summary resolvespec_common.SqlString `bun:"summary,type:text,nullzero," json:"summary"`
|
|
||||||
Title resolvespec_common.SqlString `bun:"title,type:text,nullzero," json:"title"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelProjectID *ModelPublicProjects `bun:"rel:has-one,join:project_id=id" json:"relprojectid,omitempty"` // Has one ModelPublicProjects
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicChatHistories
|
|
||||||
func (m ModelPublicChatHistories) TableName() string {
|
|
||||||
return "public.chat_histories"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicChatHistories
|
|
||||||
func (m ModelPublicChatHistories) TableNameOnly() string {
|
|
||||||
return "chat_histories"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicChatHistories
|
|
||||||
func (m ModelPublicChatHistories) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicChatHistories) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicChatHistories) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicChatHistories) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicChatHistories) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicChatHistories) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicChatHistories) GetPrefix() string {
|
|
||||||
return "CHH"
|
|
||||||
}
|
|
||||||
@@ -1,66 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicEmbeddings struct {
|
|
||||||
bun.BaseModel `bun:"table:public.embeddings,alias:embeddings"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),nullzero," json:"created_at"`
|
|
||||||
Dim int32 `bun:"dim,type:int,notnull," json:"dim"`
|
|
||||||
Embedding resolvespec_common.SqlVector `bun:"embedding,type:vector,notnull," json:"embedding"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Model resolvespec_common.SqlString `bun:"model,type:text,notnull,unique:uidx_embeddings_thought_id_model," json:"model"`
|
|
||||||
ThoughtID int64 `bun:"thought_id,type:bigint,notnull,unique:uidx_embeddings_thought_id_model," json:"thought_id"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),nullzero," json:"updated_at"`
|
|
||||||
RelThoughtID *ModelPublicThoughts `bun:"rel:has-one,join:thought_id=id" json:"relthoughtid,omitempty"` // Has one ModelPublicThoughts
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicEmbeddings
|
|
||||||
func (m ModelPublicEmbeddings) TableName() string {
|
|
||||||
return "public.embeddings"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicEmbeddings
|
|
||||||
func (m ModelPublicEmbeddings) TableNameOnly() string {
|
|
||||||
return "embeddings"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicEmbeddings
|
|
||||||
func (m ModelPublicEmbeddings) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicEmbeddings) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicEmbeddings) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicEmbeddings) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicEmbeddings) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicEmbeddings) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicEmbeddings) GetPrefix() string {
|
|
||||||
return "EMB"
|
|
||||||
}
|
|
||||||
@@ -1,84 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicLearnings struct {
|
|
||||||
bun.BaseModel `bun:"table:public.learnings,alias:learnings"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
ActionRequired bool `bun:"action_required,type:boolean,default:false,notnull," json:"action_required"`
|
|
||||||
Area resolvespec_common.SqlString `bun:"area,type:text,default:'other',notnull," json:"area"`
|
|
||||||
Category resolvespec_common.SqlString `bun:"category,type:text,default:'insight',notnull," json:"category"`
|
|
||||||
Confidence resolvespec_common.SqlString `bun:"confidence,type:text,default:'hypothesis',notnull," json:"confidence"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Details resolvespec_common.SqlString `bun:"details,type:text,default:'',notnull," json:"details"`
|
|
||||||
DuplicateOfLearningID resolvespec_common.SqlInt64 `bun:"duplicate_of_learning_id,type:bigint,nullzero," json:"duplicate_of_learning_id"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Priority resolvespec_common.SqlString `bun:"priority,type:text,default:'medium',notnull," json:"priority"`
|
|
||||||
ProjectID resolvespec_common.SqlInt64 `bun:"project_id,type:bigint,nullzero," json:"project_id"`
|
|
||||||
RelatedSkillID resolvespec_common.SqlInt64 `bun:"related_skill_id,type:bigint,nullzero," json:"related_skill_id"`
|
|
||||||
RelatedThoughtID resolvespec_common.SqlInt64 `bun:"related_thought_id,type:bigint,nullzero," json:"related_thought_id"`
|
|
||||||
ReviewedAt resolvespec_common.SqlTimeStamp `bun:"reviewed_at,type:timestamptz,nullzero," json:"reviewed_at"`
|
|
||||||
ReviewedBy resolvespec_common.SqlString `bun:"reviewed_by,type:text,nullzero," json:"reviewed_by"`
|
|
||||||
SourceRef resolvespec_common.SqlString `bun:"source_ref,type:text,nullzero," json:"source_ref"`
|
|
||||||
SourceType resolvespec_common.SqlString `bun:"source_type,type:text,nullzero," json:"source_type"`
|
|
||||||
Status resolvespec_common.SqlString `bun:"status,type:text,default:'pending',notnull," json:"status"`
|
|
||||||
Summary resolvespec_common.SqlString `bun:"summary,type:text,notnull," json:"summary"`
|
|
||||||
SupersedesLearningID resolvespec_common.SqlInt64 `bun:"supersedes_learning_id,type:bigint,nullzero," json:"supersedes_learning_id"`
|
|
||||||
Tags resolvespec_common.SqlStringArray `bun:"tags,type:text,default:'{}',notnull," json:"tags"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelDuplicateOfLearningID *ModelPublicLearnings `bun:"rel:has-one,join:duplicate_of_learning_id=id" json:"relduplicateoflearningid,omitempty"` // Has one ModelPublicLearnings
|
|
||||||
RelProjectID *ModelPublicProjects `bun:"rel:has-one,join:project_id=id" json:"relprojectid,omitempty"` // Has one ModelPublicProjects
|
|
||||||
RelRelatedSkillID *ModelPublicAgentSkills `bun:"rel:has-one,join:related_skill_id=id" json:"relrelatedskillid,omitempty"` // Has one ModelPublicAgentSkills
|
|
||||||
RelRelatedThoughtID *ModelPublicThoughts `bun:"rel:has-one,join:related_thought_id=id" json:"relrelatedthoughtid,omitempty"` // Has one ModelPublicThoughts
|
|
||||||
RelSupersedesLearningID *ModelPublicLearnings `bun:"rel:has-one,join:supersedes_learning_id=id" json:"relsupersedeslearningid,omitempty"` // Has one ModelPublicLearnings
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicLearnings
|
|
||||||
func (m ModelPublicLearnings) TableName() string {
|
|
||||||
return "public.learnings"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicLearnings
|
|
||||||
func (m ModelPublicLearnings) TableNameOnly() string {
|
|
||||||
return "learnings"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicLearnings
|
|
||||||
func (m ModelPublicLearnings) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicLearnings) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicLearnings) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicLearnings) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicLearnings) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicLearnings) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicLearnings) GetPrefix() string {
|
|
||||||
return "LEA"
|
|
||||||
}
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicOauthClients struct {
|
|
||||||
bun.BaseModel `bun:"table:public.oauth_clients,alias:oauth_clients"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
ClientID resolvespec_common.SqlString `bun:"client_id,type:text,notnull," json:"client_id"`
|
|
||||||
ClientName resolvespec_common.SqlString `bun:"client_name,type:text,default:'',notnull," json:"client_name"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
RedirectUris resolvespec_common.SqlStringArray `bun:"redirect_uris,type:text,default:'{}',notnull," json:"redirect_uris"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicOauthClients
|
|
||||||
func (m ModelPublicOauthClients) TableName() string {
|
|
||||||
return "public.oauth_clients"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicOauthClients
|
|
||||||
func (m ModelPublicOauthClients) TableNameOnly() string {
|
|
||||||
return "oauth_clients"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicOauthClients
|
|
||||||
func (m ModelPublicOauthClients) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicOauthClients) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicOauthClients) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicOauthClients) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicOauthClients) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicOauthClients) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicOauthClients) GetPrefix() string {
|
|
||||||
return "OCA"
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicPersonaArc struct {
|
|
||||||
bun.BaseModel `bun:"table:public.persona_arc,alias:persona_arc"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
PersonaID int64 `bun:"persona_id,type:bigint,pk," json:"persona_id"`
|
|
||||||
ArcID int64 `bun:"arc_id,type:bigint,notnull," json:"arc_id"`
|
|
||||||
CurrentStageID int64 `bun:"current_stage_id,type:bigint,notnull," json:"current_stage_id"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelArcID *ModelPublicCharacterArcs `bun:"rel:has-one,join:arc_id=id" json:"relarcid,omitempty"` // Has one ModelPublicCharacterArcs
|
|
||||||
RelCurrentStageID *ModelPublicArcStages `bun:"rel:has-one,join:current_stage_id=id" json:"relcurrentstageid,omitempty"` // Has one ModelPublicArcStages
|
|
||||||
RelPersonaID *ModelPublicAgentPersonas `bun:"rel:has-one,join:persona_id=id" json:"relpersonaid,omitempty"` // Has one ModelPublicAgentPersonas
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicPersonaArc
|
|
||||||
func (m ModelPublicPersonaArc) TableName() string {
|
|
||||||
return "public.persona_arc"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicPersonaArc
|
|
||||||
func (m ModelPublicPersonaArc) TableNameOnly() string {
|
|
||||||
return "persona_arc"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicPersonaArc
|
|
||||||
func (m ModelPublicPersonaArc) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicPersonaArc) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicPersonaArc) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicPersonaArc) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicPersonaArc) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicPersonaArc) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicPersonaArc) GetPrefix() string {
|
|
||||||
return "PAE"
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicPlanDependencies struct {
|
|
||||||
bun.BaseModel `bun:"table:public.plan_dependencies,alias:plan_dependencies"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
DependsOnPlanID int64 `bun:"depends_on_plan_id,type:bigint,notnull,unique:uidx_plan_dependencies_plan_id_depends_on_plan_id," json:"depends_on_plan_id"`
|
|
||||||
PlanID int64 `bun:"plan_id,type:bigint,notnull,unique:uidx_plan_dependencies_plan_id_depends_on_plan_id," json:"plan_id"`
|
|
||||||
RelDependsOnPlanID *ModelPublicPlans `bun:"rel:has-one,join:depends_on_plan_id=id" json:"reldependsonplanid,omitempty"` // Has one ModelPublicPlans
|
|
||||||
RelPlanID *ModelPublicPlans `bun:"rel:has-one,join:plan_id=id" json:"relplanid,omitempty"` // Has one ModelPublicPlans
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicPlanDependencies
|
|
||||||
func (m ModelPublicPlanDependencies) TableName() string {
|
|
||||||
return "public.plan_dependencies"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicPlanDependencies
|
|
||||||
func (m ModelPublicPlanDependencies) TableNameOnly() string {
|
|
||||||
return "plan_dependencies"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicPlanDependencies
|
|
||||||
func (m ModelPublicPlanDependencies) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicPlanDependencies) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicPlanDependencies) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicPlanDependencies) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicPlanDependencies) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicPlanDependencies) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicPlanDependencies) GetPrefix() string {
|
|
||||||
return "PDL"
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicPlanGuardrails struct {
|
|
||||||
bun.BaseModel `bun:"table:public.plan_guardrails,alias:plan_guardrails"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
GuardrailID int64 `bun:"guardrail_id,type:bigint,notnull,unique:uidx_plan_guardrails_plan_id_guardrail_id," json:"guardrail_id"`
|
|
||||||
PlanID int64 `bun:"plan_id,type:bigint,notnull,unique:uidx_plan_guardrails_plan_id_guardrail_id," json:"plan_id"`
|
|
||||||
RelGuardrailID *ModelPublicAgentGuardrails `bun:"rel:has-one,join:guardrail_id=id" json:"relguardrailid,omitempty"` // Has one ModelPublicAgentGuardrails
|
|
||||||
RelPlanID *ModelPublicPlans `bun:"rel:has-one,join:plan_id=id" json:"relplanid,omitempty"` // Has one ModelPublicPlans
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicPlanGuardrails
|
|
||||||
func (m ModelPublicPlanGuardrails) TableName() string {
|
|
||||||
return "public.plan_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicPlanGuardrails
|
|
||||||
func (m ModelPublicPlanGuardrails) TableNameOnly() string {
|
|
||||||
return "plan_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicPlanGuardrails
|
|
||||||
func (m ModelPublicPlanGuardrails) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicPlanGuardrails) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicPlanGuardrails) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicPlanGuardrails) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicPlanGuardrails) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicPlanGuardrails) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicPlanGuardrails) GetPrefix() string {
|
|
||||||
return "PGL"
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicPlanRelatedPlans struct {
|
|
||||||
bun.BaseModel `bun:"table:public.plan_related_plans,alias:plan_related_plans"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
PlanAID int64 `bun:"plan_a_id,type:bigint,notnull,unique:uidx_plan_related_plans_plan_a_id_plan_b_id," json:"plan_a_id"`
|
|
||||||
PlanBID int64 `bun:"plan_b_id,type:bigint,notnull,unique:uidx_plan_related_plans_plan_a_id_plan_b_id," json:"plan_b_id"`
|
|
||||||
RelPlanAID *ModelPublicPlans `bun:"rel:has-one,join:plan_a_id=id" json:"relplanaid,omitempty"` // Has one ModelPublicPlans
|
|
||||||
RelPlanBID *ModelPublicPlans `bun:"rel:has-one,join:plan_b_id=id" json:"relplanbid,omitempty"` // Has one ModelPublicPlans
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicPlanRelatedPlans
|
|
||||||
func (m ModelPublicPlanRelatedPlans) TableName() string {
|
|
||||||
return "public.plan_related_plans"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicPlanRelatedPlans
|
|
||||||
func (m ModelPublicPlanRelatedPlans) TableNameOnly() string {
|
|
||||||
return "plan_related_plans"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicPlanRelatedPlans
|
|
||||||
func (m ModelPublicPlanRelatedPlans) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicPlanRelatedPlans) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicPlanRelatedPlans) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicPlanRelatedPlans) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicPlanRelatedPlans) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicPlanRelatedPlans) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicPlanRelatedPlans) GetPrefix() string {
|
|
||||||
return "PRP"
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicPlanSkills struct {
|
|
||||||
bun.BaseModel `bun:"table:public.plan_skills,alias:plan_skills"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
PlanID int64 `bun:"plan_id,type:bigint,notnull,unique:uidx_plan_skills_plan_id_skill_id," json:"plan_id"`
|
|
||||||
SkillID int64 `bun:"skill_id,type:bigint,notnull,unique:uidx_plan_skills_plan_id_skill_id," json:"skill_id"`
|
|
||||||
RelPlanID *ModelPublicPlans `bun:"rel:has-one,join:plan_id=id" json:"relplanid,omitempty"` // Has one ModelPublicPlans
|
|
||||||
RelSkillID *ModelPublicAgentSkills `bun:"rel:has-one,join:skill_id=id" json:"relskillid,omitempty"` // Has one ModelPublicAgentSkills
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicPlanSkills
|
|
||||||
func (m ModelPublicPlanSkills) TableName() string {
|
|
||||||
return "public.plan_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicPlanSkills
|
|
||||||
func (m ModelPublicPlanSkills) TableNameOnly() string {
|
|
||||||
return "plan_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicPlanSkills
|
|
||||||
func (m ModelPublicPlanSkills) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicPlanSkills) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicPlanSkills) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicPlanSkills) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicPlanSkills) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicPlanSkills) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicPlanSkills) GetPrefix() string {
|
|
||||||
return "PSL"
|
|
||||||
}
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicPlans struct {
|
|
||||||
bun.BaseModel `bun:"table:public.plans,alias:plans"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CompletedAt resolvespec_common.SqlTimeStamp `bun:"completed_at,type:timestamptz,nullzero," json:"completed_at"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,default:'',notnull," json:"description"`
|
|
||||||
DueDate resolvespec_common.SqlTimeStamp `bun:"due_date,type:timestamptz,nullzero," json:"due_date"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
LastReviewedAt resolvespec_common.SqlTimeStamp `bun:"last_reviewed_at,type:timestamptz,nullzero," json:"last_reviewed_at"`
|
|
||||||
Owner resolvespec_common.SqlString `bun:"owner,type:text,nullzero," json:"owner"`
|
|
||||||
Priority resolvespec_common.SqlString `bun:"priority,type:text,default:'medium',notnull," json:"priority"` // low, medium, high, critical
|
|
||||||
ProjectID resolvespec_common.SqlInt64 `bun:"project_id,type:bigint,nullzero," json:"project_id"`
|
|
||||||
ReviewedBy resolvespec_common.SqlString `bun:"reviewed_by,type:text,nullzero," json:"reviewed_by"`
|
|
||||||
Status resolvespec_common.SqlString `bun:"status,type:text,default:'draft',notnull," json:"status"` // draft, active, blocked, completed, cancelled, superseded
|
|
||||||
SupersedesPlanID resolvespec_common.SqlInt64 `bun:"supersedes_plan_id,type:bigint,nullzero," json:"supersedes_plan_id"`
|
|
||||||
Tags resolvespec_common.SqlStringArray `bun:"tags,type:text,default:'{}',notnull," json:"tags"`
|
|
||||||
Title resolvespec_common.SqlString `bun:"title,type:text,notnull," json:"title"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelProjectID *ModelPublicProjects `bun:"rel:has-one,join:project_id=id" json:"relprojectid,omitempty"` // Has one ModelPublicProjects
|
|
||||||
RelSupersedesPlanID *ModelPublicPlans `bun:"rel:has-one,join:supersedes_plan_id=id" json:"relsupersedesplanid,omitempty"` // Has one ModelPublicPlans
|
|
||||||
RelDependsOnPlanIDPublicPlanDependencies []*ModelPublicPlanDependencies `bun:"rel:has-many,join:id=depends_on_plan_id" json:"reldependsonplanidpublicplandependencies,omitempty"` // Has many ModelPublicPlanDependencies
|
|
||||||
RelPlanIDPublicPlanDependencies []*ModelPublicPlanDependencies `bun:"rel:has-many,join:id=plan_id" json:"relplanidpublicplandependencies,omitempty"` // Has many ModelPublicPlanDependencies
|
|
||||||
RelPlanAIDPublicPlanRelatedPlans []*ModelPublicPlanRelatedPlans `bun:"rel:has-many,join:id=plan_a_id" json:"relplanaidpublicplanrelatedplans,omitempty"` // Has many ModelPublicPlanRelatedPlans
|
|
||||||
RelPlanBIDPublicPlanRelatedPlans []*ModelPublicPlanRelatedPlans `bun:"rel:has-many,join:id=plan_b_id" json:"relplanbidpublicplanrelatedplans,omitempty"` // Has many ModelPublicPlanRelatedPlans
|
|
||||||
RelPlanIDPublicPlanSkills []*ModelPublicPlanSkills `bun:"rel:has-many,join:id=plan_id" json:"relplanidpublicplanskills,omitempty"` // Has many ModelPublicPlanSkills
|
|
||||||
RelPlanIDPublicPlanGuardrails []*ModelPublicPlanGuardrails `bun:"rel:has-many,join:id=plan_id" json:"relplanidpublicplanguardrails,omitempty"` // Has many ModelPublicPlanGuardrails
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicPlans
|
|
||||||
func (m ModelPublicPlans) TableName() string {
|
|
||||||
return "public.plans"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicPlans
|
|
||||||
func (m ModelPublicPlans) TableNameOnly() string {
|
|
||||||
return "plans"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicPlans
|
|
||||||
func (m ModelPublicPlans) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicPlans) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicPlans) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicPlans) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicPlans) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicPlans) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicPlans) GetPrefix() string {
|
|
||||||
return "PLA"
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicProjectGuardrails struct {
|
|
||||||
bun.BaseModel `bun:"table:public.project_guardrails,alias:project_guardrails"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
GuardrailID int64 `bun:"guardrail_id,type:bigint,notnull," json:"guardrail_id"`
|
|
||||||
ProjectID int64 `bun:"project_id,type:bigint,notnull," json:"project_id"`
|
|
||||||
RelGuardrailID *ModelPublicAgentGuardrails `bun:"rel:has-one,join:guardrail_id=id" json:"relguardrailid,omitempty"` // Has one ModelPublicAgentGuardrails
|
|
||||||
RelProjectID *ModelPublicProjects `bun:"rel:has-one,join:project_id=id" json:"relprojectid,omitempty"` // Has one ModelPublicProjects
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicProjectGuardrails
|
|
||||||
func (m ModelPublicProjectGuardrails) TableName() string {
|
|
||||||
return "public.project_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicProjectGuardrails
|
|
||||||
func (m ModelPublicProjectGuardrails) TableNameOnly() string {
|
|
||||||
return "project_guardrails"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicProjectGuardrails
|
|
||||||
func (m ModelPublicProjectGuardrails) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicProjectGuardrails) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicProjectGuardrails) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicProjectGuardrails) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicProjectGuardrails) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicProjectGuardrails) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicProjectGuardrails) GetPrefix() string {
|
|
||||||
return "PGR"
|
|
||||||
}
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicProjectSkills struct {
|
|
||||||
bun.BaseModel `bun:"table:public.project_skills,alias:project_skills"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
ProjectID int64 `bun:"project_id,type:bigint,notnull," json:"project_id"`
|
|
||||||
SkillID int64 `bun:"skill_id,type:bigint,notnull," json:"skill_id"`
|
|
||||||
RelProjectID *ModelPublicProjects `bun:"rel:has-one,join:project_id=id" json:"relprojectid,omitempty"` // Has one ModelPublicProjects
|
|
||||||
RelSkillID *ModelPublicAgentSkills `bun:"rel:has-one,join:skill_id=id" json:"relskillid,omitempty"` // Has one ModelPublicAgentSkills
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicProjectSkills
|
|
||||||
func (m ModelPublicProjectSkills) TableName() string {
|
|
||||||
return "public.project_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicProjectSkills
|
|
||||||
func (m ModelPublicProjectSkills) TableNameOnly() string {
|
|
||||||
return "project_skills"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicProjectSkills
|
|
||||||
func (m ModelPublicProjectSkills) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicProjectSkills) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicProjectSkills) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicProjectSkills) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicProjectSkills) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicProjectSkills) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicProjectSkills) GetPrefix() string {
|
|
||||||
return "PSR"
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicProjects struct {
|
|
||||||
bun.BaseModel `bun:"table:public.projects,alias:projects"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),nullzero," json:"created_at"`
|
|
||||||
Description resolvespec_common.SqlString `bun:"description,type:text,nullzero," json:"description"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
LastActiveAt resolvespec_common.SqlTimeStamp `bun:"last_active_at,type:timestamptz,default:now(),nullzero," json:"last_active_at"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
ThoughtCount resolvespec_common.SqlInt64 `bun:"thought_count,scanonly" json:"thought_count"`
|
|
||||||
RelProjectIDPublicThoughts []*ModelPublicThoughts `bun:"rel:has-many,join:id=project_id" json:"relprojectidpublicthoughts,omitempty"` // Has many ModelPublicThoughts
|
|
||||||
RelProjectIDPublicStoredFiles []*ModelPublicStoredFiles `bun:"rel:has-many,join:id=project_id" json:"relprojectidpublicstoredfiles,omitempty"` // Has many ModelPublicStoredFiles
|
|
||||||
RelProjectIDPublicChatHistories []*ModelPublicChatHistories `bun:"rel:has-many,join:id=project_id" json:"relprojectidpublicchathistories,omitempty"` // Has many ModelPublicChatHistories
|
|
||||||
RelProjectIDPublicLearnings []*ModelPublicLearnings `bun:"rel:has-many,join:id=project_id" json:"relprojectidpubliclearnings,omitempty"` // Has many ModelPublicLearnings
|
|
||||||
RelProjectIDPublicPlans []*ModelPublicPlans `bun:"rel:has-many,join:id=project_id" json:"relprojectidpublicplans,omitempty"` // Has many ModelPublicPlans
|
|
||||||
RelProjectIDPublicProjectSkills []*ModelPublicProjectSkills `bun:"rel:has-many,join:id=project_id" json:"relprojectidpublicprojectskills,omitempty"` // Has many ModelPublicProjectSkills
|
|
||||||
RelProjectIDPublicProjectGuardrails []*ModelPublicProjectGuardrails `bun:"rel:has-many,join:id=project_id" json:"relprojectidpublicprojectguardrails,omitempty"` // Has many ModelPublicProjectGuardrails
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicProjects
|
|
||||||
func (m ModelPublicProjects) TableName() string {
|
|
||||||
return "public.projects"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicProjects
|
|
||||||
func (m ModelPublicProjects) TableNameOnly() string {
|
|
||||||
return "projects"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicProjects
|
|
||||||
func (m ModelPublicProjects) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicProjects) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicProjects) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicProjects) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicProjects) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicProjects) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicProjects) GetPrefix() string {
|
|
||||||
return "PRO"
|
|
||||||
}
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicStoredFiles struct {
|
|
||||||
bun.BaseModel `bun:"table:public.stored_files,alias:stored_files"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
Content []byte `bun:"content,type:bytea,notnull," json:"content"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),notnull," json:"created_at"`
|
|
||||||
Encoding resolvespec_common.SqlString `bun:"encoding,type:text,default:'base64',notnull," json:"encoding"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Kind resolvespec_common.SqlString `bun:"kind,type:text,default:'file',notnull," json:"kind"`
|
|
||||||
MediaType resolvespec_common.SqlString `bun:"media_type,type:text,notnull," json:"media_type"`
|
|
||||||
Name resolvespec_common.SqlString `bun:"name,type:text,notnull," json:"name"`
|
|
||||||
ProjectID resolvespec_common.SqlInt64 `bun:"project_id,type:bigint,nullzero," json:"project_id"`
|
|
||||||
Sha256 resolvespec_common.SqlString `bun:"sha256,type:text,notnull," json:"sha256"`
|
|
||||||
SizeBytes int64 `bun:"size_bytes,type:bigint,notnull," json:"size_bytes"`
|
|
||||||
ThoughtID resolvespec_common.SqlInt64 `bun:"thought_id,type:bigint,nullzero," json:"thought_id"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),notnull," json:"updated_at"`
|
|
||||||
RelProjectID *ModelPublicProjects `bun:"rel:has-one,join:project_id=id" json:"relprojectid,omitempty"` // Has one ModelPublicProjects
|
|
||||||
RelThoughtID *ModelPublicThoughts `bun:"rel:has-one,join:thought_id=id" json:"relthoughtid,omitempty"` // Has one ModelPublicThoughts
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicStoredFiles
|
|
||||||
func (m ModelPublicStoredFiles) TableName() string {
|
|
||||||
return "public.stored_files"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicStoredFiles
|
|
||||||
func (m ModelPublicStoredFiles) TableNameOnly() string {
|
|
||||||
return "stored_files"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicStoredFiles
|
|
||||||
func (m ModelPublicStoredFiles) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicStoredFiles) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicStoredFiles) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicStoredFiles) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicStoredFiles) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicStoredFiles) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicStoredFiles) GetPrefix() string {
|
|
||||||
return "SFT"
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicThoughtLinks struct {
|
|
||||||
bun.BaseModel `bun:"table:public.thought_links,alias:thought_links"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),nullzero," json:"created_at"`
|
|
||||||
FromID int64 `bun:"from_id,type:bigint,notnull," json:"from_id"`
|
|
||||||
Relation resolvespec_common.SqlString `bun:"relation,type:text,notnull," json:"relation"`
|
|
||||||
ToID int64 `bun:"to_id,type:bigint,notnull," json:"to_id"`
|
|
||||||
RelFromID *ModelPublicThoughts `bun:"rel:has-one,join:from_id=id" json:"relfromid,omitempty"` // Has one ModelPublicThoughts
|
|
||||||
RelToID *ModelPublicThoughts `bun:"rel:has-one,join:to_id=id" json:"reltoid,omitempty"` // Has one ModelPublicThoughts
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicThoughtLinks
|
|
||||||
func (m ModelPublicThoughtLinks) TableName() string {
|
|
||||||
return "public.thought_links"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicThoughtLinks
|
|
||||||
func (m ModelPublicThoughtLinks) TableNameOnly() string {
|
|
||||||
return "thought_links"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicThoughtLinks
|
|
||||||
func (m ModelPublicThoughtLinks) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicThoughtLinks) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicThoughtLinks) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicThoughtLinks) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicThoughtLinks) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicThoughtLinks) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicThoughtLinks) GetPrefix() string {
|
|
||||||
return "TLH"
|
|
||||||
}
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
// Code generated by relspecgo. DO NOT EDIT.
|
|
||||||
package generatedmodels
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
resolvespec_common "github.com/bitechdev/ResolveSpec/pkg/spectypes"
|
|
||||||
"github.com/uptrace/bun"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ModelPublicThoughts struct {
|
|
||||||
bun.BaseModel `bun:"table:public.thoughts,alias:thoughts"`
|
|
||||||
ID resolvespec_common.SqlInt64 `bun:"id,type:bigserial,pk,autoincrement," json:"id"`
|
|
||||||
ArchivedAt resolvespec_common.SqlTimeStamp `bun:"archived_at,type:timestamptz,nullzero," json:"archived_at"`
|
|
||||||
Content resolvespec_common.SqlString `bun:"content,type:text,notnull," json:"content"`
|
|
||||||
CreatedAt resolvespec_common.SqlTimeStamp `bun:"created_at,type:timestamptz,default:now(),nullzero," json:"created_at"`
|
|
||||||
GUID resolvespec_common.SqlUUID `bun:"guid,type:uuid,default:gen_random_uuid(),notnull," json:"guid"`
|
|
||||||
Metadata resolvespec_common.SqlJSONB `bun:"metadata,type:jsonb,default:{}::jsonb,nullzero," json:"metadata"`
|
|
||||||
ProjectID resolvespec_common.SqlInt64 `bun:"project_id,type:bigint,nullzero," json:"project_id"`
|
|
||||||
UpdatedAt resolvespec_common.SqlTimeStamp `bun:"updated_at,type:timestamptz,default:now(),nullzero," json:"updated_at"`
|
|
||||||
RelProjectID *ModelPublicProjects `bun:"rel:has-one,join:project_id=id" json:"relprojectid,omitempty"` // Has one ModelPublicProjects
|
|
||||||
RelFromIDPublicThoughtLinks []*ModelPublicThoughtLinks `bun:"rel:has-many,join:id=from_id" json:"relfromidpublicthoughtlinks,omitempty"` // Has many ModelPublicThoughtLinks
|
|
||||||
RelToIDPublicThoughtLinks []*ModelPublicThoughtLinks `bun:"rel:has-many,join:id=to_id" json:"reltoidpublicthoughtlinks,omitempty"` // Has many ModelPublicThoughtLinks
|
|
||||||
RelThoughtIDPublicEmbeddings []*ModelPublicEmbeddings `bun:"rel:has-many,join:id=thought_id" json:"relthoughtidpublicembeddings,omitempty"` // Has many ModelPublicEmbeddings
|
|
||||||
RelThoughtIDPublicStoredFiles []*ModelPublicStoredFiles `bun:"rel:has-many,join:id=thought_id" json:"relthoughtidpublicstoredfiles,omitempty"` // Has many ModelPublicStoredFiles
|
|
||||||
RelRelatedThoughtIDPublicLearnings []*ModelPublicLearnings `bun:"rel:has-many,join:id=related_thought_id" json:"relrelatedthoughtidpubliclearnings,omitempty"` // Has many ModelPublicLearnings
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableName returns the table name for ModelPublicThoughts
|
|
||||||
func (m ModelPublicThoughts) TableName() string {
|
|
||||||
return "public.thoughts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// TableNameOnly returns the table name without schema for ModelPublicThoughts
|
|
||||||
func (m ModelPublicThoughts) TableNameOnly() string {
|
|
||||||
return "thoughts"
|
|
||||||
}
|
|
||||||
|
|
||||||
// SchemaName returns the schema name for ModelPublicThoughts
|
|
||||||
func (m ModelPublicThoughts) SchemaName() string {
|
|
||||||
return "public"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetID returns the primary key value
|
|
||||||
func (m ModelPublicThoughts) GetID() int64 {
|
|
||||||
return m.ID.Int64()
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDStr returns the primary key as a string
|
|
||||||
func (m ModelPublicThoughts) GetIDStr() string {
|
|
||||||
return fmt.Sprintf("%v", m.ID)
|
|
||||||
}
|
|
||||||
|
|
||||||
// SetID sets the primary key value
|
|
||||||
func (m ModelPublicThoughts) SetID(newid int64) {
|
|
||||||
m.UpdateID(newid)
|
|
||||||
}
|
|
||||||
|
|
||||||
// UpdateID updates the primary key value
|
|
||||||
func (m *ModelPublicThoughts) UpdateID(newid int64) {
|
|
||||||
m.ID.FromString(fmt.Sprintf("%d", newid))
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetIDName returns the name of the primary key column
|
|
||||||
func (m ModelPublicThoughts) GetIDName() string {
|
|
||||||
return "id"
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetPrefix returns the table prefix
|
|
||||||
func (m ModelPublicThoughts) GetPrefix() string {
|
|
||||||
return "THO"
|
|
||||||
}
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user