From a2e38b61217d5ecb6687b94b648e38543e0ec97c Mon Sep 17 00:00:00 2001 From: rafaelsideguide <150964962+rafaelsideguide@users.noreply.github.com> Date: Tue, 6 Aug 2024 13:56:44 -0300 Subject: [PATCH] Improvements on default values and description --- .../firecrawl_crawl_website_tool.py | 5 +++++ .../firecrawl_scrape_website_tool.py | 9 ++++++++- .../tools/firecrawl_search_tool/firecrawl_search_tool.py | 5 +++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/crewai_tools/tools/firecrawl_crawl_website_tool/firecrawl_crawl_website_tool.py b/src/crewai_tools/tools/firecrawl_crawl_website_tool/firecrawl_crawl_website_tool.py index 5c796189a..7c0b4c7fb 100644 --- a/src/crewai_tools/tools/firecrawl_crawl_website_tool/firecrawl_crawl_website_tool.py +++ b/src/crewai_tools/tools/firecrawl_crawl_website_tool/firecrawl_crawl_website_tool.py @@ -26,6 +26,11 @@ class FirecrawlCrawlWebsiteTool(BaseTool): self.firecrawl = FirecrawlApp(api_key=api_key) def _run(self, url: str, crawler_options: Optional[Dict[str, Any]] = None, page_options: Optional[Dict[str, Any]] = None): + if (crawler_options is None): + crawler_options = {} + if (page_options is None): + page_options = {} + options = { "crawlerOptions": crawler_options, "pageOptions": page_options diff --git a/src/crewai_tools/tools/firecrawl_scrape_website_tool/firecrawl_scrape_website_tool.py b/src/crewai_tools/tools/firecrawl_scrape_website_tool/firecrawl_scrape_website_tool.py index 8540b13ff..29d6e238b 100644 --- a/src/crewai_tools/tools/firecrawl_scrape_website_tool/firecrawl_scrape_website_tool.py +++ b/src/crewai_tools/tools/firecrawl_scrape_website_tool/firecrawl_scrape_website_tool.py @@ -6,7 +6,7 @@ class FirecrawlScrapeWebsiteToolSchema(BaseModel): url: str = Field(description="Website URL") page_options: Optional[Dict[str, Any]] = Field(default=None, description="Options for page scraping") extractor_options: Optional[Dict[str, Any]] = Field(default=None, description="Options for data extraction") - timeout: Optional[int] = Field(default=None, description="Timeout for the scraping operation") + timeout: Optional[int] = Field(default=None, description="Timeout in milliseconds for the scraping operation. The default value is 30000.") class FirecrawlScrapeWebsiteTool(BaseTool): name: str = "Firecrawl web scrape tool" @@ -27,6 +27,13 @@ class FirecrawlScrapeWebsiteTool(BaseTool): self.firecrawl = FirecrawlApp(api_key=api_key) def _run(self, url: str, page_options: Optional[Dict[str, Any]] = None, extractor_options: Optional[Dict[str, Any]] = None, timeout: Optional[int] = None): + if page_options is None: + page_options = {} + if extractor_options is None: + extractor_options = {} + if timeout is None: + timeout = 30000 + options = { "pageOptions": page_options, "extractorOptions": extractor_options, diff --git a/src/crewai_tools/tools/firecrawl_search_tool/firecrawl_search_tool.py b/src/crewai_tools/tools/firecrawl_search_tool/firecrawl_search_tool.py index 89843f797..5b01ce8c5 100644 --- a/src/crewai_tools/tools/firecrawl_search_tool/firecrawl_search_tool.py +++ b/src/crewai_tools/tools/firecrawl_search_tool/firecrawl_search_tool.py @@ -26,6 +26,11 @@ class FirecrawlSearchTool(BaseTool): self.firecrawl = FirecrawlApp(api_key=api_key) def _run(self, query: str, page_options: Optional[Dict[str, Any]] = None, result_options: Optional[Dict[str, Any]] = None): + if (page_options is None): + page_options = {} + if (result_options is None): + result_options = {} + options = { "pageOptions": page_options, "resultOptions": result_options