hpcflow-new2 0.2.0a190__py3-none-any.whl → 0.2.0a199__py3-none-any.whl

hpcflow/sdk/data/workflow_spec_schema.yaml

@@ -6,10 +6,12 @@ rules:
         - name
         - source_file
         - resources
+        - config
         - environments
         - env_presets
         - template_components
         - tasks
+        - meta_tasks
         - loops
         - store_kwargs
         - merge_resources

hpcflow/sdk/demo/cli.py

@@ -1,6 +1,7 @@
 """
 CLI components for demonstration code.
 """
+
 from __future__ import annotations
 from pathlib import Path
 from random import randint
@@ -25,12 +26,14 @@ from hpcflow.sdk.cli_common import (
     cancel_opt,
     submit_status_opt,
     make_status_opt,
+    add_sub_opt,
 )
 
 if TYPE_CHECKING:
     from collections.abc import Iterable
     from typing import Literal
     from ..app import BaseApp
+    from ..core.workflow import Workflow
 
 
 def get_demo_software_CLI(app: BaseApp):
@@ -116,6 +119,7 @@ def get_demo_workflow_CLI(app: BaseApp):
     @ts_name_fmt_option
     @variables_option
     @make_status_opt
+    @add_sub_opt
     def make_demo_workflow(
         workflow_name: str,
         format: Literal["json", "yaml"] | None,
@@ -127,6 +131,7 @@ def get_demo_workflow_CLI(app: BaseApp):
         ts_name_fmt: str | None = None,
         variables: Iterable[tuple[str, str]] = (),
         status: bool = True,
+        add_submission: bool = False,
     ):
         wk = app.make_demo_workflow(
             workflow_name=workflow_name,
@@ -139,7 +144,9 @@ def get_demo_workflow_CLI(app: BaseApp):
             ts_name_fmt=ts_name_fmt,
             variables=dict(variables),
             status=status,
+            add_submission=add_submission,
         )
+        assert isinstance(wk, Workflow)
         click.echo(wk.path)
 
     @demo_workflow.command("go")

hpcflow/sdk/helper/cli.py

@@ -1,6 +1,7 @@
 """
 Common Click command line options related to the helper.
 """
+
 from __future__ import annotations
 from typing import TYPE_CHECKING
 

hpcflow/sdk/log.py

@@ -58,6 +58,17 @@ class TimeIt:
     #: Preceding trace indices.
     trace_idx_prev: ClassVar[list[int]] = []
 
+    def __enter__(self):
+        self.__class__.active = True
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        try:
+            self.__class__.summarise_string()
+        finally:
+            self.__class__.reset()
+            self.__class__.active = False
+
     @classmethod
     def decorator(cls, func: Callable[P, T]) -> Callable[P, T]:
         """
@@ -167,6 +178,14 @@ class TimeIt:
         else:
             print(out_str)
 
+    @classmethod
+    def reset(cls):
+        cls.timers = defaultdict(list)
+        cls.trace = []
+        cls.trace_idx = []
+        cls.trace_prev = []
+        cls.trace_idx_prev = []
+
 
 class AppLog:
     """
@@ -176,11 +195,11 @@ class AppLog:
     #: Default logging level for the console.
     DEFAULT_LOG_CONSOLE_LEVEL: ClassVar = "WARNING"
     #: Default logging level for log files.
-    DEFAULT_LOG_FILE_LEVEL: ClassVar = "INFO"
+    DEFAULT_LOG_FILE_LEVEL: ClassVar = "WARNING"
 
     def __init__(self, app: BaseApp, log_console_level: str | None = None) -> None:
         #: The application context.
-        self.app = app
+        self._app = app
         #: The base logger for the application.
         self.logger = logging.getLogger(app.package_name)
         self.logger.setLevel(logging.DEBUG)
@@ -188,6 +207,7 @@ class AppLog:
         self.console_handler = self.__add_console_logger(
             level=log_console_level or AppLog.DEFAULT_LOG_CONSOLE_LEVEL
         )
+        self.file_handler: logging.FileHandler | None = None
 
     def __add_console_logger(self, level: str, fmt: str | None = None) -> logging.Handler:
         fmt = fmt or "%(levelname)s %(name)s: %(message)s"
@@ -197,23 +217,29 @@ class AppLog:
         self.logger.addHandler(handler)
         return handler
 
-    def update_console_level(self, new_level: str) -> None:
+    def update_console_level(self, new_level: str | None = None) -> None:
         """
         Set the logging level for console messages.
         """
-        if new_level:
-            self.console_handler.setLevel(new_level.upper())
+        new_level = new_level or AppLog.DEFAULT_LOG_CONSOLE_LEVEL
+        self.console_handler.setLevel(new_level.upper())
+
+    def update_file_level(self, new_level: str | None = None) -> None:
+        if self.file_handler:
+            new_level = new_level or AppLog.DEFAULT_LOG_FILE_LEVEL
+            self.file_handler.setLevel(new_level.upper())
 
     def add_file_logger(
         self,
-        path: Path,
+        path: str | Path,
         level: str | None = None,
         fmt: str | None = None,
         max_bytes: int | None = None,
-    ) -> logging.Handler:
+    ) -> None:
         """
         Add a log file.
         """
+        path = Path(path)
         fmt = fmt or "%(asctime)s %(levelname)s %(name)s: %(message)s"
         level = level or AppLog.DEFAULT_LOG_FILE_LEVEL
         max_bytes = max_bytes or int(10e6)
@@ -226,12 +252,13 @@ class AppLog:
         handler.setFormatter(logging.Formatter(fmt))
         handler.setLevel(level.upper())
         self.logger.addHandler(handler)
-        return handler
+        self.file_handler = handler
 
-    def remove_file_handlers(self) -> None:
-        """Remove all file handlers."""
-        # TODO: store a `file_handlers` attribute as well as `console_handlers`
-        for hdlr in self.logger.handlers:
-            if isinstance(hdlr, logging.FileHandler):
-                self.logger.debug(f"Removing file handler from the AppLog: {hdlr!r}.")
-                self.logger.removeHandler(hdlr)
+    def remove_file_handler(self) -> None:
+        """Remove the file handler."""
+        if self.file_handler:
+            self.logger.debug(
+                f"Removing file handler from the AppLog: {self.file_handler!r}."
+            )
+            self.logger.removeHandler(self.file_handler)
+            self.file_handler = None