feat: added new tools

Author: MikeSquall

README.md

@@ -134,10 +134,10 @@ console.log(result);
 
 ### Create and Poll (Recommended)
 
-For convenience, you can use `create_and_poll()` which automatically waits for completion:
+For convenience, you can use `createAndPoll()` which automatically waits for completion:
 
 ```typescript
-const result = await client.beta.maestro.runs.create_and_poll(
+const result = await client.beta.maestro.runs.createAndPoll(
   {
     input: 'Write a comprehensive report on AI trends in 2024',
     tools: ['web_search'],
@@ -157,7 +157,7 @@ console.log(result.result);
 Maestro supports various advanced configurations:
 
 ```typescript
-const advancedRun = await client.beta.maestro.runs.create_and_poll({
+const advancedRun = await client.beta.maestro.runs.createAndPoll({
   input: 'Research sustainable energy solutions',
 
   // Specify tools to use

examples/studio/maestro/maestro-run-create-and-poll.ts

@@ -6,7 +6,7 @@ const INTERVAL = 1500;
 async function main() {
   const client = new AI21({ apiKey: process.env.AI21_API_KEY });
 
-  const response = await client.beta.maestro.runs.create_and_poll(
+  const response = await client.beta.maestro.runs.createAndPoll(
     {
       input: 'Write a poem about the ocean',
       requirements: [

src/resources/maestro/runs.ts

@@ -41,7 +41,7 @@ export class Runs extends APIResource {
     throw new TimeoutError(`Maestro run ${runId}`, timeout);
   }
 
-  async create_and_poll(
+  async createAndPoll(
     body: MaestroRunRequest,
     options?: MaestroRunRequestOptions,
   ): Promise<MaestroRunResponse> {

src/types/maestro/MaestroRunRequest.ts

@@ -1,3 +1,5 @@
+import { FileSearchTool, HttpTool, MCPTool, WebSearchTool } from './MaestroTools';
+
 type MaestroRunInputObject = {
   role: string;
   content: string;
@@ -11,7 +13,7 @@ type MaestroRunRequirement = {
   isMandatory?: boolean;
 };
 
-type MaestroRunTool = 'file_search' | 'web_search';
+type MaestroRunTool = HttpTool | MCPTool | FileSearchTool | WebSearchTool;
 
 export type MaestroToolResources = {
   /* 

src/types/maestro/MaestroTools.ts

@@ -0,0 +1,47 @@
+interface HttpToolFunctionParametersProperty {
+  type: string;
+  description: string;
+}
+
+interface HttpToolFunctionParameters {
+  type: 'object';
+  properties: Record<string, HttpToolFunctionParametersProperty>;
+  required: string[];
+  additional_properties?: boolean;
+}
+
+interface HttpToolFunction {
+  name: string;
+  description: string;
+  parameters: HttpToolFunctionParameters;
+}
+
+interface HttpToolEndpoint {
+  url: string;
+  headers?: Record<string, string>;
+}
+
+export interface HttpTool {
+  type: 'http';
+  function: HttpToolFunction;
+  endpoint: HttpToolEndpoint;
+}
+
+export interface MCPTool {
+  type: 'mcp';
+  server_label: string;
+  server_url: string;
+  headers?: Record<string, string>;
+  allowed_tools?: string[];
+}
+
+export interface FileSearchTool {
+  type: 'file_search';
+  file_ids?: string[];
+  labels?: string[];
+}
+
+export interface WebSearchTool {
+  type: 'web_search';
+  urls?: string[];
+}

tests/unittests/resources/maestro/runs.test.ts

@@ -67,7 +67,33 @@ describe('Maestro Runs', () => {
           },
           { name: 'completeness', description: 'Cover all major areas', isMandatory: false },
         ],
-        tools: ['web_search', 'file_search'],
+        tools: [
+          { type: 'web_search', urls: ['https://arxiv.org', 'https://openai.com'] },
+          { type: 'file_search', file_ids: ['file_123', 'file_456'], labels: ['ai', 'ml', 'nlp'] },
+          {
+            type: 'http',
+            function: {
+              name: 'get_weather',
+              description: 'Get the weather for a given city',
+              parameters: {
+                type: 'object',
+                properties: { city: { type: 'string', description: 'The city to get the weather for' } },
+                required: ['city'],
+              },
+            },
+            endpoint: {
+              url: 'https://api.openweathermap.org/data/2.5/weather',
+              headers: { Authorization: 'Bearer 1234567890' },
+            },
+          },
+          {
+            type: 'mcp',
+            server_label: 'openai',
+            server_url: 'https://my-mcp-server.com',
+            headers: { Authorization: 'Bearer 1234567890' },
+            allowed_tools: ['get_weather'],
+          },
+        ],
         tool_resources: {
           file_search: {
             file_ids: ['file_123', 'file_456'],
@@ -174,7 +200,7 @@ describe('Maestro Runs', () => {
     });
   });
 
-  describe('create_and_poll', () => {
+  describe('createAndPoll', () => {
     it('should create and poll until completion with default options', async () => {
       const body: Models.MaestroRunRequest = {
         input: 'Test input',
@@ -199,7 +225,7 @@ describe('Maestro Runs', () => {
       mockClient.post.mockResolvedValue(createResponse);
       mockClient.get.mockResolvedValue(completedResponse);
 
-      const response = await runs.create_and_poll(body);
+      const response = await runs.createAndPoll(body);
 
       expect(mockClient.post).toHaveBeenCalledWith('/maestro/runs', { body });
       expect(mockClient.get).toHaveBeenCalledWith('/maestro/runs/run_123');
@@ -235,14 +261,14 @@ describe('Maestro Runs', () => {
       mockClient.post.mockResolvedValue(createResponse);
       mockClient.get.mockResolvedValue(completedResponse);
 
-      const response = await runs.create_and_poll(body, options);
+      const response = await runs.createAndPoll(body, options);
 
       expect(mockClient.post).toHaveBeenCalledWith('/maestro/runs', { body });
       expect(mockClient.get).toHaveBeenCalledWith('/maestro/runs/run_123');
       expect(response).toEqual(completedResponse);
     });
 
-    it('should call create_and_poll with correct parameters', async () => {
+    it('should call createAndPoll with correct parameters', async () => {
       const body: Models.MaestroRunRequest = {
         input: 'Test input',
       };
@@ -271,7 +297,7 @@ describe('Maestro Runs', () => {
       mockClient.post.mockResolvedValue(createResponse);
       mockClient.get.mockResolvedValue(completedResponse);
 
-      const response = await runs.create_and_poll(body, options);
+      const response = await runs.createAndPoll(body, options);
 
       expect(mockClient.post).toHaveBeenCalledWith('/maestro/runs', { body });
       expect(mockClient.get).toHaveBeenCalledWith('/maestro/runs/run_123');
@@ -286,7 +312,7 @@ describe('Maestro Runs', () => {
       const error = new AI21Error();
       mockClient.post.mockRejectedValue(error);
 
-      await expect(runs.create_and_poll(body)).rejects.toThrow();
+      await expect(runs.createAndPoll(body)).rejects.toThrow();
     });
 
     it('should handle polling errors', async () => {
@@ -306,7 +332,7 @@ describe('Maestro Runs', () => {
       mockClient.post.mockResolvedValue(createResponse);
       mockClient.get.mockRejectedValue(error);
 
-      await expect(runs.create_and_poll(body)).rejects.toThrow();
+      await expect(runs.createAndPoll(body)).rejects.toThrow();
     });
   });