kbasic 0.3.19__tar.gz → 0.3.21__tar.gz

{kbasic-0.3.19 → kbasic-0.3.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: kbasic
-Version: 0.3.19
+Version: 0.3.21
 Summary: Keyan's basic utility functions.
 Author: Keyan Gootkin
 Author-email: Keyan Gootkin <keyangootkin@gmail.com>

{kbasic-0.3.19 → kbasic-0.3.21}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kbasic"
-version = "0.3.19"
+version = "0.3.21"
 description = "Keyan's basic utility functions."
 readme = "README.md"
 authors = [

{kbasic-0.3.19 → kbasic-0.3.21}/src/kbasic/array.py

@@ -26,6 +26,8 @@ def tile(arr: ArrayLike) -> NDArray:
     """
     x = array(arr)
     return r_[c_[x, x, x], c_[x, x, x], c_[x, x, x]]
+
+
 def where_closest(arr:ArrayLike, value: Number) -> int | tuple[int]: 
     """find the index where arr is closest to the value of x
 
@@ -39,6 +41,8 @@ def where_closest(arr:ArrayLike, value: Number) -> int | tuple[int]:
     arr = array(arr)
     indices = unravel_index(argmin(absolute(arr-value)), arr.shape)
     return indices if len(indices)>1 else indices[0]
+
+
 def where_between(arr:ArrayLike, low: Number, high: Number) -> NDArray: 
     """Find the range of indicies where arr is between low and high
 
@@ -52,10 +56,21 @@ def where_between(arr:ArrayLike, low: Number, high: Number) -> NDArray:
     """
     arr = array(arr)
     return where((arr>=low)&(arr<=high))
+
+
+def is_between(value: Number, low: Number, high: Number) -> bool:
+    """return whether value is in between low and high (inclusive)."""
+    return (value>=low) & (value<=high)
+
+def std_err(x: ArrayLike):
+    """standard error of the mean"""
+    return nanstd(x) / sqrt(len(x))
+
 def bin_this(
-        x: ArrayLike, y: ArrayLike, 
-        n_bins: int = 50, 
-        func: Callable = nanmean
+        x: ArrayLike, y: ArrayLike,
+        bins: int | ArrayLike = 50,
+        y_func: Callable = nanmean,
+        e_func: Callable = std_err
     ) -> tuple[NDArray]:
     """a function to rebin x, y data and calculate errors.
 
@@ -71,16 +86,18 @@ def bin_this(
         bin_errors (NDArray): standard error of the mean for each bin
     """
     x, y = array(x), array(y)
-    xbins = linspace(nanmin(x),nanmax(x),n_bins)
+    xbins = linspace(nanmin(x),nanmax(x),bins) if type(bins)==int else bins
     Y,error = list(),list()
     for i,low_edge in enumerate(xbins[:-1]):
         high_edge = xbins[i+1]
         mask = (low_edge<x)&(x<high_edge)
         yin = y[mask]
-        Y.append(func(yin))
-        error.append(nanstd(yin)/sqrt(len(yin)))
+        Y.append(y_func(yin))
+        error.append(e_func(yin))
     x_binned, y_binned, bin_errors = array(xbins)[:-1],array(Y),array(error)
     return x_binned, y_binned, bin_errors
+
+
 def nan_clip(*args: tuple[ArrayLike]) -> tuple[ArrayLike]:
     """
     take a series of arrays and only return the indicies where ALL members are not nan
@@ -88,6 +105,8 @@ def nan_clip(*args: tuple[ArrayLike]) -> tuple[ArrayLike]:
     mask = ~any([isnan(a) for a in args], axis=0)
     nanless_args = tuple([array(a)[mask] for a in args])
     return nanless_args
+
+
 def only_finite(*args: tuple[ArrayLike]) -> tuple[ArrayLike]:
     """
     take a series of arrays and only return the indicies where ALL members are finite
@@ -95,6 +114,8 @@ def only_finite(*args: tuple[ArrayLike]) -> tuple[ArrayLike]:
     mask = all([isfinite(a) for a in args], axis=0)
     nanless_args = tuple([array(a)[mask] for a in args])
     return nanless_args
+
+
 def interpolate2d(
         data: ArrayLike, factor: int, 
         method: str = 'linear',
@@ -120,9 +141,13 @@ def interpolate2d(
     data_repeat[-1,-1] = data[-1,-1]
     new_grid = mgrid[:Nx:1/factor, :Ny:1/factor].T
     return RegularGridInterpolator(grid, data_repeat, method=method)(new_grid).T
+
+
 def kspec(image: ArrayLike) -> NDArray:
     """take 2d fft and center k=0 at the center point"""
     return absolute(fftshift(fft2(image) / (1. * image.shape[0] * image.shape[1])))**2
+
+
 def kspec1d(
         image: ArrayLike, 
         bins: int = 100, 
@@ -152,6 +177,8 @@ def kspec1d(
     kerr = array([nanstd(in_bin:=k[where((kgrid[i] < kmag) & (kmag < kgrid[i+1]))])/sqrt(len(in_bin)) for i in range(len(kgrid)-1)])
     if not return_bin_edges: return kx, ks, kerr
     return kgrid, kx, ks, kerr
+
+
 def kspec3d(
         cube: ArrayLike,
         parallel_axis: int = 0

{kbasic-0.3.19 → kbasic-0.3.21}/src/kbasic/audio/lib/Caroline Rose - year of the slug - 01 everything in its right place.wav

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
-name: kbasic-0.3.19/src/kbasic/audio/lib/Caroline Rose - year of the slug - 01 everything in its right place.wav
+name: kbasic-0.3.21/src/kbasic/audio/lib/Caroline Rose - year of the slug - 01 everything in its right place.wav
 size: 39844960 bytes
 sha256: 4cdd2c0f7e886a48b3d524c14a3e24de7e8cb924874980cd5179f3d589153a04

{kbasic-0.3.19 → kbasic-0.3.21}/src/kbasic/parsing/basic.py

@@ -26,6 +26,7 @@ unreadable_file_types: list[str] = ['.gz', '.tar', '.zip']
 # >-|===|>                             Classes                             <|===|-<
 # !==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==!==
 class File:
+    __match_args__=("path",)
     def __init__(
         self, path: str | Self,
         master: Optional[Self] = None, verbose: bool = False
@@ -71,6 +72,7 @@ class File:
         if other==0: return self
         return self.__add__(other)
     def __fspath__(self) -> str: return self.path
+    def __gt__(self, other) -> bool: return self.path > other.path
     @property
     def exists(self) -> bool:
         """_summary_
@@ -158,6 +160,7 @@ class File:
         system(f"touch {self.path}")
 
 class Folder:
+    __match_args__=("path",)
     def __init__(
         self, path: str|Self,
         master: Optional[Self] = None
@@ -211,7 +214,7 @@ class Folder:
         return exists(self.path)
     def glob(self, pattern: str, recursive=True):
         """summary"""
-        return glob(self.path+'/'+pattern, recursive=recursive)
+        return glob(self / pattern, recursive=recursive)
     @property
     def children(self) -> list:
         """summary"""

{kbasic-0.3.19 → kbasic-0.3.21}/src/kbasic/shell.py

@@ -49,13 +49,13 @@ def system(cmd: str) -> str | list[str]:
     """
     command = cmd.split(' ') if type(cmd)==str else cmd
     for i in range(len(command)-1):
-        if command[i].startswith('"'): 
-            start_quote = i 
+        if command[i].startswith('"'):
+            start_quote = i
             end_quote = i+1
             while not command[end_quote].endswith('"'): end_quote+=1
             command[i] = " ".join(command[start_quote:end_quote+1])
             for j in range(start_quote+1, end_quote+1): del command[j]
-    output = parse_shell_output(check_output(command, stderr=DEVNULL).decode().splitlines())
+    output = parse_shell_output(check_output(command, stderr=DEVNULL, executable='/bin/bash').decode().splitlines())
     return output
 def anvil(cmd: str, username=_USERNAME_) -> str | list[str]:
     """Send a shell command to anvil and parse the output