hydraflow 0.11.1__py3-none-any.whl → 0.12.1__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/conf.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass, field
 class Step:
     batch: str = ""
     args: str = ""
-    configs: str = ""
+    with_: str = ""
 
 
 @dataclass
@@ -15,7 +15,7 @@ class Job:
     name: str = ""
     run: str = ""
     call: str = ""
-    configs: str = ""
+    with_: str = ""
     steps: list[Step] = field(default_factory=list)
 
 

hydraflow/executor/io.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from omegaconf import OmegaConf
+from omegaconf import DictConfig, ListConfig, OmegaConf
 
 from .conf import HydraflowConf
 
@@ -35,7 +35,26 @@ def load_config() -> HydraflowConf:
 
     cfg = OmegaConf.load(path)
 
-    return OmegaConf.merge(schema, cfg)  # type: ignore
+    if not isinstance(cfg, DictConfig):
+        return schema
+
+    rename_with(cfg)
+
+    return OmegaConf.merge(schema, cfg)  # type: ignore[return-value]
+
+
+def rename_with(cfg: DictConfig) -> None:
+    """Rename the `with` field to `with_`."""
+    if "with" in cfg:
+        cfg["with_"] = cfg.pop("with")
+
+    for key in list(cfg.keys()):
+        if isinstance(cfg[key], DictConfig):
+            rename_with(cfg[key])
+        elif isinstance(cfg[key], ListConfig):
+            for item in cfg[key]:
+                if isinstance(item, DictConfig):
+                    rename_with(item)
 
 
 def get_job(name: str) -> Job:

hydraflow/executor/job.py

@@ -69,10 +69,10 @@ def iter_batches(job: Job) -> Iterator[list[str]]:
 
     """
     job_name = f"hydra.job.name={job.name}"
-    job_configs = shlex.split(job.configs)
+    job_configs = shlex.split(job.with_)
 
     for step in job.steps:
-        configs = shlex.split(step.configs) or job_configs
+        configs = shlex.split(step.with_) or job_configs
 
         for args in iter_args(step.batch, step.args):
             sweep_dir = f"hydra.sweep.dir=multirun/{ulid.ULID()}"

hydraflow/executor/parser.py

@@ -83,7 +83,7 @@ def count_decimal_places(x: str) -> int:
 
 
 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 +140,54 @@ 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 = 1e-10
+
+    decimal_places = max(
+        count_decimal_places(str(start)),
+        count_decimal_places(str(step)),
+        count_decimal_places(str(stop)),
+    )
+
     result = []
     current = start
 
-    while current <= stop if step > 0 else current >= stop:
-        result.append(current)
-        current += step
+    if step > 0:
+        while current <= stop + epsilon:
+            rounded = round(current, decimal_places)
+            result.append(rounded)
+            current += step
+    else:
+        while current >= stop - epsilon:
+            rounded = round(current, decimal_places)
+            result.append(rounded)
+            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 +230,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 +247,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 +299,59 @@ 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_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(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
@@ -389,7 +449,7 @@ def split_arg(arg: str) -> tuple[str, str, str]:
     key, value = arg.split("=")
 
     if "/" in key:
-        key, suffix = key.split("/", 1)
+        key, suffix = key.split("/")
         return key, suffix, value
 
     return key, "", value

{hydraflow-0.11.1.dist-info → hydraflow-0.12.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.11.1
+Version: 0.12.1
 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.11.1.dist-info → hydraflow-0.12.1.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
@@ -13,12 +13,12 @@ hydraflow/entities/run_collection.py,sha256=E8IRBgxCnJE_IPCaSmS2mc9GtDXXLBfc7GHv
 hydraflow/entities/run_data.py,sha256=Y2_Lc-BdQ7nXhcEIjdHGHIkLrXsmAktOftESEwYOY8o,1602
 hydraflow/entities/run_info.py,sha256=FRC6ICOlzB2u_xi_33Qs-YZLt677UotuNbYqI7XSmHY,1017
 hydraflow/executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydraflow/executor/conf.py,sha256=SJNiQ87MXMlpDfdm0POcv55MY3GS5FUh5wT7u3XU3oU,406
-hydraflow/executor/io.py,sha256=xV3m-nV9eKbu9Fb7u04J2bfmR_Ky3jTEJjq4QC2m6V4,954
-hydraflow/executor/job.py,sha256=yiVbAYgsZZtSTRER-H5pUopULeygzPNzKlSkl27yFI4,4856
-hydraflow/executor/parser.py,sha256=6oqMlAZWykukZWLpRuFUaXXqROxIyqSEacDtNOxBCjw,11894
-hydraflow-0.11.1.dist-info/METADATA,sha256=iPCvp7q_NK3wwRSfvE3HzxBUfJ5kQW9r9kAd3hdazGc,4549
-hydraflow-0.11.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.11.1.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
-hydraflow-0.11.1.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.11.1.dist-info/RECORD,,
+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,,