mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-27 07:16:19 +09:00
feat: refactor User/Bot architecture and implement multi-channel gateway
Major changes: 1. Core Architecture: Decoupled Bots from Users. Bots now have independent lifecycles, member management (bot_members), and dedicated configurations. 2. Channel Gateway: - Implemented a unified Channel Manager supporting Feishu, Telegram, and Local (Web/CLI) adapters. - Added message processing pipeline to normalize interactions across different platforms. - Introduced a Contact system for identity binding and guest access policies. 3. Database & Tooling: - Consolidated all migrations into 0001_init with updated schema for bots, channels, and contacts. - Optimized sqlc.yaml to automatically track the migrations directory. 4. Agent Enhancements: - Introduced ToolContext to provide Agents with platform-aware execution capabilities (e.g., messaging, contact lookups). - Added tool logging and fallback mechanisms for toolChoice execution. 5. UI & Docs: Updated frontend stores, UI components, and Swagger documentation to align with the new Bot-centric model.
This commit is contained in:
@@ -87,7 +87,7 @@ func (s *Service) Upsert(ctx context.Context, userID string, req UpsertRequest)
|
||||
current.Language = strings.TrimSpace(req.Language)
|
||||
}
|
||||
|
||||
_, err = s.queries.UpsertSettings(ctx, sqlc.UpsertSettingsParams{
|
||||
_, err = s.queries.UpsertUserSettings(ctx, sqlc.UpsertUserSettingsParams{
|
||||
UserID: pgID,
|
||||
ChatModelID: pgtype.Text{String: current.ChatModelID, Valid: current.ChatModelID != ""},
|
||||
MemoryModelID: pgtype.Text{String: current.MemoryModelID, Valid: current.MemoryModelID != ""},
|
||||
@@ -101,15 +101,77 @@ func (s *Service) Upsert(ctx context.Context, userID string, req UpsertRequest)
|
||||
return current, nil
|
||||
}
|
||||
|
||||
func (s *Service) Delete(ctx context.Context, userID string) error {
|
||||
func (s *Service) GetBot(ctx context.Context, botID string) (Settings, error) {
|
||||
pgID, err := parseUUID(botID)
|
||||
if err != nil {
|
||||
return Settings{}, err
|
||||
}
|
||||
row, err := s.queries.GetSettingsByBotID(ctx, pgID)
|
||||
if err != nil {
|
||||
if errors.Is(err, pgx.ErrNoRows) {
|
||||
return Settings{
|
||||
MaxContextLoadTime: DefaultMaxContextLoadTime,
|
||||
Language: DefaultLanguage,
|
||||
AllowGuest: false,
|
||||
}, nil
|
||||
}
|
||||
return Settings{}, err
|
||||
}
|
||||
return normalizeBotSetting(row), nil
|
||||
}
|
||||
|
||||
func (s *Service) UpsertBot(ctx context.Context, botID string, req UpsertRequest) (Settings, error) {
|
||||
if s.queries == nil {
|
||||
return Settings{}, fmt.Errorf("settings queries not configured")
|
||||
}
|
||||
pgID, err := parseUUID(botID)
|
||||
if err != nil {
|
||||
return Settings{}, err
|
||||
}
|
||||
|
||||
current := Settings{
|
||||
MaxContextLoadTime: DefaultMaxContextLoadTime,
|
||||
Language: DefaultLanguage,
|
||||
AllowGuest: false,
|
||||
}
|
||||
existing, err := s.queries.GetSettingsByBotID(ctx, pgID)
|
||||
if err != nil && !errors.Is(err, pgx.ErrNoRows) {
|
||||
return Settings{}, err
|
||||
}
|
||||
if err == nil {
|
||||
current = normalizeBotSetting(existing)
|
||||
}
|
||||
if req.MaxContextLoadTime != nil && *req.MaxContextLoadTime > 0 {
|
||||
current.MaxContextLoadTime = *req.MaxContextLoadTime
|
||||
}
|
||||
if strings.TrimSpace(req.Language) != "" {
|
||||
current.Language = strings.TrimSpace(req.Language)
|
||||
}
|
||||
if req.AllowGuest != nil {
|
||||
current.AllowGuest = *req.AllowGuest
|
||||
}
|
||||
|
||||
_, err = s.queries.UpsertBotSettings(ctx, sqlc.UpsertBotSettingsParams{
|
||||
BotID: pgID,
|
||||
MaxContextLoadTime: int32(current.MaxContextLoadTime),
|
||||
Language: current.Language,
|
||||
AllowGuest: current.AllowGuest,
|
||||
})
|
||||
if err != nil {
|
||||
return Settings{}, err
|
||||
}
|
||||
return current, nil
|
||||
}
|
||||
|
||||
func (s *Service) Delete(ctx context.Context, botID string) error {
|
||||
if s.queries == nil {
|
||||
return fmt.Errorf("settings queries not configured")
|
||||
}
|
||||
pgID, err := parseUUID(userID)
|
||||
pgID, err := parseUUID(botID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return s.queries.DeleteSettingsByUserID(ctx, pgID)
|
||||
return s.queries.DeleteSettingsByBotID(ctx, pgID)
|
||||
}
|
||||
|
||||
func normalizeUserSetting(row sqlc.UserSetting) Settings {
|
||||
@@ -129,6 +191,21 @@ func normalizeUserSetting(row sqlc.UserSetting) Settings {
|
||||
return settings
|
||||
}
|
||||
|
||||
func normalizeBotSetting(row sqlc.BotSetting) Settings {
|
||||
settings := Settings{
|
||||
MaxContextLoadTime: int(row.MaxContextLoadTime),
|
||||
Language: strings.TrimSpace(row.Language),
|
||||
AllowGuest: row.AllowGuest,
|
||||
}
|
||||
if settings.MaxContextLoadTime <= 0 {
|
||||
settings.MaxContextLoadTime = DefaultMaxContextLoadTime
|
||||
}
|
||||
if settings.Language == "" {
|
||||
settings.Language = DefaultLanguage
|
||||
}
|
||||
return settings
|
||||
}
|
||||
|
||||
func parseUUID(id string) (pgtype.UUID, error) {
|
||||
parsed, err := uuid.Parse(id)
|
||||
if err != nil {
|
||||
|
||||
@@ -11,6 +11,7 @@ type Settings struct {
|
||||
EmbeddingModelID string `json:"embedding_model_id"`
|
||||
MaxContextLoadTime int `json:"max_context_load_time"`
|
||||
Language string `json:"language"`
|
||||
AllowGuest bool `json:"allow_guest"`
|
||||
}
|
||||
|
||||
type UpsertRequest struct {
|
||||
@@ -19,4 +20,5 @@ type UpsertRequest struct {
|
||||
EmbeddingModelID string `json:"embedding_model_id,omitempty"`
|
||||
MaxContextLoadTime *int `json:"max_context_load_time,omitempty"`
|
||||
Language string `json:"language,omitempty"`
|
||||
AllowGuest *bool `json:"allow_guest,omitempty"`
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user