address comments

Author: tybug

hypothesis-python/RELEASE.rst

@@ -1,3 +1,3 @@
 RELEASE_TYPE: patch
 
-This patch fixes a bug where only interactively-generated values (via ``data.draw``) would be reported in the ``arguments`` field of our :doc:`observability output <observability>`. Now, all values are reported.
+This patch fixes a bug since :ref:`v6.99.13` where only interactively-generated values (via ``data.draw``) would be reported in the ``arguments`` field of our :doc:`observability output <observability>`. Now, all values are reported.

hypothesis-python/src/hypothesis/internal/conjecture/data.py

@@ -2531,7 +2531,10 @@ def draw(
                     in_gctime = gc_cumulative_time() - gc_start_time
                     self.draw_times[key] = time.perf_counter() - start_time - in_gctime
             except Exception as err:
-                add_note(err, f"while generating {key[9:]!r} from {strategy!r}")
+                add_note(
+                    err,
+                    f"while generating {key.removeprefix('generate:')!r} from {strategy!r}",
+                )
                 raise
             if TESTCASE_CALLBACKS:
                 self._observability_args[key] = to_jsonable(v)

hypothesis-python/src/hypothesis/internal/observability.py

@@ -63,7 +63,9 @@ def make_testcase(
         }[data.status],
         "status_reason": status_reason,
         "representation": string_repr,
-        "arguments": arguments or {},
+        "arguments": {
+            k.removeprefix("generate:"): v for k, v in (arguments or {}).items()
+        },
         "how_generated": how_generated,  # iid, mutation, etc.
         "features": {
             **{

hypothesis-python/src/hypothesis/strategies/_internal/core.py

@@ -2113,13 +2113,13 @@ def __repr__(self):
     def draw(self, strategy: SearchStrategy[Ex], label: Any = None) -> Ex:
         check_strategy(strategy, "strategy")
         self.count += 1
-        printer = RepresentationPrinter(context=current_build_context())
         desc = f"Draw {self.count}{'' if label is None else f' ({label})'}"
         with deprecate_random_in_strategy("{}from {!r}", desc, strategy):
             result = self.conjecture_data.draw(strategy, observe_as=f"generate:{desc}")
 
         # optimization to avoid needless printer.pretty
         if should_note():
+            printer = RepresentationPrinter(context=current_build_context())
             printer.text(f"{desc}: ")
             printer.pretty(result)
             note(printer.getvalue())

hypothesis-python/tests/cover/test_observability.py

@@ -80,10 +80,10 @@ def f(v1, v2, data):
     test_cases = [tc for tc in observations if tc["type"] == "test_case"]
     for test_case in test_cases:
         assert list(test_case["arguments"].keys()) == [
-            "generate:v1",
-            "generate:v2",
-            "generate:data",
-            "generate:Draw 1",
+            "v1",
+            "v2",
+            "data",
+            "Draw 1",
         ], test_case
 
 
@@ -98,10 +98,10 @@ def f(named1, named2, data):
     test_cases = [tc for tc in observations if tc["type"] == "test_case"]
     for test_case in test_cases:
         assert list(test_case["arguments"].keys()) == [
-            "generate:named1",
-            "generate:named2",
-            "generate:data",
-            "generate:Draw 1",
+            "named1",
+            "named2",
+            "data",
+            "Draw 1",
         ], test_case