From c4dac172418fe38918157c7bc83fcb838b3e5c57 Mon Sep 17 00:00:00 2001
From: Daniel Bartley <dbrtly00@gmail.com>
Date: Sat, 19 Oct 2024 19:36:26 +1100
Subject: [PATCH] feat(config): enable assets_directory as config option in
 pyproject.toml

---
 python_modules/dagster/dagster/_cli/workspace/cli_target.py   | 2 ++
 python_modules/dagster/dagster/_core/workspace/load_target.py | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/python_modules/dagster/dagster/_cli/workspace/cli_target.py b/python_modules/dagster/dagster/_cli/workspace/cli_target.py
index dba03698041dd..cfce2d0b332a2 100644
--- a/python_modules/dagster/dagster/_cli/workspace/cli_target.py
+++ b/python_modules/dagster/dagster/_cli/workspace/cli_target.py
@@ -200,6 +200,7 @@ def get_workspace_load_target(kwargs: ClickArgMapping) -> WorkspaceLoadTarget:
                 attribute=check.opt_str_elem(kwargs, "attribute"),
                 working_directory=working_directory,
                 location_name=None,
+                assets_directory=None,
             )
         else:
             # multiple modules
@@ -217,6 +218,7 @@ def get_workspace_load_target(kwargs: ClickArgMapping) -> WorkspaceLoadTarget:
                         attribute=None,
                         working_directory=working_directory,
                         location_name=None,
+                        assets_directory=None,
                     )
                     for module_name in module_names
                 ]
diff --git a/python_modules/dagster/dagster/_core/workspace/load_target.py b/python_modules/dagster/dagster/_core/workspace/load_target.py
index 33f20190645b8..bedbf8e67cad9 100644
--- a/python_modules/dagster/dagster/_core/workspace/load_target.py
+++ b/python_modules/dagster/dagster/_core/workspace/load_target.py
@@ -99,6 +99,7 @@ def get_origins_from_toml(
                 attribute=None,
                 working_directory=os.getcwd(),
                 location_name=dagster_block.get("code_location_name"),
+                assets_directory=None,
             ).create_origins()
         elif "modules" in dagster_block and is_valid_modules_list(dagster_block.get("modules")):
             origins = []
@@ -110,6 +111,7 @@ def get_origins_from_toml(
                             attribute=None,
                             working_directory=os.getcwd(),
                             location_name=dagster_block.get("code_location_name"),
+                            assets_directory=dagster_block.get("assets_directory" , "assets"),
                         ).create_origins()
                     )
             return origins
@@ -153,6 +155,7 @@ class ModuleTarget(
             ("attribute", Optional[str]),
             ("working_directory", Optional[str]),
             ("location_name", Optional[str]),
+            ("assets_directory", Optional[str]), 
         ],
     ),
     WorkspaceLoadTarget,