memory-graph 0.3.66__tar.gz → 0.3.67__tar.gz

{memory_graph-0.3.66 → memory_graph-0.3.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memory_graph
-Version: 0.3.66
+Version: 0.3.67
 Summary: Teaching tool and debugging aid in context of references, mutable data types, and shallow and deep copy.
 Author-email: Bas Terwijn <bterwijn@gmail.com>
 License-Expression: BSD-2-Clause
@@ -500,6 +500,7 @@ The ```mg.stack()``` doesn't work well in **watch** context in most debuggers be
 |:---|:---|
 | [pdb](https://docs.python.org/3/library/pdb.html), [pudb](https://pypi.org/project/pudb/) | `mg.stack_pdb()` |
 | [Visual Studio Code](https://code.visualstudio.com/docs/languages/python) | `mg.stack_vscode()` |
+| [Jupyter Notebooks in VS Code](https://code.visualstudio.com/docs/datascience/jupyter-notebooks) | `mg.stack_vscode_jupyter()` |
 | [Cursor AI](https://www.cursor.com/) | `mg.stack_cursor()` |
 | [PyCharm](https://www.jetbrains.com/pycharm/) | `mg.stack_pycharm()` |
 | [Wing](https://wingware.com/) | `mg.stack_wing()` |

{memory_graph-0.3.66 → memory_graph-0.3.67}/README.md

@@ -480,6 +480,7 @@ The ```mg.stack()``` doesn't work well in **watch** context in most debuggers be
 |:---|:---|
 | [pdb](https://docs.python.org/3/library/pdb.html), [pudb](https://pypi.org/project/pudb/) | `mg.stack_pdb()` |
 | [Visual Studio Code](https://code.visualstudio.com/docs/languages/python) | `mg.stack_vscode()` |
+| [Jupyter Notebooks in VS Code](https://code.visualstudio.com/docs/datascience/jupyter-notebooks) | `mg.stack_vscode_jupyter()` |
 | [Cursor AI](https://www.cursor.com/) | `mg.stack_cursor()` |
 | [PyCharm](https://www.jetbrains.com/pycharm/) | `mg.stack_pycharm()` |
 | [Wing](https://wingware.com/) | `mg.stack_wing()` |

{memory_graph-0.3.66 → memory_graph-0.3.67}/memory_graph/__init__.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2023, Bas Terwijn.
 # SPDX-License-Identifier: BSD-2-Clause
 
-__version__ = "0.3.66"
+__version__ = "0.3.67"
 __author__ = 'Bas Terwijn'
 
 import memory_graph.memory_to_nodes as memory_to_nodes
@@ -241,6 +241,51 @@ def stack_slice(begin_functions : List[Tuple[str, int]] = [],
     end_index = stack_end_index(stack_functions, begin_index, end_functions)
     return stack_frames_to_dict(reversed(frameInfos[begin_index+stack_index:end_index+1]))
 
+def stack_multi_slice(drop_functions : List[Tuple[str, int]] = [],
+                      end_functions : List[str] = ["<module>"],
+                      stack_index : int = 0,
+                      frameInfos : List[inspect.FrameInfo] = None,
+                      ignore_frame_condition = None):
+    """
+    Returns a slice of the call stack, dropping all occurrences of the specified drop_functions.
+    Parameters:
+      drop_functions - list of (function-name, offset), drops all matching 'function-name' frames
+                       including 'offset' number of parent frames for each match.
+      end_functions - list of function-names, ends at the index of the first 'function-name'
+                      that is found in the call stack after stack index (inclusive),
+                      otherwise ends at the last index
+      stack_index - number of frames removed from the beginning
+      ignore_frame_condition - optional callable that takes an inspect.FrameInfo and returns True if the frame should be dropped
+    """
+    if frameInfos is None:
+        frameInfos = inspect.stack()
+    
+    stack_functions = [s.function for s in frameInfos]
+    
+    # establish where to start (skipping innermost debugger eval frames)
+    begin_index = stack_begin_index(stack_functions, drop_functions)
+    if begin_index == 0:
+        begin_index += stack_index
+        
+    end_index = stack_end_index(stack_functions, begin_index, end_functions)
+    
+    drop_indices = set()
+    for drop_func, offset in drop_functions:
+        for i, func in enumerate(stack_functions[begin_index:end_index+1]):
+            actual_i = i + begin_index
+            if func == drop_func:
+                for j in range(actual_i, actual_i + offset):
+                    drop_indices.add(j)
+                    
+    if ignore_frame_condition:
+        for i in range(begin_index, end_index + 1):
+            if i not in drop_indices and ignore_frame_condition(frameInfos[i]):
+                drop_indices.add(i)
+    
+    filtered_frames = [frameInfos[i] for i in range(begin_index, end_index + 1) if i not in drop_indices]
+    
+    return stack_frames_to_dict(reversed(filtered_frames))
+
 def stack(end_functions=["<module>"], stack_index=0):
     return stack_slice([], end_functions, stack_index+2)
 
@@ -275,6 +320,56 @@ def stack_wing(begin_functions=[("_py_line_event",1), ("_py_return_event",1)],
     return stack_slice(begin_functions, end_functions, stack_index)
 
 
+banned_vscode_jupyter_strings = ['pydevd', 'debugpy', 'ipython', 'ipykernel', 'asyncio', 'tornado', 'traitlets', 'runpy']
+
+def is_vscode_jupyter_banned(frameInfo):
+    module_name = frameInfo.frame.f_globals.get('__name__', '')
+    filename = frameInfo.filename
+    func_name = frameInfo.function
+    
+    module_name_lower = module_name.lower()
+    func_name_lower = func_name.lower()
+    filename_lower = filename.lower()
+    
+    # Exempt user notebook/cell code from being banned.
+    if module_name == '__main__' or filename_lower.startswith('<ipython-input'):
+        return False
+    
+    for b in banned_vscode_jupyter_strings:
+        if b in module_name_lower or b in func_name_lower or b in filename_lower:
+            return True
+            
+    return False
+
+def stack_vscode_jupyter(drop_functions=[("trace_dispatch",1), ("_line_event",1), ("_return_event",1), ("do_wait_suspend",1), ("_do_wait_suspend",2)],
+                         end_functions=["<module>"],
+                         stack_index=0):
+    """ Get the call stack natively in a 'vscode' debugging 'jupyter' notebook session, 
+    filtering out the noisy environment specific functions and modules that pollute the graph. """
+    # stack_index + 2 to account for stack_vscode_jupyter and stack_multi_slice
+    call_stack_dict = stack_multi_slice(drop_functions, end_functions, stack_index + 2, ignore_frame_condition=is_vscode_jupyter_banned)
+    
+    for level_key, local_dict in call_stack_dict.items():
+        if '__pydevd_ret_val_dict' in local_dict:
+            ret_vals = local_dict.pop('__pydevd_ret_val_dict')
+            if isinstance(ret_vals, dict):
+                for k, v in ret_vals.items():
+                    # filter out Jupyter internal return values, particularly I/O stream writes
+                    if not any(b in k.lower() for b in banned_vscode_jupyter_strings) and 'write' not in k.lower():
+                        # Place return value in the function's own frame if it is still on the stack
+                        target_dict = local_dict
+                        for l_key, l_dict in call_stack_dict.items():
+                            if ": " in l_key and l_key.split(": ", 1)[1] == k:
+                                target_dict = l_dict
+                                break
+                        target_dict[f"<return> {k}"] = v
+        
+        if "<module>" in level_key:
+            call_stack_dict[level_key] = jupyter_locals_filter(local_dict)
+
+    return call_stack_dict
+
+
 def save_call_stack(filename):
     """ Saves the call stack to 'filename' for inspection to see what functions need to be 
     filtered out to create the desired graph. """
@@ -310,6 +405,12 @@ def wing(filename=None, data=None):
         data = stack_wing()
     render(data, filename)
 
+def vscode_jupyter(filename=None, data=None):
+    if data is None:
+        # stack_index=1 since this function counts as an extra stack frame
+        data = stack_vscode_jupyter(stack_index=1)
+    render(data, filename)
+
 def locals_filter(locals, keys):
     """ Filter out the jupyter specific keys that polute the graph. """
     return {k:v for k,v in utils.filter_dict(jupyter_locals)

{memory_graph-0.3.66 → memory_graph-0.3.67}/memory_graph.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: memory_graph
-Version: 0.3.66
+Version: 0.3.67
 Summary: Teaching tool and debugging aid in context of references, mutable data types, and shallow and deep copy.
 Author-email: Bas Terwijn <bterwijn@gmail.com>
 License-Expression: BSD-2-Clause
@@ -500,6 +500,7 @@ The ```mg.stack()``` doesn't work well in **watch** context in most debuggers be
 |:---|:---|
 | [pdb](https://docs.python.org/3/library/pdb.html), [pudb](https://pypi.org/project/pudb/) | `mg.stack_pdb()` |
 | [Visual Studio Code](https://code.visualstudio.com/docs/languages/python) | `mg.stack_vscode()` |
+| [Jupyter Notebooks in VS Code](https://code.visualstudio.com/docs/datascience/jupyter-notebooks) | `mg.stack_vscode_jupyter()` |
 | [Cursor AI](https://www.cursor.com/) | `mg.stack_cursor()` |
 | [PyCharm](https://www.jetbrains.com/pycharm/) | `mg.stack_pycharm()` |
 | [Wing](https://wingware.com/) | `mg.stack_wing()` |

{memory_graph-0.3.66 → memory_graph-0.3.67}/memory_graph.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 LICENSE.txt
 README.md
 pyproject.toml
-setup.py
 memory_graph/__init__.py
 memory_graph/call_stack.py
 memory_graph/config.py

{memory_graph-0.3.66 → memory_graph-0.3.67}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "memory_graph"
-version = "0.3.66"
+version = "0.3.67"
 description = "Teaching tool and debugging aid in context of references, mutable data types, and shallow and deep copy."
 authors = [
     {name = "Bas Terwijn", email = "bterwijn@gmail.com"}

memory_graph-0.3.66/setup.py

@@ -1,7 +0,0 @@
-from setuptools import setup
-
-setup(
-    name="memory-graph",
-    version="0.3.30",
-    packages=["memory_graph"],
-)