atrace 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

atrace/__init__.py

@@ -3,27 +3,13 @@ import inspect
 import signal
 import sys
 from types import FrameType
-from typing import Any, Optional
+from typing import Optional
 
 from . import model, outputlogger, report, vartracer
 
 trace: model.Trace = []
 
 
-def just_kicking_off(frame: FrameType, event: str, arg: Any):
-    return None
-
-
-def get_importer_frame() -> Optional[FrameType]:
-    # Get the current call stack
-    for frame_info in inspect.stack():
-        # Filter out internal importlib frames and the current module's frame
-        filename = frame_info.filename
-        if not filename.startswith("<") and filename != __file__:
-            return frame_info.frame
-    return None
-
-
 original_stdout = sys.stdout
 
 
@@ -37,12 +23,19 @@ def sig_handler(_signo, _frame):
     sys.exit(0)
 
 
+def get_importer_frame() -> Optional[FrameType]:
+    # Get the current call stack
+    for frame_info in inspect.stack():
+        # Filter out internal importlib frames and the current module's frame
+        filename = frame_info.filename
+        if not filename.startswith("<") and filename != __file__:
+            return frame_info.frame
+    return None
+
+
 def setup():
     """See https://docs.python.org/3/library/sys.html#sys.settrace for an explanation of all the convoluted things in here"""
 
-    # This kicks off the tracing machinery (so that the lines below work)
-    sys.settrace(just_kicking_off)
-
     # We want to only trace the module that imports us
     importer_frame = get_importer_frame()
     if importer_frame:
@@ -50,12 +43,13 @@ def setup():
         if module_of_interest:
             var_tracer = vartracer.VarTracer(trace, module_of_interest)
 
+            # Setup tracing inside of functions.
+            # Order is important. This must be called before seting the trace function for the current frame
+            sys.settrace(var_tracer.trace_vars)
+
             # Setup tracing outside of functions
             importer_frame.f_trace = var_tracer.trace_vars
 
-            # Setup tracing inside of functions
-            sys.settrace(var_tracer.trace_vars)
-
     sys.stdout = outputlogger.OutputLogger(trace=trace, stdout=sys.stdout)
 
     atexit.register(exit_handler)
@@ -64,4 +58,21 @@ def setup():
         signal.signal(sig, sig_handler)
 
 
-setup()
+def var_trace_for_code(code: str) -> model.Trace:
+    trace: model.Trace = []
+    # We want to only trace the module that imports us
+    importer_frame = get_importer_frame()
+    if importer_frame:
+        module_of_interest = inspect.getmodule(importer_frame)
+        if module_of_interest:
+            var_tracer = vartracer.VarTracer(trace, module_of_interest)
+            try:
+                sys.settrace(var_tracer.trace_vars)
+                exec(code)
+            finally:
+                sys.settrace(None)
+    return trace
+
+
+if "pytest" not in sys.modules:
+    setup()

atrace/model.py

@@ -2,28 +2,34 @@ from dataclasses import dataclass
 from typing import Any, TypeAlias
 
 
-@dataclass
+@dataclass(frozen=True)
 class PrintEvent:
     text: str
 
 
 @dataclass(frozen=True)
 class Variable:
-    function_name: str | None
+    scope: str
     name: str
 
 
+@dataclass(frozen=True)
+class ReturnEvent:
+    function_name: str
+    return_value: Any
+
+
 @dataclass(frozen=True)
 class VariableChangeEvent:
     variable: Variable
     value: Any
 
 
-@dataclass
+@dataclass(frozen=True)
 class TraceItem:
     line_no: int
     function_name: str
-    event: PrintEvent | VariableChangeEvent
+    event: PrintEvent | VariableChangeEvent | ReturnEvent
 
 
 Trace: TypeAlias = list[TraceItem]

atrace/outputlogger.py

@@ -6,7 +6,7 @@ from . import model
 
 class OutputLogger:
     """
-    OutputLogger wraps stdout, writing to it and simultaneously capturing the text to the trace.
+    OutputLogger wraps stdout, passing down writes and flushes to it, while simultaneously capturing the text to the trace.
     """
 
     def __init__(self, trace: model.Trace, stdout: TextIO):

atrace/report.py

@@ -1,98 +1,74 @@
 from dataclasses import dataclass
-from typing import Any
+from typing import Any, TypeAlias
 
 from tabulate import tabulate
 
 from . import model
 
 
-def collect_variable_list(trace: model.Trace) -> list[model.Variable]:
-    variable_list = []
-    for traceItem in trace:
-        match traceItem.event:
-            case model.VariableChangeEvent(variable_name, _):
-                if variable_name not in variable_list:
-                    variable_list.append(variable_name)
-    return variable_list
-
+@dataclass
+class Instant:
+    line_no: int
+    variable_changes: dict[model.Variable, Any]
+    output: str
 
-def coalesce_print_events(trace: model.Trace) -> model.Trace:
-    last_print_item = None
-    for trace_item in trace:
-        match trace_item.event:
-            case model.PrintEvent(text):
-                if (
-                    last_print_item is None
-                    or trace_item.line_no != last_print_item.line_no
-                ):
-                    last_print_item = trace_item
-                else:
-                    last_print_item.event.text += text
-                    trace_item.event = None  # Mark for deletion
-            case _:
-                last_print_item = None
 
-    return [item for item in trace if item.event is not None]
+Instants: TypeAlias = list[Instant]
 
 
-def contains_prints(trace: model.Trace) -> bool:
+def trace_to_instants(trace: model.Trace) -> Instants:
+    instants = []
+    instant = None
     for trace_item in trace:
+        if instant is None or instant.line_no != trace_item.line_no:
+            instant = Instant(trace_item.line_no, {}, "")
+            instants.append(instant)
+
         match trace_item.event:
-            case model.PrintEvent:
-                return True
-    return False
+            case model.PrintEvent(text):
+                instant.output += text
+            case model.VariableChangeEvent(variable, value):
+                # Don't clobber an existing value a variable if it changes again on the same line
+                # (this happens for example in tight loops)
+                if variable in instant.variable_changes:
+                    instant = Instant(trace_item.line_no, {}, "")
+                    instants.append(instant)
+                instant.variable_changes[variable] = value
+            case model.ReturnEvent():
+                pass  # XXX
+
+    return instants
 
 
 def variable_to_column_name(var: model.Variable) -> str:
-    context = None if var.function_name == "<module>" else var.function_name
-    return "(" + context + ") " + var.name if context else var.name
+    return var.name if var.scope == "<module>" else f"({var.scope}) {var.name}"
 
 
-@dataclass
-class Line:
-    line_no: int
-    variable_changes: dict[str, Any]
-    output: str | None
+def formatted_table_from_instants(instants: Instants) -> str:
+    variables = []
 
+    for instant in instants:
+        for variable in instant.variable_changes:
+            if variable not in variables:
+                variables.append(variable)
 
-def dump_report(trace: model.Trace) -> None:
-    trace = coalesce_print_events(trace)
+    LINE_NO, OUTPUT = "ligne", "affichage"
 
-    # Build intermediate "lines" datastructure, that collects all events that happen on a given line
-    lines = []
-    current_line = None
-    for trace_item in trace:
-        if current_line is None or current_line.line_no != trace_item.line_no:
-            current_line = Line(trace_item.line_no, {}, None)
-            lines.append(current_line)
+    table = []
+    for instant in instants:
+        row: dict[str, Any] = {}
+        table.append(row)
 
-        match trace_item.event:
-            case model.VariableChangeEvent(variable, value):
-                # Don't clobber a new value if it changes on the same line
-                # (this happens for example in tight loops)
-                if variable in current_line.variable_changes:
-                    current_line = Line(trace_item.line_no, {}, None)
-                    lines.append(current_line)
+        row[LINE_NO] = instant.line_no
+        for variable in variables:
+            cell_for_variable = instant.variable_changes.get(variable, "")
+            row[variable_to_column_name(variable)] = cell_for_variable
+        row[OUTPUT] = instant.output
 
-                current_line.variable_changes[variable_to_column_name(variable)] = value
-            case model.PrintEvent(text):
-                current_line.output = text
+    return tabulate(table, headers="keys", tablefmt="simple_outline")
 
-    # The extra spaces so the names cannot collide with variable names
-    LINE_NO, OUTPUT = " ligne", "affichage "
 
-    variable_list = collect_variable_list(trace)
-    headers = [LINE_NO] + [variable_to_column_name(v) for v in variable_list] + [OUTPUT]
-    table = []
-    for line in lines:
-        table_row = [line.line_no]
-        for column_name in headers[1:-1]:
-            variable_value = line.variable_changes.get(column_name)
-            if variable_value:
-                table_row.append(variable_value)
-            else:
-                table_row.append(None)
-        table_row.append(line.output)
-        table.append(table_row)
-
-    print(tabulate(table, headers=headers, tablefmt="outline"))
+def dump_report(trace: model.Trace) -> None:
+    instants = trace_to_instants(trace)
+    formatted_table = formatted_table_from_instants(instants)
+    print(formatted_table)

atrace/vartracer.py

@@ -33,13 +33,21 @@ class VarTracer:
     def __init__(self, trace: model.Trace, module_of_interest: ModuleType):
         self.trace = trace
         self.module_of_interest = module_of_interest
-        self.last_locals = {}
+        self.last_locals: dict[str, Any] = {}
 
     def trace_vars(self, frame: FrameType, event: str, arg: Any):
         if inspect.getmodule(frame) != self.module_of_interest:
             return
         if event == "return":
-            return
+            self.trace.append(
+                model.TraceItem(
+                    line_no=frame.f_lineno,
+                    function_name=frame.f_code.co_name,
+                    event=model.ReturnEvent(
+                        function_name=frame.f_code.co_name, return_value=arg  # XXX
+                    ),
+                )
+            )
 
         code = frame.f_code
 
@@ -57,9 +65,7 @@ class VarTracer:
                         line_no=frame.f_lineno,
                         function_name=frame.f_code.co_name,
                         event=model.VariableChangeEvent(
-                            variable=model.Variable(
-                                function_name=code.co_name, name=var
-                            ),
+                            variable=model.Variable(scope=code.co_name, name=var),
                             value=new_val,
                         ),
                     )

atrace-0.1.6.dist-info/METADATA

@@ -0,0 +1,67 @@
+Metadata-Version: 2.4
+Name: atrace
+Version: 0.1.6
+Summary: Generate trace tables for programs
+Project-URL: Repository, https://github.com/nwolff/atrace.git
+Author-email: Nicholas Wolff <nwolff@gmail.com>
+Requires-Python: >=3.10
+Requires-Dist: tabulate>=0.9.0
+Description-Content-Type: text/markdown
+
+# Usage
+
+Automatically prints a trace table of a program once the execution is finished.
+
+Just import the module.
+
+An idea of how things look:
+
+```
+
+```
+
+Does not work with :
+
+- Multithreaded programs
+- Multi-module programs
+- Classes
+
+# TODO
+
+- Unit tests for the capture part (because the line numbers are so hard). If pytest adds too much magic, then revert to UnitTest
+- Fix line numbers in trace_vars. https://discuss.python.org/t/trace-a-line-after-the-line-but-not-only-before-the-line/89475/7
+  This might not even be possible. Start solving it without functions in the scope.
+
+- Handle returns (with and without return statements)
+
+- Thonny, which adds a lot of indirection and magic. Try and find a way to edit the package directly when running in thonny
+
+# Later
+
+- localize the names of the line and output columns in the report
+
+# Done
+
+- Sets the program print to stdout unhindered (this is important for input to work properly),
+  but captures the prints at the same time to show in the trace at the end.
+- Emits the trace at the end if the application ends normally and abruptly (exception, signal, etc.)
+- Shows bindings to local variables when entering a function
+- Handles mutations to objects like lists (by copying the previous version and then comparing)
+- Parallel assignations show up properly
+- Changes to variables in other scopes (for instance global)
+
+# Build
+
+Automatically deployed to pypi every time a new tag is pushed: https://pypi.org/project/atrace/
+
+# Inspiration
+
+https://github.com/DarshanLakshman/PyTracerTool/blob/master/PyTracerTool/pytracertool.py
+
+Does almost everything I want, but has many flaws:
+
+- it chokes trying to deepcopy some objects
+- it cannot be simply imported into a module
+- it fumbles the handling of output (preventing programs with input from working properly).
+- it repeats values for no good reason
+- its line numbers are very confused

atrace-0.1.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+atrace/__init__.py,sha256=FBVbvNBcU8agaIv62OT0PjhccY2-bhe0mkWOKT1H2fg,2406
+atrace/model.py,sha256=yhBJuciqRc4X_10QuHv18y4lB2N35m39DvpIpYYtiIQ,556
+atrace/outputlogger.py,sha256=gAM15WF7DOVxc6ZDBnMmutUJ7okeRoc9JUC4iqJaN9I,928
+atrace/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+atrace/report.py,sha256=P6fgj-dJUZYk1wbW_Q-MATXoedXUvZ28VR3RdBjU8dA,2240
+atrace/vartracer.py,sha256=bmENaHoSnh8-kdlJMaopWj5W8kPHjKC2E4k2Rx03f0k,2316
+atrace-0.1.6.dist-info/METADATA,sha256=vHaImexdGhE25FbLMO7e3vN3gyskzuub90fY6RIw9ZU,2200
+atrace-0.1.6.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+atrace-0.1.6.dist-info/RECORD,,

atrace-0.1.5.dist-info/METADATA

@@ -1,86 +0,0 @@
-Metadata-Version: 2.4
-Name: atrace
-Version: 0.1.5
-Summary: Generate trace tables for programs
-Project-URL: Repository, https://github.com/nwolff/atrace.git
-Author-email: Nicholas Wolff <nwolff@gmail.com>
-Requires-Python: >=3.10
-Requires-Dist: tabulate>=0.9.0
-Description-Content-Type: text/markdown
-
-# Usage
-
-Automatically prints a trace table of a program once the execution is finished.
-
-Just import the module.
-
-An animated example of a trace table: https://www.101computing.net/using-trace-tables/
-
-An idea of how things look:
-
-```
-+-----------+-----+-----+---------+---------------+-----------------------+-------------------------+
-|    ligne  |   x |   y | (f) a   | (f) b         | (f) c                 |  affichage              |
-+===========+=====+=====+=========+===============+=======================+=========================+
-|         5 |   1 |   3 |         |               |                       |                         |
-|         7 |   2 |     |         |               |                       |                         |
-|         5 |     |   2 |         |               |                       |                         |
-|         7 |   3 |     |         |               |                       |                         |
-|         5 |     |   1 |         |               |                       |                         |
-|         7 |   4 |     |         |               |                       |                         |
-|         5 |     |     |         |               |                       |                         |
-|         9 |     |     |         |               |                       | somme:  4               |
-|        12 |     |     | Bonjour | tout le monde |                       |                         |
-|        14 |     |     |         |               | Bonjour tout le monde | Bonjour tout le monde ! |
-+-----------+-----+-----+---------+---------------+-----------------------+-------------------------+
-```
-
-Does not work with :
-
-- Multithreaded programs
-- Multi-module programs
-- Classes
-
-# TODO
-
-- Fix line numbers in trace_vars. https://discuss.python.org/t/trace-a-line-after-the-line-but-not-only-before-the-line/89475/7
-  This is a bitch
-- Thonny, which adds a lot of indirection and magic
-
-# Later
-
-- Make robust. In other words should never raise an exception.
-- mypy, unit-tests. Integrate in build pipeline
-- localize the names of the line and output columns in the report
-- Handle classes better
-
-# Possible enhancements
-
-- More details when recursive invocations
-- Think about how to show returns
-- Find if there could be a good use for colors in the trace
-
-# Done
-
-- Sets the program print to stdout unhindered (this is important for input to work properly),
-  but captures the prints at the same time to show in the trace at the end.
-- Emits the trace at the end if the application ends normally and abruptly (exception, signal, etc.)
-- Shows bindings to local variables when entering a function
-- Handles mutations to objects like lists (by copying the previous version and then comparing)
-- Parallel assignations show up properly
-
-# Build
-
-Automatically deployed to pypi every time a new tag is pushed: https://pypi.org/project/atrace/
-
-# Inspiration
-
-https://github.com/DarshanLakshman/PyTracerTool/blob/master/PyTracerTool/pytracertool.py
-
-Does almost everything I want, but has many flaws:
-
-- it chokes trying to deepcopy some objects
-- it cannot be simply imported into a module
-- it fumbles the handling of output (preventing programs with input from working properly).
-- it repeats values for no good reason
-- its line numbers are very confused

atrace-0.1.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-atrace/__init__.py,sha256=MdubXhWJW6S5OqDrA3-YYOjl91EomeoCmBC4MwInPmQ,1920
-atrace/model.py,sha256=uNX2rjYOZYIATY_ZvXFYiD5FhLeQ02Bqy8ExnRFPiK8,441
-atrace/outputlogger.py,sha256=ct1jlUlK03ZI5hy45aysdb2I9UDWPLK4hxRJ_aU83Xk,901
-atrace/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-atrace/report.py,sha256=6p19dK3YWI8mn-HPiGRp55UE7ddJg7TjGgw1b2S0CCA,3350
-atrace/vartracer.py,sha256=O3FPZhWl2nHcmtQHu1HECwP1ZF8X9XGNuk9xTe7Y1Og,2041
-atrace-0.1.5.dist-info/METADATA,sha256=AtkCObDbIF95triDjCOqba1Xx93zWm7Wqb9MhKuh2Qc,3628
-atrace-0.1.5.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-atrace-0.1.5.dist-info/RECORD,,