reordering

core/action/custom.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/traefik/yaegi/interp"
 	"github.com/traefik/yaegi/stdlib"

core/action/custom_test.go

@@ -3,7 +3,7 @@ package action_test
 import (
 	"context"
 
-	. "github.com/mudler/local-agent-framework/action"
+	. "github.com/mudler/local-agent-framework/core/action"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 

core/agent/actions.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"github.com/sashabaranov/go-openai"
 )

core/agent/agent.go

@@ -8,10 +8,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/llm"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/llm"
 	"github.com/sashabaranov/go-openai"
 )
 

core/agent/agent_test.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	"github.com/mudler/local-agent-framework/action"
-	. "github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/action"
+	. "github.com/mudler/local-agent-framework/core/agent"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/sashabaranov/go-openai/jsonschema"

core/agent/state.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/llm"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/llm"
 )
 
 // PromptHUD contains

core/agent/state_test.go

@@ -1,7 +1,7 @@
 package agent_test
 
 import (
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )

core/agent/templates.go

@@ -5,7 +5,7 @@ import (
 	"html/template"
 	"time"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai"
 )
 

example/webui/actions.go

@@ -4,11 +4,11 @@ import (
 	"context"
 	"encoding/json"
 
-	"github.com/mudler/local-agent-framework/action"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/action"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	. "github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/external"
+	. "github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/services/actions"
 )
 
 const (
@@ -39,7 +39,7 @@ var AvailableActions = []string{
 }
 
 func (a *AgentConfig) availableActions(ctx context.Context) []Action {
-	actions := []Action{}
+	allActions := []Action{}
 
 	for _, a := range a.Actions {
 		var config map[string]string
@@ -55,27 +55,27 @@ func (a *AgentConfig) availableActions(ctx context.Context) []Action {
 				xlog.Error("Error creating custom action", "error", err)
 				continue
 			}
-			actions = append(actions, customAction)
+			allActions = append(allActions, customAction)
 		case ActionSearch:
-			actions = append(actions, external.NewSearch(config))
+			allActions = append(allActions, actions.NewSearch(config))
 		case ActionGithubIssueLabeler:
-			actions = append(actions, external.NewGithubIssueLabeler(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueLabeler(ctx, config))
 		case ActionGithubIssueOpener:
-			actions = append(actions, external.NewGithubIssueOpener(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueOpener(ctx, config))
 		case ActionGithubIssueCloser:
-			actions = append(actions, external.NewGithubIssueCloser(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueCloser(ctx, config))
 		case ActionGithubIssueSearcher:
-			actions = append(actions, external.NewGithubIssueSearch(ctx, config))
+			allActions = append(allActions, actions.NewGithubIssueSearch(ctx, config))
 		case ActionScraper:
-			actions = append(actions, external.NewScraper(config))
+			allActions = append(allActions, actions.NewScraper(config))
 		case ActionWikipedia:
-			actions = append(actions, external.NewWikipedia(config))
+			allActions = append(allActions, actions.NewWikipedia(config))
 		case ActionBrowse:
-			actions = append(actions, external.NewBrowse(config))
+			allActions = append(allActions, actions.NewBrowse(config))
 		case ActionSendMail:
-			actions = append(actions, external.NewSendMail(config))
+			allActions = append(allActions, actions.NewSendMail(config))
 		}
 	}
 
-	return actions
+	return allActions
 }

example/webui/agentpool.go

@@ -10,10 +10,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 )
 
 type AgentPool struct {

example/webui/app.go

@@ -8,9 +8,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 
 	"github.com/donseba/go-htmx"
 	"github.com/dslipak/pdf"

example/webui/connectors.go

@@ -3,11 +3,10 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
+	"github.com/mudler/local-agent-framework/services/connectors"
 
-	. "github.com/mudler/local-agent-framework/agent"
-
-	"github.com/mudler/local-agent-framework/example/webui/connector"
+	. "github.com/mudler/local-agent-framework/core/agent"
 )
 
 const (
@@ -34,7 +33,7 @@ var AvailableConnectors = []string{
 }
 
 func (a *AgentConfig) availableConnectors() []Connector {
-	connectors := []Connector{}
+	conns := []Connector{}
 
 	for _, c := range a.Connector {
 		var config map[string]string
@@ -44,22 +43,22 @@ func (a *AgentConfig) availableConnectors() []Connector {
 		}
 		switch c.Type {
 		case ConnectorTelegram:
-			cc, err := connector.NewTelegramConnector(config)
+			cc, err := connectors.NewTelegramConnector(config)
 			if err != nil {
 				xlog.Info("Error creating telegram connector", err)
 				continue
 			}
 
-			connectors = append(connectors, cc)
+			conns = append(conns, cc)
 		case ConnectorSlack:
-			connectors = append(connectors, connector.NewSlack(config))
+			conns = append(conns, connectors.NewSlack(config))
 		case ConnectorDiscord:
-			connectors = append(connectors, connector.NewDiscord(config))
+			conns = append(conns, connectors.NewDiscord(config))
 		case ConnectorGithubIssues:
-			connectors = append(connectors, connector.NewGithubIssueWatcher(config))
+			conns = append(conns, connectors.NewGithubIssueWatcher(config))
 		case ConnectorGithubPRs:
-			connectors = append(connectors, connector.NewGithubPRWatcher(config))
+			conns = append(conns, connectors.NewGithubPRWatcher(config))
 		}
 	}
-	return connectors
+	return conns
 }

example/webui/main.go

@@ -10,9 +10,9 @@ import (
 	fiber "github.com/gofiber/fiber/v2"
 	"github.com/gofiber/template/html/v2"
 
-	. "github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/llm"
-	"github.com/mudler/local-agent-framework/llm/rag"
+	. "github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/llm"
+	"github.com/mudler/local-agent-framework/pkg/llm/rag"
 )
 
 var testModel = os.Getenv("TEST_MODEL")

example/webui/rag.go

@@ -5,14 +5,14 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"net/http"
 	"os"
 	"strings"
 	"sync"
 
-	. "github.com/mudler/local-agent-framework/agent"
+	. "github.com/mudler/local-agent-framework/core/agent"
 	"jaytaylor.com/html2text"
 
 	sitemap "github.com/oxffaa/gopher-parse-sitemap"

example/webui/routes.go

@@ -6,7 +6,7 @@ import (
 
 	fiber "github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/filesystem"
-	"github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/agent"
 )
 
 func RegisterRoutes(webapp *fiber.App, pool *AgentPool, app *App) {

services/actions/browse.go

@@ -1,4 +1,4 @@
-package external
+package actions
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"jaytaylor.com/html2text"
 )

services/actions/githubissuecloser.go

@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 

services/actions/githubissuelabeler.go

@@ -1,4 +1,4 @@
-package external
+package actions
 
 import (
 	"context"
@@ -7,7 +7,7 @@ import (
 	"strings"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 

services/actions/githubissueopener.go

@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 

services/actions/githubissuesearch.go

@@ -1,4 +1,4 @@
-package external
+package actions
 
 import (
 	"context"
@@ -6,7 +6,7 @@ import (
 	"log/slog"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 

services/actions/scrape.go

@@ -1,10 +1,10 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/tmc/langchaingo/tools/scraper"
 )

services/actions/search.go

@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 	"log/slog"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/tmc/langchaingo/tools/duckduckgo"
 )

services/actions/sendmail.go

@@ -1,11 +1,11 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 	"net/smtp"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 )
 

services/actions/wikipedia.go

@@ -1,10 +1,10 @@
-package external
+package actions
 
 import (
 	"context"
 	"fmt"
 
-	"github.com/mudler/local-agent-framework/action"
+	"github.com/mudler/local-agent-framework/core/action"
 	"github.com/sashabaranov/go-openai/jsonschema"
 	"github.com/tmc/langchaingo/tools/wikipedia"
 )

services/connectors/discord.go

@@ -1,11 +1,11 @@
-package connector
+package connectors
 
 import (
 	"strings"
 
 	"github.com/bwmarrin/discordgo"
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 )
 
 type Discord struct {

services/connectors/githubissue.go

@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"fmt"
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"github.com/sashabaranov/go-openai"
 )

services/connectors/githubpr.go

@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"fmt"
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/google/go-github/v61/github"
-	"github.com/mudler/local-agent-framework/agent"
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/core/agent"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
 	"github.com/sashabaranov/go-openai"
 )

services/connectors/slack.go

@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"fmt"
@@ -6,9 +6,9 @@ import (
 	"os"
 	"strings"
 
-	"github.com/mudler/local-agent-framework/xlog"
+	"github.com/mudler/local-agent-framework/pkg/xlog"
 
-	"github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/agent"
 
 	"github.com/slack-go/slack/socketmode"
 

services/connectors/telegram.go

@@ -1,4 +1,4 @@
-package connector
+package connectors
 
 import (
 	"context"
@@ -8,7 +8,7 @@ import (
 
 	"github.com/go-telegram/bot"
 	"github.com/go-telegram/bot/models"
-	"github.com/mudler/local-agent-framework/agent"
+	"github.com/mudler/local-agent-framework/core/agent"
 )
 
 type Telegram struct {