From ae60410cc1550c6601ffff60316666cffcb7c3c0 Mon Sep 17 00:00:00 2001 From: Travis Fischer Date: Fri, 16 Jun 2023 16:16:53 -0700 Subject: [PATCH] =?UTF-8?q?=E2=9D=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tools/diffbot.ts | 13 +++++-------- src/tools/search-and-crawl.ts | 9 ++++----- src/tools/serpapi.ts | 11 +++++------ 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/tools/diffbot.ts b/src/tools/diffbot.ts index adfe80ce..04560522 100644 --- a/src/tools/diffbot.ts +++ b/src/tools/diffbot.ts @@ -104,9 +104,9 @@ export class DiffbotTool extends BaseTask { url: ctx.input!.url }) - this._logger.info(res, `Diffbot response for url "${ctx.input!.url}"`) + // this._logger.info(res, `Diffbot response for url "${ctx.input!.url}"`) - const pickedRes = { + const output = this.outputSchema.parse({ type: res.type, title: res.title, objects: res.objects.map((obj) => ({ @@ -126,12 +126,9 @@ export class DiffbotTool extends BaseTask { // tags: obj.tags?.map((tag) => tag.label) // images: obj.images?.map((image) => omit(image, 'diffbotUri')) })) - } + }) - this._logger.info( - pickedRes, - `Diffbot picked response for url "${ctx.input!.url}"` - ) - return this.outputSchema.parse(pickedRes) + this._logger.info(output, `Diffbot response for url "${ctx.input!.url}"`) + return output } } diff --git a/src/tools/search-and-crawl.ts b/src/tools/search-and-crawl.ts index 065ca224..14504b27 100644 --- a/src/tools/search-and-crawl.ts +++ b/src/tools/search-and-crawl.ts @@ -166,13 +166,12 @@ export class SearchAndCrawlTool extends BaseTask< ) ).flat() - const result = { + const output = this.outputSchema.parse({ ...omit(search.result, 'organic_results'), scrape_results: scrapeResults - } + }) - this._logger.info(result, `SearchAndCrawl response for query "${query}"`) - - return this.outputSchema.parse(result) + this._logger.info(output, `SearchAndCrawl response for query "${query}"`) + return output } } diff --git a/src/tools/serpapi.ts b/src/tools/serpapi.ts index 9f8e6551..c15cb811 100644 --- a/src/tools/serpapi.ts +++ b/src/tools/serpapi.ts @@ -103,11 +103,6 @@ export class SerpAPITool extends BaseTask { // results manuall }) - this._logger.info( - res, - `SerpAPI response for query ${JSON.stringify(ctx.input, null, 2)}"` - ) - const twitterResults = res.twitter_results ? { ...res.twitter_results, @@ -120,11 +115,15 @@ export class SerpAPITool extends BaseTask { } : undefined - return this.outputSchema.parse({ + const output = this.outputSchema.parse({ knowledge_graph: res.knowledge_graph, answer_box: res.answer_box, organic_results: res.organic_results?.slice(0, numResults), twitter_results: twitterResults }) + + this._logger.info(output, `SerpAPI response for query "${query}"`) + + return output } }