rp 0.1.1144__tar.gz → 0.1.1146__tar.gz

{rp-0.1.1144 → rp-0.1.1146}/PKG-INFO

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

{rp-0.1.1144 → rp-0.1.1146}/rp/r.py

@@ -5014,9 +5014,8 @@ def save_image(image,file_name=None,add_png_extension: bool = True):
     if file_name.startswith('~'):
         file_name=get_absolute_path(file_name)
 
-    if not folder_exists(get_parent_folder(file_name)):
-        #If the specified path's folders don't exist, make them. Don't whine and throw errors.
-        make_directory(get_parent_folder(file_name))
+    #If the specified path's folders don't exist, make them. Don't whine and throw errors.
+    make_parent_directory(file_name)
     
     if get_file_extension(file_name)=='exr':
         #Note that exr filetypes must have a float32 dtype
@@ -5210,7 +5209,7 @@ def save_image_jpg(image,path=None,*,quality=100,add_extension=True):
     if path is None:
         path=get_unique_copy_path('image.jpg')
 
-    make_directory(get_parent_folder(path)) #Make sure the directory exists
+    make_parent_directory(path) #Make sure the directory exists
     image=as_numpy_image(image)
     image=as_rgb_image(image)
     image=as_byte_image(image)
@@ -5244,7 +5243,7 @@ def save_image_webp(image, path=None, *, quality=100, add_extension=True):
     if path is None:
         path = get_unique_copy_path('image.webp')
 
-    make_directory(get_parent_folder(path))  
+    make_parent_directory(path)
 
     assert 0 <= quality <= 100, 'WebP quality is measured in percent'
 
@@ -5272,7 +5271,7 @@ def save_image_avif(image, path=None, *, quality=100, add_extension=True):
     if path is None:
         path = get_unique_copy_path('image.avif')
 
-    make_directory(get_parent_folder(path))  
+    make_parent_directory(path)
 
     assert 0 <= quality <= 100, 'AVIF quality is measured in percent'
 
@@ -5392,7 +5391,7 @@ def save_image_jxl(image, path=None, *, quality=100, add_extension=True):
     if path is None:
         path = get_unique_copy_path('image.jxl')
     
-    make_directory(get_parent_folder(path))
+    make_parent_directory(path)
     
     assert 0 <= quality <= 100, 'JpgXL quality is measured in percent'
     
@@ -5412,7 +5411,7 @@ def save_animated_webp(video, path=None, *, framerate=60, quality=100, loop=True
     if path is None:
         path = get_unique_copy_path('video.webp')
 
-    make_directory(get_parent_folder(path))
+    make_parent_directory(path)
 
     assert 0 <= quality <= 100, 'WebP quality is measured in percent'
 
@@ -19800,7 +19799,7 @@ def pseudo_terminal(
                             fansi_print("RYAN PUDBRC: Setting PUDB's shell to pseudo_terminal",'blue','bold')
 
                             pudb_config_file_path=get_absolute_path('~/.config/pudb/pudb.cfg')
-                            make_directory(get_parent_folder(pudb_config_file_path))
+                            make_parent_directory(pudb_config_file_path)
                             if not file_exists(pudb_config_file_path):
                                 pudb_config=line_join([
                                   '[pudb]',
@@ -21012,7 +21011,7 @@ def save_animated_png(frames, path=None,*,framerate=None):
 
     frames = as_byte_images(frames)
 
-    make_directory(get_path_parent(path))
+    make_parent_directory(path)
     save_animated_png(path, frames, delay=delay)
 
     return path
@@ -22657,6 +22656,10 @@ def cv_line_graph(
     import cv2
     import math
 
+    if len(y_values)==1 and x_values is None:
+        #If given a single value make it a line
+        y_values=[y_values[0]]*2
+    
     # Convert input values to numpy arrays
     y_values = np.array(y_values, dtype=np.float32)
     x_values = np.array(x_values, dtype=np.float32) if x_values is not None else np.arange(len(y_values), dtype=np.float32)
@@ -22665,15 +22668,20 @@ def cv_line_graph(
     height = height or int(np.ptp(y_values))
     width = width or len(y_values)
 
+    # Create the output image with the specified background color
+    graph = np.full((height, width, 4), background_color, dtype=np.uint8)
+
+    assert len(y_values)==len(x_values), (len(x_values), len(y_values))
+    if not len(y_values):
+        #No plotting!
+        return graph
+
     # Determine the range of the axes if not provided
     y_min = y_min if y_min is not None else np.min(y_values)
     y_max = y_max if y_max is not None else np.max(y_values)
     x_min = x_min if x_min is not None else np.min(x_values)
     x_max = x_max if x_max is not None else np.max(x_values)
 
-    # Create the output image with the specified background color
-    graph = np.full((height, width, 4), background_color, dtype=np.uint8)
-
     # Map the data points to pixel coordinates
     x = ((x_values - x_min) / (x_max - x_min + 1e-10) * width ).astype(int)
     y = ((y_max - y_values) / (y_max - y_min + 1e-10) * height).astype(int)
@@ -24545,7 +24553,7 @@ def labeled_image(image,
         flip_text (bool): Whether to flip the label text upside down. Default is False. Can be useful when position in ['left', 'right']
         size_by_lines (bool): If True, the `size` argument is multiplied by the number of lines in the text, so it can grow accordingly
                               Good in combination with wrap_string_to_width
-        font (int, str, optional): Can be an int between 0 and 8 (to use opencv) or a string (to use PIL) such as "Menlo", "Times New Roman", "Courier", "Futura", "Comic Sans", "Calibri" etc (get a bit list of available fonts with rp.get_all_ttf_fonts() )
+        font (int, str, optional): Can be an int between 0 and 8 (to use opencv) or a string (to use PIL) such as "Menlo", "Times New Roman", "Courier", "Futura", "Comic Sans", "Calibri" etc (get a bit list of available fonts with rp.get_system_fonts() )
 
     Returns:
         numpy.ndarray: The image with the label added.
@@ -25247,6 +25255,37 @@ def as_rgb_float_color(color, clamp=True):
     return as_rgba_float_color(color, clamp=clamp)[:3]
     
 
+_ryan_fonts = {
+    "R:Futura"      : "https://github.com/Eyeline-Research/Go-with-the-Flow/raw/refs/heads/website/fonts/Futura.ttc",
+    ###
+    "R:Helvetica"   : "https://github.com/RyannDaGreat/Images/blob/master/fonts/Helvetica.ttc", 
+    "R:Monaco"      : "https://github.com/RyannDaGreat/Images/blob/master/fonts/Monaco.ttf", 
+    "R:Menlo"       : "https://github.com/RyannDaGreat/Images/blob/master/fonts/Menlo.ttc", 
+    "R:Optima"      : "https://github.com/RyannDaGreat/Images/blob/master/fonts/Optima.ttc", 
+    "R:Palatino"    : "https://github.com/RyannDaGreat/Images/blob/master/fonts/Palatino.ttc", 
+}
+
+def _get_font_path(font):
+    if isinstance(font,str):
+
+        if font.startswith("G:"):
+            #"G:Quicksand" or "G:Zilla Slab" from google fonts
+            font = download_google_font(font[len("G:"):])
+        elif font in _ryan_fonts:
+            # Starts with R: by convention
+            # "R:Futura" from _ryan_fonts
+            font = _ryan_fonts[font]
+
+        if is_valid_url(font):
+            #A proper URL
+            font = download_font(font)
+        else:
+            #Just return the font as is. It's actually ok if its not a path, as long as it's a system font, like "Arial" etc
+            pass
+
+        return font
+
+@lru_cache(maxsize=128)
 def pil_text_to_image(
     text,
     *,
@@ -25269,7 +25308,7 @@ def pil_text_to_image(
     This function uses _slow_pil_text_to_image - and somehow concatting letters is faster than using pil natively ¯\_(ツ)_/¯
     
     EXAMPLE:
-        >>> for font in ["Menlo", "Times New Roman", "Courier", "Futura", "Comic Sans", "Calibri"]:
+        >>> for font in ["Menlo", "Times New Roman", "Courier", "Futura", "Comic Sans", "Calibri"] + list(r._ryan_fonts):
         ...     color = random_rgb_float_color()
         ...     display_alpha_image(
         ...         with_drop_shadow(
@@ -25294,7 +25333,7 @@ def pil_text_to_image(
         ...             ),
         ...     )
 
-        >>> fonts = get_all_ttf_fonts()
+        >>> fonts = get_system_fonts()
         ... fonts = random_batch(fonts, 5)
         ... for _ in range(100):
         ...     text = "Hello World!"
@@ -25309,11 +25348,7 @@ def pil_text_to_image(
         ...     display_image(horizontally_concatenated_images(letters, origin="center"))
     """
     
-    if isinstance(font,str):
-        if font.startswith("G:"):
-            font = download_google_font(font[len("G:"):])
-        elif is_valid_url(font):
-            font = download_font(font)
+    font = _get_font_path(font)
 
     text = str(text)
     assert align in ["left", "right", "center"]
@@ -25564,7 +25599,7 @@ def download_google_font(font_name, *, skip_existing=True):
 
         return paths
 
-    fonts_folder = path_join(rp.r._rp_downloads_folder, "google_fonts",font_name)
+    fonts_folder = path_join(_google_fonts_download_folder,font_name)
 
     if folder_exists(fonts_folder):
         paths = get_all_files(fonts_folder)
@@ -25600,6 +25635,21 @@ def download_google_fonts(*font_names,skip_existing=True):
     font_names=detuple(font_names)
     return [download_google_font(font_name,skip_existing=skip_existing) for font_name in font_names]
 
+def get_downloaded_fonts():
+    """ Returns a list of font files downloaded by rp """
+    def get(x):
+        try:
+            return _get_all_paths_fast(
+                x,
+                recursive=True,
+                include_folders=False,
+                include_files=True,
+                include_hidden=False,
+            )
+        except FileNotFoundError:
+            return []
+    return get(_fonts_download_folder) + get(_google_fonts_download_folder)
+
 def _get_file_path(path_or_url):
     """If given a url, get a file path that can be used for things"""
     #TODO: Use this to make strip_file_extension etc work for URL's as well
@@ -25610,7 +25660,6 @@ def _get_file_path(path_or_url):
         return parsed_url.path
     return path_or_url
 
-
 def strip_file_extension(file_path):
     """
     'x.png'        --> 'x'
@@ -26605,8 +26654,9 @@ def horizontally_concatenated_images(*image_list,origin=None):
         image_converter = _common_image_converter(image_list)
 
         image_list=[image_converter(image,copy=False) for image in image_list]
-        max_height=max(img.shape[0]for img in image_list)
+        max_height=max(get_image_height(img) for img in image_list)
         def heightify(img):
+            img=as_numpy_image(img)
             s=list(img.shape)
             if s[0]==max_height:
                 return img #Don't copy - its slow.
@@ -29148,8 +29198,7 @@ class VideoWriterMP4:
         assert not self.finished
 
         assert not is_a_folder(self.path)
-        if not path_exists(get_parent_directory(self.path)):
-            make_directory(get_parent_directory(self.path))
+        make_parent_directory(self.path)
 
         if not self.started:
             self.started = True
@@ -29264,6 +29313,9 @@ def _cv_save_video_mp4(
     if not has_file_extension(path):
         path = with_file_extension(path, 'mp4')
 
+    if not folder_exists(get_parent_folder(path)):
+        make_parent_directory(path)
+
     fourcc = cv2.VideoWriter_fourcc(*"mp4v")
     _, h, w, c = video.shape
     video_writer = cv2.VideoWriter(path, fourcc, framerate, (w, h))
@@ -29317,15 +29369,15 @@ def save_video_mp4(frames, path=None, framerate=60, *, video_bitrate='high', hei
      10^9: 1000000000: (93.0MB) It seems to be the maximum size
     """
 
+    if backend is None:
+        backend = _save_video_mp4_default_backend
+
     if backend=='ffmpeg':
         try:
             _ensure_ffmpeg_installed()
         except Exception as e:
             raise RuntimeError("save_video_mp4: Can't use backend=='ffmpeg' because ffmpeg is not installed. Consider setting backend=='cv2' instead? Or, if you can't change this argument, you can try running rp.r.set_save_video_mp4_default_backend('cv2')") from e
 
-    if backend is None:
-        backend = _save_video_mp4_default_backend
-
     assert backend in ('ffmpeg', 'cv2'), backend
     assert not isinstance(frames, str), 'The first argument should be the sequence of video frames, not the path!'
 
@@ -29512,7 +29564,7 @@ def convert_to_gif_via_ffmpeg(
         output_path = with_file_extension(video_path, "gif", replace=True)
         output_path = get_unique_copy_path(output_path)
 
-    make_folder(get_path_parent(output_path))
+    make_parent_folder(output_path)
 
     input_framerate = get_video_file_framerate(video_path)
 
@@ -29825,7 +29877,7 @@ def move_path(from_path,to_path):
     otherwise just rename the path
     """
     
-    make_directory(get_parent_directory(to_path))#Make sure it has somewhere to go. If the destination folder doesn't already exist, create it.
+    make_parent_directory(to_path)#Make sure it has somewhere to go. If the destination folder doesn't already exist, create it.
     if is_a_directory(to_path):
         new_path=path_join(to_path,get_file_name(from_path))
     else:
@@ -30300,6 +30352,10 @@ def make_directory(path):
         return str(path)
 make_folder=make_directory
 
+def make_parent_directory(path):
+    return make_directory(get_parent_directory(path))
+make_parent_folder=make_parent_directory
+
 def take_directory(path):
     "ZSH's take command combined mkdir with cd"
     path=make_directory(path)
@@ -34455,7 +34511,7 @@ def _load_ryan_lazygit_config():
         path=r'%LOCALAPPDATA%\lazygit\config.yml'
     
     path=get_absolute_path(path)
-    make_directory(get_path_parent(path))
+    make_parent_directory(path)
     
     config_lines=unindent("""
         # < RP Lazygit Config Start >
@@ -36492,7 +36548,7 @@ def bytes_to_file(data: bytes, path: str = None):
         return helper()
     except FileNotFoundError:
         #Faster than checking for folder exists every time
-        make_directory(get_parent_directory(path))
+        make_parent_directory(path)
         return helper()
 
 
@@ -39075,15 +39131,18 @@ def extract_alpha_channel(image):
 
 get_alpha_channel=get_image_alpha=extract_alpha_channel #Uncomment this if you think it would make the code nicer!
 
-def apply_image_function_per_channel(image,function):
+def apply_image_function_per_channel(function,image,*args,**kwargs):
     """
-    Apply a grayscale funcion on every image channel individually
+    Apply a grayscale function on every image channel individually
+    Calls the function with any additional args and kwargs you give it, too 
+    EXAMPLE: Low Rank Webcam Demo: https://gist.github.com/SqrtRyan/c33e4e40ccf74714a20c229a13c717fe
     """
+    assert callable(function),type(function)
     assert is_image(image)
     if is_grayscale_image(image):
-        return function(image)
+        return function(image, *args, **kwargs)
     channels=extract_image_channels(image)
-    return compose_image_from_channels(*(function(channel) for channel in channels))
+    return compose_image_from_channels(*(function(channel,*args,**kwargs) for channel in channels))
 
 def with_alpha_channel(image, alpha, copy=True):
     """
@@ -40264,6 +40323,9 @@ def unwarped_perspective_image(image, from_points, to_points=None, height:int=No
 
 _rp_folder = get_parent_folder(__file__)
 _rp_downloads_folder = path_join(_rp_folder, "downloads")
+_google_fonts_download_folder = _rp_downloads_folder + "/google_fonts"
+_fonts_download_folder        = _rp_downloads_folder + "/fonts"
+
 
 def _pip_import_depth_pro(autoyes=False):
 
@@ -41627,13 +41689,21 @@ def get_git_repo_root(folder='.', use_cache=False):
     assert output, 'Is not a git repo: '+str(folder)
     return output
 
+
 def _distill_github_url(url):
     """
+    Distills a GitHub URL to its base repository URL.
+
     https://github.com/fperazzi/davis-2017/tree/main --> https://github.com/fperazzi/davis-2017
+    https://github.com/AeroScripts/repo_name?tab=readme-ov-file --> https://github.com/AeroScripts/repo_name
     """
-    if url.startswith('https://github.com/'):
-        url = path_join(path_split(url)[:4])
-    return url
+    from urllib.parse import urlparse
+    parsed = urlparse(url)
+    if parsed.netloc == "github.com":
+        path_parts = parsed.path.split("/")
+        if len(path_parts) >= 3:  # Ensure at least user/repo
+            return "https://github.com/" + path_parts[1] + "/" + path_parts[2]
+    return url  # Return original URL if not a valid GitHub URL or doesn't match expected format.
 
 def _get_repo_name_from_url(url):
     """
@@ -42486,17 +42556,36 @@ class IteratorWithLen:
         return self._length
     
 @memoized
-def get_all_ttf_fonts():
-    """ Returns a list of paths to all .ttf fonts on this computer """
+def get_system_fonts(filetypes="ttf ttc otf"):
+    import os
+    """ Returns a list of paths to all fonts of specified types on this computer """
     if currently_running_mac():
-        #https://apple.stackexchange.com/questions/35852/list-of-activated-fonts-with-shell-command-in-os-x
         out=[]
-        out+=['/System/Library/Fonts/'+x for x in shell_command('ls -R /System/Library/Fonts | grep ttf').splitlines()]
-        out+=['/Library/Fonts/'       +x for x in shell_command('ls -R /Library/Fonts | grep ttf'       ).splitlines()]
-        out+=['~/Library/Fonts/'      +x for x in shell_command('ls -R ~/Library/Fonts | grep ttf'      ).splitlines()]
-        out=[get_absolute_path(x) for x in out]
-        out=[x for x in out if file_exists(x)]
-        return list(out)
+        extensions_list = filetypes.lower().split() # Convert to lowercase for case-insensitive matching and split into list
+
+        locations = [
+            '/System/Library/Fonts',
+            '/Library/Fonts',
+            '~/Library/Fonts'
+        ]
+
+        for location in locations:
+            full_location = os.path.expanduser(location) # Expand ~ to user home
+            all_paths = _get_all_paths_fast(full_location, recursive=True) # Get all paths recursively
+
+            def filter_by_extension(path):
+                if not extensions_list: # If no extensions specified, include all files (or filter based on some default font-like extensions if desired)
+                    return True # Keep all if no extension filter
+
+                return any(path.lower().endswith("." + ext) for ext in extensions_list) # Check if path ends with any of the specified extensions
+
+            filtered_paths = filter(filter_by_extension, all_paths) # Apply the filter
+            out.extend(filtered_paths) # Add filtered paths to the output list
+
+
+        # Potentially add Network fonts, but less common for standard fonts, and could be slow in some network environments.
+        # out+=['/Network/Library/Fonts/'+x for x in shell_command('ls -R /Network/Library/Fonts | grep -i ttf').splitlines()]
+        return out
     elif currently_running_linux():
         #https://askubuntu.com/questions/552979/how-can-i-determine-which-fonts-are-installed-from-the-command-line-and-what-is
         ans=shell_command('fc-list')

rp-0.1.1146/rp/version.py

@@ -0,0 +1 @@
+1146

{rp-0.1.1144 → rp-0.1.1146}/rp/web_evaluator.py

@@ -122,7 +122,7 @@ class Evaluation:
             rp.print_stack_trace()
 
             #Add the stack trace into the error
-            stack_trace = traceback.format_exc()
+            stack_trace = '[WEB_EVALUATOR EVALUATION ERROR]\n'+traceback.format_exc()
             error.args = (stack_trace,) + error.args[1:]
 
             self.error = error
@@ -1192,6 +1192,9 @@ def run_delegation_server(server_port=None,
     if delegator is None: delegator = ClientDelegator()
     if server_port is None: server_port = DEFAULT_DELEGATION_SERVER_PORT
 
+    if rp.get_port_is_taken(server_port):
+        raise RuntimeError("rp.web_evaluator.run_delegation_server: port %i is already taken!" % server_port)
+
     stop_refreshing = False
 
     def refresh_clients():

{rp-0.1.1144 → rp-0.1.1146}/rp.egg-info/PKG-INFO

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

rp-0.1.1146/version.py

@@ -0,0 +1 @@
+1146

rp-0.1.1144/rp/version.py

@@ -1 +0,0 @@
-1144

rp-0.1.1144/version.py

@@ -1 +0,0 @@
-1144