hpcflow-new2 0.2.0a188__tar.gz → 0.2.0a190__tar.gz

{hpcflow_new2-0.2.0a188 → hpcflow_new2-0.2.0a190}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hpcflow-new2
-Version: 0.2.0a188
+Version: 0.2.0a190
 Summary: Computational workflow management
 License: MIT
 Author: aplowman
@@ -28,6 +28,7 @@ Requires-Dist: reretry (>=0.11.8,<0.12.0)
 Requires-Dist: rich (>=13.4.2,<14.0.0)
 Requires-Dist: ruamel-yaml (>=0.18.6,<0.19.0)
 Requires-Dist: termcolor (>=1.1.0,<2.0.0)
+Requires-Dist: typing-extensions (>=4.12.2,<5.0.0)
 Requires-Dist: valida (>=0.7.5,<0.8.0)
 Requires-Dist: watchdog (>=2.1.9,<3.0.0)
 Requires-Dist: zarr (>=2.17.2,<3.0.0)

{hpcflow_new2-0.2.0a188 → hpcflow_new2-0.2.0a190}/hpcflow/__pyinstaller/hook-hpcflow.py

@@ -4,9 +4,8 @@ from hpcflow.sdk import sdk_classes
 
 
 # most of the modules in `sdk_classes` are imported on-demand via the app object:
-hiddenimports = list(sdk_classes.values())
-
-hiddenimports += [
+hiddenimports = [
+    *sdk_classes.values(),
     "hpcflow.sdk.data",
     "hpcflow.data.demo_data_manifest",
     "hpcflow.data.scripts",
@@ -19,13 +18,16 @@ hiddenimports += [
     "fsspec.implementations.github",  # for GitHub fsspec file system
 ]
 
-py_include_kwargs = dict(include_py_files=True, excludes=("**/__pycache__",))
 datas = (
     collect_data_files("hpcflow.sdk.data")
     + collect_data_files("hpcflow.data.demo_data_manifest")
-    + collect_data_files("hpcflow.data.scripts", **py_include_kwargs)
+    + collect_data_files(
+        "hpcflow.data.scripts", include_py_files=True, excludes=("**/__pycache__",)
+    )
     + collect_data_files("hpcflow.data.template_components")
     + collect_data_files("hpcflow.data.workflows")
-    + collect_data_files("hpcflow.tests", **py_include_kwargs)
+    + collect_data_files(
+        "hpcflow.tests", include_py_files=True, excludes=("**/__pycache__",)
+    )
     + collect_data_files("hpcflow.tests.data")
 )

hpcflow_new2-0.2.0a190/hpcflow/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.0a190"

{hpcflow_new2-0.2.0a188 → hpcflow_new2-0.2.0a190}/hpcflow/app.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from hpcflow import __version__, _app_name
 from hpcflow.sdk import app as sdk_app
 from hpcflow.sdk.config import ConfigOptions

{hpcflow_new2-0.2.0a188 → hpcflow_new2-0.2.0a190}/hpcflow/data/scripts/main_script_test_hdf5_in_obj.py

@@ -1,4 +1,4 @@
-import h5py
+import h5py  # type: ignore[import-untyped]
 
 
 def main_script_test_hdf5_in_obj(_input_files):

{hpcflow_new2-0.2.0a188 → hpcflow_new2-0.2.0a190}/hpcflow/data/scripts/main_script_test_hdf5_out_obj.py

@@ -1,4 +1,4 @@
-import h5py
+import h5py  # type: ignore[import-untyped]
 
 
 def main_script_test_hdf5_out_obj(p1, _output_files):

{hpcflow_new2-0.2.0a188 → hpcflow_new2-0.2.0a190}/hpcflow/sdk/__init__.py

@@ -1,15 +1,18 @@
 """Sub-package to define an extensible hpcflow application."""
 
+from __future__ import annotations
+from collections.abc import Mapping
 import logging
 import os
 import sys
+from typing import Final
 
 #: Classes used in the construction of a workflow.
 #: :meta hide-value:
-sdk_classes = {
+sdk_classes: Final[Mapping[str, str]] = {
     "Workflow": "hpcflow.sdk.core.workflow",
     "Task": "hpcflow.sdk.core.task",
-    "ActionScopeType": "hpcflow.sdk.core.actions",
+    "ActionScopeType": "hpcflow.sdk.core.enums",
     "ActionScope": "hpcflow.sdk.core.actions",
     "ActionRule": "hpcflow.sdk.core.actions",
     "Rule": "hpcflow.sdk.core.rule",
@@ -68,9 +71,9 @@ sdk_classes = {
     "ValuePerturbation": "hpcflow.sdk.core.parameters",
     "InputValue": "hpcflow.sdk.core.parameters",
     "ResourceSpec": "hpcflow.sdk.core.parameters",
-    "TaskSourceType": "hpcflow.sdk.core.parameters",
-    "InputSourceType": "hpcflow.sdk.core.parameters",
-    "ParameterPropagationMode": "hpcflow.sdk.core.parameters",
+    "TaskSourceType": "hpcflow.sdk.core.enums",
+    "InputSourceType": "hpcflow.sdk.core.enums",
+    "ParameterPropagationMode": "hpcflow.sdk.core.enums",
     "InputSource": "hpcflow.sdk.core.parameters",
     "TaskObjective": "hpcflow.sdk.core.task_schema",
     "TaskSchema": "hpcflow.sdk.core.task_schema",
@@ -87,6 +90,7 @@ sdk_classes = {
     "WorkflowBlueprint": "hpcflow.sdk.core.workflow",
     "Jobscript": "hpcflow.sdk.submission.jobscript",
     "Submission": "hpcflow.sdk.submission.submission",
+    "QueuedScheduler": "hpcflow.sdk.submission.schedulers",
     "DirectWindows": "hpcflow.sdk.submission.schedulers.direct",
     "DirectPosix": "hpcflow.sdk.submission.schedulers.direct",
     "SlurmPosix": "hpcflow.sdk.submission.schedulers.slurm",
@@ -98,7 +102,7 @@ sdk_classes = {
 # these are defined as `BaseApp` methods with an underscore prefix:
 #: Functions exported by the application.
 #: :meta hide-value:
-sdk_funcs = (
+sdk_funcs: Final[tuple[str, ...]] = (
     "make_workflow",
     "make_demo_workflow",
     "make_and_submit_workflow",
@@ -114,24 +118,26 @@ sdk_funcs = (
     "cancel",
 )
 
-_SDK_CONSOLE_LOG_LEVEL = os.environ.get("HPCFLOW_SDK_CONSOLE_LOG_LEVEL", "ERROR")
 
-
-def get_SDK_logger(name=None):
+def get_SDK_logger(name: str | None = None) -> logging.Logger:
     """Get a logger with prefix of "hpcflow_sdk" instead of "hpcflow.sdk" to ensure the
     handlers of the SDK logger and app logger are distinct."""
     name = ".".join(["hpcflow_sdk"] + (name or __name__).split(".")[2:])
     return logging.getLogger(name)
 
 
-_SDK_logger = get_SDK_logger()
-_SDK_logger.setLevel("DEBUG")
+def _init_logger() -> None:
+    level = os.environ.get("HPCFLOW_SDK_CONSOLE_LOG_LEVEL", "ERROR")
+    SDK_logger = get_SDK_logger()
+    SDK_logger.setLevel("DEBUG")
+
+    sh = logging.StreamHandler()
+    sh.setFormatter(logging.Formatter("%(levelname)s %(name)s: %(message)s"))
+    sh.setLevel(level)
+    SDK_logger.addHandler(sh)
 
-_sh = logging.StreamHandler()
-_sh.setFormatter(logging.Formatter("%(levelname)s %(name)s: %(message)s"))
-_sh.setLevel(_SDK_CONSOLE_LOG_LEVEL)
-_SDK_logger.addHandler(_sh)
 
+_init_logger()
 if getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS"):
     import multiprocessing