schemathesis 3.26.1__tar.gz → 3.26.2__tar.gz

{schemathesis-3.26.1 → schemathesis-3.26.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: schemathesis
-Version: 3.26.1
+Version: 3.26.2
 Summary: Property-based testing framework for Open API and GraphQL based apps
 Project-URL: Documentation, https://schemathesis.readthedocs.io/en/stable/
 Project-URL: Changelog, https://schemathesis.readthedocs.io/en/stable/changelog.html
@@ -39,7 +39,7 @@ Requires-Dist: hypothesis<7,>=6.84.3; python_version > '3.8'
 Requires-Dist: hypothesis[zoneinfo]<7,>=6.84.3; python_version == '3.8'
 Requires-Dist: jsonschema<5.0,>=4.18.0
 Requires-Dist: junit-xml<2.0,>=1.9
-Requires-Dist: pyrate-limiter<3.0,>=2.10
+Requires-Dist: pyrate-limiter<4.0,>=2.10
 Requires-Dist: pytest-subtests<0.8.0,>=0.2.1
 Requires-Dist: pytest<9,>=4.6.4
 Requires-Dist: pyyaml<7.0,>=5.1

{schemathesis-3.26.1 → schemathesis-3.26.2}/docs/changelog.rst

@@ -1,9 +1,22 @@
 Changelog
 =========
 
-:version:`Unreleased <v3.26.1...HEAD>` - TBD
+:version:`Unreleased <v3.26.2...HEAD>` - TBD
 --------------------------------------------
 
+.. _v3.26.2:
+
+:version:`3.26.2 <v3.26.1...v3.26.2>` - 2024-04-06
+--------------------------------------------------
+
+**Added**
+
+- Support for ``pyrate-limiter>=3.0``.
+
+**Fixed**
+
+- Excluding ``\x00`` bytes as a result of probes.
+
 .. _v3.26.1:
 
 :version:`3.26.1 <v3.26.0...v3.26.1>` - 2024-04-04

{schemathesis-3.26.1 → schemathesis-3.26.2}/docs/extending.rst

@@ -24,7 +24,13 @@ They can be used to limit the test input to certain criteria, modify the generat
         return query["key"] != "42"
 
 Hooks are identified and applied based on their function name, utilized through a decorator, like ``@schemathesis.hook``. 
-The function name, such as ``filter_query``, indicates it's a hook to filter query parameters. 
+The function name, such as ``filter_query``, indicates it's a hook to filter query parameters.
+
+.. note::
+
+    The second argument could be ``None`` if there are no parameters of such a kind or if it is optional.
+    Keep it in mind when acessing the keys of the dictionary.
+
 When dealing with multiple hooks that serve similar purposes, especially across different schemas within the same file, custom names can be assigned as the first argument in the decorator to avoid conflicts and maintain clarity.
 
 .. code:: python

{schemathesis-3.26.1 → schemathesis-3.26.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "schemathesis"
-version = "3.26.1"
+version = "3.26.2"
 description = "Property-based testing framework for Open API and GraphQL based apps"
 keywords = ["pytest", "hypothesis", "openapi", "graphql", "testing"]
 authors = [{ name = "Dmitry Dygalo", email = "dmitry@dygalo.dev" }]
@@ -42,7 +42,7 @@ dependencies = [
     "hypothesis_jsonschema>=0.23.1,<0.24",
     "jsonschema>=4.18.0,<5.0",
     "junit-xml>=1.9,<2.0",
-    "pyrate-limiter>=2.10,<3.0",
+    "pyrate-limiter>=2.10,<4.0",
     "pytest-subtests>=0.2.1,<0.8.0",
     "pytest>=4.6.4,<9",
     "PyYAML>=5.1,<7.0",
@@ -160,6 +160,7 @@ known-third-party = ["_pytest", "aiohttp", "click", "fastapi", "flask", "graphen
 [tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401"]
 "_compat.py" = ["F401"]
+"_rate_limiter.py" = ["F401"]
 
 [tool.ruff.format]
 skip-magic-trailing-comma = false

{schemathesis-3.26.1 → schemathesis-3.26.2}/src/schemathesis/_dependency_versions.py

@@ -16,3 +16,6 @@ IS_PYTEST_ABOVE_8 = PYTEST_VERSION >= version.parse("8.0.0")
 
 HYPOTHESIS_VERSION = version.parse(metadata.version("hypothesis"))
 HYPOTHESIS_HAS_STATEFUL_NAMING_IMPROVEMENTS = HYPOTHESIS_VERSION >= version.parse("6.98.14")
+
+PYRATE_LIMITER_VERSION = version.parse(metadata.version("pyrate-limiter"))
+IS_PYRATE_LIMITER_ABOVE_3 = PYRATE_LIMITER_VERSION >= version.parse("3.0")

schemathesis-3.26.2/src/schemathesis/_rate_limiter.py

@@ -0,0 +1,6 @@
+from ._dependency_versions import IS_PYRATE_LIMITER_ABOVE_3
+
+if IS_PYRATE_LIMITER_ABOVE_3:
+    from pyrate_limiter import Limiter, Rate, RateItem
+else:
+    from pyrate_limiter import Limiter, RequestRate as Rate

{schemathesis-3.26.1 → schemathesis-3.26.2}/src/schemathesis/schemas.py

@@ -40,6 +40,7 @@ from .generation import (
     DataGenerationMethodInput,
     GenerationConfig,
 )
+from ._dependency_versions import IS_PYRATE_LIMITER_ABOVE_3
 from .exceptions import OperationSchemaError, UsageError
 from .hooks import HookContext, HookDispatcher, HookScope, dispatch
 from .internal.result import Result, Ok
@@ -423,7 +424,10 @@ class BaseSchema(Mapping):
         """Limit the rate of sending generated requests."""
         label = urlparse(self.base_url).netloc
         if self.rate_limiter is not None:
-            return self.rate_limiter.ratelimit(label, delay=True, max_delay=0)
+            if IS_PYRATE_LIMITER_ABOVE_3:
+                self.rate_limiter.try_acquire(label)
+            else:
+                return self.rate_limiter.ratelimit(label, delay=True, max_delay=0)
         return nullcontext()
 
     def _get_payload_schema(self, definition: dict[str, Any], media_type: str) -> dict[str, Any] | None:

{schemathesis-3.26.1 → schemathesis-3.26.2}/src/schemathesis/specs/openapi/_hypothesis.py

@@ -43,7 +43,9 @@ StrategyFactory = Callable[[Dict[str, Any], str, str, Optional[str], GenerationC
 
 
 def header_values(blacklist_characters: str = "\n\r") -> st.SearchStrategy[str]:
-    return st.text(alphabet=st.characters(min_codepoint=0, max_codepoint=255, blacklist_characters="\n\r"))
+    return st.text(
+        alphabet=st.characters(min_codepoint=0, max_codepoint=255, blacklist_characters=blacklist_characters)
+    )
 
 
 @lru_cache

{schemathesis-3.26.1 → schemathesis-3.26.2}/src/schemathesis/throttling.py

@@ -34,8 +34,8 @@ def invalid_rate(value: str) -> UsageError:
 
 
 def build_limiter(rate: str) -> Limiter:
-    from pyrate_limiter import Limiter, RequestRate
+    from ._rate_limiter import Limiter, Rate
 
     limit, interval = parse_units(rate)
-    rate = RequestRate(limit, interval)
+    rate = Rate(limit, interval)
     return Limiter(rate)

{schemathesis-3.26.1 → schemathesis-3.26.2}/test/test_lazy.py

@@ -1,5 +1,7 @@
 import pytest
 
+from schemathesis._dependency_versions import IS_PYRATE_LIMITER_ABOVE_3
+
 
 def test_default(testdir):
     # When LazySchema is used
@@ -71,16 +73,16 @@ def test_(request, case):
     result.assert_outcomes(passed=1, failed=1)
     if is_older_subtests:
         expected = [
-            r"test_invalid_operation.py::test_[GET /v1/valid] PASSED                   [ 25%]",
-            r"test_invalid_operation.py::test_[GET /v1/invalid] FAILED                 [ 50%]",
-            r"test_invalid_operation.py::test_[GET /v1/users] PASSED                   [ 75%]",
+            r"test_invalid_operation.py::test_\[GET /v1/valid\] PASSED *\[ 25%\]",
+            r"test_invalid_operation.py::test_\[GET /v1/invalid\] FAILED *\[ 50%\]",
+            r"test_invalid_operation.py::test_\[GET /v1/users\] PASSED *\[ 75%\]",
             r".*1 passed",
         ]
     else:
         expected = [
-            r"test_invalid_operation.py::test_[GET /v1/valid] SUBPASS                  [ 25%]",
-            r"test_invalid_operation.py::test_[GET /v1/invalid] SUBFAIL                [ 50%]",
-            r"test_invalid_operation.py::test_[GET /v1/users] SUBPASS                  [ 75%]",
+            r"test_invalid_operation.py::test_\[GET /v1/valid\] SUBPASS +\[ 25%\]",
+            r"test_invalid_operation.py::test_\[GET /v1/invalid\] SUBFAIL +\[ 50%\]",
+            r"test_invalid_operation.py::test_\[GET /v1/users\] SUBPASS +\[ 75%\]",
             r".*1 passed",
         ]
     result.stdout.re_match_lines(expected)
@@ -898,6 +900,17 @@ def test_(case):
 
 @pytest.mark.operations("success")
 def test_rate_limit(testdir, openapi3_schema_url):
+    if IS_PYRATE_LIMITER_ABOVE_3:
+        assertion = """
+    assert limiter.bucket_factory.bucket.rates[0].limit == 1
+    assert limiter.bucket_factory.bucket.rates[0].interval == 1000
+"""
+    else:
+        assertion = """
+    rate = limiter._rates[0]
+    assert rate.interval == 1
+    assert rate.limit == 1
+        """
     testdir.make_test(
         f"""
 @pytest.fixture
@@ -909,9 +922,7 @@ lazy_schema = schemathesis.from_pytest_fixture("api_schema", rate_limit="1/s")
 @lazy_schema.parametrize()
 def test_(case):
     limiter = case.operation.schema.rate_limiter
-    rate = limiter._rates[0]
-    assert rate.interval == 1
-    assert rate.limit == 1
+    {assertion}
 """,
     )
     result = testdir.runpytest()

{schemathesis-3.26.1 → schemathesis-3.26.2}/test/test_rate_limit.py

@@ -1,9 +1,11 @@
 import threading
 
 import pytest
-from pyrate_limiter import BucketFullException, RequestRate
+from pyrate_limiter import BucketFullException
 
 import schemathesis.graphql
+from schemathesis._rate_limiter import Rate
+from schemathesis._dependency_versions import IS_PYRATE_LIMITER_ABOVE_3
 
 
 @pytest.mark.parametrize(
@@ -16,10 +18,16 @@ import schemathesis.graphql
 @pytest.mark.operations("success")
 @pytest.mark.filterwarnings("ignore:.*method is good for exploring strategies.*")
 def test_maximum_requests(request, loader, fixture, mocker):
-    mocker.patch(
-        "pyrate_limiter.limit_context_decorator.LimitContextDecorator.delay_or_reraise",
-        side_effect=BucketFullException("41", RequestRate(5, 3600), 0.0),
-    )
+    if IS_PYRATE_LIMITER_ABOVE_3:
+        from pyrate_limiter import RateItem
+
+        target = "pyrate_limiter.limiter.Limiter.delay_or_raise"
+        rate_item = RateItem("test_item", timestamp=None)
+        side_effect = BucketFullException(rate_item, Rate(5, 3600))
+    else:
+        target = "pyrate_limiter.limit_context_decorator.LimitContextDecorator.delay_or_reraise"
+        side_effect = BucketFullException("41", Rate(5, 3600), 0.0)
+    mocker.patch(target, side_effect=side_effect)
     url = request.getfixturevalue(fixture)
     schema = loader(url, rate_limit="5/h")
     counter = 0