Merge branch 'release/v1.0.1'

Author: locbt-casso

.github/workflows/auto-response.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Post auto-response
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             github.rest.issues.createComment({

.github/workflows/create-release.yml

@@ -1,10 +1,12 @@
 name: Create Github Release
 
 on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+[a-zA-Z]+[0-9]*"
+  workflow_run:
+    workflows: ["Run Tests"]
+    types:
+      - completed
+    branches:
+      - '**'
   workflow_dispatch:
     inputs:
       tag:
@@ -15,13 +17,19 @@ on:
 jobs:
   create-release:
     runs-on: ubuntu-latest
+    # Only run if tests passed and this is a tag push, or manual dispatch
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_branch, 'refs/tags/v'))
 
     permissions:
       contents: write
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          ref: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.tag) || github.event.workflow_run.head_branch }}
 
       - name: Extract version information
         id: version_info
@@ -30,7 +38,7 @@ jobs:
           if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
             VERSION="${{ github.event.inputs.tag }}"
           else
-            VERSION="${{ github.ref_name }}"
+            VERSION="${{ github.event.workflow_run.head_branch }}"
           fi
 
           echo "version=$VERSION" >> $GITHUB_OUTPUT
@@ -85,13 +93,13 @@ jobs:
         id: create_release
         run: |
           if [ "${{ steps.version_info.outputs.is_prerelease }}" = "true" ]; then
-            echo "Create release for version ${{ github.ref_name }} (Pre-release)"
+            echo "Create release for version ${{ steps.version_info.outputs.version }} (Pre-release)"
             gh release create "${{ steps.version_info.outputs.version }}" \
               --title "${{ steps.version_info.outputs.release_name }}" \
               --notes-file release_notes.md \
               --prerelease
           else
-            echo "Create release for version ${{ github.ref_name }}"
+            echo "Create release for version ${{ steps.version_info.outputs.version }}"
             gh release create "${{ steps.version_info.outputs.version }}" \
               --title "${{ steps.version_info.outputs.release_name }}" \
               --notes-file release_notes.md

.github/workflows/publish-pypi.yml

@@ -1,28 +1,58 @@
 name: Publish to PyPi
 
 on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"
-      - "v[0-9]+.[0-9]+.[0-9]+[a-zA-Z]+[0-9]"
+  workflow_run:
+    workflows: ["Run Tests"]
+    types:
+      - completed
+    branches:
+      - '**'
   workflow_dispatch:
+    inputs:
+      tag:
+        description: "Tag to checkout and publish (e.g., v2.0.0)"
+        required: true
+        type: string
+        default: ""
+
+permissions:
+  contents: read
 
 jobs:
   publish-and-release:
     runs-on: ubuntu-latest
     environment: publish
+    # Only run if tests passed and this is a tag push, or manual dispatch
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      (github.event.workflow_run.conclusion == 'success' && startsWith(github.event.workflow_run.head_branch, 'refs/tags/v'))
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+          ref: ${{ (github.event_name == 'workflow_dispatch' && github.event.inputs.tag != '' && github.event.inputs.tag) || github.event.workflow_run.head_branch }}
+
+      - name: Verify tag exists (only for dispatch)
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          git fetch --tags
+          if ! git rev-parse --verify "refs/tags/${{ github.event.inputs.tag }}" > /dev/null; then
+            echo "ERROR: Tag '${{ github.event.inputs.tag }}' does not exist"
+            echo "Available tags:"
+            git tag --sort=-version:refname | head -10
+            exit 1
+          fi
+          echo "Tag '${{ github.event.inputs.tag }}' verified successfully"
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version-file: ".python-version"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Publish to PyPI
         run: |

.github/workflows/test.yml

@@ -0,0 +1,48 @@
+name: Run Tests
+
+on:
+  push:
+    branches:
+      - '**'
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+[a-zA-Z]+[0-9]*'
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v6
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@v7
+
+      - name: Install dependencies
+        run: uv sync --group dev
+
+      - name: Run linting and type checks
+        run: uv run poe lint
+
+      - name: Run tests
+        run: uv run pytest -q
+
+      - name: Upload coverage reports
+        if: matrix.python-version == '3.9'
+        uses: codecov/codecov-action@v5
+        continue-on-error: true
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -8,4 +8,7 @@ dist
 
 .env
 
-.DS_Store
+.DS_Store
+
+cov.xml
+.coverage

CONTRIBUTING.md

@@ -34,6 +34,14 @@ uv run poe format
 uv run poe lint
 ```
 
+## Testing
+
+We use [pytest](https://docs.pytest.org) as testing framework.
+
+```bash
+uv run poe test
+```
+
 ## Publishing and release
 
 Update version with `uv version --bump`:

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "payos"
-version = "1.0.0"
+version = "1.0.1"
 description = "payOS Python SDK"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -109,6 +109,7 @@ force-wrap-aliases = true
 "typecheck" = [{ cmd = "mypy ./src" }]
 format = ["fix:ruff", "format:ruff"]
 lint = ["check:ruff", "typecheck", "check:importable"]
+test = [{ cmd = "pytest" }]
 
 # Combined tasks
 check = ["format", "lint"]
@@ -125,7 +126,7 @@ testpaths = ["tests"]
 python_files = ["test_*.py", "*_test.py"]
 python_classes = ["Test*"]
 python_functions = ["test_*"]
-addopts = "-v --tb=short"
+addopts = "-v --tb=short --cov=payos --cov-report=xml:cov.xml"
 asyncio_mode = "auto"
 
 [dependency-groups]
@@ -138,5 +139,6 @@ dev = [
     "mypy>=1.17.1",
     "ruff>=0.12.11",
     "poethepoet>=0.37.0",
+    "pytest-cov>=7.0.0",
 ]
 example = ["flask>=3.1.2", "python-dotenv>=1.1.1"]

src/payos/_crypto/provider.py

@@ -110,7 +110,7 @@ def create_signature_from_object(
         self, data: Union[dict[str, Any], Any], key: str
     ) -> Optional[str]:
         """Create HMAC signature from object data."""
-        if not data or not key:
+        if data is None or not key:
             return None
 
         # Convert Pydantic models to camelCase dict
@@ -128,7 +128,7 @@ def create_signature_of_payment_request(
         self, data: Union[dict[str, Any], Any], key: str
     ) -> Optional[str]:
         """Create signature for payment request using specific fields."""
-        if not data or not key:
+        if data is None or not key:
             return None
 
         data = _convert_to_camel_case_dict(data)

src/payos/_version.py

@@ -1,2 +1,2 @@
 # Do not update manually, this will be generate when building
-__version__ = "1.0.0"
+__version__ = "1.0.1"

src/payos/resources/webhooks/webhooks.py

@@ -116,10 +116,31 @@ async def confirm(self, webhook_url: str, **kwargs: Any) -> ConfirmWebhookRespon
         except Exception as error:
             raise error
 
-    async def verify(self, webhook: Webhook) -> WebhookData:
+    async def verify(self, payload: Union[str, bytes, dict, Webhook]) -> WebhookData:
         """
         Verify the webhook data sent from payOS.
         """
+        if isinstance(payload, Webhook):
+            webhook = payload
+        else:
+            if isinstance(payload, (bytes, bytearray)):
+                payload_str = payload.decode("utf-8")
+                payload_obj = safe_json_parse(payload_str)
+                if not payload_obj:
+                    raise WebhookError("Invalid JSON")
+            elif isinstance(payload, str):
+                payload_obj = safe_json_parse(payload)
+                if not payload_obj:
+                    raise WebhookError("Invalid JSON")
+            elif isinstance(payload, dict):
+                payload_obj = payload
+            else:
+                raise WebhookError(f"Unsupported payload type: {type(payload)}")
+            try:
+                webhook = Webhook(**payload_obj)
+            except ValidationError as e:
+                raise WebhookError(f"Webhook schema validation failed: {e}") from e
+
         data = webhook.data
         signature = webhook.signature