Merge pull request #20 from paywithextend/development

Release 1.2.0

Author: byjoh

.github/workflows/release.yml

@@ -34,11 +34,10 @@ jobs:
           rm -rf build dist *.egg-info
           make build ENV=stage
 
-      - name: Extract Version from pyproject.toml
+      - name: Extract Version from version file
         id: get_version
         run: |
-          # Extract the version assuming a line like: version = "0.1.0"
-          VERSION=$(grep -Po '^version\s*=\s*"\K[^"]+' pyproject.toml)
+          VERSION=$(grep -Po '^__version__\s*=\s*"\K[^"]+' extend/__version__.py)
           echo "Version extracted: $VERSION"
           echo "version=$VERSION" >> $GITHUB_OUTPUT  
 

extend/__init__.py

@@ -3,9 +3,10 @@
 """
 
 from extend.models import VirtualCard, Transaction, RecurrenceConfig
+from .__version__ import __version__ as _version
 from .extend import ExtendClient
 
-__version__ = "1.1.0"
+__version__ = _version
 
 __all__ = [
     "ExtendClient",

extend/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.2.0"

extend/client.py

@@ -66,15 +66,7 @@ async def get(self, url: str, params: Optional[Dict] = None) -> Any:
             httpx.HTTPError: If the request fails
             ValueError: If the response is not valid JSON
         """
-        async with httpx.AsyncClient() as client:
-            response = await client.get(
-                self.build_full_url(url),
-                headers=self.headers,
-                params=params,
-                timeout=httpx.Timeout(30)
-            )
-            response.raise_for_status()
-            return response.json()
+        return await self._send_request("GET", url, params=params)
 
     async def post(self, url: str, data: Dict) -> Any:
         """Make a POST request to the Extend API.
@@ -90,15 +82,7 @@ async def post(self, url: str, data: Dict) -> Any:
             httpx.HTTPError: If the request fails
             ValueError: If the response is not valid JSON
         """
-        async with httpx.AsyncClient() as client:
-            response = await client.post(
-                self.build_full_url(url),
-                headers=self.headers,
-                json=data,
-                timeout=httpx.Timeout(30)
-            )
-            response.raise_for_status()
-            return response.json()
+        return await self._send_request("POST", url, json=data)
 
     async def put(self, url: str, data: Dict) -> Any:
         """Make a PUT request to the Extend API.
@@ -114,15 +98,7 @@ async def put(self, url: str, data: Dict) -> Any:
             httpx.HTTPError: If the request fails
             ValueError: If the response is not valid JSON
         """
-        async with httpx.AsyncClient() as client:
-            response = await client.put(
-                self.build_full_url(url),
-                headers=self.headers,
-                json=data,
-                timeout=httpx.Timeout(30)
-            )
-            response.raise_for_status()
-            return response.json()
+        return await self._send_request("PUT", url, json=data)
 
     async def patch(self, url: str, data: Dict) -> Any:
         """Make a PATCH request to the Extend API.
@@ -138,15 +114,7 @@ async def patch(self, url: str, data: Dict) -> Any:
             httpx.HTTPError: If the request fails
             ValueError: If the response is not valid JSON
         """
-        async with httpx.AsyncClient() as client:
-            response = await client.patch(
-                self.build_full_url(url),
-                headers=self.headers,
-                json=data,
-                timeout=httpx.Timeout(30)
-            )
-            response.raise_for_status()
-            return response.json()
+        return await self._send_request("PATCH", url, json=data)
 
     async def post_multipart(
             self,
@@ -173,16 +141,34 @@ async def post_multipart(
         """
         # When sending multipart data, we pass `data` (for non-file fields)
         # and `files` (for file uploads) separately.
+        return await self._send_request("POST", url, data=data, files=files)
+
+    def build_full_url(self, url: Optional[str]):
+        return f"https://{API_HOST}{url or ''}"
+
+    async def _send_request(
+            self,
+            method: str,
+            url: str,
+            *,
+            params: Optional[Dict] = None,
+            json: Optional[Dict] = None,
+            data: Optional[Dict] = None,
+            files: Optional[Dict] = None
+    ) -> Any:
         async with httpx.AsyncClient() as client:
-            response = await client.post(
-                self.build_full_url(url),
+            response = await client.request(
+                method=method.upper(),
+                url=self.build_full_url(url),
                 headers=self.headers,
+                params=params,
+                json=json,
                 data=data,
                 files=files,
                 timeout=httpx.Timeout(30)
             )
             response.raise_for_status()
-            return response.json()
 
-    def build_full_url(self, url: Optional[str]):
-        return f"https://{API_HOST}{url or ''}"
+            if response.content:
+                return response.json()
+            return None

extend/resources/transactions.py

@@ -114,3 +114,20 @@ async def update_transaction_expense_data(self, transaction_id: str, data: Dict)
             path=f"/{transaction_id}/expensedata",
             params=data
         )
+
+    async def send_receipt_reminder(self, transaction_id: str) -> Dict:
+        """Send a transaction-specific receipt reminder.
+
+        Args:
+            transaction_id (str): The unique identifier of the transaction.
+
+        Returns:
+            None
+
+        Raises:
+            httpx.HTTPError: If the request fails.
+        """
+        return await self._request(
+            method="post",
+            path=f"/{transaction_id}/receiptreminder"
+        )

pyproject.toml

@@ -8,6 +8,7 @@ version = "1.1.0"
 description = "Python client for the Extend API"
 readme = "README.md"
 authors = [{ name = "Extend Engineering", email = "[email protected]" }]
+dynamic = ["version"]
 license = { text = "MIT" }
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -26,6 +27,9 @@ dependencies = [
 "Issue Tracker" = "https://github.com/paywithextend/extend-python/issues"
 "Source Code" = "https://github.com/paywithextend/extend-python"
 
+[tool.hatch.version]
+path = "extend/__version__.py"
+
 [tool.hatch.build.targets.wheel]
 packages = ["extend"]
 

tests/test_client.py

@@ -649,3 +649,17 @@ async def test_get_automatch_status(extend, mocker):
     assert response["id"] == "job_123"
     assert len(response["tasks"]) == 1
     assert response["tasks"][0]["transactionId"] == "txn_123"
+
+
+@pytest.mark.asyncio
+async def test_send_receipt_reminder(extend, mocker, mock_transaction):
+    mock_post = mocker.patch.object(
+        extend._api_client,
+        'post',
+        return_value=None
+    )
+
+    result = await extend.transactions.send_receipt_reminder(mock_transaction["id"])
+
+    assert result is None
+    mock_post.assert_called_once_with("/transactions/txn_123/receiptreminder", None)

tests/test_integration.py

@@ -432,7 +432,7 @@ async def test_update_transaction_expense_data_with_specific_category_and_label(
         assert label_resp["code"] == label_code
 
         # Retrieve at least one transaction to update expense data
-        transactions_response = await extend.transactions.get_transactions(per_page=1)
+        transactions_response = await extend.transactions.get_transactions(per_page=1, sort_field="-date")
         assert "report" in transactions_response, "Response should include 'report'"
         assert "transactions" in transactions_response["report"], "Response should include 'transactions'"
         assert transactions_response["report"][
@@ -534,6 +534,29 @@ async def test_automatch_receipts_and_get_status(self, extend):
         assert status_response["id"] == job_id, "Job id should match the one returned during automatch"
         assert "tasks" in status_response, "Status response should include tasks"
 
+    @pytest.mark.asyncio
+    async def test_send_receipt_reminder(self, extend):
+        """Test sending a receipt reminder for a transaction that requires a receipt."""
+
+        # Fetch a page of transactions and look for one that requires a receipt
+        response = await extend.transactions.get_transactions(per_page=20, sort_field='-date')
+        transactions = response.get("report", {}).get("transactions", [])
+
+        # Find a transaction with receiptRequired = True
+        tx_with_receipt_required = next(
+            (tx for tx in transactions if tx.get("receiptRequired") is True),
+            None
+        )
+
+        assert tx_with_receipt_required, "No transactions found with receiptRequired = True"
+        transaction_id = tx_with_receipt_required["id"]
+
+        # Send receipt reminder
+        result = await extend.transactions.send_receipt_reminder(transaction_id)
+
+        # The call should succeed and return None
+        assert result is None
+
 
 def test_environment_variables():
     """Test that required environment variables are set"""