liveConsole 1.7.6__py3-none-any.whl → 1.7.8__py3-none-any.whl

{liveconsole-1.7.6.dist-info → liveconsole-1.7.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liveConsole
-Version: 1.7.6
+Version: 1.7.8
 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.dist-info → liveconsole-1.7.8.dist-info}/RECORD

@@ -1,19 +1,19 @@
 liveConsole/__init__.py,sha256=GyV_Y3iiiS12JoEiqE55uZPQ8ZDYfOSKvxh5rcfaD1U,20
-liveconsole-1.7.6.dist-info/licenses/LICENSE,sha256=7dZ0zL72aGaFE0C9DxacOpnaSkC5jajhG6iL7lqhWmU,1064
+liveconsole-1.7.8.dist-info/licenses/LICENSE,sha256=7dZ0zL72aGaFE0C9DxacOpnaSkC5jajhG6iL7lqhWmU,1064
 pysole/__init__.py,sha256=0Jq2s5WxFVveZW-pGwThGZLt_mVSdGcsT9lpJNEZ6ds,124
 pysole/__main__.py,sha256=QvVFH8J2yzgQaF9MosQ6ajCW67uiRbYliePsTEUCIAg,82
 pysole/commandHistory.py,sha256=xJtWbJ_vgJo2QGgaZJsApTOi_Hm8Yz0V9_zqQUCItj8,1084
 pysole/helpTab.py,sha256=o0uSY-8sw7FuuBrt0FQwcgK6ljNVx3IgRnW7heZ6GvY,2454
 pysole/liveConsole.py,sha256=lzS3dphAQ1i8pQC4E2FY-FyMMSKi-dAN0xr6XUgrNmo,168
 pysole/mainConsole.py,sha256=t_ijaSm2rTxM5CrLqjxT5Oq_OFwxk7JsPOAXxo9dbdE,15357
-pysole/pysole.py,sha256=gQgjzmnXesUCWk2OnOdAGRcYZlw86QH4OeeVQhD_6Zs,12970
+pysole/pysole.py,sha256=QxcLjy2SyxXPkzv54SY2BBC1zJ8SqrDtRzhHQqVDw6I,13775
 pysole/settings.json,sha256=cmOtIhRDWHMwmQMESuykWuzJd_jG6iT2tJ-uhSps_3U,722
 pysole/styledTextbox.py,sha256=qWnwGAKjl7R2HYPXQOr8GrGYIr4JC8PzmeioOCH7hGo,2236
-pysole/suggestionManager.py,sha256=EUFeCQoZnLS8EjPPNuZpzjY0BR07m2KP5TloyaMDVGY,6457
+pysole/suggestionManager.py,sha256=CGR1wsRIU4le3Bq_6CPAytM1CzTQAV_jUl5KZbg9LPU,6544
 pysole/themes.json,sha256=2KvEfxm-eDsfVKIdBhWk-Qd93wYQub3YwkxbS6CGKH0,2525
-pysole/utils.py,sha256=cBjS3KxDCuVr4Wa8up0eH493cLky9_CFImO-kaiWakQ,339
-liveconsole-1.7.6.dist-info/METADATA,sha256=HvzEQCn9tzYeDfsdF9Oa6YIdY2x2D6U17TOSzsIB8eE,10407
-liveconsole-1.7.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-liveconsole-1.7.6.dist-info/entry_points.txt,sha256=qtvuJHcex4QqM97x_UawFWJYnfhQRl0jhqLcWRpnAGo,84
-liveconsole-1.7.6.dist-info/top_level.txt,sha256=YGhC2H7bvcDnMwEtvLXF6qQNIZT2Saayyk1KOJyndN8,19
-liveconsole-1.7.6.dist-info/RECORD,,
+pysole/utils.py,sha256=cKsSPWeYRxPhkiM8Xrb-aMW6w0SU5Xuu9WCgsu6_xtA,1364
+liveconsole-1.7.8.dist-info/METADATA,sha256=ra5xvWuvJAaTs-0JAgcxo_rclzPm0He5Ij1p6lShW5c,10407
+liveconsole-1.7.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+liveconsole-1.7.8.dist-info/entry_points.txt,sha256=qtvuJHcex4QqM97x_UawFWJYnfhQRl0jhqLcWRpnAGo,84
+liveconsole-1.7.8.dist-info/top_level.txt,sha256=YGhC2H7bvcDnMwEtvLXF6qQNIZT2Saayyk1KOJyndN8,19
+liveconsole-1.7.8.dist-info/RECORD,,

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."""
@@ -202,7 +213,7 @@ class InteractiveConsole(ctk.CTk):
         def saveSettings():
             try:
                 newSettings = json.loads(textbox.get("0.0", "end-1c"))
-                with open("settings.json", "w") as f:
+                with open(settingsPath, "w") as f:
                     json.dump(newSettings, f, indent=4)
                 messagebox.showinfo("Success", "Settings saved!")
                 editor.destroy()

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."""

pysole/utils.py

@@ -1,5 +1,6 @@
 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")
@@ -10,4 +11,35 @@ def stdPrint(text):
         sys.__stdout__.write(f"{text}\n")
         sys.__stdout__.flush()
     except:
-        pass
+        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)