Skip to content

feat/EXT-7110/createToolClient-accessToken-runtime-evaluation #305

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

Draft
Michael Pineiro (michaelpineirocontentful) wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat/EXT-7110/createToolClient-accessToken-runtime-evaluation #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/config/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/
export interface ContentfulConfig {
/** Contentful CMA (Content Management API) access token */
accessToken: string;
accessToken: (() => Promise<string>) | string;
/** Contentful API host (default: 'api.contentful.com') */
host?: string;
/** Contentful Space ID */
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/createAiAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export function createAiActionTool(config: ContentfulConfig) {
environmentId: args.environmentId || 'master',
};

const contentfulClient = createToolClient(config, {
const contentfulClient = await createToolClient(config, {
...args,
environmentId: args.environmentId || 'master',
});
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/deleteAiAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function deleteAiActionTool(config: ContentfulConfig) {
aiActionId: args.aiActionId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// First, get the AI action to store info for return
const aiAction = await contentfulClient.aiAction.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/getAiAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function getAiActionTool(config: ContentfulConfig) {
aiActionId: args.aiActionId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the AI action
const aiAction = await contentfulClient.aiAction.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/getAiActionInvocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function getAiActionInvocationTool(config: ContentfulConfig) {
invocationId: args.invocationId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const aiActionInvocation =
await contentfulClient.aiActionInvocation.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/invokeAiAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export function invokeAiActionTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);
const aiActions = [];

for (const field of args.fields) {
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/listAiActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function listAiActionTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const aiActions = await contentfulClient.aiAction.getMany({
...params,
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/publishAiAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function publishAiActionTool(config: ContentfulConfig) {
aiActionId: args.aiActionId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

try {
// Get the AI action first
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/unpublishAiAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function unpublishAiActionTool(config: ContentfulConfig) {
aiActionId: args.aiActionId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

try {
// Unpublish the AI action
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/ai-actions/updateAiAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export function updateAiActionTool(config: ContentfulConfig) {
aiActionId: args.aiActionId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get existing AI action, merge fields, and update
const existingAiAction = await contentfulClient.aiAction.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/archiveAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function archiveAssetTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const assetIds = Array.isArray(args.assetId) ? args.assetId : [args.assetId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/deleteAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function deleteAssetTool(config: ContentfulConfig) {
assetId: args.assetId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// First, get the asset to store info for return
const asset = await contentfulClient.asset.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/getAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function getAssetTool(config: ContentfulConfig) {
assetId: args.assetId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the asset
const asset = await contentfulClient.asset.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/listAssets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export function listAssetsTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const assets = await contentfulClient.asset.getMany({
...params,
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/publishAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function publishAssetTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const assetIds = Array.isArray(args.assetId) ? args.assetId : [args.assetId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/unarchiveAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function unarchiveAssetTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const assetIds = Array.isArray(args.assetId) ? args.assetId : [args.assetId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/unpublishAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function unpublishAssetTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const assetIds = Array.isArray(args.assetId) ? args.assetId : [args.assetId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/updateAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function updateAssetTool(config: ContentfulConfig) {
assetId: args.assetId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get existing asset, merge fields, and update
const existingAsset = await contentfulClient.asset.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/assets/uploadAsset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export function uploadAssetTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Prepare asset properties following Contentful's structure
const locale = args.locale || 'en-US';
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/content-types/createContentType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function createContentTypeTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const contentTypeData = {
name: args.name,
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/content-types/deleteContentType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function deleteContentTypeTool(config: ContentfulConfig) {
contentTypeId: args.contentTypeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Delete the content type
await contentfulClient.contentType.delete(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/content-types/getContentType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function getContentTypeTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the content type details
const contentType = await contentfulClient.contentType.get({
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/content-types/listContentTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function listContentTypesTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const contentTypes = await contentfulClient.contentType.getMany({
...params,
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/content-types/publishContentType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function publishContentTypeTool(config: ContentfulConfig) {
contentTypeId: args.contentTypeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the content type first
const currentContentType = await contentfulClient.contentType.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/content-types/unpublishContentType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function unpublishContentTypeTool(config: ContentfulConfig) {
contentTypeId: args.contentTypeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Unpublish the content type
const contentType = await contentfulClient.contentType.unpublish(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/content-types/updateContentType.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function updateContentTypeTool(config: ContentfulConfig) {
contentTypeId: args.contentTypeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the current content type
const currentContentType = await contentfulClient.contentType.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/editor-interfaces/getEditorInterface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function getEditorInterfaceTool(config: ContentfulConfig) {
contentTypeId: args.contentTypeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const editorInterface = await contentfulClient.editorInterface.get(params);

Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/editor-interfaces/listEditorInterfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function listEditorInterfacesTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const editorInterfaces =
await contentfulClient.editorInterface.getMany(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/editor-interfaces/updateEditorInterface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export function updateEditorInterfaceTool(config: ContentfulConfig) {
contentTypeId: args.contentTypeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the current editor interface
const currentEditorInterface =
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/archiveEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function archiveEntryTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const entryIds = Array.isArray(args.entryId) ? args.entryId : [args.entryId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/createEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function createEntryTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);
const newEntry = await contentfulClient.entry.create(
{
...params,
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/deleteEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function deleteEntryTool(config: ContentfulConfig) {
entryId: args.entryId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// First, get the entry to check its status
const entry = await contentfulClient.entry.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/getEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function getEntryTool(config: ContentfulConfig) {
entryId: args.entryId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the entry
const entry = await contentfulClient.entry.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/publishEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function publishEntryTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const entryIds = Array.isArray(args.entryId) ? args.entryId : [args.entryId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/searchEntries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export function searchEntriesTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

const entries = await contentfulClient.entry.getMany({
...params,
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/unarchiveEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function unarchiveEntryTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const entryIds = Array.isArray(args.entryId) ? args.entryId : [args.entryId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/unpublishEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function unpublishEntryTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Normalize input to always be an array
const entryIds = Array.isArray(args.entryId) ? args.entryId : [args.entryId];
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/entries/updateEntry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export function updateEntryTool(config: ContentfulConfig) {
entryId: args.entryId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// First, get the existing entry
const existingEntry = await contentfulClient.entry.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/environments/createEnvironment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type Params = z.infer<typeof CreateEnvironmentToolParams>;

export function createEnvironmentTool(config: ContentfulConfig) {
async function tool(args: Params) {
const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Create the environment
const environment = await contentfulClient.environment.createWithId(
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/environments/deleteEnvironment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export function deleteEnvironmentTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Delete the environment
await contentfulClient.environment.delete(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/environments/listEnvironments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export function listEnvironmentsTool(config: ContentfulConfig) {
environmentId: args.environmentId || 'master',
};

const contentfulClient = createToolClient(config, clientArgs);
const contentfulClient = await createToolClient(config, clientArgs);

const environments = await contentfulClient.environment.getMany({
spaceId: args.spaceId,
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/locales/createLocale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function createLocaleTool(config: ContentfulConfig) {
environmentId: args.environmentId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Create the locale
const newLocale = await contentfulClient.locale.create(params, {
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/locales/deleteLocale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function deleteLocaleTool(config: ContentfulConfig) {
localeId: args.localeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// First, get the locale to check its current state
const locale = await contentfulClient.locale.get(params);
Expand Down
2 changes: 1 addition & 1 deletion packages/mcp-tools/src/tools/locales/getLocale.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export function getLocaleTool(config: ContentfulConfig) {
localeId: args.localeId,
};

const contentfulClient = createToolClient(config, args);
const contentfulClient = await createToolClient(config, args);

// Get the locale
const locale = await contentfulClient.locale.get(params);
Expand Down
Loading