hydraflow 0.12.1__py3-none-any.whl → 0.12.2__py3-none-any.whl

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.dist-info → hydraflow-0.12.2.dist-info}/METADATA

@@ -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.dist-info → hydraflow-0.12.2.dist-info}/RECORD

@@ -16,9 +16,9 @@ hydraflow/executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 hydraflow/executor/conf.py,sha256=2dv6_PlsynRmia-fGZlmBEVt8GopT0f32N13qY7tYnM,402
 hydraflow/executor/io.py,sha256=yZMcBVmAbPZZ82cAXhgiJfj9p8WvHmzOCMBg_vtEVek,1509
 hydraflow/executor/job.py,sha256=IL7ek0Vwa3Bl_gANq0wCbldNCUclo8YBckeEeO6W6xg,4852
-hydraflow/executor/parser.py,sha256=YiA-Upn7H39BZYyvmCumtXXS27an6aDdHKkaF7Nl8Vk,13617
-hydraflow-0.12.1.dist-info/METADATA,sha256=DWSgcm2oCZt8udPqgoTpQJzyIepIrjfujSggYn3MZ_U,4549
-hydraflow-0.12.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.12.1.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
-hydraflow-0.12.1.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.12.1.dist-info/RECORD,,
+hydraflow/executor/parser.py,sha256=_Rfund3FDgrXitTt_znsTpgEtMDqZ_ICynaB_Zje14Q,14561
+hydraflow-0.12.2.dist-info/METADATA,sha256=8i5Ejzdakw6X9t6ddhuNGW0DaeQT9N3-xVCWrmX1QfQ,4549
+hydraflow-0.12.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hydraflow-0.12.2.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
+hydraflow-0.12.2.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.12.2.dist-info/RECORD,,