mayutils 1.2.25__tar.gz → 1.2.28__tar.gz

{mayutils-1.2.25 → mayutils-1.2.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mayutils
-Version: 1.2.25
+Version: 1.2.28
 Summary: Utilities for Python from Mayuran Visakan
 Author: Mayuran Visakan
 Author-email: Mayuran Visakan <mayuran.k.v@gmail.com>
@@ -70,13 +70,23 @@ Requires-Dist: requests>=2.32.5
 Requires-Dist: rich>=14.1.0
 Requires-Dist: scikit-learn>=1.7.1
 Requires-Dist: scipy>=1.16.1
+Requires-Dist: scipy-stubs>=1.16.2.4
 Requires-Dist: selenium>=4.35.0
 Requires-Dist: snowflake-connector-python[secure-local-storage]>=3.17.2
 Requires-Dist: snowflake-sqlalchemy>=1.7.6
 Requires-Dist: sqlalchemy>=2.0.43
 Requires-Dist: streamlit>=1.49.0
 Requires-Dist: typer
+Requires-Dist: types-cachetools>=6.2.0.20251022
+Requires-Dist: types-decorator>=5.2.0.20250324
+Requires-Dist: types-openpyxl>=3.1.5.20250919
+Requires-Dist: types-pycurl>=7.45.7.20250926
+Requires-Dist: types-python-dateutil>=2.9.0.20251008
+Requires-Dist: types-pyyaml>=6.0.12.20250915
+Requires-Dist: types-requests>=2.32.4.20250913
+Requires-Dist: types-simplejson>=3.20.0.20250822
 Requires-Dist: types-six>=1.17.0.20250515
+Requires-Dist: types-toml>=0.10.8.20240310
 Requires-Dist: unicodeit>=0.7.5
 Requires-Dist: watchdog>=6.0.0
 Requires-Dist: coverage ; extra == 'dev'

{mayutils-1.2.25 → mayutils-1.2.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mayutils"
-version = "1.2.25"
+version = "1.2.28"
 description = "Utilities for Python from Mayuran Visakan"
 authors = [
     { name = "Mayuran Visakan", email = "mayuran.k.v@gmail.com" }
@@ -57,13 +57,23 @@ dependencies = [
     "rich>=14.1.0",
     "scikit-learn>=1.7.1",
     "scipy>=1.16.1",
+    "scipy-stubs>=1.16.2.4",
     "selenium>=4.35.0",
     "snowflake-connector-python[secure-local-storage]>=3.17.2",
     "snowflake-sqlalchemy>=1.7.6",
     "sqlalchemy>=2.0.43",
     "streamlit>=1.49.0",
     "typer",
+    "types-cachetools>=6.2.0.20251022",
+    "types-decorator>=5.2.0.20250324",
+    "types-openpyxl>=3.1.5.20250919",
+    "types-pycurl>=7.45.7.20250926",
+    "types-python-dateutil>=2.9.0.20251008",
+    "types-pyyaml>=6.0.12.20250915",
+    "types-requests>=2.32.4.20250913",
+    "types-simplejson>=3.20.0.20250822",
     "types-six>=1.17.0.20250515",
+    "types-toml>=0.10.8.20240310",
     "unicodeit>=0.7.5",
     "watchdog>=6.0.0",
 ]
@@ -85,10 +95,28 @@ generate_encryption_key = "mayutils.environment.oauth:generate_fernet_key"
 [tool.uv]
 prerelease = "if-necessary-or-explicit"
 
+[tool.uv.sources]
+mayutils = { workspace = true }
+
 [tool.pyright]
 venvPath = "."
 venv = ".venv"
 
+[tool.mypy]
+explicit_package_bases = true
+
+
 [build-system]
 requires = ["uv_build>=0.8.14,<0.9.0"]
 build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "coverage>=7.11.0",
+    "ipdb>=0.13.13",
+    "mayutils",
+    "mypy>=1.18.2",
+    "pytest>=8.4.2",
+    "ruff>=0.14.2",
+    "ty>=0.0.1a24",
+]

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/data/live.py

@@ -92,13 +92,17 @@ class LiveData(object):
         engine: EngineWrapper,
     ) -> None:
         new_interval = Interval(
-            start=(now - self.interval.as_duration()) if self.rolling else self.interval.start,
+            start=(now - self.interval.as_duration())
+            if self.rolling
+            else self.interval.start,
             end=now,
         )
 
         if self.rolling:
             # elapsed_period = (previous_period[0], self.period[0])
-            self.data = self.data.loc[self.data[self.index_column] >= new_interval.start.naive()]
+            self.data = self.data.loc[
+                self.data[self.index_column] >= new_interval.start.naive()
+            ]
 
         # new_period = (previous_period[1], self.period[1])»
         additional_data = engine.read_pandas(
@@ -132,7 +136,11 @@ class LiveData(object):
         if engine is None:
             engine = self.engine
 
-        if force or self.update_frequency is None or ((now - self.interval.end) > self.update_frequency):
+        if (
+            force
+            or self.update_frequency is None
+            or ((now - self.interval.end) > self.update_frequency)
+        ):
             self._update(
                 now=now,
                 engine=engine,
@@ -143,7 +151,10 @@ class LiveData(object):
     def _get_aggregated_data(
         self,
     ) -> dict[str, DataFrame]:
-        self.aggregated_data = {aggregation_name: aggregation(self.data) for aggregation_name, aggregation in self.aggregations.items()}
+        self.aggregated_data = {
+            aggregation_name: aggregation(self.data)
+            for aggregation_name, aggregation in self.aggregations.items()
+        }
 
         return self.aggregated_data
 

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/data/queries/__init__.py

@@ -11,7 +11,10 @@ def get_queries_folders() -> tuple[Path, ...]:
     ROOT = get_root()
     return (
         ROOT / "queries",
-        *[ROOT / "src" / module / "data" / "queries" for module in os.listdir(path=ROOT / "src")],
+        *[
+            ROOT / "src" / module / "data" / "queries"
+            for module in os.listdir(path=ROOT / "src")
+        ],
         Path(__file__).parent,
     )
 
@@ -44,7 +47,9 @@ def get_query(
         return read_file(path=path)
 
     except ValueError:
-        raise ValueError(f"No such query {query_name} found in the query folders {', '.join(list(map(str, queries_folders)))} or at the path {path}")
+        raise ValueError(
+            f"No such query {query_name} found in the query folders {', '.join(list(map(str, queries_folders)))} or at the path {path}"
+        )
 
 
 def get_formatted_query(

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/data/read.py

@@ -10,8 +10,8 @@ from mayutils.data import CACHE_FOLDER
 from mayutils.data.queries import QUERIES_FOLDERS, get_formatted_query
 from mayutils.environment.filesystem import encode_path
 from mayutils.environment.memoisation import DataframeBackends
-from mayutils.objects.dataframes import DataFrames, read_parquet, to_parquet
 from mayutils.objects.hashing import hash_inputs
+from mayutils.objects.dataframes import read_parquet, to_parquet, DataFrames
 
 if TYPE_CHECKING:
     from functools import _lru_cache_wrapper as LRUCacheWrapper
@@ -58,7 +58,11 @@ def get_query_data(
     cache: bool | Literal["persistent"] = True,
     **format_kwargs,
 ) -> DataFrames:
-    if cache is False and hasattr(read_query, "cache_clear") and callable(getattr(read_query, "cache_clear")):
+    if (
+        cache is False
+        and hasattr(read_query, "cache_clear")
+        and callable(getattr(read_query, "cache_clear"))
+    ):
         read_query.cache_clear()
 
     cache_name = f"{encode_path(path=query_name)}_data_{

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/environment/logging.py

@@ -146,7 +146,9 @@ class Logger(logging.Logger):
         level: Optional[Level] = None,
         **kwargs,
     ) -> str:
-        level_int = logging._nameToLevel.get(level, None) if isinstance(level, str) else level
+        level_int = (
+            logging._nameToLevel.get(level, None) if isinstance(level, str) else level
+        )
         if level_int is None:
             level_int = self.getEffectiveLevel()
 

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/environment/memoisation.py

@@ -107,7 +107,10 @@ class cache(object):
                     **kwargs,
                 )
 
-                if self.maxsize is not None and len(self.persistent_cache) >= self.maxsize:
+                if (
+                    self.maxsize is not None
+                    and len(self.persistent_cache) >= self.maxsize
+                ):
                     self.persistent_cache.popitem(last=False)
 
                 self.misses += 1

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/export/slides.py

@@ -64,9 +64,15 @@ def export_slides(
         format="%Y_%m_%d",
     )
 
-    filepath = os.path.dirname(p=os.path.realpath(filename="__file__")) + "/" + file_name
+    filepath = (
+        os.path.dirname(p=os.path.realpath(filename="__file__")) + "/" + file_name
+    )
 
-    file_title = f"{title}_{today}" if title is not None else f"{file_name.split(sep='.')[0]}_{today}"
+    file_title = (
+        f"{title}_{today}"
+        if title is not None
+        else f"{file_name.split(sep='.')[0]}_{today}"
+    )
     output_filepath = SLIDES_FOLDER / file_title
 
     with Progress(

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/objects/dataframes.py

@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Callable, Literal, Optional, Self, TypeAlias, get_args
+from typing import Callable, Literal, Optional, Self, get_args
 
 from itables import show
 from great_tables import GT
@@ -31,7 +31,7 @@ from mayutils.objects.colours import Colour
 from mayutils.export import OUTPUT_FOLDER
 
 DataframeBackends = Literal["pandas", "polars"]
-DataFrames: TypeAlias = pd.DataFrame | pl.DataFrame
+DataFrames = pd.DataFrame | pl.DataFrame
 
 DATA_FOLDER = OUTPUT_FOLDER / "Data"
 
@@ -59,7 +59,12 @@ class Styler(Style):
         self,
     ) -> Self:
         def style_map(value):
-            return "color: rgba(0,0,0,0); background-color: rgba(0, 0, 0, 0);" if isinstance(value, (float, int, np.floating, np.integer)) and np.isnan(value) else ""
+            return (
+                "color: rgba(0,0,0,0); background-color: rgba(0, 0, 0, 0);"
+                if isinstance(value, (float, int, np.floating, np.integer))
+                and np.isnan(value)
+                else ""
+            )
 
         return self.map(style_map=style_map)
 
@@ -97,7 +102,9 @@ class Styler(Style):
 
                 for col_num in range(len(self.columns)):
                     self._display_funcs[(row_num, col_num)] = (  # type: ignore
-                        row_formatter if not isinstance(row_formatter, str) else lambda x: format(x, row_formatter)  # type: ignore
+                        row_formatter
+                        if not isinstance(row_formatter, str)
+                        else lambda x: format(x, row_formatter)  # type: ignore
                     )
 
         return self
@@ -324,9 +331,13 @@ class DataframeUtilsAccessor(object):
     ) -> DataFrame:
         df_cut = self.df.loc[self.df.index < cutoff].copy()
         if aggregation is not None:
-            df_cut.loc[f"{cutoff}+", :] = aggregation(self.df.loc[self.df.index >= cutoff])
+            df_cut.loc[f"{cutoff}+", :] = aggregation(
+                self.df.loc[self.df.index >= cutoff]
+            )
             df_cut.index = df_cut.index.astype(dtype=str)
-            df_cut = df_cut.sort_index(key=lambda x: x.str.split(pat="+").str[0].astype(dtype=int))
+            df_cut = df_cut.sort_index(
+                key=lambda x: x.str.split(pat="+").str[0].astype(dtype=int)
+            )
 
         return df_cut
 
@@ -413,7 +424,9 @@ class SeriesUtilsAccessor(object):
         path: Path | str,
     ) -> Path:
         # TODO: Finish
-        raise NotImplementedError("Not implemented for series yet: leverage existing df methods")
+        raise NotImplementedError(
+            "Not implemented for series yet: leverage existing df methods"
+        )
 
 
 class IndexUtilsAccessor(object):
@@ -430,7 +443,14 @@ class IndexUtilsAccessor(object):
         if not isinstance(self.index, MultiIndex):
             raise TypeError("Index is not of type MultiIndex")
 
-        return list(map(list, self.index)) if not transpose else list(list(self.index.get_level_values(level=level)) for level in range(len(self.index.names)))
+        return (
+            list(map(list, self.index))
+            if not transpose
+            else list(
+                list(self.index.get_level_values(level=level))
+                for level in range(len(self.index.names))
+            )
+        )
 
 
 # def save_dataframe(
@@ -510,7 +530,7 @@ class IndexUtilsAccessor(object):
 
 
 def to_parquet(
-    df: DataFrames,
+    df: DataFrames,  # type: ignore
     path: Path | str,
     dataframe_backend: Optional[DataframeBackends] = None,
     **kwargs,
@@ -552,7 +572,7 @@ def read_parquet(
     path: Path | str,
     dataframe_backend: DataframeBackends = "pandas",
     **kwargs,
-) -> DataFrames:
+) -> DataFrames:  # type: ignore
     path = Path(path)
 
     if dataframe_backend == "pandas":

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/objects/datetime.py

@@ -227,7 +227,9 @@ class Time(BaseTime):
     def fractional_completion(
         self,
     ) -> float:
-        return (self.hour * 3600 + self.minute * 60 + self.second + self.microsecond * 1e-6) / DAY_SECONDS
+        return (
+            self.hour * 3600 + self.minute * 60 + self.second + self.microsecond * 1e-6
+        ) / DAY_SECONDS
 
 
 class DateTime(BaseDateTime):
@@ -580,7 +582,9 @@ class Intervals(object):
     def sort(
         self,
     ) -> Self:
-        self.intervals = tuple(sorted(self.intervals, key=lambda interval: (interval.start, interval.end)))
+        self.intervals = tuple(
+            sorted(self.intervals, key=lambda interval: (interval.start, interval.end))
+        )
 
         return self
 

mayutils-1.2.28/src/mayutils/objects/strings.py

@@ -0,0 +1,61 @@
+from typing import Optional
+from re import sub
+
+
+def noneish_string(
+    string: Optional[str],
+) -> Optional[str]:
+    return None if string == "" else string
+
+
+def snakify(
+    string: str,
+) -> str:
+    return "_".join(
+        sub(
+            pattern="([A-Z][a-z]+)",
+            repl=r" \1",
+            string=sub(
+                pattern="([A-Z]+)",
+                repl=r" \1",
+                string=string.replace("-", " "),
+            ),
+        ).split()
+    ).lower()
+
+
+def unsnakify(
+    string: str,
+) -> str:
+    return string.replace("_", " ").title()
+
+
+def kebabify(
+    string: str,
+) -> str:
+    return "-".join(
+        sub(
+            pattern=r"(\s|_|-)+",
+            repl=" ",
+            string=sub(
+                pattern=r"[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+",
+                repl=r" \1",
+                string=string,
+            ).lower(),
+        ).split()
+    )
+
+
+def camel(
+    string: str,
+) -> str:
+    string = (
+        sub(
+            pattern=r"(_|-)+",
+            repl=" ",
+            string=string,
+        )
+        .title()
+        .replace(" ", "")
+    )
+    return "".join([string[0].lower(), string[1:]])

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/visualisation/graphs/plotly/charts.py

@@ -5,7 +5,7 @@ from typing import Any, Literal, Optional, Self, final
 from dataclasses import dataclass, field
 from mayutils.export.images import IMAGES_FOLDER
 import numpy as np
-from scipy.stats import gaussian_kde, norm  # pyright: ignore[reportAttributeAccessIssue]
+from scipy.stats import gaussian_kde, norm
 
 import plotly.graph_objects as go
 import plotly.io as pio
@@ -21,13 +21,13 @@ from mayutils.visualisation.graphs.plotly.templates import (
     axis_dict,
     shuffled_colourscale,
 )
+from plotly.basedatatypes import BaseTraceType as Trace
 from mayutils.visualisation.graphs.plotly.traces import (
     Null,
     Line,
     Scatter,
     Ecdf,
     Bar3d,
-    Trace,
     is_trace_3d,
 )
 
@@ -586,7 +586,7 @@ class Plot(go.Figure):
         *args,
         **kwargs,
     ) -> Self:
-        self.data: list[Trace] = []
+        self.data: Any = []  #  pyright: ignore[reportIncompatibleMethodOverride]
 
         return self
 

{mayutils-1.2.25 → mayutils-1.2.28}/src/mayutils/visualisation/graphs/plotly/traces.py

@@ -10,7 +10,7 @@ import plotly.graph_objects as go
 from numpy.typing import ArrayLike
 from pandas import DataFrame, Series
 from plotly.basedatatypes import BaseTraceType as Trace
-from scipy.stats import gaussian_kde  # pyright: ignore[reportAttributeAccessIssue]
+from scipy.stats import gaussian_kde
 
 from mayutils.objects.colours import Colour
 from mayutils.objects.datetime import DateTime
@@ -41,19 +41,24 @@ class Line(go.Scatter):
         self,
         label_name: bool | str = False,
         textposition: str = "middle right",
+        meta: str = "line",
         *args,
         **kwargs,
     ) -> None:
         mode: str = kwargs.pop("mode", "lines")
-        mode += "+text" if label_name is not False and not mode.endswith("+text") else ""
+        mode += (
+            "+text" if label_name is not False and not mode.endswith("+text") else ""
+        )
         kwargs["mode"] = mode
         kwargs["textposition"] = textposition
 
-        label_name = (kwargs.get("name", None) if label_name is True else label_name) or ""
+        label_name = (
+            kwargs.get("name", None) if label_name is True else label_name
+        ) or ""
         kwargs["text"] = [""] * (len(kwargs.get("x", [])) - 1) + [label_name]
 
         super().__init__(
-            meta="line",
+            meta=meta,
             *args,
             **kwargs,
         )
@@ -93,7 +98,9 @@ class Line(go.Scatter):
         for lower, upper in zip(y_lower, y_upper):
             if len(lower) != len(y) or len(upper) != len(y):  # type: ignore
                 raise ValueError("Y Values of different length provided")
-            elif np.any(np.asarray(lower) > last_lower) or np.any(np.asarray(upper) < last_upper):
+            elif np.any(np.asarray(lower) > last_lower) or np.any(
+                np.asarray(upper) < last_upper
+            ):
                 raise ValueError("Monotonic bounds not passed")
 
             last_lower = lower
@@ -124,7 +131,11 @@ class Line(go.Scatter):
                     legendgroup=legendgroup,
                     hoverinfo="skip",
                     *[*args],
-                    **{key: value for key, value in kwargs.items() if key != "line_color"},
+                    **{
+                        key: value
+                        for key, value in kwargs.items()
+                        if key != "line_color"
+                    },
                 )
                 for lower, upper in zip(y_lower, y_upper)
             ],
@@ -184,8 +195,11 @@ class Ecdf(Line):
 
         _y += y_shift
 
-        kwargs["line_shape"] = "hv" if ((mode != "reversed") ^ (not left_inclusive)) else "vh"
+        kwargs["line_shape"] = (
+            "hv" if ((mode != "reversed") ^ (not left_inclusive)) else "vh"
+        )
         kwargs["fill"] = fill
+        kwargs["meta"] = kwargs.pop("meta", "ecdf")
 
         if fill == "toself":
             _x = np.insert(_x, 0, _x[-1])
@@ -202,8 +216,6 @@ class Ecdf(Line):
             **kwargs,
         )
 
-        self.meta = "ecdf"
-
 
 class Kde(Line):
     def __init__(
@@ -219,6 +231,8 @@ class Kde(Line):
         _x_grid = np.linspace(np.min(_x), np.max(_x), 1000)
         _y = kde(_x_grid)
 
+        kwargs["meta"] = kwargs.pop("meta", "kde")
+
         super().__init__(
             x=_x_grid,
             y=_y,
@@ -228,8 +242,6 @@ class Kde(Line):
             **kwargs,
         )
 
-        self.meta = "kde"
-
 
 class Scatter(go.Scatter):
     def __init__(
@@ -372,7 +384,11 @@ class Bar3d(go.Mesh3d):
         x_arr = np.asarray(x)
         y_arr = np.asarray(y)
         z_arr = np.asarray(z, dtype=np.float64)
-        w_arr = np.asarray(w, dtype=np.float64) if w is not None else np.ones(z_arr.shape, dtype=np.float64)
+        w_arr = (
+            np.asarray(w, dtype=np.float64)
+            if w is not None
+            else np.ones(z_arr.shape, dtype=np.float64)
+        )
 
         if any(len(arr) != len(w_arr) for arr in [x_arr, y_arr, z_arr]):
             raise ValueError("Input arrays are not same length")
@@ -390,7 +406,12 @@ class Bar3d(go.Mesh3d):
             )
             * dx
         )
-        self._x = np.stack([x_arr_numerical - dx / 2, x_arr_numerical + dx / 2], axis=1)[np.arange(x_arr_numerical.size)[:, None], [0, 0, 1, 1, 0, 0, 1, 1]].reshape(-1) + x_start
+        self._x = (
+            np.stack([x_arr_numerical - dx / 2, x_arr_numerical + dx / 2], axis=1)[
+                np.arange(x_arr_numerical.size)[:, None], [0, 0, 1, 1, 0, 0, 1, 1]
+            ].reshape(-1)
+            + x_start
+        )
         y_arr_numerical = (
             map_categorical_array(
                 arr=self._y_arr,
@@ -398,18 +419,34 @@ class Bar3d(go.Mesh3d):
             )
             * dy
         )
-        self._y = np.stack([y_arr_numerical - dy / 2, y_arr_numerical + dy / 2], axis=1)[np.arange(y_arr_numerical.size)[:, None], [0, 1, 1, 0, 0, 1, 1, 0]].reshape(-1) + y_start
+        self._y = (
+            np.stack([y_arr_numerical - dy / 2, y_arr_numerical + dy / 2], axis=1)[
+                np.arange(y_arr_numerical.size)[:, None], [0, 1, 1, 0, 0, 1, 1, 0]
+            ].reshape(-1)
+            + y_start
+        )
         self._z = np.ones(self._z_arr.size * 8, dtype=self._z_arr.dtype) * z0
-        self._z[(np.arange(self._z_arr.size) * 8)[:, None] + np.array([4, 5, 6, 7])] = self._z_arr[:, None]
+        self._z[(np.arange(self._z_arr.size) * 8)[:, None] + np.array([4, 5, 6, 7])] = (
+            self._z_arr[:, None]
+        )
         self._z += z_start
         self._w = np.repeat(
             self._w_arr,
             repeats=8,
         )
 
-        i = (np.tile([7, 0, 0, 0, 4, 4, 6, 6, 4, 0, 3, 2], (len(self._x_arr), 1)) + np.arange(len(self._x_arr))[:, np.newaxis] * 8).flatten()
-        j = (np.tile([3, 4, 1, 2, 5, 6, 5, 2, 0, 1, 6, 3], (len(self._x_arr), 1)) + np.arange(len(self._x_arr))[:, np.newaxis] * 8).flatten()
-        k = (np.tile([0, 7, 2, 3, 6, 7, 1, 1, 5, 5, 7, 6], (len(self._x_arr), 1)) + np.arange(len(self._x_arr))[:, np.newaxis] * 8).flatten()
+        i = (
+            np.tile([7, 0, 0, 0, 4, 4, 6, 6, 4, 0, 3, 2], (len(self._x_arr), 1))
+            + np.arange(len(self._x_arr))[:, np.newaxis] * 8
+        ).flatten()
+        j = (
+            np.tile([3, 4, 1, 2, 5, 6, 5, 2, 0, 1, 6, 3], (len(self._x_arr), 1))
+            + np.arange(len(self._x_arr))[:, np.newaxis] * 8
+        ).flatten()
+        k = (
+            np.tile([0, 7, 2, 3, 6, 7, 1, 1, 5, 5, 7, 6], (len(self._x_arr), 1))
+            + np.arange(len(self._x_arr))[:, np.newaxis] * 8
+        ).flatten()
 
         return super().__init__(
             x=self._x,
@@ -474,9 +511,18 @@ def merge_cuboids(
     y = np.zeros(len(cuboids) * 8)
     z = np.zeros(len(cuboids) * 8)
     intensity = np.zeros(len(cuboids) * 8)
-    i = (np.tile([7, 0, 0, 0, 4, 4, 6, 6, 4, 0, 3, 2], (len(cuboids), 1)) + np.arange(len(cuboids))[:, np.newaxis] * 8).flatten()
-    j = (np.tile([3, 4, 1, 2, 5, 6, 5, 2, 0, 1, 6, 3], (len(cuboids), 1)) + np.arange(len(cuboids))[:, np.newaxis] * 8).flatten()
-    k = (np.tile([0, 7, 2, 3, 6, 7, 1, 1, 5, 5, 7, 6], (len(cuboids), 1)) + np.arange(len(cuboids))[:, np.newaxis] * 8).flatten()
+    i = (
+        np.tile([7, 0, 0, 0, 4, 4, 6, 6, 4, 0, 3, 2], (len(cuboids), 1))
+        + np.arange(len(cuboids))[:, np.newaxis] * 8
+    ).flatten()
+    j = (
+        np.tile([3, 4, 1, 2, 5, 6, 5, 2, 0, 1, 6, 3], (len(cuboids), 1))
+        + np.arange(len(cuboids))[:, np.newaxis] * 8
+    ).flatten()
+    k = (
+        np.tile([0, 7, 2, 3, 6, 7, 1, 1, 5, 5, 7, 6], (len(cuboids), 1))
+        + np.arange(len(cuboids))[:, np.newaxis] * 8
+    ).flatten()
 
     for idx, cuboid in enumerate(cuboids):
         x[idx * 8 : (idx + 1) * 8] = cuboid.x  # type: ignore

mayutils-1.2.25/src/mayutils/objects/strings.py

@@ -1,7 +0,0 @@
-from typing import Optional
-
-
-def noneish_string(
-    string: Optional[str],
-) -> Optional[str]:
-    return None if string == "" else string