salesforce-data-customcode 6.0.6.dev1__tar.gz → 6.0.7.dev1__tar.gz

{salesforce_data_customcode-6.0.6.dev1 → salesforce_data_customcode-6.0.7.dev1}/PKG-INFO

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

{salesforce_data_customcode-6.0.6.dev1 → salesforce_data_customcode-6.0.7.dev1}/pyproject.toml

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

{salesforce_data_customcode-6.0.6.dev1 → salesforce_data_customcode-6.0.7.dev1}/src/datacustomcode/token_provider.py

@@ -97,10 +97,19 @@ class SFCLITokenProvider(TokenProvider):
     def get_token(self) -> "AccessTokenResponse":
         """Get token from Salesforce SF CLI"""
         import json
+        import shutil
         import subprocess
 
         from datacustomcode.deploy import AccessTokenResponse
 
+        sf_path = shutil.which("sf") or shutil.which("sf.cmd")
+        if sf_path is None:
+            raise RuntimeError(
+                "The 'sf' command was not found. "
+                "Install Salesforce CLI: "
+                "https://developer.salesforce.com/tools/salesforcecli"
+            )
+
         def _run_sf_command(args: list[str], description: str) -> dict:
             try:
                 result = subprocess.run(
@@ -108,14 +117,8 @@ class SFCLITokenProvider(TokenProvider):
                     capture_output=True,
                     text=True,
                     check=True,
-                    timeout=30,
+                    timeout=120,
                 )
-            except FileNotFoundError as exc:
-                raise RuntimeError(
-                    "The 'sf' command was not found. "
-                    "Install Salesforce CLI: "
-                    "https://developer.salesforce.com/tools/salesforcecli"
-                ) from exc
             except subprocess.TimeoutExpired as exc:
                 raise RuntimeError(
                     f"'{description}' timed out for org '{self.sf_cli_org}'"
@@ -142,7 +145,7 @@ class SFCLITokenProvider(TokenProvider):
 
         # Get org info from sf org display
         display_data = _run_sf_command(
-            ["sf", "org", "display", "--target-org", self.sf_cli_org, "--json"],
+            [sf_path, "org", "display", "--target-org", self.sf_cli_org, "--json"],
             "sf org display",
         )
         result_data = display_data.get("result", {})
@@ -159,7 +162,7 @@ class SFCLITokenProvider(TokenProvider):
         try:
             token_data = _run_sf_command(
                 [
-                    "sf",
+                    sf_path,
                     "org",
                     "auth",
                     "show-access-token",