httpdbg 2.0.1__tar.gz → 2.0.2__tar.gz

{httpdbg-2.0.1 → httpdbg-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.0.1
+Version: 2.0.2
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0

{httpdbg-2.0.1 → httpdbg-2.0.2}/httpdbg/__init__.py

@@ -2,6 +2,6 @@ from httpdbg.hooks.all import httprecord
 from httpdbg.records import HTTPRecords
 
 
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 
 __all__ = ["httprecord", "HTTPRecords"]

{httpdbg-2.0.1 → httpdbg-2.0.2}/httpdbg/initiator.py

@@ -2,7 +2,9 @@
 from collections.abc import Callable
 from contextlib import contextmanager
 import datetime
+import functools
 import inspect
+import linecache
 import os
 import platform
 import traceback
@@ -98,9 +100,9 @@ def in_lib(line: str, packages: list[str] = None):
 def get_current_instruction(
     extracted_stack: traceback.StackSummary,
 ) -> tuple[str, str, list[str]]:
-    instruction = ""
-    short_stack = ""
-    stack = []
+    instruction: str = ""
+    short_stack: str = ""
+    stack: list[str] = []
 
     try:
         n_stack = -2
@@ -114,12 +116,7 @@ def get_current_instruction(
             n_stack -= 1
             framesummary = extracted_stack[n_stack - 1]
 
-        short_stack = f'File "{framesummary.filename}", line {framesummary.lineno}, in {framesummary.name}\n'
         if os.path.exists(framesummary.filename) and framesummary.lineno is not None:
-            instruction, s_stack = extract_short_stack_from_file(
-                framesummary.filename, framesummary.lineno, 0, 8
-            )
-            short_stack += s_stack
 
             # stack
             to_include = False
@@ -131,14 +128,20 @@ def get_current_instruction(
                     and ("importlib" not in fs.filename)
                 )  # remove the stack before to start the user part
                 if to_include:
-                    _, s_stack = extract_short_stack_from_file(
+                    instruction, s_stack, l_stack = extract_short_stack_from_file(
                         fs.filename,
                         fs.lineno if fs.lineno else 0,
-                        4 if last_stack else 0,
-                        8,
                         not last_stack,
                     )
-                    stack.append(f'File "{fs.filename}", line {fs.lineno}, \n{s_stack}')
+                    if last_stack:
+                        short_stack = (
+                            f'File "{fs.filename}", line {fs.lineno}, in {fs.name}\n'
+                        )
+                        short_stack += s_stack
+
+                    stack.append(
+                        f'File "{fs.filename}", line {fs.lineno}, \n{l_stack}\n'
+                    )
 
         else:
             instruction = framesummary.line if framesummary.line else "console"
@@ -152,52 +155,57 @@ def get_current_instruction(
     return instruction.replace("\n", " "), short_stack, stack
 
 
+@functools.cache
 def extract_short_stack_from_file(
     filename: str,
     lineno: int,
-    before: int,
-    after: int,
     stop_if_instruction_ends: bool = True,
-) -> tuple[str, str]:
-    instruction = ""
-    short_stack = ""
+) -> tuple[str, str, str]:
+    before: int = 4
+    after: int = 8
+    instruction: str = ""
+    short_stack: str = ""
+    long_stack: str = ""
 
     try:
         if os.path.exists(filename):
-            with open(filename, "r") as src:
-                lines = src.read().splitlines()
-
-                # copy the lines before
-                for i in range(
-                    max(0, lineno - 1 - before), min(lineno - 1, len(lines))
-                ):
-                    line = lines[i]
-                    short_stack += f" {i+1}. {line}\n"
-
-                # try to recompose the instruction if on multi-lines
-                end_of_instruction_found = False
-                for i in range(max(0, lineno - 1), min(lineno - 1 + after, len(lines))):
-                    line = lines[i]
-                    if not end_of_instruction_found:
-                        instruction += line.strip()
-                    short_stack += f" {i+1}. {line}{' <====' if (before > 0 and i + 1 == lineno) else ''}\n"
-                    nb_parenthesis = 0
-                    for c in instruction[instruction.find("(") :]:
-                        if c == "(":
-                            nb_parenthesis += 1
-                        if c == ")":
-                            nb_parenthesis -= 1
-                        if nb_parenthesis == 0:
-                            end_of_instruction_found = True
-                            break
-                    if end_of_instruction_found and stop_if_instruction_ends:
+            # copy the lines before, only for the "long" stack (if they are not empty)
+            copyit = False
+            for i in range(max(0, lineno - before), lineno):
+                line = linecache.getline(filename, i).removesuffix("\n").rstrip()
+                copyit = copyit or (line != "")
+                if copyit:
+                    long_stack += f" {i}. {line}\n"
+
+            # try to recompose the instruction if on multi-lines
+            end_of_instruction_found = False
+            for i in range(max(0, lineno), lineno + after):
+                line = linecache.getline(filename, i).removesuffix("\n").rstrip()
+                if not end_of_instruction_found:
+                    instruction += line.strip()
+                    short_stack += f" {i}. {line}\n"
+                long_stack += (
+                    f" {i}. {line}{' <====' if (before > 0 and i == lineno) else ''}\n"
+                )
+                nb_parenthesis = 0
+                for c in instruction[instruction.find("(") :]:
+                    if c == "(":
+                        nb_parenthesis += 1
+                    if c == ")":
+                        nb_parenthesis -= 1
+                    if nb_parenthesis == 0:
+                        end_of_instruction_found = True
                         break
+                if end_of_instruction_found and stop_if_instruction_ends:
+                    break
     except Exception as ex:
+        tb = traceback.extract_tb(ex.__traceback__)
+        _, lineno, _, _ = tb[-1]
         logger().info(
-            f"EXTRACT_SHORT_STACK_FROM_FILE {filename} lineno={lineno} before={before} after={after}- error - {str(ex)}"
+            f"EXTRACT_SHORT_STACK_FROM_FILE {filename} lineno={lineno} before={before} after={after}- error (line {lineno}) - {str(ex)}",
         )
 
-    return instruction, short_stack
+    return instruction, short_stack, long_stack
 
 
 def construct_call_str(original_method, *args, **kwargs):
@@ -345,7 +353,7 @@ def httpdbg_endpoint(
     filename = inspect.getsourcefile(original_method)
     if filename:
         _, lineno = inspect.getsourcelines(original_method)
-        instruction, s_stack = extract_short_stack_from_file(filename, lineno, 0, 8)
+        instruction, s_stack, _ = extract_short_stack_from_file(filename, lineno)
         full_label = (
             f'File "{filename}", line {lineno}, in {original_method.__name__}\n'
         )

{httpdbg-2.0.1 → httpdbg-2.0.2}/httpdbg.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: httpdbg
-Version: 2.0.1
+Version: 2.0.2
 Summary: A very simple tool to debug HTTP(S) client and server requests.
 Author-email: cle-b <cle@tictac.pm>
 License: Apache-2.0