Changeset 0.8.6 (#49)

server/handlers/teams.go

@@ -2,7 +2,9 @@ package handlers
 
 import (
 	"database/sql"
+	"encoding/json"
 	"fmt"
+	"log"
 	"net/http"
 	"strconv"
 	"strings"
@@ -10,6 +12,7 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"git.gobha.me/xcaliber/chat-switchboard/database"
+	"git.gobha.me/xcaliber/chat-switchboard/providers"
 )
 
 // ── Request types ───────────────────────────
@@ -212,7 +215,7 @@ func (h *TeamHandler) UpdateTeam(c *gin.Context) {
 		argN++
 	}
 	if req.Settings != nil {
-		sets = append(sets, "settings = $"+strconv.Itoa(argN)+"::jsonb")
+		sets = append(sets, "settings = COALESCE(settings, '{}'::jsonb) || $"+strconv.Itoa(argN)+"::jsonb")
 		args = append(args, *req.Settings)
 		argN++
 	}
@@ -461,20 +464,7 @@ func (h *TeamHandler) MyTeams(c *gin.Context) {
 // for team admins building presets. Requires RequireTeamAdmin middleware.
 // GET /api/v1/teams/:teamId/models
 func (h *TeamHandler) ListAvailableModels(c *gin.Context) {
-	rows, err := database.DB.Query(`
-		SELECT mc.id, mc.model_id, mc.display_name, mc.visibility,
-		       ac.provider, ac.name as provider_name
-		FROM model_configs mc
-		JOIN api_configs ac ON mc.api_config_id = ac.id
-		WHERE mc.visibility IN ('enabled', 'team')
-		  AND ac.is_active = true AND ac.user_id IS NULL
-		ORDER BY ac.name, mc.model_id
-	`)
-	if err != nil {
-		c.JSON(http.StatusInternalServerError, gin.H{"error": "query failed"})
-		return
-	}
-	defer rows.Close()
+	teamID := getTeamID(c)
 
 	type availableModel struct {
 		ID           string  `json:"id"`
@@ -483,18 +473,89 @@ func (h *TeamHandler) ListAvailableModels(c *gin.Context) {
 		Visibility   string  `json:"visibility"`
 		Provider     string  `json:"provider"`
 		ProviderName string  `json:"provider_name"`
+		Source       string  `json:"source"`
 	}
 
 	models := make([]availableModel, 0)
+
+	// ── 1. Global admin models (synced in model_configs) ──
+	rows, err := database.DB.Query(`
+		SELECT mc.id, mc.model_id, mc.display_name, mc.visibility,
+		       ac.provider, ac.name as provider_name
+		FROM model_configs mc
+		JOIN api_configs ac ON mc.api_config_id = ac.id
+		WHERE mc.visibility IN ('enabled', 'team')
+		  AND ac.is_active = true AND ac.is_global = true
+		ORDER BY ac.name, mc.model_id
+	`)
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "query failed"})
+		return
+	}
+	defer rows.Close()
+
 	for rows.Next() {
 		var m availableModel
 		if err := rows.Scan(&m.ID, &m.ModelID, &m.DisplayName, &m.Visibility,
 			&m.Provider, &m.ProviderName); err != nil {
 			continue
 		}
+		m.Source = "global"
 		models = append(models, m)
 	}
 
+	// ── 2. Team provider models (live query) ──
+	teamRows, err := database.DB.Query(`
+		SELECT id, name, provider, endpoint, api_key_encrypted, custom_headers
+		FROM api_configs
+		WHERE team_id = $1 AND is_active = true
+	`, teamID)
+	if err == nil {
+		defer teamRows.Close()
+		for teamRows.Next() {
+			var cfgID, name, providerID, endpoint string
+			var apiKey *string
+			var headersJSON []byte
+			if err := teamRows.Scan(&cfgID, &name, &providerID, &endpoint, &apiKey, &headersJSON); err != nil {
+				continue
+			}
+
+			provider, pErr := providers.Get(providerID)
+			if pErr != nil {
+				continue
+			}
+
+			key := ""
+			if apiKey != nil {
+				key = *apiKey
+			}
+
+			var customHeaders map[string]string
+			_ = json.Unmarshal(headersJSON, &customHeaders)
+
+			provModels, lErr := provider.ListModels(c.Request.Context(), providers.ProviderConfig{
+				Endpoint:      endpoint,
+				APIKey:        key,
+				CustomHeaders: customHeaders,
+			})
+			if lErr != nil {
+				log.Printf("[models] team provider %q list failed: %v", name, lErr)
+				continue
+			}
+
+			for _, pm := range provModels {
+				models = append(models, availableModel{
+					ID:           pm.ID,
+					ModelID:      pm.ID,
+					Provider:     providerID,
+					ProviderName: name,
+					Visibility:   "enabled",
+					Source:       "team",
+				})
+			}
+		}
+	}
+
 	c.JSON(http.StatusOK, gin.H{"models": models})
 }