mayutils 1.2.0__tar.gz → 1.2.2__tar.gz

{mayutils-1.2.0 → mayutils-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mayutils
-Version: 1.2.0
+Version: 1.2.2
 Summary: Utilities for Python from Mayuran Visakan
 Author: Mayuran Visakan
 Author-email: Mayuran Visakan <mayuran.k.v@gmail.com>
@@ -48,6 +48,7 @@ Requires-Dist: numba>=0.62.0rc1
 Requires-Dist: numpy>=2.3.2
 Requires-Dist: numpy-financial>=1.0.0
 Requires-Dist: pandas>=2.3.2
+Requires-Dist: pandas-stubs>=2.3.2.250827
 Requires-Dist: pathlib>=1.0.1
 Requires-Dist: pendulum[test]>=3.1.0
 Requires-Dist: pillow>=11.3.0
@@ -71,6 +72,7 @@ Requires-Dist: snowflake-sqlalchemy>=1.7.6
 Requires-Dist: sqlalchemy>=2.0.43
 Requires-Dist: streamlit>=1.49.0
 Requires-Dist: typer>=0.16.1
+Requires-Dist: types-six>=1.17.0.20250515
 Requires-Dist: unicodeit>=0.7.5
 Requires-Dist: ruff>=0.9.6 ; extra == 'dev'
 Requires-Dist: mypy>=1.15.0 ; extra == 'dev'

{mayutils-1.2.0 → mayutils-1.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mayutils"
-version = "1.2.0"
+version = "1.2.2"
 description = "Utilities for Python from Mayuran Visakan"
 authors = [
     { name = "Mayuran Visakan", email = "mayuran.k.v@gmail.com" }
@@ -32,6 +32,7 @@ dependencies = [
     "numpy>=2.3.2",
     "numpy-financial>=1.0.0",
     "pandas>=2.3.2",
+    "pandas-stubs>=2.3.2.250827",
     "pathlib>=1.0.1",
     "pendulum[test]>=3.1.0",
     "pillow>=11.3.0",
@@ -55,6 +56,7 @@ dependencies = [
     "sqlalchemy>=2.0.43",
     "streamlit>=1.49.0",
     "typer>=0.16.1",
+    "types-six>=1.17.0.20250515",
     "unicodeit>=0.7.5",
 ]
 
@@ -73,6 +75,10 @@ generate_encryption_key = "mayutils.environment.oauth:generate_fernet_key"
 [tool.uv]
 prerelease = "if-necessary-or-explicit"
 
+[tool.pyright]
+venvPath = "."
+venv = ".venv"
+
 [build-system]
 requires = ["uv_build>=0.8.14,<0.9.0"]
 build-backend = "uv_build"

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/__init__.py

@@ -16,6 +16,7 @@ def setup(
     try:
         from mayutils.objects.dataframes import setup_dataframes
         from mayutils.visualisation.notebook import setup_notebooks
+        import mayutils.visualisation.graphs.plotly.templates  # noqa: F401
 
         setup_notebooks()
         setup_dataframes()

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/data/live.py

@@ -18,7 +18,7 @@ class LiveData(object):
         - Data is stored in a pandas DataFrame
     """
 
-    def __init__(
+    def _initialise(
         self,
         query_string: str,
         engine: EngineWrapper,
@@ -61,6 +61,30 @@ class LiveData(object):
 
         return None
 
+    def __init__(
+        self,
+        query_string: str,
+        engine: EngineWrapper,
+        index_column: str,
+        start_timestamp: datetime,
+        rolling: bool = True,
+        aggregations: dict[str, Callable[[DataFrame], DataFrame]] = {},
+        update_frequency: Optional[timedelta] = None,
+        time_format: str = "%Y-%m-%d",
+        **format_kwargs,
+    ) -> None:
+        return self._initialise(
+            query_string=query_string,
+            engine=engine,
+            index_column=index_column,
+            start_timestamp=start_timestamp,
+            rolling=rolling,
+            aggregations=aggregations,
+            update_frequency=update_frequency,
+            time_format=time_format,
+            **format_kwargs,
+        )
+
     def update(
         self,
         engine: Optional[EngineWrapper] = None,
@@ -118,7 +142,7 @@ class LiveData(object):
         self,
         start_timestamp: Optional[datetime] = None,
     ) -> Self:
-        self.__init__(
+        self._initialise(
             query_string=self.query_string,
             engine=self.engine,
             index_column=self.index_column,

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/environment/benchmarking.py

@@ -33,7 +33,7 @@ def timing(
 
         length = end - start
 
-        logger.log(
+        logger.report(
             f"{func.__name__} took {length:.4f} seconds",
             show=show,
         )

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/environment/logging.py

@@ -117,7 +117,7 @@ class Logger(logging.Logger):
 
         return cls.clone(logger=logger)
 
-    def log(
+    def report(
         self,
         *msgs: str,
         sep: str = " ",
@@ -176,7 +176,7 @@ def _log(
         *args,
         **kwargs,
     ) -> Any:
-        logger.log(
+        logger.report(
             f"Calling function: {func.__name__}",
             level=level,
             show=show,
@@ -189,7 +189,7 @@ def _log(
                 **kwargs,
             )
             end = time.perf_counter()
-            logger.log(
+            logger.report(
                 f"Function {func.__name__} returned ({end - start:.2f}s): {result}",
                 level=level,
                 show=show,
@@ -198,7 +198,7 @@ def _log(
             return result
         except Exception as exception:
             end = time.perf_counter()
-            logger.log(
+            logger.report(
                 f"Function {func.__name__} raised an exception ({end - start:.2f}s): {exception}",
                 level=logging.ERROR,
                 exc_info=True,
@@ -243,13 +243,13 @@ def log(
         raise ValueError("No target provided")
     if isinstance(target, type):
         return _log_class(
-            cls=target,
+            target,
             *args,
             **kwargs,
         )
     else:
         return _log(
-            func=target,
+            target,
             *args,
             **kwargs,
         )

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/interfaces/google.py

@@ -677,6 +677,11 @@ class Slides(object):
         if y_shift is None:
             y_shift = self.height * 0.05
 
+        theme_color = ""
+        parsed_colour = Colour(0, 0, 0)
+        theme_background_color = ""
+        parsed_background_colour = Colour(0, 0, 0)
+
         if colour is not None and not isinstance(colour, Colour):
             if colour.startswith("theme-"):
                 theme_color = colour[len("theme-") :]
@@ -695,7 +700,7 @@ class Slides(object):
                 f"Slide number {slide_number} is out of range. Presentation has {len(self.slides)} slides."
             )
 
-        requests = [
+        requests: list[dict[str, Any]] = [
             {
                 "createShape": {
                     "objectId": element_id,
@@ -747,20 +752,22 @@ class Slides(object):
                                 "foregroundColor": (
                                     {}
                                     if colour is None
-                                    else {
-                                        "opaqueColor": {
-                                            "rgbColor": {
-                                                "red": parsed_colour.r / 255,
-                                                "green": parsed_colour.g / 255,
-                                                "blue": parsed_colour.b / 255,
+                                    else (
+                                        {
+                                            "opaqueColor": {
+                                                "rgbColor": {
+                                                    "red": parsed_colour.r / 255,
+                                                    "green": parsed_colour.g / 255,
+                                                    "blue": parsed_colour.b / 255,
+                                                }
                                             }
                                         }
-                                    }
-                                    if not (
-                                        isinstance(colour, str)
-                                        and colour.startswith("theme-")
+                                        if not (
+                                            isinstance(colour, str)
+                                            and colour.startswith("theme-")
+                                        )
+                                        else {"themeColor": theme_color}
                                     )
-                                    else {"themeColor": theme_color}
                                 )
                             }
                             if colour
@@ -1510,7 +1517,7 @@ class Sheets(object):
         ]:
             raise ValueError(f"Sheet title {new_title} is already used")
 
-        sheet_properties = {}
+        sheet_properties: dict[str, str | int] = {}
         if to_position is not None:
             sheet_properties["index"] = target_index
 

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/interfaces/microsoft.py

@@ -49,6 +49,12 @@ class Presentation:
             len(self.internal.slide_layouts) - 1
         ]
 
+    # TODO: Implement display/__repr__/_repr_mimebundle_
+    # def __repr__(
+    #     self,
+    #     text: str,
+    # ) -> Self:
+
     @property
     def layouts(
         self,
@@ -89,6 +95,12 @@ class Presentation:
     ) -> None:
         self.internal.slide_width = value
 
+    # TODO: Implement
+    # @property
+    # def title(
+    #     self,
+    # ) -> str:
+
     @property
     def slides(
         self,
@@ -306,6 +318,24 @@ class Presentation:
 
         return self
 
+    # TODO: Implement
+    # def insert_markdown(
+    #     self,
+    #     text: str,
+    # ) -> Self:
+
+    # TODO: Implement
+    # def insert_image(
+    #     self,
+    #     image_path: Path | str,
+    # ) -> Self:
+
+    # TODO: Implement
+    # def insert_table(
+    #     self,
+    #     table: DataFrame | Styler,
+    # ) -> Self:
+
     def save(
         self,
         file_path: Path | str,

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/objects/colours.py

@@ -138,7 +138,12 @@ class Colour:
         rgb = getrgb(colour)
         opacity = rgb[3] if len(rgb) == 4 else opacity
 
-        return cls(*rgb[:3], a=opacity)
+        return cls(
+            r=rgb[0],
+            g=rgb[1],
+            b=rgb[2],
+            a=opacity,
+        )
 
     def set_opacity(
         self,

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/objects/dataframes.py

@@ -243,7 +243,6 @@ class DataframeUtilsAccessor(object):
     def save(
         self,
         path: Path | str,
-        *args,
         **kwargs,
     ) -> Path:
         path = Path(path)
@@ -251,22 +250,25 @@ class DataframeUtilsAccessor(object):
         if path.suffix in [".png", ".jpeg", ".jpg", ".pdf", ".svg", ".eps"]:
             return self.styler.save(
                 path=path,
-                *args,
                 **kwargs,
             )
+
         elif path.suffix == ".parquet":
             self.df.to_parquet(
                 path=path,
                 index=True,
             )
+
         elif path.suffix == ".feather":
             raise NotImplementedError("Feather not implemented")
             self.df.to_feather(path)
+
         elif path.suffix == ".csv":
             self.df.to_csv(
                 path_or_buf=path,
                 index=True,
             )
+
         elif path.suffix == ".xlsx":
             with ExcelWriter(path=path) as excel_writer:
                 self.df.to_excel(
@@ -379,21 +381,22 @@ class DataframeUtilsAccessor(object):
                 return to_datetime(series, format=date_format).dt.date
             elif datetime_type == "time":
                 return to_datetime(series, format=time_format).dt.time
-            else:
-                raise ValueError(f"Unknown datetime_type: {datetime_type}")
+
+            raise ValueError(f"Unknown datetime_type: {datetime_type}")
 
         for col, dtype in mapper.items():
             try:
                 self.df[col] = (
                     convert_datetime(
-                        series=self.df[col],
+                        series=self.df.loc[:, col],
                         datetime_type=dtype,  # type: ignore
                     )
                     if dtype in ["datetime", "date", "time"]
-                    else to_numeric(self.df[col])
+                    else to_numeric(self.df.loc[:, col])
                     if dtype == "numeric"
-                    else self.df[col].astype(dtype)  # type: ignore
+                    else self.df.loc[:, col].astype(dtype)  # type: ignore
                 )
+
             except (
                 KeyError,
                 ValueError,

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/objects/datetime.py

@@ -268,7 +268,7 @@ class DateTime(BaseDateTime):
         )
 
     @classmethod
-    def naive(
+    def as_naive(
         cls,
         year: int,
         month: int,
@@ -390,13 +390,15 @@ class Interval(BaseInterval):
     def start(
         self,
     ) -> DateTime:
-        return self._start if not (self._invert and self._absolute) else self._end
+        return DateTime.from_base(super().start)
+        # return self._start if not (self._invert and self._absolute) else self._end
 
     @property
     def end(
         self,
     ) -> DateTime:
-        return self._end if not (self._invert and self._absolute) else self._start
+        return DateTime.from_base(super().end)
+        # return self._end if not (self._invert and self._absolute) else self._start
 
     @classmethod
     def from_base(
@@ -440,8 +442,8 @@ class Intervals(object):
     def sort(
         self,
     ) -> Self:
-        self.intervals = 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.0 → mayutils-1.2.2}/src/mayutils/objects/decorators.py

@@ -28,7 +28,7 @@ def flexwrap(
             def true_deco(
                 func: T,
             ) -> T:
-                decorated_func = update_wrapper(
+                decorated_func: T = update_wrapper(  # type: ignore[assignment]
                     wrapped=func,
                     wrapper=deco(
                         func,

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/objects/functions.py

@@ -1,3 +1,6 @@
+from typing import Any
+
+
 def null(
     *args,
     **kwargs,
@@ -9,7 +12,7 @@ def set_inline(
     object,
     property,
     value,
-) -> None:
+) -> Any:
     object.__setitem__(property, value)
 
     return object

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/scripts/versioning.py

@@ -145,7 +145,7 @@ def bump() -> None:
         new_version=new_version,
     )
 
-    logger.log(f"Bumped version to {new_version}")
+    logger.report(f"Bumped version to {new_version}")
 
 
 if __name__ == "__main__":

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/visualisation/graphs/plotly/charts.py

@@ -1,7 +1,7 @@
 import os
 from math import isqrt, ceil
 from pathlib import Path
-from typing import Literal, Optional, Self, final
+from typing import Any, Literal, Optional, Self, final
 from dataclasses import dataclass, field
 from mayutils.export.images import IMAGES_FOLDER
 import numpy as np
@@ -14,7 +14,7 @@ from plotly._subplots import _build_subplot_title_annotations
 
 from mayutils.objects.colours import TRANSPARENT, Colour
 
-from mayutils.objects.functions import null, set_inline
+from mayutils.objects.functions import set_inline
 
 from mayutils.visualisation.graphs.plotly.templates import (
     non_primary_axis_dict,
@@ -217,7 +217,6 @@ class SubPlotConfig:
         cls,
         plots: tuple[Optional[PlotConfig], ...],
         cols: Optional[int],
-        *args,
         **kwargs,
     ) -> "SubPlotConfig":
         if cols is None:
@@ -232,7 +231,6 @@ class SubPlotConfig:
                 tuple(extended_plots[idx : idx + cols])
                 for idx in range(0, len(extended_plots), cols)
             ),
-            *args,
             **kwargs,
         )
 
@@ -588,7 +586,7 @@ class Plot(go.Figure):
         *args,
         **kwargs,
     ) -> Self:
-        self.data = []
+        self.data: list[Trace] = []
 
         return self
 
@@ -707,7 +705,11 @@ class Plot(go.Figure):
                 **kwargs,
             )
 
-        return IMAGES_FOLDER / f"{filename}.{image_format}"
+        return (
+            IMAGES_FOLDER / f"{filename}.{image_formats[0]}"
+            if len(image_formats) > 0
+            else IMAGES_FOLDER
+        )
 
     def modifications(
         self,
@@ -729,7 +731,7 @@ class Plot(go.Figure):
                     opacity = 0.1 if trace.meta == "ecdf" else 0.4  # type: ignore
                     trace.fillcolor = colour.to_str(opacity=opacity)  # type: ignore
 
-        bound_groups = {}
+        bound_groups: dict[str, tuple[tuple[Optional[str], int], list[Trace]]] = {}
         for idx, trace in enumerate(self.data):
             if (
                 hasattr(trace, "legendgroup")
@@ -737,7 +739,7 @@ class Plot(go.Figure):
                 and trace.legendgroup.startswith("bounds")  # type: ignore
             ):
                 if trace.legendgroup not in bound_groups:  # type: ignore
-                    bound_groups[trace.legendgroup] = [None, []]  # type: ignore
+                    bound_groups[trace.legendgroup] = ((None, 0), [])  # type: ignore
 
                 if trace.fill == "toself":  # type: ignore
                     bound_groups[trace.legendgroup][1].append(trace)  # type: ignore
@@ -750,7 +752,7 @@ class Plot(go.Figure):
                     colour=shuffled_colourscale[idx % len(shuffled_colourscale)]
                 )
 
-                opacity = Colour.parse(colour=bound_traces[0].fillcolor).a
+                opacity = Colour.parse(colour=bound_traces[0].fillcolor).a  # type: ignore
                 for bound_trace in bound_traces:
                     bound_trace.fillcolor = colour.to_str(opacity=opacity)  # type: ignore
 
@@ -791,8 +793,15 @@ class Plot(go.Figure):
                         xaxis=self.data[idx].xaxis,  # type: ignore
                         yaxis=self.data[idx].yaxis,  # type: ignore
                         legendgroup=self.data[idx].legendgroup  # type: ignore
-                        or null(set_inline(self.data[idx], "legendgroup", idx))
-                        or idx,
+                        or getattr(
+                            set_inline(
+                                self.data[idx],
+                                "legendgroup",
+                                idx,
+                            ),
+                            "legendgroup",
+                            idx,
+                        ),
                         showlegend=False,
                         label_name=False,
                     )
@@ -837,8 +846,15 @@ class Plot(go.Figure):
                             else f"trace {idx} Rug"
                         ),
                         legendgroup=self.data[idx].legendgroup  # type: ignore
-                        or null(set_inline(self.data[idx], "legendgroup", idx))
-                        or idx,
+                        or getattr(
+                            set_inline(
+                                self.data[idx],
+                                "legendgroup",
+                                idx,
+                            ),
+                            "legendgroup",
+                            idx,
+                        ),
                         showlegend=False,
                         marker=dict(
                             color=self.data[idx].marker.line.color,  # type: ignore
@@ -862,8 +878,15 @@ class Plot(go.Figure):
                             else f"trace {idx} Rug"
                         ),
                         legendgroup=self.data[idx].legendgroup  # type: ignore
-                        or null(set_inline(self.data[idx], "legendgroup", idx))
-                        or idx,
+                        or getattr(
+                            set_inline(
+                                self.data[idx],
+                                "legendgroup",
+                                idx,
+                            ),
+                            "legendgroup",
+                            idx,
+                        ),
                         showlegend=False,
                         line=dict(
                             color=TRANSPARENT.to_str(),
@@ -898,8 +921,15 @@ class Plot(go.Figure):
                             else f"trace {idx} Rug"
                         ),
                         legendgroup=self.data[idx].legendgroup  # type: ignore
-                        or null(set_inline(self.data[idx], "legendgroup", idx))
-                        or idx,
+                        or getattr(
+                            set_inline(
+                                self.data[idx],
+                                "legendgroup",
+                                idx,
+                            ),
+                            "legendgroup",
+                            idx,
+                        ),
                         showlegend=False,
                         line=dict(
                             color=self.data[idx].marker.line.color,  # type: ignore
@@ -933,8 +963,15 @@ class Plot(go.Figure):
                             else f"trace {idx} Rug"
                         ),
                         legendgroup=self.data[idx].legendgroup  # type: ignore
-                        or null(set_inline(self.data[idx], "legendgroup", idx))
-                        or idx,
+                        or getattr(
+                            set_inline(
+                                self.data[idx],
+                                "legendgroup",
+                                idx,
+                            ),
+                            "legendgroup",
+                            idx,
+                        ),
                         showlegend=False,
                         line=dict(
                             color=self.data[idx].marker.line.color,  # type: ignore
@@ -968,8 +1005,15 @@ class Plot(go.Figure):
                             else f"trace {idx} Rug"
                         ),
                         legendgroup=self.data[idx].legendgroup  # type: ignore
-                        or null(set_inline(self.data[idx], "legendgroup", idx))
-                        or idx,
+                        or getattr(
+                            set_inline(
+                                self.data[idx],
+                                "legendgroup",
+                                idx,
+                            ),
+                            "legendgroup",
+                            idx,
+                        ),
                         showlegend=False,
                         line=dict(
                             color=self.data[idx].marker.line.color,  # type: ignore
@@ -1096,8 +1140,15 @@ class Plot(go.Figure):
                         xaxis=self.data[idx].xaxis,  # type: ignore
                         yaxis=self.data[idx].yaxis,  # type: ignore
                         legendgroup=self.data[idx].legendgroup  # type: ignore
-                        or null(set_inline(self.data[idx], "legendgroup", idx))
-                        or idx,
+                        or getattr(
+                            set_inline(
+                                self.data[idx],
+                                "legendgroup",
+                                idx,
+                            ),
+                            "legendgroup",
+                            idx,
+                        ),
                         showlegend=False,
                         label_name=False,
                     )
@@ -1107,7 +1158,7 @@ class Plot(go.Figure):
                 "layout": dict(),
             },
         }
-        buttons = {
+        buttons: dict[str, list[dict[str, Any]]] = {
             "scatter": [
                 dict(
                     label="Toggle Density",
@@ -1482,6 +1533,8 @@ class SubPlot(Plot):
                 if is_scene:
                     scene_count += 1
                     scene_str = str(scene_count) if scene_count != 1 else ""
+                else:
+                    scene_str = ""
 
                 xaxis_num = (
                     col_idx + row_idx * len(subplot_config.plots[0]) + 1 - scene_count
@@ -1588,12 +1641,17 @@ class SubPlot(Plot):
 
         self.modifications()
 
-    def add_rug(
-        self,
-        *args,
-        **kwargs,
-    ) -> None:
-        pass
+    # def add_rug(
+    #     self,
+    #     rug_type: Literal[
+    #         "scatter", "violin", "box", "strip", "historgram", "ecdf"
+    #     ] = "scatter",
+    #     rug_height: Optional[float] = None,
+    #     *args,
+    #     **kwargs,
+    # ) -> Self:
+    #     raise NotImplementedError("Rug not implemented for SubPlot")
+    #     return self
 
 
 def pop_axis_config_title(
@@ -1641,7 +1699,7 @@ def get_domains(
 def sort_traces_by_axes(
     traces: list[Trace],
 ) -> dict:
-    traces_axes = {}
+    traces_axes: dict[tuple[str, str], list[Trace]] = {}
     for trace in traces:
         if (trace.xaxis, trace.yaxis) in traces_axes:  # type: ignore
             traces_axes[(trace.xaxis, trace.yaxis)].append(trace)  # type: ignore

{mayutils-1.2.0 → mayutils-1.2.2}/src/mayutils/visualisation/graphs/plotly/traces.py

@@ -259,7 +259,7 @@ class Icicle(go.Icicle):
             if path in node_values:
                 return node_values[path]
 
-            total = 0
+            total = 0.0
             for key, value in d.items():
                 new_path = f"{path}/{key}" if path else key
                 if isinstance(value, dict):
@@ -470,7 +470,6 @@ class Bar3d(go.Mesh3d):
         value_weights: bool = False,
         x_mapping: Optional[ArrayLike] = None,
         y_mapping: Optional[ArrayLike] = None,
-        *args,
         **kwargs,
     ) -> Self:
         if not df.columns.is_unique:
@@ -490,7 +489,6 @@ class Bar3d(go.Mesh3d):
             y=y,
             z=z,
             w=z if value_weights else kwargs.pop("w", None),
-            *args,
             **kwargs,
         )