liveConsole 1.7.6__tar.gz → 1.7.7__tar.gz

{liveconsole-1.7.6/src/liveConsole.egg-info → liveconsole-1.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liveConsole
-Version: 1.7.6
+Version: 1.7.7
 Summary: An IDLE-like debugger to allow for real-time command injection for debugging and testing python code
 Author-email: Tzur Soffer <tzur.soffer@gmail.com>
 License: MIT

{liveconsole-1.7.6 → liveconsole-1.7.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "liveConsole"
-version = "1.7.6"
+version = "1.7.7"
 description = "An IDLE-like debugger to allow for real-time command injection for debugging and testing python code"
 authors = [{ name="Tzur Soffer", email="tzur.soffer@gmail.com" }]
 license = {text = "MIT"}

{liveconsole-1.7.6 → liveconsole-1.7.7/src/liveConsole.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liveConsole
-Version: 1.7.6
+Version: 1.7.7
 Summary: An IDLE-like debugger to allow for real-time command injection for debugging and testing python code
 Author-email: Tzur Soffer <tzur.soffer@gmail.com>
 License: MIT

{liveconsole-1.7.6 → liveconsole-1.7.7}/src/pysole/pysole.py

@@ -8,7 +8,7 @@ import sys
 import io
 import json
 
-from .utils import settingsPath, themesPath, stdPrint
+from .utils import settingsPath, themesPath, stdPrint, normalizeWhitespace, findUnindentedLine
 from .helpTab import HelpTab
 from .mainConsole import InteractiveConsoleText
 
@@ -73,6 +73,7 @@ class InteractiveConsole(ctk.CTk):
             if userLocals is None:
                 userLocals = callerFrame.f_locals
 
+        self.callerFrame = callerFrame
         self.userGlobals = userGlobals
         self.userLocals = userLocals
 
@@ -87,20 +88,30 @@ class InteractiveConsole(ctk.CTk):
         self.runRemainingCode = runRemainingCode
         self.printStartupCode = printStartupCode
         self.removeWaterMark = removeWaterMark
-        self.startupCode = ()
+        self.startupCode = []
         if runRemainingCode:
-            code_obj = callerFrame.f_code
-            filename = code_obj.co_filename
-
-            # Read the rest of the file after the call to probe()
-            with open(filename, "r", encoding="utf-8") as f:
-                lines = f.readlines()
-
-            startLineIndex = callerFrame.f_lineno
-            startLine = lines[startLineIndex - 1]
-            leadingWhitespaceLen = len(startLine) - len(startLine.lstrip())
-            self.startupCode = lines[startLineIndex:]
-            self.startupCode = [line.rstrip()[leadingWhitespaceLen:] for line in self.startupCode]
+            self.startupCode = self._getStartupCode()
+    
+    def _getStartupCode(self):
+        code_obj = self.callerFrame.f_code
+        callStartLineIndex = inspect.getframeinfo(self.callerFrame).positions.lineno     #< start of the probe call
+        callEndLineIndex = inspect.getframeinfo(self.callerFrame).positions.end_lineno   #< end of the probe call
+        filename = code_obj.co_filename
+
+        # Read the rest of the file after the call to probe()
+        with open(filename, "r", encoding="utf-8") as f:
+            lines = f.readlines()
+
+        startLine = lines[callStartLineIndex-1]
+        for line in lines[callStartLineIndex:callEndLineIndex]:
+            startLine += line.strip()
+
+        startupCode = normalizeWhitespace(lines[callEndLineIndex:])        #< ensure the code is not indented too much (egg if in __name__ == "__main__")
+        firstUnindentedLine = findUnindentedLine(startupCode)
+        while firstUnindentedLine != 0 and firstUnindentedLine != None:    #< handle if probe is inside a loop/if/etc by simply unindenting the call (while is for nested calls)
+            startupCode[:firstUnindentedLine] = normalizeWhitespace(startupCode[:firstUnindentedLine])
+            firstUnindentedLine = findUnindentedLine(startupCode)
+        return(startupCode)
 
     def _createMenu(self):
         """Create a menu bar using CTkOptionMenu."""

{liveconsole-1.7.6 → liveconsole-1.7.7}/src/pysole/suggestionManager.py

@@ -107,8 +107,11 @@ class CodeSuggestionManager:
         self.suggestionListbox.selection_set(0)
         
         # Position window near cursor
-        self._positionSuggestionWindow()
-        self.suggestionWindow.deiconify()
+        try:      #< some weird errors idk
+            self._positionSuggestionWindow()
+            self.suggestionWindow.deiconify()
+        except:
+            pass
     
     def _createSuggestionWindow(self):
         """Create the suggestion popup window."""

liveconsole-1.7.7/src/pysole/utils.py

@@ -0,0 +1,45 @@
+import os
+import sys
+import re
+
+settingsPath = os.path.join(os.path.dirname(__file__), "settings.json")
+themesPath = os.path.join(os.path.dirname(__file__), "themes.json")
+
+def stdPrint(text):
+    """Print text to the terminal."""
+    try:
+        sys.__stdout__.write(f"{text}\n")
+        sys.__stdout__.flush()
+    except:
+        pass
+
+def normalizeWhitespace(lines):
+    """
+    Normalize leading whitespace across a list of code lines.
+    Removes common leading indentation and trims excess on over-indented lines.
+    """
+    
+    if type(lines) == str:
+        lines = lines.split('\n')
+
+    # Remove empty lines and preserve original line endings
+    strippedLines = [line.rstrip('\n') for line in lines if line.strip()]
+    if not strippedLines:
+        return []
+
+    # Find minimum indentation across non-empty lines
+    indentLevels = [
+        len(re.match(r'^[ \t]*', line).group())
+        for line in strippedLines
+    ]
+    minIndent = min(indentLevels)
+
+    
+    normalized = [line[minIndent:] if len(line) >= minIndent else line for line in lines]   #< Normalize by removing minIndent from each line
+    return(normalized)
+
+def findUnindentedLine(lines):
+    for i, line in enumerate(lines):
+        if re.match(r'^\S', line):  # Line starts with non-whitespace
+            return(i)
+    return(None)

liveconsole-1.7.6/src/pysole/utils.py

@@ -1,13 +0,0 @@
-import os
-import sys
-
-settingsPath = os.path.join(os.path.dirname(__file__), "settings.json")
-themesPath = os.path.join(os.path.dirname(__file__), "themes.json")
-
-def stdPrint(text):
-    """Print text to the terminal."""
-    try:
-        sys.__stdout__.write(f"{text}\n")
-        sys.__stdout__.flush()
-    except:
-        pass