Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 99bb3526db | |||
| bb8cb8d014 |
+12
-8
@@ -107,14 +107,18 @@ func (h *reactiveHandler) confirmResolvers(ctx context.Context) []confirmResolve
|
||||
return pr != nil && !h.now().After(pr.expiry)
|
||||
},
|
||||
yes: func() string {
|
||||
// Only record the acceptance. The tick loop reads accepted
|
||||
// routines and nudges on their own interval. Building a
|
||||
// reminder here made a routine fire exactly once (Vikunja #366).
|
||||
if err := h.dataStore.AcceptProposedRoutine(ctx, pr.routineID, h.now()); err != nil {
|
||||
log.Printf("voice: accept proposed routine: %v", err)
|
||||
return "не получилось запомнить рутину."
|
||||
}
|
||||
return "буду напоминать."
|
||||
// Voice does NOT accept (Vikunja #367). Accepting hands the
|
||||
// tick loop a standing new reason to speak, which is the same
|
||||
// tier as enabling a tool — and DESIGN.md § "surface caps
|
||||
// authority" says a room mic, reachable by anyone present, is
|
||||
// structurally incapable of layer 3. So a spoken "да" leaves
|
||||
// the row 'proposed' and points at the authed page, where the
|
||||
// accept button is gated at step-up. The convenience of
|
||||
// answering out loud stays; the authority does not move.
|
||||
//
|
||||
// Acceptance itself is recorded by /routines, and the tick
|
||||
// loop nudges on the interval from there (Vikunja #366).
|
||||
return "поняла — подтверди на странице рутин, и начну напоминать."
|
||||
},
|
||||
no: func() string {
|
||||
if err := h.dataStore.DismissProposedRoutine(ctx, pr.routineID); err != nil {
|
||||
|
||||
+8
-9
@@ -246,15 +246,14 @@ func run(args []string) error {
|
||||
phr = phraser.NewStub()
|
||||
if cfg.Phraser != nil {
|
||||
pc := phraser.Config{
|
||||
ModelPath: cfg.Phraser.ModelPath,
|
||||
BinPath: cfg.Phraser.BinPath,
|
||||
Listen: cfg.Phraser.Listen,
|
||||
NGpuLayers: cfg.Phraser.NGpuLayers,
|
||||
NCtx: cfg.Phraser.NCtx,
|
||||
Timeout: time.Duration(cfg.Phraser.Timeout),
|
||||
StartupTimeout: time.Duration(cfg.Phraser.StartupTimeout),
|
||||
LLMNudges: cfg.Phraser.LLMNudges,
|
||||
ContextBlock: contextBlockFn(cfg, time.Now),
|
||||
ModelPath: cfg.Phraser.ModelPath,
|
||||
BinPath: cfg.Phraser.BinPath,
|
||||
Listen: cfg.Phraser.Listen,
|
||||
NGpuLayers: cfg.Phraser.NGpuLayers,
|
||||
NCtx: cfg.Phraser.NCtx,
|
||||
Timeout: time.Duration(cfg.Phraser.Timeout),
|
||||
LLMNudges: cfg.Phraser.LLMNudges,
|
||||
ContextBlock: contextBlockFn(cfg, time.Now),
|
||||
}
|
||||
if pc.BinPath == "" {
|
||||
pc.BinPath = "llama-server"
|
||||
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
|
||||
"github.com/kami/maven/internal/config"
|
||||
"github.com/kami/maven/internal/delivery"
|
||||
"github.com/kami/maven/internal/ipc"
|
||||
"github.com/kami/maven/internal/loop"
|
||||
"github.com/kami/maven/internal/pattern"
|
||||
"github.com/kami/maven/internal/store"
|
||||
@@ -283,3 +284,81 @@ func TestTickProposalCooldownSpacesAnnouncements(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TestVoiceYesDoesNotAcceptRoutine — Vikunja #367. Accepting a routine hands
|
||||
// the tick loop a standing new reason to speak, which DESIGN.md puts at layer
|
||||
// 3, and voice is structurally incapable of layer 3. A spoken "да" must park
|
||||
// the decision for the authed page, not flip the row itself.
|
||||
func TestVoiceYesDoesNotAcceptRoutine(t *testing.T) {
|
||||
st := newTestStore(t)
|
||||
ctx := context.Background()
|
||||
now := refNow()
|
||||
seedRefillEvents(t, st, ctx, now, pattern.MinEvents-1)
|
||||
|
||||
h := &reactiveHandler{api: ipc.NewStoreAPI(st), dataStore: st, now: func() time.Time { return now }}
|
||||
|
||||
// The MinEvents'th event is the one that makes the pattern detectable, and
|
||||
// it goes through the voice path so the proposal is parked for a y/n.
|
||||
last := now.Add(time.Duration(pattern.MinEvents-1) * 7 * 24 * time.Hour)
|
||||
factID, err := st.WriteFact(ctx, last, store.KindSelf, "cat_water", "refill", "voice", 1.0, sql.NullInt64{})
|
||||
if err != nil {
|
||||
t.Fatalf("write fact: %v", err)
|
||||
}
|
||||
if phrase := h.detectPattern(ctx, factID, "cat_water", "refill", last); phrase == "" {
|
||||
t.Fatal("expected a parked routine proposal")
|
||||
}
|
||||
|
||||
reply, handled := h.resolveConfirm(ctx, "да")
|
||||
if !handled {
|
||||
t.Fatal("the spoken yes should be consumed by the routine confirm")
|
||||
}
|
||||
if !strings.Contains(reply, "рутин") {
|
||||
t.Fatalf("reply should send him to the routines page, got %q", reply)
|
||||
}
|
||||
|
||||
rows, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineAccepted)
|
||||
if err != nil {
|
||||
t.Fatalf("list accepted: %v", err)
|
||||
}
|
||||
if len(rows) != 0 {
|
||||
t.Fatalf("voice accepted a routine: %+v", rows)
|
||||
}
|
||||
proposed, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineProposed)
|
||||
if err != nil {
|
||||
t.Fatalf("list proposed: %v", err)
|
||||
}
|
||||
if len(proposed) != 1 {
|
||||
t.Fatalf("proposed routines = %d, want 1 (still waiting for the page)", len(proposed))
|
||||
}
|
||||
}
|
||||
|
||||
// TestVoiceNoStillDismissesRoutine — declining does not move the boundary
|
||||
// outward, so voice keeps it. Only acceptance is gated.
|
||||
func TestVoiceNoStillDismissesRoutine(t *testing.T) {
|
||||
st := newTestStore(t)
|
||||
ctx := context.Background()
|
||||
now := refNow()
|
||||
seedRefillEvents(t, st, ctx, now, pattern.MinEvents-1)
|
||||
|
||||
h := &reactiveHandler{api: ipc.NewStoreAPI(st), dataStore: st, now: func() time.Time { return now }}
|
||||
|
||||
last := now.Add(time.Duration(pattern.MinEvents-1) * 7 * 24 * time.Hour)
|
||||
factID, err := st.WriteFact(ctx, last, store.KindSelf, "cat_water", "refill", "voice", 1.0, sql.NullInt64{})
|
||||
if err != nil {
|
||||
t.Fatalf("write fact: %v", err)
|
||||
}
|
||||
if phrase := h.detectPattern(ctx, factID, "cat_water", "refill", last); phrase == "" {
|
||||
t.Fatal("expected a parked routine proposal")
|
||||
}
|
||||
|
||||
if _, handled := h.resolveConfirm(ctx, "нет"); !handled {
|
||||
t.Fatal("the spoken no should be consumed by the routine confirm")
|
||||
}
|
||||
rows, err := st.ListProposedRoutinesByStatus(ctx, store.RoutineDismissed)
|
||||
if err != nil {
|
||||
t.Fatalf("list dismissed: %v", err)
|
||||
}
|
||||
if len(rows) != 1 {
|
||||
t.Fatalf("dismissed routines = %d, want 1", len(rows))
|
||||
}
|
||||
}
|
||||
|
||||
+4
-7
@@ -1210,13 +1210,10 @@ func routineRows(rs []ipc.ProposedRoutine) []routineRow {
|
||||
return out
|
||||
}
|
||||
|
||||
// acceptRoutine creates the recurring reminder for a proposal, then marks the
|
||||
// proposal accepted and links the reminder to it. Weekly patterns get a cron
|
||||
// expression; any other interval fires once.
|
||||
//
|
||||
// TODO(vikunja#46): this mirrors the voice accept path in cmd/mavend/voice.go.
|
||||
// When the tick loop learns to read accepted proposals directly, both callers
|
||||
// should hand off to one place in core instead of each building a reminder.
|
||||
// acceptRoutine marks a proposal accepted. This page is the ONLY surface that
|
||||
// may do it (Vikunja #367): accepting gives the tick loop a standing new
|
||||
// reason to speak, which DESIGN.md puts at layer 3, and the button here is
|
||||
// behind step-up. Voice can park the question and dismiss, never accept.
|
||||
func acceptRoutine(ctx context.Context, core ipc.CoreAPI, id int64) error {
|
||||
proposed, err := core.ListProposedRoutines(ctx)
|
||||
if err != nil {
|
||||
|
||||
@@ -1233,13 +1233,6 @@ type PhraserConfig struct {
|
||||
NCtx int `json:"n_ctx,omitempty"`
|
||||
Timeout Duration `json:"timeout,omitempty"`
|
||||
|
||||
// StartupTimeout — how long the daemon waits for llama-server to print its
|
||||
// listen line at boot. Zero ⇒ the phraser's 60s default.
|
||||
//
|
||||
// It is here because a cold 1.7B loading off a spinning disk can outrun 60s,
|
||||
// and that failed the boot with no way to raise it (Vikunja #323).
|
||||
StartupTimeout Duration `json:"startup_timeout,omitempty"`
|
||||
|
||||
// LLMNudges — let the model word nudges again. Off by default: nudges are
|
||||
// worded from hand-written Russian templates now (the model broke the
|
||||
// persona and invented units). Chat, query and reminder phrasing always go
|
||||
|
||||
@@ -101,21 +101,8 @@ type Config struct {
|
||||
// ever fights the grammar, the fix should be a config flip on the
|
||||
// deploy box, not a code change and a rebuild.
|
||||
NoGrammar bool
|
||||
|
||||
// StartupTimeout — how long to wait for llama-server to print its listen
|
||||
// line before giving up, killing the child and returning an error.
|
||||
//
|
||||
// A field rather than a constant because the box may legitimately want
|
||||
// longer: a cold 1.7B loading off a spinning disk can outrun the 60s
|
||||
// default, and that used to fail the boot with no way to raise it
|
||||
// (Vikunja #323). Zero ⇒ defaultStartupTimeout.
|
||||
StartupTimeout time.Duration
|
||||
}
|
||||
|
||||
// defaultStartupTimeout — the wait DefaultConfig sets and the zero value falls
|
||||
// back to, so a Config built by hand still has a ceiling.
|
||||
const defaultStartupTimeout = 60 * time.Second
|
||||
|
||||
func DefaultConfig(modelPath string) Config {
|
||||
return Config{
|
||||
ModelPath: modelPath,
|
||||
@@ -124,8 +111,6 @@ func DefaultConfig(modelPath string) Config {
|
||||
NGpuLayers: -1,
|
||||
NCtx: 2048,
|
||||
Timeout: 30 * time.Second,
|
||||
|
||||
StartupTimeout: defaultStartupTimeout,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -293,10 +278,6 @@ func startLlamaProc(ctx context.Context, cfg Config) (*llamaProc, error) {
|
||||
}
|
||||
}()
|
||||
|
||||
startupTimeout := cfg.StartupTimeout
|
||||
if startupTimeout <= 0 {
|
||||
startupTimeout = defaultStartupTimeout
|
||||
}
|
||||
select {
|
||||
case addr := <-portCh:
|
||||
p.base = addr
|
||||
@@ -309,12 +290,10 @@ func startLlamaProc(ctx context.Context, cfg Config) (*llamaProc, error) {
|
||||
_ = cmd.Process.Kill()
|
||||
_ = cmd.Wait()
|
||||
return nil, ctx.Err()
|
||||
case <-time.After(startupTimeout):
|
||||
// The arm most likely to leak: the child is still loading a model, so
|
||||
// it is alive and busy rather than dead. Kill and reap before the error.
|
||||
case <-time.After(60 * time.Second):
|
||||
_ = cmd.Process.Kill()
|
||||
_ = cmd.Wait()
|
||||
return nil, fmt.Errorf("llm: server did not start within %s", startupTimeout)
|
||||
return nil, fmt.Errorf("llm: server did not start within 60s")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -555,8 +534,14 @@ func (p *LLMPhraser) PhraseReminder(ctx context.Context, d loop.ReminderDecision
|
||||
text = "reminder"
|
||||
}
|
||||
|
||||
// Russian, like the other two prompts (Vikunja #404). Asking a model for a
|
||||
// Russian reply in English is asking it to switch languages mid-prompt,
|
||||
// and a 1.7B sometimes answers in the language it was asked in. The
|
||||
// persona rules and the JSON contract are not repeated here: this call
|
||||
// goes through chat(), so nudgeSystem already states both, and a second
|
||||
// statement of the same contract is one more thing that can drift.
|
||||
prompt := fmt.Sprintf(
|
||||
`The user set a reminder: "%s". Rephrase it briefly as a gentle nudge. Respond as JSON: {"response": "...", "mood": "..."}`,
|
||||
`Он поставил напоминание: "%s". Скажи это своими словами, коротко и мягко — одно предложение.`,
|
||||
text,
|
||||
)
|
||||
resp, err := p.chat(ctx, prompt)
|
||||
@@ -775,7 +760,7 @@ func (p *LLMPhraser) querySystemPrompt() string {
|
||||
base := "Ты отвечаешь ему по источникам, которые тебе дали. Отвечай ТОЛЬКО по ним: всё, что ты говоришь, должно быть написано в источниках. " +
|
||||
"Если ответа в них нет — так и скажи и на этом остановись; не добавляй ничего из своих знаний и не догадывайся. " +
|
||||
"Не приплетай прошлые реплики разговора. " +
|
||||
"Отвечай по-русски, коротко и своими словами, начинай с \"вот что я нашла: \". О себе — в женском роде, глаголы в прошедшем времени с окончанием -ла. Он мужчина, обращайся к нему на \"ты\". Respond ONLY with valid JSON: {\"response\": \"...\", \"mood\": \"neutral\"}."
|
||||
"Отвечай по-русски, коротко и своими словами, начинай с \"вот что я нашла: \". О себе — в женском роде, глаголы в прошедшем времени с окончанием -ла. Он мужчина, обращайся к нему на \"ты\". Отвечай ТОЛЬКО одним объектом JSON: {\"response\": \"...\", \"mood\": \"neutral\"}."
|
||||
return persona.Prepend(p.cfg.ContextBlock, base)
|
||||
}
|
||||
|
||||
|
||||
@@ -1,285 +0,0 @@
|
||||
package phraser
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"syscall"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
// The spawn path (NewLLMPhraser, spawnLlamaServer, startLlamaProc, llamaProc.Close)
|
||||
// was at 0% coverage: every test built the phraser with NewLLMPhraserAt, which
|
||||
// starts no process. These tests drive the real spawn code against a fake
|
||||
// llama-server script, so the startup race arms and the reaping are exercised
|
||||
// without a model or a GPU.
|
||||
|
||||
// fakeLlama writes an executable script standing in for llama-server and returns
|
||||
// its path. body runs after the script has recorded its own pid.
|
||||
func fakeLlama(t *testing.T, body string) string {
|
||||
t.Helper()
|
||||
dir := t.TempDir()
|
||||
path := filepath.Join(dir, "fake-llama-server")
|
||||
script := "#!/bin/sh\n" + body + "\n"
|
||||
if err := os.WriteFile(path, []byte(script), 0o755); err != nil {
|
||||
t.Fatalf("write fake server: %v", err)
|
||||
}
|
||||
return path
|
||||
}
|
||||
|
||||
// listensThenSleeps prints the line startLlamaProc scrapes, then stays alive
|
||||
// until killed — the shape of a real llama-server that came up.
|
||||
const listensThenSleeps = `echo "srv load_model: listening on http://127.0.0.1:18081" >&2
|
||||
while : ; do sleep 1 ; done`
|
||||
|
||||
func testCfg(bin string) Config {
|
||||
cfg := DefaultConfig("/nonexistent/model.gguf")
|
||||
cfg.BinPath = bin
|
||||
return cfg
|
||||
}
|
||||
|
||||
func TestExtractPort(t *testing.T) {
|
||||
for _, tc := range []struct{ in, want string }{
|
||||
{"127.0.0.1:0", "0"},
|
||||
{"127.0.0.1:8080", "8080"},
|
||||
{"127.0.0.1:", "0"},
|
||||
{"", "0"},
|
||||
{"8080", "0"}, // no colon: Cut yields no port, so the caller gets the "any port" default
|
||||
} {
|
||||
if got := extractPort(tc.in); got != tc.want {
|
||||
t.Errorf("extractPort(%q) = %q, want %q", tc.in, got, tc.want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestStartLlamaProcScrapesPortAndReaps(t *testing.T) {
|
||||
bin := fakeLlama(t, listensThenSleeps)
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
p, err := startLlamaProc(ctx, testCfg(bin))
|
||||
if err != nil {
|
||||
t.Fatalf("startLlamaProc: %v", err)
|
||||
}
|
||||
if p.BaseURL() != "http://127.0.0.1:18081" {
|
||||
t.Fatalf("BaseURL = %q, want the scraped address", p.BaseURL())
|
||||
}
|
||||
pid := p.cmd.Process.Pid
|
||||
|
||||
p.cancel = cancel
|
||||
if err := p.Close(); err != nil {
|
||||
t.Fatalf("Close: %v", err)
|
||||
}
|
||||
// Close must Wait, otherwise the child lingers as a zombie.
|
||||
if p.cmd.ProcessState == nil {
|
||||
t.Fatal("Close did not reap the child: ProcessState is nil")
|
||||
}
|
||||
if err := syscall.Kill(pid, 0); err == nil {
|
||||
t.Fatalf("child %d still exists after Close", pid)
|
||||
}
|
||||
}
|
||||
|
||||
func TestStartLlamaProcFailureArms(t *testing.T) {
|
||||
t.Run("binary missing", func(t *testing.T) {
|
||||
cfg := testCfg(filepath.Join(t.TempDir(), "does-not-exist"))
|
||||
_, err := startLlamaProc(context.Background(), cfg)
|
||||
if err == nil || !strings.Contains(err.Error(), "llm: start") {
|
||||
t.Fatalf("err = %v, want a start failure", err)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("server exits without listening", func(t *testing.T) {
|
||||
// stderr closes, so the reader goroutine reports EOF on errCh.
|
||||
bin := fakeLlama(t, `echo "ggml_vulkan: no device" >&2
|
||||
exit 1`)
|
||||
_, err := startLlamaProc(context.Background(), testCfg(bin))
|
||||
if err == nil || !strings.Contains(err.Error(), "llm: server output") {
|
||||
t.Fatalf("err = %v, want the server-output arm", err)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("startup timeout", func(t *testing.T) {
|
||||
// The 60s wait was a literal in the select, so this arm could only be
|
||||
// tested by waiting a real minute (Vikunja #323). It is Config now.
|
||||
//
|
||||
// The child records its pid, because startLlamaProc returns nil on
|
||||
// every failure arm and this is the arm where the child is alive and
|
||||
// busy loading a model rather than already dead.
|
||||
pidFile := filepath.Join(t.TempDir(), "pid")
|
||||
bin := fakeLlama(t, `echo $$ > `+pidFile+`
|
||||
while : ; do sleep 1 ; done`)
|
||||
cfg := testCfg(bin)
|
||||
cfg.StartupTimeout = 50 * time.Millisecond
|
||||
_, err := startLlamaProc(context.Background(), cfg)
|
||||
if err == nil || !strings.Contains(err.Error(), "did not start within") {
|
||||
t.Fatalf("err = %v, want the startup-timeout arm", err)
|
||||
}
|
||||
raw, readErr := os.ReadFile(pidFile)
|
||||
if readErr != nil {
|
||||
t.Fatalf("the child never ran: %v", readErr)
|
||||
}
|
||||
pid, convErr := strconv.Atoi(strings.TrimSpace(string(raw)))
|
||||
if convErr != nil {
|
||||
t.Fatalf("pid file %q: %v", raw, convErr)
|
||||
}
|
||||
if err := syscall.Kill(pid, 0); err == nil {
|
||||
t.Errorf("child %d survived the startup timeout", pid)
|
||||
}
|
||||
})
|
||||
|
||||
t.Run("context cancelled during startup", func(t *testing.T) {
|
||||
// Never prints the listen line and never exits: only ctx can end this.
|
||||
bin := fakeLlama(t, `while : ; do sleep 1 ; done`)
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
go func() {
|
||||
time.Sleep(150 * time.Millisecond)
|
||||
cancel()
|
||||
}()
|
||||
defer cancel()
|
||||
_, err := startLlamaProc(ctx, testCfg(bin))
|
||||
if !errors.Is(err, context.Canceled) {
|
||||
t.Fatalf("err = %v, want context.Canceled", err)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func TestNewLLMPhraserSpawns(t *testing.T) {
|
||||
bin := fakeLlama(t, listensThenSleeps)
|
||||
p, err := NewLLMPhraser(context.Background(), testCfg(bin))
|
||||
if err != nil {
|
||||
t.Fatalf("NewLLMPhraser: %v", err)
|
||||
}
|
||||
if p.BaseURL() != "http://127.0.0.1:18081" {
|
||||
t.Fatalf("BaseURL = %q", p.BaseURL())
|
||||
}
|
||||
pid := p.be.(*llamaProc).cmd.Process.Pid
|
||||
if err := p.Close(); err != nil {
|
||||
t.Fatalf("Close: %v", err)
|
||||
}
|
||||
if p.BaseURL() != "" {
|
||||
t.Fatalf("BaseURL after Close = %q, want empty", p.BaseURL())
|
||||
}
|
||||
if err := syscall.Kill(pid, 0); err == nil {
|
||||
t.Fatalf("llama-server %d survived Close", pid)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNewLLMPhraserSpawnFailure(t *testing.T) {
|
||||
cfg := testCfg(filepath.Join(t.TempDir(), "does-not-exist"))
|
||||
p, err := NewLLMPhraser(context.Background(), cfg)
|
||||
if err == nil {
|
||||
p.Close()
|
||||
t.Fatal("want an error when the server cannot start")
|
||||
}
|
||||
if p != nil {
|
||||
t.Fatalf("want a nil phraser on failure, got %#v", p)
|
||||
}
|
||||
}
|
||||
|
||||
// TestPdeathsigKillsOrphan is the orphan test the task asked for. A SIGKILLed
|
||||
// mavend never runs Close, so nothing but the kernel's Pdeathsig can stop its
|
||||
// llama-server. Re-exec this test binary as the "daemon", let it spawn the fake
|
||||
// server, SIGKILL the daemon, and assert the grandchild died with it.
|
||||
func TestPdeathsigKillsOrphan(t *testing.T) {
|
||||
bin := fakeLlama(t, listensThenSleeps)
|
||||
|
||||
cmd := exec.Command(os.Args[0], "-test.run=TestSpawnHelperProcess", "-test.v=false")
|
||||
cmd.Env = append(os.Environ(), "MAVEN_SPAWN_HELPER=1", "MAVEN_FAKE_LLAMA="+bin)
|
||||
out, err := cmd.StdoutPipe()
|
||||
if err != nil {
|
||||
t.Fatalf("stdout pipe: %v", err)
|
||||
}
|
||||
if err := cmd.Start(); err != nil {
|
||||
t.Fatalf("start helper: %v", err)
|
||||
}
|
||||
defer func() { _ = cmd.Process.Kill(); _ = cmd.Wait() }()
|
||||
|
||||
buf := make([]byte, 256)
|
||||
n, err := out.Read(buf)
|
||||
if err != nil {
|
||||
t.Fatalf("read child pid: %v", err)
|
||||
}
|
||||
childPID, err := strconv.Atoi(strings.TrimSpace(string(buf[:n])))
|
||||
if err != nil {
|
||||
t.Fatalf("helper printed %q, want a pid: %v", string(buf[:n]), err)
|
||||
}
|
||||
if err := syscall.Kill(childPID, 0); err != nil {
|
||||
t.Fatalf("llama-server %d not running before the kill: %v", childPID, err)
|
||||
}
|
||||
|
||||
// SIGKILL: the helper gets no chance to clean up, exactly like an OOM kill.
|
||||
if err := cmd.Process.Signal(syscall.SIGKILL); err != nil {
|
||||
t.Fatalf("kill helper: %v", err)
|
||||
}
|
||||
_, _ = cmd.Process.Wait()
|
||||
|
||||
deadline := time.Now().Add(5 * time.Second)
|
||||
for time.Now().Before(deadline) {
|
||||
if err := syscall.Kill(childPID, 0); err != nil {
|
||||
return // gone: Pdeathsig did its job
|
||||
}
|
||||
time.Sleep(20 * time.Millisecond)
|
||||
}
|
||||
_ = syscall.Kill(childPID, syscall.SIGKILL)
|
||||
t.Fatalf("llama-server %d outlived the SIGKILLed parent", childPID)
|
||||
}
|
||||
|
||||
// TestSpawnHelperProcess is not a test. It is the child half of
|
||||
// TestPdeathsigKillsOrphan: spawn a llama-server, print its pid, then block.
|
||||
func TestSpawnHelperProcess(t *testing.T) {
|
||||
if os.Getenv("MAVEN_SPAWN_HELPER") != "1" {
|
||||
t.Skip("helper for TestPdeathsigKillsOrphan")
|
||||
}
|
||||
cfg := testCfg(os.Getenv("MAVEN_FAKE_LLAMA"))
|
||||
p, err := startLlamaProc(context.Background(), cfg)
|
||||
if err != nil {
|
||||
fmt.Println("spawn failed:", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
fmt.Println(p.cmd.Process.Pid)
|
||||
os.Stdout.Sync()
|
||||
select {} // wait to be killed
|
||||
}
|
||||
|
||||
// TestKillMavenScriptMatchesRealCommandLine pins kill-maven.sh's fallback
|
||||
// pattern to the command line startLlamaProc actually builds. The script leaked
|
||||
// orphans twice already, both times because the pattern stopped matching: first
|
||||
// `llama-server.*maven`, then a hardcoded model name after the model was swapped.
|
||||
func TestKillMavenScriptMatchesRealCommandLine(t *testing.T) {
|
||||
src, err := os.ReadFile("../../kill-maven.sh")
|
||||
if err != nil {
|
||||
t.Fatalf("read kill-maven.sh: %v", err)
|
||||
}
|
||||
m := regexp.MustCompile(`(?m)^\s*LLM='([^']+)'`).FindSubmatch(src)
|
||||
if m == nil {
|
||||
t.Fatal("no default LLM='...' pattern in kill-maven.sh")
|
||||
}
|
||||
pat, err := regexp.Compile(string(m[1]))
|
||||
if err != nil {
|
||||
t.Fatalf("LLM pattern %q does not compile: %v", m[1], err)
|
||||
}
|
||||
|
||||
// Rebuild the command line from the production arg list, so a change to
|
||||
// startLlamaProc that breaks the sweep fails here instead of on the box.
|
||||
cfg := DefaultConfig("/opt/maven/models/llm/Qwen3-1.7B-UD-Q4_K_XL.gguf")
|
||||
cfg.NCtx, cfg.NGpuLayers = 4096, 99
|
||||
cmdline := strings.Join([]string{
|
||||
cfg.BinPath,
|
||||
"-m", cfg.ModelPath,
|
||||
"--host", "127.0.0.1",
|
||||
"--port", extractPort(cfg.Listen),
|
||||
"-c", fmt.Sprintf("%d", cfg.NCtx),
|
||||
"-ngl", fmt.Sprintf("%d", cfg.NGpuLayers),
|
||||
"--no-webui",
|
||||
}, " ")
|
||||
if !pat.MatchString(cmdline) {
|
||||
t.Fatalf("kill-maven.sh pattern %q does not match %q — orphans would leak", m[1], cmdline)
|
||||
}
|
||||
}
|
||||
@@ -6,5 +6,5 @@ func KnowledgePrompt() string {
|
||||
// No self-introduction here: the shared persona block already says who she
|
||||
// is, and this line used to disagree with it — a different name ("Мавена")
|
||||
// and a masculine noun ("ассистент") in front of a feminine persona.
|
||||
return `Ответь кратко из своих знаний. Если не знаешь — скажи "не знаю". Не выдумывай. Respond ONLY with valid JSON: {"response": "...", "mood": "neutral"}.`
|
||||
return `Ответь кратко из своих знаний. Если не знаешь — скажи "не знаю". Не выдумывай. Отвечай ТОЛЬКО одним объектом JSON: {"response": "...", "mood": "neutral"}.`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user