Mathis/llamactl
1
0
Fork 0
mirror of https://github.com/lordmathis/llamactl.git synced 2025-11-05 16:44:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename ProxyToInstance to InstanceProxy for clarity in routing

Browse Source
This commit is contained in:
Matúš Námešný
2025-10-26 10:22:37 +01:00
parent a7593e9a58
commit 836e918fc5
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/server/handlers_instances.go
View File

@@ -305,7 +305,7 @@ func (h *Handler) GetInstanceLogs() http.HandlerFunc {
} }
} }
// ProxyToInstance godoc // InstanceProxy godoc
// @Summary Proxy requests to a specific instance, does not autostart instance if stopped // @Summary Proxy requests to a specific instance, does not autostart instance if stopped
// @Description Forwards HTTP requests to the llama-server instance running on a specific port // @Description Forwards HTTP requests to the llama-server instance running on a specific port
// @Tags instances // @Tags instances
@@ -317,7 +317,7 @@ func (h *Handler) GetInstanceLogs() http.HandlerFunc {
// @Failure 503 {string} string "Instance is not running" // @Failure 503 {string} string "Instance is not running"
// @Router /instances/{name}/proxy [get] // @Router /instances/{name}/proxy [get]
// @Router /instances/{name}/proxy [post] // @Router /instances/{name}/proxy [post]
func (h *Handler) ProxyToInstance() http.HandlerFunc { func (h *Handler) InstanceProxy() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
inst, err := h.getInstance(r) inst, err := h.getInstance(r)
if err != nil { if err != nil {
@@ -330,14 +330,12 @@ func (h *Handler) ProxyToInstance() http.HandlerFunc {
return return
} }
// Get the cached proxy for this instance
proxy, err := inst.GetProxy() proxy, err := inst.GetProxy()
if err != nil { if err != nil {
writeError(w, http.StatusInternalServerError, "proxy_failed", "Failed to get proxy: "+err.Error()) writeError(w, http.StatusInternalServerError, "proxy_failed", "Failed to get proxy: "+err.Error())
return return
} }
// Check if this is a remote instance
if !inst.IsRemote() { if !inst.IsRemote() {
// Strip the "/api/v1/instances/<name>/proxy" prefix from the request URL // Strip the "/api/v1/instances/<name>/proxy" prefix from the request URL
prefix := fmt.Sprintf("/api/v1/instances/%s/proxy", inst.Name) prefix := fmt.Sprintf("/api/v1/instances/%s/proxy", inst.Name)
@@ -348,7 +346,6 @@ func (h *Handler) ProxyToInstance() http.HandlerFunc {
r.Header.Set("X-Forwarded-Host", r.Header.Get("Host")) r.Header.Set("X-Forwarded-Host", r.Header.Get("Host"))
r.Header.Set("X-Forwarded-Proto", "http") r.Header.Set("X-Forwarded-Proto", "http")
// Forward the request using the cached proxy
proxy.ServeHTTP(w, r) proxy.ServeHTTP(w, r)
} }
} }

2
pkg/server/routes.go
View File

@@ -86,7 +86,7 @@ func SetupRouter(handler *Handler) *chi.Mux {
// Llama.cpp server proxy endpoints (proxied to the actual llama.cpp server) // Llama.cpp server proxy endpoints (proxied to the actual llama.cpp server)
r.Route("/proxy", func(r chi.Router) { r.Route("/proxy", func(r chi.Router) {
r.HandleFunc("/*", handler.ProxyToInstance()) // Proxy all llama.cpp server requests r.HandleFunc("/*", handler.InstanceProxy()) // Proxy all llama.cpp server requests
}) })
}) })
}) })