Introduce new routing backend (#790)

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.
This commit is contained in:
Benson Wong
2026-05-28 21:47:01 -07:00
committed by GitHub
parent 63bc266395
commit 02e015fa49
107 changed files with 12014 additions and 251 deletions
+111
View File
@@ -0,0 +1,111 @@
package server
import (
"embed"
"io/fs"
"net/http"
"path"
"strings"
)
// uiStaticFS holds the embedded UI build. The build is copied into ui_dist by
// the Makefile's `ui` target; placeholder.txt keeps the embed valid before a
// build has run.
//
//go:embed ui_dist
var uiStaticFS embed.FS
// uiFS is the embedded UI rooted at ui_dist.
var uiFS = func() http.FileSystem {
sub, err := fs.Sub(uiStaticFS, "ui_dist")
if err != nil {
panic(err)
}
return http.FS(sub)
}()
// selectEncoding chooses the best pre-compressed encoding the client accepts.
// It returns the encoding ("br" or "gzip") and the matching file extension.
func selectEncoding(acceptEncoding string) (encoding, ext string) {
if acceptEncoding == "" {
return "", ""
}
for _, part := range strings.Split(acceptEncoding, ",") {
if strings.TrimSpace(strings.SplitN(part, ";", 2)[0]) == "br" {
return "br", ".br"
}
}
for _, part := range strings.Split(acceptEncoding, ",") {
if strings.TrimSpace(strings.SplitN(part, ";", 2)[0]) == "gzip" {
return "gzip", ".gz"
}
}
return "", ""
}
// serveCompressedFile serves name from fsys, preferring a pre-compressed
// sibling (name+".br" / name+".gz") when the client accepts it. It returns an
// error without writing a response when name cannot be served, so callers can
// fall back (e.g. SPA routing).
func serveCompressedFile(fsys http.FileSystem, w http.ResponseWriter, r *http.Request, name string) error {
if encoding, ext := selectEncoding(r.Header.Get("Accept-Encoding")); encoding != "" {
if cf, err := fsys.Open(name + ext); err == nil {
defer cf.Close()
if stat, err := cf.Stat(); err == nil && !stat.IsDir() {
w.Header().Set("Content-Encoding", encoding)
w.Header().Add("Vary", "Accept-Encoding")
http.ServeContent(w, r, name, stat.ModTime(), cf)
return nil
}
}
}
file, err := fsys.Open(name)
if err != nil {
return err
}
defer file.Close()
stat, err := file.Stat()
if err != nil {
return err
}
if stat.IsDir() {
return fs.ErrNotExist
}
http.ServeContent(w, r, name, stat.ModTime(), file)
return nil
}
// handleUI serves the embedded SPA under /ui/.
func (s *Server) handleUI(w http.ResponseWriter, r *http.Request) {
serveUI(uiFS, w, r)
}
// serveUI serves the SPA from fsys. Real files are served with compression
// support; unknown paths without a file extension fall back to index.html so
// client-side routing works.
func serveUI(fsys http.FileSystem, w http.ResponseWriter, r *http.Request) {
name := strings.TrimPrefix(r.URL.Path, "/ui/")
if name == "" {
name = "index.html"
}
if err := serveCompressedFile(fsys, w, r, name); err != nil {
if strings.Contains(path.Base(name), ".") {
http.NotFound(w, r)
return
}
if err := serveCompressedFile(fsys, w, r, "index.html"); err != nil {
http.NotFound(w, r)
}
}
}
// handleFavicon serves /favicon.ico from the embedded UI build.
func (s *Server) handleFavicon(w http.ResponseWriter, r *http.Request) {
if err := serveCompressedFile(uiFS, w, r, "favicon.ico"); err != nil {
http.NotFound(w, r)
}
}