Skip to content

Supercharge your AI agents with data from the web and beyond. Building the library for superintelligence. 🔥

Nick: fixed js sdk

Nicolaseae393afb501
diff --git a/apps/js-sdk/firecrawl/src/index.ts b/apps/js-sdk/firecrawl/src/index.ts
index e97a26241..af9dbc756 100644
--- a/apps/js-sdk/firecrawl/src/index.ts
+++ b/apps/js-sdk/firecrawl/src/index.ts
@@ -290,7 +290,6 @@ export class FirecrawlError extends Error {
* Defines options for searching and scraping search results.
*/
export interface SearchParams {
- query: string;
limit?: number;
tbs?: string;
filter?: string;
@@ -401,26 +400,27 @@ export default class FirecrawlApp {
/**
* Searches using the Firecrawl API and optionally scrapes the results.
- * @param params - Parameters for the search request.
+ * @param query - The search query string.
+ * @param params - Optional parameters for the search request.
* @returns The response from the search operation.
*/
- async search(params: SearchParams): Promise<SearchResponse> {
+ async search(query: string, params?: SearchParams | Record<string, any>): Promise<SearchResponse> {
const headers: AxiosRequestHeaders = {
"Content-Type": "application/json",
Authorization: `Bearer ${this.apiKey}`,
} as AxiosRequestHeaders;
let jsonData: any = {
- query: params.query,
- limit: params.limit ?? 5,
- tbs: params.tbs,
- filter: params.filter,
- lang: params.lang ?? "en",
- country: params.country ?? "us",
- location: params.location,
- origin: params.origin ?? "api",
- timeout: params.timeout ?? 60000,
- scrapeOptions: params.scrapeOptions ?? { formats: [] },
+ query,
+ limit: params?.limit ?? 5,
+ tbs: params?.tbs,
+ filter: params?.filter,
+ lang: params?.lang ?? "en",
+ country: params?.country ?? "us",
+ location: params?.location,
+ origin: params?.origin ?? "api",
+ timeout: params?.timeout ?? 60000,
+ scrapeOptions: params?.scrapeOptions ?? { formats: [] },
};
if (jsonData?.scrapeOptions?.extract?.schema) {
@@ -456,7 +456,7 @@ export default class FirecrawlApp {
if (responseData.success) {
return {
success: true,
- data: responseData.data,
+ data: responseData.data as FirecrawlDocument<any>[],
warning: responseData.warning,
};
} else {
diff --git a/apps/python-sdk/firecrawl/firecrawl.py b/apps/python-sdk/firecrawl/firecrawl.py
index 249e94af9..271a13f06 100644
--- a/apps/python-sdk/firecrawl/firecrawl.py
+++ b/apps/python-sdk/firecrawl/firecrawl.py
@@ -21,22 +21,19 @@ import websockets
logger : logging.Logger = logging.getLogger("firecrawl")
-class FirecrawlApp:
- class SearchParams(pydantic.BaseModel):
- """
- Parameters for the search operation.
- """
- query: str
- limit: Optional[int] = 5
- tbs: Optional[str] = None
- filter: Optional[str] = None
- lang: Optional[str] = "en"
- country: Optional[str] = "us"
- location: Optional[str] = None
- origin: Optional[str] = "api"
- timeout: Optional[int] = 60000
- scrapeOptions: Optional[Dict[str, Any]] = None
+class SearchParams(pydantic.BaseModel):
+ query: str
+ limit: Optional[int] = 5
+ tbs: Optional[str] = None
+ filter: Optional[str] = None
+ lang: Optional[str] = "en"
+ country: Optional[str] = "us"
+ location: Optional[str] = None
+ origin: Optional[str] = "api"
+ timeout: Optional[int] = 60000
+ scrapeOptions: Optional[Dict[str, Any]] = None
+class FirecrawlApp:
class SearchResponse(pydantic.BaseModel):
"""
Response from the search operation.
@@ -133,60 +130,36 @@ class FirecrawlApp:
else:
self._handle_error(response, 'scrape URL')
- def search(self, params: Union[str, SearchParams, Dict[str, Any]]) -> SearchResponse:
+ def search(self, query: str, params: Optional[Union[Dict[str, Any], SearchParams]] = None) -> Dict[str, Any]:
"""
- Search using the Firecrawl API and optionally scrape the results.
+ Search for content using the Firecrawl API.
Args:
- params (Union[str, SearchParams, Dict[str, Any]]): Search parameters. Can be:
- - A string representing the search query
- - A SearchParams object
- - A dictionary with search parameters
+ query (str): The search query string.
+ params (Optional[Union[Dict[str, Any], SearchParams]]): Additional search parameters.
Returns:
- SearchResponse: The response from the search operation.
+ Dict[str, Any]: The search response containing success status and search results.
+ """
+ if params is None:
+ params = {}
- Raises:
- Exception: If the search operation fails.
- """
- # Convert string query to SearchParams
- if isinstance(params, str):
- params = self.SearchParams(query=params)
- # Convert dict to SearchParams
- elif isinstance(params, dict):
- params = self.SearchParams(**params)
-
- # Validate params
- if not isinstance(params, self.SearchParams):
- raise ValueError("Invalid search parameters")
-
- # Convert to dict for request
- json_data = params.model_dump(exclude_none=True)
-
- # Handle schema conversion if present in scrapeOptions
- if json_data.get('scrapeOptions', {}).get('extract', {}).get('schema'):
- try:
- schema = json_data['scrapeOptions']['extract']['schema']
- if isinstance(schema, dict):
- # Already a JSON schema
- pass
- else:
- # Try to convert from a Pydantic model
- schema = schema.model_json_schema()
- json_data['scrapeOptions']['extract']['schema'] = schema
- except Exception as e:
- logger.warning(f"Failed to convert schema: {e}")
+ if isinstance(params, dict):
+ search_params = SearchParams(query=query, **params)
+ else:
+ search_params = params
+ search_params.query = query
- headers = self._prepare_headers()
- response = self._post_request(f'{self.api_url}/v1/search', json_data, headers)
+ response = requests.post(
+ f"{self.api_url}/v1/search",
+ headers={"Authorization": f"Bearer {self.api_key}"},
+ json=search_params.dict(exclude_none=True)
+ )
- if response.status_code == 200:
- response_data = response.json()
- return self.SearchResponse(**response_data)
- else:
- self._handle_error(response, 'search')
+ if response.status_code != 200:
+ raise Exception(f"Request failed with status code {response.status_code}")
- return self.SearchResponse(success=False, data=[], error="Internal server error.")
+ return response.json()
def crawl_url(self, url: str,
params: Optional[Dict[str, Any]] = None,