vodorod/Dorod-Sky
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add n8n credential test + migrate to new API endpoint (#2427)

Browse Source
This commit is contained in:
LawyZheng
2025-05-22 22:15:20 +08:00
committed by GitHub
parent 2e068d88ac
commit 7c1240bfef
3 changed files with 55 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
integrations/n8n/credentials/SkyvernApi.credentials.ts
View File

@@ -1,5 +1,6 @@
import {
IAuthenticateGeneric,
ICredentialTestRequest,
ICredentialType,
INodeProperties,
} from 'n8n-workflow';
@@ -35,4 +36,10 @@ export class SkyvernApi implements ICredentialType {
}
},
};
test: ICredentialTestRequest = {
request: {
baseURL: '={{$credentials?.baseUrl}}',
url: '/api/v1/organizations',
},
};
}

96
integrations/n8n/nodes/Skyvern/Skyvern.node.ts
View File

@@ -123,7 +123,7 @@ export class Skyvern implements INodeType {
request: {
baseURL: '={{$credentials.baseUrl}}',
method: '={{ $value === "dispatch" ? "POST" : "GET" }}' as IHttpRequestMethods,
url: '={{"/api/" + ($parameter["taskOptions"]["engine"] ? $parameter["taskOptions"]["engine"] : "v2") + "/tasks"}}',
url: '={{"/v1/run/tasks"}}',
},
send: {
preSend: [
@@ -132,46 +132,11 @@ export class Skyvern implements INodeType {
if (taskOperation === "get") return requestOptions;
const taskOptions: IDataObject = this.getNodeParameter('taskOptions') as IDataObject;
if (taskOptions["engine"] !== "v1") return requestOptions;
const credentials = await this.getCredentials('skyvernApi');
const userPrompt = this.getNodeParameter('userPrompt');
// *** capture optional webhook URL ***
let webhookUrl: string | undefined;
try {
webhookUrl = this.getNodeParameter('webhookUrl') as string;
} catch (e) {
webhookUrl = undefined;
}
const generateBody: IDataObject = {
prompt: userPrompt,
};
const response = await makeRequest(credentials['baseUrl'] + '/api/v1/generate/task', {
method: 'POST',
headers: {
'Content-Type': 'application/json',
'x-api-key': credentials['apiKey'],
},
body: JSON.stringify(generateBody),
});
if (!response.ok) {
throw new Error('Request to generate Task V1 failed'); // eslint-disable-line
}
const data = await response.json();
requestOptions.body = {
url: data.url,
navigation_goal: data.navigation_goal,
navigation_payload: data.navigation_payload,
data_extraction_goal: data.data_extraction_goal,
extracted_information_schema: data.extracted_information_schema,
} as IDataObject;
if (webhookUrl) {
(requestOptions.body as IDataObject)['webhook_callback_url'] = webhookUrl;
const legacy_engine = taskOptions["engine"] as string | null
if (legacy_engine === "v1") {
(requestOptions.body as IDataObject)['engine'] = "skyvern-1.0";
}else if (legacy_engine === "v2") {
(requestOptions.body as IDataObject)['engine'] = "skyvern-2.0";
}
return requestOptions;
},
@@ -196,7 +161,7 @@ export class Skyvern implements INodeType {
routing: {
request: {
body: {
user_prompt: '={{$value}}',
prompt: '={{$value}}',
},
},
},
@@ -222,7 +187,6 @@ export class Skyvern implements INodeType {
},
},
},
// *** New property: optional webhook URL for Task dispatch ***
{
displayName: 'Webhook Callback URL',
description: 'Optional URL that Skyvern will call when the task finishes',
@@ -239,7 +203,7 @@ export class Skyvern implements INodeType {
routing: {
request: {
body: {
webhook_callback_url: '={{$value ? $value : undefined}}',
webhook_url: '={{$value ? $value : null}}',
},
},
},
@@ -260,7 +224,7 @@ export class Skyvern implements INodeType {
routing: {
request: {
method: 'GET',
url: '={{"/api/" + ($parameter["taskOptions"]["engine"] ? $parameter["taskOptions"]["engine"] : "v2") + "/tasks/" + $value}}',
url: '={{"/v1/runs/" + $value}}',
},
},
},
@@ -273,10 +237,12 @@ export class Skyvern implements INodeType {
default: {},
options: [
{
displayName: 'Engine',
displayName: 'Engine(Deprecated)',
description: 'Deprecated: please migrate to use "Engine" option',
name: 'engine',
type: 'options',
default: 'v2',
default: '',
required: false,
options: [
{
name: 'TaskV1',
@@ -286,12 +252,45 @@ export class Skyvern implements INodeType {
name: 'TaskV2',
value: 'v2',
},
],
},
{
displayName: 'Engine',
name: 'runEngine',
type: 'options',
default: 'skyvern-2.0',
options: [
{
name: 'Skyvern 1.0',
value: 'skyvern-1.0',
},
{
name: 'Skyvern 2.0',
value: 'skyvern-2.0',
},
{
name: 'OpenAI CUA',
value: 'openai-cua',
},
{
name: 'Anthropic CUA',
value: 'anthropic-cua',
}
],
routing: {
request: {
body: {
engine: '={{$value}}',
},
},
},
}
],
displayOptions: {
show: {
resource: ['task'],
taskOperation: ['dispatch'],
},
},
},
@@ -400,7 +399,6 @@ export class Skyvern implements INodeType {
},
},
},
// *** New property: optional webhook URL for Workflow dispatch ***
{
displayName: 'Webhook Callback URL',
description: 'Optional URL that Skyvern will call when the workflow run finishes',
@@ -417,7 +415,7 @@ export class Skyvern implements INodeType {
routing: {
request: {
body: {
webhook_callback_url: '={{$value ? $value : undefined}}',
webhook_callback_url: '={{$value ? $value : null}}',
},
},
},

2
integrations/n8n/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "n8n-nodes-skyvern",
"version": "0.0.4",
"version": "0.0.5",
"description": "Skyvern Node for n8n",
"keywords": [
"n8n-community-node-package"