onekit 2.1.0__tar.gz → 2.2.0__tar.gz

{onekit-2.1.0 → onekit-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: onekit
-Version: 2.1.0
+Version: 2.2.0
 Summary: All-in-One Python Kit.
 License: BSD 3-Clause
 Keywords: onekit
@@ -11,12 +11,13 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: analytics
-Provides-Extra: basic
+Provides-Extra: base
+Provides-Extra: pyspark
 Requires-Dist: pandas[compression,computation,excel,output-formatting,parquet,performance,plot] (>=2.2.3,<3.0.0) ; extra == "analytics"
-Requires-Dist: pyspark (==3.5.3) ; extra == "analytics"
-Requires-Dist: pytz (>=2025.2,<2026.0) ; extra == "basic"
+Requires-Dist: pyspark (==3.5.3) ; extra == "pyspark"
+Requires-Dist: pytz (>=2025.2,<2026.0) ; extra == "base"
 Requires-Dist: scikit-learn (>=1.6.1,<2.0.0) ; extra == "analytics"
-Requires-Dist: toolz (>=1.0.0,<2.0.0) ; extra == "basic"
+Requires-Dist: toolz (>=1.0.0,<2.0.0) ; extra == "base"
 Requires-Dist: tqdm (>=4.67.1,<5.0.0) ; extra == "analytics"
 Description-Content-Type: text/markdown
 
@@ -53,7 +54,7 @@ pip install onekit
 With optional dependencies:
 
 ```shell
-pip install onekit[basic,analytics]
+pip install onekit[base,analytics,pyspark]
 ```
 
 ## Disclaimer

{onekit-2.1.0 → onekit-2.2.0}/README.md

@@ -31,7 +31,7 @@ pip install onekit
 With optional dependencies:
 
 ```shell
-pip install onekit[basic,analytics]
+pip install onekit[base,analytics,pyspark]
 ```
 
 ## Disclaimer

{onekit-2.1.0 → onekit-2.2.0}/pyproject.toml

@@ -22,10 +22,10 @@ requires-python = ">=3.11"
 dependencies = []
 
 [tool.poetry]
-version = "2.1.0"
+version = "2.2.0"
 
 [project.optional-dependencies]
-basic = [
+base = [
     "toolz (>=1.0.0,<2.0.0)",
     "pytz (>=2025.2,<2026.0)",
 ]
@@ -33,12 +33,12 @@ analytics = [
     "pandas[compression,computation,excel,output-formatting,parquet,performance,plot] (>=2.2.3,<3.0.0)",
     "scikit-learn (>=1.6.1,<2.0.0)",
     "tqdm (>=4.67.1,<5.0.0)",
-    "pyspark (==3.5.3)",
 ]
+pyspark = ["pyspark (==3.5.3)"]
 
 [tool.poetry.group.dev.dependencies]
 autoflake = "^2.3.1"
-black = {extras = ["jupyter"], version = "^25.1.0"}
+black = { extras = ["jupyter"], version = "^25.1.0" }
 isort = "^6.0.1"
 flake8 = "^7.1.2"
 pre-commit = "^4.2.0"

{onekit-2.1.0 → onekit-2.2.0}/src/onekit/sparkkit.py

@@ -1104,8 +1104,8 @@ def with_date_diff_ago(
     ref_date: str | dt.date,
     new_col: str,
 ) -> SparkDF:
-    """Add column with date differences w.r.t. the reference date,
-    where date differences of past dates are positive integers.
+    """Add a column showing date differences with respect to the reference date,
+    where differences to past dates are positive integers.
 
     Examples
     --------
@@ -1150,8 +1150,8 @@ def with_date_diff_ahead(
     ref_date: str | dt.date,
     new_col: str,
 ) -> SparkDF:
-    """Add column with date differences w.r.t. the reference date,
-    where date differences of future dates are positive integers.
+    """Add a column showing date differences with respect to the reference date,
+    where differences to future dates are positive integers.
 
     Examples
     --------

{onekit-2.1.0 → onekit-2.2.0}/src/onekit/vizkit.py

@@ -13,6 +13,7 @@ from mpl_toolkits.axes_grid1 import make_axes_locatable
 from mpl_toolkits.mplot3d.axes3d import Axes3D
 
 from onekit import numpykit as npk
+from onekit import pythonkit as pk
 
 __all__ = (
     "Config",
@@ -21,6 +22,7 @@ __all__ = (
     "create_xyz_points",
     "discrete_cmap",
     "plot_contour",
+    "plot_digitscale",
     "plot_line",
     "plot_surface",
     "plot_xy_points",
@@ -481,6 +483,66 @@ def plot_contour(
     return ax
 
 
+def plot_digitscale(
+    x,
+    /,
+    *,
+    cmap_name: str = "YlOrBr_r",
+    kws_plot: dict[str, str] | None = None,
+    ax=None,
+) -> Axes:
+    """Plot a scaled version of :math:`x` using digitscale.
+
+    See Also
+    --------
+    onekit.mathkit.digitscale : Python version
+
+    Examples
+    --------
+    >>> from onekit import mathkit as mk
+    >>> from onekit import vizkit as vk
+    >>> vk.plot_digitscale(tuple(mk.collatz(27)))  # doctest: +SKIP
+    """
+    ax = ax or plt.gca()
+
+    kwargs_plot = dict(marker=".", color="black")
+    kwargs_plot.update(kws_plot or dict())
+
+    x_values = np.asarray(x)
+    x_scaled = npk.digitscale(x_values)
+    ax.plot(x_scaled, **kwargs_plot)
+    x_limits = ax.get_xlim()
+
+    y_min = int(np.floor(x_scaled.min()))
+    y_max = int(np.ceil(x_scaled.max()))
+    y_range = tuple(range(y_min, y_max))
+    colors = discrete_cmap(y_max, name=cmap_name, lower_bound=0.2, upper_bound=0.8)
+
+    for i, y in enumerate(y_range):
+        ax.fill_between(x_limits, y, y + 1, color=colors[i], alpha=0.3)
+
+    ax.set_xlim(x_limits)
+    ax.set_yticks(y_range)
+
+    ax.set_xlabel("index")
+    ax.set_ylabel("num_digits(orig_value)")
+
+    ax.set_title(
+        pk.concat_strings(
+            ", ",
+            f"mean={pk.num_to_str(x_values.mean())}",
+            f"median={pk.num_to_str(float(np.median(x_values)))}",
+            f"std={pk.num_to_str(x_values.std(ddof=1))}",
+            f"min={pk.num_to_str(x_values.min())}",
+            f"max={pk.num_to_str(x_values.max())}",
+        ),
+        size="medium",
+        pad=12,
+    )
+
+    return ax
+
+
 def plot_line(xy_pts: XyPoints, /, *, kws_plot=None, ax=None) -> Axes:
     """Plot :math:`y` versus :math:`x` as line.