hprint 2.1.1__py3-none-any.whl → 2.1.2__py3-none-any.whl

hprint/__init__.py

@@ -1,6 +1,8 @@
+from typing import Any, Union
 from functools import partial
 from tabulate import tabulate
 import json
+import copy
 from pprint import pformat
 import os
 import traceback
@@ -8,6 +10,14 @@ import logging
 import textwrap
 from .utils import chain_get
 
+
+DEFAULTS = {
+    'tablefmt': 'simple',
+    'disable_numparse': True
+    # 'intfmt': '',
+    # 'floatfmt': '',
+}
+
 _MISSING_VALUE = '[none]'
 
 _print = partial(print, flush=True)
@@ -21,6 +31,17 @@ HPRINT_DEBUG = os.getenv("HPRINT_DEBUG")
 __all__ = ['pretty_print', 'hprint']
 
 
+def _format_numeric(value: Union[int, float], tabulate_kwargs: dict) -> Any:
+    """
+    Format numeric values according to the provided tabulate kwargs.
+    """
+    if 'floatfmt' in tabulate_kwargs and isinstance(value, float):
+        return f"{value:{tabulate_kwargs['floatfmt']}}"
+    elif 'intfmt' in tabulate_kwargs and isinstance(value, int):
+        return f"{value:{tabulate_kwargs['intfmt']}}"
+    return value
+
+
 def _if_null(x, default):
     return default if x is None else x
 
@@ -54,7 +75,7 @@ def _get(obj, key):
     return chain_get(obj, key)
 
 
-def tabulate_numbered_print(data, mappings, offset=0, convert=True, missing_value=_MISSING_VALUE):
+def tabulate_numbered_print(data, mappings, offset=0, convert=True, missing_value=_MISSING_VALUE, raw=False, **tabulate_kwargs):
     if not data:
         return
     if not mappings:
@@ -69,7 +90,7 @@ def tabulate_numbered_print(data, mappings, offset=0, convert=True, missing_valu
             k = mappings[h]
             if isinstance(k, (tuple, list)):
                 if len(k) == 2:
-                    default = None
+                    default = missing_value
                     (k0, func) = k
                 elif len(k) == 3:
                     (k0, default, func) = k
@@ -77,11 +98,18 @@ def tabulate_numbered_print(data, mappings, offset=0, convert=True, missing_valu
                     raise ValueError(f"Invalid mapping {k}")
                 if not convert:
                     func = _no_convertion_func
-                attrs.append(func(_if_null(_get(item, k0), default)))
+                attrs.append(func(_if_null(_format_numeric(_get(item, k0), tabulate_kwargs), default)))
             else:
-                attrs.append(_if_null(_get(item, k), missing_value))
+                attrs.append(_if_null(_format_numeric(_get(item, k), tabulate_kwargs), missing_value))
         tabdata.append(attrs)
-    _print(tabulate(tabdata, headers=headers, floatfmt='', intfmt=''))
+    if 'floatfmt' in tabulate_kwargs:
+        del tabulate_kwargs['floatfmt']
+    if 'intfmt' in tabulate_kwargs:
+        del tabulate_kwargs['intfmt']
+    output = tabulate(tabdata, headers=headers, **tabulate_kwargs)
+    if raw:
+        return output
+    _print(output)
 
 
 def _len(x):
@@ -113,7 +141,11 @@ def x_print(records, headers, offset=0, header=True):
     return os.linesep.join(output)
 
 
-def tabulate_print(data, mappings, x=False, offset=0, header=True, raw=False, tf='simple', convert=True, missing_value=_MISSING_VALUE):
+def tabulate_print(
+        data, mappings, x=False, offset=0, header=True, raw=False,
+        convert=True, missing_value=_MISSING_VALUE,
+        **tabulate_kwargs,
+):
     if not data:
         return
     if not mappings:
@@ -129,7 +161,7 @@ def tabulate_print(data, mappings, x=False, offset=0, header=True, raw=False, tf
             k = mappings[h]
             if isinstance(k, (tuple, list)):
                 if len(k) == 2:
-                    default = None
+                    default = missing_value
                     (k0, func) = k
                 elif len(k) == 3:
                     (k0, default, func) = k
@@ -137,20 +169,45 @@ def tabulate_print(data, mappings, x=False, offset=0, header=True, raw=False, tf
                     raise ValueError(f"Invalid mapping {k}")
                 if not convert:
                     func = _no_convertion_func
-                attrs.append(func(_if_null(_get(item, k0), default)))
+                attrs.append(func(_if_null(_format_numeric(_get(item, k0), tabulate_kwargs), default)))
             else:
-                attrs.append(_if_null(_get(item, k), missing_value))
+                attrs.append(_if_null(_format_numeric(_get(item, k), tabulate_kwargs), missing_value))
         tabdata.append(attrs)
     if x:
         output = x_print(tabdata, headers, offset=offset, header=header)
     else:
-        output = tabulate(tabdata, headers=headers if header else (), tablefmt=tf, floatfmt='', intfmt='')
+        if 'floatfmt' in tabulate_kwargs:
+            del tabulate_kwargs['floatfmt']
+        if 'intfmt' in tabulate_kwargs:
+            del tabulate_kwargs['intfmt']
+        output = tabulate(tabdata, headers=headers if header else (), **tabulate_kwargs)
     if raw:
         return output
     _print(output)
 
 
-def hprint(data, *, mappings=None, json_format=False, as_json=False, x=False, offset=0, numbered=False, missing_value=_MISSING_VALUE, tf='simple', header=True, raw=False, convert=True):
+def _set_defaults(tabulate_kwargs: dict[str, Any]) -> None:
+    for k, d in DEFAULTS.items():
+        if k not in tabulate_kwargs:
+            tabulate_kwargs[k] = d
+
+
+def hprint(
+        data,
+        *,
+        mappings=None,
+        json_format=False,
+        as_json=False,
+        x=False,
+        offset=0,
+        numbered=False,
+        missing_value=_MISSING_VALUE,
+        header=True,
+        raw=False,
+        convert=True,
+        **tabulate_kwargs
+):
+    _set_defaults(tabulate_kwargs)
     as_json = as_json or json_format
     if not data:
         return
@@ -160,9 +217,16 @@ def hprint(data, *, mappings=None, json_format=False, as_json=False, x=False, of
                 return data
             json_print(data)
         elif not x and numbered:
-            tabulate_numbered_print(data, mappings, offset=offset, convert=convert, missing_value=missing_value)
+            return tabulate_numbered_print(
+                copy.deepcopy(data), mappings, offset=offset, convert=convert, missing_value=missing_value, raw=raw,
+                **tabulate_kwargs
+            )
         else:
-            return tabulate_print(data, mappings=mappings, x=x, offset=offset, header=header, raw=raw, tf=tf, convert=convert, missing_value=missing_value)
+            return tabulate_print(
+                data, mappings=mappings, x=x, offset=offset, header=header, raw=raw,
+                convert=convert, missing_value=missing_value,
+                **tabulate_kwargs
+            )
     except Exception:
         json_print(data)
         if HPRINT_DEBUG or logger.isEnabledFor(logging.DEBUG):

{hprint-2.1.1.dist-info → hprint-2.1.2.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: hprint
-Version: 2.1.1
-Summary: Print python object in table/json format
+Version: 2.1.2
+Summary: Print python object list in table format
 Home-page: https://github.com/ruanhao/hprint
 Author: Hao Ruan
 Author-email: ruanhao1116@gmail.com
 License: MIT
-Keywords: utils,print,json
+Keywords: table,print,json,utils,format
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Web Environment
 Classifier: Intended Audience :: Developers
@@ -20,6 +20,8 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.7, <4

hprint-2.1.2.dist-info/RECORD

@@ -0,0 +1,8 @@
+hprint/__init__.py,sha256=A9W4vvGdhxrkIBTCy7_PsLHx3vAwJWJ-ft1Op_xFAcI,7295
+hprint/dsutils.py,sha256=UD1L8-23_0320w7ESc_Vwc148w_CLSyJ6t7T5t3yu9M,786
+hprint/utils.py,sha256=ziZQyo-c3QhACQCnFaRjoKZTT9EhjMLu2Qf53jimhHo,603
+hprint-2.1.2.dist-info/licenses/LICENSE,sha256=5IASoCg1AtQddnqyVxltUyoadbZzUpRa_0QvUB-Hwlg,1065
+hprint-2.1.2.dist-info/METADATA,sha256=rHnJfX7N-lXcsg6Pq2XNGPeYTjdlhOyQaKdYqCFMv2c,5667
+hprint-2.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+hprint-2.1.2.dist-info/top_level.txt,sha256=yHUSDt5IDs8J8taLMOu-SaOZK24DyzM0TidniiEJ-Ng,7
+hprint-2.1.2.dist-info/RECORD,,

hprint-2.1.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-hprint/__init__.py,sha256=zJYTFYq88Qgppddo2TIdm_5ocaQ6AdqAxyi9bcWhJpU,5663
-hprint/dsutils.py,sha256=UD1L8-23_0320w7ESc_Vwc148w_CLSyJ6t7T5t3yu9M,786
-hprint/utils.py,sha256=ziZQyo-c3QhACQCnFaRjoKZTT9EhjMLu2Qf53jimhHo,603
-hprint-2.1.1.dist-info/licenses/LICENSE,sha256=5IASoCg1AtQddnqyVxltUyoadbZzUpRa_0QvUB-Hwlg,1065
-hprint-2.1.1.dist-info/METADATA,sha256=bQWzNdxemNJ4uEizWAg41sHHAW92K4B2qSoD3uYbXTw,5552
-hprint-2.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-hprint-2.1.1.dist-info/top_level.txt,sha256=yHUSDt5IDs8J8taLMOu-SaOZK24DyzM0TidniiEJ-Ng,7
-hprint-2.1.1.dist-info/RECORD,,