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

Refactor server handlers and routing to use a handler struct

Browse Source
This commit is contained in:
Matúš Námešný
2025-07-17 21:46:26 +02:00
parent 1e962438bf
commit 6f571dd91c
4 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
server/pkg/handlers.go
View File

@@ -1,10 +1,22 @@
package llamactl
import (
"encoding/json"
"fmt"
"net/http"
"os/exec"
)
type Handler struct {
InstanceManager InstanceManager
}
func NewHandler(im InstanceManager) *Handler {
return &Handler{
InstanceManager: im,
}
}
// HelpHandler godoc
// @Summary Get help for llama server
// @Description Returns the help text for the llama server command
@@ -13,15 +25,17 @@ import (
// @Success 200 {string} string "Help text"
// @Failure 500 {string} string "Internal Server Error"
// @Router /server/help [get]
func HelpHandler(w http.ResponseWriter, r *http.Request) {
helpCmd := exec.Command("llama-server", "--help")
output, err := helpCmd.CombinedOutput()
if err != nil {
http.Error(w, "Failed to get help: "+err.Error(), http.StatusInternalServerError)
return
func (h *Handler) HelpHandler() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
helpCmd := exec.Command("llama-server", "--help")
output, err := helpCmd.CombinedOutput()
if err != nil {
http.Error(w, "Failed to get help: "+err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "text/plain")
w.Write(output)
}
w.Header().Set("Content-Type", "text/plain")
w.Write(output)
}
// VersionHandler godoc
@@ -32,15 +46,17 @@ func HelpHandler(w http.ResponseWriter, r *http.Request) {
// @Success 200 {string} string "Version information"
// @Failure 500 {string} string "Internal Server Error"
// @Router /server/version [get]
func VersionHandler(w http.ResponseWriter, r *http.Request) {
versionCmd := exec.Command("llama-server", "--version")
output, err := versionCmd.CombinedOutput()
if err != nil {
http.Error(w, "Failed to get version: "+err.Error(), http.StatusInternalServerError)
return
func (h *Handler) VersionHandler() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
versionCmd := exec.Command("llama-server", "--version")
output, err := versionCmd.CombinedOutput()
if err != nil {
http.Error(w, "Failed to get version: "+err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "text/plain")
w.Write(output)
}
w.Header().Set("Content-Type", "text/plain")
w.Write(output)
}
// ListDevicesHandler godoc
@@ -51,15 +67,29 @@ func VersionHandler(w http.ResponseWriter, r *http.Request) {
// @Success 200 {string} string "List of devices"
// @Failure 500 {string} string "Internal Server Error"
// @Router /server/devices [get]
func ListDevicesHandler(w http.ResponseWriter, r *http.Request) {
listCmd := exec.Command("llama-server", "--list-devices")
output, err := listCmd.CombinedOutput()
if err != nil {
http.Error(w, "Failed to list devices: "+err.Error(), http.StatusInternalServerError)
return
func (h *Handler) ListDevicesHandler() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
listCmd := exec.Command("llama-server", "--list-devices")
output, err := listCmd.CombinedOutput()
if err != nil {
http.Error(w, "Failed to list devices: "+err.Error(), http.StatusInternalServerError)
return
}
w.Header().Set("Content-Type", "text/plain")
w.Write(output)
}
}
func (h *Handler) StartHandler() http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var requestBody InstanceOptions
if err := json.NewDecoder(r.Body).Decode(&requestBody); err != nil {
fmt.Println("Error decoding request body:", err)
http.Error(w, "Invalid request body", http.StatusBadRequest)
return
}
}
w.Header().Set("Content-Type", "text/plain")
w.Write(output)
}
// func launchHandler(w http.ResponseWriter, r *http.Request) {