sfq 0.0.16__tar.gz → 0.0.18__tar.gz

sfq-0.0.18/.github/workflows/publish.yml

@@ -0,0 +1,106 @@
+name: Version, Build, and Publish
+
+on:
+  push:
+    branches: ["main"]
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  id-token: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    environment: release
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.12
+
+      - name: Install uv CLI
+        uses: astral-sh/setup-uv@v4
+        with:
+          version: latest
+          enable-cache: true
+
+      - name: Sync dependencies with uv
+        run: uv sync
+
+      - name: Authenticate GitHub CLI
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
+
+      - name: Calculate next patch version from latest tag (using gh)
+        id: get_version
+        run: |
+          echo "Fetching tags using gh CLI..."
+
+          TAGS=$(gh api repos/${{ github.repository }}/tags --jq '.[].name' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+$' | sort -V)
+
+          echo "All semver tags found:"
+          echo "$TAGS"
+
+          LATEST_TAG=$(echo "$TAGS" | tail -n1)
+          echo "Latest tag found: $LATEST_TAG"
+
+          if [ -z "$LATEST_TAG" ]; then
+            NEXT_VERSION="0.0.1"
+            echo "No tags found, starting at $NEXT_VERSION"
+          else
+            IFS='.' read -r MAJOR MINOR PATCH <<< "$LATEST_TAG"
+            PATCH=$((PATCH + 1))
+            NEXT_VERSION="$MAJOR.$MINOR.$PATCH"
+            echo "Incremented patch version to $NEXT_VERSION"
+          fi
+
+          echo "version=$NEXT_VERSION" >> $GITHUB_OUTPUT
+
+      - name: Update version strings in files
+        run: |
+          VERSION=${{ steps.get_version.outputs.version }}
+
+          echo "Updating pyproject.toml version to $VERSION"
+          sed -i -E "s/(^version *= *\")([0-9]+\.[0-9]+\.[0-9]+)(\")/\1$VERSION\3/" pyproject.toml
+
+          echo "Updating uv.lock version to $VERSION"
+          sed -i -E "s/(^version *= *\")([0-9]+\.[0-9]+\.[0-9]+)(\")/\1$VERSION\3/" uv.lock
+
+          echo "Updating src/sfq/__init__.py user_agent to $VERSION"
+          sed -i -E "s/(user_agent: str = \"sfq\/)[0-9]+\.[0-9]+\.[0-9]+(\")/\1$VERSION\2/" src/sfq/__init__.py
+          sed -i -E "s/(default is \"sfq\/)[0-9]+\.[0-9]+\.[0-9]+(\")/\1$VERSION\2/" src/sfq/__init__.py
+
+      - name: Commit version updates
+        run: |
+          git config user.name "github-actions"
+          git config user.email "github-actions@users.noreply.github.com"
+          git add pyproject.toml uv.lock src/sfq/__init__.py
+          git commit -m "chore: bump version to ${{ steps.get_version.outputs.version }}"
+          git push
+
+      - name: Create and push git tag
+        run: |
+          VERSION=${{ steps.get_version.outputs.version }}
+          git tag $VERSION
+          git push origin $VERSION
+
+      - name: Build package with uv
+        run: uv build
+
+      - name: Publish package distributions to PyPI
+        uses: pypa/gh-action-pypi-publish@release/v1
+
+      - name: Upload artifacts to GitHub Release (prerelease)
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ steps.get_version.outputs.version }}
+          name: Release ${{ steps.get_version.outputs.version }}
+          files: dist/*
+          prerelease: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{sfq-0.0.16 → sfq-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sfq
-Version: 0.0.16
+Version: 0.0.18
 Summary: Python wrapper for the Salesforce's Query API.
 Author-email: David Moruzzi <sfq.pypi@dmoruzi.com>
 Keywords: salesforce,salesforce query
@@ -56,18 +56,6 @@ print(sf.query("SELECT Id FROM Account LIMIT 5"))
 print(sf.tooling_query("SELECT Id, FullName, Metadata FROM SandboxSettings LIMIT 5"))
 ```
 
-### sObject Key Prefixes
-
-```python
-# Key prefix via IDs
-print(sf.get_sobject_prefixes())
->>> {'0Pp': 'AIApplication', '6S9': 'AIApplicationConfig', '9qd': 'AIInsightAction', '9bq': 'AIInsightFeedback', '0T2': 'AIInsightReason', '9qc': 'AIInsightValue', ...}
-
-# Key prefix via names
-print(sf.get_sobject_prefixes(key_type="name"))
->>> {'AIApplication': '0Pp', 'AIApplicationConfig': '6S9', 'AIInsightAction': '9qd', 'AIInsightFeedback': '9bq', 'AIInsightReason': '0T2', 'AIInsightValue': '9qc', ...}
-```
-
 ### Composite Batch Queries
 
 ```python
@@ -94,7 +82,7 @@ for subrequest_identifer, subrequest_response in batched_response.items():
 
 ```python
 response = sf.cdelete(['07La0000000bYgj', '07La0000000bYgk', '07La0000000bYgl'])
->>> [{'id': '500aj000006wtdZAAQ', 'success': True, 'errors': []}, {'id': '500aj000006wtdaAAA', 'success': True, 'errors': []}, {'id': '500aj000006wtdbAAA', 'success': True, 'errors': []}]
+>>> [{'id': '07La0000000bYgj', 'success': True, 'errors': []}, {'id': '07La0000000bYgk', 'success': True, 'errors': []}, {'id': '07La0000000bYgl', 'success': True, 'errors': []}]
 ```
 
 ### Static Resources
@@ -110,6 +98,18 @@ print(f'Updated resource: {page}')
 sf.update_static_resource_id('081aj000009jUMXAA2', '<h1>It works!</h1>')
 ```
 
+### sObject Key Prefixes
+
+```python
+# Key prefix via IDs
+print(sf.get_sobject_prefixes())
+>>> {'0Pp': 'AIApplication', '6S9': 'AIApplicationConfig', '9qd': 'AIInsightAction', '9bq': 'AIInsightFeedback', '0T2': 'AIInsightReason', '9qc': 'AIInsightValue', ...}
+
+# Key prefix via names
+print(sf.get_sobject_prefixes(key_type="name"))
+>>> {'AIApplication': '0Pp', 'AIApplicationConfig': '6S9', 'AIInsightAction': '9qd', 'AIInsightFeedback': '9bq', 'AIInsightReason': '0T2', 'AIInsightValue': '9qc', ...}
+```
+
 ## How to Obtain Salesforce Tokens
 
 To use the `sfq` library, you'll need a **client ID** and **refresh token**. The easiest way to obtain these is by using the Salesforce CLI:

{sfq-0.0.16 → sfq-0.0.18}/README.md

@@ -40,18 +40,6 @@ print(sf.query("SELECT Id FROM Account LIMIT 5"))
 print(sf.tooling_query("SELECT Id, FullName, Metadata FROM SandboxSettings LIMIT 5"))
 ```
 
-### sObject Key Prefixes
-
-```python
-# Key prefix via IDs
-print(sf.get_sobject_prefixes())
->>> {'0Pp': 'AIApplication', '6S9': 'AIApplicationConfig', '9qd': 'AIInsightAction', '9bq': 'AIInsightFeedback', '0T2': 'AIInsightReason', '9qc': 'AIInsightValue', ...}
-
-# Key prefix via names
-print(sf.get_sobject_prefixes(key_type="name"))
->>> {'AIApplication': '0Pp', 'AIApplicationConfig': '6S9', 'AIInsightAction': '9qd', 'AIInsightFeedback': '9bq', 'AIInsightReason': '0T2', 'AIInsightValue': '9qc', ...}
-```
-
 ### Composite Batch Queries
 
 ```python
@@ -78,7 +66,7 @@ for subrequest_identifer, subrequest_response in batched_response.items():
 
 ```python
 response = sf.cdelete(['07La0000000bYgj', '07La0000000bYgk', '07La0000000bYgl'])
->>> [{'id': '500aj000006wtdZAAQ', 'success': True, 'errors': []}, {'id': '500aj000006wtdaAAA', 'success': True, 'errors': []}, {'id': '500aj000006wtdbAAA', 'success': True, 'errors': []}]
+>>> [{'id': '07La0000000bYgj', 'success': True, 'errors': []}, {'id': '07La0000000bYgk', 'success': True, 'errors': []}, {'id': '07La0000000bYgl', 'success': True, 'errors': []}]
 ```
 
 ### Static Resources
@@ -94,6 +82,18 @@ print(f'Updated resource: {page}')
 sf.update_static_resource_id('081aj000009jUMXAA2', '<h1>It works!</h1>')
 ```
 
+### sObject Key Prefixes
+
+```python
+# Key prefix via IDs
+print(sf.get_sobject_prefixes())
+>>> {'0Pp': 'AIApplication', '6S9': 'AIApplicationConfig', '9qd': 'AIInsightAction', '9bq': 'AIInsightFeedback', '0T2': 'AIInsightReason', '9qc': 'AIInsightValue', ...}
+
+# Key prefix via names
+print(sf.get_sobject_prefixes(key_type="name"))
+>>> {'AIApplication': '0Pp', 'AIApplicationConfig': '6S9', 'AIInsightAction': '9qd', 'AIInsightFeedback': '9bq', 'AIInsightReason': '0T2', 'AIInsightValue': '9qc', ...}
+```
+
 ## How to Obtain Salesforce Tokens
 
 To use the `sfq` library, you'll need a **client ID** and **refresh token**. The easiest way to obtain these is by using the Salesforce CLI:

{sfq-0.0.16 → sfq-0.0.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sfq"
-version = "0.0.16"
+version = "0.0.18"
 description = "Python wrapper for the Salesforce's Query API."
 readme = "README.md"
 authors = [{ name = "David Moruzzi", email = "sfq.pypi@dmoruzi.com" }]

{sfq-0.0.16 → sfq-0.0.18}/src/sfq/__init__.py

@@ -84,9 +84,9 @@ class SFAuth:
         access_token: Optional[str] = None,
         token_expiration_time: Optional[float] = None,
         token_lifetime: int = 15 * 60,
-        user_agent: str = "sfq/0.0.16",
+        user_agent: str = "sfq/0.0.18",
         sforce_client: str = "_auto",
-        proxy: str = "auto",
+        proxy: str = "_auto",
     ) -> None:
         """
         Initializes the SFAuth with necessary parameters.
@@ -100,9 +100,9 @@ class SFAuth:
         :param access_token: The access token for the current session (default is None).
         :param token_expiration_time: The expiration time of the access token (default is None).
         :param token_lifetime: The lifetime of the access token in seconds (default is 15 minutes).
-        :param user_agent: Custom User-Agent string (default is "sfq/0.0.16").
+        :param user_agent: Custom User-Agent string (default is "sfq/0.0.18").
         :param sforce_client: Custom Application Identifier (default is user_agent).
-        :param proxy: The proxy configuration, "auto" to use environment (default is "auto").
+        :param proxy: The proxy configuration, "_auto" to use environment (default is "_auto").
         """
         self.instance_url = self._format_instance_url(instance_url)
         self.client_id = client_id
@@ -114,12 +114,12 @@ class SFAuth:
         self.token_expiration_time = token_expiration_time
         self.token_lifetime = token_lifetime
         self.user_agent = user_agent
-        self.sforce_client = quote(str(sforce_client), safe="")
+        self.sforce_client = str(sforce_client).replace(",", "")
         self._auto_configure_proxy(proxy)
         self._high_api_usage_threshold = 80
 
         if sforce_client == "_auto":
-            self.sforce_client = quote(str(user_agent), safe="")
+            self.sforce_client = user_agent
 
         if self.client_secret == "_deprecation_warning":
             warnings.warn(
@@ -134,6 +134,13 @@ class SFAuth:
             )
 
     def _format_instance_url(self, instance_url) -> str:
+        """
+        HTTPS is mandatory with Spring '21 release,
+        This method ensures that the instance URL is formatted correctly.
+
+        :param instance_url: The Salesforce instance URL.
+        :return: The formatted instance URL.
+        """
         if instance_url.startswith("https://"):
             return instance_url
         if instance_url.startswith("http://"):
@@ -144,8 +151,8 @@ class SFAuth:
         """
         Automatically configure the proxy based on the environment or provided value.
         """
-        if proxy == "auto":
-            self.proxy = os.environ.get("https_proxy")
+        if proxy == "_auto":
+            self.proxy = os.environ.get("https_proxy")  # HTTPs is mandatory
             if self.proxy:
                 logger.debug("Auto-configured proxy: %s", self.proxy)
         else:
@@ -798,3 +805,74 @@ class SFAuth:
             if isinstance(result, (dict, list))
         ]
         return combined_response or None
+
+    def _cupdate(self, update_dict: Dict[str, Any], batch_size: int = 25, max_workers: int = None) -> Optional[Dict[str, Any]]:
+        """
+        Execute the Composite Update API to update multiple records.
+
+        :param update_dict: A dictionary of keys of records to be updated, and a dictionary of field-value pairs to be updated, with a special key '_' overriding the sObject type which is otherwise inferred from the key. Example:
+            {'001aj00000C8kJhAAJ': {'Subject': 'Easily updated via SFQ'}, '00aaj000006wtdcAAA': {'_': 'CaseComment', 'IsPublished': False}, '001aj0000002yJRCAY': {'_': 'IdeaComment', 'CommentBody': 'Hello World!'}} 
+        :param batch_size: The number of records to update in each batch (default is 25).
+        :return: JSON response from the update request or None on failure.
+        """
+        allOrNone = False
+        endpoint = f"/services/data/{self.api_version}/composite"
+
+        compositeRequest_payload = []
+        sobject_prefixes = {}
+
+        for key, record in update_dict.items():
+            sobject = record.copy().pop("_", None)
+            if not sobject and not sobject_prefixes:
+                sobject_prefixes = self.get_sobject_prefixes()
+            
+            sobject = str(sobject) or str(sobject_prefixes.get(str(key[:3]), None))
+            
+            compositeRequest_payload.append(
+                {
+                    'method': 'PATCH',
+                    'url': f"/services/data/{self.api_version}/sobjects/{sobject}/{key}",
+                    'referenceId': key,
+                    'body': record,
+                }
+            )
+
+        chunks = [compositeRequest_payload[i:i+batch_size] for i in range(0, len(compositeRequest_payload), batch_size)]
+
+        def update_chunk(chunk: List[Dict[str, Any]]) -> Optional[Dict[str, Any]]:
+            payload = {
+                "allOrNone": bool(allOrNone),
+                "compositeRequest": chunk
+            }
+
+            status_code, resp_data = self._send_request(
+                method="POST",
+                endpoint=endpoint,
+                headers=self._get_common_headers(),
+                body=json.dumps(payload),
+            )
+
+            if status_code == 200:
+                logger.debug("Composite update API response without errors.")
+                return json.loads(resp_data)
+            else:
+                logger.error("Composite update API request failed: %s", status_code)
+                logger.debug("Response body: %s", resp_data)
+                return None
+
+        results = []
+        with ThreadPoolExecutor(max_workers=max_workers) as executor:
+            futures = [executor.submit(update_chunk, chunk) for chunk in chunks]
+            for future in as_completed(futures):
+                result = future.result()
+                if result:
+                    results.append(result)
+
+        combined_response = [
+            item
+            for result in results
+            for item in (result if isinstance(result, list) else [result])
+            if isinstance(result, (dict, list))
+        ]
+        
+        return combined_response or None

{sfq-0.0.16 → sfq-0.0.18}/uv.lock

@@ -3,5 +3,5 @@ requires-python = ">=3.9"
 
 [[package]]
 name = "sfq"
-version = "0.0.16"
+version = "0.0.18"
 source = { editable = "." }

sfq-0.0.16/.github/workflows/publish.yml

@@ -1,37 +0,0 @@
-name: Publish to PyPI
-
-on:
-  release:
-    types: [published]
-  workflow_dispatch:
-
-jobs:
-
-  publish-release:
-    name: upload release to PyPI
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    environment: release
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v4
-        with:
-          version: "latest"
-          enable-cache: true
-
-      - name: Uv sync
-        run: uv sync
-
-      - name: Build package
-        run: uv build
-
-      - name: Publish package distributions to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1