fixies

Signed-off-by: Ayush Kamat <[email protected]>

Author: ayushkamat

pyproject.toml

@@ -12,7 +12,7 @@ include = ["src/**/*.py", "src/latch_cli/services/init/*"]
 
 [project]
 name = "latch"
-version = "2.56.10"
+version = "2.57.0"
 description = "The Latch SDK"
 authors = [{ name = "Kenny Workman", email = "[email protected]" }]
 maintainers = [

src/latch_cli/centromere/ast_parsing.py

@@ -23,27 +23,29 @@ class FlyteObject:
 
 
 class Visitor(ast.NodeVisitor):
-    def __init__(self, file: Path):
+    def __init__(self, file: Path, module_name: str):
         self.file = file
-        self.module_name = str(file.with_suffix("")).replace(os.pathsep, ".")
+        self.module_name = module_name
         self.flyte_objects: list[FlyteObject] = []
 
     # todo(ayush): skip defs that arent run on import
     def visit_FunctionDef(self, node: ast.FunctionDef):  # noqa: N802
         if len(node.decorator_list) == 0:
             return self.generic_visit(node)
 
-        name = f"{self.module_name}.{node.name}"
+        fqn = f"{self.module_name}.{node.name}"
+        # fqn = node.name
 
         # todo(ayush): |
         # 1. support ast.Attribute (@latch.tasks.small_task)
         # 2. normalize to fqn before checking whether or not its a task decorator
+        # 3. save fully qualified name for tasks (need to parse based on import graph)
         for decorator in node.decorator_list:
             if isinstance(decorator, ast.Name):
                 if decorator.id == "workflow":
-                    self.flyte_objects.append(FlyteObject("workflow", name))
+                    self.flyte_objects.append(FlyteObject("workflow", fqn))
                 elif decorator.id in task_decorators:
-                    self.flyte_objects.append(FlyteObject("task", name))
+                    self.flyte_objects.append(FlyteObject("task", fqn))
 
             elif isinstance(decorator, ast.Call):
                 func = decorator.func
@@ -53,7 +55,7 @@ def visit_FunctionDef(self, node: ast.FunctionDef):  # noqa: N802
                     continue
 
                 if func.id == "workflow":
-                    self.flyte_objects.append(FlyteObject("workflow", name))
+                    self.flyte_objects.append(FlyteObject("workflow", fqn))
                     continue
 
                 # note(ayush): this only works if `dockerfile` is a keyword arg - if someone
@@ -65,40 +67,27 @@ def visit_FunctionDef(self, node: ast.FunctionDef):  # noqa: N802
                         continue
 
                     try:
-                        provided: str = ast.literal_eval(kw.value)
+                        dockerfile = Path(ast.literal_eval(kw.value))
                     except ValueError as e:
                         click.secho(
                             dedent(f"""\
-                                There was an issue parsing the `dockerfile` argument for task `{name}` in {self.file}.
+                                There was an issue parsing the `dockerfile` argument for task `{fqn}` in {self.file}.
                                 Note that values passed to `dockerfile` must be string literals.
                             """),
                             fg="red",
                         )
 
                         raise click.exceptions.Exit(1) from e
 
-                    dockerfile = self.file.parent / provided
-
-                    if not dockerfile.exists():
-                        click.secho(
-                            f"""\
-                            The `dockerfile` value (provided {provided}, resolved to {dockerfile}) for task `{name}` in {self.file} does not exist.
-                            Note that relative paths are resolved with respect to the parent directory of the file.\
-                            """,
-                            fg="red",
-                        )
-
-                        raise click.exceptions.Exit(1)
-
-                self.flyte_objects.append(FlyteObject("task", name, dockerfile))
+                self.flyte_objects.append(FlyteObject("task", fqn, dockerfile))
 
         return self.generic_visit(node)
 
 
-def get_flyte_objects(p: Path) -> list[FlyteObject]:
+def get_flyte_objects(module: Path) -> list[FlyteObject]:
     res: list[FlyteObject] = []
     queue: Queue[Path] = Queue()
-    queue.put(p)
+    queue.put(module)
 
     while not queue.empty():
         file = queue.get()
@@ -114,7 +103,11 @@ def get_flyte_objects(p: Path) -> list[FlyteObject]:
         if file.suffix != ".py":
             continue
 
-        v = Visitor(file)
+        module_name = str(file.with_suffix("").relative_to(module.parent)).replace(
+            os.sep, "."
+        )
+
+        v = Visitor(file, module_name)
 
         try:
             parsed = ast.parse(file.read_text(), filename=file)

src/latch_cli/centromere/ctx.py

@@ -26,6 +26,7 @@
     WorkflowType,
     generate_temporary_ssh_credentials,
     hash_directory,
+    identifier_suffix_from_str,
 )
 from latch_sdk_config.latch import config
 
@@ -36,6 +37,9 @@ class _Container:
     pkg_dir: Path
     image_name: str
 
+    def __post_init__(self):
+        print(self)
+
 
 # todo(ayush): cleanse this
 class _CentromereCtx:
@@ -217,6 +221,19 @@ def __init__(
                     if obj.type != "task" or obj.dockerfile is None:
                         continue
 
+                    dockerfile = self.pkg_root / obj.dockerfile
+
+                    if not dockerfile.exists():
+                        click.secho(
+                            f"""\
+                            The `dockerfile` value (provided {obj.dockerfile}, resolved to {dockerfile}) for task `{obj.name}` does not exist.
+                            Note that relative paths are resolved with respect to the parent directory of the file.\
+                            """,
+                            fg="red",
+                        )
+
+                        raise click.exceptions.Exit(1)
+
                     self.container_map[obj.name] = _Container(
                         dockerfile=obj.dockerfile,
                         image_name=self.task_image_name(obj.name),
@@ -440,8 +457,6 @@ def image(self):
         else:
             account_id = self.account_id
 
-        from ..utils import identifier_suffix_from_str
-
         wf_name = identifier_suffix_from_str(self.workflow_name).lower()
         wf_name = docker_image_name_illegal_pat.sub("_", wf_name)
 
@@ -481,6 +496,9 @@ def image_tagged(self):
         return f"{self.image}:{self.version}"
 
     def task_image_name(self, task_name: str) -> str:
+        task_name = identifier_suffix_from_str(task_name).lower()
+        task_name = docker_image_name_illegal_pat.sub("_", task_name)
+
         return f"{self.image}:{task_name}-{self.version}"
 
     @property

src/latch_cli/services/register/register.py

@@ -359,9 +359,10 @@ def register(
 
         # todo(maximsmol): we really want the workflow display name here
         click.echo(
-            " ".join(
-                [click.style("Workflow name:", fg="bright_blue"), ctx.workflow_name]
-            )
+            " ".join([
+                click.style("Workflow name:", fg="bright_blue"),
+                ctx.workflow_name,
+            ])
         )
         click.echo(" ".join([click.style("Version:", fg="bright_blue"), ctx.version]))
 
@@ -392,15 +393,17 @@ def register(
         )
         if ctx.workflow_type == WorkflowType.snakemake:
             click.echo(
-                " ".join(
-                    [click.style("Snakefile:", fg="bright_blue"), str(ctx.snakefile)]
-                )
+                " ".join([
+                    click.style("Snakefile:", fg="bright_blue"),
+                    str(ctx.snakefile),
+                ])
             )
         elif ctx.workflow_type == WorkflowType.nextflow:
             click.echo(
-                " ".join(
-                    [click.style("NF script:", fg="bright_blue"), str(ctx.nf_script)]
-                )
+                " ".join([
+                    click.style("NF script:", fg="bright_blue"),
+                    str(ctx.nf_script),
+                ])
             )
 
         if use_new_centromere:
@@ -532,7 +535,7 @@ def register(
                     try:
                         split_task_name = task_name.split(".")
                         task_name = ".".join(
-                            split_task_name[split_task_name.index("wf") :]
+                            split_task_name[split_task_name.index(ctx.wf_module) :]
                         )
                         for new_proto in new_protos:
                             if task_name in new_proto.name: