Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Docs/Bot_Commands_User_Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
1. 管理员发送: `编辑渠道`
2. 机器人回复: (列出现有渠道) `请选择要编辑的渠道ID:`
3. 管理员发送: (选择一个渠道ID,例如 `1`)
4. 机器人回复: (列出可编辑字段) `请选择要编辑的字段:\n1. 名称 (当前值)\n2. 地址 (当前值)\n3. 类型 (当前值)\n4. API Key\n5. 最大并行数量 (当前值)\n6. 优先级 (当前值)`
4. 机器人回复: (列出可编辑字段) `请选择要编辑的字段:\n1. 名称 (当前值)\n2. 地址 (当前值)\n3. 类型 (当前值)\n4. API Key\n5. 最大并行数量 (当前值)\n6. 优先级 (当前值)\n7. 协议绑定`
5. 管理员发送: (选择字段编号)
6. **如果选择 `1`, `2`, `4`, `5`, `6`**:
- 机器人回复: `请输入新的值:`
Expand All @@ -191,9 +191,14 @@
6. **如果选择 `3` (类型)**:
- 机器人回复: `请选择渠道类型:\n1. OpenAI\n2. Ollama`
- 管理员发送: (输入选项编号,例如 `1`)
6. **如果选择 `7` (协议绑定)**(多协议网关用,如 OpenCode Zen/Go):
- 机器人回复: (列出绑定) `渠道 x 的协议绑定:\n3. https://opencode.ai/zen/v1 (OpenAIChat/Bearer) [默认]\n...`
- 管理员发送: 绑定ID(设为默认)或 `0`(新增绑定)
- 新增时依次输入:端点地址 → 线协议(OpenAIChat/OpenAIResponses/AnthropicMessages/Ollama/Gemini)→ 认证方式(Bearer/AnthropicApiKey/None)
- 机器人回复: `绑定创建成功(ID: x,协议/认证)`
7. 管理员发送: (输入新值或选择编号)
8. 机器人回复: `更新成功` (或失败信息)
* **`移除模型` 指令的交互流程示例:**
* **`移除模型` 指令的交互流程示例:**(按模型行删除:多 binding 下同名模型会带 `[渠道/binding/协议]` 标注,删错行不会发生)
1. 管理员发送: `移除模型`
2. 机器人回复: (列出现有渠道) `请选择要移除模型的渠道ID:`
3. 管理员发送: (选择一个渠道ID,例如 `1`)
Expand Down
102 changes: 99 additions & 3 deletions TelegramSearchBot.Test/Manage/EditLLMConfHelperTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -496,9 +496,8 @@ private async Task<LLMApiBinding> SeedChannelWithDefaultBinding(int id, string n

[Fact]
public async Task RefreshAllChannel_OpenCodeBinding_CreatesNoRowsAndSoftDeletesNothing() {
// Arrange: OpenCode 默认 binding(opencode.ai/zen/* 空间)——目录不是授权快照,
// 刷新不得创建行、不得软删/复活任何行(blueprint §四.1/.5)
const string openCodeEndpoint = "https://opencode.ai/zen/go/v1/chat/completions";
// Arrange: OpenCode Zen 是按量计费目录(非授权快照),刷新不得创建行、不得软删/复活任何行(blueprint §四.1/.5)
const string openCodeEndpoint = "https://opencode.ai/zen/v1/chat/completions";
var binding = await SeedChannelWithDefaultBinding(20, "OpenCode", LLMProvider.OpenAI,
gateway: openCodeEndpoint, endpoint: openCodeEndpoint);
await _context.ChannelsWithModel.AddRangeAsync(new[] {
Expand Down Expand Up @@ -738,6 +737,103 @@ public async Task SetModelPreferred_UnknownRowRejected() {
Assert.False(ok);
}

/// <summary>OpenCode Go 是订阅网关(目录即授权):只增不删;既有行/手工行不被覆盖或删除。</summary>
[Fact]
public async Task RefreshAllChannel_OpenCodeGo_SyncsCatalogAddOnly() {
// Arrange
const string goEndpoint = "https://opencode.ai/zen/go/v1";
var binding = await SeedChannelWithDefaultBinding(40, "OpenCode Go", LLMProvider.OpenAI,
gateway: goEndpoint, endpoint: goEndpoint);
await _context.ChannelsWithModel.AddRangeAsync(new[] {
new ChannelWithModel { LLMChannelId = 40, ModelName = "existing-manual", IsDeleted = false, AuthorizationSource = AuthorizationSource.Manual },
new ChannelWithModel { LLMChannelId = 40, ModelName = "restored-discovered", IsDeleted = true, AuthorizationSource = AuthorizationSource.Discovered, ApiBindingId = binding.Id },
new ChannelWithModel { LLMChannelId = 40, ModelName = "catalog-dropped", IsDeleted = false, AuthorizationSource = AuthorizationSource.Discovered, ApiBindingId = binding.Id }
});
await _context.SaveChangesAsync();

_openAIServiceMock.Setup(o => o.GetAllModels(It.IsAny<LLMChannel>(), It.IsAny<LLMApiBinding>()))
.ReturnsAsync(new List<string> { "new-model", "existing-manual", "restored-discovered" });

// Act
await _helper.RefreshAllChannel();

// Assert: 新模型以 Discovered 行加入;既有行不重复;软删行恢复;目录里没有的行不被软删
var rows = await _context.ChannelsWithModel.Where(m => m.LLMChannelId == 40).ToListAsync();
Assert.Single(rows.Where(r => r.ModelName == "new-model"));
Assert.Single(rows.Where(r => r.ModelName == "existing-manual"));
Assert.False(rows.Single(r => r.ModelName == "restored-discovered").IsDeleted);
Assert.False(rows.Single(r => r.ModelName == "catalog-dropped").IsDeleted);
}

[Fact]
public async Task PromoteBinding_SwitchesDefaultAndMirrorsChannel() {
// Arrange
var defaultBinding = await SeedChannelWithDefaultBinding(41, "Multi Prot", LLMProvider.OpenAI, gateway: "http://a", endpoint: "http://a");
var responsesBinding = new LLMApiBinding {
LLMChannelId = 41,
Endpoint = "http://b",
Protocol = LlmProtocol.OpenAIResponses,
AuthProfile = LlmAuthProfile.Bearer,
IsDefault = false
};
await _context.LLMApiBindings.AddAsync(responsesBinding);
await _context.SaveChangesAsync();

// Act
var ok = await _helper.PromoteBinding(41, responsesBinding.Id);

// Assert
Assert.True(ok);
Assert.True((await _context.LLMApiBindings.FindAsync(responsesBinding.Id))!.IsDefault);
Assert.False((await _context.LLMApiBindings.FindAsync(defaultBinding.Id))!.IsDefault);
var channel = await _context.LLMChannels.FindAsync(41);
Assert.Equal("http://b", channel.Gateway);
Assert.Equal(LLMProvider.ResponsesAPI, channel.Provider);
}

[Fact]
public async Task GetModelRowsByChannelId_QualifiesDuplicateNamesAndRemoveModelRowKeepsTheOther() {
// Arrange
var bindingA = await SeedChannelWithDefaultBinding(42, "Multi Model", LLMProvider.OpenAI, gateway: "http://a", endpoint: "http://a");
var bindingB = new LLMApiBinding { LLMChannelId = 42, Endpoint = "http://b", Protocol = LlmProtocol.OpenAIResponses, AuthProfile = LlmAuthProfile.Bearer, IsDefault = false };
await _context.LLMApiBindings.AddAsync(bindingB);
await _context.SaveChangesAsync();

var rowA = new ChannelWithModel { LLMChannelId = 42, ModelName = "shared-model", ApiBindingId = bindingA.Id };
var rowB = new ChannelWithModel { LLMChannelId = 42, ModelName = "shared-model", ApiBindingId = bindingB.Id };
var rowC = new ChannelWithModel { LLMChannelId = 42, ModelName = "single-model", ApiBindingId = bindingA.Id };
await _context.ChannelsWithModel.AddRangeAsync(rowA, rowB, rowC);
await _context.SaveChangesAsync();

// Act
var rows = await _helper.GetModelRowsByChannelId(42);

// Assert: 重名行带协议标注,唯一行保持原名
Assert.Equal(3, rows.Count);
Assert.Equal(2, rows.Count(r => r.Display.Contains("shared-model [")));
Assert.Contains(rows, r => r.Display == "single-model");

// 按行 Id 删除只影响目标行
var rowToRemove = rows.First(r => r.RowId == rowB.Id);
Assert.True(await _helper.RemoveModelRow(rowToRemove.RowId));
var remaining = await _context.ChannelsWithModel.Where(m => m.LLMChannelId == 42).ToListAsync();
Assert.Equal(2, remaining.Count);
Assert.DoesNotContain(remaining, r => r.Id == rowB.Id);
Assert.Contains(remaining, r => r.Id == rowA.Id);
}

[Fact]
public async Task GetBindings_ReturnsChannelBindingsOrderedById() {
await SeedChannelWithDefaultBinding(43, "Bindings", LLMProvider.OpenAI, gateway: "http://a", endpoint: "http://a");
await _context.LLMApiBindings.AddAsync(new LLMApiBinding { LLMChannelId = 43, Endpoint = "http://b", Protocol = LlmProtocol.OpenAIResponses, AuthProfile = LlmAuthProfile.Bearer });
await _context.SaveChangesAsync();

var bindings = await _helper.GetBindings(43);

Assert.Equal(2, bindings.Count);
Assert.True(bindings[0].Id < bindings[1].Id);
}

[Fact]
public async Task UpdateChannel_GatewayAndProviderChange_SyncsDefaultBinding() {
// Arrange
Expand Down
134 changes: 97 additions & 37 deletions TelegramSearchBot.Test/Manage/EditLLMConfTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -255,61 +255,43 @@ public async Task ExecuteAsync_RemoveModel_CompleteFlow() {
ApiKey = "test-key",
Provider = LLMProvider.OpenAI
};
await _context.LLMChannels.AddAsync(channel);
await _context.ChannelsWithModel.AddAsync(new ChannelWithModel {
LLMChannelId = 1,
ModelName = "model1"
});
// Add model2 to the in-memory database
await _context.ChannelsWithModel.AddAsync(new ChannelWithModel {
LLMChannelId = 1,
ModelName = "model2"
});
await _context.SaveChangesAsync();

var stateKey = $"llmconf:{chatId}:state";
var dataKey = $"llmconf:{chatId}:data";

// Setup state transitions
// 1. initial state, 2. state after "移除模型", 3. state after channel input, 4. row id payload
_dbMock.SetupSequence(d => d.StringGetAsync(It.IsAny<RedisKey>(), It.IsAny<CommandFlags>()))
.ReturnsAsync(RedisValue.Null) // 1. Initial state before "移除模型"
.ReturnsAsync("removing_model_select_channel") // 2. State after "移除模型" command
.ReturnsAsync("removing_model_select") // 3. State after channel ID input
.ReturnsAsync("1|model1,model2"); // 4. Data read by HandleRemovingModelSelectAsync

// Setup helper mock to return channel
helperMock.Setup(h => h.GetChannelById(1))
.ReturnsAsync(channel);

// Setup helper mock to return a channel in GetAllChannels, which should trigger GetModelsByChannelId in service (but service doesn't call helper here)
// This setup is still needed for the initial "移除模型" command which lists channels.
helperMock.Setup(h => h.GetAllChannels())
.ReturnsAsync(new List<LLMChannel> { channel });
.ReturnsAsync(RedisValue.Null)
.ReturnsAsync("removing_model_select_channel")
.ReturnsAsync("removing_model_select")
.ReturnsAsync("1|101,102");

helperMock.Setup(h => h.GetChannelById(1)).ReturnsAsync(channel);
helperMock.Setup(h => h.GetAllChannels()).ReturnsAsync(new List<LLMChannel> { channel });
helperMock.Setup(h => h.GetModelRowsByChannelId(1)).ReturnsAsync(new List<(long, string, string)> {
(101, "model1", "model1"),
(102, "model2", "model2")
});
helperMock.Setup(h => h.RemoveModelRow(It.IsAny<long>())).ReturnsAsync(true);

// Act & Assert
var result1 = await _service.ExecuteAsync("移除模型", chatId);
Assert.True(result1.Item1);
Assert.Contains("请选择要移除模型的渠道ID:", result1.Item2);

// Verify the in-memory database contains the expected models
var modelsInDb = await _context.ChannelsWithModel.Where(m => m.LLMChannelId == 1).ToListAsync();
Assert.NotNull(modelsInDb);
Assert.Equal(2, modelsInDb.Count);
Assert.Contains(modelsInDb, m => m.ModelName == "model1");
Assert.Contains(modelsInDb, m => m.ModelName == "model2");

var result2 = await _service.ExecuteAsync("1", chatId); // User inputs channel ID
var result2 = await _service.ExecuteAsync("1", chatId);
Assert.True(result2.Item1);
// Verify the response lists models
Assert.Contains("请选择要移除的模型:", result2.Item2);
Assert.Contains("1. model1", result2.Item2);
Assert.Contains("2. model2", result2.Item2);

var result3 = await _service.ExecuteAsync("1", chatId); // User inputs model index (1 for model1)
var result3 = await _service.ExecuteAsync("1", chatId); // 选择第一行
Assert.True(result3.Item1);
Assert.Equal("模型移除成功", result3.Item2);

// Verify model was removed by helper (as service calls helper)
helperMock.Verify(h => h.RemoveModelFromChannel(1, "model1"), Times.Once);
// 按行 Id 删除(不是按模型名,多 binding 下不会删错行)
helperMock.Verify(h => h.RemoveModelRow(101), Times.Once);
helperMock.Verify(h => h.RemoveModelRow(It.IsAny<long>()), Times.Once);

// Verify Redis keys are deleted
_dbMock.Verify(d => d.KeyDeleteAsync(stateKey, It.IsAny<CommandFlags>()), Times.Once);
Expand Down Expand Up @@ -553,5 +535,83 @@ public async Task ExecuteAsync_PresetOpenCodeGo_CreatesResponseBindingAndAssigns
helperMock.Verify(h => h.AssignModelBinding(7, "glm-5.3", It.IsAny<int>()), Times.Never);
helperMock.Verify(h => h.AssignModelBinding(7, It.IsAny<string>(), It.IsAny<int>()), Times.Exactly(2));
}

[Fact]
public async Task ExecuteAsync_EditChannelBindings_PromotesSelectedBinding() {
// Arrange
long chatId = 123;
var channel = new LLMChannel { Id = 1, Name = "Test Channel", Provider = LLMProvider.OpenAI, Gateway = "http://test.com" };
var binding = new LLMApiBinding { Id = 5, LLMChannelId = 1, Endpoint = "http://test.com/v1", Protocol = LlmProtocol.OpenAIResponses, AuthProfile = LlmAuthProfile.Bearer };

_dbMock.SetupSequence(d => d.StringGetAsync(It.IsAny<RedisKey>(), It.IsAny<CommandFlags>()))
.ReturnsAsync(RedisValue.Null)
.ReturnsAsync("editing_select_channel")
.ReturnsAsync("editing_select_field")
.ReturnsAsync("1")
.ReturnsAsync("editing_select_binding")
.ReturnsAsync("1|7");

helperMock.Setup(h => h.GetAllChannels()).ReturnsAsync(new List<LLMChannel> { channel });
helperMock.Setup(h => h.GetChannelById(1)).ReturnsAsync(channel);
helperMock.Setup(h => h.GetBindings(1)).ReturnsAsync(new List<LLMApiBinding> { binding });
helperMock.Setup(h => h.PromoteBinding(1, 5)).ReturnsAsync(true);

// Act
var result1 = await _service.ExecuteAsync("编辑渠道", chatId);
Assert.True(result1.Item1);

var result2 = await _service.ExecuteAsync("1", chatId);
Assert.Contains("7. 协议绑定", result2.Item2);

var result3 = await _service.ExecuteAsync("7", chatId);
Assert.True(result3.Item1);
Assert.Contains("5. http://test.com/v1 (OpenAIResponses/Bearer)", result3.Item2);
Assert.Contains("0 新增绑定", result3.Item2);

var result4 = await _service.ExecuteAsync("5", chatId);

// Assert
Assert.True(result4.Item1);
Assert.Contains("设为默认绑定", result4.Item2);
helperMock.Verify(h => h.PromoteBinding(1, 5), Times.Once);
}

[Fact]
public async Task ExecuteAsync_EditChannelBindings_AddsNewBinding() {
// Arrange
long chatId = 123;
var existing = new LLMApiBinding { Id = 3, LLMChannelId = 1, Endpoint = "https://opencode.ai/zen/v1", Protocol = LlmProtocol.OpenAIChat, AuthProfile = LlmAuthProfile.Bearer, IsDefault = true };

_dbMock.SetupSequence(d => d.StringGetAsync(It.IsAny<RedisKey>(), It.IsAny<CommandFlags>()))
.ReturnsAsync("editing_select_field").ReturnsAsync("1")
.ReturnsAsync("editing_select_binding").ReturnsAsync("1|7")
.ReturnsAsync("editing_binding_endpoint").ReturnsAsync("1|new")
.ReturnsAsync("editing_binding_protocol").ReturnsAsync("1|https://opencode.ai/zen/v1")
.ReturnsAsync("editing_binding_auth").ReturnsAsync("1|https://opencode.ai/zen/v1|OpenAIResponses");

helperMock.Setup(h => h.GetBindings(1)).ReturnsAsync(new List<LLMApiBinding> { existing });
helperMock.Setup(h => h.EnsureBinding(1, "https://opencode.ai/zen/v1", LlmProtocol.OpenAIResponses, LlmAuthProfile.Bearer)).ReturnsAsync(55);

// Act
var openBindings = await _service.ExecuteAsync("7", chatId);
Assert.Contains("3. https://opencode.ai/zen/v1", openBindings.Item2);

var askEndpoint = await _service.ExecuteAsync("0", chatId);
Assert.Contains("请输入新绑定的端点地址", askEndpoint.Item2);

var askProtocol = await _service.ExecuteAsync("https://opencode.ai/zen/v1", chatId);
Assert.Contains("请选择线协议", askProtocol.Item2);
Assert.Contains("2. OpenAIResponses", askProtocol.Item2);

var askAuth = await _service.ExecuteAsync("2", chatId);
Assert.Contains("请选择认证方式", askAuth.Item2);

var created = await _service.ExecuteAsync("1", chatId);

// Assert
Assert.True(created.Item1);
Assert.Contains("绑定创建成功(ID: 55", created.Item2);
helperMock.Verify(h => h.EnsureBinding(1, "https://opencode.ai/zen/v1", LlmProtocol.OpenAIResponses, LlmAuthProfile.Bearer), Times.Once);
}
}
}
15 changes: 15 additions & 0 deletions TelegramSearchBot/Interface/Manage/IEditLLMConfHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,20 @@ public interface IEditLLMConfHelper {

/// <summary>把模型行改挂到指定 binding,并标记为模型级协议覆盖;成功返回 true。</summary>
Task<bool> AssignModelBinding(int channelId, string modelName, int bindingId);

/// <summary>渠道下的全部协议绑定(按 Id 升序)。</summary>
Task<List<LLMApiBinding>> GetBindings(int channelId);

/// <summary>把指定 binding 设为渠道默认(其余降级),并镜像 channel.Gateway/Provider;成功返回 true。</summary>
Task<bool> PromoteBinding(int channelId, int bindingId);

/// <summary>
/// 渠道下的模型行(按行 Id),展示格式与 GetModelsByChannelId 一致(多 binding 时带 [channel/binding/protocol]);
/// 移除模型按行 Id 删除,避免多 binding 下删错行。
/// </summary>
Task<List<(long RowId, string ModelName, string Display)>> GetModelRowsByChannelId(long channelId);

/// <summary>按行 Id 删除模型行;行不存在返回 false。</summary>
Task<bool> RemoveModelRow(long rowId);
}
}
Loading
Loading