salesforce-data-customcode 0.1.26__tar.gz → 0.1.28__tar.gz

{salesforce_data_customcode-0.1.26 → salesforce_data_customcode-0.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salesforce-data-customcode
-Version: 0.1.26
+Version: 0.1.28
 Summary: Data Cloud Custom Code SDK
 License-Expression: Apache-2.0
 License-File: LICENSE.txt

{salesforce_data_customcode-0.1.26 → salesforce_data_customcode-0.1.28}/pyproject.toml

@@ -18,7 +18,7 @@ license = "Apache-2.0"
 name = "salesforce-data-customcode"
 readme = "README.md"
 requires-python = ">=3.10,<3.12"
-version = "0.1.26"
+version = "0.1.28"
 
 [tool.black]
 exclude = '''

{salesforce_data_customcode-0.1.26 → salesforce_data_customcode-0.1.28}/src/datacustomcode/cli.py

@@ -134,9 +134,12 @@ def auth(profile: str):
 @click.option("--network", default="default")
 def zip(path: str, network: str):
     from datacustomcode.deploy import zip
+    from datacustomcode.scan import find_base_directory, get_package_type
 
     logger.debug("Zipping project")
-    zip(path, network)
+    base_directory = find_base_directory(path)
+    package_type = get_package_type(base_directory)
+    zip(path, network, package_type)
 
 
 @cli.command()

{salesforce_data_customcode-0.1.26 → salesforce_data_customcode-0.1.28}/src/datacustomcode/cmd.py

@@ -85,9 +85,13 @@ def _cmd_output(
     **kwargs: Any,
 ) -> tuple[int, bytes, Union[bytes, None]]:
     _setdefault_kwargs(kwargs)
+    kwargs.setdefault("shell", True)
+    # On Windows, Popen with shell=True and a sequence uses list2cmdline() which
+    # quotes the entire string, causing cmd.exe to fail. Joining to a plain string
+    # works correctly on both Unix (/bin/sh -c "...") and Windows (cmd.exe /c ...).
+    cmd_arg: Union[tuple[str, ...], str] = " ".join(cmd) if kwargs.get("shell") else cmd
     try:
-        kwargs.setdefault("shell", True)
-        proc = subprocess.Popen(cmd, **kwargs)
+        proc = subprocess.Popen(cmd_arg, **kwargs)
     except OSError as e:
         returncode, stdout_b, stderr_b = _oserror_to_output(e)
     else:

{salesforce_data_customcode-0.1.26 → salesforce_data_customcode-0.1.28}/src/datacustomcode/deploy.py

@@ -272,45 +272,68 @@ def create_deployment(
         raise
 
 
-PLATFORM_ENV_VAR = "DOCKER_DEFAULT_PLATFORM=linux/amd64"
+PLATFORM_ENV = {"DOCKER_DEFAULT_PLATFORM": "linux/amd64"}
 DOCKER_IMAGE_NAME = "datacloud-custom-code-dependency-builder"
 DEPENDENCIES_ARCHIVE_NAME = "native_dependencies"
 DEPENDENCIES_ARCHIVE_FULL_NAME = f"{DEPENDENCIES_ARCHIVE_NAME}.tar.gz"
 DEPENDENCIES_ARCHIVE_PATH = os.path.join(
     "payload", "archives", DEPENDENCIES_ARCHIVE_FULL_NAME
 )
+PY_FILES_PATH = os.path.join("payload", "py-files")
 ZIP_FILE_NAME = "deployment.zip"
 
 
-def prepare_dependency_archive(directory: str, docker_network: str) -> None:
+def prepare_dependency_archive(
+    directory: str, docker_network: str, package_type: str
+) -> None:
     cmd = f"docker images -q {DOCKER_IMAGE_NAME}"
     image_exists = cmd_output(cmd)
 
+    docker_env = {**os.environ, **PLATFORM_ENV}
+
     if not image_exists:
         logger.info(f"Building docker image with docker network: {docker_network}...")
         cmd = docker_build_cmd(docker_network)
-        cmd_output(cmd)
+        cmd_output(cmd, env=docker_env)
 
-    with tempfile.TemporaryDirectory() as temp_dir:
+    # ignore_cleanup_errors=True: on Windows, Docker creates files inside the
+    # mounted volume whose permissions prevent the host from deleting them.
+    # The archive has already been copied out, so silently skipping leftover
+    # files is safe and avoids a fatal error on context-manager exit.
+    with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as temp_dir:
         logger.info(
             f"Building dependencies archive with docker network: {docker_network}"
         )
         shutil.copy("requirements.txt", temp_dir)
         shutil.copy("build_native_dependencies.sh", temp_dir)
         cmd = docker_run_cmd(docker_network, temp_dir)
-        cmd_output(cmd)
-        archives_temp_path = os.path.join(temp_dir, DEPENDENCIES_ARCHIVE_FULL_NAME)
-        os.makedirs(os.path.dirname(DEPENDENCIES_ARCHIVE_PATH), exist_ok=True)
-        shutil.copy(archives_temp_path, DEPENDENCIES_ARCHIVE_PATH)
-
-        logger.info(f"Dependencies archived to {DEPENDENCIES_ARCHIVE_PATH}")
+        cmd_output(cmd, env=docker_env)
+        if package_type == "function":
+            source_py_files = os.path.join(temp_dir, "py-files")
+            if os.path.exists(source_py_files):
+                logger.info(
+                    f"py-files directory found at {source_py_files}. "
+                    "Copying to payload directory..."
+                )
+                os.makedirs(os.path.dirname(PY_FILES_PATH), exist_ok=True)
+                if os.path.exists(PY_FILES_PATH):
+                    shutil.rmtree(PY_FILES_PATH)
+                shutil.copytree(source_py_files, PY_FILES_PATH)
+                logger.info(f"py-files copied to {PY_FILES_PATH}")
+            else:
+                logger.info(
+                    f"No py-files directory found at {source_py_files}. "
+                    "Skipping py-files copy."
+                )
+        else:
+            archives_temp_path = os.path.join(temp_dir, DEPENDENCIES_ARCHIVE_FULL_NAME)
+            os.makedirs(os.path.dirname(DEPENDENCIES_ARCHIVE_PATH), exist_ok=True)
+            shutil.copy(archives_temp_path, DEPENDENCIES_ARCHIVE_PATH)
+            logger.info(f"Dependencies archived to {DEPENDENCIES_ARCHIVE_PATH}")
 
 
 def docker_build_cmd(network: str) -> str:
-    cmd = (
-        f"{PLATFORM_ENV_VAR} docker build -t {DOCKER_IMAGE_NAME} "
-        f"--file Dockerfile.dependencies . "
-    )
+    cmd = f"docker build -t {DOCKER_IMAGE_NAME} --file Dockerfile.dependencies . "
 
     if network != "default":
         cmd = cmd + f"--network {network}"
@@ -318,12 +341,11 @@ def docker_build_cmd(network: str) -> str:
     return cmd
 
 
-def docker_run_cmd(network: str, temp_dir) -> str:
-    cmd = (
-        f"{PLATFORM_ENV_VAR} docker run --rm "
-        f"-v {temp_dir}:/workspace "
-        f"{DOCKER_IMAGE_NAME} "
-    )
+def docker_run_cmd(network: str, temp_dir: str) -> str:
+    # Normalise path separators: Docker expects forward slashes even on Windows,
+    # and quoting handles paths that contain spaces.
+    docker_path = temp_dir.replace("\\", "/")
+    cmd = f'docker run --rm -v "{docker_path}:/workspace" {DOCKER_IMAGE_NAME} '
 
     if network != "default":
         cmd = cmd + f"--network {network} "
@@ -514,13 +536,14 @@ def upload_zip(file_upload_url: str) -> None:
 def zip(
     directory: str,
     docker_network: str,
+    package_type: str,
 ):
     # Create a zip file excluding .DS_Store files
     import zipfile
 
     # prepare payload only if requirements.txt is non-empty
     if has_nonempty_requirements_file(directory):
-        prepare_dependency_archive(directory, docker_network)
+        prepare_dependency_archive(directory, docker_network, package_type)
     else:
         logger.info(
             f"Skipping dependency archive: requirements.txt is missing or empty "
@@ -559,7 +582,7 @@ def deploy_full(
 
     # create deployment and upload payload
     deployment = create_deployment(access_token, metadata)
-    zip(directory, docker_network)
+    zip(directory, docker_network, metadata.codeType)
     upload_zip(deployment.fileUploadUrl)
     wait_for_deployment(access_token, metadata, callback)
 

salesforce_data_customcode-0.1.28/src/datacustomcode/templates/function/build_native_dependencies.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -e
+
+# Description: build native dependencies for function (unpacked pip install to py-files)
+
+python3.11 -m venv --copies .venv
+source .venv/bin/activate
+pip install --target ./py-files -r requirements.txt

salesforce_data_customcode-0.1.26/src/datacustomcode/templates/script/build_native_dependencies.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -e
-
-# Description: build native dependencies
-
-python3.11 -m venv --copies .venv
-source .venv/bin/activate
-pip install -r requirements.txt
-venv-pack -o native_dependencies.tar.gz -f