mirror/LocalAI
1
0
Fork 0
mirror of https://github.com/mudler/LocalAI.git synced 2026-03-31 13:15:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid race condition

Browse Source 
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
This commit is contained in:
Ettore Di Giacinto
2026-03-12 18:46:22 +00:00
parent 13bd0d9944
commit 6c11c54a3b
3 changed files with 72 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/application/application.go
View File

@@ -3,6 +3,7 @@ package application
import (
"context"
"sync"
"sync/atomic"
"github.com/mudler/LocalAI/core/config"
mcpTools "github.com/mudler/LocalAI/core/http/endpoints/mcp"
@@ -20,7 +21,7 @@ type Application struct {
templatesEvaluator *templates.Evaluator
galleryService *services.GalleryService
agentJobService *services.AgentJobService
agentPoolService *services.AgentPoolService
agentPoolService atomic.Pointer[services.AgentPoolService]
watchdogMutex sync.Mutex
watchdogStop chan bool
p2pMutex sync.Mutex
@@ -70,7 +71,7 @@ func (a *Application) AgentJobService() *services.AgentJobService {
}
func (a *Application) AgentPoolService() *services.AgentPoolService {
return a.agentPoolService
return a.agentPoolService.Load()
}
// StartupConfig returns the original startup configuration (from env vars, before file loading)
@@ -121,5 +122,5 @@ func (a *Application) StartAgentPool() {
xlog.Error("Failed to start agent pool", "error", err)
return
}
a.agentPoolService = aps
a.agentPoolService.Store(aps)
}

119
core/http/routes/agents.go
View File

@@ -1,74 +1,89 @@
package routes
import (
"net/http"
"github.com/labstack/echo/v4"
"github.com/mudler/LocalAI/core/application"
"github.com/mudler/LocalAI/core/http/endpoints/localai"
)
func RegisterAgentPoolRoutes(e *echo.Echo, app *application.Application) {
if app.AgentPoolService() == nil {
if !app.ApplicationConfig().AgentPool.Enabled {
return
}
// Group all agent routes behind a middleware that returns 503 while the
// agent pool is still initializing (it starts after the HTTP server).
g := e.Group("/api/agents", func(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
if app.AgentPoolService() == nil {
return c.JSON(http.StatusServiceUnavailable, map[string]string{
"error": "agent pool is starting, please retry shortly",
})
}
return next(c)
}
})
// Agent Management
e.GET("/api/agents", localai.ListAgentsEndpoint(app))
e.POST("/api/agents", localai.CreateAgentEndpoint(app))
e.GET("/api/agents/config/metadata", localai.GetAgentConfigMetaEndpoint(app))
e.POST("/api/agents/import", localai.ImportAgentEndpoint(app))
e.GET("/api/agents/:name", localai.GetAgentEndpoint(app))
e.PUT("/api/agents/:name", localai.UpdateAgentEndpoint(app))
e.DELETE("/api/agents/:name", localai.DeleteAgentEndpoint(app))
e.GET("/api/agents/:name/config", localai.GetAgentConfigEndpoint(app))
e.PUT("/api/agents/:name/pause", localai.PauseAgentEndpoint(app))
e.PUT("/api/agents/:name/resume", localai.ResumeAgentEndpoint(app))
e.GET("/api/agents/:name/status", localai.GetAgentStatusEndpoint(app))
e.GET("/api/agents/:name/observables", localai.GetAgentObservablesEndpoint(app))
e.DELETE("/api/agents/:name/observables", localai.ClearAgentObservablesEndpoint(app))
e.POST("/api/agents/:name/chat", localai.ChatWithAgentEndpoint(app))
e.GET("/api/agents/:name/sse", localai.AgentSSEEndpoint(app))
e.GET("/api/agents/:name/export", localai.ExportAgentEndpoint(app))
e.GET("/api/agents/:name/files", localai.AgentFileEndpoint(app))
g.GET("", localai.ListAgentsEndpoint(app))
g.POST("", localai.CreateAgentEndpoint(app))
g.GET("/config/metadata", localai.GetAgentConfigMetaEndpoint(app))
g.POST("/import", localai.ImportAgentEndpoint(app))
g.GET("/:name", localai.GetAgentEndpoint(app))
g.PUT("/:name", localai.UpdateAgentEndpoint(app))
g.DELETE("/:name", localai.DeleteAgentEndpoint(app))
g.GET("/:name/config", localai.GetAgentConfigEndpoint(app))
g.PUT("/:name/pause", localai.PauseAgentEndpoint(app))
g.PUT("/:name/resume", localai.ResumeAgentEndpoint(app))
g.GET("/:name/status", localai.GetAgentStatusEndpoint(app))
g.GET("/:name/observables", localai.GetAgentObservablesEndpoint(app))
g.DELETE("/:name/observables", localai.ClearAgentObservablesEndpoint(app))
g.POST("/:name/chat", localai.ChatWithAgentEndpoint(app))
g.GET("/:name/sse", localai.AgentSSEEndpoint(app))
g.GET("/:name/export", localai.ExportAgentEndpoint(app))
g.GET("/:name/files", localai.AgentFileEndpoint(app))
// Actions
e.GET("/api/agents/actions", localai.ListActionsEndpoint(app))
e.POST("/api/agents/actions/:name/definition", localai.GetActionDefinitionEndpoint(app))
e.POST("/api/agents/actions/:name/run", localai.ExecuteActionEndpoint(app))
g.GET("/actions", localai.ListActionsEndpoint(app))
g.POST("/actions/:name/definition", localai.GetActionDefinitionEndpoint(app))
g.POST("/actions/:name/run", localai.ExecuteActionEndpoint(app))
// Skills
e.GET("/api/agents/skills", localai.ListSkillsEndpoint(app))
e.GET("/api/agents/skills/config", localai.GetSkillsConfigEndpoint(app))
e.GET("/api/agents/skills/search", localai.SearchSkillsEndpoint(app))
e.POST("/api/agents/skills", localai.CreateSkillEndpoint(app))
e.GET("/api/agents/skills/export/*", localai.ExportSkillEndpoint(app))
e.POST("/api/agents/skills/import", localai.ImportSkillEndpoint(app))
e.GET("/api/agents/skills/:name", localai.GetSkillEndpoint(app))
e.PUT("/api/agents/skills/:name", localai.UpdateSkillEndpoint(app))
e.DELETE("/api/agents/skills/:name", localai.DeleteSkillEndpoint(app))
e.GET("/api/agents/skills/:name/resources", localai.ListSkillResourcesEndpoint(app))
e.GET("/api/agents/skills/:name/resources/*", localai.GetSkillResourceEndpoint(app))
e.POST("/api/agents/skills/:name/resources", localai.CreateSkillResourceEndpoint(app))
e.PUT("/api/agents/skills/:name/resources/*", localai.UpdateSkillResourceEndpoint(app))
e.DELETE("/api/agents/skills/:name/resources/*", localai.DeleteSkillResourceEndpoint(app))
g.GET("/skills", localai.ListSkillsEndpoint(app))
g.GET("/skills/config", localai.GetSkillsConfigEndpoint(app))
g.GET("/skills/search", localai.SearchSkillsEndpoint(app))
g.POST("/skills", localai.CreateSkillEndpoint(app))
g.GET("/skills/export/*", localai.ExportSkillEndpoint(app))
g.POST("/skills/import", localai.ImportSkillEndpoint(app))
g.GET("/skills/:name", localai.GetSkillEndpoint(app))
g.PUT("/skills/:name", localai.UpdateSkillEndpoint(app))
g.DELETE("/skills/:name", localai.DeleteSkillEndpoint(app))
g.GET("/skills/:name/resources", localai.ListSkillResourcesEndpoint(app))
g.GET("/skills/:name/resources/*", localai.GetSkillResourceEndpoint(app))
g.POST("/skills/:name/resources", localai.CreateSkillResourceEndpoint(app))
g.PUT("/skills/:name/resources/*", localai.UpdateSkillResourceEndpoint(app))
g.DELETE("/skills/:name/resources/*", localai.DeleteSkillResourceEndpoint(app))
// Git Repos
e.GET("/api/agents/git-repos", localai.ListGitReposEndpoint(app))
e.POST("/api/agents/git-repos", localai.AddGitRepoEndpoint(app))
e.PUT("/api/agents/git-repos/:id", localai.UpdateGitRepoEndpoint(app))
e.DELETE("/api/agents/git-repos/:id", localai.DeleteGitRepoEndpoint(app))
e.POST("/api/agents/git-repos/:id/sync", localai.SyncGitRepoEndpoint(app))
e.POST("/api/agents/git-repos/:id/toggle", localai.ToggleGitRepoEndpoint(app))
g.GET("/git-repos", localai.ListGitReposEndpoint(app))
g.POST("/git-repos", localai.AddGitRepoEndpoint(app))
g.PUT("/git-repos/:id", localai.UpdateGitRepoEndpoint(app))
g.DELETE("/git-repos/:id", localai.DeleteGitRepoEndpoint(app))
g.POST("/git-repos/:id/sync", localai.SyncGitRepoEndpoint(app))
g.POST("/git-repos/:id/toggle", localai.ToggleGitRepoEndpoint(app))
// Collections / Knowledge Base
e.GET("/api/agents/collections", localai.ListCollectionsEndpoint(app))
e.POST("/api/agents/collections", localai.CreateCollectionEndpoint(app))
e.POST("/api/agents/collections/:name/upload", localai.UploadToCollectionEndpoint(app))
e.GET("/api/agents/collections/:name/entries", localai.ListCollectionEntriesEndpoint(app))
e.GET("/api/agents/collections/:name/entries/*", localai.GetCollectionEntryContentEndpoint(app))
e.POST("/api/agents/collections/:name/search", localai.SearchCollectionEndpoint(app))
e.POST("/api/agents/collections/:name/reset", localai.ResetCollectionEndpoint(app))
e.DELETE("/api/agents/collections/:name/entry/delete", localai.DeleteCollectionEntryEndpoint(app))
e.POST("/api/agents/collections/:name/sources", localai.AddCollectionSourceEndpoint(app))
e.DELETE("/api/agents/collections/:name/sources", localai.RemoveCollectionSourceEndpoint(app))
e.GET("/api/agents/collections/:name/sources", localai.ListCollectionSourcesEndpoint(app))
g.GET("/collections", localai.ListCollectionsEndpoint(app))
g.POST("/collections", localai.CreateCollectionEndpoint(app))
g.POST("/collections/:name/upload", localai.UploadToCollectionEndpoint(app))
g.GET("/collections/:name/entries", localai.ListCollectionEntriesEndpoint(app))
g.GET("/collections/:name/entries/*", localai.GetCollectionEntryContentEndpoint(app))
g.POST("/collections/:name/search", localai.SearchCollectionEndpoint(app))
g.POST("/collections/:name/reset", localai.ResetCollectionEndpoint(app))
g.DELETE("/collections/:name/entry/delete", localai.DeleteCollectionEntryEndpoint(app))
g.POST("/collections/:name/sources", localai.AddCollectionSourceEndpoint(app))
g.DELETE("/collections/:name/sources", localai.RemoveCollectionSourceEndpoint(app))
g.GET("/collections/:name/sources", localai.ListCollectionSourcesEndpoint(app))
}

2
core/http/routes/localai.go
View File

@@ -131,7 +131,7 @@ func RegisterLocalAIRoutes(router *echo.Echo,
router.GET("/api/features", func(c echo.Context) error {
return c.JSON(200, map[string]bool{
"agents": app.AgentPoolService() != nil,
"agents": appConfig.AgentPool.Enabled,
"mcp": !appConfig.DisableMCP,
})
})