rp 0.1.1272__tar.gz → 0.1.1274__tar.gz

{rp-0.1.1272 → rp-0.1.1274}/PKG-INFO

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

{rp-0.1.1272 → rp-0.1.1274}/rp/r.py

@@ -20362,6 +20362,10 @@ def pseudo_terminal(
 
         64P  ans=$printed($string_from_clipboard()) ; $fansi_print($human_readable_file_size(len( ans )), 'bold cyan') ; ans=$base64_to_object(ans)   #Copy object via Base64 String
         64C _ans64=$printed($object_to_base64(ans)) ; $fansi_print($human_readable_file_size(len(_ans64)), 'bold cyan') ; $string_to_clipboard(_ans64) #Copy object via Base64 String
+        64FC  ans=$object_to_base64($r._copy_path_to_bundle(None)); $string_to_clipboard(ans)
+        64FCA ans=$object_to_base64($r._copy_path_to_bundle(ans )); $string_to_clipboard(ans)
+        64FP  ans=$r._paste_path_from_bundle($base64_to_object($string_from_clipboard())) #Copy file via Base64 String
+        64FPA ans=$r._paste_path_from_bundle($base64_to_object(ans                     )) #Copy file via Base64 String
 
         # GO GC
 
@@ -20617,7 +20621,7 @@ def pseudo_terminal(
         RPA $r._relative_path_ans(ans)
         UPA $r._user_path_ans(ans)
 
-        UZA $unzip_to_folder(ans)
+        UZA $unzip_to_folder(ans,show_progress=True)
         ZIH $make_zip_file_from_folder($get_absolute_path('.'))
         ZIA $make_zip_file_from_folder(ans)
 
@@ -20761,6 +20765,7 @@ def pseudo_terminal(
                     # region Get user_message, xor exit with second keyboard interrupt
                     _update_cd_history()
                     try:
+                        did_cdb=False
                         def evaluable_part(cmd:str):
                             # DOesn't take into account the ';' character
                             cmd=cmd.rstrip().split('\n')[-1]
@@ -23014,7 +23019,7 @@ def pseudo_terminal(
                                     module_path = get_parent_folder(module_path)
                                 user_message = 'CD '+module_path
 
-                            if user_message.startswith('CD '):
+                            if user_message.startswith('CD ') and not user_message in ['CD .','CD ..']:
                                 #Do fuzzy searching
                                 old_cd_path = user_message[len('CD '):]
                                 new_cd_path = _pterm_fuzzy_cd(old_cd_path)
@@ -23116,6 +23121,7 @@ def pseudo_terminal(
                                     else:
                                         fansi_print("    (Cannot CDB because the CD history is empty)",'red')
                                         cancel=True
+                                    did_cdb=True
                             else:
                                 new_dir=user_message[2:].strip()
                             if cancel:
@@ -23423,6 +23429,9 @@ def pseudo_terminal(
                         #When the folder we're working in is deleted, get_current_directory throws an error
                         #This is ok, just ignore it.
                         pass
+
+                    if did_cdb and len(_cd_history):
+                        _cd_history.pop()
                         
                 except Exception as E:
                     show_error(E)
@@ -29036,11 +29045,7 @@ def get_relative_paths(*paths, root=None):
 
     """
 
-    paths = detuple(paths)
-    if isinstance(paths, str):
-        paths = [paths]
-    else:
-        paths = list(paths)
+    paths = _detuple_paths(paths)
 
     roots = root
     if isinstance(roots, str) or roots is None:
@@ -29062,9 +29067,15 @@ def get_absolute_path(path,*,physical=True):
         path=os.path.realpath(path)#Get rid of any symlinks in the path
     return os.path.abspath(path)
 
+def _detuple_paths(paths):
+    paths=detuple(paths)
+    if isinstance(paths,str):
+        paths=shlex.split(paths)
+    return list(paths)
+
 def get_absolute_paths(*paths,physical=True):
     "Plural of get_absolute_path"
-    return [get_absolute_path(path, physical=physical) for path in detuple(paths)]
+    return [get_absolute_path(path, physical=physical) for path in _detuple_paths(paths)]
 
 def has_file_extension(file_path):
     return get_file_extension(file_path)!=''
@@ -45302,19 +45313,25 @@ def zip_folder_to_bytes(folder_path:str):
 class _BundledPath:
     """ A class used internally by rp for web_copy_path and web_paste_path """
     def __init__(self,is_file,data,path):
+        assert isinstance(data,bytes)
         self.is_file=is_file
         self.is_folder=not is_file
         self.data=data
         self.path=path
+    def __repr__(self):
+        return '<rp.r._BundledPath: is_file='+str(self.is_file)+', data='+human_readable_file_size(len(self.data))+', path='+repr(self.path)+'>'
 
 def web_paste_path(path=None,*,ask_to_replace=True):
     """ FP (file paste) """
-    data=web_paste()
+    data = web_paste()
+    return gather_args_call(_paste_path_from_bundle, data,path=path)
+
+def _paste_path_from_bundle(data,path=None, *,ask_to_replace=True):
     try:
-        data=bytes_to_object(data)
         assert isinstance(data,_BundledPath)
     except Exception:
         raise Exception('web_paste_path error: web_paste data was not created via web_copy_path')
+
     def request_replace(path)->bool:
         return input_yes_no(fansi("Replace "+get_file_name(path)+"?",'yellow'))
     if path is None and data.path=='.' and data.is_folder:
@@ -45354,13 +45371,18 @@ def web_paste_path(path=None,*,ask_to_replace=True):
 
 def web_copy_path(path:str=None, *, show_progress=False):
     """ FC (file copy) """
+    web_copy(_copy_path_to_bundle(path), show_progress=show_progress)
+    return path
+
+def _copy_path_to_bundle(path:str=None):
     if path is None:
         path=input_select_path(message='Select a file or folder for web_copy_path:')
         path=get_relative_path(path)
     assert path_exists(path),'Path does not exist: '+str(path)
     data=file_to_bytes(path) if is_a_file(path) else zip_folder_to_bytes(path)
-    web_copy(object_to_bytes(_BundledPath(is_a_file(path),data,path)), show_progress=show_progress)
-    return path
+    file_object = _BundledPath(is_a_file(path),data,path)
+    return file_object
+
 
 def get_all_local_ip_addresses():
     """
@@ -45879,6 +45901,16 @@ def unwarped_perspective_image(image, from_points, to_points=None, height:int=No
     If you specify to_points, it might be useful in-case you want to adjust the transform etc
     Height and width can be manually specified as well, in case you want to capture parts of the perspectie transform that might have been cropped out
     When to_points is not specified, we assume that the from_points start from the top left of the desired area, and progress clockwise
+
+    The sister function is rp.unwarped_perspective_contour
+
+    If to_points is not specified, from_points should start from the top left and go clockwise to the other 3 points
+
+    from_points and/or to_points are specified as either:
+        - a points array: i.e a list or numpy array in the form [[x0,y0],[x1,y1],[x2,y2],[x3,y3]]
+        - a complex vector, i.e like: [0+0j, 1+0j, 1+1j, 0+1j]
+        - a cv_countour as defined by rp.as_cv_contour
+
     
     EXAMPLE:
         while True:
@@ -45926,6 +45958,92 @@ def unwarped_perspective_image(image, from_points, to_points=None, height:int=No
     warped = cv2.warpPerspective(image, M, (width, height), flags=cv2.INTER_LINEAR)
     return warped
 
+def unwarped_perspective_contour(contour, from_points, to_points=None, *, height:int=None, width:int=None):
+    """
+    Transform contour points using perspective transformation.
+    The sister function is rp.unwarped_perspective_image
+    
+    Args:
+        contour: Points to transform (points array, complex vector, or cv_contour).
+        from_points: Source quadrangle points (clockwise from top-left).
+        to_points: Target quadrangle points. If None, uses default rectangle.
+        height: Output height for default to_points calculation.
+        width: Output width for default to_points calculation.
+    
+    Notes:
+        - Points can be specified as arrays [[x0,y0],[x1,y1],...], 
+          complex vectors [0+0j, 1+0j,...], or cv_contours.
+        - Either to_points XOR both height/width must be provided, but not both!
+    
+    Returns:
+        numpy.ndarray: Transformed contour as points array [[x0,y0],[x1,y1],...].
+        
+    EXAMPLE:
+        
+        >>> image = rp.load_image(
+        ...     "https://github.com/RyannDaGreat/Diffusion-Illusions/blob/gh-pages/images/emma.png?raw=true",
+        ...     use_cache=True,
+        ... )
+        ... height, width = get_image_dimensions(image)
+        ... 
+        ... dot_points = [[50, 50], [240, 200], [100, 200], [100, 233]]
+        ... warp_quad = [[10, 10], [300, 0], [350, 400], [0, 250]]
+        ... 
+        ... dots_x, dots_y = list(zip(*dot_points))
+        ... rp.seed_all(123)
+        ... colors = rp.as_rgba_float_colors("randomhue" for _ in dot_points)
+        ... 
+        ... dotted_image = rp.cv_draw_circles(image, dots_x, dots_y, color=colors, rim=3, rim_color='white')
+        ... 
+        ... unwarped_image = rp.unwarped_perspective_image(image, warp_quad)
+        ... unwarped_dotted_image = rp.unwarped_perspective_image(dotted_image, warp_quad)
+        ... quad_image = rp.cv_draw_contour(dotted_image, warp_quad)
+        ... 
+        ... warped_points = unwarped_perspective_contour(dot_points, warp_quad, height=height, width=width)
+        ... warped_x, warped_y = list(zip(*warped_points))
+        ... warped_dots_image = rp.cv_draw_circles(unwarped_image, warped_x, warped_y, color=colors, rim=3, rim_color='white')
+        ... 
+        ... blended_image = blend_images(warped_dots_image, unwarped_dotted_image, .5)
+        ... 
+        ... rp.display_image(
+        ...     rp.horizontally_concatenated_images(
+        ...         quad_image,
+        ...         unwarped_dotted_image,
+        ...         warped_dots_image,
+        ...         blended_image,
+        ...     )
+        ... )
+        
+    """
+    pip_import('cv2')
+    import cv2
+    
+    if to_points is None:
+        assert height is not None and width is not None, 'unwarped_perspective_contour: You must specify either to_points or both width and height, but all three were None'
+        to_points=[[0,0],[width,0],[width,height],[0,height]]
+    else:
+        assert height is None and width is None, 'unwarped_perspective_contour: Both to_points AND height/width were specified - please only give to_points or height/width'
+    
+    from_points=as_points_array(from_points).astype(np.float32)
+    to_points  =as_points_array(to_points  ).astype(np.float32)
+    contour_points = as_points_array(contour).astype(np.float32)
+    
+    assert len(from_points)==4,'unwarped_perspective_contour needs four from_points, but got '+str(len(from_points))
+    assert len(to_points  )==4,'unwarped_perspective_contour needs four to_points, but got '  +str(len(to_points  ))
+    
+    # Get the perspective transformation matrix
+    M = cv2.getPerspectiveTransform(from_points, to_points)
+    
+    # Transform the contour points
+    # Reshape points for cv2.perspectiveTransform (needs shape [N, 1, 2])
+    contour_reshaped = contour_points.reshape(-1, 1, 2)
+    transformed_points = cv2.perspectiveTransform(contour_reshaped, M)
+    
+    # Reshape back to original format [N, 2]
+    transformed_points = transformed_points.reshape(-1, 2)
+    
+    return transformed_points
+
 _rp_folder = get_parent_folder(__file__)
 _rp_downloads_folder = path_join(_rp_folder, "downloads")
 _google_fonts_download_folder = _rp_downloads_folder + "/google_fonts"
@@ -50547,7 +50665,8 @@ known_pypi_module_package_names={
     'colors': 'ansicolors',
     'compose': 'docker-compose',
     # '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-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
     'cython': 'Cython',
     'deprecate': 'pyDeprecate',
     'diff_match_patch': 'diff-match-patch',

{rp-0.1.1272 → rp-0.1.1274}/rp/rp_ptpython/key_bindings.py

@@ -1341,7 +1341,8 @@ def handle_character(buffer,char,event=None):
         lines=text.splitlines()
         lines=[line[1:] for line in lines]
         text='\n'.join(lines)
-        buffer.document=Document((text),min(len(text),buffer.document.cursor_position),buffer.document.selection)
+        replace_buffer_text(buffer, text)
+        # buffer.document=Document((text),min(len(text),buffer.document.cursor_position),buffer.document.selection)
         return True
 
     if char=='v' and meta_pressed(clear=True):
@@ -2899,6 +2900,9 @@ def load_python_bindings(python_input):
                                          '\\dilp':'diff_local_paste',
                                          '\\diph':'diff_pt_history',
                                          '\\qph':'query_pt_history',
+                                         '\\und':'unindent',
+                                         '\\ind':'indent',
+                                         '\\rcl':'reverse_columns',
                                          '\\stp':'strip',
                                          '\\spl':'splitlines',
                                          '\\lj':'line_join',
@@ -3129,6 +3133,21 @@ def load_python_bindings(python_input):
                                 if header=='strip':
                                     text=buffer.document.text.strip()
                                     replace_buffer_text(buffer, text)
+                                if header=='unindent':
+                                    import rp
+                                    text=buffer.document.text
+                                    text=rp.unindent(text)
+                                    replace_buffer_text(buffer, text)
+                                if header=='indent':
+                                    import rp
+                                    text=buffer.document.text
+                                    text=rp.indentify(text,'    ')
+                                    replace_buffer_text(buffer, text)
+                                if header=='reverse_columns':
+                                    import rp
+                                    text=buffer.document.text
+                                    text='\n'.join(x[::-1] for x in text.splitlines())
+                                    replace_buffer_text(buffer, text)
                                 if header=='splitlines' or header=='line_join':
                                     import rp
                                     text=buffer.document.text

rp-0.1.1274/rp/version.py

@@ -0,0 +1 @@
+1274

{rp-0.1.1272 → rp-0.1.1274}/rp.egg-info/PKG-INFO

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

rp-0.1.1274/version.py

@@ -0,0 +1 @@
+1274

rp-0.1.1272/rp/version.py

@@ -1 +0,0 @@
-1272

rp-0.1.1272/version.py

@@ -1 +0,0 @@
-1272