mirror of
https://github.com/mostlygeek/llama-swap.git
synced 2026-06-09 06:46:34 +02:00
Benson Wong
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.
108 lines
3.7 KiB
Makefile
108 lines
3.7 KiB
Makefile
# Define variables for the application
|
|
APP_NAME = llama-swap
|
|
BUILD_DIR = build
|
|
|
|
# Get the current Git hash
|
|
GIT_HASH := $(shell git rev-parse --short HEAD)
|
|
ifneq ($(shell git status --porcelain),)
|
|
# There are untracked changes
|
|
GIT_HASH := $(GIT_HASH)+
|
|
endif
|
|
|
|
# Capture the current build date in RFC3339 format
|
|
BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
|
|
|
|
# Default target: Builds binaries for both OSX and Linux
|
|
all: mac linux simple-responder
|
|
|
|
# Clean build directory
|
|
clean:
|
|
rm -rf $(BUILD_DIR)
|
|
|
|
proxy/ui_dist/placeholder.txt:
|
|
mkdir -p proxy/ui_dist
|
|
touch $@
|
|
|
|
# use cached test results while developing
|
|
test-dev: proxy/ui_dist/placeholder.txt
|
|
go test -short ./proxy/... ./internal/...
|
|
staticcheck ./proxy/... ./internal/... || true
|
|
|
|
test: proxy/ui_dist/placeholder.txt
|
|
go test -short -count=1 ./proxy/... ./internal/...
|
|
|
|
# for CI - full test (takes longer)
|
|
test-all: proxy/ui_dist/placeholder.txt
|
|
go test -race -count=1 ./proxy/... ./internal/...
|
|
|
|
ui/node_modules:
|
|
cd ui-svelte && npm install
|
|
|
|
# build react UI
|
|
ui: ui/node_modules
|
|
cd ui-svelte && npm run build
|
|
mkdir -p internal/server/ui_dist
|
|
cp -R proxy/ui_dist/. internal/server/ui_dist/
|
|
|
|
# Build OSX binary
|
|
mac: ui
|
|
@echo "Building Mac binary..."
|
|
GOOS=darwin GOARCH=arm64 go build -ldflags="-X main.commit=${GIT_HASH} -X main.version=local_${GIT_HASH} -X main.date=${BUILD_DATE}" -o $(BUILD_DIR)/$(APP_NAME)-darwin-arm64
|
|
|
|
# Build Linux binary
|
|
linux: linux-arm64 linux-amd64
|
|
|
|
linux-amd64: ui
|
|
@echo "Building Linux AMD64 binary..."
|
|
GOOS=linux GOARCH=amd64 go build -ldflags="-X main.commit=${GIT_HASH} -X main.version=local_${GIT_HASH} -X main.date=${BUILD_DATE}" -o $(BUILD_DIR)/$(APP_NAME)-linux-amd64
|
|
|
|
linux-arm64: ui
|
|
@echo "Building Linux ARM64 binary..."
|
|
GOOS=linux GOARCH=arm64 go build -ldflags="-X main.commit=${GIT_HASH} -X main.version=local_${GIT_HASH} -X main.date=${BUILD_DATE}" -o $(BUILD_DIR)/$(APP_NAME)-linux-arm64
|
|
|
|
# Build Windows binary
|
|
windows: ui
|
|
@echo "Building Windows binary..."
|
|
GOOS=windows GOARCH=amd64 go build -ldflags="-X main.commit=${GIT_HASH} -X main.version=local_${GIT_HASH} -X main.date=${BUILD_DATE}" -o $(BUILD_DIR)/$(APP_NAME)-windows-amd64.exe
|
|
|
|
# for testing proxy.Process
|
|
simple-responder:
|
|
@echo "Building simple responder"
|
|
GOOS=darwin GOARCH=arm64 go build -o $(BUILD_DIR)/simple-responder_darwin_arm64 cmd/simple-responder/simple-responder.go
|
|
GOOS=linux GOARCH=amd64 go build -o $(BUILD_DIR)/simple-responder_linux_amd64 cmd/simple-responder/simple-responder.go
|
|
|
|
simple-responder-windows:
|
|
@echo "Building simple responder for windows"
|
|
GOOS=windows GOARCH=amd64 go build -o $(BUILD_DIR)/simple-responder.exe cmd/simple-responder/simple-responder.go
|
|
|
|
# Ensure build directory exists
|
|
$(BUILD_DIR):
|
|
mkdir -p $(BUILD_DIR)
|
|
|
|
# Create a new release tag
|
|
release:
|
|
@echo "Checking for unstaged changes..."
|
|
@if [ -n "$(shell git status --porcelain)" ]; then \
|
|
echo "Error: There are unstaged changes. Please commit or stash your changes before creating a release tag." >&2; \
|
|
exit 1; \
|
|
fi
|
|
|
|
# Get the highest tag in v{number} format, increment it, and create a new tag
|
|
@highest_tag=$$(git tag --sort=-v:refname | grep -E '^v[0-9]+$$' | head -n 1 || echo "v0"); \
|
|
new_tag="v$$(( $${highest_tag#v} + 1 ))"; \
|
|
echo "tagging new version: $$new_tag"; \
|
|
git tag "$$new_tag";
|
|
|
|
GOOS ?= $(shell go env GOOS 2>/dev/null || echo linux)
|
|
GOARCH ?= $(shell go env GOARCH 2>/dev/null || echo amd64)
|
|
wol-proxy: $(BUILD_DIR)
|
|
@echo "Building wol-proxy"
|
|
go build -o $(BUILD_DIR)/wol-proxy-$(GOOS)-$(GOARCH)-$(shell date +%Y-%m-%d) cmd/wol-proxy/wol-proxy.go
|
|
|
|
test-ui:
|
|
cd ui-svelte && npm ci && npm run check && npm test
|
|
|
|
# Phony targets
|
|
.PHONY: all clean ui mac windows simple-responder simple-responder-windows test test-all test-dev test-ui wol-proxy
|
|
.PHONE: linux linux-arm64 linux-amd64
|