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

hydraflow/core/main.py

@@ -16,6 +16,7 @@ used to wrap experiment entry points. This decorator handles:
 
 Example:
     ```python
+    import hydraflow
     from dataclasses import dataclass
     from mlflow.entities import Run
 
@@ -24,7 +25,7 @@ Example:
         learning_rate: float
         batch_size: int
 
-    @main(Config)
+    @hydraflow.main(Config)
     def train(run: Run, config: Config):
         # Your training code here
         pass

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,8 +82,52 @@ 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 is a number.
+    """Check if a string represents a valid number.
 
     Args:
         x (str): The string to check.
@@ -140,18 +184,46 @@ def _get_range(arg: str) -> tuple[float, float, float]:
 
 
 def _arange(start: float, step: float, stop: float) -> list[float]:
+    """Generate a range of floating point numbers.
+
+    This function generates a range of floating point numbers
+    with protection against rounding errors.
+
+    Args:
+        start (float): The starting value.
+        step (float): The step size.
+        stop (float): The end value (inclusive).
+
+    Returns:
+        list[float]: A list of floating point numbers from start to stop
+        (inclusive) with the given step.
+
+    """
+    if step == 0:
+        raise ValueError("Step cannot be zero")
+
+    epsilon = min(abs(start), abs(stop)) * 1e-5
+
     result = []
     current = start
 
-    while current <= stop if step > 0 else current >= stop:
-        result.append(current)
-        current += step
+    if step > 0:
+        while current <= stop + epsilon:
+            result.append(current)
+            current += step
+    else:
+        while current >= stop - epsilon:
+            result.append(current)
+            current += step
 
     return result
 
 
 def split_suffix(arg: str) -> tuple[str, str]:
-    """Split a string into prefix and suffix.
+    """Split a string into the prefix and suffix.
+
+    The suffix is the part of the string that starts with a colon (:).
+    The prefix is the part of the string that precedes the suffix.
 
     Args:
         arg (str): The string to split.
@@ -194,6 +266,16 @@ def add_exponent(value: str, exponent: str) -> str:
     Returns:
         str: The value with the exponent added.
 
+    Examples:
+        >>> add_exponent("1", "e3")
+        '1e3'
+        >>> add_exponent("1", "")
+        '1'
+        >>> add_exponent("0", "e-3")
+        '0'
+        >>> add_exponent("0.0", "e-3")
+        '0.0'
+
     """
     if value in ["0", "0.", "0.0"] or not exponent:
         return value
@@ -201,43 +283,6 @@ def add_exponent(value: str, exponent: str) -> str:
     return f"{value}{exponent}"
 
 
-def collect_values(arg: str) -> list[str]:
-    """Collect a list of values from a range argument.
-
-    Collect all individual values within a numeric range
-    represented by a string (e.g., `1:4`) and return them
-    as a list of strings.
-    Support both integer and floating-point ranges.
-
-    Args:
-        arg (str): The argument to collect.
-
-    Returns:
-        list[str]: A list of the collected values.
-
-    """
-    if "(" in arg:
-        return collect_parentheses(arg)
-
-    if ":" not in arg:
-        return [arg]
-
-    arg, exponent = split_suffix(arg)
-
-    if ":" not in arg:
-        return [f"{arg}{exponent}"]
-
-    rng = _get_range(arg)
-
-    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)]
-
-    return [add_exponent(x, exponent) for x in values]
-
-
 def split_parentheses(arg: str) -> Iterator[str]:
     """Split a string with parentheses into a list of strings.
 
@@ -290,8 +335,60 @@ def collect_parentheses(arg: str) -> list[str]:
     return ["".join(x[::-1]) for x in product(*it[::-1])]
 
 
+def collect_values(arg: str) -> list[str]:
+    """Collect a list of values from a range argument.
+
+    Collect all individual values within a numeric range
+    represented by a string (e.g., `1:4`) and return them
+    as a list of strings.
+    Support both integer and floating-point ranges.
+
+    Args:
+        arg (str): The argument to collect.
+
+    Returns:
+        list[str]: A list of the collected values.
+
+    Examples:
+        >>> collect_values("1:4")
+        ['1', '2', '3', '4']
+        >>> collect_values("1.2:0.1:1.4:k")
+        ['1.2e3', '1.3e3', '1.4e3']
+        >>> collect_values("0.1")
+        ['0.1']
+        >>> collect_values("4:M")
+        ['4e6']
+        >>> collect_values("(1:3,5:7)M")
+        ['1e6', '2e6', '3e6', '5e6', '6e6', '7e6']
+        >>> collect_values("(1,5)e-(1:3)")
+        ['1e-1', '5e-1', '1e-2', '5e-2', '1e-3', '5e-3']
+
+    """
+    if "(" in arg:
+        return collect_parentheses(arg)
+
+    if ":" not in arg:
+        return [arg]
+
+    arg, exponent = split_suffix(arg)
+
+    if ":" not in arg:
+        return [f"{arg}{exponent}"]
+
+    rng = _get_range(arg)
+
+    if all(isinstance(x, int) for x in rng):
+        values = [str(x) for x in _arange(*rng)]
+    else:
+        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]
+
+
 def split(arg: str) -> list[str]:
-    r"""Split a string by top-level commas.
+    """Split a string by top-level commas.
 
     Splits a string by commas while respecting nested structures.
     Commas inside brackets and quotes are ignored, only splitting
@@ -355,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.
@@ -379,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:
@@ -398,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.0.dist-info → hydraflow-0.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.12.0
+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.0.dist-info → hydraflow-0.12.2.dist-info}/RECORD

@@ -5,7 +5,7 @@ hydraflow/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydraflow/core/config.py,sha256=SJzjgsO_kzB78_whJ3lmy7GlZvTvwZONH1BJBn8zCuI,3817
 hydraflow/core/context.py,sha256=QPyPg1xrTlmhviKNn-0nDY9bXcVky1zInqRqPN-VNhc,4741
 hydraflow/core/io.py,sha256=C207DsGAU4CLvlHySyyIl0_aKZ83ysJ-W_wNM2n4RPI,6754
-hydraflow/core/main.py,sha256=500fh5cnlKj9CHFgD8-f16wZcOuPF-5zSvFeVMqI8MQ,5100
+hydraflow/core/main.py,sha256=66-X2-IJVEcJ4XrEC2BIKNzdd_M1RfVIAHME8k70Jo0,5131
 hydraflow/core/mlflow.py,sha256=M3MhiChnMzKnKRmjBl4h_SRGkAZKL7GAmFr3DdzwRuQ,5666
 hydraflow/core/param.py,sha256=LHU9j9_7oA99igasoOyKofKClVr9FmGA3UABJ-KmyS0,4538
 hydraflow/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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=llbv6BLPyO5UlExeRibkYI0vaxZbqS4q3uPZ1NnkIDM,11891
-hydraflow-0.12.0.dist-info/METADATA,sha256=-CLwckmFxrCb9GEyhoz1ZaSaChVQU5_pQ0zkCCqfUMw,4549
-hydraflow-0.12.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.12.0.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
-hydraflow-0.12.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.12.0.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,,