hprint 2.1.0__tar.gz → 2.1.2__tar.gz

{hprint-2.1.0 → hprint-2.1.2}/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hprint
-Version: 2.1.0
-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,12 +20,26 @@ 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 hprint
 ======

{hprint-2.1.0 → hprint-2.1.2}/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
 
@@ -35,10 +56,10 @@ def _pprint(obj):
 
 def json_print(data):
     if isinstance(data, dict):
-        _print(json.dumps(data, indent=4, sort_keys=True, default=str))
+        _print(json.dumps(data, indent=4, sort_keys=True, default=str, ensure_ascii=False))
     elif isinstance(data, list):
         try:
-            _print(json.dumps([dict(d) for d in data], indent=4, sort_keys=True, default=str))
+            _print(json.dumps([dict(d) for d in data], indent=4, sort_keys=True, default=str, ensure_ascii=False))
         except Exception:
             try:
                 _pprint([dict(d) for d in data])
@@ -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.0 → hprint-2.1.2}/hprint.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: hprint
-Version: 2.1.0
-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,12 +20,26 @@ 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
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: tabulate
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 hprint
 ======

{hprint-2.1.0 → hprint-2.1.2}/hprint.egg-info/SOURCES.txt

@@ -9,4 +9,5 @@ hprint.egg-info/PKG-INFO
 hprint.egg-info/SOURCES.txt
 hprint.egg-info/dependency_links.txt
 hprint.egg-info/requires.txt
-hprint.egg-info/top_level.txt
+hprint.egg-info/top_level.txt
+tests/test_hprint.py

{hprint-2.1.0 → hprint-2.1.2}/setup.py

@@ -12,11 +12,11 @@ config = {
     'license': 'MIT',
     "long_description": long_description,
     "long_description_content_type": 'text/markdown',
-    'description': 'Print python object in table/json format',
+    'description': 'Print python object list in table format',
     'author' : 'Hao Ruan',
     'author_email': 'ruanhao1116@gmail.com',
-    'keywords': ['utils', 'print', 'json'],
-    'version': '2.1.0',
+    'keywords': ['table', 'print', 'json', 'utils', 'format'],
+    'version': '2.1.2',
     'packages': ['hprint'],
     'install_requires': [
         'tabulate',
@@ -37,6 +37,8 @@ config = {
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
         "Programming Language :: Python :: 3 :: Only",
         "Topic :: Software Development :: Libraries",
     ],

hprint-2.1.2/tests/test_hprint.py

@@ -0,0 +1,206 @@
+from hprint import hprint
+
+
+test_data_1 = [
+    {'a': 1, 'b': "1", 'c': 1.0},
+    {'a': 2, 'b': "2", 'c': 2.0},
+]
+
+test_data_2 = [
+    {'a': 1, 'b': "1", 'c': 1.12345},
+    {'a': 2, 'b': "2", 'c': 2.12345},
+]
+
+test_data_3 = [
+    {'a': 1000, 'b': "1000", 'c': 1.2345},
+    {'a': 2000000, 'b': "2000", 'c': 1.2345}
+]
+
+
+test_data_4 = [
+    {'a': "1e5", 'b': "1000000000"}
+]
+
+test_data_5 = [
+    {'a': "1", 'b': "2"},
+    {'a': "1", 'b': "2", 'c': "3"},
+]
+
+
+def _hprint(*args, **kwargs):
+    if "raw" not in kwargs or not kwargs["raw"]:
+        kwargs["raw"] = True
+    args_str = ", ".join(repr(arg) for arg in args)
+    kwargs_str = ", ".join(f"{k}={repr(v)}" for k, v in kwargs.items())
+    function_str = f"hprint({args_str}, {kwargs_str})"
+    output = hprint(*args, **kwargs)
+    print("-> " + function_str)
+    print(output)
+    output = str(output)
+    _output = '\n'.join([line.rstrip() for line in output.splitlines()])
+    return _output
+
+
+def test_missing_value():
+    assert _hprint(test_data_5) == """
+a    b    c
+---  ---  ------
+1    2    [none]
+1    2    3
+"""[1:-1]
+    assert _hprint(test_data_5, missing_value='?') == """
+a    b    c
+---  ---  ---
+1    2    ?
+1    2    3
+"""[1:-1]
+
+
+def test_header():
+    assert _hprint(test_data_5, header=False) == """
+-  -  ------
+1  2  [none]
+1  2  3
+-  -  ------
+"""[1:-1]
+
+
+def test_convert():
+    assert _hprint(test_data_5, mappings={
+        'a': ('a', lambda x: int(x) + 100),
+        'c': ('c', 1000, lambda x: int(x) + 200),
+    }) == """
+a    c
+---  ----
+101  1200
+101  203
+"""[1:-1]
+    assert _hprint(test_data_5, mappings={
+        'a': ('a', lambda x: int(x) + 100),
+        'c': ('c', lambda x: int(x) + 100),
+    }, convert=False) == """
+a    c
+---  ------
+1    [none]
+1    3
+"""[1:-1]
+
+
+def test_numparse():
+    assert _hprint(test_data_4, disable_numparse=False) == """
+     a           b
+------  ----------
+100000  1000000000
+"""[1:-1]
+    assert _hprint(test_data_4) == """
+a    b
+---  ----------
+1e5  1000000000
+"""[1:-1]
+
+
+def test_json_format():
+    assert _hprint(test_data_1, json_format=True) == """
+[{'a': 1, 'b': '1', 'c': 1.0}, {'a': 2, 'b': '2', 'c': 2.0}]
+"""[1:-1]
+    assert _hprint(test_data_1, as_json=True) == """
+[{'a': 1, 'b': '1', 'c': 1.0}, {'a': 2, 'b': '2', 'c': 2.0}]
+"""[1:-1]
+
+
+def test_offset():
+    assert _hprint(test_data_1, x=True) == """
+-[ RECORD 1 ]--+----
+a              | 1
+b              | 1
+c              | 1.0
+-[ RECORD 2 ]--+----
+a              | 2
+b              | 2
+c              | 2.0
+"""[1:-1]
+    assert _hprint(test_data_1, x=True, offset=1) == """
+-[ RECORD 2 ]--+----
+a              | 1
+b              | 1
+c              | 1.0
+-[ RECORD 3 ]--+----
+a              | 2
+b              | 2
+c              | 2.0
+"""[1:-1]
+
+
+def test_numbered():
+    assert _hprint(test_data_1, numbered=True) == """
+No    a    b    c
+----  ---  ---  ---
+1     1    1    1.0
+2     2    2    2.0
+"""[1:-1]
+
+
+def test_kwargs_floatfmt():
+    assert _hprint(test_data_2) == """
+a    b    c
+---  ---  -------
+1    1    1.12345
+2    2    2.12345
+"""[1:-1]
+    assert _hprint(test_data_2, floatfmt='.2f') == """
+a    b    c
+---  ---  ----
+1    1    1.12
+2    2    2.12
+"""[1:-1]
+    assert _hprint(test_data_2, floatfmt='.2f', x=True) == """
+-[ RECORD 1 ]--+-----
+a              | 1
+b              | 1
+c              | 1.12
+-[ RECORD 2 ]--+-----
+a              | 2
+b              | 2
+c              | 2.12
+"""[1:-1]
+
+
+def test_kwargs_intfmt():
+    assert _hprint(test_data_3) == """
+a        b     c
+-------  ----  ------
+1000     1000  1.2345
+2000000  2000  1.2345
+"""[1:-1]
+    assert _hprint(test_data_3, intfmt=",", floatfmt='.2f') == """
+a          b     c
+---------  ----  ----
+1,000      1000  1.23
+2,000,000  2000  1.23
+"""[1:-1]
+    assert _hprint(test_data_3, intfmt=",", floatfmt='.2f', x=True) == """
+-[ RECORD 1 ]--+----------
+a              | 1,000
+b              | 1000
+c              | 1.23
+-[ RECORD 2 ]--+----------
+a              | 2,000,000
+b              | 2000
+c              | 1.23
+"""[1:-1]
+
+
+def test_kwargs_tablefmt():
+    assert _hprint(test_data_1, tablefmt='psql') == """
++-----+-----+-----+
+| a   | b   | c   |
+|-----+-----+-----|
+| 1   | 1   | 1.0 |
+| 2   | 2   | 2.0 |
++-----+-----+-----+
+"""[1:-1]
+    assert _hprint(test_data_1, tablefmt='plain') == """
+a    b    c
+1    1    1.0
+2    2    2.0
+"""[1:-1]