rp 0.1.1163__tar.gz → 0.1.1166__tar.gz

{rp-0.1.1163 → rp-0.1.1166}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1163
+Version: 0.1.1166
 Summary: Ryan's Python
 Home-page: https://github.com/RyannDaGreat/Quick-Python
 Author: Ryan Burgert

{rp-0.1.1163 → rp-0.1.1166}/rp/r.py

@@ -6593,7 +6593,7 @@ def _display_video_in_notebook(video, filetype, *, embed, framerate, save_video=
         if not isinstance(video, str) and embed and file_exists(temp_path):
             delete_file(temp_path)
 
-def display_video_in_notebook_webp(video, quality=100, framerate=60, embed=False):
+def display_video_in_notebook_webp(video, quality=100, framerate=60):
     """
     Displays an animated webp in a Jupyter notebook with a specified quality and framerate
     See rp.display_video_in_notebook's docstring for explanations of what the args do
@@ -6610,7 +6610,7 @@ def display_video_in_notebook_webp(video, quality=100, framerate=60, embed=False
     """
     def save_video(video, path, framerate):
         return save_video_webp(video, path, quality=quality, framerate=framerate)
-    return gather_args_call(_display_video_in_notebook, filetype='webp')
+    return gather_args_call(_display_video_in_notebook, filetype='webp', embed=True)
 
 # def display_embedded_video_in_notebook(video,framerate:int=30,filetype:str='gif'):
 #     """
@@ -11603,6 +11603,27 @@ def get_nested_value(list_to_be_accessed,*address_int_list,ignore_errors: bool =
                 raise IndexError
     return list_to_be_accessed
 
+def get_nested_attr(obj, attr):
+    """
+    Get a nested attribute from an object using dot notation.
+    
+    Args:
+        obj: The object to get the attribute from
+        attr: String with attribute names in dot notation (e.g., "attr1.attr2.attr3")
+        
+    Returns:
+        The value of the nested attribute
+        
+    Raises:
+        AttributeError: If any attribute in the chain doesn't exist
+    """
+    attrs = attr.split('.')
+    
+    for name in attrs:
+        obj = getattr(obj, name)
+        
+    return obj
+
 # def shell_command(command: str,as_subprocess=False,return_printed_stuff_as_string: bool = True) -> str or None:
 #     # region OLD VERSION: had an argument called return_printed_stuff_as_string, which I never really used as False, and run_as_subprocess when True might not return a string anyay. If I recall correctly, I implemented return_printed_stuff_as_string simply because it was sometimes annoying to see the output when using pseudo_terminal
 #     #       def shell_command(command: str,return_printed_stuff_as_string: bool = True,run_as_subprocess=False) -> str or None:
@@ -12153,6 +12174,14 @@ def sorted_by_number(x, *, reverse=False):
 def sorted_by_len(x, *, reverse=False):
     return sorted(x, key=len, reverse=reverse)
 
+def sorted_by_attr(x, attr, *, key=None, reverse=False):
+    def new_key(e):
+        e = get_nested_attr(e, attr)
+        if key is not None:
+            e = key(e)
+        return e
+    return sorted(x, key=new_key, reverse=reverse)
+
 # def sync_sorted(*lists_in_descending_sorting_priority,key=identity):
 #         # Sorts main_list and reorders all *lists_in_descending_sorting_priority the same way, in sync with main_list
 #         return tuple(zip(*sorted(zip(*lists_in_descending_sorting_priority),key=lambda x:tuple(map(key,x)))))
@@ -14589,11 +14618,21 @@ def _eta(total_n,*,min_interval=.3,title="r.eta"):
     timer = tic()
     interval_timer = tic()
     title = title + ": "
+    shown_done = False
+
+    def fansi_progress(string, proportion, style='underlined'):
+        """ Used to show a progress bar under the ETA text! """
+        string = string.expandtabs() #Jupyter doesn't render underlines over tabs
+        num_chars = round(len(string) * proportion)
+        return fansi(string[:num_chars], style) + string[num_chars:]
 
     def display_eta(proportion_completed,time_elapsed_in_seconds,TOTAL_TO_COMPLETE,COMPLETED_SO_FAR):
         nonlocal interval_timer
+        nonlocal shown_done
 
-        if interval_timer()>=min_interval:
+        done = proportion_completed >= 1
+
+        if interval_timer()>=min_interval or done and not shown_done:
             interval_timer=tic()
 
             # Estimated time of arrival printer
@@ -14612,23 +14651,26 @@ def _eta(total_n,*,min_interval=.3,title="r.eta"):
             # Estimated time of arrival
             etr = eta - time_elapsed_in_seconds  # Estimated time remaining
 
+            if done:
+                shown_done = True
+
             return _print_status(
-                title
-                + (
-                    (
-                        "ETR="
-                        + str(timedelta(seconds=etr))
-                        + "\tETA="
-                        + str(timedelta(seconds=eta))
-                        + "\tT="
-                        + str(temp)
-                        + progress
-                        if etr > 0
-                        else "COMPLETED IN " + str(temp) + progress + "\n"
-                    )
+                fansi_progress(
+                    title
+                    + "ETR="
+                    + str(timedelta(seconds=etr))
+                    + "\tETA="
+                    + str(timedelta(seconds=eta))
+                    + "\tT="
+                    + str(temp)
+                    + progress,
+                    proportion_completed,
                 )
+                if not done
+                else title + "COMPLETED IN " + str(temp) + progress + "\n"
             )
 
+
     def out(n):
         return display_eta(
             n / total_n,
@@ -14652,10 +14694,14 @@ class eta:
         ...     sleep(.1)
     """
 
-    def __init__(self, x, title='r.eta', min_interval=.3):
-        assert isinstance(x, int) or hasattr(x, '__len__')
+    def __init__(self, x, title='r.eta', min_interval=.3, length=None):
+        assert isinstance(x, int) or hasattr(x, '__len__') or length is not None
 
-        if hasattr(x, '__len__'):
+        if length is not None:
+            length = int(length)
+            self.elements = IteratorWithLen(x, length)
+            x = length
+        elif has_len(x):
             self.elements = x
             x = len(x)
         else:
@@ -17334,8 +17380,8 @@ def _add_pterm_prefix_shortcut(shortcut:str,replacement:str):
     When using pterm, you can type commands like 'pi ' --> 'PIP install '
     This lets you add custom ones from your rprc file, like _add_prefix_shortcut('fu','!fileutil')
     """
-    assert isinstance(shortcut,str)
-    assert isinstance(replacement,str)
+    assert isinstance(shortcut,str), shortcut
+    assert isinstance(replacement,str) or isinstance(replacement, list) and len(replacement)==2, replacement
     
     import rp.r_iterm_comm as ric
     ric.kibble_shortcuts[shortcut]=replacement
@@ -33656,7 +33702,7 @@ def is_gs_url(url):
 
 def download_url(url, path=None, *, skip_existing=False, show_progress=False, timeout=None):
     """
-    Works with both HTTP, Aws S3 and Google Cloud Storage urls
+    Works with both HTTP, Aws S3 and Google Cloud Storage urls, as well as /cns paths accessed via Google's internal fileutil
     Download a file from a url and return the path it downloaded to. It no path is specified, it will choose one for you and return it (as a string)
     If path exists and it is a folder, it will download to the url's filename in that folder
     EXAMPLE: open_file_with_default_application(download_url('https://i.imgur.com/qSmVyCo.jpg'))#Show a picture of a cat
@@ -33671,7 +33717,7 @@ def download_url(url, path=None, *, skip_existing=False, show_progress=False, ti
 
     else:
         if path is None:
-            path=get_file_name(url)
+            path= './' + get_file_name(url)
 
         #Create the parent directory of the destination if it doesn't already exist
         root = get_path_parent(path)
@@ -33713,6 +33759,28 @@ def download_url(url, path=None, *, skip_existing=False, show_progress=False, ti
             raise Exception("rp.download_url failed to download Google Cloud Storage url %s to path %s: "%(url,path) + str(e))
 
         return path
+    
+    elif url.startswith('/cns/') and system_command_exists('fileutil', use_cache=True) and not folder_exists('/cns'):
+        #We're on an internal Google computer and want to download a file from colossus
+
+        import subprocess
+
+        try:
+            kwargs = dict()
+            fileutil_args = ['fileutil', 'cp', '--R', '--f']
+            if timeout:
+                fileutil_args+=['--fileutil_timeout',str(timeout)] #Not a guarantee - in the doc it says its aspirational
+                fileutil_args = ['timeout', str(timeout*2)] + fileutil_args #So we kill it if it takes 2x as long as the deadline
+            fileutil_args+=[url,path]
+            if not show_progress:
+                kwargs.update(dict(stderr=subprocess.DEVNULL))
+            subprocess.check_call(fileutil_args,**kwargs)
+        except subprocess.TimeoutExpired:
+            raise TimeoutError("rp.download_url timed out downloading Google Colossus url %s to path %s"%(url,path))
+        except subprocess.CalledProcessError as e:
+            raise Exception("rp.download_url failed to download Google Colossus url %s to path %s: "%(url,path) + str(e))
+
+        return path
 
 
     elif _is_youtube_video_url(url):
@@ -34913,6 +34981,7 @@ __import__("sys").path.append(__import__("os").getcwd())
 
 ## Custom command prefix shortcuts
 #__import__('rp').r._add_pterm_prefix_shortcut("fu","!!fileutil")
+#__import__('rp').r._add_pterm_prefix_shortcut("fp",["fansi_print('","','green bold')"])
 
 ## Custom pterm commands
 #__import__('rp').r._add_pterm_command_shortcuts('''
@@ -39347,10 +39416,11 @@ def resize_video_to_fit(
     *,
     allow_growth=True,
     alpha_weighted=False,
-    show_progress=False
+    show_progress=False,
+    lazy=False
 ):
     """ Almost the same as resize_images_to_fit - but height and width and interp can be args and returns numpy arrays if input video is a numpy array too """
-    output = gather_args_call(resize_images_to_fit, images)
+    output = gather_args_call(resize_images_to_fit, video)
 
     if is_numpy_array(video): output = as_numpy_array(output)
 
@@ -39386,7 +39456,7 @@ def resize_videos_to_fit(
     )
 
     if show_progress:
-        output = eta(output, title=get_current_function_name())
+        output = eta(output, title=get_current_function_name(), length=len(videos))
 
     if not lazy:
         output = list(output)
@@ -39422,7 +39492,7 @@ def resize_videos_to_hold(
     )
 
     if show_progress:
-        output = eta(output, title=get_current_function_name())
+        output = eta(output, title=get_current_function_name(), length=len(videos))
 
     if not lazy:
         output = list(output)

{rp-0.1.1163 → rp-0.1.1166}/rp/rp_ptpython/key_bindings.py

@@ -2149,11 +2149,18 @@ def handle_character(buffer,char,event=None):
                 token=shortcuts[before]
 
             if token is not None and not is_callable_token(before) and not is_iterable_token(before):
-                #Allow 'cd thing' to be 'CD thing'
                 buffer.delete_before_cursor(len(before))
-                buffer.insert_text(token+' ')
+                if isinstance(token, str):
+                    #Allow 'cd thing' to be 'CD thing'
+                    buffer.insert_text(token+' ')
+                else:
+                    assert len(token)==2, token
+                    buffer.insert_text(token[0])
+                    buffer.insert_text(token[1])
+                    buffer.cursor_left(len(token[1]))
                 return True
 
+
         #OLD VERSION
         #if before=='cd' and not after and char==' ':
         #    #Allow 'cd thing' to be 'CD thing'

rp-0.1.1166/rp/version.py

@@ -0,0 +1 @@
+1166

{rp-0.1.1163 → rp-0.1.1166}/rp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1163
+Version: 0.1.1166
 Summary: Ryan's Python
 Home-page: https://github.com/RyannDaGreat/Quick-Python
 Author: Ryan Burgert

rp-0.1.1166/version.py

@@ -0,0 +1 @@
+1166

rp-0.1.1163/rp/version.py

@@ -1 +0,0 @@
-1163

rp-0.1.1163/version.py

@@ -1 +0,0 @@
-1163