rp 0.1.1340__tar.gz → 0.1.1341__tar.gz

{rp-0.1.1340 → rp-0.1.1341}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1340
+Version: 0.1.1341
 Summary: Ryan's Python: IDE + Library + Tools
 Home-page: https://github.com/RyannDaGreat/rp
 Author: Ryan Burgert

{rp-0.1.1340 → rp-0.1.1341}/rp/prompt_toolkit/buffer.py

@@ -111,6 +111,7 @@ def _return_document_handler(cli, buffer):
             ric.dont_erase_buffer_on_enter.clear()#Do erase the buffer now. This is a one-time-thing.
         else:
             buffer.reset()
+
     cli.pre_run_callables.append(reset_this_buffer)
 
 
@@ -1212,6 +1213,11 @@ class Buffer(object):
         if not self.validate():
             return
 
+        # Save document state before adding to history (for Ctrl+E/Ctrl+Q restore)
+        if self.text.strip():
+            import rp.rp_ptpython.r_iterm_comm as ric
+            ric.last_ctrl_e_doc = (self.document.text, self.document.cursor_position)
+
         # Save at the tail of the history. (But don't if the last entry the
         # history is already the same.)
         if self.text and (not len(self.history) or self.history[-1] != self.text):

{rp-0.1.1340 → rp-0.1.1341}/rp/r.py

@@ -7045,6 +7045,88 @@ def _load_files(
 
 # region  Saving/Loading Images: ［load_image，_load_image_from_url，save_image，save_image_jpg］
 
+def copy_paths_to_clipboard(*paths):
+    """ 
+    Copies files to the system clipboard, as opposed to just the file paths
+    It also copies the path as a string though:
+        Basically if you try to paste in a place that only accepts strings it only pastes that string
+        But if you paste in let's say finder, it will paste the actual file
+    Currently only works on MacOS. TODO: Windows, Linux
+    """
+    
+    paths=detuple(paths)
+    if isinstance(paths,str):
+        paths=[paths]
+    if not all(isinstance(x, str) for x in paths):
+        raise ValueError('Not all given paths were strings: '+repr(paths))
+
+    if currently_running_mac():
+        
+        from subprocess import run
+        import sys
+
+        pip_import('AppKit')
+        pip_import('Foundation')
+        pip_import('objc')
+
+        code = r"""
+        #!/bin/python
+        from pathlib import Path
+        from AppKit import NSPasteboard, NSPasteboardItem, NSPasteboardTypeString
+        from Foundation import NSURL
+        import objc
+
+        # Expect: 'paths' is a tuple of original strings, and 'resolved_paths' is the same length,
+        # each a resolved absolute POSIX path string (validated to exist).
+        with objc.autorelease_pool():
+            pb = NSPasteboard.generalPasteboard()
+            pb.clearContents()
+
+            items = []
+            for original_str, resolved_str in zip(paths, resolved_paths):
+                # File URL from the resolved absolute path
+                url = NSURL.fileURLWithPath_(resolved_str)
+
+                item = NSPasteboardItem.alloc().init()
+                # 1) Plain-text string representation (what you typed in)
+                item.setString_forType_(original_str, NSPasteboardTypeString)
+                # 2) File URL representation for apps that accept files
+                #    'public.file-url' expects a URL string (e.g., 'file:///...')
+                item.setString_forType_(url.absoluteString(), "public.file-url")
+
+                items.append(item)
+
+            ok = pb.writeObjects_(items)
+            if not ok:
+                raise RuntimeError("Failed to write items to the pasteboard.")
+        """
+
+        # Pre-validate & prepare the resolved absolute paths on the Python side
+        # so the exec'd snippet can trust 'resolved_paths'.
+        from pathlib import Path
+        resolved = []
+        for p in paths:
+            ap = Path(p).expanduser().resolve()
+            if not ap.exists():
+                raise FileNotFoundError(ap)
+            resolved.append(str(ap))
+
+        command = [
+            sys.executable, "-m", "rp", "exec", code,
+            "--paths", repr(tuple(paths)),
+            "--resolved_paths", repr(tuple(resolved)),
+        ]
+        
+        run(command, check=True)
+
+
+    elif currently_running_linux():
+        #TODO
+        raise NotImplementedError
+
+    elif currently_running_windows():
+        #TODO
+        raise NotImplementedError
 
 def _load_animated_image_via_pil(location, *, use_cache=True):
     """
@@ -26028,9 +26110,36 @@ def pseudo_terminal(
                             fansi_print("COPY --> r.copy_image_to_clipboard(ans)","blue")
                             copy_image_to_clipboard(get_ans())
                         else:
-                            #Can copy text to clipboard
-                            fansi_print("COPY --> r.string_to_clipboard(str(ans))","blue")
-                            copy(str(get_ans()))
+                            
+                            do_string_copy=True
+
+                            #Attempt to copy file paths
+                            if currently_running_desktop() and not running_in_ssh() and (
+                                isinstance(get_ans(), str)
+                                or has_len(get_ans())
+                                and len(get_ans()) <= 100
+                                and all(isinstance(x, str) for x in get_ans())
+                            ):
+                                try:
+                                    copy_paths_to_clipboard(get_ans())
+                                    #If we succesfully copied, it should also have been copied as a string too
+                                    do_string_copy=False
+                                    rp.fansi_print("COPY: Copied the files/paths to system clipboard!",'blue italic')
+                                except NotImplementedError:
+                                    #Unsupported OS right now
+                                    pass
+                                except FileNotFoundError as e:
+                                    #Fair enough, no need to be loud about it
+                                    pass
+                                except Exception as e:
+                                    #For now, hide errors...
+                                    print_stack_trace()
+
+
+                            if do_string_copy:
+                                #Can copy text to clipboard
+                                fansi_print("COPY --> r.string_to_clipboard(str(ans))","blue")
+                                copy(str(get_ans()))
 
                     elif user_message == "VARS":
                         if _get_pterm_verbose(): fansi_print("VARS --> ans = user_created_variables (AKA all the names you created in this pseudo_terminal session):","blue")
@@ -46307,8 +46416,8 @@ def download_url(url, path=None, *, skip_existing=False, show_progress=False, ti
     assert timeout is None or isinstance(timeout, (int, float)), 'timeout should be a number or None, but got type ' + repr(type(timeout))
 
     if is_a_folder(path):
-        dst_path = path_join(root, get_file_name(url))
         dst_root = path
+        dst_path = path_join(dst_root, get_file_name(url))
 
     else:
         dst_path= './' + get_file_name(url) if path is None else path
@@ -46393,7 +46502,7 @@ def download_url(url, path=None, *, skip_existing=False, show_progress=False, ti
         if path is None:
             #We can't use the default dst_path as it would take the file name from the URL which is often junk
             #It needs to end with "/" to treat it as a folder
-            dst_path = root + "/"
+            dst_path = dst_root + "/"
 
         output_path = gdown.download(url=url, output=dst_path, fuzzy=True, quiet=not show_progress)
 
@@ -63507,6 +63616,12 @@ known_pypi_module_package_names={
     # 'cv2': 'opencv-python',
     # 'cv2': 'opencv-contrib-python', #This one is just like opencv, but better...but does it install as reliably? (Update: so far, so good!)
     'cv2': 'opencv-python opencv-contrib-python', #But that didn't work for get_edge_drawing...https://github.com/Comfy-Org/ComfyUI-Manager/discussions/708
+    'AppKit':         'pyobjc-framework-Cocoa',
+    'Cocoa':          'pyobjc-framework-Cocoa',
+    'CoreFoundation': 'pyobjc-framework-Cocoa',
+    'Foundation':     'pyobjc-framework-Cocoa',
+    'PyObjCTools': 'pyobjc-core',
+    'objc':        'pyobjc-core',
     'pi_heif':'pi-heif',
     'cython': 'Cython',
     'pdfminer':'pdfminer.six',
@@ -63656,7 +63771,6 @@ known_pypi_module_package_names={
     'yapftests': 'yapf',
     'yaml':'PyYAML',
     'zalgo_text': 'zalgo-text',
-
     'hitherdither' : "git+https://www.github.com/hbldh/hitherdither",
     'decord' : "eva-decord" if currently_running_mac() else "decord", #https://www.piwheels.org/project/eva-decord/ - decord doesn't pip install on mac
 }
@@ -64132,3 +64246,4 @@ del re #re is random element
 
 # Version Oct24 2021
 
+

{rp-0.1.1340 → rp-0.1.1341}/rp/rp_ptpython/key_bindings.py

@@ -51,6 +51,18 @@ def get_all_function_names(code:str):
     func_names=[d[len('def '):d.find('(')].strip() for d in defs]
     return func_names
 
+def try_restore_last_buffer(buffer):
+    """
+    If buffer is empty, restore last executed doc + cursor position.
+    Returns True if restored, False otherwise.
+    """
+    import rp.rp_ptpython.r_iterm_comm as ric
+    if not buffer.document.text.strip() and ric.last_ctrl_e_doc is not None:
+        text, cursor_pos = ric.last_ctrl_e_doc
+        buffer.document = Document(text, min(cursor_pos, len(text)))
+        return True
+    return False
+
 def run_code_without_destroying_buffer(event,put_in_history=True):
     #Run the code in the buffer without clearing it or destroying cursor position etc
     buffer=event.cli.current_buffer
@@ -79,6 +91,11 @@ def handle_run_cell(event):
     #Happens when we press control+w or alt+w
     #Run current cell between the boundary prefixes
     buffer=event.cli.current_buffer
+
+    # If buffer is empty, try to restore last buffer
+    if try_restore_last_buffer(buffer):
+        return
+
     def main():
         text=buffer.document.text
         shell_mode=text.startswith('!')
@@ -1430,7 +1447,7 @@ def handle_character(buffer,char,event=None):
     if not shell and last_pressed_dash and char in '-=' and not in_string_or_comment and not after_line.strip() and re.fullmatch(r' *[a-zA-Z_0-9]+\_',before_line):
         buffer.delete_before_cursor()
         buffer.insert_text('-')#Trigger '--' or '-=' indirectly by replacing the '_' with a '-' where applicable (aka NOT if the user made the _ by typing _ with the shift key. This is one of the rare instances where stateful is OK)
-    if char=='-':last_pressed_dash=True
+    if not shell and char=='-':last_pressed_dash=True
     else:        last_pressed_dash=False
 
         
@@ -1672,7 +1689,7 @@ def handle_character(buffer,char,event=None):
       #endregion
 
       #region
-        if char=='-':
+        if not shell and char=='-':
             if re.fullmatch(r'.* for [a-zA-Z_0-9]+',before_line):
                 #[x for y| in]  --->  [x for y_| in]
                 buffer.insert_text('_')
@@ -1939,7 +1956,7 @@ def handle_character(buffer,char,event=None):
             buffer.cursor_left()
             buffer.insert_text(char)
             return True
-        if char=='-':
+        if not shell and char=='-':
             if re.fullmatch(r'( )*for [a-zA-Z_]+',before_line):
                 #`   for abc|`  --->   `   for abc_|`
                 buffer.insert_text('_')
@@ -2012,14 +2029,14 @@ def handle_character(buffer,char,event=None):
                 #on space: `if x:re`         -->  `if x:return|`  -->  `if x:return |`
                 #on space: `if x:y`          -->  `if x:yield|`   -->  `if x:yield |`
                 #on space: `with x as y:con  -->  `if x:return|`  -->  `if x:continue |`
-        if char==' ' and re.fullmatch(r'.*[\(\[\, ]\-',before_line):
+        if not shell and char==' ' and re.fullmatch(r'.*[\(\[\, ]\-',before_line):
             #if -|:   --->   if _ |:
             #print(-|)   --->   print(_,|)
             #print(_,-|)   --->   print(_,_|)
             buffer.delete_before_cursor()
             buffer.insert_text('_')
             refresh_strings_from_buffer()
-        if char=='\n' \
+        if not shell and char=='\n' \
              and before_line.endswith('-')\
              and (re.fullmatch(r' *[^\w\(\{].*',after_line) or not after_line.strip())\
              and re.fullmatch(r'(\s*)|(.*[^\w\s]\s*\-)',before_line):
@@ -2056,7 +2073,7 @@ def handle_character(buffer,char,event=None):
             buffer.insert_text(char)
             buffer.cursor_left(l+1)
             return True
-        if char=='=' and re.fullmatch(r' *[\-][\)\]\.\+\*\&\%\@\>\<\/\[\(]',before_line):
+        if not shell and char=='=' and re.fullmatch(r' *[\-][\)\]\.\+\*\&\%\@\>\<\/\[\(]',before_line):
             #  `-+=x`  --->     `_+=x|`
             #`  -)=f`  --->   `  _=f(_|)`
             # ` -.=x`  --->    ` _=_.x|`
@@ -2064,7 +2081,7 @@ def handle_character(buffer,char,event=None):
             buffer.delete_before_cursor()
             buffer.insert_text('_')
             buffer.cursor_right()
-        if char=='=' and re.fullmatch(r' +[\-]',before_line):
+        if not shell and char=='=' and re.fullmatch(r' +[\-]',before_line):
             #`if _:\n\t-=5`  --->   `if _:\n\t_=5|`
             buffer.delete_before_cursor()
             buffer.insert_text('_')
@@ -2078,11 +2095,11 @@ def handle_character(buffer,char,event=None):
             buffer.insert_text('()')
             buffer.cursor_left()
             return True
-        if char=='=' and before_line.endswith('-') and after_line.strip().endswith(':'):
+        if not shell and char=='=' and before_line.endswith('-') and after_line.strip().endswith(':'):
             #   `if -=5`  --->  `if _=5:`  --->  `if _==5|:`
             buffer.delete_before_cursor()
             buffer.insert_text('_')
-        if char in '<>/%^&@+[,*' and before_line.endswith('-'):
+        if not shell and char in '<>/%^&@+[,*' and before_line.endswith('-'):
             #- is treated like _ when an syntax-breaking operator comes after it
             #`-*5` --->  `_*5`
             buffer.delete_before_cursor()
@@ -2154,7 +2171,7 @@ def handle_character(buffer,char,event=None):
             buffer.insert_text('_')
             buffer.cursor_right(len(' in '))
             return True
-        if char in '- \n' and starts_with_any(before_line.lstrip(),'nonlocal ','global ','del '):
+        if not shell and char in '- \n' and starts_with_any(before_line.lstrip(),'nonlocal ','global ','del '):
             #After nonlocal and global,
             if char=='-':
                 #‹nonlocal -var-name› ---> ‹nonlocal _var_name›
@@ -2257,10 +2274,10 @@ def handle_character(buffer,char,event=None):
             buffer.insert_text(':')
             return True
 
-        if char=='-' and before_line.lstrip().startswith('def ') and before_line.endswith(')') and after_line==':':
+        if not shell and char=='-' and before_line.lstrip().startswith('def ') and before_line.endswith(')') and after_line==':':
             buffer.insert_text('->')
             return True
-        if (char=='-' or char=='>') and before_line.lstrip().startswith('def ') and before_line.endswith(')->') and after_line==':':
+        if not shell and (char=='-' or char=='>') and before_line.lstrip().startswith('def ') and before_line.endswith(')->') and after_line==':':
             #Do nothing
             return True
 
@@ -5065,7 +5082,11 @@ def load_python_bindings(python_input):
         def _(event):
             if not meta_pressed():
                 #Run the buffer without erasing it or disturbing cursor position
-                run_code_without_destroying_buffer(event)
+                buffer = event.cli.current_buffer
+
+                # If buffer is empty, restore last executed doc + cursor pos
+                if not try_restore_last_buffer(buffer):
+                    run_code_without_destroying_buffer(event)
             else:
                 global aicode_result
                 buffer=event.cli.current_buffer
@@ -5378,8 +5399,11 @@ def load_python_bindings(python_input):
         #Abandon the current buffer. But still save it to history.
 
         buffer=event.cli.current_buffer
-        buffer.append_to_history()
-        event.cli.abort()
+
+        # If buffer is empty, restore last executed doc + cursor pos
+        if not try_restore_last_buffer(buffer):
+            buffer.append_to_history()
+            event.cli.abort()
         # print(buffer._redo_stack)
         # buffer.redo()
 
@@ -5464,7 +5488,8 @@ def load_python_bindings(python_input):
             # print('GAGAGAGA')
 
             from rp import is_namespaceable
-            if inc_or_dec == '-' and all(is_namespaceable(x) for x in before_line if x not in ' ') and starts_with_any(before_line.lstrip(),'def ','class '):# When writing the title of a function, you don't have to use _ you can type - and it will turn it into _
+            shell = document.text.startswith('!')
+            if not shell and inc_or_dec == '-' and all(is_namespaceable(x) for x in before_line if x not in ' ') and starts_with_any(before_line.lstrip(),'def ','class '):# When writing the title of a function, you don't have to use _ you can type - and it will turn it into _
                 #(on -)
                 #def |(): ---> def _|():
                 #     AND
@@ -5472,7 +5497,7 @@ def load_python_bindings(python_input):
                 buffer.insert_text('_')
                 return
             if inc_or_dec=='-' :
-                if is_namespaceable(before_line.strip()) and before_line.rstrip()==before_line and not single_line:
+                if not shell and is_namespaceable(before_line.strip()) and before_line.rstrip()==before_line and not single_line:
                     #If multiline, and we're starting a line, and we're continuing some variable name, assume that we don't want to create an expression.
                     #Example:
                     #def f():
@@ -5480,7 +5505,7 @@ def load_python_bindings(python_input):
                     buffer.insert_text('_')
                     return
 
-                if before_line.endswith('for ')and starts_with_any(after_line,' in)',' in}',' in]'):
+                if not shell and before_line.endswith('for ')and starts_with_any(after_line,' in)',' in}',' in]'):
                     buffer.insert_text('_')
                     buffer.cursor_right(3)
                     buffer.insert_text(' ')
@@ -5515,7 +5540,7 @@ def load_python_bindings(python_input):
             #     buffer.insert_text('+')
             #     return
 
-            if inc_or_dec=='-' and before_line.lstrip()=='for ' and after_line.rstrip()==' in :':
+            if not shell and inc_or_dec=='-' and before_line.lstrip()=='for ' and after_line.rstrip()==' in :':
                 #(on -)
                 #for | in : --> for _ in |:
                 buffer.insert_text('_')
@@ -5530,14 +5555,14 @@ def load_python_bindings(python_input):
                 else:
                     buffer.insert_text(inc_or_dec)
                     buffer.cursor_left()
-            elif inc_or_dec=='-' and before_line.endswith('-'):
+            elif not shell and inc_or_dec=='-' and before_line.endswith('-'):
                 #becuase then we dont have to reach for the shify key (default blank vairable is _ in for loops)
                 #print(-|) ---> print(_|)
                 buffer.delete_before_cursor()
                 buffer.insert_text('_')
-            elif inc_or_dec=='-' and before_line.endswith('-=1'):
+            elif not shell and inc_or_dec=='-' and before_line.endswith('-=1'):
                 #(when we wanted to make an underscore but got -=1, just press - again...)
-                #x-=1| ---> x_| 
+                #x-=1| ---> x_|
                 buffer.delete_before_cursor(3)
                 buffer.insert_text('_')
             else:
@@ -5649,7 +5674,7 @@ def load_python_bindings(python_input):
 
     for char in '"\'':
         thing2(char)
-    @handle(',',filter=~vi_mode_enabled&microcompletions_enabled)  
+    @handle(',',filter=~vi_mode_enabled&microcompletions_enabled)
     def _(event):
         #Comma event
         buffer=event.cli.current_buffer
@@ -5659,6 +5684,7 @@ def load_python_bindings(python_input):
         after= document.text_after_cursor
         before_line=document.current_line_before_cursor
         after_line=document.current_line_after_cursor
+        shell = document.text.startswith('!')
         if before_line.lstrip()=='for ' and after_line.rstrip()==' in :':
             #for | in:  --->  for i,e in enumerate(|):
             buffer.insert_text('i,e')
@@ -5683,7 +5709,7 @@ def load_python_bindings(python_input):
             buffer.insert_text(',')
             buffer.cursor_left()
             return
-        if before_line.endswith('-'):
+        if not shell and before_line.endswith('-'):
             #Turning the '-' into a '_' where a '-' would be syntactically invalid
             buffer.delete_before_cursor()
             buffer.insert_text('_')
@@ -6011,11 +6037,11 @@ def load_python_bindings(python_input):
             buffer.cursor_left(len(' in :'))
             refresh_strings_from_buffer()
 
-        if before_line.lstrip()=='for 'and after_line.rstrip()==' in :':
+        if not shell and before_line.lstrip()=='for 'and after_line.rstrip()==' in :':
             #for | in :   --->   for _ in |:   (we don't stop here, it eventually goes to "for _ in ans": see the next 'if' block)
             buffer.insert_text('_')
             # buffer.insert_text('ans')
-            # 
+            #
             refresh_strings_from_buffer()
 
         if after_line.rstrip()==' in :':
@@ -6075,8 +6101,8 @@ def load_python_bindings(python_input):
                 #Which is a syntax error. Autocorrect it to:
                 #import w as x,y as z
                 buffer.delete_before_cursor(2)
-            if before_line.lstrip() in ('def ','class ') and current_line.strip() in ('def ():','def (self):','class :') :
-                #def |():  --->  'def ans():\n|'  or 'def _():\n|' 
+            if not shell and before_line.lstrip() in ('def ','class ') and current_line.strip() in ('def ():','def (self):','class :') :
+                #def |():  --->  'def ans():\n|'  or 'def _():\n|'
                 #class |:  --->  class _:\n|
                 if single_line:
                     buffer.insert_text('ans')

{rp-0.1.1340 → rp-0.1.1341}/rp/rp_ptpython/r_iterm_comm.py

@@ -21,6 +21,7 @@ dont_erase_buffer_on_enter=[]#as opposed to [True], which is truthy
 completion_style=['good']#should be either ['good'] or ['fast']
 debug_height=20#The height of the debugger toolbar
 successful_commands=[]
+last_ctrl_e_doc = None  # Store last executed doc from Ctrl+E (text, cursor_position, vertical_scroll_offset)
 options={
 	'top_space':0,
 	'min_bot_space':15,

rp-0.1.1341/rp/version.py

@@ -0,0 +1 @@
+1341

{rp-0.1.1340 → rp-0.1.1341}/rp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1340
+Version: 0.1.1341
 Summary: Ryan's Python: IDE + Library + Tools
 Home-page: https://github.com/RyannDaGreat/rp
 Author: Ryan Burgert

rp-0.1.1341/version.py

@@ -0,0 +1 @@
+1341

rp-0.1.1340/rp/version.py

@@ -1 +0,0 @@
-1340

rp-0.1.1340/version.py

@@ -1 +0,0 @@
-1340