mirror of
https://github.com/mudler/LocalAI.git
synced 2026-06-28 02:17:00 -04:00
* feat(distributed): add SyncedMap cross-replica in-memory state component Introduce core/services/syncstate.SyncedMap[K,V]: a thread-safe in-memory map that keeps itself consistent across frontend replicas via NATS, with an optional pluggable durable Store and hydrate-from-source convergence. Several features keep process-local state surfaced to the API (finetune/quant jobs, agent tasks, model configs) and each hand-wired the same in-memory + NATS broadcast + read-through-store legs - or forgot to, reintroducing cross-replica staleness. SyncedMap makes that consistency a configuration choice: - local writes mutate the map, write through the Store, then broadcast a delta; - the apply path is memory-only and never re-publishes or re-writes the Store (structural echo-loop guard, mirroring galleryop.mergeStatus); - on Start and on NATS reconnect the map re-hydrates from the source (Store, else Loader); an optional periodic Reconcile repairs silent drift; - standalone mode (nil NATS client) is a strict in-memory no-op. Reconnect re-hydrate is wired via a new *messaging.Client.OnReconnect callback, consumed through an optional type-assertion so MessagingClient stays minimal. Adds messaging.SubjectSyncStateDelta and a reusable testutil.FakeBus (synchronous in-process MessagingClient with wildcard matching) for adopter tests. Component only; service migrations follow in subsequent commits. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Assisted-by: Claude:claude-opus-4-8 [Claude Code] * refactor(finetune): back jobs with SyncedMap for cross-replica consistency FineTuneService kept jobs in a process-local map and, although it wrote them to Postgres, ListJobs/GetJob never read the store back and the wired natsClient was never used - so in distributed mode a job created on one replica was invisible to the others. Replace the map and the dead client with a syncstate.SyncedMap keyed by job ID, value *schema.FineTuneJob (the exact REST shape, so responses are unchanged). - Add a Store adapter (core/services/finetune/syncstore.go) over FineTuneStore, plus FineTuneStore.ListAll (global hydrate; per-user List kept) and an idempotent Upsert (create-or-update; Create alone fails on dup key). - Writes go through SyncedMap.Set/Delete (write-through + broadcast); reads use List/Get. The on-disk state.json path becomes the standalone Loader, keeping single-node restart recovery (stale->stopped / exporting->failed fixups). - Fold SetNATSClient/SetFineTuneStore into NewFineTuneService; app.go passes the distributed NATS client + store when distributed, nil otherwise. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Assisted-by: Claude:claude-opus-4-8 [Claude Code] * refactor(agentpool): back agent tasks with SyncedMap for cross-replica consistency AgentJobService.ListTasks read the process-local tasks map only, while ListJobs already read through the DB persister + dispatcher NATS - so in distributed mode a task created on one replica was invisible to the others. Back tasks with a syncstate.SyncedMap keyed by task ID (value schema.Task, the exact REST shape); jobs are left untouched. - Store adapter (task_syncstore.go) over the existing JobPersister (LoadTasks/SaveTask/DeleteTask); reads svc.persister/userID live so a persister swap needs no rebuild. No new persister methods required. - Task reads -> SyncedMap.List/Get; create/update -> Set (write-through + broadcast); delete -> Delete. The file persister now owns its own task set so the write-through path does not re-enter the SyncedMap lock (deadlock guard). - The distributed NATS client is not available at construction (start() precedes initDistributed), so it is injected via SetTaskSyncNATS, which rebuilds the still-empty map before Start/hydrate. Wired at the main, restart, and per-user (UserServicesManager) distributed sites. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Assisted-by: Claude:claude-opus-4-8 [Claude Code] * refactor(quantization): back jobs with SyncedMap + durable QuantStore QuantizationService kept jobs in a process-local map persisted only to a local state.json, so in distributed mode jobs were neither visible across replicas nor durable cluster-wide. Back jobs with a syncstate.SyncedMap keyed by job ID (value *schema.QuantizationJob, the exact REST shape). - New distributed.QuantStore (GORM, table quantization_jobs) mirroring FineTuneStore: Create/Get/ListAll/Upsert(idempotent)/Delete, registered for AutoMigrate via distributed.InitStores (Stores.Quant). - New adapter (quantization/syncstore.go) over QuantStore implementing syncstate.Store, with record<->schema conversion. - Reads go through List/Get, writes through Set/Delete (write-through + broadcast); state.json is kept as the standalone Loader for single-node restart recovery (stale-job fixups preserved). - app.go passes the distributed NATS client + QuantStore when distributed, nil otherwise; Start/Close lifecycle mirrors finetune. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Assisted-by: Claude:claude-opus-4-8 [Claude Code] * fix(syncstate): annotate gosec G118 false positive on lifeCtx gosec flagged the WithCancel in Start as "cancellation function not called" because the returned cancel is stored on the struct rather than called/deferred in scope. It is invoked in Close (covered by tests), and lifeCtx must outlive Start to drive the reconnect/reconcile goroutines. Suppress the verified false positive with a justified #nosec G118. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Assisted-by: Claude:claude-opus-4-8 [Claude Code] * test(distributed): e2e two-replica SyncedMap sync over real NATS + Postgres Adds the real-infrastructure counterpart to the fake-bus unit tests, in the existing distributed e2e suite (testcontainers NATS + PostgreSQL). Two SyncedMap instances stand in for two frontend replicas - each with its OWN NATS connection to a shared server and a SHARED Postgres store (the distributed-mode invariant) - and assert, over the wire: - a create on replica A is observed by replica B; - an update and a delete propagate A -> B (delete prunes, which a reload cannot); - a late-joining replica recovers a job it never received a delta for, via store hydrate on Start (the at-most-once gap a fake bus cannot exercise); - a local Set is written through to the shared Postgres store. Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Assisted-by: Claude:claude-opus-4-8 [Claude Code] --------- Signed-off-by: Ettore Di Giacinto <mudler@localai.io> Co-authored-by: Ettore Di Giacinto <mudler@localai.io>
115 lines
3.7 KiB
Go
115 lines
3.7 KiB
Go
package quantization
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/mudler/LocalAI/core/schema"
|
|
"github.com/mudler/LocalAI/core/services/distributed"
|
|
"github.com/mudler/LocalAI/core/services/syncstate"
|
|
)
|
|
|
|
// quantStoreAdapter bridges the distributed PostgreSQL QuantStore to the generic
|
|
// syncstate.Store the SyncedMap consumes. It is only wired in distributed mode;
|
|
// standalone leaves Store nil and hydrates from disk via a Loader instead.
|
|
//
|
|
// The SyncedMap value type is *schema.QuantizationJob (the exact shape the REST
|
|
// API returns) so reads need no conversion and the response JSON is provably
|
|
// unchanged. The adapter is the single place that translates between that API
|
|
// shape and the DB QuantJobRecord.
|
|
type quantStoreAdapter struct {
|
|
store *distributed.QuantStore
|
|
}
|
|
|
|
// compile-time assertion that the adapter satisfies the component's Store.
|
|
var _ syncstate.Store[string, *schema.QuantizationJob] = (*quantStoreAdapter)(nil)
|
|
|
|
func (a *quantStoreAdapter) List(_ context.Context) ([]*schema.QuantizationJob, error) {
|
|
records, err := a.store.ListAll()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
jobs := make([]*schema.QuantizationJob, 0, len(records))
|
|
for i := range records {
|
|
jobs = append(jobs, recordToJob(&records[i]))
|
|
}
|
|
return jobs, nil
|
|
}
|
|
|
|
func (a *quantStoreAdapter) Upsert(_ context.Context, job *schema.QuantizationJob) error {
|
|
return a.store.Upsert(jobToRecord(job))
|
|
}
|
|
|
|
func (a *quantStoreAdapter) Delete(_ context.Context, id string) error {
|
|
return a.store.Delete(id)
|
|
}
|
|
|
|
// recordToJob maps a persisted DB record back to the API shape, reconstructing
|
|
// the structured Config / ExtraOptions from their JSON columns.
|
|
func recordToJob(r *distributed.QuantJobRecord) *schema.QuantizationJob {
|
|
job := &schema.QuantizationJob{
|
|
ID: r.ID,
|
|
UserID: r.UserID,
|
|
Model: r.Model,
|
|
Backend: r.Backend,
|
|
ModelID: r.ModelID,
|
|
QuantizationType: r.QuantizationType,
|
|
Status: r.Status,
|
|
Message: r.Message,
|
|
OutputDir: r.OutputDir,
|
|
OutputFile: r.OutputFile,
|
|
ImportStatus: r.ImportStatus,
|
|
ImportMessage: r.ImportMessage,
|
|
ImportModelName: r.ImportModelName,
|
|
CreatedAt: r.CreatedAt.UTC().Format(time.RFC3339),
|
|
}
|
|
if r.ExtraOptsJSON != "" {
|
|
// Best-effort: a malformed column must not drop the whole job from the API.
|
|
_ = json.Unmarshal([]byte(r.ExtraOptsJSON), &job.ExtraOptions)
|
|
}
|
|
if r.ConfigJSON != "" {
|
|
var cfg schema.QuantizationJobRequest
|
|
if err := json.Unmarshal([]byte(r.ConfigJSON), &cfg); err == nil {
|
|
job.Config = &cfg
|
|
}
|
|
}
|
|
return job
|
|
}
|
|
|
|
// jobToRecord maps the API shape to a DB record for write-through, serializing
|
|
// the structured Config / ExtraOptions into their JSON columns. CreatedAt is
|
|
// parsed back from the RFC3339 string the service stamps; an unparseable value is
|
|
// left zero so QuantStore.Upsert stamps "now".
|
|
func jobToRecord(job *schema.QuantizationJob) *distributed.QuantJobRecord {
|
|
rec := &distributed.QuantJobRecord{
|
|
ID: job.ID,
|
|
UserID: job.UserID,
|
|
Model: job.Model,
|
|
Backend: job.Backend,
|
|
ModelID: job.ModelID,
|
|
QuantizationType: job.QuantizationType,
|
|
Status: job.Status,
|
|
Message: job.Message,
|
|
OutputDir: job.OutputDir,
|
|
OutputFile: job.OutputFile,
|
|
ImportStatus: job.ImportStatus,
|
|
ImportMessage: job.ImportMessage,
|
|
ImportModelName: job.ImportModelName,
|
|
}
|
|
if job.Config != nil {
|
|
if data, err := json.Marshal(job.Config); err == nil {
|
|
rec.ConfigJSON = string(data)
|
|
}
|
|
}
|
|
if job.ExtraOptions != nil {
|
|
if data, err := json.Marshal(job.ExtraOptions); err == nil {
|
|
rec.ExtraOptsJSON = string(data)
|
|
}
|
|
}
|
|
if t, err := time.Parse(time.RFC3339, job.CreatedAt); err == nil {
|
|
rec.CreatedAt = t
|
|
}
|
|
return rec
|
|
}
|