firecrawl-py 3.1.0__py3-none-any.whl → 3.1.1__py3-none-any.whl

firecrawl/__init__.py

@@ -17,7 +17,7 @@ from .v1 import (
     V1ChangeTrackingOptions,
 )
 
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 # Define the logger for the Firecrawl project
 logger: logging.Logger = logging.getLogger("firecrawl")
@@ -84,4 +84,4 @@ __all__ = [
     'V1JsonConfig',
     'V1ScrapeOptions',
     'V1ChangeTrackingOptions',
-]
+]

firecrawl/__tests__/unit/v2/methods/test_search_validation.py

@@ -11,7 +11,7 @@ class TestSearchValidation:
         request = SearchRequest(query="")
         with pytest.raises(ValueError, match="Query cannot be empty"):
             _validate_search_request(request)
-        
+
         request = SearchRequest(query="   ")
         with pytest.raises(ValueError, match="Query cannot be empty"):
             _validate_search_request(request)
@@ -22,12 +22,12 @@ class TestSearchValidation:
         request = SearchRequest(query="test", limit=0)
         with pytest.raises(ValueError, match="Limit must be positive"):
             _validate_search_request(request)
-        
+
         # Negative limit
         request = SearchRequest(query="test", limit=-1)
         with pytest.raises(ValueError, match="Limit must be positive"):
             _validate_search_request(request)
-        
+
         # Too high limit
         request = SearchRequest(query="test", limit=101)
         with pytest.raises(ValueError, match="Limit cannot exceed 100"):
@@ -39,12 +39,12 @@ class TestSearchValidation:
         request = SearchRequest(query="test", timeout=0)
         with pytest.raises(ValueError, match="Timeout must be positive"):
             _validate_search_request(request)
-        
+
         # Negative timeout
         request = SearchRequest(query="test", timeout=-1000)
         with pytest.raises(ValueError, match="Timeout must be positive"):
             _validate_search_request(request)
-        
+
         # Too high timeout
         request = SearchRequest(query="test", timeout=300001)
         with pytest.raises(ValueError, match="Timeout cannot exceed 300000ms"):
@@ -56,12 +56,12 @@ class TestSearchValidation:
         request = SearchRequest(query="test", sources=["invalid_source"])
         with pytest.raises(ValueError, match="Invalid source type"):
             _validate_search_request(request)
-        
+
         # Invalid object source
         request = SearchRequest(query="test", sources=[Source(type="invalid_source")])
         with pytest.raises(ValueError, match="Invalid source type"):
             _validate_search_request(request)
-        
+
         # Mixed valid/invalid sources
         request = SearchRequest(query="test", sources=["web", "invalid_source"])
         with pytest.raises(ValueError, match="Invalid source type"):
@@ -73,7 +73,7 @@ class TestSearchValidation:
         request = SearchRequest(query="test", location="")
         with pytest.raises(ValueError, match="Location must be a non-empty string"):
             _validate_search_request(request)
-        
+
         # Whitespace location
         request = SearchRequest(query="test", location="   ")
         with pytest.raises(ValueError, match="Location must be a non-empty string"):
@@ -82,19 +82,49 @@ class TestSearchValidation:
     def test_validate_invalid_tbs(self):
         """Test validation of invalid tbs values."""
         invalid_tbs_values = ["invalid", "qdr:x", "yesterday", "last_week"]
-        
+
         for invalid_tbs in invalid_tbs_values:
             request = SearchRequest(query="test", tbs=invalid_tbs)
             with pytest.raises(ValueError, match="Invalid tbs value"):
                 _validate_search_request(request)
 
+    def test_validate_custom_date_ranges(self):
+        """Test validation of custom date range formats."""
+        valid_custom_ranges = [
+            "cdr:1,cd_min:1/1/2024,cd_max:12/31/2024",
+            "cdr:1,cd_min:12/1/2024,cd_max:12/31/2024",
+            "cdr:1,cd_min:2/28/2023,cd_max:3/1/2023",
+            "cdr:1,cd_min:10/15/2023,cd_max:11/15/2023"
+        ]
+
+        for valid_range in valid_custom_ranges:
+            request = SearchRequest(query="test", tbs=valid_range)
+            validated = _validate_search_request(request)
+            assert validated == request
+
+    def test_validate_invalid_custom_date_ranges(self):
+        """Test validation of invalid custom date range formats."""
+        # Invalid custom date ranges
+        invalid_custom_ranges = [
+            "cdr:1,cd_min:2/28/2023",  # Missing cd_max
+            "cdr:1,cd_max:2/28/2023",  # Missing cd_min
+            "cdr:2,cd_min:1/1/2024,cd_max:12/31/2024",  # Wrong cdr value
+            "cdr:cd_min:1/1/2024,cd_max:12/31/2024",  # Missing :1
+            "custom:1,cd_min:1/1/2024,cd_max:12/31/2024"  # Wrong prefix
+        ]
+
+        for invalid_range in invalid_custom_ranges:
+            request = SearchRequest(query="test", tbs=invalid_range)
+            with pytest.raises(ValueError, match="Invalid"):
+                _validate_search_request(request)
+
     def test_validate_valid_requests(self):
         """Test that valid requests pass validation."""
         # Minimal valid request
         request = SearchRequest(query="test")
         validated = _validate_search_request(request)
         assert validated == request
-        
+
         # Request with all optional parameters
         request = SearchRequest(
             query="test query",
@@ -107,7 +137,7 @@ class TestSearchValidation:
         )
         validated = _validate_search_request(request)
         assert validated == request
-        
+
         # Request with object sources
         request = SearchRequest(
             query="test",
@@ -122,17 +152,17 @@ class TestSearchValidation:
         request = SearchRequest(query="test", limit=100)
         validated = _validate_search_request(request)
         assert validated == request
-        
+
         # Maximum valid timeout
         request = SearchRequest(query="test", timeout=300000)
         validated = _validate_search_request(request)
         assert validated == request
-        
+
         # Minimum valid limit
         request = SearchRequest(query="test", limit=1)
         validated = _validate_search_request(request)
         assert validated == request
-        
+
         # Minimum valid timeout
         request = SearchRequest(query="test", timeout=1)
         validated = _validate_search_request(request)
@@ -191,16 +221,16 @@ class TestSearchRequestModel:
         data1 = request1.model_dump(by_alias=True)
         assert "ignore_invalid_urls" in data1  # No alias, uses snake_case
         assert data1["ignore_invalid_urls"] is None
-        
+
         # Test with explicit False value
         request2 = SearchRequest(
             query="test",
             ignore_invalid_urls=False,
             scrape_options=ScrapeOptions(formats=["markdown"])
         )
-        
+
         # Check that aliases are used in model_dump with by_alias=True
         data2 = request2.model_dump(by_alias=True)
         assert "ignore_invalid_urls" in data2  # No alias, uses snake_case
         assert "scrape_options" in data2  # No alias, uses snake_case
-        assert data2["ignore_invalid_urls"] is False 
+        assert data2["ignore_invalid_urls"] is False

firecrawl/v2/methods/search.py

@@ -2,6 +2,7 @@
 Search functionality for Firecrawl v2 API.
 """
 
+import re
 from typing import Optional, Dict, Any, Union
 from ..types import SearchRequest, SearchData, SearchResult, Document
 from ..utils.normalize import normalize_document_input
@@ -119,11 +120,18 @@ def _validate_search_request(request: SearchRequest) -> SearchRequest:
     # Validate tbs (time-based search, if provided)
     if request.tbs is not None:
         valid_tbs_values = {
-            "qdr:d", "qdr:w", "qdr:m", "qdr:y",  # Google time filters
+            "qdr:h", "qdr:d", "qdr:w", "qdr:m", "qdr:y",  # Google time filters
             "d", "w", "m", "y"  # Short forms
         }
-        if request.tbs not in valid_tbs_values:
-            raise ValueError(f"Invalid tbs value: {request.tbs}. Valid values: {valid_tbs_values}")
+        
+        if request.tbs in valid_tbs_values:
+            pass  # Valid predefined value
+        elif request.tbs.startswith("cdr:"):
+            custom_date_pattern = r"^cdr:1,cd_min:\d{1,2}/\d{1,2}/\d{4},cd_max:\d{1,2}/\d{1,2}/\d{4}$"
+            if not re.match(custom_date_pattern, request.tbs):
+                raise ValueError(f"Invalid custom date range format: {request.tbs}. Expected format: cdr:1,cd_min:MM/DD/YYYY,cd_max:MM/DD/YYYY")
+        else:
+            raise ValueError(f"Invalid tbs value: {request.tbs}. Valid values: {valid_tbs_values} or custom date range format: cdr:1,cd_min:MM/DD/YYYY,cd_max:MM/DD/YYYY")
     
     # Validate scrape_options (if provided)
     if request.scrape_options is not None:
@@ -166,4 +174,4 @@ def _prepare_search_request(request: SearchRequest) -> Dict[str, Any]:
             data["scrapeOptions"] = scrape_data
         data.pop("scrape_options", None)
     
-    return data
+    return data

{firecrawl_py-3.1.0.dist-info → firecrawl_py-3.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: firecrawl-py
-Version: 3.1.0
+Version: 3.1.1
 Summary: Python SDK for Firecrawl API
 Home-page: https://github.com/firecrawl/firecrawl
 Author: Mendable.ai
@@ -40,6 +40,10 @@ Requires-Dist: websockets
 Requires-Dist: nest-asyncio
 Requires-Dist: pydantic
 Requires-Dist: aiohttp
+Dynamic: author
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
 
 # Firecrawl Python SDK
 

{firecrawl_py-3.1.0.dist-info → firecrawl_py-3.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-firecrawl/__init__.py,sha256=OoUlrci9zB9_QHxXASXoaO90qLMv0B1ck7yUsRhX7gE,2191
+firecrawl/__init__.py,sha256=-BUn8vFl0b_PPw4VJ0lV9y0BKsHBlOSfxGTPqGMZK7U,2192
 firecrawl/client.py,sha256=2BGIRTiW2eR6q3wu_g2s3VTQtrHYauoDeNF1YklQpHo,11089
 firecrawl/firecrawl.backup.py,sha256=v1FEN3jR4g5Aupg4xp6SLkuFvYMQuUKND2YELbYjE6c,200430
 firecrawl/types.py,sha256=yZ4iza0M1T2kxNbt-tLEOKH7o6mFKZZ11VAZGodHSq4,2734
@@ -27,7 +27,7 @@ firecrawl/__tests__/unit/v2/methods/test_crawl_validation.py,sha256=kErOmHSD01eM
 firecrawl/__tests__/unit/v2/methods/test_map_request_preparation.py,sha256=toVcgnMp_cFeYsIUuyKGEWZGp0nAAkzaeFGUbY0zY0o,1868
 firecrawl/__tests__/unit/v2/methods/test_scrape_request_preparation.py,sha256=wDOslsA5BN4kyezlaT5GeMv_Ifn8f461EaA7i5ujnaQ,3482
 firecrawl/__tests__/unit/v2/methods/test_search_request_preparation.py,sha256=14lUgFpQsiosgMKjDustBRVE0zXnHujBI76F8BC5PZ4,6072
-firecrawl/__tests__/unit/v2/methods/test_search_validation.py,sha256=PaV_kSgzjW8A3eFBCCn1-y4WFZBR2nf84NZk4UEBPX8,8275
+firecrawl/__tests__/unit/v2/methods/test_search_validation.py,sha256=7UGcNHpQzCpZbAPYjthfdPFWmAPcoApY-ED-khtuANs,9498
 firecrawl/__tests__/unit/v2/methods/test_usage_types.py,sha256=cCHHfa6agSjD0brQ9rcAcw2kaI9riUH5C0dXV-fqktg,591
 firecrawl/__tests__/unit/v2/methods/test_webhook.py,sha256=AvvW-bKpUA--Lvtif2bmUIp-AxiaMJ29ie1i9dk8WbI,4586
 firecrawl/__tests__/unit/v2/methods/aio/test_aio_crawl_params.py,sha256=9azJxVvDOBqUevLp-wBF9gF7Ptj-7nN6LOkPQncFX2M,456
@@ -53,7 +53,7 @@ firecrawl/v2/methods/crawl.py,sha256=4ZUmanHNuNtq9wbKMAZ3lenuPcNdOaV0kYXqMI5XJJ8
 firecrawl/v2/methods/extract.py,sha256=-Jr4BtraU3b7hd3JIY73V-S69rUclxyXyUpoQb6DCQk,4274
 firecrawl/v2/methods/map.py,sha256=4SADb0-lkbdOWDmO6k8_TzK0yRti5xsN40N45nUl9uA,2592
 firecrawl/v2/methods/scrape.py,sha256=CSHBwC-P91UfrW3zHirjNAs2h899FKcWvd1DY_4fJdo,1921
-firecrawl/v2/methods/search.py,sha256=AdiaisKW4I5_Cjr_UQZYiRqDHu3nNrZqpfG4U2OhM6c,6131
+firecrawl/v2/methods/search.py,sha256=HB17OorEHfZXZh8tvfSqVKxS9uYtqBX3Me4YAFMF7w0,6640
 firecrawl/v2/methods/usage.py,sha256=OJlkxwaB-AAtgO3WLr9QiqBRmjdh6GVhroCgleegupQ,1460
 firecrawl/v2/methods/aio/__init__.py,sha256=RocMJnGwnLIvGu3G8ZvY8INkipC7WHZiu2bE31eSyJs,35
 firecrawl/v2/methods/aio/batch.py,sha256=GS_xsd_Uib1fxFITBK1sH88VGzFMrIcqJVQqOvMQ540,3735
@@ -70,10 +70,10 @@ firecrawl/v2/utils/http_client.py,sha256=_n8mp4xi6GGihg662Lsv6TSlvw9zykyADwEk0fg
 firecrawl/v2/utils/http_client_async.py,sha256=P4XG6nTz6kKH3vCPTz6i7DRhbpK4IImRGaFvQFGBFRc,1874
 firecrawl/v2/utils/normalize.py,sha256=nlTU6QRghT1YKZzNZlIQj4STSRuSUGrS9cCErZIcY5w,3636
 firecrawl/v2/utils/validation.py,sha256=L8by7z-t6GuMGIYkK7il1BM8d-4_-sAdG9hDMF_LeG4,14518
+firecrawl_py-3.1.1.dist-info/licenses/LICENSE,sha256=nPCunEDwjRGHlmjvsiDUyIWbkqqyj3Ej84ntnh0g0zA,1084
 tests/test_change_tracking.py,sha256=_IJ5ShLcoj2fHDBaw-nE4I4lHdmDB617ocK_XMHhXps,4177
 tests/test_timeout_conversion.py,sha256=PWlIEMASQNhu4cp1OW_ebklnE9NCiigPnEFCtI5N3w0,3996
-firecrawl_py-3.1.0.dist-info/LICENSE,sha256=nPCunEDwjRGHlmjvsiDUyIWbkqqyj3Ej84ntnh0g0zA,1084
-firecrawl_py-3.1.0.dist-info/METADATA,sha256=h_fUaPhhCXCBDp4ezfQjwvdyw64Xi8fFtypU2aIzBjM,7308
-firecrawl_py-3.1.0.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-firecrawl_py-3.1.0.dist-info/top_level.txt,sha256=8T3jOaSN5mtLghO-R3MQ8KO290gIX8hmfxQmglBPdLE,16
-firecrawl_py-3.1.0.dist-info/RECORD,,
+firecrawl_py-3.1.1.dist-info/METADATA,sha256=JGp1wtMdsywSEAY520vzMJtol2Mq14v3CbC_ec6DSKA,7390
+firecrawl_py-3.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+firecrawl_py-3.1.1.dist-info/top_level.txt,sha256=8T3jOaSN5mtLghO-R3MQ8KO290gIX8hmfxQmglBPdLE,16
+firecrawl_py-3.1.1.dist-info/RECORD,,

{firecrawl_py-3.1.0.dist-info → firecrawl_py-3.1.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.38.4)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any