Skip to content

fix: Actor server default tool loading #104

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

Merged
merged 1 commit into from
May 2, 2025
Merged

fix: Actor server default tool loading #104

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
23 changes: 12 additions & 11 deletions src/actor/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import express from 'express';
import log from '@apify/log';

import { type ActorsMcpServer } from '../mcp/server.js';
import { processParamsGetTools } from '../mcp/utils.js';
import { addTool, removeTool } from '../tools/helpers.js';
import { parseInputParamsFromUrl, processParamsGetTools } from '../mcp/utils.js';
import { getHelpMessage, HEADER_READINESS_PROBE, Routes } from './const.js';
import { getActorRunData } from './utils.js';

Expand Down Expand Up @@ -47,6 +46,7 @@ export function createExpressApp(
}
try {
log.info(`Received GET message at: ${Routes.ROOT}`);
// TODO: I think we should remove this logic, root should return only help message
Copy link

Copilot AI May 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] If the root route is intended to return only the help message, consider removing this TODO comment and any related legacy logic to improve clarity.

Copilot uses AI. Check for mistakes.
const tools = await processParamsGetTools(req.url, process.env.APIFY_TOKEN as string);
if (tools) {
mcpServer.updateTools(tools);
Expand All @@ -67,13 +67,12 @@ export function createExpressApp(
app.get(Routes.SSE, async (req: Request, res: Response) => {
try {
log.info(`Received GET message at: ${Routes.SSE}`);
const tools = await processParamsGetTools(req.url, process.env.APIFY_TOKEN as string);
if (tools.length > 0) {
mcpServer.updateTools(tools);
const input = parseInputParamsFromUrl(req.url);
if (input.actors || input.enableAddingActors) {
await mcpServer.loadToolsFromUrl(req.url, process.env.APIFY_TOKEN as string);
}
// TODO fix this - we should not be loading default tools here or provide more generic way
if (tools.length === 2 && tools.includes(addTool) && tools.includes(removeTool)) {
// We are loading default Actors (if not specified otherwise), so that we don't have "empty" tools
// Load default tools if no actors are specified
if (!input.actors) {
await mcpServer.loadDefaultTools(process.env.APIFY_TOKEN as string);
}
transportSSE = new SSEServerTransport(Routes.MESSAGE, res);
Expand Down Expand Up @@ -126,10 +125,12 @@ export function createExpressApp(
});
// Load MCP server tools
// TODO using query parameters in POST request is not standard
const urlSearchParams = new URLSearchParams(req.url.split('?')[1]);
if (urlSearchParams.get('actors')) {
const input = parseInputParamsFromUrl(req.url);
if (input.actors || input.enableAddingActors) {
await mcpServer.loadToolsFromUrl(req.url, process.env.APIFY_TOKEN as string);
} else {
}
// Load default tools if no actors are specified
if (!input.actors) {
await mcpServer.loadDefaultTools(process.env.APIFY_TOKEN as string);
}

Expand Down