rp 0.1.1207__tar.gz → 0.1.1209__tar.gz

{rp-0.1.1207 → rp-0.1.1209}/PKG-INFO

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

rp-0.1.1209/rp/libs/torch_tools.py

@@ -0,0 +1,89 @@
+import rp
+
+def resize_conv2d_channels(conv2d, in_channels=None, out_channels=None):
+    """
+    Create a new Conv2d layer with resized input/output channels while preserving weights.
+    
+    Args:
+        conv2d: Original Conv2d layer
+        in_channels: New number of input channels (if None, keeps original)
+        out_channels: New number of output channels (if None, keeps original)
+        
+    Returns:
+        New Conv2d layer with requested channel dimensions and preserved weights
+        
+    EXAMPLE:
+        >>> import torch.nn as nn
+        >>> # Original conv2d with 3 input channels, 64 output channels
+        >>> conv = nn.Conv2d(3, 64, kernel_size=3, padding=1)
+        
+        >>> conv
+        Conv2d(3, 64, kernel_size=(3, 3), stride=(1, 1), padding=(1, 1))
+        >>> conv.weight.shape
+        torch.Size([64, 3, 3, 3])
+        
+        >>> # Resize to 5 input channels, 32 output channels
+        >>> new_conv = resize_conv2d_channels(conv, in_channels=5, out_channels=32)
+        
+        >>> new_conv
+        Conv2d(5, 32, kernel_size=(3, 3), stride=(1, 1), padding=(1, 1))
+        >>> new_conv.weight.shape
+        torch.Size([32, 5, 3, 3])
+        
+    """
+    from torch.nn import Conv2d
+    
+    # ------------------------
+    # Input Validation Section
+    # ------------------------
+    if not isinstance(conv2d, Conv2d):
+        raise TypeError("Expected Conv2d layer, got " + type(conv2d).__name__)
+
+    # Set new channels or keep original
+    new_in_channels = in_channels if in_channels is not None else conv2d.in_channels
+    new_out_channels = out_channels if out_channels is not None else conv2d.out_channels
+    
+    # Validate channel dimensions
+    if new_in_channels <= 0:
+        raise ValueError("in_channels must be positive, got " + str(new_in_channels))
+    if new_out_channels <= 0:
+        raise ValueError("out_channels must be positive, got " + str(new_out_channels))
+        
+    # Check if groups is compatible with new in_channels
+    if new_in_channels % conv2d.groups != 0:
+        raise ValueError(
+            "in_channels ("
+            + str(new_in_channels)
+            + ") must be divisible by groups ("
+            + str(conv2d.groups)
+            + ")"
+        )
+    
+    # ------------------------
+    # Main Implementation
+    # ------------------------
+    # Create new Conv2d with same parameters except for channels
+    new_conv = Conv2d(
+        in_channels=new_in_channels,
+        out_channels=new_out_channels,
+        kernel_size=conv2d.kernel_size,
+        stride=conv2d.stride,
+        padding=conv2d.padding,
+        dilation=conv2d.dilation,
+        groups=conv2d.groups,
+        bias=conv2d.bias is not None,
+        padding_mode=conv2d.padding_mode,
+        device=conv2d.weight.device,
+        dtype=conv2d.weight.dtype
+    )
+    
+    # Copy weights where dimensions overlap using rp.crop_tensor
+    new_weight_shape = (new_out_channels, new_in_channels // conv2d.groups) + conv2d.kernel_size
+    new_conv.weight.data = rp.crop_tensor(conv2d.weight.data, new_weight_shape)
+    
+    # Copy bias where dimensions overlap
+    if conv2d.bias is not None:
+        new_conv.bias.data = rp.crop_tensor(conv2d.bias.data, (new_out_channels,))
+    
+    return new_conv
+

{rp-0.1.1207 → rp-0.1.1209}/rp/r.py

@@ -5626,7 +5626,7 @@ def convert_image_file(
         input_file (str): Path to the image file to be converted.
         new_extension (str, optional): Desired extension for the output files. If None, the extension is not changed.
         output_folder (str, optional): Path to the folder where the converted image will be saved. 
-                                        If not provided, the image is saved in the same folder as the input file.
+                                       If not provided, the image is saved in the same folder as the input file.
         skip_overwrite (bool, optional): If True, won't overwrite existing files. Defaults to False.
         image_transform (func, optional): A function that modifies the image before it's saved again. 
                                           It should take in an image and a path string and return an image.
@@ -11538,19 +11538,6 @@ def append_line_to_file(line:str,file_path:str):
     if not file_exists(file_path):
         string_to_text_file(file_path,line)
     else:
-
-
-
-
-
-
-
-
-
-
-
-
-
         file=open(file_path, 'a')
         try:
             file.write('\n'+line)
@@ -12617,8 +12604,8 @@ def _add_system_commands_to_pterm_bash_highlighter():
     import pygments.lexers.shell as shell
     import re
     Name=shell.Name
-    commands=get_system_commands()
-    shell.BashLexer.tokens['basic']+=[(r'\b(' + '|'.join(re.escape(x) for x in commands) + r')(?=[\s)\`])', Name.Function),]
+    commands=get_system_commands()+['!']
+    shell.BashLexer.tokens['basic']+=[(r'(^|!|\b)(' + '|'.join(re.escape(x) for x in commands) + r')(?=[\s)\`]|$)', Name.Function),]
 _add_system_commands_to_pterm_bash_highlighter()
 
 _system_command_exists_cache = {}
@@ -23591,6 +23578,83 @@ def kill_processes(*pids, signall="SIGKILL", strict=True):
                 raise
 
 
+def search_processes(pattern, *, show_progress=False, whole_arg=False):
+    """
+    Search for processes containing pattern in their command.
+
+    Args:
+        pattern: String to search for in process commands
+        show_progress: Whether to show progress information
+        whole_arg: If True, only match complete command arguments
+
+            Examples:
+            For a process with command: "/usr/bin/python3 script.py --config file.txt"
+
+            With whole_arg=False (default):
+                - "python" would match (substring of an argument)
+                - "config" would match (substring of an argument)
+
+            With whole_arg=True:
+                - "python" would NOT match (not a complete argument)
+                - "python3" would NOT match (part of "/usr/bin/python3")
+                - "--config" would match (complete argument)
+                - "script.py" would match (complete argument)
+
+            Tips:
+                - To match whole args, you can add spaces to the beginning and ends of the pattern
+                >>> search_processes(' ollama serve ')
+                ans = {18374: {'pid': 18374, 'command': ['ollama', 'serve']}}
+
+    Returns:
+        dict[int, dict]: Dictionary mapping matching process PIDs to their information
+    """
+    import psutil
+    import sys
+    from typing import List
+
+    matches = {}
+    pattern = pattern.lower()
+
+    # Get process count for progress reporting
+    total = 0
+    if show_progress:
+        try:
+            total = len(list(psutil.process_iter()))
+            sys.stdout.write("\rSearching through " + str(total) + " processes...")
+            sys.stdout.flush()
+        except:
+            show_progress = False
+
+    # Search processes
+    for i, proc in enumerate(psutil.process_iter(["pid", "cmdline"])):
+        if show_progress and i % 100 == 0:
+            sys.stdout.write("\rSearching: " + str(i) + "/" + str(total))
+            sys.stdout.flush()
+
+        try:
+            command = proc.info["cmdline"]
+            if not command:
+                continue
+
+            if whole_arg:
+                # Match whole arguments only
+                match_found = any(arg.lower() == pattern for arg in command)
+            else:
+                # Match anywhere in the command
+                match_found = pattern in " " + " ".join(command).lower() + " "
+
+            if match_found:
+                pid = proc.info["pid"]
+                matches[pid] = gather_vars("pid command")
+        except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+            pass
+
+    if show_progress:
+        sys.stdout.write("\rFound " + str(len(matches)) + " processes matching '" + pattern + "'")
+        sys.stdout.flush()
+        print()
+
+    return matches
 
 def regex_match(string,regex)->bool:
     """ returns true if the regex describes the whole string """
@@ -36584,7 +36648,7 @@ def _run_sys_command(*command, title='SYS COMMAND'):
     print(message)
     return os.system(command)
 
-def _ensure_installed(name:str,*,windows=None,mac=None,linux=None):
+def _ensure_installed(name: str, *, windows=None, mac=None, linux=None, force=False):
     """ Attempts to install a program on various operating systems """
 
     assert isinstance(name,    str)
@@ -36592,7 +36656,7 @@ def _ensure_installed(name:str,*,windows=None,mac=None,linux=None):
     assert isinstance(mac,     str) or mac     is None
     assert isinstance(windows, str) or windows is None
 
-    if system_command_exists(name):
+    if not force and system_command_exists(name):
         #Don't reinstall what we've already installed
         return
 
@@ -36710,43 +36774,65 @@ def _ensure_git_installed():
     )
     pip_import('git',auto_yes=True)
 
-def _ensure_ollama_installed():
+def _install_ollama(force=False):
     _ensure_installed(
         'ollama',
         mac='brew install ollama',
         linux='curl -fsSL https://ollama.com/install.sh | sh',
         windows='winget install --id=Ollama.Ollama  -e  --accept-source-agreements', #https://winstall.app/apps/Ollama.Ollama
+        force=force,
     )
     pip_import('ollama',auto_yes=True)
 
-def _install_grounded_sam_2(grounded_sam_dir: str = None, force=False):
-    """
-    WARNING: This function might be moved to CommonSource!
-    Installs this: https://github.com/IDEA-Research/Grounded-SAM-2
-    Downloads code, installs it
-    Downloads checkpoints too
-    If grounded_sam_dir is not specified, defaults to rp's downloads folder
-    """
-    import shutil
-
-    grounded_sam_dir = grounded_sam_dir or path_join(r._rp_downloads_folder, "grounded_sam_2")
-    
-    if folder_exists(grounded_sam_dir):
-        if force:
-            shutil.rmtree(grounded_sam_dir)
-        else:
-            return
+def _ensure_ollama_server_running():
+    serve_processes = search_processes(" ollama serve ")
+    ollama_running = bool(serve_processes)
+    if not ollama_running:
+        _install_ollama()
         
-    if not folder_exists(grounded_sam_dir):
-        git_clone("https://github.com/IDEA-Research/Grounded-SAM-2", grounded_sam_dir, depth=1)
+        session_name = tmux_get_unique_session_name("Ollama Server")
+            
+        yaml = tmuxp_create_session_yaml(
+            {"ollama": "ollama serve"},
+            session_name=session_name,
+        )
+        tmuxp_launch_session_from_yaml(yaml)
         
-    with SetCurrentDirectoryTemporarily(grounded_sam_dir):
-        os.environ["SAM2_BUILD_CUDA"] = "0"
-        for checkpoint_folder in ["gdino_checkpoints", "checkpoints"]:
-            with SetCurrentDirectoryTemporarily(checkpoint_folder):
-                os.system("bash download_ckpts.sh")
-        pip_install('-e ".[notebooks]"')
+        fansi_print(
+            " >> OLLAMA SERVER STARTED IN TMUX SESSION: %s << "%repr(session_name),
+            "italic bold black black on green cyan",
+        )
 
+#THIS FUNCTION INSTALLS IT FINE! BUT I DIDN'T FINISH MAKING IT USEFUL YET. UNCOMMENT ONCE I HAVE WRAPPERS FOR IT.
+# def _install_grounded_sam_2(grounded_sam_dir: str = None, force=False):
+#     """
+#     TODO: I currently don't have code that uses this, I used SA2VA instead. It's in CommonSource.
+#     WARNING: This function might be moved to CommonSource!
+#     Installs this: https://github.com/IDEA-Research/Grounded-SAM-2
+#     Downloads code, installs it
+#     Downloads checkpoints too
+#     If grounded_sam_dir is not specified, defaults to rp's downloads folder
+#     """
+#     import shutil
+#
+#     grounded_sam_dir = grounded_sam_dir or path_join(r._rp_downloads_folder, "grounded_sam_2")
+#     
+#     if folder_exists(grounded_sam_dir):
+#         if force:
+#             shutil.rmtree(grounded_sam_dir)
+#         else:
+#             return
+#         
+#     if not folder_exists(grounded_sam_dir):
+#         git_clone("https://github.com/IDEA-Research/Grounded-SAM-2", grounded_sam_dir, depth=1)
+#         
+#     with SetCurrentDirectoryTemporarily(grounded_sam_dir):
+#         os.environ["SAM2_BUILD_CUDA"] = "0"
+#         for checkpoint_folder in ["gdino_checkpoints", "checkpoints"]:
+#             with SetCurrentDirectoryTemporarily(checkpoint_folder):
+#                 os.system("bash download_ckpts.sh")
+#         pip_install('-e ".[notebooks]"')
+#
 #THIS FUNCTION INSTALLS IT FINE! BUT I DIDN'T FINISH MAKING IT USEFUL YET. UNCOMMENT ONCE I HAVE WRAPPERS FOR IT.
 # def _install_pytorch_hed(git_dir: str = None, force=False):
 #     """
@@ -36834,8 +36920,6 @@ def _install_lazygit(force=False):
             #Untested
             _run_sys_command("""winget install -e --id=JesseDuffield.lazygit""")
         
-    
-    
 def _ensure_filebrowser_installed():
     """https://filebrowser.org/installation"""
 
@@ -36902,18 +36986,20 @@ def _run_claude_code(code):
             code = get_source_code(code)
         except:
             pass
-        
-    display_code_cell(code,title=' Claude code.py ')
-    workdir = temporary_file_path()
+
+    filename = "editme.py"
+
+    display_code_cell(code, title=" Claude " + filename + " ")
+    workdir = path_join(_claudecode_folder, 'workspace_%i'%millis())
     make_directory(workdir)
 
     print(fansi_highlight_path(workdir))
     with SetCurrentDirectoryTemporarily(workdir):
-        save_text_file(code, 'code.py')
-        _run_sys_command('claude')
+        save_text_file(code, filename)
+        _run_sys_command("claude")
 
-        if file_exists('code.py'):
-            code = load_text_file('code.py')
+        if file_exists(filename):
+            code = load_text_file(filename)
             return gather_vars("code workdir")
         else:
             return gather_vars("workdir")
@@ -37080,7 +37166,7 @@ def object_to_bytes(x:object)->bytes:
     return dill.dumps(x)
 
 def bytes_to_object(x:bytes)->object:
-    #Inverse of object_to_bytes, see object_to_bytes for more documentation
+    """ Inverse of object_to_bytes, see object_to_bytes for more documentation """
     dill=pip_import('dill')
     try:
         return dill.loads(x)
@@ -37263,7 +37349,7 @@ def tmux_get_unique_session_name(name=""):
     candidate_name = name
     index = 0
     while not candidate_name or candidate_name in existing_sessions:
-        candidate_name = name + '.' * bool(name) + str(index)
+        candidate_name = name + ' ' * bool(name) + str(index)
         index+=1
     
     return candidate_name
@@ -37849,7 +37935,7 @@ def extract_code_from_ipynb(notebook_path=None):
         str: Concatenated code from all code cells with cell separators.
     """
     # Get processed code blocks
-    code_blocks = extract_code_cells_from_ipynb(notebook_path)
+    code_blocks = _extract_code_cells_from_ipynb(notebook_path)
 
     # Join with separators
     cell_separator = '\n\n'+_ipynb_separator+'\n\n'
@@ -40602,15 +40688,91 @@ def _floor(x):
     if is_torch_tensor(x):return x.floor().long()
     return math.floor(x)
 
-def _randn_like(x):
-    """ Works across libraries - such as numpy, torch """
-    if is_numpy_array(x):
-        return np.random.randn(*x.shape)
-    elif is_torch_tensor:
-        import torch
-        return torch.randn_like(x)
+def _create_array_like(x, *, func_name, shape=None, dtype=None):
+    """Helper function for creating arrays/tensors across libraries"""
+    target_shape = shape if shape is not None else x.shape
+    target_dtype = dtype if dtype is not None else x.dtype
+    
+    if is_torch_tensor(x):  # PyTorch tensor
+        import torch as th
+        device = x.device
+        if func_name == 'zeros':
+            return th.zeros(target_shape, dtype=target_dtype, device=device)
+        elif func_name == 'ones':
+            return th.ones(target_shape, dtype=target_dtype, device=device)
+        elif func_name == 'randn':
+            return th.randn(target_shape, dtype=target_dtype, device=device)
+    elif is_numpy_array(x):  # NumPy array
+        import numpy as np
+        if func_name == 'zeros':
+            return np.zeros(target_shape, dtype=target_dtype)
+        elif func_name == 'ones':
+            return np.ones(target_shape, dtype=target_dtype)
+        elif func_name == 'randn':
+            return np.random.randn(*target_shape).astype(target_dtype)
     else:
-        raise ValueError(get_current_function_name() + " does not support type "+str(type(tensor)))
+        assert False, type(x)
+            
+    raise ValueError("Unsupported type "+str(type(x))+" or function "+func_name)
+
+def _zeros_like(x, *, shape=None, dtype=None):
+    """Works across libraries - such as numpy, torch"""
+    return _create_array_like(x, func_name='zeros', shape=shape, dtype=dtype)
+
+
+def _ones_like(x, *, shape=None, dtype=None):
+    """Works across libraries - such as numpy, torch"""
+    return _create_array_like(x, func_name='ones', shape=shape, dtype=dtype)
+
+
+def _randn_like(x, *, shape=None, dtype=None):
+    """Works across libraries - such as numpy, torch"""
+    return _create_array_like(x, func_name='randn', shape=shape, dtype=dtype)
+
+def crop_tensor(tensor, new_shape):
+    """
+    Crop or pad tensor to new shape, preserving original data where dimensions overlap.
+    
+    Creates a new tensor/array with the requested shape and copies data from
+    the original tensor where dimensions overlap. Works with both NumPy arrays
+    and PyTorch tensors. Can make tensors larger (padding with zeros) or smaller (cropping).
+    
+    Args:
+        tensor: Input tensor (PyTorch) or array (NumPy)
+        new_shape: Target shape as tuple of dimensions
+        
+    Returns:
+        New tensor/array with requested shape containing original data
+        where dimensions overlap
+
+    Examples:
+        >>> import numpy as np
+        ... arr = np.ones((2, 3))
+        ... print(crop_tensor(arr, (4, 5)))  # returns array of shape (4, 5) with ones in top-left 2x3 area
+        ... print(crop_tensor(arr, (1, 2)))  # returns array of shape (1, 2) with data cropped from original
+        [[1. 1. 1. 0. 0.]
+         [1. 1. 1. 0. 0.]
+         [0. 0. 0. 0. 0.]
+         [0. 0. 0. 0. 0.]]
+        [[1. 1.]]
+        
+        >>> import torch
+        ... t = torch.ones((2, 3))
+        ... print(crop_tensor(t, (4, 5)))  # returns tensor of shape (4, 5) with ones in top-left 2x3 area
+        ... print(crop_tensor(t, (1, 2))  # returns tensor of shape (1, 2) with data cropped from original
+        tensor([[1., 1., 1., 0., 0.],
+                [1., 1., 1., 0., 0.],
+                [0., 0., 0., 0., 0.],
+                [0., 0., 0., 0., 0.]])
+        tensor([[1., 1.]])
+
+    """
+    old_shape = tensor.shape
+    new_tensor = _zeros_like(tensor, shape=new_shape)
+    slices = tuple(slice(0, min(o, n)) for o, n in zip(old_shape, new_shape))
+    new_tensor[slices] = tensor[slices]
+    return new_tensor
+
 
 def get_bilinear_weights(x, y):
     """
@@ -40700,7 +40862,7 @@ def torch_scatter_add_image(image, x, y, *, relative=False, interp='floor', heig
 
         >>> def demo_torch_scatter_add_image(interp,normalize=False,):
         ...     import torch
-        ...
+        ... 
         ...     url = "https://upload.wikimedia.org/wikipedia/en/7/7d/Lenna_%28test_image%29.png"
         ...     image=as_torch_image(load_image(url))
         ...     
@@ -40709,17 +40871,17 @@ def torch_scatter_add_image(image, x, y, *, relative=False, interp='floor', heig
         ...     wave_speed = 0.1
         ...     wave_freq = 0.025
         ...     wave_amp = 20
-        ...
+        ... 
         ...     def get_frames():
         ...         for frame in range(num_frames):
         ...             y, x = torch.meshgrid(torch.arange(image.shape[1]), torch.arange(image.shape[2]))
         ...             x = x.float()
         ...             y = y.float()
-        ...
+        ... 
         ...             # Apply sine and cosine waves to create caustics effect
         ...             dx = wave_amp * torch.cos(wave_freq * (x + y) + frame * wave_speed)
         ...             dy = wave_amp * torch.sin(wave_freq * (x - y) + frame * wave_speed)
-        ...
+        ... 
         ...             caustics_image = torch_scatter_add_image(
         ...                 image,
         ...                 dx,
@@ -43471,6 +43633,8 @@ _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"
+_rp_outputs_folder = path_join(_rp_folder, "outputs")
+_claudecode_folder            = _rp_outputs_folder + "/claudecode"
 
 
 def _pip_import_depth_pro(autoyes=False):
@@ -46172,11 +46336,15 @@ def list_dict_transpose(data):
     dict_type=None
     if list_type is None: list_type = list
     if dict_type is None:
-        if rp.r._is_easydict(inner_sample) or rp.r._is_easydict(data):
-            pip_import('easydict')
-            from easydict import EasyDict as dict_type
-        else:
-            dict_type = dict
+        pip_import('easydict')
+        from easydict import EasyDict as dict_type
+
+        # #I used to switch between dict and EasyDict...but I think I just like EasyDict
+        # if rp.r._is_easydict(inner_sample) or rp.r._is_easydict(data):
+        #     pip_import('easydict')
+        #     from easydict import EasyDict as dict_type
+        # else:
+        #     dict_type = dict
 
     if issubclass(outer_type, Mapping):
         # If data is dict-like {'a':, 'b':[3,4]} turn it to [{'a':1,'b':3},{'a':2,'b':4}]

rp-0.1.1209/rp/version.py

@@ -0,0 +1 @@
+1209

{rp-0.1.1207 → rp-0.1.1209}/rp.egg-info/PKG-INFO

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

{rp-0.1.1207 → rp-0.1.1209}/rp.egg-info/SOURCES.txt

@@ -1114,6 +1114,7 @@ rp/libs/pynput_recorder.py
 rp/libs/pytorch_module_explorer.py
 rp/libs/rp_black_macchiato.py
 rp/libs/torch_hooks.py
+rp/libs/torch_tools.py
 rp/libs/jedi/__init__.py
 rp/libs/jedi/__main__.py
 rp/libs/jedi/_compatibility.py

rp-0.1.1209/version.py

@@ -0,0 +1 @@
+1209

rp-0.1.1207/rp/version.py

@@ -1 +0,0 @@
-1207

rp-0.1.1207/version.py

@@ -1 +0,0 @@
-1207