diff options
| author | Chia <Chia@93.nz> | 2026-08-06 09:29:41 +1200 |
|---|---|---|
| committer | Chia <Chia@93.nz> | 2026-08-06 09:32:46 +1200 |
| commit | 41e322c53d7b4b796eb377d0df9c29ecd10ba431 (patch) | |
| tree | c730526150e55e39b822d5197e4a20318ecaa449 /internal/catalog | |
| parent | eadb2ffe85c43cf6fc741c9823cd28eedb4a844c (diff) | |
feat: complete commercial control plane, billing, auth, and model catalog
- add PostgreSQL control-plane persistence with Redis-degraded hot reload
- implement prepaid balance, usage ledger, Stripe top-up and reconciliation
- add registration, email verification, password reset, invitations and RBAC
- support TOTP, Passkey MFA, device sessions, quotas and rate limits
- add tenant billing profiles, audit logs and operational readiness checks
- build authenticated admin console, Quickstart, Playground and usage analytics
- add public model catalog with pricing, filtering and cost estimation
- support OpenAI Responses providers and provider health failover
- validate real upstream usage reporting and balance settlement
Diffstat (limited to 'internal/catalog')
| -rw-r--r-- | internal/catalog/catalog.go | 21 | ||||
| -rw-r--r-- | internal/catalog/catalog_test.go | 10 |
2 files changed, 30 insertions, 1 deletions
diff --git a/internal/catalog/catalog.go b/internal/catalog/catalog.go index 09a6fba..362d5b0 100644 --- a/internal/catalog/catalog.go +++ b/internal/catalog/catalog.go @@ -23,9 +23,15 @@ type snapshot struct { func New(cfg config.Config) *Catalog { providers := make(map[string]domain.Provider, len(cfg.Providers)) for _, provider := range cfg.Providers { + slug := provider.Slug + if slug == "" { + slug = provider.ID + } providers[provider.ID] = domain.Provider{ ID: provider.ID, + Slug: slug, Protocol: provider.Protocol, + WireAPI: provider.WireAPI, BaseURL: strings.TrimRight(provider.BaseURL, "/"), APIKey: provider.APIKey, } @@ -124,7 +130,7 @@ func (c *Catalog) Models(protocol domain.Protocol) []domain.Model { result := make([]domain.Model, 0, len(current.list)) for _, model := range current.list { for _, route := range model.Routes { - if route.Provider.Protocol == protocol { + if protocolCompatible(route.Provider, protocol) { result = append(result, model) break } @@ -133,6 +139,19 @@ func (c *Catalog) Models(protocol domain.Protocol) []domain.Model { return result } +func protocolCompatible(provider domain.Provider, requestProtocol domain.Protocol) bool { + switch requestProtocol { + case domain.ProtocolOpenAI: + return provider.Protocol == domain.ProtocolOpenAI && provider.EffectiveWireAPI() == "chat_completions" + case domain.ProtocolOpenAIResponses: + return provider.Protocol == domain.ProtocolOpenAI && provider.EffectiveWireAPI() == "responses" + case domain.ProtocolAnthropic: + return provider.Protocol == domain.ProtocolAnthropic && provider.EffectiveWireAPI() == "messages" + default: + return false + } +} + func (c *Catalog) Count() int { current := c.state.Load() if current == nil { diff --git a/internal/catalog/catalog_test.go b/internal/catalog/catalog_test.go index 07fb71f..2ce8779 100644 --- a/internal/catalog/catalog_test.go +++ b/internal/catalog/catalog_test.go @@ -41,3 +41,13 @@ func TestCatalogReplaceCopiesRouteSlices(t *testing.T) { t.Fatal("catalog snapshot aliases the caller's route slice") } } + +func TestModelRestrictionIsAppliedBeforeCatalogAccess(t *testing.T) { + principal := domain.Principal{AllowedModels: map[string]struct{}{"model/allowed": {}}} + if !(domain.Model{ID: "model/allowed"}).Allows(principal) { + t.Fatal("allowed model was rejected") + } + if (domain.Model{ID: "model/other"}).Allows(principal) { + t.Fatal("model outside the API key restriction was allowed") + } +} |
