feat(v2): add Parse() function and extensible Registry for model string resolution
Introduces llm.Parse(spec) backed by an extensible Registry that resolves model strings like "openai/gpt-4o", aliases like "fast", and named targets like "m5/qwen3:30b" (via LLM_M5 env var DSNs) into ready-to-use *Model objects. Extension points: RegisterProvider, RegisterAlias, RegisterResolver. Adds Foreman constructor and sentinel errors ErrAliasLoop, ErrUnknownProvider, ErrInvalidDSN. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
+179
-11
@@ -1,6 +1,9 @@
|
||||
package llm
|
||||
|
||||
import (
|
||||
"os"
|
||||
"sync"
|
||||
|
||||
"gitea.stevedudenhoeffer.com/steve/go-llm/v2/deepseek"
|
||||
"gitea.stevedudenhoeffer.com/steve/go-llm/v2/groq"
|
||||
"gitea.stevedudenhoeffer.com/steve/go-llm/v2/moonshot"
|
||||
@@ -38,7 +41,7 @@ type ProviderInfo struct {
|
||||
|
||||
// providerRegistry is the in-process list of known providers. Order is
|
||||
// intentional: the three original providers first, then OpenAI-compatible
|
||||
// additions in the order they were added.
|
||||
// additions in the order they were added. This slice seeds NewRegistry().
|
||||
var providerRegistry = []ProviderInfo{
|
||||
{
|
||||
Name: "openai",
|
||||
@@ -151,24 +154,189 @@ var providerRegistry = []ProviderInfo{
|
||||
},
|
||||
New: OllamaCloud,
|
||||
},
|
||||
{
|
||||
Name: "foreman",
|
||||
DisplayName: "Foreman",
|
||||
EnvKey: "", // no single env key; discovered via LLM_* DSNs
|
||||
DefaultURL: "", // always requires a URL
|
||||
Models: []string{},
|
||||
New: Foreman,
|
||||
},
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Resolver — dynamic model-spec resolution
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// Resolver resolves an alias or short name to a full spec string. Consumers
|
||||
// register resolvers for dynamic lookups (e.g., database-backed tier aliases).
|
||||
type Resolver interface {
|
||||
// Resolve returns the resolved spec and an optional default reasoning
|
||||
// level. ok is false when the resolver does not handle this name.
|
||||
Resolve(name string) (spec string, defaultReasoning ReasoningLevel, ok bool)
|
||||
}
|
||||
|
||||
// ResolverFunc adapts a plain function to the Resolver interface.
|
||||
type ResolverFunc func(name string) (string, ReasoningLevel, bool)
|
||||
|
||||
// Resolve implements Resolver by calling the underlying function.
|
||||
func (f ResolverFunc) Resolve(name string) (string, ReasoningLevel, bool) {
|
||||
return f(name)
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Registry — extensible provider/alias/resolver store
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// Registry holds providers, static aliases, and dynamic resolvers. Use
|
||||
// NewRegistry to create one pre-populated with the built-in providers, or
|
||||
// use the package-level DefaultRegistry.
|
||||
type Registry struct {
|
||||
mu sync.RWMutex
|
||||
providers map[string]ProviderInfo
|
||||
order []string // insertion order for Providers()
|
||||
aliases map[string]string
|
||||
resolvers []Resolver
|
||||
envLookup func(string) string // defaults to os.Getenv
|
||||
}
|
||||
|
||||
// NewRegistry creates a Registry pre-populated with all built-in providers
|
||||
// (the same set returned by the providerRegistry package variable).
|
||||
//
|
||||
// Why: provides a fresh, isolated registry for testing or multi-tenant
|
||||
// scenarios while reusing the canonical provider list.
|
||||
// What: copies every entry from providerRegistry into a new Registry.
|
||||
// Test: call NewRegistry(), verify Providers() length matches providerRegistry
|
||||
// and ProviderByName("openai") is non-nil.
|
||||
func NewRegistry() *Registry {
|
||||
r := &Registry{
|
||||
providers: make(map[string]ProviderInfo, len(providerRegistry)),
|
||||
order: make([]string, 0, len(providerRegistry)),
|
||||
aliases: make(map[string]string),
|
||||
envLookup: os.Getenv,
|
||||
}
|
||||
for _, info := range providerRegistry {
|
||||
r.providers[info.Name] = info
|
||||
r.order = append(r.order, info.Name)
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
// DefaultRegistry is the package-level registry used by the convenience
|
||||
// functions Parse, Providers, ProviderByName, RegisterProvider, RegisterAlias,
|
||||
// and RegisterResolver. Initialized in init() with all built-in providers.
|
||||
var DefaultRegistry *Registry
|
||||
|
||||
func init() {
|
||||
DefaultRegistry = NewRegistry()
|
||||
}
|
||||
|
||||
// RegisterProvider adds or replaces a provider in the registry. When
|
||||
// replacing, the provider keeps its original position in the ordered list.
|
||||
//
|
||||
// Why: allows consumers to override built-in factories (e.g., wrapping with
|
||||
// middleware) or add entirely new providers at runtime.
|
||||
// What: upserts info by Name into the provider map and order slice.
|
||||
// Test: register a custom "openai" factory, verify ProviderByName returns it.
|
||||
func (r *Registry) RegisterProvider(info ProviderInfo) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
|
||||
if _, exists := r.providers[info.Name]; !exists {
|
||||
r.order = append(r.order, info.Name)
|
||||
}
|
||||
r.providers[info.Name] = info
|
||||
}
|
||||
|
||||
// RegisterAlias maps a short name to a full spec string. The spec is resolved
|
||||
// recursively by Parse, so an alias can point to another alias or to a
|
||||
// "provider/model" string.
|
||||
//
|
||||
// Why: lets consumers define convenient shortcuts like "fast" → "openai/gpt-4o-mini".
|
||||
// What: stores name→spec in the alias map.
|
||||
// Test: register "fast" → "openai/gpt-4o-mini", parse "fast", verify model.
|
||||
func (r *Registry) RegisterAlias(name, spec string) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
r.aliases[name] = spec
|
||||
}
|
||||
|
||||
// RegisterResolver appends a dynamic resolver. Resolvers are checked in
|
||||
// registration order after static aliases. A resolver may return a spec
|
||||
// string that is itself an alias or "provider/model" — it will be recursed.
|
||||
//
|
||||
// Why: supports dynamic alias sources (databases, remote config) without
|
||||
// requiring static registration of every possible name.
|
||||
// What: appends res to the resolver list.
|
||||
// Test: register a ResolverFunc, parse a name it handles, verify resolution.
|
||||
func (r *Registry) RegisterResolver(res Resolver) {
|
||||
r.mu.Lock()
|
||||
defer r.mu.Unlock()
|
||||
r.resolvers = append(r.resolvers, res)
|
||||
}
|
||||
|
||||
// ProviderByName returns the registered ProviderInfo with the given name, or
|
||||
// nil if no such provider is registered. Name matching is exact.
|
||||
//
|
||||
// Why: callers need to look up provider metadata by name for factory calls,
|
||||
// discovery, and DSN scheme resolution.
|
||||
// What: returns a copy of the ProviderInfo or nil.
|
||||
// Test: verify ProviderByName("openai") is non-nil, ProviderByName("nope") is nil.
|
||||
func (r *Registry) ProviderByName(name string) *ProviderInfo {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
|
||||
if info, ok := r.providers[name]; ok {
|
||||
return &info
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Providers returns a copy of all registered providers in insertion order.
|
||||
//
|
||||
// Why: CLI pickers and admin tools need the full list for display.
|
||||
// What: returns a freshly allocated slice of ProviderInfo copies.
|
||||
// Test: verify length matches expected count after registration.
|
||||
func (r *Registry) Providers() []ProviderInfo {
|
||||
r.mu.RLock()
|
||||
defer r.mu.RUnlock()
|
||||
|
||||
out := make([]ProviderInfo, 0, len(r.order))
|
||||
for _, name := range r.order {
|
||||
if info, ok := r.providers[name]; ok {
|
||||
out = append(out, info)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Package-level convenience functions — delegate to DefaultRegistry
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
// Providers returns a copy of the registered provider list so callers cannot
|
||||
// mutate library state.
|
||||
func Providers() []ProviderInfo {
|
||||
out := make([]ProviderInfo, len(providerRegistry))
|
||||
copy(out, providerRegistry)
|
||||
return out
|
||||
return DefaultRegistry.Providers()
|
||||
}
|
||||
|
||||
// ProviderByName returns the registered ProviderInfo with the given name, or
|
||||
// nil if no such provider is registered. Name matching is exact.
|
||||
func ProviderByName(name string) *ProviderInfo {
|
||||
for i := range providerRegistry {
|
||||
if providerRegistry[i].Name == name {
|
||||
p := providerRegistry[i]
|
||||
return &p
|
||||
}
|
||||
}
|
||||
return nil
|
||||
return DefaultRegistry.ProviderByName(name)
|
||||
}
|
||||
|
||||
// RegisterProvider adds or replaces a provider in the DefaultRegistry.
|
||||
func RegisterProvider(info ProviderInfo) {
|
||||
DefaultRegistry.RegisterProvider(info)
|
||||
}
|
||||
|
||||
// RegisterAlias maps a short name to a full spec in the DefaultRegistry.
|
||||
func RegisterAlias(name, spec string) {
|
||||
DefaultRegistry.RegisterAlias(name, spec)
|
||||
}
|
||||
|
||||
// RegisterResolver appends a dynamic resolver to the DefaultRegistry.
|
||||
func RegisterResolver(res Resolver) {
|
||||
DefaultRegistry.RegisterResolver(res)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user