Changeset 0.9.0 (#50)

server/providers/provider.go

@@ -3,6 +3,8 @@ package providers
 import (
 	"context"
 	"encoding/json"
+
+	"git.gobha.me/xcaliber/chat-switchboard/models"
 )
 
 // ── Provider Interface ──────────────────────
@@ -26,12 +28,12 @@ type Provider interface {
 // ── Configuration ───────────────────────────
 
 // ProviderConfig holds credentials and endpoint for a configured provider.
-// Populated from the api_configs table at call time.
+// Populated from the provider_configs table at call time.
 type ProviderConfig struct {
-	Endpoint       string
-	APIKey         string
-	CustomHeaders  map[string]string      // Extra HTTP headers (e.g. OpenRouter HTTP-Referer)
-	Settings       map[string]interface{} // Provider-specific settings from provider_settings JSONB
+	Endpoint      string
+	APIKey        string
+	CustomHeaders map[string]string      // Extra HTTP headers (e.g. OpenRouter HTTP-Referer)
+	Settings      map[string]interface{} // Provider-specific settings from config JSONB
 }
 
 // ── Request / Response Types ────────────────
@@ -62,8 +64,8 @@ type FunctionCall struct {
 
 // ToolDef describes a tool available to the LLM.
 type ToolDef struct {
-	Type     string       `json:"type"` // "function"
-	Function FunctionDef  `json:"function"`
+	Type     string      `json:"type"` // "function"
+	Function FunctionDef `json:"function"`
 }
 
 // FunctionDef is the schema for a tool function.
@@ -96,38 +98,19 @@ type CompletionResponse struct {
 
 // StreamEvent is a single chunk from a streaming response.
 type StreamEvent struct {
-	// Delta is the incremental text content (empty for non-content events).
-	Delta string `json:"delta,omitempty"`
-
-	// Done is true when the stream is complete.
-	Done bool `json:"done,omitempty"`
-
-	// FinishReason is set on the final event.
-	// "stop" = normal, "tool_calls" = LLM wants to call tools.
-	FinishReason string `json:"finish_reason,omitempty"`
-
-	// ToolCalls accumulates tool call data during streaming.
-	// Fully populated on the final event when FinishReason is "tool_calls".
-	ToolCalls []ToolCall `json:"tool_calls,omitempty"`
-
-	// Model echoes back the model used.
-	Model string `json:"model,omitempty"`
-
-	// Error is set if the stream encountered an error.
-	Error error `json:"-"`
+	Delta        string     `json:"delta,omitempty"`
+	Done         bool       `json:"done,omitempty"`
+	FinishReason string     `json:"finish_reason,omitempty"`
+	ToolCalls    []ToolCall `json:"tool_calls,omitempty"`
+	Model        string     `json:"model,omitempty"`
+	Error        error      `json:"-"`
 }
 
 // Model represents an available model from a provider, with capabilities.
 type Model struct {
-	ID           string            `json:"id"`
-	Name         string            `json:"name,omitempty"`
-	OwnedBy      string            `json:"owned_by,omitempty"`
-	Capabilities ModelCapabilities `json:"capabilities"`
-	Pricing      *ModelPricing     `json:"pricing,omitempty"`
-}
-
-// ModelPricing holds per-million-token costs.
-type ModelPricing struct {
-	InputPerM  float64 `json:"input_per_m,omitempty"`
-	OutputPerM float64 `json:"output_per_m,omitempty"`
+	ID           string                   `json:"id"`
+	Name         string                   `json:"name,omitempty"`
+	OwnedBy      string                   `json:"owned_by,omitempty"`
+	Capabilities models.ModelCapabilities `json:"capabilities"`
+	Pricing      *models.ModelPricing     `json:"pricing,omitempty"`
 }