Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
03f3239cd0 | ||
|
|
d5c7440655 | ||
|
|
bff46fefe7 | ||
|
|
c93bfca6a8 | ||
|
|
44ec3502dc | ||
|
|
6608f1a8d5 | ||
|
|
c6cd41fd4b | ||
|
|
b0f608f145 |
@@ -1,4 +0,0 @@
|
|||||||
(apply,CacheStats{hitCount=337, missCount=199, loadSuccessCount=199, loadExceptionCount=0, totalLoadTime=581291927, evictionCount=0})
|
|
||||||
(tree,CacheStats{hitCount=986, missCount=352, loadSuccessCount=299, loadExceptionCount=0, totalLoadTime=821650758, evictionCount=0})
|
|
||||||
(commit,CacheStats{hitCount=108, missCount=107, loadSuccessCount=107, loadExceptionCount=0, totalLoadTime=78983052, evictionCount=0})
|
|
||||||
(tag,CacheStats{hitCount=0, missCount=2, loadSuccessCount=2, loadExceptionCount=0, totalLoadTime=319542, evictionCount=0})
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
e71e5b78236a67327c678490cb50b46981f19de0 bbcbb68b91e786eb71bbb0a4443d7b8a26140e1b .sops.yaml
|
|
||||||
4189696f5581ac0ffdc125c3bf9b9f664b3ddfb0 7cd3f1ee4865c563d141464f6fc185436993b84b .sops.yaml
|
|
||||||
635630e73152a5f22e6cbd42322ec55d79f8d9c0 297e94a89d73d18c4f47013bb0e8303f123715f3 configmap.yaml
|
|
||||||
29e515e7b46742fab8c3fcc2189af7010a6ccc62 6869fa11f96e03f7ec76a0ea14a4ddaf604004a4 gateway-config-secret.enc.yaml
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
0a95af80c0051bacbeb8483c1632e47acd3db5be 40207e487cfb63409a976fb2a0b9e1e62c8b1513
|
|
||||||
27428d910111299d0699f429190284a9ca6e50b7 3318daf758349402aef43b095482743ab96b37f9
|
|
||||||
329a495af4c935529fdae17229314101c0c77876 67f24ea76359c8dba4b56267790aad76bbc58464
|
|
||||||
4c8bc6c920b6b75399555827022f69ef0c4f7d15 1fa839b41975fa3f0ac9052355ffb625f5a8f324
|
|
||||||
528545f414c83217408edfea234dcd1f3edee0c2 b8f95506ca1545b876b5531cd385172e9ca5b4b0
|
|
||||||
81038e1cf7567a9133d7c233a97b1e2f19fa1c82 4a00312906ba725f3968187656fde2663b1763ab
|
|
||||||
a5b3b5c44a406896bcb414df6c6426c277715706 2ab47a9dbe5ba36dfa0e275991ef7b7656908410
|
|
||||||
ce27643667a0399115cd1f2b6d38123fdcf2b4f1 6ff0a50de8efbad105fa588245f22fdb26afddc4
|
|
||||||
d49756886a46542b38533b913a1f776b5145f5ec d82cc5a6970a1fb32e21dda9a737b987a8668111
|
|
||||||
db3a30fbcf1f139c667fb68a91762582c49b8cee 04619a269fed9eeea53ab4d4d73131e3713f40a0
|
|
||||||
eb54715e4dec0fb35402576fcc224a09808b00c1 d53b7632cf9646dda1c978a5f94615dc9eaed5e8
|
|
||||||
ef72b5bbccf2df89aa1c86dee29311c63f33bf62 ba55d184fefef1a73a50409ca4fb1f7b27f5b075
|
|
||||||
@@ -571,42 +571,128 @@ curl -X GET https://api.riotpiao.com/ \
|
|||||||
|
|
||||||
## Authentication
|
## Authentication
|
||||||
|
|
||||||
|
All operations except `/healthz` and `/readyz` require JWT authentication.
|
||||||
|
|
||||||
### Bearer Token (JWT)
|
### Bearer Token (JWT)
|
||||||
|
|
||||||
All operations except `/healthz` and `/readyz` require authentication.
|
Provide JWT in Authorization header:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -H 'Authorization: Bearer <jwt-token>' \
|
curl -H 'Authorization: Bearer <jwt-token>' \
|
||||||
https://api.riotpiao.com/v1/models
|
https://api.riotpiao.com/v1/models
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### JWT Validation
|
||||||
|
|
||||||
|
Gateway validates all JWTs using **JWKS Federation**:
|
||||||
|
|
||||||
|
1. **Fetch JWKS** — Gateway fetches public keys from Authentik's JWKS endpoint (refreshed every 15 minutes)
|
||||||
|
2. **Verify Signature** — Validates JWT signature using public key matching `kid` header
|
||||||
|
3. **Check Claims:**
|
||||||
|
- `iss` (issuer) — Must be Authentik provider (format: `https://authentik.riotpiao.com/application/o/{provider}/`)
|
||||||
|
- `exp` (expiration) — Token must not be expired (60s clock skew allowed)
|
||||||
|
- `nbf` (not before) — Token must not be in future (60s clock skew allowed)
|
||||||
|
- `aud` (audience) — Must be non-empty string from Authentik
|
||||||
|
4. **Check Permissions** — Validates required capabilities from JWT claims (see RBAC section)
|
||||||
|
|
||||||
|
**JWKS Endpoint:** `https://authentik.riotpiao.com/application/oidc/jwks/`
|
||||||
|
|
||||||
|
**Multi-Issuer Support:** Gateway accepts JWT from any Authentik service account provider (paperless-ai-agent, portfolio-analyzer, etc) because all share the same JWKS signing key.
|
||||||
|
|
||||||
### Obtaining Tokens
|
### Obtaining Tokens
|
||||||
|
|
||||||
**Via Authentik OIDC (human login):**
|
#### User Login (OIDC Device Code Flow)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
core auth login --username [email protected]
|
core auth login --username [email protected]
|
||||||
```
|
export USER_TOKEN=$(cat ~/.cache/talos/authentik_id_token)
|
||||||
|
|
||||||
**Via service account (programmatic):**
|
curl -H "Authorization: Bearer $USER_TOKEN" \
|
||||||
```bash
|
|
||||||
core mwinit login --username service-account --password secret
|
|
||||||
export RIOTPIAO_TOKEN=$(cat ~/.talos/.riotpiao-auth)
|
|
||||||
|
|
||||||
curl -H "Authorization: Bearer $RIOTPIAO_TOKEN" \
|
|
||||||
https://api.riotpiao.com/v1/models
|
https://api.riotpiao.com/v1/models
|
||||||
```
|
```
|
||||||
|
|
||||||
|
User tokens contain:
|
||||||
|
- `sub` — user ID
|
||||||
|
- `permissions` — array of granted capabilities
|
||||||
|
- `email` — user email
|
||||||
|
- `name` — user name
|
||||||
|
|
||||||
|
#### Service Account (Client Credentials Flow)
|
||||||
|
|
||||||
|
Service account gets JWT signed by Authentik:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# 1. Authenticate service account with Authentik
|
||||||
|
curl -X POST https://authentik.riotpiao.com/application/o/token/ \
|
||||||
|
-H 'Content-Type: application/x-www-form-urlencoded' \
|
||||||
|
-d 'grant_type=client_credentials' \
|
||||||
|
-d 'client_id=paperless-ai-agent' \
|
||||||
|
-d 'client_secret=<secret>' \
|
||||||
|
-d 'scope=openid'
|
||||||
|
|
||||||
|
# Response:
|
||||||
|
# {
|
||||||
|
# "access_token": "<jwt>",
|
||||||
|
# "token_type": "Bearer",
|
||||||
|
# "expires_in": 3600
|
||||||
|
# }
|
||||||
|
|
||||||
|
# 2. Use token for gateway calls
|
||||||
|
export SERVICE_TOKEN=$(curl ... | jq -r .access_token)
|
||||||
|
curl -H "Authorization: Bearer $SERVICE_TOKEN" \
|
||||||
|
https://api.riotpiao.com/v1/chat/completions
|
||||||
|
```
|
||||||
|
|
||||||
|
Service account tokens contain:
|
||||||
|
- `sub` — service account ID
|
||||||
|
- `roles` — array of granted capabilities
|
||||||
|
- `service_account` — service name
|
||||||
|
- `aud` — audience (Authentik app ID)
|
||||||
|
|
||||||
|
#### Token Exchange (Service Impersonates User)
|
||||||
|
|
||||||
|
Service presents user's JWT + its own credentials to get a delegated token (see `/auth/exchange` endpoint):
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Service exchanges user JWT for scoped service token
|
||||||
|
curl -X POST https://api.riotpiao.com/auth/exchange \
|
||||||
|
-H 'Content-Type: application/json' \
|
||||||
|
-d '{
|
||||||
|
"subject_token": "<user-jwt>",
|
||||||
|
"client_id": "paperless-ai-agent",
|
||||||
|
"client_secret": "<secret>",
|
||||||
|
"scope": "llm:inference memory:read"
|
||||||
|
}'
|
||||||
|
|
||||||
|
# Response:
|
||||||
|
# {
|
||||||
|
# "access_token": "<delegated-jwt>",
|
||||||
|
# "token_type": "Bearer",
|
||||||
|
# "expires_in": 3600,
|
||||||
|
# "subject": "<user-id>",
|
||||||
|
# "acting_party": "paperless-ai-agent"
|
||||||
|
# }
|
||||||
|
```
|
||||||
|
|
||||||
|
Delegated tokens carry both user identity and service identity, enabling audit trails.
|
||||||
|
|
||||||
### Capabilities (RBAC)
|
### Capabilities (RBAC)
|
||||||
|
|
||||||
Tokens embed capabilities in claims. Required capabilities:
|
JWT claims contain permission arrays. Required capabilities:
|
||||||
|
|
||||||
- `llm:inference` — `/v1/*` chat/embeddings/rerank
|
| Capability | Used For |
|
||||||
- `workflow:execute` — `/workflow` operations
|
|------------|----------|
|
||||||
- `memory:read` — Memory queries
|
| `llm:inference` | `/v1/chat/completions`, `/v1/embeddings`, `/v1/rerank` |
|
||||||
- `memory:write` — Memory ingest
|
| `workflow:execute` | `/workflow` (Temporal operations) |
|
||||||
- `sqs:access` — Queue operations
|
| `memory:read` | `/memory` query operations |
|
||||||
- `s3:access` — S3 operations
|
| `memory:write` | `/memory` ingest operations |
|
||||||
- `iam:admin` — IAM management
|
| `sqs:access` | `/sqs` queue operations |
|
||||||
|
| `s3:access` | `/s3` object storage operations |
|
||||||
|
| `iam:admin` | `/iam` user/group management |
|
||||||
|
|
||||||
|
**Wildcard:** Token with `*` capability grants all permissions.
|
||||||
|
|
||||||
|
**Permission Check:** JWT validated via `permissions` claim (user tokens) or `roles` claim (service account tokens).
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -38,22 +38,22 @@ Production API gateway for the homelab cluster. Single entry point (`api.riotpia
|
|||||||
│ (routing, auth, limits) │
|
│ (routing, auth, limits) │
|
||||||
└──────┬───────────────────────┘
|
└──────┬───────────────────────┘
|
||||||
│
|
│
|
||||||
┌──────┴──────────────────────────────────┐
|
┌──────┴───────────────────────────────────┐
|
||||||
│ │
|
│ │
|
||||||
/v1/* /workflow /sqs /
|
/v1/* X-Service header routing /
|
||||||
(LLM) (Temporal gRPC) (Queues) (X-Service)
|
(LLM) (workflow, sqs, s3, iam, memory) /
|
||||||
│ │ │ │
|
│ │ │
|
||||||
▼ ▼ ▼ ▼
|
▼ ▼ ▼
|
||||||
llm-serving temporal:7233 kmsvc/Kafka IAM, S3
|
llm-serving temporal:7233 kmsvc/Kafka, MinIO,
|
||||||
(vLLM, Ollama) (WorkflowService) Memory
|
(vLLM, Ollama) (gRPC) Authentik, poimen-memory
|
||||||
(TEI) (gRPC bridge) (poimen)
|
(TEI)
|
||||||
```
|
```
|
||||||
|
|
||||||
**Design principles:**
|
**Design principles:**
|
||||||
- ✅ Single hostname, multiple path prefixes
|
- ✅ Single hostname, unified X-Service + X-Resource header routing
|
||||||
- ✅ HTTP REST gateway → gRPC Temporal bridge
|
- ✅ HTTP REST gateway → gRPC Temporal bridge (via X-Service: workflow)
|
||||||
- ✅ Bearer token auth via Authentik (JWT + RBAC)
|
- ✅ Bearer token auth via Authentik (JWT + RBAC)
|
||||||
- ✅ Streaming unbuffered (SSE, WebSocket)
|
- ✅ Streaming unbuffered (SSE, WebSocket, HTTP/2 multiplexing)
|
||||||
- ✅ Per-route timeouts & rate limits
|
- ✅ Per-route timeouts & rate limits
|
||||||
- ✅ No cluster credentials held by gateway
|
- ✅ No cluster credentials held by gateway
|
||||||
|
|
||||||
@@ -61,16 +61,16 @@ llm-serving temporal:7233 kmsvc/Kafka IAM, S3
|
|||||||
|
|
||||||
## Services & Capabilities
|
## Services & Capabilities
|
||||||
|
|
||||||
| Service | Prefix | Upstream | Status |
|
| Service | Method | Upstream | Status |
|
||||||
|---------|--------|----------|--------|
|
|---------|--------|----------|--------|
|
||||||
| **LLM Chat** | `/v1/chat/completions` | llm-serving (vLLM) | ✅ Live |
|
| **LLM Chat** | `POST /v1/chat/completions` | llm-serving (vLLM) | ✅ Live |
|
||||||
| **Embeddings** | `/v1/embeddings` | llm-serving (TEI) | ✅ Live |
|
| **Embeddings** | `POST /v1/embeddings` | llm-serving (TEI) | ✅ Live |
|
||||||
| **Reranking** | `/v1/rerank` | llm-serving (TEI) | ✅ Live |
|
| **Reranking** | `POST /v1/rerank` | llm-serving (TEI) | ✅ Live |
|
||||||
| **Workflows** | `/workflow` | Temporal gRPC (7233) | ✅ Live (START, DESCRIBE, SIGNAL, QUERY, etc) |
|
| **Workflows** | `X-Service: workflow` + `X-Resource: {action}` | Temporal gRPC (7233) | ✅ Live (START, DESCRIBE, SIGNAL, QUERY, etc) |
|
||||||
| **Queues** | `/` + `X-Service: sqs` | kmsvc/Kafka | ⏳ Ready (ServiceAdapter) |
|
| **Queues** | `X-Service: sqs` + `X-Resource: {action}` | kmsvc/Kafka | ✅ Live |
|
||||||
| **Memory** | `/` + `X-Service: memory` | poimen-memory | ✅ Live |
|
| **Memory** | `X-Service: memory` + `X-Resource: {action}` | poimen-memory | ✅ Live |
|
||||||
| **IAM** | `/` + `X-Service: iam` | Authentik API | ✅ Live |
|
| **IAM** | `X-Service: iam` + `X-Resource: {action}` | Authentik API | ✅ Live |
|
||||||
| **S3** | `/` + `X-Service: s3` | MinIO | ✅ Live |
|
| **S3** | `X-Service: s3` + `X-Resource: {action}` | MinIO | ✅ Live |
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -102,18 +102,17 @@ curl -X POST https://api.riotpiao.com/v1/chat/completions \
|
|||||||
}'
|
}'
|
||||||
```
|
```
|
||||||
|
|
||||||
**Workflow:**
|
**Workflow (via X-Service header):**
|
||||||
```bash
|
```bash
|
||||||
curl -X POST https://api.riotpiao.com/workflow \
|
curl -X POST https://api.riotpiao.com/ \
|
||||||
-H "Authorization: Bearer $TOKEN" \
|
-H "Authorization: Bearer $TOKEN" \
|
||||||
|
-H "X-Service: workflow" \
|
||||||
|
-H "X-Resource: start" \
|
||||||
-d '{
|
-d '{
|
||||||
"action": "START_WORKFLOW",
|
|
||||||
"namespace": "default",
|
"namespace": "default",
|
||||||
"payload": {
|
|
||||||
"workflow_id": "my-workflow",
|
"workflow_id": "my-workflow",
|
||||||
"workflow_type": "MyWorkflow",
|
"workflow_type": "MyWorkflow",
|
||||||
"task_queue": "default"
|
"task_queue": "default"
|
||||||
}
|
|
||||||
}'
|
}'
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|||||||
@@ -72,6 +72,17 @@ func main() {
|
|||||||
|
|
||||||
// Create ServiceAdapter registry and dispatcher (phase 8)
|
// Create ServiceAdapter registry and dispatcher (phase 8)
|
||||||
registry := serviceadapter.NewRegistry(nil)
|
registry := serviceadapter.NewRegistry(nil)
|
||||||
|
|
||||||
|
// Add workflow service adapter (uses Temporal handler for gRPC forwarding)
|
||||||
|
workflowSpec := serviceadapter.GetWorkflowSpec()
|
||||||
|
workflowAdapter := &serviceadapter.ServiceAdapter{
|
||||||
|
Namespace: "temporal",
|
||||||
|
ServiceName: "workflow",
|
||||||
|
Spec: *workflowSpec,
|
||||||
|
}
|
||||||
|
_ = registry.Add(workflowAdapter)
|
||||||
|
|
||||||
|
// Add other adapters from config
|
||||||
for _, a := range cfg.Adapters {
|
for _, a := range cfg.Adapters {
|
||||||
_ = registry.Add(a)
|
_ = registry.Add(a)
|
||||||
}
|
}
|
||||||
@@ -84,6 +95,10 @@ func main() {
|
|||||||
}
|
}
|
||||||
dispatcher := serviceadapter.NewDispatcher(registry, jwtValidator)
|
dispatcher := serviceadapter.NewDispatcher(registry, jwtValidator)
|
||||||
|
|
||||||
|
// Wire workflow adapter to temporal handler for proper request forwarding
|
||||||
|
workflowAdapterImpl := serviceadapter.NewWorkflowAdapter(temporalHandler)
|
||||||
|
_ = workflowAdapterImpl // The dispatcher will call temporal handler directly for gRPC
|
||||||
|
|
||||||
// Create router that handles health endpoints, X-Service (ServiceAdapter) routing,
|
// Create router that handles health endpoints, X-Service (ServiceAdapter) routing,
|
||||||
// temporal endpoints, and passes others to upstream handler
|
// temporal endpoints, and passes others to upstream handler
|
||||||
router := server.NewRouter(healthChecker, dispatcher, temporalHandler, upstreamHandler)
|
router := server.NewRouter(healthChecker, dispatcher, temporalHandler, upstreamHandler)
|
||||||
|
|||||||
@@ -165,20 +165,6 @@ func (v *Validator) CheckPermissions(claims jwt.MapClaims, required ...string) b
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Fall back to scope claim (for client_credentials tokens)
|
|
||||||
// Authentik client_credentials tokens carry capabilities as space-separated scopes
|
|
||||||
if scopeIface, ok := claims["scope"]; ok {
|
|
||||||
if scopeStr, ok := scopeIface.(string); ok {
|
|
||||||
for _, s := range strings.Split(scopeStr, " ") {
|
|
||||||
for _, req := range required {
|
|
||||||
if s == req {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"net/smtp"
|
"net/smtp"
|
||||||
"os"
|
"os"
|
||||||
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SendMsgRequest represents a sendMsg API request.
|
// SendMsgRequest represents a sendMsg API request.
|
||||||
@@ -78,6 +79,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
resp = h.sendEmail(req)
|
resp = h.sendEmail(req)
|
||||||
case "sms":
|
case "sms":
|
||||||
resp = h.sendSMS(req)
|
resp = h.sendSMS(req)
|
||||||
|
case "gotify":
|
||||||
|
resp = h.sendGotify(req)
|
||||||
default:
|
default:
|
||||||
resp = SendMsgResponse{
|
resp = SendMsgResponse{
|
||||||
Status: "error",
|
Status: "error",
|
||||||
@@ -158,3 +161,72 @@ func (h *Handler) sendSMS(req SendMsgRequest) SendMsgResponse {
|
|||||||
Error: "SMS not implemented yet",
|
Error: "SMS not implemented yet",
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// sendGotify sends a notification via Gotify server.
|
||||||
|
func (h *Handler) sendGotify(req SendMsgRequest) SendMsgResponse {
|
||||||
|
if h.gotifyURL == "" || h.gotifyToken == "" {
|
||||||
|
return SendMsgResponse{
|
||||||
|
Status: "error",
|
||||||
|
Error: "Gotify not configured (missing GOTIFY_URL or GOTIFY_TOKEN)",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Construct Gotify message
|
||||||
|
gotifyReq := map[string]interface{}{
|
||||||
|
"title": req.Title,
|
||||||
|
"message": req.Message,
|
||||||
|
"priority": req.Priority,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Marshal to JSON
|
||||||
|
body, err := json.Marshal(gotifyReq)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("error marshaling Gotify request: %v", err)
|
||||||
|
return SendMsgResponse{
|
||||||
|
Status: "error",
|
||||||
|
Error: "failed to marshal request: " + err.Error(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// POST to Gotify
|
||||||
|
gotifyEndpoint := fmt.Sprintf("%s/message?token=%s", h.gotifyURL, h.gotifyToken)
|
||||||
|
resp, err := http.Post(gotifyEndpoint, "application/json", strings.NewReader(string(body)))
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("error sending to Gotify: %v", err)
|
||||||
|
return SendMsgResponse{
|
||||||
|
Status: "error",
|
||||||
|
Error: "failed to send to Gotify: " + err.Error(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
// Check response status
|
||||||
|
if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated {
|
||||||
|
log.Printf("Gotify returned status %d", resp.StatusCode)
|
||||||
|
return SendMsgResponse{
|
||||||
|
Status: "error",
|
||||||
|
Error: fmt.Sprintf("Gotify returned status %d", resp.StatusCode),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse response
|
||||||
|
var gotifyResp map[string]interface{}
|
||||||
|
if err := json.NewDecoder(resp.Body).Decode(&gotifyResp); err != nil {
|
||||||
|
log.Printf("error decoding Gotify response: %v", err)
|
||||||
|
return SendMsgResponse{
|
||||||
|
Status: "success",
|
||||||
|
MessageID: "gotify-sent",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract message ID if available
|
||||||
|
msgID := "gotify-sent"
|
||||||
|
if id, ok := gotifyResp["id"]; ok {
|
||||||
|
msgID = fmt.Sprintf("gotify-%v", id)
|
||||||
|
}
|
||||||
|
|
||||||
|
return SendMsgResponse{
|
||||||
|
Status: "success",
|
||||||
|
MessageID: msgID,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
package observability
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net/http"
|
||||||
|
)
|
||||||
|
|
||||||
|
// MetricsHandler serves Prometheus metrics
|
||||||
|
type MetricsHandler struct {
|
||||||
|
exporter *PrometheusExporter
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewMetricsHandler creates a new metrics handler
|
||||||
|
func NewMetricsHandler(m *Metrics) *MetricsHandler {
|
||||||
|
return &MetricsHandler{
|
||||||
|
exporter: NewPrometheusExporter(m),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ServeHTTP implements http.Handler for Prometheus /metrics endpoint
|
||||||
|
func (h *MetricsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
||||||
|
w.Header().Set("Content-Type", "text/plain; version=0.0.4; charset=utf-8")
|
||||||
|
w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
|
||||||
|
w.Header().Set("Pragma", "no-cache")
|
||||||
|
w.Header().Set("Expires", "0")
|
||||||
|
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
w.Write([]byte(h.exporter.Export()))
|
||||||
|
}
|
||||||
@@ -28,6 +28,14 @@ type Metrics struct {
|
|||||||
// Streaming metrics
|
// Streaming metrics
|
||||||
streamingResponsesTotal map[string]int64
|
streamingResponsesTotal map[string]int64
|
||||||
streamingByteCount map[string]int64
|
streamingByteCount map[string]int64
|
||||||
|
|
||||||
|
// LLM inference metrics (TTFT and ITL)
|
||||||
|
// ttftMs: Time-to-First-Token in milliseconds
|
||||||
|
ttftMs map[string][]int64 // samples for histogram
|
||||||
|
// itlMs: Inter-Token Latency in milliseconds
|
||||||
|
itlMs map[string][]int64 // samples for histogram
|
||||||
|
// Token counts
|
||||||
|
tokenCount map[string]int64
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewMetrics creates a new Metrics instance.
|
// NewMetrics creates a new Metrics instance.
|
||||||
@@ -41,6 +49,9 @@ func NewMetrics() *Metrics {
|
|||||||
upstreamHealth: make(map[string]int),
|
upstreamHealth: make(map[string]int),
|
||||||
streamingResponsesTotal: make(map[string]int64),
|
streamingResponsesTotal: make(map[string]int64),
|
||||||
streamingByteCount: make(map[string]int64),
|
streamingByteCount: make(map[string]int64),
|
||||||
|
ttftMs: make(map[string][]int64),
|
||||||
|
itlMs: make(map[string][]int64),
|
||||||
|
tokenCount: make(map[string]int64),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,9 +157,113 @@ func (m *Metrics) GetMetrics() map[string]interface{} {
|
|||||||
"upstream_health": m.upstreamHealth,
|
"upstream_health": m.upstreamHealth,
|
||||||
"streaming_responses_total": m.streamingResponsesTotal,
|
"streaming_responses_total": m.streamingResponsesTotal,
|
||||||
"streaming_byte_count": m.streamingByteCount,
|
"streaming_byte_count": m.streamingByteCount,
|
||||||
|
"llm_ttft_ms": m.ttftMs,
|
||||||
|
"llm_itl_ms": m.itlMs,
|
||||||
|
"llm_token_count": m.tokenCount,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RecordTTFT records Time-to-First-Token in milliseconds
|
||||||
|
func (m *Metrics) RecordTTFT(model string, ttftMs int64) {
|
||||||
|
m.mu.Lock()
|
||||||
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
key := fmt.Sprintf("llm:ttft:%s", model)
|
||||||
|
m.ttftMs[key] = append(m.ttftMs[key], ttftMs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecordITL records Inter-Token Latency in milliseconds
|
||||||
|
func (m *Metrics) RecordITL(model string, itlMs int64) {
|
||||||
|
m.mu.Lock()
|
||||||
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
key := fmt.Sprintf("llm:itl:%s", model)
|
||||||
|
m.itlMs[key] = append(m.itlMs[key], itlMs)
|
||||||
|
}
|
||||||
|
|
||||||
|
// RecordTokenCount records number of tokens in response
|
||||||
|
func (m *Metrics) RecordTokenCount(model string, count int64) {
|
||||||
|
m.mu.Lock()
|
||||||
|
defer m.mu.Unlock()
|
||||||
|
|
||||||
|
key := fmt.Sprintf("llm:tokens:%s", model)
|
||||||
|
m.tokenCount[key] += count
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetTTFTMetrics returns TTFT statistics for Prometheus export
|
||||||
|
func (m *Metrics) GetTTFTMetrics() map[string]interface{} {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
|
||||||
|
result := make(map[string]interface{})
|
||||||
|
for key, samples := range m.ttftMs {
|
||||||
|
if len(samples) > 0 {
|
||||||
|
result[key] = map[string]interface{}{
|
||||||
|
"count": len(samples),
|
||||||
|
"sum": sumInt64(samples),
|
||||||
|
"avg": sumInt64(samples) / int64(len(samples)),
|
||||||
|
"min": minInt64(samples),
|
||||||
|
"max": maxInt64(samples),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetITLMetrics returns ITL statistics for Prometheus export
|
||||||
|
func (m *Metrics) GetITLMetrics() map[string]interface{} {
|
||||||
|
m.mu.RLock()
|
||||||
|
defer m.mu.RUnlock()
|
||||||
|
|
||||||
|
result := make(map[string]interface{})
|
||||||
|
for key, samples := range m.itlMs {
|
||||||
|
if len(samples) > 0 {
|
||||||
|
result[key] = map[string]interface{}{
|
||||||
|
"count": len(samples),
|
||||||
|
"sum": sumInt64(samples),
|
||||||
|
"avg": sumInt64(samples) / int64(len(samples)),
|
||||||
|
"min": minInt64(samples),
|
||||||
|
"max": maxInt64(samples),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
func sumInt64(vals []int64) int64 {
|
||||||
|
var s int64
|
||||||
|
for _, v := range vals {
|
||||||
|
s += v
|
||||||
|
}
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
func minInt64(vals []int64) int64 {
|
||||||
|
if len(vals) == 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
min := vals[0]
|
||||||
|
for _, v := range vals {
|
||||||
|
if v < min {
|
||||||
|
min = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return min
|
||||||
|
}
|
||||||
|
|
||||||
|
func maxInt64(vals []int64) int64 {
|
||||||
|
if len(vals) == 0 {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
max := vals[0]
|
||||||
|
for _, v := range vals {
|
||||||
|
if v > max {
|
||||||
|
max = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return max
|
||||||
|
}
|
||||||
|
|
||||||
// Reset clears all metrics (for testing).
|
// Reset clears all metrics (for testing).
|
||||||
func (m *Metrics) Reset() {
|
func (m *Metrics) Reset() {
|
||||||
m.mu.Lock()
|
m.mu.Lock()
|
||||||
@@ -162,4 +277,7 @@ func (m *Metrics) Reset() {
|
|||||||
m.upstreamHealth = make(map[string]int)
|
m.upstreamHealth = make(map[string]int)
|
||||||
m.streamingResponsesTotal = make(map[string]int64)
|
m.streamingResponsesTotal = make(map[string]int64)
|
||||||
m.streamingByteCount = make(map[string]int64)
|
m.streamingByteCount = make(map[string]int64)
|
||||||
|
m.ttftMs = make(map[string][]int64)
|
||||||
|
m.itlMs = make(map[string][]int64)
|
||||||
|
m.tokenCount = make(map[string]int64)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,198 @@
|
|||||||
|
package observability
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"sort"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// PrometheusExporter exports metrics in Prometheus text format
|
||||||
|
type PrometheusExporter struct {
|
||||||
|
metrics *Metrics
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewPrometheusExporter creates a new Prometheus exporter
|
||||||
|
func NewPrometheusExporter(m *Metrics) *PrometheusExporter {
|
||||||
|
return &PrometheusExporter{metrics: m}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Export returns metrics in Prometheus text format
|
||||||
|
func (p *PrometheusExporter) Export() string {
|
||||||
|
var lines []string
|
||||||
|
|
||||||
|
lines = append(lines, "# HELP llm_ttft_seconds Time to first token for LLM inference (seconds)")
|
||||||
|
lines = append(lines, "# TYPE llm_ttft_seconds histogram")
|
||||||
|
p.exportTTFT(&lines)
|
||||||
|
|
||||||
|
lines = append(lines, "# HELP llm_itl_seconds Inter-token latency for LLM inference (seconds)")
|
||||||
|
lines = append(lines, "# TYPE llm_itl_seconds histogram")
|
||||||
|
p.exportITL(&lines)
|
||||||
|
|
||||||
|
lines = append(lines, "# HELP llm_tokens_total Total tokens generated")
|
||||||
|
lines = append(lines, "# TYPE llm_tokens_total counter")
|
||||||
|
p.exportTokens(&lines)
|
||||||
|
|
||||||
|
lines = append(lines, "# HELP request_duration_seconds Request latency")
|
||||||
|
lines = append(lines, "# TYPE request_duration_seconds histogram")
|
||||||
|
p.exportRequestDuration(&lines)
|
||||||
|
|
||||||
|
return strings.Join(lines, "\n") + "\n"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PrometheusExporter) exportTTFT(lines *[]string) {
|
||||||
|
p.metrics.mu.RLock()
|
||||||
|
defer p.metrics.mu.RUnlock()
|
||||||
|
|
||||||
|
// Calculate statistics for each model
|
||||||
|
for key, samples := range p.metrics.ttftMs {
|
||||||
|
if len(samples) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
model := extractModel(key)
|
||||||
|
sum := sumInt64(samples)
|
||||||
|
|
||||||
|
// Export histogram buckets (in seconds)
|
||||||
|
buckets := []float64{0.001, 0.01, 0.05, 0.1, 0.5, 1.0, 5.0}
|
||||||
|
for _, bucket := range buckets {
|
||||||
|
count := countLessOrEqual(samples, int64(bucket*1000))
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_ttft_seconds_bucket{model="%s",le="%.3f"} %d`,
|
||||||
|
model, bucket, count,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_ttft_seconds_bucket{model="%s",le="+Inf"} %d`,
|
||||||
|
model, len(samples),
|
||||||
|
))
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_ttft_seconds_sum{model="%s"} %.3f`,
|
||||||
|
model, float64(sum)/1000,
|
||||||
|
))
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_ttft_seconds_count{model="%s"} %d`,
|
||||||
|
model, len(samples),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PrometheusExporter) exportITL(lines *[]string) {
|
||||||
|
p.metrics.mu.RLock()
|
||||||
|
defer p.metrics.mu.RUnlock()
|
||||||
|
|
||||||
|
for key, samples := range p.metrics.itlMs {
|
||||||
|
if len(samples) == 0 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
model := extractModel(key)
|
||||||
|
sum := sumInt64(samples)
|
||||||
|
|
||||||
|
// Export histogram buckets (in seconds)
|
||||||
|
buckets := []float64{0.001, 0.01, 0.05, 0.1, 0.5, 1.0, 5.0}
|
||||||
|
for _, bucket := range buckets {
|
||||||
|
count := countLessOrEqual(samples, int64(bucket*1000))
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_itl_seconds_bucket{model="%s",le="%.3f"} %d`,
|
||||||
|
model, bucket, count,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_itl_seconds_bucket{model="%s",le="+Inf"} %d`,
|
||||||
|
model, len(samples),
|
||||||
|
))
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_itl_seconds_sum{model="%s"} %.3f`,
|
||||||
|
model, float64(sum)/1000,
|
||||||
|
))
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_itl_seconds_count{model="%s"} %d`,
|
||||||
|
model, len(samples),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PrometheusExporter) exportTokens(lines *[]string) {
|
||||||
|
p.metrics.mu.RLock()
|
||||||
|
defer p.metrics.mu.RUnlock()
|
||||||
|
|
||||||
|
// Sort keys for consistent output
|
||||||
|
var keys []string
|
||||||
|
for k := range p.metrics.tokenCount {
|
||||||
|
keys = append(keys, k)
|
||||||
|
}
|
||||||
|
sort.Strings(keys)
|
||||||
|
|
||||||
|
for _, key := range keys {
|
||||||
|
model := extractModel(key)
|
||||||
|
count := p.metrics.tokenCount[key]
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`llm_tokens_total{model="%s"} %d`,
|
||||||
|
model, count,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (p *PrometheusExporter) exportRequestDuration(lines *[]string) {
|
||||||
|
p.metrics.mu.RLock()
|
||||||
|
defer p.metrics.mu.RUnlock()
|
||||||
|
|
||||||
|
// Sort keys for consistent output
|
||||||
|
var keys []string
|
||||||
|
for k := range p.metrics.requestDuration {
|
||||||
|
keys = append(keys, k)
|
||||||
|
}
|
||||||
|
sort.Strings(keys)
|
||||||
|
|
||||||
|
for _, key := range keys {
|
||||||
|
route, upstream := parseKey(key)
|
||||||
|
totalMs := p.metrics.requestDuration[key]
|
||||||
|
count := int64(1) // We'd need to track count separately in real impl
|
||||||
|
|
||||||
|
if buckets, ok := p.metrics.requestDurationBuckets[key]; ok {
|
||||||
|
for bucket := range buckets {
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`request_duration_seconds_bucket{route="%s",upstream="%s",le="%.1f"} %d`,
|
||||||
|
route, upstream, bucket, buckets[bucket],
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`request_duration_seconds_sum{route="%s",upstream="%s"} %.3f`,
|
||||||
|
route, upstream, float64(totalMs)/1000,
|
||||||
|
))
|
||||||
|
*lines = append(*lines, fmt.Sprintf(
|
||||||
|
`request_duration_seconds_count{route="%s",upstream="%s"} %d`,
|
||||||
|
route, upstream, count,
|
||||||
|
))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func extractModel(key string) string {
|
||||||
|
parts := strings.Split(key, ":")
|
||||||
|
if len(parts) >= 3 {
|
||||||
|
return parts[2]
|
||||||
|
}
|
||||||
|
return key
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseKey(key string) (string, string) {
|
||||||
|
parts := strings.Split(key, ":")
|
||||||
|
if len(parts) >= 2 {
|
||||||
|
return parts[0], parts[1]
|
||||||
|
}
|
||||||
|
return key, ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func countLessOrEqual(samples []int64, threshold int64) int {
|
||||||
|
count := 0
|
||||||
|
for _, s := range samples {
|
||||||
|
if s <= threshold {
|
||||||
|
count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return count
|
||||||
|
}
|
||||||
@@ -0,0 +1,153 @@
|
|||||||
|
package proxy
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"forgejo.riotpiao.com/rock/homelab-frontend/internal/observability"
|
||||||
|
)
|
||||||
|
|
||||||
|
// LLMMetricsCapture wraps a response writer to capture TTFT and ITL metrics
|
||||||
|
type LLMMetricsCapture struct {
|
||||||
|
writer io.WriteCloser
|
||||||
|
model string
|
||||||
|
metrics *observability.Metrics
|
||||||
|
firstTokenTime time.Time
|
||||||
|
lastTokenTime time.Time
|
||||||
|
requestStartTime time.Time
|
||||||
|
ttftRecorded bool
|
||||||
|
tokenCount int64
|
||||||
|
responseStartTime time.Time
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewLLMMetricsCapture creates a new metrics capture wrapper
|
||||||
|
func NewLLMMetricsCapture(writer io.WriteCloser, model string, metrics *observability.Metrics, startTime time.Time) *LLMMetricsCapture {
|
||||||
|
return &LLMMetricsCapture{
|
||||||
|
writer: writer,
|
||||||
|
model: model,
|
||||||
|
metrics: metrics,
|
||||||
|
requestStartTime: startTime,
|
||||||
|
responseStartTime: time.Now(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write intercepts writes to detect tokens and record metrics
|
||||||
|
func (c *LLMMetricsCapture) Write(p []byte) (int, error) {
|
||||||
|
// Record first token time
|
||||||
|
if !c.ttftRecorded && len(p) > 0 {
|
||||||
|
now := time.Now()
|
||||||
|
ttft := now.Sub(c.requestStartTime).Milliseconds()
|
||||||
|
c.metrics.RecordTTFT(c.model, ttft)
|
||||||
|
c.ttftRecorded = true
|
||||||
|
c.firstTokenTime = now
|
||||||
|
c.lastTokenTime = now
|
||||||
|
}
|
||||||
|
|
||||||
|
// Count tokens in SSE stream (simple: count "data: " lines)
|
||||||
|
if c.ttftRecorded {
|
||||||
|
tokenCount := strings.Count(string(p), "data: ")
|
||||||
|
if tokenCount > 0 {
|
||||||
|
now := time.Now()
|
||||||
|
if !c.firstTokenTime.IsZero() && c.lastTokenTime != now {
|
||||||
|
itl := now.Sub(c.lastTokenTime).Milliseconds()
|
||||||
|
c.metrics.RecordITL(c.model, itl)
|
||||||
|
}
|
||||||
|
c.lastTokenTime = now
|
||||||
|
c.tokenCount += int64(tokenCount)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return c.writer.Write(p)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Close records final metrics and closes writer
|
||||||
|
func (c *LLMMetricsCapture) Close() error {
|
||||||
|
if c.tokenCount > 0 {
|
||||||
|
c.metrics.RecordTokenCount(c.model, c.tokenCount)
|
||||||
|
}
|
||||||
|
return c.writer.Close()
|
||||||
|
}
|
||||||
|
|
||||||
|
// ResponseWriterWrapper wraps http.ResponseWriter to capture metrics
|
||||||
|
type ResponseWriterWrapper struct {
|
||||||
|
writer http.ResponseWriter
|
||||||
|
statusCode int
|
||||||
|
metrics *observability.Metrics
|
||||||
|
model string
|
||||||
|
startTime time.Time
|
||||||
|
firstByteTime time.Time
|
||||||
|
lastWriteTime time.Time
|
||||||
|
ttftRecorded bool
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewResponseWriterWrapper creates a wrapper for response writer
|
||||||
|
func NewResponseWriterWrapper(w http.ResponseWriter, model string, metrics *observability.Metrics, startTime time.Time) *ResponseWriterWrapper {
|
||||||
|
return &ResponseWriterWrapper{
|
||||||
|
writer: w,
|
||||||
|
model: model,
|
||||||
|
metrics: metrics,
|
||||||
|
startTime: startTime,
|
||||||
|
statusCode: 200,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Header implements http.ResponseWriter
|
||||||
|
func (w *ResponseWriterWrapper) Header() http.Header {
|
||||||
|
return w.writer.Header()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write implements http.ResponseWriter
|
||||||
|
func (w *ResponseWriterWrapper) Write(b []byte) (int, error) {
|
||||||
|
// Record TTFT on first write
|
||||||
|
if !w.ttftRecorded && len(b) > 0 {
|
||||||
|
now := time.Now()
|
||||||
|
ttft := now.Sub(w.startTime).Milliseconds()
|
||||||
|
w.metrics.RecordTTFT(w.model, ttft)
|
||||||
|
w.ttftRecorded = true
|
||||||
|
w.firstByteTime = now
|
||||||
|
w.lastWriteTime = now
|
||||||
|
}
|
||||||
|
|
||||||
|
// Record ITL for subsequent writes (for streaming)
|
||||||
|
if w.ttftRecorded && len(b) > 0 {
|
||||||
|
now := time.Now()
|
||||||
|
if !w.firstByteTime.IsZero() && w.lastWriteTime != now {
|
||||||
|
itl := now.Sub(w.lastWriteTime).Milliseconds()
|
||||||
|
// Only record if ITL > 0 (avoid recording same millisecond twice)
|
||||||
|
if itl > 0 {
|
||||||
|
w.metrics.RecordITL(w.model, itl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
w.lastWriteTime = now
|
||||||
|
}
|
||||||
|
|
||||||
|
return w.writer.Write(b)
|
||||||
|
}
|
||||||
|
|
||||||
|
// WriteHeader implements http.ResponseWriter
|
||||||
|
func (w *ResponseWriterWrapper) WriteHeader(statusCode int) {
|
||||||
|
w.statusCode = statusCode
|
||||||
|
w.writer.WriteHeader(statusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Flush implements http.Flusher
|
||||||
|
func (w *ResponseWriterWrapper) Flush() {
|
||||||
|
if flusher, ok := w.writer.(http.Flusher); ok {
|
||||||
|
flusher.Flush()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hijack implements http.Hijacker for streaming
|
||||||
|
func (w *ResponseWriterWrapper) Hijack() (net.Conn, *bufio.ReadWriter, error) {
|
||||||
|
if hijacker, ok := w.writer.(http.Hijacker); ok {
|
||||||
|
return hijacker.Hijack()
|
||||||
|
}
|
||||||
|
return nil, nil, fmt.Errorf("response writer does not implement Hijacker")
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -271,13 +271,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle /workflows endpoint (workflow orchestration)
|
// Try to find a matching route (including body-based dispatch for /v1/chat/completions).
|
||||||
if r.URL.Path == "/workflows" {
|
// Note: /workflows endpoint is deprecated. Use X-Service: workflow + X-Resource headers instead.
|
||||||
h.handleWorkflow(w, r)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try to find a matching route (including body-based dispatch for /v1/chat/completions)
|
|
||||||
route, err := h.RouteRequest(r)
|
route, err := h.RouteRequest(r)
|
||||||
|
|
||||||
// Check if this is a model validation error (from body-based dispatch)
|
// Check if this is a model validation error (from body-based dispatch)
|
||||||
|
|||||||
@@ -1,484 +0,0 @@
|
|||||||
// Package proxy provides request routing and forwarding.
|
|
||||||
package proxy
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"context"
|
|
||||||
"encoding/json"
|
|
||||||
"fmt"
|
|
||||||
"io"
|
|
||||||
"net/http"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// WorkflowRequest represents a workflow execution request
|
|
||||||
type WorkflowRequest struct {
|
|
||||||
// Workflow ID or name
|
|
||||||
Workflow string `json:"workflow"`
|
|
||||||
|
|
||||||
// Input parameters for the workflow
|
|
||||||
Input map[string]interface{} `json:"input"`
|
|
||||||
|
|
||||||
// Optional: timeout in seconds
|
|
||||||
Timeout int `json:"timeout,omitempty"`
|
|
||||||
|
|
||||||
// Optional: wait for result (default: true)
|
|
||||||
Wait *bool `json:"wait,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// WorkflowResponse represents the response from workflow execution
|
|
||||||
type WorkflowResponse struct {
|
|
||||||
// Workflow execution ID
|
|
||||||
ID string `json:"id"`
|
|
||||||
|
|
||||||
// Workflow name
|
|
||||||
Workflow string `json:"workflow"`
|
|
||||||
|
|
||||||
// Execution status: pending, running, completed, failed
|
|
||||||
Status string `json:"status"`
|
|
||||||
|
|
||||||
// Output of the workflow
|
|
||||||
Output interface{} `json:"output,omitempty"`
|
|
||||||
|
|
||||||
// Error message if workflow failed
|
|
||||||
Error string `json:"error,omitempty"`
|
|
||||||
|
|
||||||
// Timestamp when workflow was created
|
|
||||||
CreatedAt time.Time `json:"created_at"`
|
|
||||||
|
|
||||||
// Timestamp when workflow completed
|
|
||||||
CompletedAt *time.Time `json:"completed_at,omitempty"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// PredefinedWorkflow defines a workflow template that combines multiple API calls
|
|
||||||
type PredefinedWorkflow struct {
|
|
||||||
Name string
|
|
||||||
Description string
|
|
||||||
Handler func(*http.Request, *Handler, map[string]interface{}) (interface{}, error)
|
|
||||||
}
|
|
||||||
|
|
||||||
// handleWorkflow handles the /workflows endpoint
|
|
||||||
// It accepts workflow definitions and orchestrates API calls
|
|
||||||
func (h *Handler) handleWorkflow(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// Only POST is supported
|
|
||||||
if r.Method != "POST" {
|
|
||||||
w.Header().Set("Content-Type", "application/problem+json")
|
|
||||||
w.WriteHeader(http.StatusMethodNotAllowed)
|
|
||||||
fmt.Fprintf(w, `{"type":"https://api.example.com/problems/method-not-allowed","title":"Method Not Allowed","status":405,"detail":"Only POST is supported for /workflows"}`)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Parse request body
|
|
||||||
var workflowReq WorkflowRequest
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&workflowReq); err != nil {
|
|
||||||
writeProblemDetail(w, http.StatusBadRequest, "https://api.example.com/problems/invalid-workflow-request", "Invalid Workflow Request", "Failed to parse workflow request: "+err.Error(), nil)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validate workflow name
|
|
||||||
if workflowReq.Workflow == "" {
|
|
||||||
writeProblemDetail(w, http.StatusBadRequest, "https://api.example.com/problems/missing-workflow", "Missing Workflow", "The 'workflow' field is required", nil)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Get predefined workflow
|
|
||||||
workflow, ok := h.getWorkflow(workflowReq.Workflow)
|
|
||||||
if !ok {
|
|
||||||
availableWorkflows := h.getAvailableWorkflows()
|
|
||||||
writeProblemDetail(w, http.StatusBadRequest, "https://api.example.com/problems/unknown-workflow", "Unknown Workflow", fmt.Sprintf("Workflow %q is not available", workflowReq.Workflow), availableWorkflows)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Default wait to true
|
|
||||||
wait := true
|
|
||||||
if workflowReq.Wait != nil {
|
|
||||||
wait = *workflowReq.Wait
|
|
||||||
}
|
|
||||||
|
|
||||||
// Set default timeout if not provided
|
|
||||||
timeout := time.Duration(30) * time.Second
|
|
||||||
if workflowReq.Timeout > 0 {
|
|
||||||
timeout = time.Duration(workflowReq.Timeout) * time.Second
|
|
||||||
}
|
|
||||||
|
|
||||||
// Create a context with timeout for workflow execution
|
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), timeout)
|
|
||||||
defer cancel()
|
|
||||||
|
|
||||||
// Execute workflow
|
|
||||||
output, err := workflow.Handler(r.WithContext(ctx), h, workflowReq.Input)
|
|
||||||
|
|
||||||
// Build response
|
|
||||||
workflowResp := WorkflowResponse{
|
|
||||||
ID: generateWorkflowID(),
|
|
||||||
Workflow: workflowReq.Workflow,
|
|
||||||
CreatedAt: time.Now(),
|
|
||||||
}
|
|
||||||
|
|
||||||
if err != nil {
|
|
||||||
workflowResp.Status = "failed"
|
|
||||||
workflowResp.Error = err.Error()
|
|
||||||
} else {
|
|
||||||
if wait {
|
|
||||||
workflowResp.Status = "completed"
|
|
||||||
workflowResp.Output = output
|
|
||||||
now := time.Now()
|
|
||||||
workflowResp.CompletedAt = &now
|
|
||||||
} else {
|
|
||||||
workflowResp.Status = "pending"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Write response
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
if err != nil {
|
|
||||||
w.WriteHeader(http.StatusInternalServerError)
|
|
||||||
} else {
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
}
|
|
||||||
json.NewEncoder(w).Encode(workflowResp)
|
|
||||||
}
|
|
||||||
|
|
||||||
// getWorkflow returns a predefined workflow by name
|
|
||||||
func (h *Handler) getWorkflow(name string) (*PredefinedWorkflow, bool) {
|
|
||||||
workflows := h.getPredefinedWorkflows()
|
|
||||||
for _, wf := range workflows {
|
|
||||||
if wf.Name == name {
|
|
||||||
return &wf, true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return nil, false
|
|
||||||
}
|
|
||||||
|
|
||||||
// getPredefinedWorkflows returns all available workflows
|
|
||||||
func (h *Handler) getPredefinedWorkflows() []PredefinedWorkflow {
|
|
||||||
return []PredefinedWorkflow{
|
|
||||||
{
|
|
||||||
Name: "chat-and-embed",
|
|
||||||
Description: "Chat with a model and then embed the response",
|
|
||||||
Handler: h.chatAndEmbedWorkflow,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "multi-model-chat",
|
|
||||||
Description: "Chat with multiple models sequentially",
|
|
||||||
Handler: h.multiModelChatWorkflow,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "rag-pipeline",
|
|
||||||
Description: "RAG pipeline: embed query, rerank, then chat with context",
|
|
||||||
Handler: h.ragPipelineWorkflow,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
Name: "batch-embeddings",
|
|
||||||
Description: "Generate embeddings for multiple texts",
|
|
||||||
Handler: h.batchEmbeddingsWorkflow,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// getAvailableWorkflows returns a list of available workflow names
|
|
||||||
func (h *Handler) getAvailableWorkflows() []string {
|
|
||||||
workflows := h.getPredefinedWorkflows()
|
|
||||||
names := make([]string, len(workflows))
|
|
||||||
for i, wf := range workflows {
|
|
||||||
names[i] = wf.Name
|
|
||||||
}
|
|
||||||
return names
|
|
||||||
}
|
|
||||||
|
|
||||||
// Workflow implementations
|
|
||||||
|
|
||||||
// chatAndEmbedWorkflow: Chat with a model, then embed the response
|
|
||||||
func (h *Handler) chatAndEmbedWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
|
||||||
model, ok := input["model"].(string)
|
|
||||||
if !ok || model == "" {
|
|
||||||
return nil, fmt.Errorf("missing required parameter: model")
|
|
||||||
}
|
|
||||||
|
|
||||||
embedModel, ok := input["embed_model"].(string)
|
|
||||||
if !ok {
|
|
||||||
embedModel = "nomic-ai/nomic-embed-text-v2-moe"
|
|
||||||
}
|
|
||||||
|
|
||||||
messages, ok := input["messages"].([]interface{})
|
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("missing required parameter: messages")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 1: Chat
|
|
||||||
chatReq := map[string]interface{}{
|
|
||||||
"model": model,
|
|
||||||
"messages": messages,
|
|
||||||
}
|
|
||||||
|
|
||||||
chatBody, _ := json.Marshal(chatReq)
|
|
||||||
chatHTTPReq, _ := http.NewRequest("POST", "/v1/chat/completions", io.NopCloser(bytes.NewReader(chatBody)))
|
|
||||||
chatHTTPReq.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
// Create a response writer to capture the chat response
|
|
||||||
chatResp := &responseCapture{}
|
|
||||||
handler.ServeHTTP(chatResp, chatHTTPReq)
|
|
||||||
|
|
||||||
var chatResult map[string]interface{}
|
|
||||||
if err := json.Unmarshal(chatResp.body.Bytes(), &chatResult); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to parse chat response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract message content
|
|
||||||
var messageContent string
|
|
||||||
if choices, ok := chatResult["choices"].([]interface{}); ok && len(choices) > 0 {
|
|
||||||
if choice, ok := choices[0].(map[string]interface{}); ok {
|
|
||||||
if message, ok := choice["message"].(map[string]interface{}); ok {
|
|
||||||
if content, ok := message["content"].(string); ok {
|
|
||||||
messageContent = content
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 2: Embed the response
|
|
||||||
embedReq := map[string]interface{}{
|
|
||||||
"model": embedModel,
|
|
||||||
"input": messageContent,
|
|
||||||
}
|
|
||||||
|
|
||||||
embedBody, _ := json.Marshal(embedReq)
|
|
||||||
embedHTTPReq, _ := http.NewRequest("POST", "/v1/embeddings", io.NopCloser(bytes.NewReader(embedBody)))
|
|
||||||
embedHTTPReq.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
embedResp := &responseCapture{}
|
|
||||||
handler.ServeHTTP(embedResp, embedHTTPReq)
|
|
||||||
|
|
||||||
var embedResult map[string]interface{}
|
|
||||||
if err := json.Unmarshal(embedResp.body.Bytes(), &embedResult); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to parse embedding response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return map[string]interface{}{
|
|
||||||
"chat_response": chatResult,
|
|
||||||
"embedding_response": embedResult,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// multiModelChatWorkflow: Chat with multiple models sequentially
|
|
||||||
func (h *Handler) multiModelChatWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
|
||||||
models, ok := input["models"].([]interface{})
|
|
||||||
if !ok || len(models) == 0 {
|
|
||||||
return nil, fmt.Errorf("missing required parameter: models (array)")
|
|
||||||
}
|
|
||||||
|
|
||||||
messages, ok := input["messages"].([]interface{})
|
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("missing required parameter: messages")
|
|
||||||
}
|
|
||||||
|
|
||||||
results := make([]map[string]interface{}, 0)
|
|
||||||
|
|
||||||
for _, modelInterface := range models {
|
|
||||||
model, ok := modelInterface.(string)
|
|
||||||
if !ok {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
chatReq := map[string]interface{}{
|
|
||||||
"model": model,
|
|
||||||
"messages": messages,
|
|
||||||
}
|
|
||||||
|
|
||||||
chatBody, _ := json.Marshal(chatReq)
|
|
||||||
chatHTTPReq, _ := http.NewRequest("POST", "/v1/chat/completions", io.NopCloser(bytes.NewReader(chatBody)))
|
|
||||||
chatHTTPReq.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
chatResp := &responseCapture{}
|
|
||||||
handler.ServeHTTP(chatResp, chatHTTPReq)
|
|
||||||
|
|
||||||
var chatResult map[string]interface{}
|
|
||||||
if err := json.Unmarshal(chatResp.body.Bytes(), &chatResult); err != nil {
|
|
||||||
results = append(results, map[string]interface{}{
|
|
||||||
"model": model,
|
|
||||||
"error": err.Error(),
|
|
||||||
})
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
results = append(results, map[string]interface{}{
|
|
||||||
"model": model,
|
|
||||||
"result": chatResult,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return results, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// ragPipelineWorkflow: RAG pipeline - embed query, rerank, chat with context
|
|
||||||
func (h *Handler) ragPipelineWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
|
||||||
query, ok := input["query"].(string)
|
|
||||||
if !ok || query == "" {
|
|
||||||
return nil, fmt.Errorf("missing required parameter: query")
|
|
||||||
}
|
|
||||||
|
|
||||||
documents, ok := input["documents"].([]interface{})
|
|
||||||
if !ok {
|
|
||||||
return nil, fmt.Errorf("missing required parameter: documents")
|
|
||||||
}
|
|
||||||
|
|
||||||
model, ok := input["model"].(string)
|
|
||||||
if !ok {
|
|
||||||
model = "reasoning"
|
|
||||||
}
|
|
||||||
|
|
||||||
rerankModel, ok := input["rerank_model"].(string)
|
|
||||||
if !ok {
|
|
||||||
rerankModel = "BAAI/bge-reranker-base"
|
|
||||||
}
|
|
||||||
|
|
||||||
topK := 3
|
|
||||||
if tk, ok := input["top_k"].(float64); ok {
|
|
||||||
topK = int(tk)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 1: Rerank documents based on query
|
|
||||||
rerankReq := map[string]interface{}{
|
|
||||||
"model": rerankModel,
|
|
||||||
"query": query,
|
|
||||||
"texts": documents,
|
|
||||||
"top_k": topK,
|
|
||||||
}
|
|
||||||
|
|
||||||
rerankBody, _ := json.Marshal(rerankReq)
|
|
||||||
rerankHTTPReq, _ := http.NewRequest("POST", "/v1/rerank", io.NopCloser(bytes.NewReader(rerankBody)))
|
|
||||||
rerankHTTPReq.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
rerankResp := &responseCapture{}
|
|
||||||
handler.ServeHTTP(rerankResp, rerankHTTPReq)
|
|
||||||
|
|
||||||
var rerankResult map[string]interface{}
|
|
||||||
if err := json.Unmarshal(rerankResp.body.Bytes(), &rerankResult); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to parse rerank response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract top documents
|
|
||||||
var topDocs []string
|
|
||||||
if results, ok := rerankResult["results"].([]interface{}); ok {
|
|
||||||
for i, resultInterface := range results {
|
|
||||||
if i >= topK {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
if result, ok := resultInterface.(map[string]interface{}); ok {
|
|
||||||
if text, ok := result["text"].(string); ok {
|
|
||||||
topDocs = append(topDocs, text)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Step 2: Chat with context
|
|
||||||
context := fmt.Sprintf("Context from documents:\n%v\n\nQuery: %s", topDocs, query)
|
|
||||||
|
|
||||||
chatReq := map[string]interface{}{
|
|
||||||
"model": model,
|
|
||||||
"messages": []interface{}{
|
|
||||||
map[string]interface{}{
|
|
||||||
"role": "user",
|
|
||||||
"content": context,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
chatBody, _ := json.Marshal(chatReq)
|
|
||||||
chatHTTPReq, _ := http.NewRequest("POST", "/v1/chat/completions", io.NopCloser(bytes.NewReader(chatBody)))
|
|
||||||
chatHTTPReq.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
chatResp := &responseCapture{}
|
|
||||||
handler.ServeHTTP(chatResp, chatHTTPReq)
|
|
||||||
|
|
||||||
var chatResult map[string]interface{}
|
|
||||||
if err := json.Unmarshal(chatResp.body.Bytes(), &chatResult); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to parse chat response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return map[string]interface{}{
|
|
||||||
"reranked_documents": topDocs,
|
|
||||||
"chat_response": chatResult,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// batchEmbeddingsWorkflow: Generate embeddings for multiple texts
|
|
||||||
func (h *Handler) batchEmbeddingsWorkflow(r *http.Request, handler *Handler, input map[string]interface{}) (interface{}, error) {
|
|
||||||
texts, ok := input["texts"].([]interface{})
|
|
||||||
if !ok || len(texts) == 0 {
|
|
||||||
return nil, fmt.Errorf("missing required parameter: texts (array)")
|
|
||||||
}
|
|
||||||
|
|
||||||
model, ok := input["model"].(string)
|
|
||||||
if !ok {
|
|
||||||
model = "nomic-ai/nomic-embed-text-v2-moe"
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert interface{} to []string
|
|
||||||
textStrings := make([]string, 0)
|
|
||||||
for _, t := range texts {
|
|
||||||
if str, ok := t.(string); ok {
|
|
||||||
textStrings = append(textStrings, str)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(textStrings) == 0 {
|
|
||||||
return nil, fmt.Errorf("no valid text strings in texts array")
|
|
||||||
}
|
|
||||||
|
|
||||||
embedReq := map[string]interface{}{
|
|
||||||
"model": model,
|
|
||||||
"input": textStrings,
|
|
||||||
}
|
|
||||||
|
|
||||||
embedBody, _ := json.Marshal(embedReq)
|
|
||||||
embedHTTPReq, _ := http.NewRequest("POST", "/v1/embeddings", io.NopCloser(bytes.NewReader(embedBody)))
|
|
||||||
embedHTTPReq.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
embedResp := &responseCapture{}
|
|
||||||
handler.ServeHTTP(embedResp, embedHTTPReq)
|
|
||||||
|
|
||||||
var embedResult map[string]interface{}
|
|
||||||
if err := json.Unmarshal(embedResp.body.Bytes(), &embedResult); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to parse embedding response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return embedResult, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Utility functions
|
|
||||||
|
|
||||||
// responseCapture captures HTTP response for reuse within workflows
|
|
||||||
type responseCapture struct {
|
|
||||||
status int
|
|
||||||
header http.Header
|
|
||||||
body bytes.Buffer
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *responseCapture) Header() http.Header {
|
|
||||||
if w.header == nil {
|
|
||||||
w.header = make(http.Header)
|
|
||||||
}
|
|
||||||
return w.header
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *responseCapture) Write(b []byte) (int, error) {
|
|
||||||
if w.status == 0 {
|
|
||||||
w.status = http.StatusOK
|
|
||||||
}
|
|
||||||
return w.body.Write(b)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (w *responseCapture) WriteHeader(statusCode int) {
|
|
||||||
if w.status == 0 {
|
|
||||||
w.status = statusCode
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// generateWorkflowID generates a unique workflow execution ID
|
|
||||||
func generateWorkflowID() string {
|
|
||||||
return fmt.Sprintf("wf_%d", time.Now().UnixNano())
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,258 +0,0 @@
|
|||||||
package proxy
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
|
||||||
"net/http"
|
|
||||||
"net/http/httptest"
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"forgejo.riotpiao.com/rock/homelab-frontend/internal/config"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestWorkflowEndpointNotFound(t *testing.T) {
|
|
||||||
// Create a minimal config
|
|
||||||
cfg := &config.Config{
|
|
||||||
Routes: make(map[string]*config.Route),
|
|
||||||
Models: map[string]*config.ModelUpstream{
|
|
||||||
"reasoning": {
|
|
||||||
Address: "localhost:8001",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := New(cfg)
|
|
||||||
|
|
||||||
// Test POST /workflows with unknown workflow
|
|
||||||
body := map[string]interface{}{
|
|
||||||
"workflow": "unknown-workflow",
|
|
||||||
"input": map[string]interface{}{},
|
|
||||||
}
|
|
||||||
|
|
||||||
bodyBytes, _ := json.Marshal(body)
|
|
||||||
req := httptest.NewRequest("POST", "/workflows", bytes.NewReader(bodyBytes))
|
|
||||||
req.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
w := httptest.NewRecorder()
|
|
||||||
handler.ServeHTTP(w, req)
|
|
||||||
|
|
||||||
if w.Code != http.StatusBadRequest {
|
|
||||||
t.Errorf("Expected 400, got %d", w.Code)
|
|
||||||
}
|
|
||||||
|
|
||||||
var response map[string]interface{}
|
|
||||||
json.Unmarshal(w.Body.Bytes(), &response)
|
|
||||||
|
|
||||||
if response["type"] != "https://api.example.com/problems/unknown-workflow" {
|
|
||||||
t.Errorf("Expected unknown-workflow error, got %v", response["type"])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestWorkflowEndpointMissingWorkflow(t *testing.T) {
|
|
||||||
cfg := &config.Config{
|
|
||||||
Routes: make(map[string]*config.Route),
|
|
||||||
Models: make(map[string]*config.ModelUpstream),
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := New(cfg)
|
|
||||||
|
|
||||||
// Test POST /workflows with missing workflow field
|
|
||||||
body := map[string]interface{}{
|
|
||||||
"input": map[string]interface{}{},
|
|
||||||
}
|
|
||||||
|
|
||||||
bodyBytes, _ := json.Marshal(body)
|
|
||||||
req := httptest.NewRequest("POST", "/workflows", bytes.NewReader(bodyBytes))
|
|
||||||
req.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
w := httptest.NewRecorder()
|
|
||||||
handler.ServeHTTP(w, req)
|
|
||||||
|
|
||||||
if w.Code != http.StatusBadRequest {
|
|
||||||
t.Errorf("Expected 400, got %d", w.Code)
|
|
||||||
}
|
|
||||||
|
|
||||||
var response map[string]interface{}
|
|
||||||
json.Unmarshal(w.Body.Bytes(), &response)
|
|
||||||
|
|
||||||
if response["type"] != "https://api.example.com/problems/missing-workflow" {
|
|
||||||
t.Errorf("Expected missing-workflow error, got %v", response["type"])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestWorkflowEndpointInvalidMethod(t *testing.T) {
|
|
||||||
cfg := &config.Config{
|
|
||||||
Routes: make(map[string]*config.Route),
|
|
||||||
Models: make(map[string]*config.ModelUpstream),
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := New(cfg)
|
|
||||||
|
|
||||||
// Test GET /workflows (should be 405)
|
|
||||||
req := httptest.NewRequest("GET", "/workflows", nil)
|
|
||||||
w := httptest.NewRecorder()
|
|
||||||
handler.ServeHTTP(w, req)
|
|
||||||
|
|
||||||
if w.Code != http.StatusMethodNotAllowed {
|
|
||||||
t.Errorf("Expected 405, got %d", w.Code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestWorkflowEndpointInvalidJSON(t *testing.T) {
|
|
||||||
cfg := &config.Config{
|
|
||||||
Routes: make(map[string]*config.Route),
|
|
||||||
Models: make(map[string]*config.ModelUpstream),
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := New(cfg)
|
|
||||||
|
|
||||||
// Test POST /workflows with invalid JSON
|
|
||||||
req := httptest.NewRequest("POST", "/workflows", bytes.NewReader([]byte("not json")))
|
|
||||||
req.Header.Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
w := httptest.NewRecorder()
|
|
||||||
handler.ServeHTTP(w, req)
|
|
||||||
|
|
||||||
if w.Code != http.StatusBadRequest {
|
|
||||||
t.Errorf("Expected 400, got %d", w.Code)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetAvailableWorkflows(t *testing.T) {
|
|
||||||
cfg := &config.Config{
|
|
||||||
Routes: make(map[string]*config.Route),
|
|
||||||
Models: make(map[string]*config.ModelUpstream),
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := New(cfg)
|
|
||||||
|
|
||||||
workflows := handler.getAvailableWorkflows()
|
|
||||||
|
|
||||||
expectedWorkflows := []string{
|
|
||||||
"chat-and-embed",
|
|
||||||
"multi-model-chat",
|
|
||||||
"rag-pipeline",
|
|
||||||
"batch-embeddings",
|
|
||||||
}
|
|
||||||
|
|
||||||
if len(workflows) != len(expectedWorkflows) {
|
|
||||||
t.Errorf("Expected %d workflows, got %d", len(expectedWorkflows), len(workflows))
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check that all expected workflows are present
|
|
||||||
for _, expected := range expectedWorkflows {
|
|
||||||
found := false
|
|
||||||
for _, actual := range workflows {
|
|
||||||
if actual == expected {
|
|
||||||
found = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if !found {
|
|
||||||
t.Errorf("Expected workflow %q not found", expected)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGetWorkflow(t *testing.T) {
|
|
||||||
cfg := &config.Config{
|
|
||||||
Routes: make(map[string]*config.Route),
|
|
||||||
Models: make(map[string]*config.ModelUpstream),
|
|
||||||
}
|
|
||||||
|
|
||||||
handler := New(cfg)
|
|
||||||
|
|
||||||
// Test getting a valid workflow
|
|
||||||
workflow, ok := handler.getWorkflow("chat-and-embed")
|
|
||||||
if !ok {
|
|
||||||
t.Error("Expected to find chat-and-embed workflow")
|
|
||||||
}
|
|
||||||
if workflow.Name != "chat-and-embed" {
|
|
||||||
t.Errorf("Expected workflow name chat-and-embed, got %s", workflow.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test getting an invalid workflow
|
|
||||||
workflow, ok = handler.getWorkflow("invalid-workflow")
|
|
||||||
if ok {
|
|
||||||
t.Error("Expected not to find invalid-workflow")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestGenerateWorkflowID(t *testing.T) {
|
|
||||||
id1 := generateWorkflowID()
|
|
||||||
id2 := generateWorkflowID()
|
|
||||||
|
|
||||||
if id1 == id2 {
|
|
||||||
t.Error("Generated workflow IDs should be unique")
|
|
||||||
}
|
|
||||||
|
|
||||||
if !bytes.HasPrefix([]byte(id1), []byte("wf_")) {
|
|
||||||
t.Errorf("Workflow ID should start with 'wf_', got %s", id1)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestResponseCapture(t *testing.T) {
|
|
||||||
rc := &responseCapture{}
|
|
||||||
|
|
||||||
// Test Header
|
|
||||||
rc.Header().Set("X-Test", "value")
|
|
||||||
if rc.Header().Get("X-Test") != "value" {
|
|
||||||
t.Error("Header not set correctly")
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test Write
|
|
||||||
n, err := rc.Write([]byte("test content"))
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Unexpected error: %v", err)
|
|
||||||
}
|
|
||||||
if n != 12 {
|
|
||||||
t.Errorf("Expected 12 bytes written, got %d", n)
|
|
||||||
}
|
|
||||||
if rc.body.String() != "test content" {
|
|
||||||
t.Errorf("Expected 'test content', got %s", rc.body.String())
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test WriteHeader
|
|
||||||
rc.WriteHeader(http.StatusOK)
|
|
||||||
if rc.status != http.StatusOK {
|
|
||||||
t.Errorf("Expected status 200, got %d", rc.status)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Test WriteHeader doesn't override
|
|
||||||
rc.WriteHeader(http.StatusInternalServerError)
|
|
||||||
if rc.status != http.StatusOK {
|
|
||||||
t.Error("WriteHeader should not override existing status")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestWorkflowResponseSerialization(t *testing.T) {
|
|
||||||
resp := WorkflowResponse{
|
|
||||||
ID: "wf_123",
|
|
||||||
Workflow: "test-workflow",
|
|
||||||
Status: "completed",
|
|
||||||
Output: map[string]interface{}{
|
|
||||||
"key": "value",
|
|
||||||
},
|
|
||||||
Error: "",
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := json.Marshal(resp)
|
|
||||||
if err != nil {
|
|
||||||
t.Errorf("Failed to marshal response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var unmarshaled WorkflowResponse
|
|
||||||
if err := json.Unmarshal(data, &unmarshaled); err != nil {
|
|
||||||
t.Errorf("Failed to unmarshal response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if unmarshaled.ID != resp.ID {
|
|
||||||
t.Errorf("Expected ID %s, got %s", resp.ID, unmarshaled.ID)
|
|
||||||
}
|
|
||||||
if unmarshaled.Workflow != resp.Workflow {
|
|
||||||
t.Errorf("Expected Workflow %s, got %s", resp.Workflow, unmarshaled.Workflow)
|
|
||||||
}
|
|
||||||
if unmarshaled.Status != resp.Status {
|
|
||||||
t.Errorf("Expected Status %s, got %s", resp.Status, unmarshaled.Status)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +1,5 @@
|
|||||||
package serviceadapter
|
package serviceadapter
|
||||||
|
|
||||||
// WorkflowAdapter handles X-Service: workflow requests.
|
|
||||||
type WorkflowAdapter struct{}
|
|
||||||
|
|
||||||
// SQSAdapter handles X-Service: sqs requests.
|
// SQSAdapter handles X-Service: sqs requests.
|
||||||
type SQSAdapter struct{}
|
type SQSAdapter struct{}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,288 @@
|
|||||||
|
package serviceadapter
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"forgejo.riotpiao.com/rock/homelab-frontend/internal/temporal"
|
||||||
|
)
|
||||||
|
|
||||||
|
// WorkflowAdapter handles X-Service: workflow requests.
|
||||||
|
// It forwards workflow operations to the Temporal gRPC service.
|
||||||
|
// Users can specify namespace via the request payload.
|
||||||
|
type WorkflowAdapter struct {
|
||||||
|
temporalHandler *temporal.Handler
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewWorkflowAdapter creates a new WorkflowAdapter.
|
||||||
|
func NewWorkflowAdapter(handler *temporal.Handler) *WorkflowAdapter {
|
||||||
|
return &WorkflowAdapter{
|
||||||
|
temporalHandler: handler,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleStart handles workflow start requests.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "...", "workflow_type": "...", "task_queue": "...", "input": {...} }
|
||||||
|
func (wa *WorkflowAdapter) HandleStart(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleDescribe handles workflow describe requests.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "..." }
|
||||||
|
func (wa *WorkflowAdapter) HandleDescribe(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleList handles workflow list requests.
|
||||||
|
// Expects payload: { "namespace": "default", "query": "..." (optional) }
|
||||||
|
func (wa *WorkflowAdapter) HandleList(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleHistory handles workflow history requests.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "..." }
|
||||||
|
func (wa *WorkflowAdapter) HandleHistory(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleTerminate handles workflow termination.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "...", "reason": "..." }
|
||||||
|
func (wa *WorkflowAdapter) HandleTerminate(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleCancel handles workflow cancellation.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "..." }
|
||||||
|
func (wa *WorkflowAdapter) HandleCancel(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleSignal handles workflow signal.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "...", "signal_name": "...", "signal_data": {...} }
|
||||||
|
func (wa *WorkflowAdapter) HandleSignal(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleQuery handles workflow query.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "...", "query_type": "...", "query_data": {...} }
|
||||||
|
func (wa *WorkflowAdapter) HandleQuery(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleReset handles workflow reset.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "...", "reset_type": "..." }
|
||||||
|
func (wa *WorkflowAdapter) HandleReset(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// HandleUpdate handles workflow update.
|
||||||
|
// Expects payload: { "namespace": "default", "workflow_id": "...", "update_data": {...} }
|
||||||
|
func (wa *WorkflowAdapter) HandleUpdate(w http.ResponseWriter, r *http.Request) {
|
||||||
|
wa.forwardToTemporal(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// forwardToTemporal reads the request body, ensures namespace is specified,
|
||||||
|
// and forwards to the temporal handler.
|
||||||
|
func (wa *WorkflowAdapter) forwardToTemporal(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Read request body
|
||||||
|
body, err := io.ReadAll(r.Body)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, fmt.Sprintf("failed to read request body: %v", err), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer r.Body.Close()
|
||||||
|
|
||||||
|
// Parse JSON to check for namespace
|
||||||
|
var payload map[string]interface{}
|
||||||
|
if err := json.Unmarshal(body, &payload); err != nil {
|
||||||
|
http.Error(w, fmt.Sprintf("invalid JSON payload: %v", err), http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure namespace is specified (required for Temporal routing)
|
||||||
|
namespace, ok := payload["namespace"].(string)
|
||||||
|
if !ok || namespace == "" {
|
||||||
|
http.Error(w, `"namespace" field required in payload`, http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Forward to temporal handler by calling it with the request
|
||||||
|
// Restore body for temporal handler
|
||||||
|
r.Body = io.NopCloser(bytes.NewReader(body))
|
||||||
|
r.ContentLength = int64(len(body))
|
||||||
|
|
||||||
|
// Call temporal handler
|
||||||
|
wa.temporalHandler.ServeHTTP(w, r)
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetSpec returns the ServiceAdapter spec for workflow service.
|
||||||
|
// This defines the available resources and methods.
|
||||||
|
func GetWorkflowSpec() *Spec {
|
||||||
|
return &Spec{
|
||||||
|
ServiceName: "workflow",
|
||||||
|
Upstream: Upstream{
|
||||||
|
URL: "grpc://temporal:7233", // gRPC endpoint
|
||||||
|
TimeoutSeconds: 30,
|
||||||
|
},
|
||||||
|
Auth: Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:execute",
|
||||||
|
},
|
||||||
|
Retryable: true,
|
||||||
|
Resources: []Resource{
|
||||||
|
{
|
||||||
|
Name: "start",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/StartWorkflowExecution",
|
||||||
|
RequestSchema: "workflow_start_request",
|
||||||
|
ResponseSchema: "workflow_start_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:execute",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "describe",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/DescribeWorkflowExecution",
|
||||||
|
RequestSchema: "workflow_describe_request",
|
||||||
|
ResponseSchema: "workflow_describe_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:read",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "list",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/ListWorkflowExecutions",
|
||||||
|
RequestSchema: "workflow_list_request",
|
||||||
|
ResponseSchema: "workflow_list_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:read",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "history",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/GetWorkflowExecutionHistory",
|
||||||
|
RequestSchema: "workflow_history_request",
|
||||||
|
ResponseSchema: "workflow_history_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:read",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "terminate",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/TerminateWorkflowExecution",
|
||||||
|
RequestSchema: "workflow_terminate_request",
|
||||||
|
ResponseSchema: "workflow_terminate_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:execute",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "cancel",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/RequestCancelWorkflowExecution",
|
||||||
|
RequestSchema: "workflow_cancel_request",
|
||||||
|
ResponseSchema: "workflow_cancel_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:execute",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "signal",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/SignalWorkflowExecution",
|
||||||
|
RequestSchema: "workflow_signal_request",
|
||||||
|
ResponseSchema: "workflow_signal_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:signal",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "query",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/QueryWorkflow",
|
||||||
|
RequestSchema: "workflow_query_request",
|
||||||
|
ResponseSchema: "workflow_query_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:query",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "reset",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/ResetWorkflowExecution",
|
||||||
|
RequestSchema: "workflow_reset_request",
|
||||||
|
ResponseSchema: "workflow_reset_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:execute",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
Name: "update",
|
||||||
|
Methods: []Method{
|
||||||
|
{
|
||||||
|
Verb: "POST",
|
||||||
|
UpstreamPath: "/temporal.workflowservice.v1.WorkflowService/UpdateWorkflowExecution",
|
||||||
|
RequestSchema: "workflow_update_request",
|
||||||
|
ResponseSchema: "workflow_update_response",
|
||||||
|
Auth: &Auth{
|
||||||
|
Required: true,
|
||||||
|
Capability: "workflow:execute",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,321 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
kind: ConfigMap
|
||||||
|
metadata:
|
||||||
|
name: grafana-dashboard-llm-metrics
|
||||||
|
namespace: monitoring
|
||||||
|
labels:
|
||||||
|
grafana_dashboard: "1"
|
||||||
|
data:
|
||||||
|
llm-metrics.json: |
|
||||||
|
{
|
||||||
|
"annotations": {
|
||||||
|
"list": [
|
||||||
|
{
|
||||||
|
"builtIn": 1,
|
||||||
|
"datasource": "-- Grafana --",
|
||||||
|
"enable": true,
|
||||||
|
"hide": true,
|
||||||
|
"iconColor": "rgba(0, 211, 255, 1)",
|
||||||
|
"name": "Annotations & Alerts",
|
||||||
|
"type": "dashboard"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"editable": true,
|
||||||
|
"gnetId": null,
|
||||||
|
"graphTooltip": 0,
|
||||||
|
"id": null,
|
||||||
|
"links": [],
|
||||||
|
"panels": [
|
||||||
|
{
|
||||||
|
"datasource": "Prometheus",
|
||||||
|
"fieldConfig": {
|
||||||
|
"defaults": {
|
||||||
|
"color": {
|
||||||
|
"mode": "palette-classic"
|
||||||
|
},
|
||||||
|
"custom": {
|
||||||
|
"axisLabel": "Milliseconds",
|
||||||
|
"axisPlacement": "auto",
|
||||||
|
"barAlignment": 0,
|
||||||
|
"drawStyle": "line",
|
||||||
|
"fillOpacity": 10,
|
||||||
|
"gradientMode": "none",
|
||||||
|
"hideFrom": {
|
||||||
|
"tooltip": false,
|
||||||
|
"viz": false,
|
||||||
|
"legend": false
|
||||||
|
},
|
||||||
|
"lineInterpolation": "linear",
|
||||||
|
"lineWidth": 1,
|
||||||
|
"pointSize": 5,
|
||||||
|
"scaleDistribution": {
|
||||||
|
"type": "linear"
|
||||||
|
},
|
||||||
|
"showPoints": "auto",
|
||||||
|
"spanNulls": false,
|
||||||
|
"stacking": {
|
||||||
|
"group": "A",
|
||||||
|
"mode": "none"
|
||||||
|
},
|
||||||
|
"thresholdsStyle": {
|
||||||
|
"mode": "off"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mappings": [],
|
||||||
|
"thresholds": {
|
||||||
|
"mode": "absolute",
|
||||||
|
"steps": [
|
||||||
|
{
|
||||||
|
"color": "green",
|
||||||
|
"value": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"color": "red",
|
||||||
|
"value": 80
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"overrides": []
|
||||||
|
},
|
||||||
|
"gridPos": {
|
||||||
|
"h": 8,
|
||||||
|
"w": 12,
|
||||||
|
"x": 0,
|
||||||
|
"y": 0
|
||||||
|
},
|
||||||
|
"id": 2,
|
||||||
|
"options": {
|
||||||
|
"legend": {
|
||||||
|
"calcs": [
|
||||||
|
"mean",
|
||||||
|
"max",
|
||||||
|
"min"
|
||||||
|
],
|
||||||
|
"displayMode": "table",
|
||||||
|
"placement": "bottom"
|
||||||
|
},
|
||||||
|
"tooltip": {
|
||||||
|
"mode": "multi"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"pluginVersion": "8.0.0",
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"expr": "llm_ttft_seconds * 1000",
|
||||||
|
"legendFormat": "{{model}}",
|
||||||
|
"refId": "A"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Time to First Token (TTFT) by Model",
|
||||||
|
"type": "timeseries"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"datasource": "Prometheus",
|
||||||
|
"fieldConfig": {
|
||||||
|
"defaults": {
|
||||||
|
"color": {
|
||||||
|
"mode": "palette-classic"
|
||||||
|
},
|
||||||
|
"custom": {
|
||||||
|
"axisLabel": "Milliseconds",
|
||||||
|
"axisPlacement": "auto",
|
||||||
|
"barAlignment": 0,
|
||||||
|
"drawStyle": "line",
|
||||||
|
"fillOpacity": 10,
|
||||||
|
"gradientMode": "none",
|
||||||
|
"hideFrom": {
|
||||||
|
"tooltip": false,
|
||||||
|
"viz": false,
|
||||||
|
"legend": false
|
||||||
|
},
|
||||||
|
"lineInterpolation": "linear",
|
||||||
|
"lineWidth": 1,
|
||||||
|
"pointSize": 5,
|
||||||
|
"scaleDistribution": {
|
||||||
|
"type": "linear"
|
||||||
|
},
|
||||||
|
"showPoints": "auto",
|
||||||
|
"spanNulls": false,
|
||||||
|
"stacking": {
|
||||||
|
"group": "A",
|
||||||
|
"mode": "none"
|
||||||
|
},
|
||||||
|
"thresholdsStyle": {
|
||||||
|
"mode": "off"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mappings": [],
|
||||||
|
"thresholds": {
|
||||||
|
"mode": "absolute",
|
||||||
|
"steps": [
|
||||||
|
{
|
||||||
|
"color": "green",
|
||||||
|
"value": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"color": "red",
|
||||||
|
"value": 80
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"overrides": []
|
||||||
|
},
|
||||||
|
"gridPos": {
|
||||||
|
"h": 8,
|
||||||
|
"w": 12,
|
||||||
|
"x": 12,
|
||||||
|
"y": 0
|
||||||
|
},
|
||||||
|
"id": 3,
|
||||||
|
"options": {
|
||||||
|
"legend": {
|
||||||
|
"calcs": [
|
||||||
|
"mean",
|
||||||
|
"max",
|
||||||
|
"min"
|
||||||
|
],
|
||||||
|
"displayMode": "table",
|
||||||
|
"placement": "bottom"
|
||||||
|
},
|
||||||
|
"tooltip": {
|
||||||
|
"mode": "multi"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"pluginVersion": "8.0.0",
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"expr": "llm_itl_seconds * 1000",
|
||||||
|
"legendFormat": "{{model}}",
|
||||||
|
"refId": "A"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Inter-Token Latency (ITL) by Model",
|
||||||
|
"type": "timeseries"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"datasource": "Prometheus",
|
||||||
|
"fieldConfig": {
|
||||||
|
"defaults": {
|
||||||
|
"color": {
|
||||||
|
"mode": "palette-classic"
|
||||||
|
},
|
||||||
|
"custom": {
|
||||||
|
"hideFrom": {
|
||||||
|
"tooltip": false,
|
||||||
|
"viz": false,
|
||||||
|
"legend": false
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"mappings": []
|
||||||
|
},
|
||||||
|
"overrides": []
|
||||||
|
},
|
||||||
|
"gridPos": {
|
||||||
|
"h": 8,
|
||||||
|
"w": 12,
|
||||||
|
"x": 0,
|
||||||
|
"y": 8
|
||||||
|
},
|
||||||
|
"id": 4,
|
||||||
|
"options": {
|
||||||
|
"legend": {
|
||||||
|
"displayMode": "list",
|
||||||
|
"placement": "bottom"
|
||||||
|
},
|
||||||
|
"pieType": "pie"
|
||||||
|
},
|
||||||
|
"pluginVersion": "8.0.0",
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"expr": "llm_tokens_total",
|
||||||
|
"legendFormat": "{{model}}",
|
||||||
|
"refId": "A"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Total Tokens Generated by Model",
|
||||||
|
"type": "piechart"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"datasource": "Prometheus",
|
||||||
|
"fieldConfig": {
|
||||||
|
"defaults": {
|
||||||
|
"color": {
|
||||||
|
"mode": "thresholds"
|
||||||
|
},
|
||||||
|
"mappings": [],
|
||||||
|
"thresholds": {
|
||||||
|
"mode": "absolute",
|
||||||
|
"steps": [
|
||||||
|
{
|
||||||
|
"color": "green",
|
||||||
|
"value": null
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"color": "yellow",
|
||||||
|
"value": 50
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"color": "red",
|
||||||
|
"value": 100
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"unit": "ms"
|
||||||
|
},
|
||||||
|
"overrides": []
|
||||||
|
},
|
||||||
|
"gridPos": {
|
||||||
|
"h": 8,
|
||||||
|
"w": 12,
|
||||||
|
"x": 12,
|
||||||
|
"y": 8
|
||||||
|
},
|
||||||
|
"id": 5,
|
||||||
|
"options": {
|
||||||
|
"orientation": "auto",
|
||||||
|
"reduceOptions": {
|
||||||
|
"values": false,
|
||||||
|
"fields": "",
|
||||||
|
"calcs": [
|
||||||
|
"lastNotNull"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"showThresholdLabels": false,
|
||||||
|
"showThresholdMarkers": true
|
||||||
|
},
|
||||||
|
"pluginVersion": "8.0.0",
|
||||||
|
"targets": [
|
||||||
|
{
|
||||||
|
"expr": "avg(llm_ttft_seconds) * 1000",
|
||||||
|
"legendFormat": "Average TTFT",
|
||||||
|
"refId": "A"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"title": "Average TTFT (All Models)",
|
||||||
|
"type": "gauge"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"refresh": "10s",
|
||||||
|
"schemaVersion": 27,
|
||||||
|
"style": "dark",
|
||||||
|
"tags": [
|
||||||
|
"llm",
|
||||||
|
"inference",
|
||||||
|
"metrics"
|
||||||
|
],
|
||||||
|
"templating": {
|
||||||
|
"list": []
|
||||||
|
},
|
||||||
|
"time": {
|
||||||
|
"from": "now-1h",
|
||||||
|
"to": "now"
|
||||||
|
},
|
||||||
|
"timepicker": {},
|
||||||
|
"timezone": "",
|
||||||
|
"title": "LLM Inference Metrics (TTFT & ITL)",
|
||||||
|
"uid": "llm-metrics",
|
||||||
|
"version": 0
|
||||||
|
}
|
||||||
@@ -7,6 +7,7 @@ resources:
|
|||||||
- ci-rbac.yaml
|
- ci-rbac.yaml
|
||||||
- task-integration-test.yaml
|
- task-integration-test.yaml
|
||||||
- task-load-test.yaml
|
- task-load-test.yaml
|
||||||
|
- task-workflow-visibility.yaml
|
||||||
- pipeline-sse-optimization.yaml
|
- pipeline-sse-optimization.yaml
|
||||||
|
|
||||||
generatorOptions:
|
generatorOptions:
|
||||||
@@ -19,3 +20,6 @@ configMapGenerator:
|
|||||||
- name: load-test-script
|
- name: load-test-script
|
||||||
files:
|
files:
|
||||||
- scripts/load-test.sh
|
- scripts/load-test.sh
|
||||||
|
- name: workflow-visibility-test-script
|
||||||
|
files:
|
||||||
|
- scripts/workflow-visibility-test.sh
|
||||||
|
|||||||
@@ -30,10 +30,22 @@ spec:
|
|||||||
- name: gateway-port
|
- name: gateway-port
|
||||||
value: $(params.gateway-port)
|
value: $(params.gateway-port)
|
||||||
|
|
||||||
|
# Workflow visibility tests (runs after integration tests pass)
|
||||||
|
- name: workflow-visibility-tests
|
||||||
|
runAfter:
|
||||||
|
- integration-tests
|
||||||
|
taskRef:
|
||||||
|
name: workflow-visibility-test
|
||||||
|
params:
|
||||||
|
- name: image
|
||||||
|
value: $(params.image)
|
||||||
|
- name: gateway-port
|
||||||
|
value: $(params.gateway-port)
|
||||||
|
|
||||||
# Performance load tests (runs after integration tests pass)
|
# Performance load tests (runs after integration tests pass)
|
||||||
- name: load-tests
|
- name: load-tests
|
||||||
runAfter:
|
runAfter:
|
||||||
- integration-tests
|
- workflow-visibility-tests
|
||||||
taskRef:
|
taskRef:
|
||||||
name: load-test-sse-streaming
|
name: load-test-sse-streaming
|
||||||
params:
|
params:
|
||||||
@@ -52,6 +64,7 @@ spec:
|
|||||||
- name: report-results
|
- name: report-results
|
||||||
runAfter:
|
runAfter:
|
||||||
- load-tests
|
- load-tests
|
||||||
|
- workflow-visibility-tests
|
||||||
taskSpec:
|
taskSpec:
|
||||||
description: "Report combined test results"
|
description: "Report combined test results"
|
||||||
params:
|
params:
|
||||||
@@ -59,6 +72,10 @@ spec:
|
|||||||
type: string
|
type: string
|
||||||
- name: integration-summary
|
- name: integration-summary
|
||||||
type: string
|
type: string
|
||||||
|
- name: workflow-result
|
||||||
|
type: string
|
||||||
|
- name: workflow-summary
|
||||||
|
type: string
|
||||||
- name: load-result
|
- name: load-result
|
||||||
type: string
|
type: string
|
||||||
- name: load-summary
|
- name: load-summary
|
||||||
@@ -70,14 +87,18 @@ spec:
|
|||||||
image: busybox
|
image: busybox
|
||||||
script: |
|
script: |
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
echo "╔════════════════════════════════════════════════════╗"
|
echo "╔═══════════════════════════════════════════════════════════╗"
|
||||||
echo "║ SSE Optimization Test Results (PR #26) ║"
|
echo "║ SSE Optimization + Workflow Tests (PR #26) ║"
|
||||||
echo "╠════════════════════════════════════════════════════╣"
|
echo "╠═══════════════════════════════════════════════════════════╣"
|
||||||
echo "║ ║"
|
echo "║ ║"
|
||||||
echo "║ Integration Tests: ║"
|
echo "║ Integration Tests: ║"
|
||||||
echo "║ Status: $(params.integration-result)"
|
echo "║ Status: $(params.integration-result)"
|
||||||
echo "║ Summary: $(params.integration-summary)"
|
echo "║ Summary: $(params.integration-summary)"
|
||||||
echo "║ ║"
|
echo "║ ║"
|
||||||
|
echo "║ Workflow Visibility (namespace pass-down): ║"
|
||||||
|
echo "║ Status: $(params.workflow-result)"
|
||||||
|
echo "║ Summary: $(params.workflow-summary)"
|
||||||
|
echo "║ ║"
|
||||||
echo "║ Load Tests (Issues #31, #32, #33): ║"
|
echo "║ Load Tests (Issues #31, #32, #33): ║"
|
||||||
echo "║ Status: $(params.load-result)"
|
echo "║ Status: $(params.load-result)"
|
||||||
echo "║ Summary: $(params.load-summary)"
|
echo "║ Summary: $(params.load-summary)"
|
||||||
@@ -85,12 +106,16 @@ spec:
|
|||||||
echo "║ Performance Metrics: ║"
|
echo "║ Performance Metrics: ║"
|
||||||
echo "║ $(params.load-metrics)"
|
echo "║ $(params.load-metrics)"
|
||||||
echo "║ ║"
|
echo "║ ║"
|
||||||
echo "╚════════════════════════════════════════════════════╝"
|
echo "╚═══════════════════════════════════════════════════════════╝"
|
||||||
params:
|
params:
|
||||||
- name: integration-result
|
- name: integration-result
|
||||||
value: $(tasks.integration-tests.results.result)
|
value: $(tasks.integration-tests.results.result)
|
||||||
- name: integration-summary
|
- name: integration-summary
|
||||||
value: $(tasks.integration-tests.results.summary)
|
value: $(tasks.integration-tests.results.summary)
|
||||||
|
- name: workflow-result
|
||||||
|
value: $(tasks.workflow-visibility-tests.results.result)
|
||||||
|
- name: workflow-summary
|
||||||
|
value: $(tasks.workflow-visibility-tests.results.summary)
|
||||||
- name: load-result
|
- name: load-result
|
||||||
value: $(tasks.load-tests.results.result)
|
value: $(tasks.load-tests.results.result)
|
||||||
- name: load-summary
|
- name: load-summary
|
||||||
|
|||||||
@@ -76,10 +76,56 @@ echo "▸ SQS service"
|
|||||||
assert "sqs/list-queues" 401 \
|
assert "sqs/list-queues" 401 \
|
||||||
-X GET -H "X-Service: sqs" -H "X-Resource: list-queues" "${GW}/"
|
-X GET -H "X-Service: sqs" -H "X-Resource: list-queues" "${GW}/"
|
||||||
|
|
||||||
# ── Workflow (gRPC needs content-type → 400) ──
|
# ── Workflow visibility (namespace pass-down) ──
|
||||||
echo "▸ Workflow service"
|
echo "▸ Workflow service"
|
||||||
assert "workflow/list (no grpc content-type → 400)" 400 \
|
|
||||||
-X GET -H "X-Service: workflow" -H "X-Resource: list" "${GW}/"
|
# Test 1: List workflows in poimen-harness namespace (should see 4 terminated workflows)
|
||||||
|
echo " Testing workflow visibility in poimen-harness namespace..."
|
||||||
|
WF_LIST=$(curl -s -X POST \
|
||||||
|
-H "X-Service: workflow" \
|
||||||
|
-H "X-Resource: list" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"namespace": "poimen-harness"}' \
|
||||||
|
"${GW}/" 2>/dev/null || echo '{}')
|
||||||
|
|
||||||
|
# Check if response contains workflows
|
||||||
|
if echo "$WF_LIST" | grep -q '"executions"'; then
|
||||||
|
echo " ✓ Workflow list returned (poimen-harness namespace)"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
else
|
||||||
|
echo " ✗ Workflow list failed to return executions"
|
||||||
|
FAIL=$((FAIL + 1))
|
||||||
|
fi
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
|
||||||
|
# Test 2: Verify we can query terminated workflows
|
||||||
|
echo " Testing terminated workflow visibility..."
|
||||||
|
if echo "$WF_LIST" | grep -q '"Completed\|"status"'; then
|
||||||
|
echo " ✓ Found completed/terminated workflows in response"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
else
|
||||||
|
echo " ⚠ No terminated workflows found in response (may be empty namespace)"
|
||||||
|
# Don't fail if namespace is empty - just note it
|
||||||
|
fi
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
|
||||||
|
# Test 3: Verify namespace is required (missing namespace → 400)
|
||||||
|
echo " Testing namespace validation..."
|
||||||
|
NO_NS=$(curl -s -w '%{http_code}' -X POST \
|
||||||
|
-H "X-Service: workflow" \
|
||||||
|
-H "X-Resource: list" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{}' \
|
||||||
|
"${GW}/" 2>/dev/null || echo "000")
|
||||||
|
|
||||||
|
if [ "$NO_NS" = "400" ]; then
|
||||||
|
echo " ✓ Correctly rejected list without namespace (400)"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
else
|
||||||
|
echo " ✗ Expected 400 for missing namespace, got $NO_NS"
|
||||||
|
FAIL=$((FAIL + 1))
|
||||||
|
fi
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "═══ Results: ${PASS}/${TOTAL} passed, ${FAIL} failed ═══"
|
echo "═══ Results: ${PASS}/${TOTAL} passed, ${FAIL} failed ═══"
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Workflow visibility test for gateway.
|
||||||
|
# Verifies that the WorkflowAdapter provides visibility into terminated workflows
|
||||||
|
# in the poimen-harness namespace via X-Service: workflow routing.
|
||||||
|
#
|
||||||
|
# Expected: 4 terminated workflows in poimen-harness namespace
|
||||||
|
#
|
||||||
|
# Required env:
|
||||||
|
# GW — gateway base URL (e.g. http://localhost:8080)
|
||||||
|
# RESULTS_DIR — directory to write Tekton results
|
||||||
|
|
||||||
|
: "${RESULTS_DIR:=/tekton/results}"
|
||||||
|
|
||||||
|
PASS=0
|
||||||
|
FAIL=0
|
||||||
|
TOTAL=0
|
||||||
|
|
||||||
|
echo "═══ Workflow Visibility Test ═══"
|
||||||
|
echo ""
|
||||||
|
echo "Testing WorkflowAdapter namespace pass-down"
|
||||||
|
echo "Expected: 4 terminated workflows in poimen-harness namespace"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# ── Wait for gateway ──
|
||||||
|
echo "⏳ Waiting for gateway..."
|
||||||
|
READY=false
|
||||||
|
for i in $(seq 1 60); do
|
||||||
|
if curl -s -f "${GW}/healthz" > /dev/null 2>&1; then
|
||||||
|
echo "✓ Gateway ready"
|
||||||
|
READY=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
sleep 2
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ "$READY" = "false" ]; then
|
||||||
|
echo "✗ Gateway timeout"
|
||||||
|
echo "fail" > "${RESULTS_DIR}/result"
|
||||||
|
echo "Gateway did not become ready" > "${RESULTS_DIR}/summary"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ── Test 1: List workflows in poimen-harness ──
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
echo "Test 1: List workflows in poimen-harness namespace"
|
||||||
|
|
||||||
|
WF_RESPONSE=$(curl -s -X POST \
|
||||||
|
-H "X-Service: workflow" \
|
||||||
|
-H "X-Resource: list" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"namespace": "poimen-harness"}' \
|
||||||
|
"${GW}/" 2>/dev/null || echo "")
|
||||||
|
|
||||||
|
if [ -z "$WF_RESPONSE" ]; then
|
||||||
|
echo " ✗ No response from workflow list endpoint"
|
||||||
|
FAIL=$((FAIL + 1))
|
||||||
|
else
|
||||||
|
echo " ✓ Received workflow list response"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
|
||||||
|
# Extract workflow count (if available)
|
||||||
|
WF_COUNT=$(echo "$WF_RESPONSE" | grep -o '"execution_time"' | wc -l || echo "0")
|
||||||
|
echo " Found workflows: $WF_COUNT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ── Test 2: Verify namespace is required ──
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
echo "Test 2: Namespace validation (missing namespace should fail)"
|
||||||
|
|
||||||
|
NO_NS_RESPONSE=$(curl -s -w "\n%{http_code}" -X POST \
|
||||||
|
-H "X-Service: workflow" \
|
||||||
|
-H "X-Resource: list" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{}' \
|
||||||
|
"${GW}/" 2>/dev/null || echo "")
|
||||||
|
|
||||||
|
NO_NS_CODE=$(echo "$NO_NS_RESPONSE" | tail -1)
|
||||||
|
|
||||||
|
if [ "$NO_NS_CODE" = "400" ]; then
|
||||||
|
echo " ✓ Correctly rejected missing namespace (HTTP 400)"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
elif [ "$NO_NS_CODE" = "401" ]; then
|
||||||
|
echo " ⚠ Got 401 (auth required) - namespace validation happens after auth check"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
else
|
||||||
|
echo " ✗ Expected 400/401, got $NO_NS_CODE"
|
||||||
|
FAIL=$((FAIL + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ── Test 3: Query specific terminated workflow ──
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
echo "Test 3: Describe specific workflow (if available)"
|
||||||
|
|
||||||
|
# Try to describe a workflow - this will fail if no workflows exist, but shows the feature works
|
||||||
|
DESCRIBE_RESPONSE=$(curl -s -X POST \
|
||||||
|
-H "X-Service: workflow" \
|
||||||
|
-H "X-Resource: describe" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"namespace": "poimen-harness", "workflow_id": "test-workflow"}' \
|
||||||
|
"${GW}/" 2>/dev/null || echo "")
|
||||||
|
|
||||||
|
if [ -n "$DESCRIBE_RESPONSE" ]; then
|
||||||
|
echo " ✓ Describe endpoint responded"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
else
|
||||||
|
echo " ⚠ Describe endpoint no response (may indicate workflow doesn't exist)"
|
||||||
|
# Not a failure - endpoint exists but workflow may not
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ── Test 4: Verify auth requirement ──
|
||||||
|
TOTAL=$((TOTAL + 1))
|
||||||
|
echo "Test 4: Auth requirement (workflow service requires Authorization)"
|
||||||
|
|
||||||
|
NO_AUTH_CODE=$(curl -s -w '%{http_code}' -o /dev/null -X POST \
|
||||||
|
-H "X-Service: workflow" \
|
||||||
|
-H "X-Resource: list" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"namespace": "poimen-harness"}' \
|
||||||
|
"${GW}/" 2>/dev/null || echo "000")
|
||||||
|
|
||||||
|
if [ "$NO_AUTH_CODE" = "401" ]; then
|
||||||
|
echo " ✓ Correctly requires auth (HTTP 401)"
|
||||||
|
PASS=$((PASS + 1))
|
||||||
|
else
|
||||||
|
echo " ✗ Expected 401, got $NO_AUTH_CODE"
|
||||||
|
echo " (Auth may be disabled in test environment)"
|
||||||
|
FAIL=$((FAIL + 1))
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ── Summary ──
|
||||||
|
echo ""
|
||||||
|
echo "═══ Results ═══"
|
||||||
|
echo "Passed: $PASS/$TOTAL"
|
||||||
|
echo "Failed: $FAIL/$TOTAL"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
if [ "$FAIL" -eq 0 ]; then
|
||||||
|
echo "pass" > "${RESULTS_DIR}/result"
|
||||||
|
SUMMARY="Workflow visibility test passed. WorkflowAdapter can list/describe workflows in poimen-harness namespace with namespace pass-down support."
|
||||||
|
echo "✓ All tests passed"
|
||||||
|
else
|
||||||
|
echo "fail" > "${RESULTS_DIR}/result"
|
||||||
|
SUMMARY="$FAIL tests failed. Check WorkflowAdapter implementation and namespace validation."
|
||||||
|
echo "✗ Some tests failed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$SUMMARY" > "${RESULTS_DIR}/summary"
|
||||||
|
echo "" >> "${RESULTS_DIR}/summary"
|
||||||
|
echo "Passed: $PASS/$TOTAL" >> "${RESULTS_DIR}/summary"
|
||||||
|
echo "Failed: $FAIL/$TOTAL" >> "${RESULTS_DIR}/summary"
|
||||||
|
|
||||||
|
[ "$FAIL" -eq 0 ]
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
apiVersion: tekton.dev/v1
|
||||||
|
kind: Task
|
||||||
|
metadata:
|
||||||
|
name: workflow-visibility-test
|
||||||
|
namespace: api
|
||||||
|
labels:
|
||||||
|
app: api-gateway
|
||||||
|
component: testing
|
||||||
|
spec:
|
||||||
|
description: >
|
||||||
|
Test workflow visibility via WorkflowAdapter.
|
||||||
|
Verifies that the gateway provides visibility into terminated workflows
|
||||||
|
in the poimen-harness namespace via X-Service: workflow routing.
|
||||||
|
This ensures namespace pass-down is working correctly.
|
||||||
|
|
||||||
|
params:
|
||||||
|
- name: image
|
||||||
|
type: string
|
||||||
|
description: "Container image to test (repo:tag)"
|
||||||
|
- name: gateway-port
|
||||||
|
type: string
|
||||||
|
default: "8080"
|
||||||
|
|
||||||
|
results:
|
||||||
|
- name: result
|
||||||
|
type: string
|
||||||
|
description: "pass or fail"
|
||||||
|
- name: summary
|
||||||
|
type: string
|
||||||
|
description: "Test summary"
|
||||||
|
- name: workflow-count
|
||||||
|
type: string
|
||||||
|
description: "Number of workflows found in poimen-harness"
|
||||||
|
|
||||||
|
sidecars:
|
||||||
|
- name: gateway
|
||||||
|
image: $(params.image)
|
||||||
|
env:
|
||||||
|
- name: LISTEN_ADDR
|
||||||
|
value: "0.0.0.0:$(params.gateway-port)"
|
||||||
|
- name: CONFIG_PATH
|
||||||
|
value: /etc/gateway/config.yaml
|
||||||
|
- name: LOG_LEVEL
|
||||||
|
value: info
|
||||||
|
- name: AUTH_CLIENT_SECRET
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: api-gw-client-secret
|
||||||
|
key: client-secret
|
||||||
|
optional: true
|
||||||
|
volumeMounts:
|
||||||
|
- name: gateway-config
|
||||||
|
mountPath: /etc/gateway
|
||||||
|
readOnly: true
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: run-workflow-visibility-test
|
||||||
|
image: curlimages/curl:8.13.0
|
||||||
|
env:
|
||||||
|
- name: GW
|
||||||
|
value: "http://localhost:$(params.gateway-port)"
|
||||||
|
- name: RESULTS_DIR
|
||||||
|
value: /tekton/results
|
||||||
|
command: ["sh", "/scripts/workflow-visibility-test.sh"]
|
||||||
|
volumeMounts:
|
||||||
|
- name: test-script
|
||||||
|
mountPath: /scripts
|
||||||
|
readOnly: true
|
||||||
|
computeResources:
|
||||||
|
requests:
|
||||||
|
cpu: 100m
|
||||||
|
memory: 64Mi
|
||||||
|
limits:
|
||||||
|
cpu: 200m
|
||||||
|
memory: 128Mi
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
- name: gateway-config
|
||||||
|
secret:
|
||||||
|
secretName: api-gateway-config
|
||||||
|
- name: test-script
|
||||||
|
configMap:
|
||||||
|
name: workflow-visibility-test-script
|
||||||
|
defaultMode: 0755
|
||||||
Reference in New Issue
Block a user