omniopt2 7100__tar.gz → 7101__tar.gz

{omniopt2-7100 → omniopt2-7101}/.omniopt.py

@@ -6342,45 +6342,60 @@ def get_alt_path_for_orchestrator(stdout_path: str) -> Optional[str]:
     return alt_path
 
 @beartype
-def check_orchestrator(stdout_path: str, trial_index: int) -> Optional[list]:
-    behavs: list = []
+def check_orchestrator(stdout_path: str, trial_index: int) -> Optional[List[str]]:
+    if not orchestrator or "errors" not in orchestrator:
+        return []
 
-    if orchestrator and "errors" in orchestrator:
-        try:
-            stdout = Path(stdout_path).read_text("UTF-8")
-        except FileNotFoundError:
-            alt_path = get_alt_path_for_orchestrator(stdout_path)
+    stdout = _check_orchestrator_read_stdout_with_fallback(stdout_path, trial_index)
+    if stdout is None:
+        return None
 
-            if alt_path and alt_path is not None and Path(alt_path).exists():
-                stdout_path = alt_path
-                try:
-                    stdout = Path(stdout_path).read_text("UTF-8")
-                except FileNotFoundError:
-                    stdout = None
-            else:
-                stdout = None
+    return _check_orchestrator_find_behaviors(stdout, orchestrator["errors"])
 
-            if stdout is None:
-                orchestrate_todo_copy = ORCHESTRATE_TODO
-                if stdout_path not in orchestrate_todo_copy.keys():
-                    ORCHESTRATE_TODO[stdout_path] = trial_index
-                    print_red(f"File not found: {stdout_path}, will try again later")
-                else:
-                    print_red(f"File not found: {stdout_path}, not trying again")
+
+@beartype
+def _check_orchestrator_read_stdout_with_fallback(stdout_path: str, trial_index: int) -> Optional[str]:
+    try:
+        return Path(stdout_path).read_text("UTF-8")
+    except FileNotFoundError:
+        alt_path = get_alt_path_for_orchestrator(stdout_path)
+
+        if alt_path and Path(alt_path).exists():
+            try:
+                return Path(alt_path).read_text("UTF-8")
+            except FileNotFoundError:
                 return None
 
-        for oc in orchestrator["errors"]:
-            name = oc["name"]
-            match_strings = oc["match_strings"]
-            behavior = oc["behavior"]
+        _check_orchestrator_register_missing_file(stdout_path, trial_index)
+        return None
+
+
+@beartype
+def _check_orchestrator_register_missing_file(stdout_path: str, trial_index: int) -> None:
+    if stdout_path not in ORCHESTRATE_TODO:
+        ORCHESTRATE_TODO[stdout_path] = trial_index
+        print_red(f"File not found: {stdout_path}, will try again later")
+    else:
+        print_red(f"File not found: {stdout_path}, not trying again")
+
+
+@beartype
+def _check_orchestrator_find_behaviors(stdout: str, errors: List[Dict[str, Any]]) -> List[str]:
+    behaviors: List[str] = []
+    stdout_lower = stdout.lower()
+
+    for error in errors:
+        name = error.get("name", "")
+        match_strings = error.get("match_strings", [])
+        behavior = error.get("behavior", "")
 
-            for match_string in match_strings:
-                if match_string.lower() in stdout.lower():
-                    if behavior not in behavs:
-                        print_debug(f"Appending behavior {behavior}, orchestrator-error-name: {name}")
-                        behavs.append(behavior)
+        for match_string in match_strings:
+            if match_string.lower() in stdout_lower:
+                if behavior not in behaviors:
+                    print_debug(f"Appending behavior {behavior}, orchestrator-error-name: {name}")
+                    behaviors.append(behavior)
 
-    return behavs
+    return behaviors
 
 @beartype
 def orchestrate_job(job: Job, trial_index: int) -> None:

{omniopt2-7100 → omniopt2-7101}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7100
+Version: 7101
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-7100 → omniopt2-7101}/omniopt2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omniopt2
-Version: 7100
+Version: 7101
 Summary: Automatic highly parallelized hyperparameter optimizer based on Ax/Botorch
 Home-page: https://scads.ai/transfer-2/verfuegbare-software-dienste-en/omniopt/
 Author: Norman Koch

{omniopt2-7100 → omniopt2-7101}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   {email = "norman.koch@tu-dresden.de"},
   {name = "Norman Koch"}
 ]
-version = "7100"
+version = "7101"
 
 readme = "README.md"
 dynamic = ["dependencies"]