wrapture 1.0.0.dev4__tar.gz → 1.0.0.dev6__tar.gz

{wrapture-1.0.0.dev4/src/wrapture.egg-info → wrapture-1.0.0.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wrapture
-Version: 1.0.0.dev4
+Version: 1.0.0.dev6
 Summary: Monkey patch, test, and trace Python by attaching bindings to call sites, without modifying the code being observed. Built on wrapt.
 Author-email: Graham Dumpleton <Graham.Dumpleton@gmail.com>
 License-Expression: BSD-2-Clause
@@ -70,7 +70,10 @@ Start with the [getting started](https://wrapture.readthedocs.io/en/latest/getti
 page: everything on it can be pasted into a Python interpreter. Coming
 from `unittest.mock`? There is a
 [comparison page](https://wrapture.readthedocs.io/en/latest/coming-from-mock.html)
-mapping each mock idiom to its wrapture counterpart.
+mapping each mock idiom to its wrapture counterpart. After that, the
+worked examples, starting with
+[testing code that calls external services](https://wrapture.readthedocs.io/en/latest/example-external-services.html),
+each take one question you might arrive with and answer it end to end.
 
 ## Thirty seconds of it
 

{wrapture-1.0.0.dev4 → wrapture-1.0.0.dev6}/README.md

@@ -39,7 +39,10 @@ Start with the [getting started](https://wrapture.readthedocs.io/en/latest/getti
 page: everything on it can be pasted into a Python interpreter. Coming
 from `unittest.mock`? There is a
 [comparison page](https://wrapture.readthedocs.io/en/latest/coming-from-mock.html)
-mapping each mock idiom to its wrapture counterpart.
+mapping each mock idiom to its wrapture counterpart. After that, the
+worked examples, starting with
+[testing code that calls external services](https://wrapture.readthedocs.io/en/latest/example-external-services.html),
+each take one question you might arrive with and answer it end to end.
 
 ## Thirty seconds of it
 

{wrapture-1.0.0.dev4 → wrapture-1.0.0.dev6}/src/wrapture/__init__.py

@@ -17,7 +17,7 @@ def _format_version(parts: tuple[str, ...]) -> str:
     )
 
 
-__version_info__ = ("1", "0", "0", "dev4")
+__version_info__ = ("1", "0", "0", "dev6")
 __version__ = _format_version(__version_info__)
 
 from wrapt import MISSING

{wrapture-1.0.0.dev4 → wrapture-1.0.0.dev6}/src/wrapture/events.py

@@ -181,9 +181,17 @@ def _format_time(seconds: float) -> str:
 def _own_time(event: Event) -> float | None:
     # The execution-time basis for self-time arithmetic. A generator's
     # wall duration includes the consumer's time between yields, so its
-    # accumulated body time is the honest measure of the code itself;
-    # everything else uses its duration. None when the event has not
-    # closed with a time.
+    # accumulated body time is the honest measure of the code itself. A
+    # request has two phases of application code, the synchronous call
+    # and the body it then streams, and its own time is their sum, again
+    # leaving out the server's time between chunks. Everything else uses
+    # its duration. None when the event has not closed with a time.
+
+    if event.kind == "request" and event.body_duration is not None:
+        app_duration = event.data.get("app_duration")
+        if app_duration is None:
+            return event.duration
+        return float(app_duration) + event.body_duration
 
     if event.body_duration is not None:
         return event.body_duration

{wrapture-1.0.0.dev4 → wrapture-1.0.0.dev6}/src/wrapture/timeline.py

@@ -246,8 +246,13 @@ class Tape(Sink):
         def emit(event: Event) -> None:
             injected = " (injected)" if event.injected else ""
 
+            # A get event's str() already carries its value, so only the
+            # injected mark is added to it.
+
             if event.exception is not None:
                 marker = f"  !! {type(event.exception).__name__}{injected}"
+            elif event.kind == "get":
+                marker = injected
             elif event.result is not MISSING:
                 marker = f"  -> {event.result!r}{injected}"
             else:

{wrapture-1.0.0.dev4 → wrapture-1.0.0.dev6/src/wrapture.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wrapture
-Version: 1.0.0.dev4
+Version: 1.0.0.dev6
 Summary: Monkey patch, test, and trace Python by attaching bindings to call sites, without modifying the code being observed. Built on wrapt.
 Author-email: Graham Dumpleton <Graham.Dumpleton@gmail.com>
 License-Expression: BSD-2-Clause
@@ -70,7 +70,10 @@ Start with the [getting started](https://wrapture.readthedocs.io/en/latest/getti
 page: everything on it can be pasted into a Python interpreter. Coming
 from `unittest.mock`? There is a
 [comparison page](https://wrapture.readthedocs.io/en/latest/coming-from-mock.html)
-mapping each mock idiom to its wrapture counterpart.
+mapping each mock idiom to its wrapture counterpart. After that, the
+worked examples, starting with
+[testing code that calls external services](https://wrapture.readthedocs.io/en/latest/example-external-services.html),
+each take one question you might arrive with and answer it end to end.
 
 ## Thirty seconds of it
 

{wrapture-1.0.0.dev4 → wrapture-1.0.0.dev6}/tests/test_events.py

@@ -9,10 +9,16 @@ import gc
 import weakref
 from typing import Any
 
+import pytest
 from wrapt import MISSING
 
 from wrapture import Event
-from wrapture.events import _signature, _signature_cache, normalized_arguments
+from wrapture.events import (
+    _own_time,
+    _signature,
+    _signature_cache,
+    normalized_arguments,
+)
 
 
 def charge(amount: int, currency: str = "USD", *, retries: int = 3) -> None:
@@ -189,3 +195,21 @@ def test_cache_does_not_keep_the_function_alive() -> None:
 
     gc.collect()
     assert alive() is None
+
+
+def test_own_time_of_a_request_sums_both_application_phases() -> None:
+    # A request's own time is the synchronous call plus the body it
+    # produced, not the wall time that includes the server between chunks.
+
+    request = Event(kind="request", path="app:wsgi_app", duration=1.0)
+    request.body_duration = 0.2
+    request.data["app_duration"] = 0.3
+
+    assert _own_time(request) == pytest.approx(0.5)
+
+
+def test_own_time_of_a_generator_is_its_body_time() -> None:
+    call = Event(kind="call", path="mod:gen", duration=1.0)
+    call.body_duration = 0.25
+
+    assert _own_time(call) == 0.25

{wrapture-1.0.0.dev4 → wrapture-1.0.0.dev6}/tests/test_timeline.py

@@ -354,6 +354,18 @@ def test_tree_renders_nesting_results_and_failures() -> None:
     assert lines[2] == "Gateway.refund(amount=100)  !! TimeoutError (injected)"
 
 
+def test_tree_shows_a_get_event_value_once() -> None:
+    class Settings:
+        retries = 3
+
+    retries = binding(Settings, "retries")
+
+    with timeline(retries) as tape:
+        _ = Settings().retries
+
+    assert tape.tree() == "get Settings.retries -> 3"
+
+
 def test_tree_of_an_empty_tape_is_empty() -> None:
     with timeline() as tape:
         pass