Skip to content
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.

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

Add OpenAPI tool #246

Merged
merged 1 commit into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/tools.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ These tools extend the agent's abilities, allowing it to interact with external
| `WebCrawlerTool` | Retrieve content of an arbitrary website. |
| `OpenMeteoTool` | Retrieve current, previous, or upcoming weather for a given destination. |
| `MilvusDatabaseTool` | Perform retrieval queries (search, insert, delete, manage collections) against a MilvusDatabaseTool database. |
| `OpenAPITool` | Send requests to and receive responses from API server. |
| ➕ [Request](https://github.com/i-am-bee/bee-agent-framework/discussions) | |

All examples can be found [here](/examples/tools).
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@
"ollama": "^0.5.11",
"openai": "^4.67.3",
"openai-chat-tokens": "^0.2.8",
"sequelize": "^6.37.3"
"sequelize": "^6.37.3",
"yaml": "^2.6.1"
},
"peerDependenciesMeta": {
"@aws-sdk/client-bedrock-runtime": {
Expand Down Expand Up @@ -258,6 +259,9 @@
},
"sequelize": {
"optional": true
},
"yaml": {
"optional": true
}
},
"devDependencies": {
Expand Down
66 changes: 66 additions & 0 deletions src/tools/openapi.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { OpenAPITool } from "@/tools/openapi.js";
import { verifyDeserialization } from "@tests/e2e/utils.js";
const cat_spec =
'{\
"openapi": "3.0.0",\
"info": {\
"title": "Cat Facts API",\
"description": "A simple API for cat facts",\
"version": "1.0.0"\
},\
"servers": [\
{\
"url": "https://catfact.ninja",\
"description": "Production server"\
}\
],\
"paths": {\
"/fact": {\
"get": {\
"summary": "Get a random cat fact",\
"description": "Returns a random cat fact.",\
"responses": {\
"200": {\
"description": "Successful response",\
"content": {\
"application/json": {\
"schema": {\
"$ref": "#/components/schemas/Fact"\
}\
}\
}\
}\
}\
}\
}\
},\
"components": {\
"schemas": {\
"Fact": {\
"type": "object",\
"properties": {\
"fact": {\
"type": "string",\
"description": "The cat fact"\
}\
}\
}\
}\
}\
}';

describe("Base Tool", () => {
beforeEach(() => {
vi.clearAllTimers();
});

describe("OpenAPITool", () => {
it("Serializes", () => {
const tool = new OpenAPITool({ name: "OpenAPITool", openApiSchema: cat_spec });

const serialized = tool.serialize();
const deserialized = OpenAPITool.fromSerialized(serialized);
verifyDeserialization(tool, deserialized);
});
});
});
175 changes: 175 additions & 0 deletions src/tools/openapi.ts
Tomas2D marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,175 @@
/**
* Copyright 2024 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { join } from "path";

import {
BaseToolOptions,
BaseToolRunOptions,
StringToolOutput,
Tool,
ToolError,
ToolEmitter,
} from "@/tools/base.js";
import { Callback, Emitter } from "@/emitter/emitter.js";
import { GetRunContext } from "@/context.js";
import { ValueError } from "@/errors.js";
import { SchemaObject } from "ajv";
import { parse } from "yaml";
Tomas2D marked this conversation as resolved.
Show resolved Hide resolved
import { isEmpty } from "remeda";

export interface OpenAPIToolOptions extends BaseToolOptions {
name: string;
description?: string;
openApiSchema: any;
apiKey?: string;
httpProxyUrl?: string;
}

export interface OpenAPIEvents {
beforeFetch: Callback<{ url: URL }>;
afterFetch: Callback<{ data: OpenAPIToolOutput }>;
}

export class OpenAPIToolOutput extends StringToolOutput {
constructor(
public readonly status: number,
public readonly statusText: string,
public readonly result = "",
) {
super();
this.status = status;
this.statusText = statusText;
this.result = result ?? "";
}
}

export class OpenAPITool extends Tool<OpenAPIToolOutput, OpenAPIToolOptions> {
name = "OpenAPI";
description = `OpenAPI tool that performs REST API requests to the servers and retrieves the response. The server API interfaces are defined in OpenAPI schema.
Only use the OpenAPI tool if you need to communicate to external servers.`;
openApiSchema: any;
protected apiKey?: string;
protected httpProxyUrl?: string;

inputSchema(): SchemaObject {
return {
type: "object",
required: ["path", "method"],
oneOf: Object.entries(this.openApiSchema.paths).flatMap(([path, pathSpec]: [string, any]) =>
Object.entries(pathSpec).map(([method, methodSpec]: [string, any]) => ({
additionalProperties: false,
properties: {
path: {
const: path,
description:
"Do not replace variables in path, instead of, put them to the parameters object.",
},
method: { const: method, description: methodSpec.summary || methodSpec.description },
...(methodSpec.requestBody?.content?.["application/json"]?.schema
? {
body: methodSpec.requestBody?.content?.["application/json"]?.schema,
}
: {}),
...(methodSpec.parameters
? {
parameters: {
type: "object",
additionalProperties: false,
required: methodSpec.parameters
.filter((p: any) => p.required === true)
.map((p: any) => p.name),
properties: methodSpec.parameters.reduce(
(acc: any, p: any) => ({
...acc,
[p.name]: { ...p.schema, description: p.name },
}),
{},
),
},
}
: {}),
},
})),
),
} as const satisfies SchemaObject;
}

public readonly emitter: ToolEmitter<Record<string, any>, OpenAPIToolOutput, OpenAPIEvents> =
Emitter.root.child({
namespace: ["tool", "web", "openAPITool"],
creator: this,
});

static {
this.register();
}

public constructor(options: OpenAPIToolOptions) {
super(options);
this.openApiSchema = parse(options.openApiSchema);
if (!this.openApiSchema?.paths) {
throw new ValueError("Server is not specified!");
Tomas2D marked this conversation as resolved.
Show resolved Hide resolved
}
}

protected async _run(
input: Record<string, any>,
_options: Partial<BaseToolRunOptions>,
run: GetRunContext<typeof this>,
) {
let path: string = input.path || "";
const url = new URL(this.openApiSchema.servers[0].url);
Object.keys(input.parameters ?? {}).forEach((key) => {
const value = input.parameters[key];
const newPath = path.replace(`{${key}}`, value);
if (newPath == path) {
url.searchParams.append(key, value);
} else {
path = newPath;
}
});
url.pathname = join(url.pathname, path);
Tomas2D marked this conversation as resolved.
Show resolved Hide resolved
// eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
const headers: { [key: string]: string } = { Accept: "application/json" };
if (this.apiKey) {
headers["Authorization"] = `Bearer ${this.apiKey}`;
}
await this.emitter.emit("beforeFetch", { url: url });
try {
const response = await fetch(url.toString(), {
Copy link
Contributor

Choose a reason for hiding this comment

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

You defined emitter with events but I don't see any run.emitter.emit(...) expressions.
See how it is implemented in openLibrary.ts tool.

body: !isEmpty(input.body) ? input.body : undefined,
method: input.method.toLowerCase(),
headers: headers,
signal: run.signal,
});
const text = await response.text();
const output = new OpenAPIToolOutput(response.status, response.statusText, text);
await this.emitter.emit("afterFetch", { data: output });
return output;
} catch (err) {
throw new ToolError(`Request to ${url} has failed.`, [err]);
}
}
createSnapshot() {
return {
...super.createSnapshot(),
openApiSchema: this.openApiSchema,
apiKey: this.apiKey,
httpProxyUrl: this.httpProxyUrl,
};
}
}
98 changes: 98 additions & 0 deletions tests/e2e/tools/openapi.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
/**
* Copyright 2024 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import { beforeEach, expect } from "vitest";
import { OpenAPITool } from "@/tools/openapi.js";

describe("OpenAPITool", () => {
let instance: OpenAPITool;

// Simple API spec for a cat fact API
// Assisted by WCA@IBM
// Latest GenAI contribution: ibm/granite-20b-code-instruct-v2

const cat_spec =
'{\
"openapi": "3.0.0",\
"info": {\
"title": "Cat Facts API",\
"description": "A simple API for cat facts",\
"version": "1.0.0"\
},\
"servers": [\
{\
"url": "https://catfact.ninja",\
"description": "Production server"\
}\
],\
"paths": {\
"/fact": {\
"get": {\
"summary": "Get a random cat fact",\
"description": "Returns a random cat fact.",\
"responses": {\
"200": {\
"description": "Successful response",\
"content": {\
"application/json": {\
"schema": {\
"$ref": "#/components/schemas/Fact"\
}\
}\
}\
}\
}\
}\
}\
},\
"components": {\
"schemas": {\
"Fact": {\
"type": "object",\
"properties": {\
"fact": {\
"type": "string",\
"description": "The cat fact"\
}\
}\
}\
}\
}\
}';

beforeEach(() => {
instance = new OpenAPITool({
name: "Cat Facts",
description: "A simple API for cat facts",
openApiSchema: cat_spec,
});
});

it("Runs", async () => {
const response = await instance.run(
{
path: "/fact",
method: "get",
},
{
signal: AbortSignal.timeout(60 * 1000),
retryOptions: {},
},
);

expect(response.isEmpty()).toBe(false);
});
});
3 changes: 3 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4915,6 +4915,7 @@ __metadata:
openai: ^4.67.3
openai-chat-tokens: ^0.2.8
sequelize: ^6.37.3
yaml: ^2.6.1
peerDependenciesMeta:
"@aws-sdk/client-bedrock-runtime":
optional: true
Expand Down Expand Up @@ -4948,6 +4949,8 @@ __metadata:
optional: true
sequelize:
optional: true
yaml:
optional: true
languageName: unknown
linkType: soft

Expand Down
Loading