From c1ec227b9a693e0e42cd9818785c9ab4a30b21d1 Mon Sep 17 00:00:00 2001
From: Amanda Richardson <amanda162000@gmail.com>
Date: Mon, 29 Jul 2024 15:11:31 -0500
Subject: [PATCH] mypy errors partially corrected

---
 smartsim/_core/generation/generator.py | 14 ++++++++++----
 smartsim/settings/dispatch.py          | 11 ++++++-----
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/smartsim/_core/generation/generator.py b/smartsim/_core/generation/generator.py
index a81396004..a649ad3e3 100644
--- a/smartsim/_core/generation/generator.py
+++ b/smartsim/_core/generation/generator.py
@@ -42,6 +42,7 @@
 
 from ...database import FeatureStore
 from ...entity import Application, TaggedFilesHierarchy
+from ...entity.files import EntityFiles
 from ...launchable import Job, JobGroup
 from ...log import get_logger
 from ..entrypoints import file_operations
@@ -191,7 +192,7 @@ def generate_experiment(self) -> str:
             log_file.write(f"Generation start date and time: {dt_string}\n")
 
         # Prevent access to type FeatureStore entities
-        if isinstance(self.job.entity, Application) and self.job.entity.files:
+        if isinstance(self.job.entity, Application):
             # Perform file system operations on attached files
             self._build_operations()
 
@@ -210,8 +211,7 @@ def _build_operations(self) -> None:
         app = t.cast(Application, self.job.entity)
         self._get_symlink_file_system_operation(app, self.path)
         self._write_tagged_entity_files(app, self.path)
-        if app.files:
-            self._get_copy_file_system_operation(app, self.path)
+        self._get_copy_file_system_operation(app, self.path)
 
     @staticmethod
     def _get_copy_file_system_operation(app: Application, dest: str) -> None:
@@ -220,9 +220,11 @@ def _get_copy_file_system_operation(app: Application, dest: str) -> None:
         :param linked_file: The file to be copied.
         :return: A list of copy file system operations.
         """
+        if app.files is None:
+            return
         parser = get_parser()
         for src in app.files.copy:
-            if Path(src).is_dir:
+            if Path(src).is_dir: # TODO figure this out, or how to replace
                 cmd = f"copy {src} {dest} --dirs_exist_ok"
             else:
                 cmd = f"copy {src} {dest}"
@@ -237,6 +239,8 @@ def _get_symlink_file_system_operation(app: Application, dest: str) -> None:
         :param linked_file: The file to be symlinked.
         :return: A list of symlink file system operations.
         """
+        if app.files is None:
+            return
         parser = get_parser()
         for sym in app.files.link:
             # Normalize the path to remove trailing slashes
@@ -259,6 +263,8 @@ def _write_tagged_entity_files(app: Application, dest: str) -> None:
 
         :param entity: a Application instance
         """
+        if app.files is None:
+            return
         if app.files.tagged:
             to_write = []
 
diff --git a/smartsim/settings/dispatch.py b/smartsim/settings/dispatch.py
index b0c6c1876..983a748fb 100644
--- a/smartsim/settings/dispatch.py
+++ b/smartsim/settings/dispatch.py
@@ -58,13 +58,13 @@
 a job
 """
 _FormatterType: TypeAlias = t.Callable[
-    [_DispatchableT, "ExecutableProtocol", _EnvironMappingType], _LaunchableT
+    [_DispatchableT, "ExecutableProtocol", str, _EnvironMappingType], _LaunchableT
 ]
 """A callable that is capable of formatting the components of a job into a type
 capable of being launched by a launcher.
 """
 _LaunchConfigType: TypeAlias = (
-    "_LauncherAdapter[ExecutableProtocol, _EnvironMappingType]"
+    "_LauncherAdapter[ExecutableProtocol, _EnvironMappingType, str]"
 )
 """A launcher adapater that has configured a launcher to launch the components
 of a job with some pre-determined launch settings
@@ -388,7 +388,7 @@ def create(cls, exp: Experiment, /) -> Self: ...
 
 def make_shell_format_fn(
     run_command: str | None,
-) -> _FormatterType[LaunchArguments, t.Sequence[str]]:
+) -> _FormatterType[LaunchArguments, tuple[t.Sequence[str], str]]:
     """A function that builds a function that formats a `LaunchArguments` as a
     shell executable sequence of strings for a given launching utility.
 
@@ -423,7 +423,7 @@ def impl(
         exe: ExecutableProtocol,
         path: str,
         _env: _EnvironMappingType,
-    ) -> t.Sequence[str]:
+    ) -> t.Tuple[t.Sequence[str], str]:
         return (
             (
                 run_command,
@@ -444,7 +444,8 @@ class ShellLauncher:
     def __init__(self) -> None:
         self._launched: dict[LaunchedJobID, sp.Popen[bytes]] = {}
 
-    def start(self, command: t.Sequence[str]) -> LaunchedJobID:
+    # TODO inject path here
+    def start(self, command: tuple[t.Sequence[str], str]) -> LaunchedJobID:
         id_ = create_job_id()
         exe, *rest = command
         print(f"here is the path: {rest}")