History

fixes actions dict attributeError (#1824)

Rafael Miller committed 1 year ago

Commit e6f0b1e1 parent b23535c2 files · +10 −12Browse files

Showing the changes to apps/python-sdk (2 of 2 files). Show all

Unified · Split

2 files
  1. apps/python-sdk/firecrawl/__init__.py +1 −1
  2. apps/python-sdk/firecrawl/firecrawl.py +9 −11
apps/python-sdk/firecrawl/__init__.py+1−1
@@ -13,7 +13,7 @@ import os · 12 unmodified lines
1313
1414 from .firecrawl import FirecrawlApp, AsyncFirecrawlApp, JsonConfig, ScrapeOptions, ChangeTrackingOptions # noqa
1515
16−__version__ = "2.16.1"
16+__version__ = "2.16.2"
1717
1818 # Define the logger for the Firecrawl project
1919 logger: logging.Logger = logging.getLogger("firecrawl")
apps/python-sdk/firecrawl/firecrawl.py+9−11
@@ -1372,8 +1372,8 @@ class FirecrawlApp: · 1371 unmodified lines
13721372 if isinstance(json_options, dict) and "schema" in json_options:
13731373 json_options["schema"] = self._ensure_schema_dict(json_options["schema"])
13741374 scrape_params['jsonOptions'] = json_options if isinstance(json_options, dict) else json_options.dict(exclude_none=True)
1375− if actions is not None:
1376− scrape_params['actions'] = [action.dict(exclude_none=True) for action in actions]
1375+ if actions:
1376+ scrape_params['actions'] = [action if isinstance(action, dict) else action.dict(exclude_none=True) for action in actions]
13771377 if agent is not None:
13781378 scrape_params['agent'] = agent.dict(exclude_none=True)
13791379 if max_concurrency is not None:
@@ -1513,8 +1513,8 @@ class FirecrawlApp: · 133 unmodified lines
15131513 if isinstance(json_options, dict) and "schema" in json_options:
15141514 json_options["schema"] = self._ensure_schema_dict(json_options["schema"])
15151515 scrape_params['jsonOptions'] = json_options if isinstance(json_options, dict) else json_options.dict(exclude_none=True)
1516− if actions is not None:
1517− scrape_params['actions'] = [action.dict(exclude_none=True) for action in actions]
1516+ if actions:
1517+ scrape_params['actions'] = [action if isinstance(action, dict) else action.dict(exclude_none=True) for action in actions]
15181518 if agent is not None:
15191519 scrape_params['agent'] = agent.dict(exclude_none=True)
15201520 if max_concurrency is not None:
@@ -1649,8 +1649,8 @@ class FirecrawlApp: · 128 unmodified lines
16491649 if isinstance(json_options, dict) and "schema" in json_options:
16501650 json_options["schema"] = self._ensure_schema_dict(json_options["schema"])
16511651 scrape_params['jsonOptions'] = json_options if isinstance(json_options, dict) else json_options.dict(exclude_none=True)
1652− if actions is not None:
1653− scrape_params['actions'] = [action.dict(exclude_none=True) for action in actions]
1652+ if actions:
1653+ scrape_params['actions'] = [action if isinstance(action, dict) else action.dict(exclude_none=True) for action in actions]
16541654 if agent is not None:
16551655 scrape_params['agent'] = agent.dict(exclude_none=True)
16561656 if max_concurrency is not None:
@@ -3074,7 +3074,6 @@ class AsyncFirecrawlApp(FirecrawlApp): · 1417 unmodified lines
30743074 scrape_params['jsonOptions'] = json_options if isinstance(json_options, dict) else json_options.dict(exclude_none=True)
30753075 if actions:
30763076 scrape_params['actions'] = [action if isinstance(action, dict) else action.dict(exclude_none=True) for action in actions]
3077−
30783077 if 'extract' in scrape_params and scrape_params['extract'] and 'schema' in scrape_params['extract']:
30793078 scrape_params['extract']['schema'] = self._ensure_schema_dict(scrape_params['extract']['schema'])
30803079 if 'jsonOptions' in scrape_params and scrape_params['jsonOptions'] and 'schema' in scrape_params['jsonOptions']:
@@ -3199,8 +3198,7 @@ class AsyncFirecrawlApp(FirecrawlApp): · 118 unmodified lines
31993198 if isinstance(json_options, dict) and "schema" in json_options:
32003199 json_options["schema"] = self._ensure_schema_dict(json_options["schema"])
32013200 scrape_params['jsonOptions'] = json_options if isinstance(json_options, dict) else json_options.dict(exclude_none=True)
3202− if actions is not None:
3203− scrape_params['actions'] = [action.dict(exclude_none=True) for action in actions]
3201+
32043202 if agent is not None:
32053203 scrape_params['agent'] = agent.dict(exclude_none=True)
32063204
@@ -3339,8 +3337,8 @@ class AsyncFirecrawlApp(FirecrawlApp): · 132 unmodified lines
33393337 if isinstance(json_options, dict) and "schema" in json_options:
33403338 json_options["schema"] = self._ensure_schema_dict(json_options["schema"])
33413339 scrape_params['jsonOptions'] = json_options if isinstance(json_options, dict) else json_options.dict(exclude_none=True)
3342− if actions is not None:
3343− scrape_params['actions'] = [action.dict(exclude_none=True) for action in actions]
3340+ if actions:
3341+ scrape_params['actions'] = [action if isinstance(action, dict) else action.dict(exclude_none=True) for action in actions]
33443342 if agent is not None:
33453343 scrape_params['agent'] = agent.dict(exclude_none=True)
33463344 if zero_data_retention is not None: