iker-python-common 1.0.13__tar.gz → 1.0.15__tar.gz

{iker_python_common-1.0.13 → iker_python_common-1.0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iker-python-common
-Version: 1.0.13
+Version: 1.0.15
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{iker_python_common-1.0.13 → iker_python_common-1.0.15}/src/iker/common/utils/numutils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import math
 from collections.abc import Callable, Sequence
 from decimal import Decimal

{iker_python_common-1.0.13 → iker_python_common-1.0.15}/src/iker/common/utils/sequtils.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import functools
 import itertools
 from collections.abc import Callable, Generator, Iterable, Iterator, Sequence, Sized
@@ -371,10 +369,10 @@ class Seq(Generic[Tco], Sequence[Tco], Sized):
     def intersect(self, other: Self) -> Self:
         return Seq(list(set(self.data).intersection(set(other.data))))
 
-    def zip(self, other: Seq[U]) -> Seq[tuple[Tco, U]]:
+    def zip(self, other: "Seq[U]") -> "Seq[tuple[Tco, U]]":
         return Seq(zip(self.data, other.data))
 
-    def zip_fill(self, other: Seq[U], fill: Tco | U | None = None) -> Seq[tuple[Tco, U]]:
+    def zip_fill(self, other: "Seq[U]", fill: Tco | U | None = None) -> "Seq[tuple[Tco, U]]":
         return Seq(itertools.zip_longest(self.data, other.data, fillvalue=fill))
 
 

{iker_python_common-1.0.13 → iker_python_common-1.0.15}/src/iker/common/utils/span.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import enum
 import itertools
 from collections.abc import Sequence

{iker_python_common-1.0.13 → iker_python_common-1.0.15}/src/iker/common/utils/strutils.py

@@ -1,8 +1,8 @@
 import datetime
+from collections.abc import Callable
 from typing import Any
 
 from iker.common.utils.dtutils import dt_parse_iso
-from iker.common.utils.sequtils import head, last
 
 __all__ = [
     "is_none",
@@ -18,6 +18,7 @@ __all__ = [
     "str_conv",
     "repr_data",
     "parse_params_string",
+    "make_params_string",
     "strip_margin",
 ]
 
@@ -125,22 +126,60 @@ def repr_data(o) -> str:
     return str(o)
 
 
-def parse_params_string(s: str, delimiter: str = ",", kv_delimiter: str = "=") -> dict[str, str]:
+def parse_params_string(
+    s: str,
+    *,
+    delim: str = ",",
+    kv_delim: str = "=",
+    neg_prefix: str = "-",
+    str_parser: Callable[[str], Any] = str,
+    true_value: Any = True,
+    false_value: Any = False,
+) -> dict[str, Any]:
     if is_blank(s):
         return {}
 
     result = {}
-    for param in s.split(delimiter):
-        segments = param.split(kv_delimiter, 1)
-        if len(segments) == 1:
-            result[head(segments)] = str(True)
-        elif len(segments) == 2:
-            result[head(segments)] = last(segments)
-        else:
-            raise ValueError("malformed param <%s>" % param)
+    for param in s.split(delim):
+        match param.split(kv_delim, 1):
+            case [key]:
+                if len(key) == 0 or key == neg_prefix:
+                    continue
+                if key.startswith(neg_prefix):
+                    result[key[len(neg_prefix):]] = false_value
+                else:
+                    result[key] = true_value
+            case [key, value]:
+                if len(key) == 0 or key == neg_prefix:
+                    continue
+                result[key] = str_parser(value)
+            case _:
+                raise ValueError("malformed param <%s>" % param)
     return result
 
 
+def make_params_string(
+    params: dict[str, Any],
+    *,
+    delim: str = ",",
+    kv_delim: str = "=",
+    neg_prefix: str = "-",
+    str_maker: Callable[[Any], str] = str,
+) -> str:
+    if len(params or {}) == 0:
+        return ""
+
+    kv_strs = []
+    for key, value in params.items():
+        if len(key) == 0 or key == neg_prefix:
+            continue
+        if isinstance(value, bool):
+            kv_strs.append(key if value is True else neg_prefix + key)
+        else:
+            kv_strs.append(kv_delim.join((key, str_maker(value))))
+    return delim.join(kv_strs)
+
+
 def strip_margin(text: str, margin_char: str = "|") -> str:
     stripped_text = ""
     last_stripped_line = ""

{iker_python_common-1.0.13 → iker_python_common-1.0.15}/src/iker_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: iker-python-common
-Version: 1.0.13
+Version: 1.0.15
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12

{iker_python_common-1.0.13 → iker_python_common-1.0.15}/test/iker_tests/common/utils/strutils_test.py

@@ -4,8 +4,8 @@ import ddt
 
 from iker.common.utils.dtutils import dt_utc
 from iker.common.utils.strutils import is_blank, is_empty, is_none
+from iker.common.utils.strutils import make_params_string, parse_params_string
 from iker.common.utils.strutils import parse_bool, parse_float_or, parse_int_or
-from iker.common.utils.strutils import parse_params_string
 from iker.common.utils.strutils import str_conv
 from iker.common.utils.strutils import strip_margin
 from iker.common.utils.strutils import trim_to_empty, trim_to_none
@@ -204,14 +204,20 @@ class StrUtilsTest(unittest.TestCase):
     @ddt.data(
         ("", {}),
         (" \t", {}),
+        (",-,", {}),
         ("foo=bar", {"foo": "bar"}),
         (
             "dummy_key_1=dummy_value_1,dummy_key_2=dummy_value_2",
             {"dummy_key_1": "dummy_value_1", "dummy_key_2": "dummy_value_2"},
         ),
         (
-            "dummy_key_1=dummy_value_1,dummy_key_2=dummy_value_2,dummy_key_3",
-            {"dummy_key_1": "dummy_value_1", "dummy_key_2": "dummy_value_2", "dummy_key_3": "True"},
+            "dummy_key_1=dummy_value_1,dummy_key_2=dummy_value_2,dummy_key_3,-dummy_key_4",
+            {
+                "dummy_key_1": "dummy_value_1",
+                "dummy_key_2": "dummy_value_2",
+                "dummy_key_3": True,
+                "dummy_key_4": False,
+            },
         ),
         (
             "dummy_key_1=dummy_value_1,dummy_key_2=dummy_value_2,dummy_key_3=do not use spaces in strings CLI",
@@ -230,8 +236,42 @@ class StrUtilsTest(unittest.TestCase):
         ),
     )
     @ddt.unpack
-    def test_parse_params_string(self, s, params_dict):
-        self.assertDictEqual(params_dict, parse_params_string(s))
+    def test_parse_params_string(self, data, expect):
+        self.assertDictEqual(expect, parse_params_string(data))
+        self.assertDictEqual(expect, parse_params_string(make_params_string(parse_params_string(data))))
+
+    @ddt.data(
+        (None, ""),
+        ({}, ""),
+        ({"foo": "bar"}, "foo=bar"),
+        (
+            {"dummy_key_1": "dummy_value_1", "dummy_key_2": "dummy_value_2"},
+            "dummy_key_1=dummy_value_1,dummy_key_2=dummy_value_2",
+        ),
+        (
+            {"dummy_key_1": "dummy_value_1", "dummy_key_2": "dummy_value_2", "dummy_key_3": True, "dummy_key_4": False},
+            "dummy_key_1=dummy_value_1,dummy_key_2=dummy_value_2,dummy_key_3,-dummy_key_4",
+        ),
+        (
+            {
+                "dummy_key_1": "dummy_value_1",
+                "dummy_key_2": "dummy_value_2",
+                "dummy_key_3": "do not use spaces in strings CLI",
+            },
+            "dummy_key_1=dummy_value_1,dummy_key_2=dummy_value_2,dummy_key_3=do not use spaces in strings CLI",
+        ),
+        (
+            {
+                "dummy_key_1": "dummy_value_1_key=dummy_value_1_value",
+                "dummy_key_2": "dummy_value_2_key=dummy_value_2_value",
+            },
+            "dummy_key_1=dummy_value_1_key=dummy_value_1_value,dummy_key_2=dummy_value_2_key=dummy_value_2_value",
+        ),
+    )
+    @ddt.unpack
+    def test_make_params_string(self, data, expect):
+        self.assertEqual(expect, make_params_string(data))
+        self.assertEqual(expect, make_params_string(parse_params_string(make_params_string(data))))
 
     @ddt.data(
         (