Lint

src/bluish/actions/base.py

@@ -2,8 +2,8 @@
 
 import bluish.nodes.step
 import bluish.process
-from bluish.nodes import Definition, log_dict
 from bluish.logging import debug
+from bluish.nodes import Definition, log_dict
 from bluish.schemas import Validator
 
 
@@ -19,23 +19,19 @@ class Action:
     INPUTS_SCHEMA: Validator | None = None
     SENSITIVE_INPUTS: Sequence[str] = tuple()
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         raise NotImplementedError()
 
-    def execute(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def execute(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         if self.SCHEMA:
             self.SCHEMA.validate(step.attrs.as_dict())
-        if self.INPUTS_SCHEMA and step.attrs._with:
-            self.INPUTS_SCHEMA.validate(step.attrs._with)
+        if self.INPUTS_SCHEMA and step.inputs:
+            self.INPUTS_SCHEMA.validate(step.inputs)
 
         step.sensitive_inputs.update(self.SENSITIVE_INPUTS)
 
         log_dict(
-            step.attrs._with,
+            step.inputs,
             header="with",
             ctx=step,
             sensitive_keys=self.SENSITIVE_INPUTS,

src/bluish/actions/core.py

@@ -18,9 +18,7 @@ class RunCommand(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         env = ChainMap(step.env, step.parent.env, step.parent.parent.env)  # type: ignore
 
         bluish.nodes.log_dict(
@@ -57,9 +55,7 @@ class ExpandTemplate(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         job = cast(bluish.nodes.job.Job, step.parent)
@@ -99,9 +95,7 @@ class UploadFile(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         contents: str
@@ -149,9 +143,7 @@ class DownloadFile(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         source_file = inputs["source_file"]

src/bluish/actions/docker.py

@@ -61,9 +61,7 @@ class Login(bluish.actions.base.Action):
 
     SENSITIVE_INPUTS: tuple[str, ...] = ("password",)
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         username = inputs["username"]
@@ -89,9 +87,7 @@ def run(
 class Logout(bluish.actions.base.Action):
     FQN: str = "docker/logout"
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         command = "docker logout"
         if step.get_inherited_attr("echo_commands", True):
             info("Logging out of Docker...")
@@ -110,9 +106,7 @@ class Build(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         dockerfile = inputs.get("dockerfile", "Dockerfile")
@@ -141,9 +135,7 @@ class GetPid(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         name = step.inputs["name"]
 
         ps_result = docker_ps(step, name=name)
@@ -184,9 +176,7 @@ class Run(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         image = inputs["image"]
@@ -253,9 +243,7 @@ class Stop(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         name = inputs.get("name")
@@ -333,9 +321,7 @@ class Exec(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         name = inputs.get("name")
@@ -416,9 +402,7 @@ class CreateNetwork(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         inputs = step.inputs
 
         name = inputs["name"]

src/bluish/actions/git.py

@@ -23,9 +23,7 @@ def run_git_command(
     return job.exec(f"{preamble} {command}", step)
 
 
-def prepare_environment(
-    step: bluish.nodes.step.Step
-) -> bluish.process.ProcessResult:
+def prepare_environment(step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
     REQUIRED = {
         "git": "git",
         "openssh-client": "ssh",
@@ -69,9 +67,7 @@ class Checkout(bluish.actions.base.Action):
     def fqn(self) -> str:
         return "git/checkout"
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         try:
             inputs = step.inputs
 

src/bluish/actions/linux.py

@@ -18,9 +18,7 @@ class InstallPackages(bluish.actions.base.Action):
         }
     )
 
-    def run(
-        self, step: bluish.nodes.step.Step
-    ) -> bluish.process.ProcessResult:
+    def run(self, step: bluish.nodes.step.Step) -> bluish.process.ProcessResult:
         package_str = " ".join(step.inputs["packages"])
         flavor = step.inputs.get("flavor", "auto")
 

src/bluish/app.py

@@ -9,12 +9,12 @@
 from flask import Flask, abort, jsonify, request
 
 from bluish.__main__ import PROJECT_VERSION
-from bluish.nodes import WorkflowDefinition
-from bluish.nodes.job import Job
-from bluish.nodes.workflow import Workflow
 from bluish.core import (
     init_commands,
 )
+from bluish.nodes import WorkflowDefinition
+from bluish.nodes.job import Job
+from bluish.nodes.workflow import Workflow
 
 
 class LogFormatter(logging.Formatter):

src/bluish/nodes/job.py

@@ -2,8 +2,8 @@
 from typing import Any
 from uuid import uuid4
 
-import bluish.nodes
 import bluish.core
+import bluish.nodes
 import bluish.process
 from bluish.logging import debug, error, info, warning
 from bluish.utils import decorate_for_log

src/bluish/nodes/step.py

@@ -1,6 +1,6 @@
 import bluish.actions
-import bluish.nodes as nodes
 import bluish.core
+import bluish.nodes as nodes
 import bluish.process
 from bluish.logging import info
 

src/bluish/nodes/workflow.py

@@ -3,9 +3,9 @@
 
 from dotenv import dotenv_values
 
+import bluish.core
 import bluish.nodes
 import bluish.nodes.job
-import bluish.core
 import bluish.process
 from bluish.logging import debug, error, info
 

test/test_core.py

@@ -4,11 +4,11 @@
 from test.utils import create_workflow
 
 import pytest
-from bluish.nodes import CircularDependencyError
 from bluish.core import (
     ExecutionStatus,
     init_commands,
 )
+from bluish.nodes import CircularDependencyError
 from bluish.process import run
 from bluish.schemas import RequiredAttributeError