PNArchives/Memoh
1
0
Fork 0
mirror of https://github.com/memohai/Memoh.git synced 2026-04-27 07:16:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unify providers and models tables

Browse Source 
- Rename `llm_providers` → `providers`, `llm_provider_oauth_tokens` → `provider_oauth_tokens`
- Remove `tts_providers` and `tts_models` tables; speech models now live in the unified `models` table with `type = 'speech'`
- Replace top-level `api_key`/`base_url` columns with a JSONB `config` field on `providers`
- Rename `llm_provider_id` → `provider_id` across all references
- Add `edge-speech` client type and `conf/providers/edge.yaml` default provider
- Create new read-only speech endpoints (`/speech-providers`, `/speech-models`) backed by filtered views of the unified tables
- Remove old TTS CRUD handlers; simplify speech page to read-only + test
- Update registry loader to skip malformed YAML files instead of failing entirely
- Fix YAML quoting for model names containing colons in openrouter.yaml
- Regenerate sqlc, swagger, and TypeScript SDK
This commit is contained in:
Acbox
2026-04-07 00:26:06 +08:00
parent 43c4153938
commit a04b8fd564
78 changed files with 3191 additions and 5737 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/agent/main.go
+5 -16
View File
@@ -251,7 +251,7 @@ func runServe() {
provideServerHandler(weixin.NewQRServerHandler),
provideServerHandler(provideUsersHandler),
provideServerHandler(handlers.NewMemoryProvidersHandler),
provideServerHandler(handlers.NewTtsProvidersHandler),
provideServerHandler(handlers.NewSpeechHandler),
provideServerHandler(handlers.NewBotTtsHandler),
provideServerHandler(handlers.NewEmailProvidersHandler),
provideServerHandler(handlers.NewEmailBindingsHandler),
@@ -274,7 +274,7 @@ func runServe() {
startRegistrySync,
startMemoryProviderBootstrap,
startSearchProviderBootstrap,
startTtsProviderBootstrap,
startScheduleService,
startHeartbeatService,
startChannelManager,
@@ -878,7 +878,7 @@ func provideServer(params serverParams) *server.Server {
func startRegistrySync(lc fx.Lifecycle, log *slog.Logger, cfg config.Config, queries *dbsqlc.Queries) {
lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error {
defs, err := registry.Load(cfg.Registry.ProvidersPath())
defs, err := registry.Load(log, cfg.Registry.ProvidersPath())
if err != nil {
log.Warn("registry: failed to load provider definitions", slog.Any("error", err))
return nil
@@ -910,17 +910,6 @@ func startMemoryProviderBootstrap(lc fx.Lifecycle, log *slog.Logger, mpService *
})
}
func startTtsProviderBootstrap(lc fx.Lifecycle, log *slog.Logger, ttsService *ttspkg.Service) {
lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error {
if err := ttsService.EnsureDefaults(ctx); err != nil {
log.Warn("failed to ensure default tts providers", slog.Any("error", err))
}
return nil
},
})
}
func startSearchProviderBootstrap(lc fx.Lifecycle, log *slog.Logger, spService *searchproviders.Service) {
lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error {
@@ -1128,8 +1117,8 @@ func (c *lazyLLMClient) resolve(ctx context.Context) (memprovider.LLM, error) {
}
return memllm.New(memllm.Config{
ModelID: memoryModel.ModelID,
BaseURL: strings.TrimRight(memoryProvider.BaseUrl, "/"),
APIKey: memoryProvider.ApiKey,
BaseURL: strings.TrimRight(providers.ProviderConfigString(memoryProvider, "base_url"), "/"),
APIKey: providers.ProviderConfigString(memoryProvider, "api_key"),
ClientType: memoryProvider.ClientType,
Timeout: c.timeout,
}), nil
cmd/memoh/serve.go
+5 -16
View File
@@ -175,7 +175,7 @@ func runServe() {
provideServerHandler(weixin.NewQRServerHandler),
provideServerHandler(provideUsersHandler),
provideServerHandler(handlers.NewMemoryProvidersHandler),
provideServerHandler(handlers.NewTtsProvidersHandler),
provideServerHandler(handlers.NewSpeechHandler),
provideServerHandler(handlers.NewBotTtsHandler),
provideServerHandler(handlers.NewEmailProvidersHandler),
provideServerHandler(handlers.NewEmailBindingsHandler),
@@ -198,7 +198,7 @@ func runServe() {
startRegistrySync,
startMemoryProviderBootstrap,
startSearchProviderBootstrap,
startTtsProviderBootstrap,
startScheduleService,
startHeartbeatService,
startChannelManager,
@@ -291,7 +291,7 @@ func provideMemoryProviderRegistry(log *slog.Logger, llm memprovider.LLM, chatSe
func startRegistrySync(lc fx.Lifecycle, log *slog.Logger, cfg config.Config, queries *dbsqlc.Queries) {
lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error {
defs, err := registry.Load(cfg.Registry.ProvidersPath())
defs, err := registry.Load(log, cfg.Registry.ProvidersPath())
if err != nil {
log.Warn("registry: failed to load provider definitions", slog.Any("error", err))
return nil
@@ -323,17 +323,6 @@ func startMemoryProviderBootstrap(lc fx.Lifecycle, log *slog.Logger, mpService *
})
}
func startTtsProviderBootstrap(lc fx.Lifecycle, log *slog.Logger, ttsService *ttspkg.Service) {
lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error {
if err := ttsService.EnsureDefaults(ctx); err != nil {
log.Warn("failed to ensure default tts providers", slog.Any("error", err))
}
return nil
},
})
}
func startSearchProviderBootstrap(lc fx.Lifecycle, log *slog.Logger, spService *searchproviders.Service) {
lc.Append(fx.Hook{
OnStart: func(ctx context.Context) error {
@@ -1050,8 +1039,8 @@ func (c *lazyLLMClient) resolve(ctx context.Context) (memprovider.LLM, error) {
}
return memllm.New(memllm.Config{
ModelID: memoryModel.ModelID,
BaseURL: strings.TrimRight(memoryProvider.BaseUrl, "/"),
APIKey: memoryProvider.ApiKey,
BaseURL: strings.TrimRight(providers.ProviderConfigString(memoryProvider, "base_url"), "/"),
APIKey: providers.ProviderConfigString(memoryProvider, "api_key"),
ClientType: memoryProvider.ClientType,
Timeout: c.timeout,
}), nil