firecrawl 1.6.0__tar.gz → 1.6.2__tar.gz

{firecrawl-1.6.0 → firecrawl-1.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: firecrawl
-Version: 1.6.0
+Version: 1.6.2
 Summary: Python SDK for Firecrawl API
 Home-page: https://github.com/mendableai/firecrawl
 Author: Mendable.ai

{firecrawl-1.6.0 → firecrawl-1.6.2}/firecrawl/__init__.py

@@ -13,7 +13,7 @@ import os
 
 from .firecrawl import FirecrawlApp # noqa
 
-__version__ = "1.6.0"
+__version__ = "1.6.2"
 
 # Define the logger for the Firecrawl project
 logger: logging.Logger = logging.getLogger("firecrawl")

{firecrawl-1.6.0 → firecrawl-1.6.2}/firecrawl/firecrawl.py

@@ -39,13 +39,6 @@ class FirecrawlApp:
         data: Optional[Any] = None
         error: Optional[str] = None
 
-    class ErrorResponse(pydantic.BaseModel):
-        """
-        Error response.
-        """
-        success: bool
-        error: str
-
     def __init__(self, api_key: Optional[str] = None, api_url: Optional[str] = None) -> None:
       """
       Initialize the FirecrawlApp instance with API key, API URL.
@@ -228,12 +221,12 @@ class FirecrawlApp:
                             if status_response.status_code != 200:
                                 logger.error(f"Failed to fetch next page: {status_response.status_code}")
                                 break
-                            status_data = status_response.json()
-                            data.extend(status_data.get('data', []))
+                            next_data = status_response.json()
+                            data.extend(next_data.get('data', []))
+                            status_data = next_data
                         except Exception as e:
                             logger.error(f"Error during pagination request: {e}")
                             break
-                        status_data.pop('next', None)
                     status_data['data'] = data
                     
             return {
@@ -437,12 +430,12 @@ class FirecrawlApp:
                             if status_response.status_code != 200:
                                 logger.error(f"Failed to fetch next page: {status_response.status_code}")
                                 break
-                            status_data = status_response.json()
-                            data.extend(status_data.get('data', []))
+                            next_data = status_response.json()
+                            data.extend(next_data.get('data', []))
+                            status_data = next_data
                         except Exception as e:
                             logger.error(f"Error during pagination request: {e}")
                             break
-                        status_data.pop('next', None)
                     status_data['data'] = data
 
             return {
@@ -460,7 +453,7 @@ class FirecrawlApp:
             self._handle_error(response, 'check batch scrape status')
 
 
-    def extract(self, urls: List[str], params: Optional[ExtractParams] = None) -> Union[ExtractResponse, ErrorResponse]:
+    def extract(self, urls: List[str], params: Optional[ExtractParams] = None) -> Any:
         """
         Extracts information from a URL using the Firecrawl API.
 
@@ -493,7 +486,11 @@ class FirecrawlApp:
                 headers
             )
             if response.status_code == 200:
-                return response.json()
+                data = response.json()
+                if data['success']:
+                    return data
+                else:
+                    raise Exception(f'Failed to extract. Error: {data["error"]}')
             else:
                 self._handle_error(response, "extract")
         except Exception as e:

{firecrawl-1.6.0 → firecrawl-1.6.2}/firecrawl.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: firecrawl
-Version: 1.6.0
+Version: 1.6.2
 Summary: Python SDK for Firecrawl API
 Home-page: https://github.com/mendableai/firecrawl
 Author: Mendable.ai