Skip to content

[AI Infra] Update logic for getConnectorById #229227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[AI Infra] Update logic for getConnectorById #229227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
402e88c
update logic for getConnectorById
qn895 Jul 23, 2025
1ad93dd
Fix type import
qn895 Jul 23, 2025
e8d0899
Update
qn895 Aug 8, 2025
70f71f0
Merge remote-tracking branch 'upstream/main' into ai-connector-by-id-…
qn895 Aug 8, 2025
6f57d05
Merge remote-tracking branch 'upstream/main' into ai-connector-by-id-…
qn895 Aug 11, 2025
12eaac4
Fix tests
qn895 Aug 11, 2025
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
3 changes: 1 addition & 2 deletions x-pack/platform/plugins/shared/inference/server/util/get_connector_by_id.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ describe('getConnectorById', () => {
expect(actionsClient.get).toHaveBeenCalledTimes(1);
expect(actionsClient.get).toHaveBeenCalledWith({
id: connectorId,
throwIfSystemAction: true,
});
});

Expand All @@ -53,7 +52,7 @@ describe('getConnectorById', () => {

await expect(() => getConnectorById({ actionsClient, connectorId })).rejects
.toThrowErrorMatchingInlineSnapshot(`
"No connector found for id 'my-connector-id'
"An error occur fetching connectors for id 'my-connector-id'
Something wrong"
`);
});
Expand Down
14 changes: 7 additions & 7 deletions x-pack/platform/plugins/shared/inference/server/util/get_connector_by_id.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import type { ActionsClient, ActionResult as ActionConnector } from '@kbn/actions-plugin/server';
import type { ActionsClient } from '@kbn/actions-plugin/server';
import {
createInferenceRequestError,
connectorToInference,
Expand All @@ -22,15 +22,15 @@ export const getConnectorById = async ({
actionsClient: ActionsClient;
connectorId: string;
}): Promise<InferenceConnector> => {
let connector: ActionConnector;
let connector;
try {
connector = await actionsClient.get({
id: connectorId,
throwIfSystemAction: true,
});
connector = await actionsClient.get({ id: connectorId });
if (!connector) {
throw createInferenceRequestError(`No connector found for id '${connectorId}'`, 400);
}
} catch (error) {
throw createInferenceRequestError(
`No connector found for id '${connectorId}'\n${error.message}`,
`An error occur fetching connectors for id '${connectorId}'\n${error.message}`,
400
);
}
Expand Down
4 changes: 2 additions & 2 deletions x-pack/platform/test/functional_gen_ai/inference/tests/chat_complete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export const chatCompleteSuite = (
type: 'error',
code: 'requestError',
message:
"No connector found for id 'do-not-exist'\nSaved object [action/do-not-exist] not found",
"An error occur fetching connectors for id 'do-not-exist'\\nSaved object [action/do-not-exist] not found",
});
});

Expand Down Expand Up @@ -338,7 +338,7 @@ export const chatCompleteSuite = (
error: {
code: 'requestError',
message:
"No connector found for id 'do-not-exist'\nSaved object [action/do-not-exist] not found",
"An error occur fetching connectors for id 'do-not-exist'\\nSaved object [action/do-not-exist] not found",
meta: {
status: 400,
},
Expand Down