salesforce-data-customcode 6.0.1__tar.gz → 6.0.2__tar.gz

{salesforce_data_customcode-6.0.1 → salesforce_data_customcode-6.0.2}/PKG-INFO

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

{salesforce_data_customcode-6.0.1 → salesforce_data_customcode-6.0.2}/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.1"
+version = "6.0.2"
 
 [tool.black]
 exclude = '''

{salesforce_data_customcode-6.0.1 → salesforce_data_customcode-6.0.2}/src/datacustomcode/cli.py

@@ -198,11 +198,7 @@ def zip(path: str, network: str):
     default=None,
     help="SF CLI org alias or username. Fetches credentials via `sf org display`.",
 )
-@click.option(
-    "--use-in-feature",
-    default="SearchIndexChunking",
-    help="Feature where this function will be used.",
-)
+@click.option("--use-in-feature", default=None, hidden=True, deprecated=True)
 def deploy(
     path: str,
     name: str,
@@ -248,17 +244,20 @@ def deploy(
     )
 
     if package_type == "function":
-        # Try to infer use_in_feature from function signature; fall back to
-        # the explicit flag value (defaults to SearchIndexChunking)
+        # Infer use_in_feature from function signature
         entrypoint_path = os.path.join(path, ENTRYPOINT_FILE)
-        inferred = infer_use_in_feature(entrypoint_path)
-        if inferred:
-            use_in_feature = inferred
+        use_in_feature = infer_use_in_feature(entrypoint_path)
+        if use_in_feature:
             logger.info(f"Inferred use_in_feature: {use_in_feature}")
         else:
-            logger.info(f"Using use_in_feature: {use_in_feature}")
+            click.secho(
+                "Error: Function signature does not match a supported type. "
+                "Use SearchIndexChunkingV1Request and "
+                "SearchIndexChunkingV1Response in function signature.",
+                fg="red",
+            )
+            raise click.Abort()
 
-        assert use_in_feature is not None
         # Map feature names to Connect API names
         mapped_feature = USE_IN_FEATURE_MAPPING_FOR_CONNECT_API.get(
             use_in_feature, use_in_feature

{salesforce_data_customcode-6.0.1 → salesforce_data_customcode-6.0.2}/src/datacustomcode/token_provider.py

@@ -140,37 +140,44 @@ class SFCLITokenProvider(TokenProvider):
                 )
             return dict(data)
 
-        # Get instanceUrl from sf org display
+        # Get org info from sf org display
         display_data = _run_sf_command(
             ["sf", "org", "display", "--target-org", self.sf_cli_org, "--json"],
             "sf org display",
         )
-        instance_url = display_data.get("result", {}).get("instanceUrl")
+        result_data = display_data.get("result", {})
+        instance_url = result_data.get("instanceUrl")
         if not instance_url:
             raise RuntimeError(
                 f"'sf org display' did not return an instance URL "
                 f"for org '{self.sf_cli_org}'"
             )
 
-        # Get access token via show-access-token (newer SF CLI versions
-        # redact the token in sf org display)
-        token_data = _run_sf_command(
-            [
-                "sf",
-                "org",
-                "auth",
-                "show-access-token",
-                "--target-org",
-                self.sf_cli_org,
-                "--json",
-            ],
-            "sf org auth show-access-token",
-        )
-        access_token = token_data.get("result", {}).get("accessToken")
+        # Try show-access-token first (SF CLI >= 2.136.6); fall back to the
+        # token from sf org display (older CLIs don't redact it).
+        access_token = None
+        try:
+            token_data = _run_sf_command(
+                [
+                    "sf",
+                    "org",
+                    "auth",
+                    "show-access-token",
+                    "--target-org",
+                    self.sf_cli_org,
+                    "--json",
+                ],
+                "sf org auth show-access-token",
+            )
+            access_token = token_data.get("result", {}).get("accessToken")
+        except RuntimeError:
+            # Command not available on older SF CLI versions
+            access_token = result_data.get("accessToken")
+
         if not access_token:
             raise RuntimeError(
-                f"'sf org auth show-access-token' did not return an access token "
-                f"for org '{self.sf_cli_org}'"
+                f"Could not obtain an access token for org '{self.sf_cli_org}'. "
+                f"Upgrade SF CLI to 2.136.6+ or ensure the org is authenticated."
             )
 
         return AccessTokenResponse(access_token=access_token, instance_url=instance_url)