Skip to content

Commit cfb3821

Browse files
authored
Merge pull request #526 from M4xymm/RDBC-1014
RDBC-1014 - Missing getRaftUniqueRequestId method in DeleteAiAgent
2 parents cabf7f7 + 49c7ff8 commit cfb3821

File tree

2 files changed

+24
-27
lines changed

2 files changed

+24
-27
lines changed

src/Documents/Operations/AI/Agents/DeleteAiAgentOperation.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { ServerNode } from "../../../../Http/ServerNode.js";
77
import { HttpRequestParameters } from "../../../../Primitives/Http.js";
88
import { StringUtil } from "../../../../Utility/StringUtil.js";
99
import { throwError } from "../../../../Exceptions/index.js";
10+
import { RaftIdGenerator } from "../../../../Utility/RaftIdGenerator.js";
1011

1112
export class DeleteAiAgentOperation implements IMaintenanceOperation<AiAgentConfigurationResult> {
1213
private readonly _identifier: string;
@@ -57,4 +58,8 @@ class DeleteAiAgentCommand extends RavenCommand<AiAgentConfigurationResult> {
5758

5859
return this._parseResponseDefaultAsync(bodyStream)
5960
}
61+
62+
public getRaftUniqueRequestId(): string {
63+
return RaftIdGenerator.newId();
64+
}
6065
}

test/Ported/Documents/Operations/AiAgentTest.ts

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
11
import {
22
AddOrUpdateAiAgentOperation,
3+
AiConnectionString,
34
IDocumentStore,
4-
PutConnectionStringOperation,
5-
RavenConnectionString
5+
OpenAiSettings,
6+
PutConnectionStringOperation
67
} from "../../../../src/index.js";
78
import {disposeTestDocumentStore, RavenTestContext, testContext} from "../../../Utils/TestUtil.js";
89
import {assertThat, assertThrows} from "../../../Utils/AssertExtensions.js";
910
import {AiAgentConfiguration} from "../../../../src/Documents/Operations/AI/Agents/config/AiAgentConfiguration.js";
1011

1112
((RavenTestContext.isRavenDbServerVersion("7.1") && !RavenTestContext.isPullRequest) ? describe : describe.skip)("AiAgentTest", function () {
12-
1313
let store: IDocumentStore;
1414

15-
beforeEach(async function () {
16-
store = await testContext.getDocumentStore();
17-
});
15+
beforeEach(async () => store = await testContext.getDocumentStore());
1816

1917
afterEach(async () =>
2018
await disposeTestDocumentStore(store));
2119

20+
async function putAiConnectionString() {
21+
const csName = `ai-agents-${Date.now()}`;
22+
const aiConnectionString = new AiConnectionString();
23+
aiConnectionString.name = csName;
24+
aiConnectionString.identifier = "openai-test";
25+
aiConnectionString.modelType = "Chat";
26+
aiConnectionString.openAiSettings = new OpenAiSettings("test-api-key", "https://api.openai.example", "gpt-test");
27+
28+
await store.maintenance.send(new PutConnectionStringOperation(aiConnectionString));
29+
return csName;
30+
}
31+
2232
it("canCreateAiAgent", async () => {
23-
const csName = `r1-${Date.now()}`;
24-
const ravenConnectionString = Object.assign(new RavenConnectionString(), {
25-
database: store.database,
26-
topologyDiscoveryUrls: ["http://localhost:8080"],
27-
name: csName
28-
});
29-
await store.maintenance.send(new PutConnectionStringOperation(ravenConnectionString));
33+
const csName = await putAiConnectionString();
3034

3135
const agentConfiguration: AiAgentConfiguration = {
3236
name: `TestAgent-${Date.now()}`,
@@ -66,13 +70,7 @@ import {AiAgentConfiguration} from "../../../../src/Documents/Operations/AI/Agen
6670
});
6771

6872
it("canUpdateAiAgent", async () => {
69-
const csName = `r1-${Date.now()}`;
70-
const ravenConnectionString = Object.assign(new RavenConnectionString(), {
71-
database: store.database,
72-
topologyDiscoveryUrls: ["http://localhost:8080"],
73-
name: csName
74-
});
75-
await store.maintenance.send(new PutConnectionStringOperation(ravenConnectionString));
73+
const csName = await putAiConnectionString();
7674

7775
const name = `Agent-${Date.now()}`;
7876
const initialConfig: AiAgentConfiguration = {
@@ -101,13 +99,7 @@ import {AiAgentConfiguration} from "../../../../src/Documents/Operations/AI/Agen
10199
});
102100

103101
it("canListAndDeleteAiAgent", async () => {
104-
const csName = `r1-${Date.now()}`;
105-
const ravenConnectionString = Object.assign(new RavenConnectionString(), {
106-
database: store.database,
107-
topologyDiscoveryUrls: ["http://localhost:8080"],
108-
name: csName
109-
});
110-
await store.maintenance.send(new PutConnectionStringOperation(ravenConnectionString));
102+
const csName = await putAiConnectionString();
111103

112104
const name = `agent-${Date.now()}`;
113105
const config: AiAgentConfiguration = {

0 commit comments

Comments
 (0)