rp 0.1.1001__tar.gz → 0.1.1002__tar.gz

{rp-0.1.1001 → rp-0.1.1002}/PKG-INFO

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

{rp-0.1.1001 → rp-0.1.1002}/rp/r.py

@@ -2299,32 +2299,75 @@ def random_batch_up_to(full_list, max_batch_size=None, retain_order=False):
 
     return random_batch(full_list, batch_size, retain_order = retain_order)
 
-def random_batch_with_replacement(full_list, batch_size: int = None):
+def random_batch_with_replacement(full_list, batch_size: int = None, method: str = "balanced"):
     """
-    Like random_batch, but it handles batch_size larger than len(full_list) by nicely repeating elements
-    It tries to do it nice and evenly, instead of simply randomly sampling it
-    EXAMPLES:
-         >>> random_batch_with_replacement([1,2,3],10)
-        ans = [1, 2, 3, 3, 2, 1, 2, 3, 1, 3]
-         >>> random_batch_with_replacement([1,2,3,4,5],20)
-        ans = [1, 4, 5, 3, 2, 5, 1, 2, 3, 4, 4, 3, 1, 5, 2, 1, 5, 3, 4, 2]
+    Like random_batch, but it handles batch_size larger than len(full_list) by nicely repeating elements.
+    It supports different sampling methods specified by the 'method' argument.
+
+    Args:
+        full_list: The list to sample from.
+        batch_size: The desired size of the output batch.
+        method: The sampling method to use. Defaults to "balanced".
+            - "balanced": Perform balanced sampling. The function tries to distribute the elements evenly across the
+                          output list by repeating full_list and shuffling the elements. If duplicates are present,
+                          the distance between them is constrained by the size of full_list.
+            - "independent": Perform independent sampling with replacement. Each element in full_list has an equal probability
+                             of being selected in each draw, similar to drawing balls from a hat with replacement.
+                             There is no guarantee of duplicates, and if present, the distance between them can be arbitrary.
+                             This is the most basic possible type of sampling with replacement.
+
+    Returns:
+        A list of size batch_size containing elements sampled from full_list.
+
+    Examples:
+        >>> random_batch_with_replacement([1, 2, 3], 10, method="balanced")
+        [1, 2, 3, 3, 2, 1, 2, 3, 1, 3]
+
+        >>> random_batch_with_replacement([1, 2, 3, 4, 5], 20, method="balanced")
+        [1, 4, 5, 3, 2, 5, 1, 2, 3, 4, 4, 3, 1, 5, 2, 1, 5, 3, 4, 2]
+
+        >>> random_batch_with_replacement([1, 2, 3], 10, method="independent")
+        [1, 1, 1, 1, 1, 1, 1, 1, 1, 1]  # Astronomically unlikely, but possible with independent sampling
+        [3, 3, 1, 3, 3, 2, 3, 1, 2, 2]  # A more typical result of this code
+
+    Raises:
+        ValueError: If an unsupported sampling method is specified.
+        AssertionError: If the code reaches an unreachable state.
     """
-    full_list=list(full_list)
+    full_list = list(full_list)
     assert batch_size >= 0
-    assert len(full_list)>0
-    
-    repeats=batch_size//len(full_list)
-    remainder=batch_size%len(full_list)
-    
-    output =list_flatten(shuffled(full_list) for _ in range(repeats))
-    output+=random_batch(full_list,remainder)
-    
+    assert len(full_list) > 0
+
+    valid_methods = ["balanced", "independent"]
+
+    if method not in valid_methods:
+        raise ValueError("Unsupported sampling method: %s. Valid methods are: %s" % (method, ', '.join(valid_methods)))
+
+    if method == "balanced":
+        # Perform balanced sampling
+        repeats = batch_size // len(full_list)
+        remainder = batch_size % len(full_list)
+
+        output = list_flatten(shuffled(full_list) for _ in range(repeats))
+        output += random_batch(full_list, remainder)
+
+    elif method == "independent":
+        # Perform independent sampling with replacement
+        output = [random.choice(full_list) for _ in range(batch_size)]
+
+    else:
+        assert False, "This code is unreachable"
+
     return output
-    
 
-def random_substring(string:str,length:int):
+def random_substring(string:str,length:int=None):
+    if length is None:
+        #If length isn't given, choose a random length
+        length=random_int(0,len(string))
+
     assert len(string)>=length
     assert length>=0
+
     index=random_index(len(string)-length+1)
     return string[index:index+length]
 
@@ -3103,14 +3146,30 @@ def save_image(image,file_name=None,add_png_extension: bool = True):
     return file_name
 
 def save_images(images,paths:list=None,skip_overwrites=False,show_progress=False):
-    #Save a list of images to a list of paths
-    #If no paths are specified, the image names will be their hash values.
-    #   In either case, this function returns a list of paths corresponsing to the image files that were saved
-    #This function is faster than using save_image sequentially, as it uses multiple threads
-    #If skip_overwrites is False, we won't overwrite any images that already have a given path name. This is especially useful when the image name is equal to it's hash code, as that can speed things up a lot (avoiding saving image files that don't need to be saved again saves you the time of having to write the same image file twice)
+    """
+    Save images to specified paths concurrently.
+
+    Parameters:
+        - images (list): List of image objects to save.
+        - paths (list, str, or None, optional): Determines the file paths for saving images.
+          * If None, each image is saved with a name derived from its hash value.
+          * If a string, treated as a format string (like 'image_%03i.png') to generate file paths.
+          * If a list, each element should be a path corresponding to each image.
+        - skip_overwrites (bool, optional): If True, does not overwrite existing files. Default is False.
+        - show_progress (bool, optional): If True, shows progress and estimated time remaining. Default is False.
+
+    Returns:
+        - list: Paths where images were saved.
+
+    Examples:
+        >>>  save_images(my_images, 'image_%03i.png', skip_overwrites=True, show_progress=True)
+
+    """
         
     if paths is None:
-        paths=[None]*len(images)
+        paths=random_namespace_hash()+'_%05i.png'
+        # paths=[None]*len(images)
+
         #if show_progress:
             #print("rp.save_images: No paths were specified for your %i images, so their names will be their hash values...calculating the image hash values...",end='',flush=True)
           #
@@ -3119,6 +3178,10 @@ def save_images(images,paths:list=None,skip_overwrites=False,show_progress=False
         #if show_progress:
             #sys.stdout.write('\033[2K\033[1G')#erase and go to beginning of line https://stackoverflow.com/questions/5290994/remove-and-replace-printed-items
 
+    if isinstance(paths,str):
+        #Assume paths is a formattable string that takes an int index
+        paths=[paths % i for i in range(len(images))]
+
     if show_progress:
         number_of_images_saved=0
         show_time_remaining=eta(len(paths),title='Saving Images')
@@ -18030,6 +18093,7 @@ def cv_text_to_image(text,
                      monospace=False
                     ):
 
+
     if monospace:
         return _cv_text_to_image_monospace(
             text,
@@ -18081,13 +18145,15 @@ def _single_line_cv_text_to_image(text,*,scale,font,thickness,color,tight_fit,ba
 
 
 def strip_file_extension(file_path):
-    #'x.png'        --> 'x'
-    #'text.txt'     --> 'text'
-    #'text'         --> 'text'
-    #'text.jpg.txt' --> 'text.jpg'
-    #'a/b/c.png'    --> 'a/b/c'
-    #'a/b/c'        --> 'a/b/c'
-    # For more, see: https://stackoverflow.com/questions/678236/how-to-get-the-filename-without-the-extension-from-a-path-in-python
+    """
+    'x.png'        --> 'x'
+    'text.txt'     --> 'text'
+    'text'         --> 'text'
+    'text.jpg.txt' --> 'text.jpg'
+    'a/b/c.png'    --> 'a/b/c'
+    'a/b/c'        --> 'a/b/c'
+     For more, see: https://stackoverflow.com/questions/678236/how-to-get-the-filename-without-the-extension-from-a-path-in-python
+    """
     return os.path.splitext(file_path)[0]
 
 def strip_file_extensions(*file_paths):
@@ -18095,46 +18161,50 @@ def strip_file_extensions(*file_paths):
     return [strip_file_extension(x) for x in detuple(file_paths)]
 
 def get_file_extension(file_path):
-    #'x.png'        --> 'png'
-    #'text.txt'     --> 'txt'
-    #'text'         --> ''
-    #'text.jpg.txt' --> 'txt'
-    #'a/b/c.png'    --> 'png'
-    #'a/b/c'        --> ''
-    # For more, see: https://stackoverflow.com/questions/541390/extracting-extension-from-filename-in-python
+    """
+    'x.png'        --> 'png'
+    'text.txt'     --> 'txt'
+    'text'         --> ''
+    'text.jpg.txt' --> 'txt'
+    'a/b/c.png'    --> 'png'
+    'a/b/c'        --> ''
+     For more, see: https://stackoverflow.com/questions/541390/extracting-extension-from-filename-in-python
+    """
     return os.path.splitext(file_path)[1].rpartition('.')[2]
 
 def with_file_extension(path:str,extension:str,*,replace=False):
-    #Replaces or adds a file extension to a path
-    #
-    #If extension is blank, and replace=False, path won't be changed
-    #If extension is blank, and replace=True, then this is equivalent to strip_file_extension
-    #
-    #EXAMPLES:
-    #    >>> with_file_extension('doggy','')
-    #   ans = doggy
-    #    >>> with_file_extension('doggy.png','jpg')
-    #   ans = doggy.png.jpg
-    #    >>> with_file_extension('doggy.png','.jpg')
-    #   ans = doggy.png.jpg
-    #    >>> with_file_extension('doggy.png','.jpg',replace=True)
-    #   ans = doggy.jpg
-    #    >>> with_file_extension('doggy.png','.png')
-    #   ans = doggy.png
-    #    >>> with_file_extension('doggy.png','..png')
-    #   ans = doggy.png..png
-    #    >>> with_file_extension('doggy.png','png')
-    #   ans = doggy.png
-    #    >>> with_file_extension('doggy','png')
-    #   ans = doggy.png
-    #    >>> with_file_extension('path/to/doggy','png')
-    #   ans = path/to/doggy.png
-    #
-    #EXAMPLES:
-    #    path='path'        ; assert path==with_file_extension(path,get_file_extension(path))
-    #    path='path.'       ; assert path==with_file_extension(path,get_file_extension(path))
-    #    path='path.png'    ; assert path==with_file_extension(path,get_file_extension(path))
-    #    path='path.png.jpg'; assert path==with_file_extension(path,get_file_extension(path))
+    """
+    Replaces or adds a file extension to a path
+    
+    If extension is blank, and replace=False, path won't be changed
+    If extension is blank, and replace=True, then this is equivalent to strip_file_extension
+    
+    EXAMPLES:
+        >>> with_file_extension('doggy','')
+       ans = doggy
+        >>> with_file_extension('doggy.png','jpg')
+       ans = doggy.png.jpg
+        >>> with_file_extension('doggy.png','.jpg')
+       ans = doggy.png.jpg
+        >>> with_file_extension('doggy.png','.jpg',replace=True)
+       ans = doggy.jpg
+        >>> with_file_extension('doggy.png','.png')
+       ans = doggy.png
+        >>> with_file_extension('doggy.png','..png')
+       ans = doggy.png..png
+        >>> with_file_extension('doggy.png','png')
+       ans = doggy.png
+        >>> with_file_extension('doggy','png')
+       ans = doggy.png
+        >>> with_file_extension('path/to/doggy','png')
+       ans = path/to/doggy.png
+    
+    EXAMPLES:
+        path='path'        ; assert path==with_file_extension(path,get_file_extension(path))
+        path='path.'       ; assert path==with_file_extension(path,get_file_extension(path))
+        path='path.png'    ; assert path==with_file_extension(path,get_file_extension(path))
+        path='path.png.jpg'; assert path==with_file_extension(path,get_file_extension(path))
+    """
 
     if extension.startswith('.'):
         extension=extension[1:]
@@ -18455,6 +18525,10 @@ get_subdirectories=get_subfolders
 def _os_listdir_files(folder):
     #like get_all_files, but returns only file names and is a little faster
     #https://stackoverflow.com/questions/3207219/how-do-i-list-all-files-of-a-directory
+
+    return [entry.name for entry in os.scandir(folder) if entry.is_file()]
+
+    #OLD CODE - WORKS FINE BUT SHOULD BE SLOWER THAN SCANDIR
     from os import listdir
     from os.path import isfile, join
     onlyfiles = [f for f in listdir(folder) if isfile(join(folder, f))]
@@ -18507,19 +18581,37 @@ def folder_is_empty(folder: str = ".") -> bool:
 directory_is_empty=folder_is_empty
 
 def random_file(folder=None):
-    #Returns the path of a random file in that folder
-    #If the folder is None, returns the name of a random file in the current directory
+    """
+    Returns the paths of random files in that folder
+    If the folder is None, returns the name of a random file in the current directory
+    Returns a list of strings (file paths) whose length=quantity
+    """
+    return random_files(quantity=1,folder=folder)[0]
+    
+
+def random_files(quantity:int,folder=None):
+    """
+    Returns the paths of random files in that folder
+    If the folder is None, returns the name of a random file in the current directory
+    Returns a list of strings (file paths) whose length=quantity
+    """
+    assert isinstance(folder,str) or folder is None
+    assert isinstance(quantity,int)
+    assert quantity>=0
     
+    if quantity==0:
+        return []
     
     if folder is None:
         folder='.'
-        return get_file_name(random_file('.')) #Return something like '__main__.py'
+        return get_file_names(random_files(quantity,'.')) #Return something like '__main__.py'
     else:
         assert folder_exists(folder), 'rp.random_file: Folder does not exist: '+repr(folder)
         files=_os_listdir_files(folder)
         assert not len(files)==0, 'rp.random_file: There are no files in '+repr(folder)
-        output=random_element(_os_listdir_files(folder))
+        output=random_batch_with_replacement(files,quantity)
         return path_join(folder,output) #Return something like './__main__.py'
+
 #endregion
 
 
@@ -21137,7 +21229,7 @@ def get_unique_copy_path(path: str, *, suffix: str = "_copy%i") -> str:
     def apply_suffix_to_path(path, suffix, num_copies):
         folder = get_parent_folder(path)
         file = get_file_name(path)
-        name = strip_file_extension(path)
+        name = strip_file_extension(file)
         extension = get_file_extension(path)
         new_name = apply_suffix_to_name(name, suffix, num_copies)
         new_file = with_file_extension(new_name, extension)
@@ -25383,6 +25475,7 @@ def resize_image_to_hold(image, height: int = None, width: int = None, *, interp
     """
     assert rp.is_image(image)
     assert height is not None or width is not None
+    image = as_numpy_image(image)
 
     if allow_shrink:
         assert height or width, ('If allow_shrink is True, at least one dimension must be nonzero. '
@@ -25418,6 +25511,8 @@ def resize_image_to_fit(image, height:int=None, width:int=None, *, interp='bilin
     image_height, image_width = rp.get_image_dimensions(image)
     scale = 1
 
+    image = as_numpy_image(image)
+
     # height and width are optional
     if height is None and width is None:
         return image+0 #Return an unmodified copy

{rp-0.1.1001 → rp-0.1.1002}/rp/ryan_vimrc.py

@@ -77,6 +77,11 @@
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
 
+" Allow backspace to delete over everything in insert mode, solving the issue where
+" backspace only deletes characters typed in the current insert mode session on macOS
+set backspace=indent,eol,start
+
+
 set nocompatible              " be iMproved, required
 filetype off                  " required
 

rp-0.1.1002/rp/version.py

@@ -0,0 +1 @@
+1002

rp-0.1.1002/rp.egg-info/PKG-INFO

@@ -0,0 +1,11 @@
+Metadata-Version: 1.0
+Name: rp
+Version: 0.1.1002
+Summary: Ryan's Python
+Home-page: https://github.com/RyannDaGreat/Quick-Python
+Author: Ryan Burgert
+Author-email: ryancentralorg@gmail.com
+License: UNKNOWN
+Description: UNKNOWN
+Keywords: not_searchable_yet_go_away_until_later_when_this_is_polished
+Platform: UNKNOWN

rp-0.1.1002/version.py

@@ -0,0 +1 @@
+1002

rp-0.1.1001/rp/version.py

@@ -1 +0,0 @@
-1001

rp-0.1.1001/rp.egg-info/PKG-INFO

@@ -1,11 +0,0 @@
-Metadata-Version: 1.0
-Name: rp
-Version: 0.1.1001
-Summary: Ryan's Python
-Home-page: https://github.com/RyannDaGreat/Quick-Python
-Author: Ryan Burgert
-Author-email: ryancentralorg@gmail.com
-License: UNKNOWN
-Description: UNKNOWN
-Keywords: not_searchable_yet_go_away_until_later_when_this_is_polished
-Platform: UNKNOWN

rp-0.1.1001/version.py

@@ -1 +0,0 @@
-1001