Refactor of Generation class and inject path into Launch process

smartsim/_core/entrypoints/file_operations.py

@@ -133,7 +133,7 @@ def copy(parsed_args: argparse.Namespace) -> None:
             dirs_exist_ok=parsed_args.dirs_exist_ok,
         )
     else:
-        shutil.copyfile(parsed_args.source, parsed_args.dest)
+        shutil.copy(parsed_args.source, parsed_args.dest)
 
 
 def symlink(parsed_args: argparse.Namespace) -> None:

smartsim/_core/launcher/dragon/dragonLauncher.py

@@ -366,6 +366,7 @@ def _assert_schema_type(obj: object, typ: t.Type[_SchemaT], /) -> _SchemaT:
 def _as_run_request_args_and_policy(
     run_req_args: DragonLaunchArguments,
     exe: ExecutableProtocol,
+    path: str | os.PathLike[str],
     env: t.Mapping[str, str | None],
 ) -> tuple[DragonRunRequestView, DragonRunPolicy]:
     # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -384,8 +385,7 @@ def _as_run_request_args_and_policy(
             #        this will need to be injected by the user or by us to have
             #        the command execute next to any generated files. A similar
             #        problem exists for the other settings.
-            # TODO: Find a way to inject this path
-            path=os.getcwd(),
+            path=path,
             env=env,
             # TODO: Not sure how this info is injected
             name=None,

smartsim/_core/utils/helpers.py

@@ -52,6 +52,18 @@
 _TSignalHandlerFn = t.Callable[[int, t.Optional["FrameType"]], object]
 
 
+def check_name(name: str) -> None:
+    """
+    Checks if the input name is valid.
+
+    :param name: The name to be checked.
+
+    :raises ValueError: If the name contains the path separator (os.path.sep).
+    """
+    if os.path.sep in name:
+        raise ValueError("Invalid input: String contains the path separator.")
+
+
 def unpack_fs_identifier(fs_id: str, token: str) -> t.Tuple[str, str]:
     """Unpack the unformatted feature store identifier
     and format for env variable suffix using the token

smartsim/entity/dbnode.py

@@ -64,7 +64,7 @@ def __init__(
         fs_identifier: str = "",
     ) -> None:
         """Initialize a feature store node within an feature store."""
-        super().__init__(name, path, run_settings)
+        super().__init__(name, run_settings)
         self.exe = [exe] if run_settings.container else [expand_exe_path(exe)]
         self.exe_args = exe_args or []
         self.ports = ports

smartsim/entity/ensemble.py

@@ -53,7 +53,6 @@ def __init__(
         exe: str | os.PathLike[str],
         exe_args: t.Sequence[str] | None = None,
         exe_arg_parameters: t.Mapping[str, t.Sequence[t.Sequence[str]]] | None = None,
-        path: str | os.PathLike[str] | None = None,
         files: EntityFiles | None = None,
         file_parameters: t.Mapping[str, t.Sequence[str]] | None = None,
         permutation_strategy: str | strategies.PermutationStrategyType = "all_perm",
@@ -66,11 +65,6 @@ def __init__(
         self.exe_arg_parameters = (
             copy.deepcopy(exe_arg_parameters) if exe_arg_parameters else {}
         )
-        self.path = os.fspath(path) if path is not None else os.getcwd()
-        #                                                    ^^^^^^^^^^^
-        # TODO: Copied from the original implementation, but I'm not sure that
-        #       I like this default. Shouldn't it be something under an
-        #       experiment directory? If so, how it injected??
         self.files = copy.deepcopy(files) if files else EntityFiles()
         self.file_parameters = dict(file_parameters) if file_parameters else {}
         self.permutation_strategy = permutation_strategy
@@ -97,7 +91,6 @@ def _create_applications(self) -> tuple[Application, ...]:
                 # ^^^^^^^^^^^^^^^^^^^^^^^
                 # FIXME: remove this constructor arg! It should not exist!!
                 exe_args=self.exe_args,
-                path=os.path.join(self.path, self.name),
                 files=self.files,
                 params=permutation.params,
                 params_as_args=permutation.exe_args,  # type: ignore[arg-type]
@@ -111,4 +104,4 @@ def as_jobs(self, settings: LaunchSettings) -> tuple[Job, ...]:
         apps = self._create_applications()
         if not apps:
             raise ValueError("There are no members as part of this ensemble")
-        return tuple(Job(app, settings) for app in apps)
+        return tuple(Job(app, settings, app.name) for app in apps)

smartsim/entity/entity.py

@@ -98,19 +98,17 @@ def _on_disable(self) -> None:
 
 
 class SmartSimEntity:
-    def __init__(self, name: str, path: str, run_settings: "RunSettings") -> None:
+    def __init__(self, name: str, run_settings: "RunSettings") -> None:
         """Initialize a SmartSim entity.
 
         Each entity must have a name, path, and
         run_settings. All entities within SmartSim
         share these attributes.
 
         :param name: Name of the entity
-        :param path: path to output, error, and configuration files
         """
         self.name = name
         self.run_settings = run_settings
-        self.path = path
 
     @property
     def type(self) -> str:

smartsim/entity/model.py

@@ -64,7 +64,6 @@ def __init__(
         run_settings: "RunSettings",
         params: t.Optional[t.Dict[str, str]] = None,
         exe_args: t.Optional[t.List[str]] = None,
-        path: t.Optional[str] = getcwd(),
         params_as_args: t.Optional[t.List[str]] = None,
         batch_settings: t.Optional["BatchSettings"] = None,
         files: t.Optional[EntityFiles] = None,
@@ -76,7 +75,6 @@ def __init__(
         :param exe_args: executable arguments
         :param params: application parameters for writing into configuration files or
                        to be passed as command line arguments to executable.
-        :param path: path to output, error, and configuration files
         :param run_settings: launcher settings specified in the experiment
         :param params_as_args: list of parameters which have to be
                                interpreted as command line arguments to
@@ -85,7 +83,7 @@ def __init__(
                                application as a batch job
         :param files: Files to have available to the application
         """
-        super().__init__(name, str(path), run_settings)
+        super().__init__(name, run_settings)
         self.exe = [expand_exe_path(exe)]
         # self.exe = [exe] if run_settings.container else [expand_exe_path(exe)]
         self.exe_args = exe_args or []
@@ -228,7 +226,6 @@ def attach_generator_files(
                     "`smartsim_params.txt` is a file automatically "
                     + "generated by SmartSim and cannot be ovewritten."
                 )
-
         self.files = EntityFiles(to_configure, to_copy, to_symlink)
 
     @property