hydraflow 0.12.1__tar.gz → 0.12.2__tar.gz

{hydraflow-0.12.1 → hydraflow-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.12.1
+Version: 0.12.2
 Summary: Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments.
 Project-URL: Documentation, https://daizutabi.github.io/hydraflow/
 Project-URL: Source, https://github.com/daizutabi/hydraflow

{hydraflow-0.12.1 → hydraflow-0.12.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.12.1"
+version = "0.12.2"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }

{hydraflow-0.12.1 → hydraflow-0.12.2}/src/hydraflow/executor/parser.py

@@ -48,7 +48,7 @@ def to_number(x: str) -> int | float:
     return int(x)
 
 
-def count_decimal_places(x: str) -> int:
+def count_decimal_digits(x: str) -> int:
     """Count decimal places in a string.
 
     Examine a string representing a number and returns the count
@@ -62,13 +62,13 @@ def count_decimal_places(x: str) -> int:
         int: The number of decimal places.
 
     Examples:
-        >>> count_decimal_places("1")
+        >>> count_decimal_digits("1")
         0
-        >>> count_decimal_places("-1.2")
+        >>> count_decimal_digits("-1.2")
         1
-        >>> count_decimal_places("1.234")
+        >>> count_decimal_digits("1.234")
         3
-        >>> count_decimal_places("-1.234e-10")
+        >>> count_decimal_digits("-1.234e-10")
         3
 
     """
@@ -82,6 +82,50 @@ def count_decimal_places(x: str) -> int:
     return len(decimal_part)
 
 
+def count_integer_digits(num_str: str) -> int:
+    """Count the number of digits in the integer part of a number.
+
+    Consider only the integer part of a number, even if it is in
+    scientific notation.
+
+    Args:
+        num_str (str): The string representing a number.
+
+    Returns:
+        int: The number of digits in the integer part of a number.
+        (excluding the sign)
+
+    Examples:
+        >>> count_integer_digits("123")
+        3
+        >>> count_integer_digits("-123.45")
+        3
+        >>> count_integer_digits("+0.00123")
+        1
+        >>> count_integer_digits("-1.200")
+        1
+        >>> count_integer_digits("+1.20e3")
+        1
+        >>> count_integer_digits("-0.120e-3")
+        1
+        >>> count_integer_digits(".123")
+        0
+
+    """
+    if num_str.startswith(("+", "-")):
+        num_str = num_str[1:]
+
+    if "e" in num_str.lower():
+        num_str = num_str.lower().split("e")[0]
+
+    if "." in num_str:
+        int_part = num_str.split(".")[0]
+        if not int_part:
+            return 0
+        return len(int_part)
+    return len(num_str)
+
+
 def is_number(x: str) -> bool:
     """Check if a string represents a valid number.
 
@@ -158,26 +202,18 @@ def _arange(start: float, step: float, stop: float) -> list[float]:
     if step == 0:
         raise ValueError("Step cannot be zero")
 
-    epsilon = 1e-10
-
-    decimal_places = max(
-        count_decimal_places(str(start)),
-        count_decimal_places(str(step)),
-        count_decimal_places(str(stop)),
-    )
+    epsilon = min(abs(start), abs(stop)) * 1e-5
 
     result = []
     current = start
 
     if step > 0:
         while current <= stop + epsilon:
-            rounded = round(current, decimal_places)
-            result.append(rounded)
+            result.append(current)
             current += step
     else:
         while current >= stop - epsilon:
-            rounded = round(current, decimal_places)
-            result.append(rounded)
+            result.append(current)
             current += step
 
     return result
@@ -344,8 +380,9 @@ def collect_values(arg: str) -> list[str]:
     if all(isinstance(x, int) for x in rng):
         values = [str(x) for x in _arange(*rng)]
     else:
-        n = max(*(count_decimal_places(x) for x in arg.split(":")))
-        values = [str(round(x, n)) for x in _arange(*rng)]
+        n = max(*(count_integer_digits(x) for x in arg.split(":")))
+        m = max(*(count_decimal_digits(x) for x in arg.split(":")))
+        values = [f"{x:.{n + m}g}" for x in _arange(*rng)]
 
     return [add_exponent(x, exponent) for x in values]
 
@@ -415,8 +452,9 @@ def split(arg: str) -> list[str]:
 def expand_values(arg: str, suffix: str = "") -> Iterator[str]:
     """Expand a string argument into a list of values.
 
-    Take a string containing comma-separated values or ranges and return a list
-    of all individual values. Handle numeric ranges and special characters.
+    Take a string containing comma-separated values or ranges
+    and return a list of all individual values.
+    Handle numeric ranges and special characters.
 
     Args:
         arg (str): The argument to expand.
@@ -439,7 +477,8 @@ def split_arg(arg: str) -> tuple[str, str, str]:
         arg (str): The argument to split.
 
     Returns:
-        tuple[str, str, str]: A tuple containing the key, suffix, and value.
+        tuple[str, str, str]: A tuple containing the key,
+        suffix, and value.
 
     """
     if "=" not in arg:
@@ -458,8 +497,9 @@ def split_arg(arg: str) -> tuple[str, str, str]:
 def collect_arg(arg: str) -> str:
     """Collect a string of expanded key-value pairs.
 
-    Take a key-value pair argument and concatenates all expanded values with commas,
-    returning a single string suitable for command-line usage.
+    Take a key-value pair argument and concatenates all expanded
+    values with commas, returning a single string suitable for
+    command-line usage.
 
     Args:
         arg (str): The argument to collect.

{hydraflow-0.12.1 → hydraflow-0.12.2}/tests/executor/test_parser.py

@@ -1,3 +1,4 @@
+import numpy as np
 import pytest
 
 
@@ -12,10 +13,20 @@ def test_to_number(s, x):
     ("s", "x"),
     [("1", 0), ("1.2", 1), ("1.234", 3), ("123.", 0), ("", 0), ("1.234e-10", 3)],
 )
-def test_count_decimal_places(s, x):
-    from hydraflow.executor.parser import count_decimal_places
+def test_count_decimal_digits(s, x):
+    from hydraflow.executor.parser import count_decimal_digits
 
-    assert count_decimal_places(s) == x
+    assert count_decimal_digits(s) == x
+
+
+@pytest.mark.parametrize(
+    ("s", "x"),
+    [("1", 1), ("1.2", 1), ("1.234", 1), ("123.", 3), ("", 0), ("1.234e-10", 1)],
+)
+def test_count_integer_digits(s, x):
+    from hydraflow.executor.parser import count_integer_digits
+
+    assert count_integer_digits(s) == x
 
 
 @pytest.mark.parametrize(
@@ -55,6 +66,7 @@ def test_get_range_errors(arg, expected_exception, expected_message):
     [
         (1.0, 2.0, 5.0, [1.0, 3.0, 5.0]),
         (1.2, 0.1, 1.4, [1.2, 1.3, 1.4]),
+        (1.2e-12, 0.1e-12, 1.4e-12, [1.2e-12, 1.3e-12, 1.4e-12]),
         (1.4, -0.1, 1.2, [1.4, 1.3, 1.2]),
         (1.02e-3, 0.01e-3, 1.04e-3, [0.00102, 0.00103, 0.00104]),
     ],
@@ -62,7 +74,7 @@ def test_get_range_errors(arg, expected_exception, expected_message):
 def test_arange(start, step, stop, expected):
     from hydraflow.executor.parser import _arange
 
-    assert _arange(start, step, stop) == expected
+    np.testing.assert_allclose(_arange(start, step, stop), expected)
 
 
 def test_arange_error():
@@ -109,21 +121,27 @@ def test_split_suffix(s, x):
         ("1:M", ["1e6"]),
         ("0.234p", ["0.234p"]),
         ("1:3", ["1", "2", "3"]),
-        ("0:0.25:1", ["0", "0.25", "0.5", "0.75", "1.0"]),
+        ("0:0.25:1", ["0", "0.25", "0.5", "0.75", "1"]),
+        ("10:0.25:11", ["10", "10.25", "10.5", "10.75", "11"]),
         (":3", ["0", "1", "2", "3"]),
         ("5:7", ["5", "6", "7"]),
         ("-1:1", ["-1", "0", "1"]),
-        ("1:0.5:2", ["1", "1.5", "2.0"]),
-        ("1.:0.5:2", ["1.0", "1.5", "2.0"]),
-        ("2:0.5:3", ["2", "2.5", "3.0"]),
-        ("-1:0.5:1", ["-1", "-0.5", "0.0", "0.5", "1.0"]),
+        ("1:0.5:2", ["1", "1.5", "2"]),
+        ("1.:0.5:2", ["1", "1.5", "2"]),
+        ("2:0.5:3", ["2", "2.5", "3"]),
+        ("-1:0.5:1", ["-1", "-0.5", "0", "0.5", "1"]),
         ("4:-1:2", ["4", "3", "2"]),
-        ("4.5:-1.5:2", ["4.5", "3.0"]),
-        ("4.5:-1.5:1.5", ["4.5", "3.0", "1.5"]),
-        ("4.5:-1.5:-4.5", ["4.5", "3.0", "1.5", "0.0", "-1.5", "-3.0", "-4.5"]),
+        ("4.5:-1.5:2", ["4.5", "3"]),
+        ("4.5:-1.5:1.5", ["4.5", "3", "1.5"]),
+        ("4.5:-1.5:-4.5", ["4.5", "3", "1.5", "0", "-1.5", "-3", "-4.5"]),
         ("1:2:u", ["1e-6", "2e-6"]),
-        ("1:.25:2:n", ["1e-9", "1.25e-9", "1.5e-9", "1.75e-9", "2.0e-9"]),
+        ("1:.25:2:n", ["1e-9", "1.25e-9", "1.5e-9", "1.75e-9", "2e-9"]),
         ("1.2:0.1:1.4:k", ["1.2e3", "1.3e3", "1.4e3"]),
+        ("1.2e-3:0.1e-3:1.4e-3", ["0.0012", "0.0013", "0.0014"]),
+        ("1.2e-12:0.1e-12:1.4e-12", ["1.2e-12", "1.3e-12", "1.4e-12"]),
+        ("1.22e-6:0.01e-6:1.24e-6", ["1.22e-06", "1.23e-06", "1.24e-06"]),
+        ("1.2e3:0.1e3:1.4e3", ["1.2e+03", "1.3e+03", "1.4e+03"]),
+        ("1.2e6:0.1e6:1.4e6", ["1.2e+06", "1.3e+06", "1.4e+06"]),
         ("1:2:e2", ["1e2", "2e2"]),
         (":2:e2", ["0", "1e2", "2e2"]),
         ("-2:2:k", ["-2e3", "-1e3", "0", "1e3", "2e3"]),
@@ -141,7 +159,7 @@ def test_collect_value(s, x):
     [
         ("1,2,3", ["1", "2", "3"]),
         ("1:3,5:6", ["1", "2", "3", "5", "6"]),
-        ("0:0.25:1,2.0", ["0", "0.25", "0.5", "0.75", "1.0", "2.0"]),
+        ("0:0.25:1,2.0", ["0", "0.25", "0.5", "0.75", "1", "2.0"]),
         ("3", ["3"]),
         ("3:k", ["3e3"]),
         ("1:3:k,3:2:7:M", ["1e3", "2e3", "3e3", "3e6", "5e6", "7e6"]),
@@ -164,7 +182,7 @@ def test_expand_value(s, x):
     [
         ("1,2,3", ["1e3", "2e3", "3e3"]),
         ("1:3,5:6", ["1e3", "2e3", "3e3", "5e3", "6e3"]),
-        ("0:0.25:1,2.0", ["0e3", "0.25e3", "0.5e3", "0.75e3", "1.0e3", "2.0e3"]),
+        ("0:0.25:1,2.0", ["0e3", "0.25e3", "0.5e3", "0.75e3", "1e3", "2.0e3"]),
         ("3", ["3e3"]),
     ],
 )