removed circular import issue checking for container entrypoint

Author: tclose

pydra/compose/shell/task.py

@@ -26,7 +26,6 @@
 )
 from pydra.compose import base
 from pydra.compose.base.field import RequirementSet
-from pydra.environments.base import Container
 from pydra.compose.base.helpers import is_set
 from . import field
 from .templating import (
@@ -255,7 +254,8 @@ class ShellTask(base.Task[ShellOutputsType]):
 
     def _run(self, job: "Job[ShellTask]", rerun: bool = True) -> None:
         """Run the shell command."""
-        if self.executable is None and not isinstance(job.environment, Container):
+
+        if self.executable is None and not job.environment.has_entrypoint:
             raise ValueError(
                 "executable is not set, and the environment is not a container "
                 f"({job.environment}) with an entrypoint"

pydra/environments/base.py

@@ -26,6 +26,8 @@ class Environment:
     TODO: add setup and teardown methods
     """
 
+    has_entrypoint = False
+
     def setup(self):
         pass
 
@@ -107,6 +109,8 @@ class Container(Environment):
         Extra arguments to be passed to the container
     """
 
+    has_entrypoint = True
+
     image: str
     tag: str = "latest"
     root: str = "/mnt/pydra"