enforce dataspace as required

Author: ppandit-sfdc

src/datacustomcode/io/reader/query_api.py

@@ -85,7 +85,7 @@ def __init__(
         self.spark = spark
         credentials = Credentials.from_available(profile=credentials_profile)
 
-        if dataspace is not None:
+        if dataspace is not None and dataspace != "default":
             self._conn = SalesforceCDPConnection(
                 credentials.login_url,
                 credentials.username,

src/datacustomcode/io/writer/print.py

@@ -39,9 +39,7 @@ def __init__(
                     self.spark, credentials_profile, dataspace=dataspace
                 )
             else:
-                self.reader = QueryAPIDataCloudReader(
-                    self.spark, credentials_profile
-                )
+                self.reader = QueryAPIDataCloudReader(self.spark, credentials_profile)
         else:
             self.reader = reader
 

src/datacustomcode/run.py

@@ -38,37 +38,39 @@ def run_entrypoint(
         profile: The credentials profile to use.
     """
     add_py_folder(entrypoint)
-    
-    # Read dataspace from config.json if it exists
+
+    # Read dataspace from config.json (required)
     entrypoint_dir = os.path.dirname(entrypoint)
     config_json_path = os.path.join(entrypoint_dir, "config.json")
-    if os.path.exists(config_json_path):
-        try:
-            with open(config_json_path, "r") as f:
-                config_json = json.load(f)
-                dataspace = config_json.get("dataspace")
-                if dataspace:
-                    # Add dataspace to reader config options
-                    if (
-                        config.reader_config
-                        and hasattr(config.reader_config, "options")
-                    ):
-                        config.reader_config.options["dataspace"] = dataspace
-                    # Add dataspace to writer config options (for PrintDataCloudWriter)
-                    if (
-                        config.writer_config
-                        and hasattr(config.writer_config, "options")
-                    ):
-                        config.writer_config.options["dataspace"] = dataspace
-        except json.JSONDecodeError as err:
-            raise ValueError(
-                f"config.json at {config_json_path} is not valid JSON"
-            ) from err
-        except FileNotFoundError as err:
-            raise FileNotFoundError(
-                f"config.json not found at {config_json_path}"
-            ) from err
-    
+
+    if not os.path.exists(config_json_path):
+        raise FileNotFoundError(
+            f"config.json not found at {config_json_path}. config.json is required."
+        )
+
+    try:
+        with open(config_json_path, "r") as f:
+            config_json = json.load(f)
+    except json.JSONDecodeError as err:
+        raise ValueError(
+            f"config.json at {config_json_path} is not valid JSON"
+        ) from err
+
+    # Require dataspace to be present in config.json
+    dataspace = config_json.get("dataspace")
+    if not dataspace:
+        raise ValueError(
+            f"config.json at {config_json_path} is missing required field 'dataspace'. "
+            f"Please ensure config.json contains a 'dataspace' field."
+        )
+
+    # Add dataspace to reader config options
+    if config.reader_config and hasattr(config.reader_config, "options"):
+        config.reader_config.options["dataspace"] = dataspace
+    # Add dataspace to writer config options (for PrintDataCloudWriter)
+    if config.writer_config and hasattr(config.writer_config, "options"):
+        config.writer_config.options["dataspace"] = dataspace
+
     if profile != "default":
         if config.reader_config and hasattr(config.reader_config, "options"):
             config.reader_config.options["credentials_profile"] = profile