Move float, integer, string, byte, and boolean drawing logic into PrimitiveProvider

hypothesis-python/RELEASE.rst

@@ -0,0 +1,8 @@
+RELEASE_TYPE: patch
+
+This patch refactors some internals.  There is no user-visible change,
+but we hope to improve performance and unlock support for alternative
+backends such as :pypi:`symbolic execution with crosshair <crosshair-tool>`
+in future (:issue:`3086`).
+
+Thanks to Liam DeVoe for this fantastic contribution!

hypothesis-python/src/hypothesis/extra/_array_helpers.py

@@ -13,7 +13,7 @@
 
 from hypothesis import assume, strategies as st
 from hypothesis.errors import InvalidArgument
-from hypothesis.internal.conjecture import utils as cu
+from hypothesis.internal.conjecture.utils import _calc_p_continue
 from hypothesis.internal.coverage import check_function
 from hypothesis.internal.validation import check_type, check_valid_interval
 from hypothesis.strategies._internal.utils import defines_strategy
@@ -562,6 +562,9 @@ def _draw_loop_dimensions(self, data, use=None):
             assert len(use) == self.num_shapes
             assert all(isinstance(x, bool) for x in use)
 
+        _gap = self.max_dims - self.min_dims
+        p_keep_extending_shape = _calc_p_continue(desired_avg=_gap / 2, max_size=_gap)
+
         for dim_count in range(1, self.max_dims + 1):
             dim = dim_count - 1
 
@@ -596,9 +599,7 @@ def _draw_loop_dimensions(self, data, use=None):
                 # shape-tuple even if it is no longer being added to.
                 # This helps to ensure more stable shrinking behavior.
                 if self.min_dims < dim_count:
-                    use[shape_id] &= cu.biased_coin(
-                        data, 1 - 1 / (1 + self.max_dims - dim)
-                    )
+                    use[shape_id] &= data.draw_boolean(p_keep_extending_shape)
 
                 if use[shape_id]:
                     shape.append(side)

hypothesis-python/src/hypothesis/extra/array_api.py

@@ -422,7 +422,7 @@ def do_draw(self, data):
             seen = set()
 
             while elements.more():
-                i = cu.integer_range(data, 0, self.array_size - 1)
+                i = data.draw_integer(0, self.array_size - 1)
                 if i in assigned:
                     elements.reject()
                     continue

hypothesis-python/src/hypothesis/extra/numpy.py

@@ -330,7 +330,7 @@ def do_draw(self, data):
             seen = set()
 
             while elements.more():
-                i = cu.integer_range(data, 0, self.array_size - 1)
+                i = data.draw_integer(0, self.array_size - 1)
                 if not needs_fill[i]:
                     elements.reject()
                     continue