Revert "update"

This reverts commit 374ba40.

Author: ppandit-sfdc

src/datacustomcode/run.py

@@ -76,10 +76,16 @@ def run_entrypoint(
             f"Please ensure config.json contains a 'dataspace' field."
         )
 
-    # Load config file (if provided)
+    # Load config file first (if provided) so that dataspace from config.json
+    # can override any dataspace in the config file
     if config_file:
         config.load(config_file)
 
+    # Add dataspace to reader and writer config options
+    # (after loading config file to ensure it takes precedence)
+    _set_config_option(config.reader_config, "dataspace", dataspace)
+    _set_config_option(config.writer_config, "dataspace", dataspace)
+
     if profile != "default":
         _set_config_option(config.reader_config, "credentials_profile", profile)
         _set_config_option(config.writer_config, "credentials_profile", profile)

tests/test_run.py

@@ -241,13 +241,25 @@ class TestDataspaceScenarios:
     """Test dataspace functionality in run_entrypoint."""
 
     def test_run_entrypoint_with_default_dataspace(self):
-        """Test that run_entrypoint runs successfully with dataspace='default'."""
+        """Test that run_entrypoint sets dataspace='default' correctly."""
         with tempfile.NamedTemporaryFile(suffix=".py", delete=False) as temp:
             entrypoint_content = textwrap.dedent(
                 """
-                # Test entrypoint - just verify it runs
+                # Test entrypoint
+                from datacustomcode.config import config
                 with open("dataspace_output.txt", "w") as f:
-                    f.write("Entrypoint executed successfully\\n")
+                    rds = (
+                        config.reader_config.options.get("dataspace")
+                        if config.reader_config
+                        else None
+                    )
+                    wds = (
+                        config.writer_config.options.get("dataspace")
+                        if config.writer_config
+                        else None
+                    )
+                    f.write(f"Reader dataspace: {rds}\\n")
+                    f.write(f"Writer dataspace: {wds}\\n")
             """
             )
             temp.write(entrypoint_content.encode("utf-8"))
@@ -266,10 +278,11 @@ def test_run_entrypoint_with_default_dataspace(self):
                 profile="default",
             )
 
-            # Verify entrypoint executed
+            # Verify dataspace was set
             with open("dataspace_output.txt", "r") as f:
                 content = f.read()
-                assert "Entrypoint executed successfully" in content
+                assert "Reader dataspace: default" in content
+                assert "Writer dataspace: default" in content
 
         finally:
             if os.path.exists(entrypoint_file):
@@ -280,14 +293,26 @@ def test_run_entrypoint_with_default_dataspace(self):
                 os.unlink("dataspace_output.txt")
 
     def test_run_entrypoint_with_custom_dataspace(self):
-        """Test that run_entrypoint runs successfully with custom dataspace."""
+        """Test that run_entrypoint sets custom dataspace correctly."""
         custom_dataspace = "dataspace-1"
         with tempfile.NamedTemporaryFile(suffix=".py", delete=False) as temp:
             entrypoint_content = textwrap.dedent(
                 """
-                # Test entrypoint - just verify it runs
+                # Test entrypoint
+                from datacustomcode.config import config
                 with open("dataspace_output.txt", "w") as f:
-                    f.write("Entrypoint executed successfully\\n")
+                    rds = (
+                        config.reader_config.options.get("dataspace")
+                        if config.reader_config
+                        else None
+                    )
+                    wds = (
+                        config.writer_config.options.get("dataspace")
+                        if config.writer_config
+                        else None
+                    )
+                    f.write(f"Reader dataspace: {rds}\\n")
+                    f.write(f"Writer dataspace: {wds}\\n")
             """
             )
             temp.write(entrypoint_content.encode("utf-8"))
@@ -299,19 +324,18 @@ def test_run_entrypoint_with_custom_dataspace(self):
             json.dump({"dataspace": custom_dataspace}, f)
 
         try:
-            # Verify entrypoint runs successfully with custom dataspace
-            # (if dataspace validation failed, this would raise an error)
             run_entrypoint(
                 entrypoint=entrypoint_file,
                 config_file=None,
                 dependencies=[],
                 profile="default",
             )
 
-            # Verify entrypoint executed
+            # Verify custom dataspace was set
             with open("dataspace_output.txt", "r") as f:
                 content = f.read()
-                assert "Entrypoint executed successfully" in content
+                assert f"Reader dataspace: {custom_dataspace}" in content
+                assert f"Writer dataspace: {custom_dataspace}" in content
 
         finally:
             if os.path.exists(entrypoint_file):