libdev 0.73__tar.gz → 0.75__tar.gz

{libdev-0.73 → libdev-0.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libdev
-Version: 0.73
+Version: 0.75
 Summary: Set of standard functions for development
 Home-page: https://github.com/kosyachniy/lib
 Author: Alexey Poloz

libdev-0.75/libdev/__init__.py

@@ -0,0 +1,7 @@
+"""
+Initializing the Python package
+"""
+
+__version__ = "0.75"
+
+__all__ = ("__version__",)

{libdev-0.73 → libdev-0.75}/libdev/num.py

@@ -8,7 +8,7 @@ from decimal import Decimal
 
 
 def is_float(value: str) -> bool:
-    """ Check value for float """
+    """Check value for float"""
 
     try:
         float(value)
@@ -17,8 +17,9 @@ def is_float(value: str) -> bool:
 
     return True
 
+
 def to_num(value) -> bool:
-    """ Convert value to int or float """
+    """Convert value to int or float"""
 
     if value is None:
         return None
@@ -31,16 +32,18 @@ def to_num(value) -> bool:
 
     return value
 
+
 def to_int(value) -> int:
-    """ Choose only decimal """
+    """Choose only decimal"""
 
     if not value:
         return 0
 
-    return int(re.sub(r'\D', '', str(value)))
+    return int(re.sub(r"\D", "", str(value)))
+
 
 def get_float(value) -> list:
-    """ Get a list of floats """
+    """Get a list of floats"""
 
     if value is None:
         return []
@@ -48,8 +51,9 @@ def get_float(value) -> list:
     numbers = re.findall(r"[-+]?\d*\.\d+|[-+]?\d+", value)
     return [float(number) for number in numbers]
 
+
 def find_decimals(value):
-    """ Get count of decimal """
+    """Get count of decimal"""
 
     if isinstance(value, str):
         while value[-1] == "0":
@@ -57,12 +61,11 @@ def find_decimals(value):
 
     return abs(Decimal(str(value)).as_tuple().exponent)
 
+
 def get_whole(value):
-    """ Get whole view of a number """
+    """Get whole view of a number"""
 
-    if isinstance(value, int) or (
-        isinstance(value, str) and '.' not in value
-    ):
+    if isinstance(value, int) or (isinstance(value, str) and "." not in value):
         # NOTE: to remove 0 in the start of the string
         return str(int(value))
 
@@ -72,17 +75,18 @@ def get_whole(value):
     # NOTE: to avoid the exponential form of the number
     return f"{value:.{find_decimals(value)}f}"
 
+
 def simplify_value(value, decimals=4):
-    """ Get the significant part of a number """
+    """Get the significant part of a number"""
 
     if value is None:
         return None
 
     value = get_whole(value)
-    if '.' not in value:
-        value += '.'
+    if "." not in value:
+        value += "."
 
-    whole, fractional = value.split('.')
+    whole, fractional = value.split(".")
 
     if value[0] == "-":
         sign = "-"
@@ -92,7 +96,7 @@ def simplify_value(value, decimals=4):
 
     if whole != "0":
         digit = len(whole)
-        value = whole + "." + fractional[:max(0, decimals-digit)]
+        value = whole + "." + fractional[: max(0, decimals - digit)]
 
     else:
         offset = 0
@@ -110,8 +114,37 @@ def simplify_value(value, decimals=4):
 
     return sign + value
 
+
+def pretty(value, decimals=None, sign=False, symbol="’"):
+    """Decorate the number beautifully"""
+
+    if value is None:
+        return None
+
+    data = str(float(value))
+
+    if decimals is not None:
+        cur = len(data.split(".")[0])
+        data = str(round(value, max(0, decimals - cur)))
+
+    if data.split(".")[-1] == "0":
+        data = data.split(".")[0]
+
+    if data == "0":
+        return "0"
+
+    if symbol:
+        data = add_radix(data, symbol)
+
+    if sign:
+        if data[0] != "-":
+            data = "+" + data
+
+    return data
+
+
 def add_sign(value):
-    """ Add sign to a number """
+    """Add sign to a number"""
 
     if value is None:
         return None
@@ -125,23 +158,27 @@ def add_sign(value):
 
     return f"{sign}{get_whole(value)}"
 
+
 def add_radix(value, symbol="’"):
-    """ Add radix to a number """
+    """Add radix to a number"""
 
     if value is None:
         return None
 
     value = str(value)
 
-    if '.' in value:
-        integer, fractional = value.split('.')
+    if "." in value:
+        integer, fractional = value.split(".")
     else:
         integer = value
         fractional = ""
 
-    if integer[0] == '-':
+    if integer[0] == "-":
         sign = "-"
         integer = integer[1:]
+    # elif integer[0] == '+':
+    #     sign = '+'
+    #     integer = integer[1:]
     else:
         sign = ""
 
@@ -159,20 +196,37 @@ def add_radix(value, symbol="’"):
 
     return data
 
+
 def mul(x, y):
-    """ Multiply fractions correctly """
+    """Multiply fractions correctly"""
     if x is None or y is None:
         return None
     return float(Decimal(str(x)) * Decimal(str(y)))
 
+
 def div(x, y):
-    """ Divide fractions correctly """
+    """Divide fractions correctly"""
     if x is None or y is None:
         return None
     return float(Decimal(str(x)) / Decimal(str(y)))
 
+
+def add(x, y):
+    """Subtract fractions correctly"""
+    if x is None or y is None:
+        return None
+    return float(Decimal(str(x)) + Decimal(str(y)))
+
+
+def sub(x, y):
+    """Subtract fractions correctly"""
+    if x is None or y is None:
+        return None
+    return float(Decimal(str(x)) - Decimal(str(y)))
+
+
 def to_step(value, step=1, side=False):
-    """ Change value step """
+    """Change value step"""
 
     if value is None:
         return None

{libdev-0.73 → libdev-0.75}/libdev/time.py

@@ -167,7 +167,7 @@ def parse_time(data: str, tz=0):
 
     return int(data.timestamp())
 
-def format_delta(sec, short=False, locale='ru'):
+def format_delta(sec, short=False, locale='en'):
     """ Format time delta in words by seconds """
 
     if abs(sec) >= 259200: # 3 days

{libdev-0.73 → libdev-0.75}/libdev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libdev
-Version: 0.73
+Version: 0.75
 Summary: Set of standard functions for development
 Home-page: https://github.com/kosyachniy/lib
 Author: Alexey Poloz

libdev-0.75/setup.py

@@ -0,0 +1,63 @@
+"""
+Setup the Python package
+"""
+
+import pathlib
+import re
+from setuptools import setup, find_packages
+
+
+with open("README.md", "r", encoding="utf-8") as file:
+    long_description = file.read()
+
+WORK_DIR = pathlib.Path(__file__).parent
+
+
+def get_version():
+    """Get version"""
+
+    txt = (WORK_DIR / "libdev" / "__init__.py").read_text("utf-8")
+
+    try:
+        return re.findall(r"^__version__ = \"([^\"]+)\"\r?$", txt, re.M)[0]
+    except IndexError as e:
+        raise RuntimeError("Unable to determine version") from e
+
+
+setup(
+    name="libdev",
+    version=get_version(),
+    description="Set of standard functions for development",
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    url="https://github.com/kosyachniy/lib",
+    author="Alexey Poloz",
+    author_email="polozhev@mail.ru",
+    classifiers=[
+        "Development Status :: 4 - Beta",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "Topic :: Software Development :: Libraries :: Application Frameworks",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python :: 3",
+        "Operating System :: OS Independent",
+    ],
+    keywords=(
+        "standard, lib, dev, development, cfg, config, generate, codes, "
+        "tokens, ids, passwords, generator, ciphers, time, formatter, nlp, "
+        "natural language, aws, s3, upload file, file server"
+    ),
+    packages=find_packages(exclude=("tests",)),
+    python_requires=">=3.7, <4",
+    install_requires=[
+        "requests",  # Because of conflicts with main repo
+        "python-dotenv==1.0.0",
+        "boto3==1.28.46",
+        "Pillow==10.0.0",
+    ],
+    project_urls={
+        "Source": "https://github.com/kosyachniy/lib",
+    },
+    license="MIT",
+    include_package_data=False,
+)

libdev-0.75/tests/test_num.py

@@ -0,0 +1,157 @@
+from libdev.num import (
+    is_float,
+    to_num,
+    to_int,
+    get_float,
+    find_decimals,
+    get_whole,
+    simplify_value,
+    add_sign,
+    add_radix,
+    to_step,
+    add,
+    pretty,
+)
+
+
+def test_float():
+    assert is_float("0") == True
+    assert is_float("-0.") == True
+    assert is_float("-.0") == True
+    assert is_float(".1") == True
+    assert is_float("-.2") == True
+    assert is_float("-3.") == True
+    assert is_float("4.0") == True
+    assert is_float("-5.678") == True
+    assert is_float("6.7x") == False
+    assert is_float("-7..8") == False
+    assert is_float("") == False
+    assert is_float(".") == False
+    assert is_float(1) == True
+    assert is_float(-2.0) == True
+    assert is_float(None) == False
+
+
+def test_num():
+    assert to_num("0") == 0
+    assert to_num("1.") == 1
+    assert to_num("-2.0") == -2
+    assert to_num("3.45") == 3.45
+    assert to_num("-.0") == 0
+    assert to_num(-4.5) == -4.5
+    assert to_num(5.0) == 5
+
+
+def test_int():
+    assert to_int(None) == 0
+    assert to_int(0) == 0
+    assert to_int("") == 0
+    assert to_int("0") == 0
+    assert to_int(" 0") == 0
+    assert to_int("    \t\n12 -34 .&7a8") == 123478
+
+
+def test_get_float():
+    assert get_float(None) == []
+    assert get_float("") == []
+    assert get_float("asd") == []
+    assert get_float("0.0") == [0.0]
+    assert get_float("0.") == [0.0]
+    assert get_float(".0") == [0.0]
+    assert get_float("0") == [0.0]
+    assert get_float("123") == [123.0]
+    assert get_float("asd 1.2") == [1.2]
+    assert get_float("asd1.2fgh") == [1.2]
+    assert get_float("asd1.2fgh3") == [1.2, 3.0]
+    assert get_float("1 2") == [1.0, 2.0]
+    assert get_float("1.2%.3") == [1.2, 0.3]
+    assert get_float("1.2-.3") == [1.2, -0.3]
+    assert get_float("1.2.3") == [1.2, 0.3]
+    assert get_float("1..2") == [1.0, 0.2]
+    assert get_float("1...2") == [1.0, 0.2]
+
+
+def test_decimals():
+    assert find_decimals(0) == 0
+    assert find_decimals(1.0) == 1
+    assert find_decimals(0.120) == 2
+    assert find_decimals("1000.00012000") == 5
+    assert find_decimals(-0.000000000123456700) == 16
+
+
+def test_whole():
+    assert get_whole(0) == "0"
+    assert get_whole(0.0) == "0.0"
+    assert get_whole(12.340) == "12.34"
+    assert get_whole("12.003400") == "12.0034"
+    assert get_whole(-0.0000000001234567) == "-0.0000000001234567"
+    assert get_whole("-0.0000000001234567000") == "-0.0000000001234567"
+
+
+def test_simplify():
+    assert simplify_value("0") == "0"
+    assert simplify_value("0.") == "0"
+    assert simplify_value(-25901050.0425) == "-25901050"
+    assert simplify_value(-0.0000000001234567) == "-0.0000000001234"
+    assert simplify_value("12.345000") == "12.34"
+    assert simplify_value(0.01234, 2) == "0.012"
+    assert simplify_value("012340000000") == "12340000000"
+
+
+def test_add_sign():
+    assert add_sign(0) == "0"
+    assert add_sign("0") == "0"
+    assert add_sign("0.") == "0.0"
+    assert add_sign(-0.0) == "0.0"
+    assert add_sign("-0") == "0"
+    assert add_sign(1) == "+1"
+    assert add_sign(-100) == "-100"
+    assert add_sign(-0.000000001) == "-0.000000001"
+    assert add_sign(1.23e-10) == "+0.000000000123"
+
+
+def test_add_radix():
+    assert add_radix(None) == None
+    assert add_radix(0) == "0"
+    assert add_radix(0.0) == "0.0"
+    assert add_radix(0.1) == "0.1"
+    assert add_radix(1234) == "1’234"
+    assert add_radix(123456) == "123’456"
+    assert add_radix(1234567.89012) == "1’234’567.89012"
+
+
+def test_to_step():
+    assert to_step(None) == None
+    assert to_step(0) == 0
+    assert to_step(0.0) == 0
+    assert to_step(0.1) == 0
+    assert to_step(1.2) == 1
+    assert to_step(1.2, 0.1) == 1.2
+    assert to_step(1.234, 0.1) == 1.2
+    assert to_step(1.234, 0.1, True) == 1.3
+    assert to_step(1.2, 0.1, True) == 1.2
+    assert to_step(1.2, 10) == 0
+    assert to_step(1.2, 10, True) == 10
+    assert to_step(123.456, 10) == 120
+    assert isinstance(to_step(12, 0.1), float)
+    assert isinstance(to_step(12.456, 1), int)
+
+
+def test_add():
+    assert add(0.7, 0.2) == 0.9
+
+
+def test_pretty():
+    assert pretty(None) == None
+    assert pretty(0) == "0"
+    assert pretty(0.0) == "0"
+    assert pretty(0.0) == "0"
+    assert pretty(1.0) == "1"
+    assert pretty(0.1) == "0.1"
+    assert pretty(1.1, 2) == "1.1"
+    assert pretty(0.1, 2) == "0.1"
+    assert pretty(1.1, 0) == "1"
+    assert pretty(1.7, 0) == "2"
+    assert pretty(123.456, 1) == "123"
+    assert pretty(123.456, 1, True) == "+123"
+    assert pretty(12345.6, 3, True) == "+12’346"

libdev-0.73/libdev/__init__.py

@@ -1,9 +0,0 @@
-"""
-Initializing the Python package
-"""
-
-__version__ = '0.73'
-
-__all__ = (
-    '__version__',
-)

libdev-0.73/setup.py

@@ -1,63 +0,0 @@
-"""
-Setup the Python package
-"""
-
-import pathlib
-import re
-from setuptools import setup, find_packages
-
-
-with open('README.md', 'r', encoding='utf-8') as file:
-    long_description = file.read()
-
-WORK_DIR = pathlib.Path(__file__).parent
-
-
-def get_version():
-    """ Get version """
-
-    txt = (WORK_DIR / 'libdev' / '__init__.py').read_text('utf-8')
-
-    try:
-        return re.findall(r"^__version__ = '([^']+)'\r?$", txt, re.M)[0]
-    except IndexError as e:
-        raise RuntimeError('Unable to determine version') from e
-
-
-setup(
-    name='libdev',
-    version=get_version(),
-    description='Set of standard functions for development',
-    long_description=long_description,
-    long_description_content_type='text/markdown',
-    url='https://github.com/kosyachniy/lib',
-    author='Alexey Poloz',
-    author_email='polozhev@mail.ru',
-    classifiers=[
-        'Development Status :: 4 - Beta',
-        'Environment :: Console',
-        'Intended Audience :: Developers',
-        'Topic :: Software Development :: Libraries :: Application Frameworks',
-        'License :: OSI Approved :: MIT License',
-        'Programming Language :: Python :: 3',
-        'Operating System :: OS Independent',
-    ],
-    keywords=(
-        'standard, lib, dev, development, cfg, config, generate, codes, '
-        'tokens, ids, passwords, generator, ciphers, time, formatter, nlp, '
-        'natural language, aws, s3, upload file, file server'
-    ),
-    packages=find_packages(exclude=('tests',)),
-    python_requires='>=3.7, <4',
-    install_requires=[
-        'requests',  # Because of conflicts with main repo
-        'python-dotenv==1.0.0',
-        'boto3==1.28.46',
-        'Pillow==10.0.0',
-    ],
-    project_urls={
-        'Source': 'https://github.com/kosyachniy/lib',
-    },
-    license='MIT',
-    include_package_data=False,
-)

libdev-0.73/tests/test_num.py

@@ -1,119 +0,0 @@
-from libdev.num import (
-    is_float, to_num, to_int, get_float, find_decimals, get_whole,
-    simplify_value, add_sign, add_radix, to_step,
-)
-
-
-def test_float():
-    assert is_float('0') == True
-    assert is_float('-0.') == True
-    assert is_float('-.0') == True
-    assert is_float('.1') == True
-    assert is_float('-.2') == True
-    assert is_float('-3.') == True
-    assert is_float('4.0') == True
-    assert is_float('-5.678') == True
-    assert is_float('6.7x') == False
-    assert is_float('-7..8') == False
-    assert is_float('') == False
-    assert is_float('.') == False
-    assert is_float(1) == True
-    assert is_float(-2.) == True
-    assert is_float(None) == False
-
-def test_num():
-    assert to_num('0') == 0
-    assert to_num('1.') == 1
-    assert to_num('-2.0') == -2
-    assert to_num('3.45') == 3.45
-    assert to_num('-.0') == 0
-    assert to_num(-4.5) == -4.5
-    assert to_num(5.0) == 5
-
-def test_int():
-    assert to_int(None) == 0
-    assert to_int(0) == 0
-    assert to_int('') == 0
-    assert to_int('0') == 0
-    assert to_int(' 0') == 0
-    assert to_int('    \t\n12 -34 .&7a8') == 123478
-
-def test_get_float():
-    assert get_float(None) == []
-    assert get_float('') == []
-    assert get_float('asd') == []
-    assert get_float('0.0') == [0.]
-    assert get_float('0.') == [0.]
-    assert get_float('.0') == [0.]
-    assert get_float('0') == [0.]
-    assert get_float('123') == [123.]
-    assert get_float('asd 1.2') == [1.2]
-    assert get_float('asd1.2fgh') == [1.2]
-    assert get_float('asd1.2fgh3') == [1.2, 3.]
-    assert get_float('1 2') == [1., 2.]
-    assert get_float('1.2%.3') == [1.2, 0.3]
-    assert get_float('1.2-.3') == [1.2, -0.3]
-    assert get_float('1.2.3') == [1.2, 0.3]
-    assert get_float('1..2') == [1., 0.2]
-    assert get_float('1...2') == [1., 0.2]
-
-
-def test_decimals():
-    assert find_decimals(0) == 0
-    assert find_decimals(1.) == 1
-    assert find_decimals(0.120) == 2
-    assert find_decimals('1000.00012000') == 5
-    assert find_decimals(-0.000000000123456700) == 16
-
-def test_whole():
-    assert get_whole(0) == '0'
-    assert get_whole(0.) == '0.0'
-    assert get_whole(12.340) == '12.34'
-    assert get_whole('12.003400') == '12.0034'
-    assert get_whole(-0.0000000001234567) == '-0.0000000001234567'
-    assert get_whole('-0.0000000001234567000') == '-0.0000000001234567'
-
-def test_simplify():
-    assert simplify_value('0') == '0'
-    assert simplify_value('0.') == '0'
-    assert simplify_value(-25901050.0425) == '-25901050'
-    assert simplify_value(-0.0000000001234567) == '-0.0000000001234'
-    assert simplify_value('12.345000') == '12.34'
-    assert simplify_value(0.01234, 2) == '0.012'
-    assert simplify_value('012340000000') == '12340000000'
-
-def test_add_sign():
-    assert add_sign(0) == '0'
-    assert add_sign('0') == '0'
-    assert add_sign('0.') == '0.0'
-    assert add_sign(-0.) == '0.0'
-    assert add_sign('-0') == '0'
-    assert add_sign(1) == '+1'
-    assert add_sign(-100) == '-100'
-    assert add_sign(-0.000000001) == '-0.000000001'
-    assert add_sign(1.23e-10) == '+0.000000000123'
-
-def test_add_radix():
-    assert add_radix(None) == None
-    assert add_radix(0) == '0'
-    assert add_radix(0.) == '0.0'
-    assert add_radix(.1) == '0.1'
-    assert add_radix(1234) == '1’234'
-    assert add_radix(123456) == '123’456'
-    assert add_radix(1234567.89012) == '1’234’567.89012'
-
-def test_to_step():
-    assert to_step(None) == None
-    assert to_step(0) == 0
-    assert to_step(0.) == 0
-    assert to_step(0.1) == 0
-    assert to_step(1.2) == 1
-    assert to_step(1.2, 0.1) == 1.2
-    assert to_step(1.234, 0.1) == 1.2
-    assert to_step(1.234, 0.1, True) == 1.3
-    assert to_step(1.2, 0.1, True) == 1.2
-    assert to_step(1.2, 10) == 0
-    assert to_step(1.2, 10, True) == 10
-    assert to_step(123.456, 10) == 120
-    assert isinstance(to_step(12, 0.1), float)
-    assert isinstance(to_step(12.456, 1), int)