From 14c2e30478ab15709f1c0867a118e0c93bc08fed Mon Sep 17 00:00:00 2001 From: mram Date: Mon, 21 Sep 2026 12:38:03 +0200 Subject: [PATCH] Clarify listener wording: Ollama-compatible clients, not Ollama-facing --- README.md | 4 ++-- SPEC.md | 4 ++-- internal/config/sample.go | 4 ++-- internal/proxy/proxy.go | 4 ++-- internal/proxy/proxy_test.go | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b7f1487..f26c6cf 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,8 @@ override file values. Invalid values fail at startup. | Var | Default | Meaning | |---|---|---| -| `LISTEN_OLLAMA` | `:11434` | Ollama-facing listener | -| `LISTEN_COMFY` | `:8188` | ComfyUI-facing listener | +| `LISTEN_OLLAMA` | `:11434` | Listener for Ollama-compatible clients | +| `LISTEN_COMFY` | `:8188` | Listener for ComfyUI clients | | `OLLAMA_URL` | _(empty = disabled)_ | Ollama upstream; set to enable the Ollama consumer | | `COMFY_URL` | _(empty = disabled)_ | ComfyUI upstream; set to enable the ComfyUI consumer | | `UNLOAD_TIMEOUT` | `60s` | Wait for Ollama to unload before an image job | diff --git a/SPEC.md b/SPEC.md index 3f061b1..ccb9855 100644 --- a/SPEC.md +++ b/SPEC.md @@ -131,8 +131,8 @@ override file values. A missing file is fine; a malformed one is fatal. | Var | Default | Meaning | |---|---|---| -| `LISTEN_OLLAMA` | `:11434` | Ollama-facing listener | -| `LISTEN_COMFY` | `:8188` | ComfyUI-facing listener | +| `LISTEN_OLLAMA` | `:11434` | listener for Ollama-compatible clients | +| `LISTEN_COMFY` | `:8188` | listener for ComfyUI clients | | `OLLAMA_URL` | _(empty = disabled)_ | Ollama upstream; set to enable the Ollama consumer | | `COMFY_URL` | _(empty = disabled)_ | ComfyUI upstream; set to enable the ComfyUI consumer | | `UNLOAD_TIMEOUT` | `60s` | wait for Ollama to unload | diff --git a/internal/config/sample.go b/internal/config/sample.go index 9e093e1..d7055aa 100644 --- a/internal/config/sample.go +++ b/internal/config/sample.go @@ -23,8 +23,8 @@ const appVerComment = `Version to run: "dev" disables updates, "stable" tracks t // CFG_VER and APP_VER are not entries — they head the file, always active. func sampleEntries(logFile string) []sampleEntry { return []sampleEntry{ - {"LISTEN_OLLAMA", ":11434", "Ollama-facing listener address", false}, - {"LISTEN_COMFY", ":8188", "ComfyUI-facing listener address", false}, + {"LISTEN_OLLAMA", ":11434", "Listen address for Ollama-compatible clients (gpu-turnstile poses as Ollama here)", false}, + {"LISTEN_COMFY", ":8188", "Listen address for ComfyUI clients (gpu-turnstile poses as ComfyUI here)", false}, {"OLLAMA_URL", "http://127.0.0.1:11434", "Ollama upstream URL; setting it enables the Ollama consumer (default: empty = disabled)", false}, {"COMFY_URL", "http://127.0.0.1:8188", "ComfyUI upstream URL; setting it enables the ComfyUI consumer (default: empty = disabled)", false}, {"WARM_MODEL", "", "Optional model to reload after an image job (default: empty = none)", false}, diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 8471846..d94dcb7 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -438,7 +438,7 @@ func isLLMRequest(r *http.Request) bool { return r.Method == http.MethodPost && llmPaths[r.URL.Path] } -// OllamaHandler serves the Ollama-facing listener. +// OllamaHandler serves the listener for Ollama-compatible clients. func (s *Server) OllamaHandler() http.Handler { return s.logRequests("ollama", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { @@ -485,7 +485,7 @@ func (s *Server) OllamaHandler() http.Handler { })) } -// ComfyHandler serves the ComfyUI-facing listener. +// ComfyHandler serves the listener for ComfyUI clients. func (s *Server) ComfyHandler() http.Handler { return s.logRequests("comfy", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { switch r.URL.Path { diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index 92b3cb2..d4df5fd 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -46,8 +46,8 @@ type fakes struct { rec *recorder ollama *httptest.Server comfy *httptest.Server - server *httptest.Server // Ollama-facing gpu-turnstile listener - comfySrv *httptest.Server // ComfyUI-facing gpu-turnstile listener + server *httptest.Server // gpu-turnstile listener for Ollama-compatible clients + comfySrv *httptest.Server // gpu-turnstile listener for ComfyUI clients freeCh chan struct{} chatCh chan struct{} historyMu sync.Mutex