firecrawl 1.1.1__tar.gz → 1.2.0__tar.gz

{firecrawl-1.1.1 → firecrawl-1.2.0}/PKG-INFO

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

{firecrawl-1.1.1 → firecrawl-1.2.0}/firecrawl/__init__.py

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

{firecrawl-1.1.1 → firecrawl-1.2.0}/firecrawl/firecrawl.py

@@ -59,21 +59,31 @@ class FirecrawlApp:
 
         # If there are additional params, process them
         if params:
-            # Initialize extractorOptions if present
-            extractor_options = params.get('extractorOptions', {})
-            # Check and convert the extractionSchema if it's a Pydantic model
-            if 'extractionSchema' in extractor_options:
-                if hasattr(extractor_options['extractionSchema'], 'schema'):
-                    extractor_options['extractionSchema'] = extractor_options['extractionSchema'].schema()
-                # Ensure 'mode' is set, defaulting to 'llm-extraction' if not explicitly provided
-                extractor_options['mode'] = extractor_options.get('mode', 'llm-extraction')
-                # Update the scrape_params with the processed extractorOptions
-                scrape_params['extractorOptions'] = extractor_options
-
-            # Include any other params directly at the top level of scrape_params
-            for key, value in params.items():
-                if key != 'extractorOptions':
-                    scrape_params[key] = value
+            if self.version == 'v0':
+                # Handle extractorOptions (for v0 compatibility)
+                extractor_options = params.get('extractorOptions', {})
+                if extractor_options:
+                    if 'extractionSchema' in extractor_options and hasattr(extractor_options['extractionSchema'], 'schema'):
+                        extractor_options['extractionSchema'] = extractor_options['extractionSchema'].schema()
+                    extractor_options['mode'] = extractor_options.get('mode', 'llm-extraction')
+                    scrape_params['extractorOptions'] = extractor_options
+
+                # Include any other params directly at the top level of scrape_params
+                for key, value in params.items():
+                    if key not in ['extractorOptions']:
+                        scrape_params[key] = value
+            elif self.version == 'v1':
+                # Handle extract (for v1)
+                extract = params.get('extract', {})
+                if extract:
+                    if 'schema' in extract and hasattr(extract['schema'], 'schema'):
+                        extract['schema'] = extract['schema'].schema()
+                    scrape_params['extract'] = extract
+
+                # Include any other params directly at the top level of scrape_params
+                for key, value in params.items():
+                    if key not in ['extract']:
+                        scrape_params[key] = value
 
         endpoint = f'/v1/scrape'
         # Make the POST request with the prepared headers and JSON data

{firecrawl-1.1.1 → firecrawl-1.2.0}/firecrawl.egg-info/PKG-INFO

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