mirror of
https://github.com/mostlygeek/llama-swap.git
synced 2026-06-09 06:46:34 +02:00
02e015fa49
This is a huge backend change that essentially started with rewriting the concurrency handling for processes and blew up to a refactor of the entire application. In short these are the improvements: **Better state and life cycle management:** Life cycle management of processes has always been the trickiest part of the code. Juggling mutex locks between multiple locations to reduce race conditions was complex. Too complex for my feeble brain to build a simple mental model around as llama-swap gained more features. All of that has been refactored. Most of the locks are gone, replaced with a single run() that owns all state changes. There is one place to start from now to understand and extend routing logic. The improved life cycle management makes it easier to implement more complex swap optimization strategies in the future like #727. **Collation of requests:** llama-swap previously handled requests and swapping in the order they came in. For example requests for models in this order ABCABC would result in 5 swaps. Now those requests are handled in this order AABBCC. The result is less time waiting for swap under a high churn request queue. This fixes #588 #612. A possible future enhancement is to support a starvation parameter so swap can be forced when models have been waiting too long. **Shared base implementation for groups and swap matrix:** During the refactor it became clear that much of the swapping logic was shared between these two implementations. That is not surprising considering the swap matrix was added many moons after groups. Now they share a common base and their specific swap strategies are implemented into the swapPlanner interface. Requests for bespoke or specific swapping scenarios is a common theme in the issues. Now users can implement whatever bespoke and weird swapping strategy they want in their own fork. Just ask your agent of choice to implement swapPlanner. I'll still remaining more conservative on what actually lands in core llama-swap and will continue to evaluate PRs if the changes is good for everyone or just one specific use case. **AI / Agentic Disclosure:** I paid very close attention to the low level swap concurrency design and implementation. It's important to keep that essential part reliable, boring and no surprises. Backwards compatibility was also maintained, even the one way non-exclusive group model loading behaviour that people have rightly pointed out be a weird design decision. With the underlying swap core done the web server, api and UI sitting on top were largely ported over with Claude Code and Opus 4.7 in multiple phases. If you're curious I kept the changes in docs/newrouter-todo.md. I did several passes to make sure things weren't left behind. However, even frontier LLMs at the time of this PR still make small decisions that don't make a lot of sense. They get shit wrong all the time, just in small subtle way. That said, there's likely to be some new bugs introduced with this massive refactor. I'm fairly confident that there's no major architectural flaws that would cause goal seeking agents to make dumb, ugly code decisions. For a little while the legacy llama-swap will be available under cmd/legacy/llama-swap. The plan is to eventually delete that entry point as well as the proxy package. On a bit of a personal note, this PR is exciting and a bit sad for me. I hand wrote much of the original code and this PR ultimately replaces much of it. While the old code served as a good reference for the agent to implement the new stuff it still a bit sad to eventually delete it all.
200 lines
6.8 KiB
Go
200 lines
6.8 KiB
Go
package router
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/mostlygeek/llama-swap/internal/config"
|
|
"github.com/mostlygeek/llama-swap/internal/logmon"
|
|
"github.com/mostlygeek/llama-swap/internal/process"
|
|
"github.com/tidwall/gjson"
|
|
)
|
|
|
|
type contextkey struct {
|
|
name string
|
|
}
|
|
|
|
type ReqContextData struct {
|
|
Model string
|
|
ModelID string
|
|
Streaming bool
|
|
SendLoadingState bool
|
|
}
|
|
|
|
var (
|
|
ErrNoModelInContext = fmt.Errorf("no model in request context")
|
|
ErrNoRouterFound = fmt.Errorf("no router found for model")
|
|
ErrNoPeerModelFound = fmt.Errorf("peer model not found")
|
|
ErrNoLocalModelFound = fmt.Errorf("local model not found")
|
|
|
|
ContextKey = &contextkey{"context"}
|
|
)
|
|
|
|
type Router interface {
|
|
// Shutdown blocks until the router has shutdown returning nil
|
|
// when the router has shutdown successfully.
|
|
//
|
|
// timeout controls how long to wait for inflight requests to finish. After
|
|
// the timeout all inflight requests will be cancelled.
|
|
Shutdown(timeout time.Duration) error
|
|
|
|
// ServeHTTP implements the http.Handler and requests coming in will
|
|
// trigger any model swapping and routing logic.
|
|
ServeHTTP(http.ResponseWriter, *http.Request)
|
|
|
|
// Handles reports whether this router can serve requests for the given model.
|
|
Handles(model string) bool
|
|
}
|
|
|
|
// LocalRouter is a Router backed by local processes whose state can be
|
|
// inspected and which can be individually stopped. Peer routers, which only
|
|
// forward to remote hosts, do not implement it.
|
|
type LocalRouter interface {
|
|
Router
|
|
|
|
// RunningModels returns the current state of every process that is not
|
|
// stopped or shut down, keyed by model ID.
|
|
RunningModels() map[string]process.ProcessState
|
|
|
|
// Unload stops the named models, or every running model when none are
|
|
// named. It blocks until each targeted process has stopped.
|
|
Unload(timeout time.Duration, models ...string)
|
|
|
|
// ProcessLogger returns the log monitor for the named model's process.
|
|
// modelID must be a real (non-alias) config key. Returns false when the
|
|
// model is not known to this router.
|
|
ProcessLogger(modelID string) (*logmon.Monitor, bool)
|
|
}
|
|
|
|
// FetchContext will attempt to get the model id from the context then
|
|
// from the model body. If it extracts the model from the body it will
|
|
// store the model in the context for downstream handlers. An error
|
|
// will be returned when model can not be fetch from either location.
|
|
func FetchContext(r *http.Request, cfg config.Config) (ReqContextData, error) {
|
|
data, ok := ReadContext(r.Context())
|
|
if ok {
|
|
return data, nil
|
|
}
|
|
|
|
if data, err := ExtractContext(r); err == nil {
|
|
realName, _ := cfg.RealModelName(data.Model)
|
|
if realName == "" {
|
|
realName = data.Model
|
|
}
|
|
data.ModelID = realName
|
|
if mc, ok := cfg.Models[realName]; ok {
|
|
data.SendLoadingState = mc.SendLoadingState != nil && *mc.SendLoadingState
|
|
}
|
|
*r = *r.WithContext(SetContext(r.Context(), data))
|
|
return data, nil
|
|
}
|
|
|
|
return ReqContextData{}, ErrNoModelInContext
|
|
}
|
|
|
|
func SetContext(ctx context.Context, data ReqContextData) context.Context {
|
|
return context.WithValue(ctx, ContextKey, data)
|
|
}
|
|
|
|
func ReadContext(ctx context.Context) (ReqContextData, bool) {
|
|
data, ok := ctx.Value(ContextKey).(ReqContextData)
|
|
return data, ok
|
|
}
|
|
|
|
// ExtractContext pulls the model name from an HTTP request without consuming the
|
|
// body. For GET requests it reads the "model" query parameter. For POST
|
|
// requests it inspects Content-Type and parses JSON, multipart/form-data, or
|
|
// application/x-www-form-urlencoded bodies. The request body is always restored
|
|
// before returning so downstream handlers — including reverse proxies that
|
|
// forward raw bytes upstream — can still read it.
|
|
func ExtractContext(r *http.Request) (ReqContextData, error) {
|
|
if r.Method == http.MethodGet {
|
|
if model := r.URL.Query().Get("model"); model != "" {
|
|
return ReqContextData{Model: model, Streaming: r.URL.Query().Get("stream") == "true"}, nil
|
|
}
|
|
return ReqContextData{}, fmt.Errorf("missing 'model' query parameter")
|
|
}
|
|
|
|
bodyBytes, err := io.ReadAll(r.Body)
|
|
if err != nil {
|
|
return ReqContextData{}, fmt.Errorf("error reading request body: %w", err)
|
|
}
|
|
defer func() {
|
|
r.Body = io.NopCloser(bytes.NewReader(bodyBytes))
|
|
}()
|
|
|
|
contentType := r.Header.Get("Content-Type")
|
|
|
|
if strings.Contains(contentType, "application/json") {
|
|
model := gjson.GetBytes(bodyBytes, "model").String()
|
|
if model == "" {
|
|
return ReqContextData{}, fmt.Errorf("missing or empty 'model' in JSON body")
|
|
}
|
|
return ReqContextData{Model: model, Streaming: gjson.GetBytes(bodyBytes, "stream").Bool()}, nil
|
|
}
|
|
|
|
// Form parsers read from r.Body, so feed them a fresh reader over the
|
|
// buffered bytes. The deferred restore above will reset r.Body again
|
|
// after parsing.
|
|
r.Body = io.NopCloser(bytes.NewReader(bodyBytes))
|
|
if strings.Contains(contentType, "multipart/form-data") {
|
|
if err := r.ParseMultipartForm(32 << 20); err != nil {
|
|
return ReqContextData{}, fmt.Errorf("error parsing multipart form: %w", err)
|
|
}
|
|
} else {
|
|
if err := r.ParseForm(); err != nil {
|
|
return ReqContextData{}, fmt.Errorf("error parsing form: %w", err)
|
|
}
|
|
}
|
|
|
|
if model := r.FormValue("model"); model != "" {
|
|
return ReqContextData{Model: model, Streaming: r.FormValue("stream") == "true"}, nil
|
|
}
|
|
|
|
return ReqContextData{}, fmt.Errorf("missing 'model' parameter")
|
|
}
|
|
|
|
func SendError(w http.ResponseWriter, r *http.Request, err error) {
|
|
switch {
|
|
case errors.Is(err, ErrNoModelInContext):
|
|
SendResponse(w, r, http.StatusNotFound, "no model id could be identified")
|
|
case errors.Is(err, ErrNoPeerModelFound):
|
|
SendResponse(w, r, http.StatusNotFound, "no peer found for requested model")
|
|
case errors.Is(err, ErrNoLocalModelFound):
|
|
SendResponse(w, r, http.StatusNotFound, "no local server found for requested model")
|
|
case errors.Is(err, ErrNoRouterFound):
|
|
SendResponse(w, r, http.StatusNotFound, "no router for requested model")
|
|
default:
|
|
SendResponse(w, r, http.StatusInternalServerError, fmt.Sprintf("unspecific error: %v", err))
|
|
}
|
|
}
|
|
|
|
// SendResponse detects what content type the client prefers and returns an error response in that format.
|
|
func SendResponse(w http.ResponseWriter, r *http.Request, status int, message string) {
|
|
// Check Accept header for preferred response format
|
|
acceptHeader := r.Header.Get("Accept")
|
|
if strings.Contains(acceptHeader, "text/plain") {
|
|
w.Header().Set("Content-Type", "text/plain")
|
|
w.WriteHeader(status)
|
|
w.Write([]byte(fmt.Sprintf("llama-swap: %s", message)))
|
|
return
|
|
}
|
|
|
|
if strings.Contains(acceptHeader, "text/html") {
|
|
w.Header().Set("Content-Type", "text/html")
|
|
w.WriteHeader(status)
|
|
w.Write([]byte(fmt.Sprintf(`<html><body><h1>llama-swap</h1><p>%s</p></body></html>`, message)))
|
|
return
|
|
}
|
|
|
|
w.Header().Set("Content-Type", "application/json")
|
|
w.WriteHeader(status)
|
|
w.Write([]byte(fmt.Sprintf(`{"src":"llama-swap", "error": "%s"}`, message)))
|
|
}
|