salesforce-data-customcode 5.0.0__tar.gz → 6.0.0__tar.gz

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: salesforce-data-customcode
-Version: 5.0.0
+Version: 6.0.0
 Summary: Data Cloud Custom Code SDK
 License-Expression: Apache-2.0
 License-File: LICENSE.txt
@@ -254,12 +254,18 @@ Instead of using `datacustomcode configure`, you can also set credentials via en
 | `SFDC_REFRESH_TOKEN` | OAuth refresh token |
 | `SFDC_ACCESS_TOKEN` | (Optional) OAuth core/access token |
 
+**Einstein Platform API Environment (Optional):**
+| Variable | Description |
+|----------|-------------|
+| `SFDC_EINSTEIN_API_ENV` | Einstein Platform API environment: `dev`, `test`, `stage`, or `prod`. If not set, automatically inferred from login URL. Set this explicitly if auto-detection fails. |
+
 Example usage:
 ```bash
 export SFDC_LOGIN_URL="https://login.salesforce.com"
 export SFDC_CLIENT_ID="your_client_id"
 export SFDC_CLIENT_SECRET="your_client_secret"
 export SFDC_REFRESH_TOKEN="your_refresh_token"
+export SFDC_EINSTEIN_API_ENV="test"  # optional
 
 datacustomcode run ./payload/entrypoint.py
 ```

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/README.md

@@ -229,12 +229,18 @@ Instead of using `datacustomcode configure`, you can also set credentials via en
 | `SFDC_REFRESH_TOKEN` | OAuth refresh token |
 | `SFDC_ACCESS_TOKEN` | (Optional) OAuth core/access token |
 
+**Einstein Platform API Environment (Optional):**
+| Variable | Description |
+|----------|-------------|
+| `SFDC_EINSTEIN_API_ENV` | Einstein Platform API environment: `dev`, `test`, `stage`, or `prod`. If not set, automatically inferred from login URL. Set this explicitly if auto-detection fails. |
+
 Example usage:
 ```bash
 export SFDC_LOGIN_URL="https://login.salesforce.com"
 export SFDC_CLIENT_ID="your_client_id"
 export SFDC_CLIENT_SECRET="your_client_secret"
 export SFDC_REFRESH_TOKEN="your_refresh_token"
+export SFDC_EINSTEIN_API_ENV="test"  # optional
 
 datacustomcode run ./payload/entrypoint.py
 ```

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/pyproject.toml

@@ -18,7 +18,7 @@ license = "Apache-2.0"
 name = "salesforce-data-customcode"
 readme = "README.md"
 requires-python = ">=3.10,<3.12"
-version = "5.0.0"
+version = "6.0.0"
 
 [tool.black]
 exclude = '''
@@ -88,8 +88,8 @@ warn_unused_configs = true
 
 [tool.poetry]
 include = [
-  {path = "src/datacustomcode/templates/**/*", format = "sdist"},
-  {path = "src/datacustomcode/config.yaml", format = "sdist"}
+  {path = "src/datacustomcode/templates/**/*"},
+  {path = "src/datacustomcode/config.yaml"}
 ]
 packages = [{include = "datacustomcode", from = "src"}]
 
@@ -133,8 +133,9 @@ datacustomcode = "datacustomcode.cli:cli"
 
 [tool.poetry-dynamic-versioning]
 enable = false
-pattern = "^v(?P<base>.+)$"
-style = "semver"
+format-jinja = "{% if distance == 0 %}{{ base }}{{ stage or '' }}{% else %}{{ bump_version(base) }}.dev{{ distance }}+{{ commit }}{% endif %}"
+pattern = "^v(?P<base>\\d+\\.\\d+\\.\\d+)(?P<stage>\\.dev\\d+|a\\d+|b\\d+|rc\\d+)?$"
+style = "pep440"
 vcs = "git"
 
 [tool.pytest.ini_options]

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/src/datacustomcode/einstein_platform_client.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
 from typing import (
     Any,
     Dict,
@@ -30,10 +31,6 @@ from datacustomcode.token_provider import (
 
 
 class EinsteinPlatformClient:
-    EINSTEIN_PLATFORM_MODELS_URL = (
-        "https://api.salesforce.com/einstein/platform/v1/models"
-    )
-
     def __init__(
         self,
         credentials_profile: Optional[str] = None,
@@ -48,8 +45,34 @@ class EinsteinPlatformClient:
             self._token_provider = CredentialsTokenProvider(profile)
             logger.debug(f"Using credentials token provider with profile: {profile}")
         self.token_response = None
+        self._einstein_url_cache: Optional[str] = None
         super().__init__(**kwargs)
 
+    def _get_einstein_platform_url(self) -> str:
+        if self._einstein_url_cache is not None:
+            return self._einstein_url_cache
+
+        env = os.environ.get("SFDC_EINSTEIN_API_ENV", "prod").lower()
+        if env not in ("dev", "test", "stage", "prod"):
+            logger.warning(
+                f"Unknown SFDC_EINSTEIN_API_ENV value '{env}', defaulting to prod"
+            )
+            env = "prod"
+
+        base_url = self._get_base_url_for_env(env)
+        logger.info(f"Using Einstein Platform API endpoint: {base_url} (env={env})")
+        self._einstein_url_cache = f"{base_url}/einstein/platform/v1/models"
+        return self._einstein_url_cache
+
+    def _get_base_url_for_env(self, env: str) -> str:
+        env_map = {
+            "dev": "https://dev.api.salesforce.com",
+            "test": "https://test.api.salesforce.com",
+            "stage": "https://stage.api.salesforce.com",
+            "prod": "https://api.salesforce.com",
+        }
+        return env_map.get(env, "https://api.salesforce.com")
+
     def _get_headers(self):
         if self.token_response is None:
             self.token_response = self._token_provider.get_token()

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/src/datacustomcode/einstein_predictions/impl/default.py

@@ -48,7 +48,7 @@ class DefaultEinsteinPredictions(EinsteinPlatformClient, EinsteinPredictions):
             )
 
         api_url = (
-            f"{self.EINSTEIN_PLATFORM_MODELS_URL}/{request.model_api_name}/{endpoint}"
+            f"{self._get_einstein_platform_url()}/{request.model_api_name}/{endpoint}"
         )
 
         prediction_columns: List[Dict[str, Any]] = []

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/src/datacustomcode/io/writer/base.py

@@ -27,11 +27,21 @@ if TYPE_CHECKING:
 class WriteMode(str, Enum):
     APPEND = "append"
     OVERWRITE = "overwrite"
-    OVERWRITE_PARTITIONS = "overwrite_partitions"
+    OVERWRITE_PARTITIONS = "overwrite_partitions"  # Deprecated: raises error if used
     MERGE = "merge"
     MERGE_UPSERT_DELETE = "merge_upsert_delete"
 
 
+class MergeRecordType(str, Enum):
+    """Values for the _merge_record_type column used by MERGE_UPSERT_DELETE."""
+
+    UPSERT = "UPSERT"
+    DELETE = "DELETE"
+
+
+MERGE_RECORD_TYPE_COLUMN = "_merge_record_type"
+
+
 class BaseDataCloudWriter(BaseDataAccessLayer):
     """Base class for Data Cloud writers."""
 

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/src/datacustomcode/llm_gateway/default.py

@@ -29,7 +29,7 @@ class DefaultLLMGateway(EinsteinPlatformClient, LLMGateway):
 
     def generate_text(self, request: GenerateTextRequest) -> GenerateTextResponse:
         api_url = (
-            f"{self.EINSTEIN_PLATFORM_MODELS_URL}/{request.model_name}/generations"
+            f"{self._get_einstein_platform_url()}/{request.model_name}/generations"
         )
 
         payload: Dict[str, Any] = {"prompt": request.prompt}

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/src/datacustomcode/templates/function/.devcontainer/devcontainer.json

@@ -5,6 +5,6 @@
 		"dockerfile": "../Dockerfile"
 	},
 	"features": {
-		"ghcr.io/devcontainers/features/git:1": {},
+		"ghcr.io/devcontainers/features/git:1": {}
 	}
 }

{salesforce_data_customcode-5.0.0 → salesforce_data_customcode-6.0.0}/src/datacustomcode/templates/script/.devcontainer/devcontainer.json

@@ -5,6 +5,6 @@
 		"dockerfile": "../Dockerfile"
 	},
 	"features": {
-		"ghcr.io/devcontainers/features/git:1": {},
+		"ghcr.io/devcontainers/features/git:1": {}
 	}
 }