Adopt published version two catalogs

internal/catalog/catalog_test.go

@@ -1,24 +1,19 @@
 package catalog
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"io/fs"
-	"os"
-	"path/filepath"
-	"reflect"
-	"sort"
 	"strings"
 	"testing"
 	"testing/fstest"
 
-	openrouter "gitea.maximumdirect.net/eric/promptkit-backend-openrouter"
-	rakestrawhome "gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome"
+	openrouter "gitea.maximumdirect.net/eric/promptkit-backend-openrouter/v2"
+	rakestrawhome "gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome/v2"
 )
 
-func TestLoadPublishedCatalogsMatchCompatibilityFixture(t *testing.T) {
+func TestLoadPublishedCatalogs(t *testing.T) {
 	loaded, err := Load(
 		Source{Name: "OpenRouter", ExpectedBackendID: "openrouter", FS: openrouter.FS(), Root: openrouter.Root},
 		Source{Name: "Rakestrawhome", ExpectedBackendID: "rakestrawhome", FS: rakestrawhome.FS(), Root: rakestrawhome.Root},
@@ -26,22 +21,48 @@ func TestLoadPublishedCatalogsMatchCompatibilityFixture(t *testing.T) {
 	if err != nil {
 		t.Fatalf("load published catalogs: %v", err)
 	}
-	expected := loadCompatibilityFixture(t)
-	expectedIDs := fixtureProfileIDs(t, expected)
-	if !reflect.DeepEqual(loaded.profileIDs, expectedIDs) {
-		t.Fatalf("published profile IDs differ from compatibility fixture: got %q, want %q", loaded.profileIDs, expectedIDs)
+	if loaded.Profiles == nil || len(loaded.profileIDs) == 0 {
+		t.Fatalf("published catalogs have no usable profiles: %#v", loaded)
 	}
-	actual := catalogValue(t, loaded)
-	actualJSON, err := json.Marshal(actual)
-	if err != nil {
-		t.Fatalf("encode loaded catalogs: %v", err)
+	if _, err := loaded.Profiles.GetProfile(context.Background(), "gemini-flash-latest"); err != nil {
+		t.Fatalf("load maintained standard-profile base: %v", err)
 	}
-	expectedJSON, err := json.Marshal(expected)
-	if err != nil {
-		t.Fatalf("encode compatibility fixture: %v", err)
+
+	expectedBackends := map[string]struct {
+		endpoint         string
+		apiKeyEnv        string
+		concurrencyLimit int
+		queueCapacity    int
+	}{
+		"openrouter": {
+			endpoint:         "https://openrouter.ai/api/v1",
+			apiKeyEnv:        "OPENROUTER_API_KEY",
+			concurrencyLimit: 16,
+			queueCapacity:    1024,
+		},
+		"rakestrawhome": {
+			endpoint:         "https://inference.ai.rakestrawhome.com/v1",
+			apiKeyEnv:        "RAKESTRAWHOME_INFERENCE_API_KEY",
+			concurrencyLimit: 4,
+			queueCapacity:    1024,
+		},
 	}
-	if !bytes.Equal(actualJSON, expectedJSON) {
-		t.Fatalf("published catalogs differ from compatibility fixture: got %#v, want %#v", actual, expected)
+	if len(loaded.Backends) != len(expectedBackends) {
+		t.Fatalf("published backend count = %d, want %d", len(loaded.Backends), len(expectedBackends))
+	}
+	for _, definition := range loaded.Backends {
+		expected, found := expectedBackends[definition.ID]
+		if !found {
+			t.Fatalf("unexpected published backend %q", definition.ID)
+		}
+		if definition.Endpoint != expected.endpoint ||
+			definition.APIKeyEnv != expected.apiKeyEnv ||
+			definition.ConcurrencyLimit != expected.concurrencyLimit ||
+			definition.QueueCapacity != expected.queueCapacity ||
+			!definition.QueueCapacitySet ||
+			definition.ExtraParams != nil {
+			t.Fatalf("unexpected published backend definition: %#v", definition)
+		}
 	}
 }
 
@@ -298,68 +319,6 @@ func TestLoadReturnsDefensiveCatalogValues(t *testing.T) {
 	}
 }
 
-func loadCompatibilityFixture(t *testing.T) map[string]any {
-	t.Helper()
-	data, err := os.ReadFile(filepath.Join("..", "..", "testdata", "builtin-catalog-v1.json"))
-	if err != nil {
-		t.Fatalf("read fixture: %v", err)
-	}
-	var value map[string]any
-	if err := json.Unmarshal(data, &value); err != nil {
-		t.Fatalf("decode fixture: %v", err)
-	}
-	return value
-}
-
-func fixtureProfileIDs(t *testing.T, fixture map[string]any) []string {
-	t.Helper()
-	profiles, ok := fixture["profiles"].([]any)
-	if !ok {
-		t.Fatal("compatibility fixture profiles are malformed")
-	}
-	ids := make([]string, 0, len(profiles))
-	for _, entry := range profiles {
-		profileValue, ok := entry.(map[string]any)
-		if !ok {
-			t.Fatal("compatibility fixture profile is malformed")
-		}
-		id, ok := profileValue["id"].(string)
-		if !ok {
-			t.Fatal("compatibility fixture profile ID is malformed")
-		}
-		ids = append(ids, id)
-	}
-	sort.Strings(ids)
-	return ids
-}
-
-func catalogValue(t *testing.T, loaded Set) map[string]any {
-	t.Helper()
-	backends := make([]any, 0, len(loaded.Backends))
-	for _, backend := range loaded.Backends {
-		backends = append(backends, map[string]any{"id": backend.ID, "endpoint": backend.Endpoint, "api_key_env": backend.APIKeyEnv, "extra_params": interfaceValue(backend.ExtraParams), "concurrency_limit": backend.ConcurrencyLimit, "queue_capacity": backend.QueueCapacity, "queue_capacity_set": backend.QueueCapacitySet})
-	}
-	sort.Slice(backends, func(left, right int) bool {
-		return backends[left].(map[string]any)["id"].(string) < backends[right].(map[string]any)["id"].(string)
-	})
-	actualProfiles := make([]any, 0, len(loaded.profileIDs))
-	for _, id := range loaded.profileIDs {
-		profile, err := loaded.Profiles.GetProfile(context.Background(), id)
-		if err != nil {
-			t.Fatalf("load profile %q: %v", id, err)
-		}
-		actualProfiles = append(actualProfiles, map[string]any{"id": profile.ID, "base_profile": profile.BaseProfileID, "backend": profile.BackendID, "endpoint": profile.Endpoint, "model": profile.Model, "temperature": profile.Temperature, "max_tokens": profile.MaxTokens, "top_p": profile.TopP, "timeout_seconds": profile.TimeoutSeconds, "service_tier": profile.ServiceTier, "reasoning_effort": profile.ReasoningEffort, "api_key_env": profile.APIKeyEnv, "api_key_required": profile.APIKeyRequired, "extra_params": interfaceValue(profile.ExtraParams)})
-	}
-	return map[string]any{"backends": backends, "profiles": actualProfiles}
-}
-
-func interfaceValue(value map[string]any) any {
-	if value == nil {
-		return nil
-	}
-	return value
-}
-
 func testSource(id string, fsys fs.FS) Source {
 	return Source{Name: id, ExpectedBackendID: id, FS: fsys, Root: "catalog"}
 }

internal/engine/engine.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	openrouter "gitea.maximumdirect.net/eric/promptkit-backend-openrouter"
-	rakestrawhome "gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome"
+	openrouter "gitea.maximumdirect.net/eric/promptkit-backend-openrouter/v2"
+	rakestrawhome "gitea.maximumdirect.net/eric/promptkit-backend-rakestrawhome/v2"
 	"gitea.maximumdirect.net/eric/promptkit/internal/artifact"
 	"gitea.maximumdirect.net/eric/promptkit/internal/backend"
 	"gitea.maximumdirect.net/eric/promptkit/internal/capacity"