Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fe0c477dff | ||
|
|
e7e0fc8c1d | ||
|
|
34fc046868 | ||
|
|
5149299c1b | ||
|
|
fef9552cbf | ||
|
|
e9b21895f4 | ||
|
|
f5953906c1 | ||
|
|
1f02195c27 | ||
|
|
f092ca2022 | ||
|
|
c6eed43d70 | ||
|
|
9e4b1e2c5e | ||
|
|
0096df78a5 | ||
|
|
3073bfbf50 | ||
|
|
30a1de32e8 | ||
|
|
8465957976 | ||
|
|
3ecb9c3136 | ||
|
|
0f31170209 | ||
|
|
e3cab5e0b6 | ||
|
|
f428a974f6 | ||
|
|
a3b9912107 | ||
|
|
abaa078471 | ||
|
|
9864f0cc9d | ||
|
|
e39b467b6b | ||
|
|
85c1a64e14 | ||
|
|
a8491c005c |
@@ -0,0 +1,19 @@
|
|||||||
|
## Version bump
|
||||||
|
|
||||||
|
If this PR changes files under `python_repositories/`, the **title must** start with one of:
|
||||||
|
|
||||||
|
- `[patch]` or `[fix]` — bug fix (0.3.1 → 0.3.2)
|
||||||
|
- `[minor]` or `[feat]` — new feature (0.3.1 → 0.4.0)
|
||||||
|
- `[major]` or `[breaking]` — breaking change (0.3.1 → 1.0.0)
|
||||||
|
|
||||||
|
Docs-, CI-, or test-only PRs do not need a prefix.
|
||||||
|
|
||||||
|
**Example title:** `[minor] Add streaming support to RedisAdapter`
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
|
||||||
|
<!-- What changed and why -->
|
||||||
|
|
||||||
|
## Test plan
|
||||||
|
|
||||||
|
- [ ] Integration tests pass locally
|
||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version-file: .python-version
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
@@ -36,7 +36,7 @@ jobs:
|
|||||||
run: uv run ruff format --check .
|
run: uv run ruff format --check .
|
||||||
|
|
||||||
- name: Pyupgrade check
|
- name: Pyupgrade check
|
||||||
run: uv run pyupgrade --py313-plus $(git ls-files '*.py') && git diff --exit-code
|
run: uv run pyupgrade --py312-plus $(git ls-files '*.py') && git diff --exit-code
|
||||||
|
|
||||||
- name: Prettier format
|
- name: Prettier format
|
||||||
run: uv run pre-commit run prettier --all-files
|
run: uv run pre-commit run prettier --all-files
|
||||||
|
|||||||
@@ -11,26 +11,24 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.CI_RUNNER_TOKEN }}
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version-file: .python-version
|
||||||
|
|
||||||
- name: Install uv and pip-review
|
- name: Install uv
|
||||||
run: |
|
run: pip install uv
|
||||||
pip install uv pip-review
|
|
||||||
|
|
||||||
- name: Update dependencies in pyproject.toml
|
- name: Upgrade dependencies
|
||||||
run: |
|
run: uv lock --upgrade
|
||||||
uv pip update --all --group dev
|
|
||||||
uv pip compile --all
|
|
||||||
|
|
||||||
- name: Commit and push changes
|
- name: Commit and push changes
|
||||||
uses: peter-evans/create-pull-request@v6
|
env:
|
||||||
with:
|
API_URL: ${{ vars.API_URL }}
|
||||||
commit-message: "chore(deps): update dependencies [automated]"
|
REPO_OWNER: ${{ github.repository_owner }}
|
||||||
branch: "renovate/auto-deps-update"
|
REPO_NAME: ${{ github.event.repository.name }}
|
||||||
title: "chore(deps): update dependencies"
|
CI_RUNNER_TOKEN: ${{ secrets.CI_RUNNER_TOKEN }}
|
||||||
body: "This PR was created automatically to update dependencies."
|
run: scripts/ci/create-deps-update-pr.sh
|
||||||
token: ${{ secrets.CI_RUNNER_TOKEN }}
|
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
name: PR Title Check
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
check-title:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Check PR title when source files change
|
||||||
|
env:
|
||||||
|
PR_TITLE: ${{ github.event.pull_request.title }}
|
||||||
|
run: |
|
||||||
|
git fetch origin "${{ github.base_ref }}"
|
||||||
|
git diff --name-only "origin/${{ github.base_ref }}...HEAD" \
|
||||||
|
| scripts/ci/check-pr-title.sh "$PR_TITLE"
|
||||||
@@ -17,17 +17,13 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version-file: .python-version
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
|
|
||||||
- name: Update version in pyproject.toml to match tag
|
- name: Update version in pyproject.toml to match tag
|
||||||
run: |
|
run: scripts/ci/bump-version.sh --from-tag "${GITHUB_REF##*/}"
|
||||||
TAG_VERSION="${GITHUB_REF##*/}"
|
|
||||||
VERSION="${TAG_VERSION#v}"
|
|
||||||
sed -i.bak -E "s/^version = \".*\"/version = \"${VERSION}\"/" pyproject.toml
|
|
||||||
rm pyproject.toml.bak
|
|
||||||
|
|
||||||
- name: Build package
|
- name: Build package
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
name: Release on merge to main
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout code
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
token: ${{ secrets.CI_RUNNER_TOKEN }}
|
||||||
|
|
||||||
|
- name: Parse merge commit
|
||||||
|
id: meta
|
||||||
|
env:
|
||||||
|
COMMIT_MSG: ${{ github.event.head_commit.message }}
|
||||||
|
run: scripts/ci/parse-merge-commit.sh "$COMMIT_MSG"
|
||||||
|
|
||||||
|
- name: Bump version
|
||||||
|
if: steps.meta.outputs.bump != 'skip'
|
||||||
|
id: bump
|
||||||
|
run: scripts/ci/bump-version.sh "${{ steps.meta.outputs.bump }}"
|
||||||
|
|
||||||
|
- name: Generate release notes
|
||||||
|
if: steps.meta.outputs.bump != 'skip'
|
||||||
|
id: notes
|
||||||
|
env:
|
||||||
|
PR_TITLE: ${{ steps.meta.outputs.pr_title }}
|
||||||
|
run: |
|
||||||
|
PREV_TAG=$(git describe --tags --abbrev=0)
|
||||||
|
NEW_TAG="v${{ steps.bump.outputs.version }}"
|
||||||
|
scripts/ci/generate-release-notes.sh "$NEW_TAG" "$PR_TITLE" "$PREV_TAG"
|
||||||
|
|
||||||
|
- name: Commit, tag, and push
|
||||||
|
if: steps.meta.outputs.bump != 'skip'
|
||||||
|
env:
|
||||||
|
VERSION: ${{ steps.bump.outputs.version }}
|
||||||
|
CI_RUNNER_TOKEN: ${{ secrets.CI_RUNNER_TOKEN }}
|
||||||
|
run: |
|
||||||
|
git config user.name "CI Bot"
|
||||||
|
git config user.email "[email protected]"
|
||||||
|
git add pyproject.toml
|
||||||
|
git commit -m "chore: release v${VERSION} [skip ci]"
|
||||||
|
git tag "v${VERSION}"
|
||||||
|
git remote set-url origin "https://x-access-token:${CI_RUNNER_TOKEN}@${GITHUB_SERVER_URL#https://}/${GITHUB_REPOSITORY}.git"
|
||||||
|
git push origin main
|
||||||
|
git push origin "v${VERSION}"
|
||||||
|
|
||||||
|
- name: Create Gitea release
|
||||||
|
if: steps.meta.outputs.bump != 'skip'
|
||||||
|
env:
|
||||||
|
API_URL: ${{ vars.API_URL }}
|
||||||
|
REPO_OWNER: ${{ github.repository_owner }}
|
||||||
|
REPO_NAME: ${{ github.event.repository.name }}
|
||||||
|
CI_RUNNER_TOKEN: ${{ secrets.CI_RUNNER_TOKEN }}
|
||||||
|
VERSION: ${{ steps.bump.outputs.version }}
|
||||||
|
PR_TITLE: ${{ steps.meta.outputs.pr_title }}
|
||||||
|
RELEASE_BODY: ${{ steps.notes.outputs.body }}
|
||||||
|
run: |
|
||||||
|
SUMMARY=$(echo "$PR_TITLE" | sed -E 's/^\[(patch|fix|minor|feat|major|breaking)\][[:space:]]*//i')
|
||||||
|
export RELEASE_NAME="v${VERSION} — ${SUMMARY}"
|
||||||
|
PAYLOAD=$(python3 -c 'import json, os; print(json.dumps({"tag_name": "v" + os.environ["VERSION"], "name": os.environ["RELEASE_NAME"], "body": os.environ["RELEASE_BODY"]}))')
|
||||||
|
curl -s -X POST \
|
||||||
|
"${API_URL}/repos/${REPO_OWNER}/${REPO_NAME}/releases" \
|
||||||
|
-H "Authorization: token ${CI_RUNNER_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$PAYLOAD"
|
||||||
@@ -1,29 +0,0 @@
|
|||||||
name: Security Audit
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
- cron: "0 0 * * 0" # Weekly
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
safety:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: ${{ inputs.python-version }}
|
|
||||||
|
|
||||||
- name: Install uv
|
|
||||||
run: pip install uv
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
env:
|
|
||||||
UV_LINK_MODE: copy
|
|
||||||
run: uv sync
|
|
||||||
|
|
||||||
- name: Run safety check
|
|
||||||
run: uv run safety check
|
|
||||||
@@ -15,7 +15,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version-file: .python-version
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
name: Sync pyproject.toml Version
|
|
||||||
|
|
||||||
on:
|
|
||||||
workflow_run:
|
|
||||||
workflows: ["Publish Python Package"]
|
|
||||||
types:
|
|
||||||
- completed
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
commit-version-update:
|
|
||||||
if: ${{ github.event.workflow_run.conclusion == 'success' }}
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Set up Python
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
with:
|
|
||||||
python-version: ${{ inputs.python-version }}
|
|
||||||
|
|
||||||
- name: Configure git
|
|
||||||
run: |
|
|
||||||
git config user.name "CI Bot"
|
|
||||||
git config user.email "[email protected]"
|
|
||||||
|
|
||||||
- name: Update version in pyproject.toml to match tag
|
|
||||||
run: |
|
|
||||||
TAG_VERSION="${{ github.event.workflow_run.head_branch }}"
|
|
||||||
VERSION="${TAG_VERSION#v}"
|
|
||||||
sed -i.bak -E "s/^version = \".*\"/version = \"${VERSION}\"/" pyproject.toml
|
|
||||||
rm pyproject.toml.bak
|
|
||||||
|
|
||||||
- name: Commit and push changes
|
|
||||||
run: |
|
|
||||||
git add pyproject.toml
|
|
||||||
git commit -m "chore: update version in pyproject.toml to ${VERSION} [skip ci]" || echo "No changes to commit"
|
|
||||||
git push
|
|
||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ inputs.python-version }}
|
python-version-file: .python-version
|
||||||
|
|
||||||
- name: Install uv
|
- name: Install uv
|
||||||
run: pip install uv
|
run: pip install uv
|
||||||
@@ -32,6 +32,7 @@ jobs:
|
|||||||
run: uv run pytest --cov=python_repositories --cov-report=term-missing > coverage.txt
|
run: uv run pytest --cov=python_repositories --cov-report=term-missing > coverage.txt
|
||||||
|
|
||||||
- name: Post coverage summary to PR
|
- name: Post coverage summary to PR
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
env:
|
env:
|
||||||
API_URL: ${{ vars.API_URL }}
|
API_URL: ${{ vars.API_URL }}
|
||||||
REPO_OWNER: ${{ github.repository_owner }}
|
REPO_OWNER: ${{ github.repository_owner }}
|
||||||
@@ -39,9 +40,20 @@ jobs:
|
|||||||
PR_NUMBER: ${{ github.event.pull_request.number }}
|
PR_NUMBER: ${{ github.event.pull_request.number }}
|
||||||
CI_RUNNER_TOKEN: ${{ secrets.CI_RUNNER_TOKEN }}
|
CI_RUNNER_TOKEN: ${{ secrets.CI_RUNNER_TOKEN }}
|
||||||
run: |
|
run: |
|
||||||
COVERAGE=$(cat coverage.txt)
|
PAYLOAD=$(python3 -c '
|
||||||
COMMENT_BODY="**Test Coverage Report:**\n\`\`\`\n$COVERAGE\n\`\`\`"
|
import json
|
||||||
curl -s -X POST "$API_URL/repos/$REPO_OWNER/$REPO_NAME/issues/$PR_NUMBER/comments" \
|
import pathlib
|
||||||
|
|
||||||
|
coverage = pathlib.Path("coverage.txt").read_text()
|
||||||
|
print(
|
||||||
|
json.dumps(
|
||||||
|
{
|
||||||
|
"body": f"**Test Coverage Report:**\n```\n{coverage}\n```",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
')
|
||||||
|
curl -sf -X POST "$API_URL/repos/$REPO_OWNER/$REPO_NAME/issues/$PR_NUMBER/comments" \
|
||||||
-H "Authorization: token $CI_RUNNER_TOKEN" \
|
-H "Authorization: token $CI_RUNNER_TOKEN" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "{\"body\": \"$COMMENT_BODY\"}"
|
-d "$PAYLOAD"
|
||||||
|
|||||||
@@ -173,4 +173,3 @@ cython_debug/
|
|||||||
|
|
||||||
# PyPI configuration file
|
# PyPI configuration file
|
||||||
.pypirc
|
.pypirc
|
||||||
|
|
||||||
|
|||||||
@@ -24,13 +24,15 @@ repos:
|
|||||||
rev: v1.8.0
|
rev: v1.8.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: mypy
|
- id: mypy
|
||||||
|
additional_dependencies:
|
||||||
|
- types-redis
|
||||||
|
|
||||||
# Python syntax modernization with pyupgrade
|
# Python syntax modernization with pyupgrade
|
||||||
- repo: https://github.com/asottile/pyupgrade
|
- repo: https://github.com/asottile/pyupgrade
|
||||||
rev: v3.20.0
|
rev: v3.20.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: pyupgrade
|
- id: pyupgrade
|
||||||
args: ["--py311-plus"]
|
args: ["--py312-plus"]
|
||||||
|
|
||||||
# Formatting for Markdown, JSON, and YAML with Prettier
|
# Formatting for Markdown, JSON, and YAML with Prettier
|
||||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
- repo: https://github.com/pre-commit/mirrors-prettier
|
||||||
|
|||||||
@@ -12,8 +12,12 @@ Subclass an adapter in your own repository to add domain-specific methods while
|
|||||||
| **Adapters** | Technology-specific base classes (`RedisAdapter`, `MinioAdapter`) |
|
| **Adapters** | Technology-specific base classes (`RedisAdapter`, `MinioAdapter`) |
|
||||||
| **Your project** | Subclass an adapter and add domain methods |
|
| **Your project** | Subclass an adapter and add domain methods |
|
||||||
|
|
||||||
|
Connection adapters expose `connect()`, `disconnect()`, and `is_connected()`. The latter verifies backend reachability with a cached health probe (default TTL: 1 second). Subclasses may override `health_check_ttl_seconds`.
|
||||||
|
|
||||||
## Optional dependencies
|
## Optional dependencies
|
||||||
|
|
||||||
|
Repository **interfaces** import with the base package. **Adapters** require the matching extra; importing an adapter without its extra raises `ImportError` with install instructions.
|
||||||
|
|
||||||
Install with the extras you need:
|
Install with the extras you need:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -112,3 +116,38 @@ uv run pre-commit run --all-files
|
|||||||
```
|
```
|
||||||
|
|
||||||
Integration tests require Docker (testcontainers).
|
Integration tests require Docker (testcontainers).
|
||||||
|
|
||||||
|
## Releases
|
||||||
|
|
||||||
|
Releases are automated when a pull request is merged to `main`. CI reads the **merged PR title** to decide whether and how to bump the version.
|
||||||
|
|
||||||
|
### How it works
|
||||||
|
|
||||||
|
1. Open a PR targeting `main` (see [`.gitea/PULL_REQUEST_TEMPLATE.md`](.gitea/PULL_REQUEST_TEMPLATE.md)).
|
||||||
|
2. If the PR changes files under `python_repositories/`, the title **must** start with a version bump prefix (enforced by CI).
|
||||||
|
3. On merge, [`release.yml`](.gitea/workflows/release.yml) bumps [`pyproject.toml`](pyproject.toml), commits, tags `vX.Y.Z`, creates a Gitea release with auto-generated notes, and pushes the tag.
|
||||||
|
4. [`publish.yml`](.gitea/workflows/publish.yml) builds and publishes the package to the Gitea Package Registry.
|
||||||
|
|
||||||
|
Docs-, CI-, and test-only PRs do not need a prefix and will not trigger a release.
|
||||||
|
|
||||||
|
### PR title prefixes
|
||||||
|
|
||||||
|
| Prefix | Bump | Example |
|
||||||
|
| ------------------------- | ---------- | --------------------- |
|
||||||
|
| `[patch]` or `[fix]` | patch | `0.3.1` → `0.3.2` |
|
||||||
|
| `[minor]` or `[feat]` | minor | `0.3.1` → `0.4.0` |
|
||||||
|
| `[major]` or `[breaking]` | major | `0.3.1` → `1.0.0` |
|
||||||
|
| _(none)_ | no release | docs / CI / deps only |
|
||||||
|
|
||||||
|
Example titles:
|
||||||
|
|
||||||
|
- `[minor] Add public repository interfaces and subclassable adapter CRUD API`
|
||||||
|
- `[patch] Fix mypy context manager typing for adapter subclasses`
|
||||||
|
|
||||||
|
### Release notes
|
||||||
|
|
||||||
|
Release notes are generated from commits since the previous tag (see [`scripts/ci/generate-release-notes.sh`](scripts/ci/generate-release-notes.sh)).
|
||||||
|
|
||||||
|
### Manual release
|
||||||
|
|
||||||
|
You can still push a `v*.*.*` tag manually; `publish.yml` will build and publish. The current baseline version is **0.3.1**.
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "python-repositories"
|
name = "python-repositories"
|
||||||
version = "0.1.0"
|
version = "0.4.0"
|
||||||
description = "Various python repository interfaces exposed as a python package."
|
description = "Various python repository interfaces exposed as a python package."
|
||||||
authors = [
|
authors = [
|
||||||
{ name = "Brian Bjarke Jensen", email = "[email protected]" }
|
{ name = "Brian Bjarke Jensen", email = "[email protected]" }
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
"""python_repositories: Unified repository interfaces and adapters."""
|
"""python_repositories: Unified repository interfaces and adapters."""
|
||||||
|
|
||||||
from .adapters import MinioAdapter, RedisAdapter
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
# Interfaces are always available; they have no optional backend dependencies.
|
||||||
|
from . import adapters
|
||||||
from .interfaces import (
|
from .interfaces import (
|
||||||
ConnectionAwareInterface,
|
ConnectionAwareInterface,
|
||||||
ContextAwareInterface,
|
ContextAwareInterface,
|
||||||
@@ -8,11 +13,27 @@ from .interfaces import (
|
|||||||
ObjectRepositoryInterface,
|
ObjectRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Adapters are imported only for static type checkers; runtime loading is delegated below.
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from .adapters.minio_adapter import MinioAdapter as MinioAdapter
|
||||||
|
from .adapters.redis_adapter import RedisAdapter as RedisAdapter
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"ConnectionAwareInterface",
|
"ConnectionAwareInterface",
|
||||||
"ContextAwareInterface",
|
"ContextAwareInterface",
|
||||||
"JsonRepositoryInterface",
|
"JsonRepositoryInterface",
|
||||||
"ObjectRepositoryInterface",
|
"ObjectRepositoryInterface",
|
||||||
"RedisAdapter",
|
*adapters.__all__,
|
||||||
"MinioAdapter",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def __getattr__(name: str) -> object:
|
||||||
|
"""Delegate adapter lookups to adapters; lazy loading is defined there."""
|
||||||
|
if name in adapters.__all__:
|
||||||
|
return getattr(adapters, name)
|
||||||
|
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
|
||||||
|
|
||||||
|
|
||||||
|
def __dir__() -> list[str]:
|
||||||
|
"""Expose lazy adapter names in tab completion and dir()."""
|
||||||
|
return sorted(__all__)
|
||||||
|
|||||||
@@ -4,10 +4,39 @@ Adapters for various backend repositories (e.g., Redis, Minio).
|
|||||||
This module exposes concrete implementations for repository interfaces.
|
This module exposes concrete implementations for repository interfaces.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from .redis_adapter import RedisAdapter
|
from __future__ import annotations
|
||||||
from .minio_adapter import MinioAdapter
|
|
||||||
|
import importlib
|
||||||
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
# Adapters are imported only for static type checkers; runtime loading is deferred below.
|
||||||
|
if TYPE_CHECKING:
|
||||||
|
from .minio_adapter import MinioAdapter
|
||||||
|
from .redis_adapter import RedisAdapter
|
||||||
|
|
||||||
|
# Map public adapter names to their defining module and class.
|
||||||
|
# Each adapter module fails fast with an install hint if its extra is missing.
|
||||||
|
# When adding a new adapter, update this dict and __all__ only.
|
||||||
|
_LAZY_EXPORTS = {
|
||||||
|
"RedisAdapter": (".redis_adapter", "RedisAdapter"),
|
||||||
|
"MinioAdapter": (".minio_adapter", "MinioAdapter"),
|
||||||
|
}
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"RedisAdapter",
|
"RedisAdapter",
|
||||||
"MinioAdapter",
|
"MinioAdapter",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def __getattr__(name: str) -> object:
|
||||||
|
"""Load an adapter on first access so the base package installs without backend clients."""
|
||||||
|
if name in _LAZY_EXPORTS:
|
||||||
|
module_path, attr = _LAZY_EXPORTS[name]
|
||||||
|
module = importlib.import_module(module_path, __package__)
|
||||||
|
return getattr(module, attr)
|
||||||
|
raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
|
||||||
|
|
||||||
|
|
||||||
|
def __dir__() -> list[str]:
|
||||||
|
"""Expose lazy adapter names in tab completion and dir()."""
|
||||||
|
return sorted(__all__)
|
||||||
|
|||||||
@@ -2,10 +2,10 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
import os
|
import os
|
||||||
from io import BytesIO
|
|
||||||
from importlib.util import find_spec
|
|
||||||
from typing import Self
|
|
||||||
import structlog
|
import structlog
|
||||||
|
import time
|
||||||
|
from io import BytesIO
|
||||||
|
from typing import Self
|
||||||
from python_utils import check_env
|
from python_utils import check_env
|
||||||
|
|
||||||
from python_repositories.interfaces import (
|
from python_repositories.interfaces import (
|
||||||
@@ -14,9 +14,13 @@ from python_repositories.interfaces import (
|
|||||||
ObjectRepositoryInterface,
|
ObjectRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Handle optional dependencies
|
try:
|
||||||
if find_spec("minio") is not None:
|
|
||||||
import minio
|
import minio
|
||||||
|
except ImportError as exc:
|
||||||
|
raise ImportError(
|
||||||
|
"MinIO support requires the minio extra. "
|
||||||
|
"Install with: pip install python-repositories[minio]"
|
||||||
|
) from exc
|
||||||
|
|
||||||
|
|
||||||
class MinioAdapter(
|
class MinioAdapter(
|
||||||
@@ -31,6 +35,7 @@ class MinioAdapter(
|
|||||||
secret_key_env_var_name: str = "MINIO_SECRET_KEY"
|
secret_key_env_var_name: str = "MINIO_SECRET_KEY"
|
||||||
bucket_env_var_name: str = "MINIO_BUCKET"
|
bucket_env_var_name: str = "MINIO_BUCKET"
|
||||||
chunk_size: int = 5 * 2**20 # 5 MiB
|
chunk_size: int = 5 * 2**20 # 5 MiB
|
||||||
|
health_check_ttl_seconds: float = 1.0
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
# Setup logger
|
# Setup logger
|
||||||
@@ -49,6 +54,8 @@ class MinioAdapter(
|
|||||||
# Prepare internal variables
|
# Prepare internal variables
|
||||||
self._client: minio.Minio | None = None
|
self._client: minio.Minio | None = None
|
||||||
self._bucket_name: str | None = None
|
self._bucket_name: str | None = None
|
||||||
|
self._health_check_at: float | None = None
|
||||||
|
self._health_check_ok: bool = False
|
||||||
|
|
||||||
def __enter__(self) -> Self:
|
def __enter__(self) -> Self:
|
||||||
"""Enter the context."""
|
"""Enter the context."""
|
||||||
@@ -72,10 +79,11 @@ class MinioAdapter(
|
|||||||
|
|
||||||
def connect(self) -> None:
|
def connect(self) -> None:
|
||||||
"""Connect to the Minio server."""
|
"""Connect to the Minio server."""
|
||||||
# Stop if already connected
|
if self._client is not None and self.is_connected():
|
||||||
if self.is_connected:
|
|
||||||
self.logger.info("Already connected to Minio")
|
self.logger.info("Already connected to Minio")
|
||||||
return
|
return
|
||||||
|
if self._client is not None:
|
||||||
|
self.disconnect()
|
||||||
# Prepare arguments
|
# Prepare arguments
|
||||||
endpoint = str(os.getenv(self.endpoint_env_var_name))
|
endpoint = str(os.getenv(self.endpoint_env_var_name))
|
||||||
access_key = str(os.getenv(self.access_key_env_var_name))
|
access_key = str(os.getenv(self.access_key_env_var_name))
|
||||||
@@ -100,6 +108,7 @@ class MinioAdapter(
|
|||||||
# Persist information
|
# Persist information
|
||||||
self._client = client
|
self._client = client
|
||||||
self._bucket_name = bucket
|
self._bucket_name = bucket
|
||||||
|
self._invalidate_health_cache()
|
||||||
|
|
||||||
def disconnect(self) -> None:
|
def disconnect(self) -> None:
|
||||||
"""Disconnect from the Minio server."""
|
"""Disconnect from the Minio server."""
|
||||||
@@ -108,13 +117,36 @@ class MinioAdapter(
|
|||||||
# Reset client
|
# Reset client
|
||||||
self._client = None
|
self._client = None
|
||||||
self._bucket_name = None
|
self._bucket_name = None
|
||||||
|
self._invalidate_health_cache()
|
||||||
|
|
||||||
|
def _invalidate_health_cache(self) -> None:
|
||||||
|
self._health_check_at = None
|
||||||
|
self._health_check_ok = False
|
||||||
|
|
||||||
|
def _probe_connection(self) -> bool:
|
||||||
|
assert self._client is not None and self._bucket_name is not None
|
||||||
|
try:
|
||||||
|
return bool(self._client.bucket_exists(self._bucket_name))
|
||||||
|
except Exception: # pylint: disable=broad-except
|
||||||
|
return False
|
||||||
|
|
||||||
@property
|
|
||||||
def is_connected(self) -> bool:
|
def is_connected(self) -> bool:
|
||||||
"""Check if connected to Minio server."""
|
"""Check if connected to the Minio server."""
|
||||||
res = bool(isinstance(self._client, minio.Minio))
|
if self._client is None or self._bucket_name is None:
|
||||||
self.logger.debug(res)
|
return False
|
||||||
return res
|
now = time.monotonic()
|
||||||
|
if self._health_check_at is not None:
|
||||||
|
seconds_since_last_health_check = now - self._health_check_at
|
||||||
|
cache_is_fresh = (
|
||||||
|
seconds_since_last_health_check < self.health_check_ttl_seconds
|
||||||
|
)
|
||||||
|
if cache_is_fresh:
|
||||||
|
return self._health_check_ok
|
||||||
|
result = self._probe_connection()
|
||||||
|
self._health_check_at = now
|
||||||
|
self._health_check_ok = result
|
||||||
|
self.logger.debug("Connection status", connected=result)
|
||||||
|
return result
|
||||||
|
|
||||||
def put(
|
def put(
|
||||||
self,
|
self,
|
||||||
@@ -131,8 +163,9 @@ class MinioAdapter(
|
|||||||
if not isinstance(content_type, str) or len(content_type) == 0:
|
if not isinstance(content_type, str) or len(content_type) == 0:
|
||||||
raise ValueError("content_type must be a non-empty string")
|
raise ValueError("content_type must be a non-empty string")
|
||||||
# Check connection
|
# Check connection
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Minio")
|
raise ConnectionError("Not connected to Minio")
|
||||||
|
assert self._client is not None and self._bucket_name is not None
|
||||||
# Prepare buffer for reading
|
# Prepare buffer for reading
|
||||||
num_bytes = data.getbuffer().nbytes
|
num_bytes = data.getbuffer().nbytes
|
||||||
data.seek(0)
|
data.seek(0)
|
||||||
@@ -156,8 +189,9 @@ class MinioAdapter(
|
|||||||
if not isinstance(object_name, str) or len(object_name) == 0:
|
if not isinstance(object_name, str) or len(object_name) == 0:
|
||||||
raise ValueError("object_name must be a non-empty string")
|
raise ValueError("object_name must be a non-empty string")
|
||||||
# Check connection
|
# Check connection
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Minio")
|
raise ConnectionError("Not connected to Minio")
|
||||||
|
assert self._client is not None and self._bucket_name is not None
|
||||||
# Get data from bucket
|
# Get data from bucket
|
||||||
# N.B. bucket name is set when connecting
|
# N.B. bucket name is set when connecting
|
||||||
try:
|
try:
|
||||||
@@ -191,8 +225,9 @@ class MinioAdapter(
|
|||||||
if not isinstance(object_name, str) or len(object_name) == 0:
|
if not isinstance(object_name, str) or len(object_name) == 0:
|
||||||
raise ValueError("object_name must be a non-empty string")
|
raise ValueError("object_name must be a non-empty string")
|
||||||
# Check connection
|
# Check connection
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Minio")
|
raise ConnectionError("Not connected to Minio")
|
||||||
|
assert self._client is not None and self._bucket_name is not None
|
||||||
# Delete object from bucket
|
# Delete object from bucket
|
||||||
# N.B. bucket name is set when connecting
|
# N.B. bucket name is set when connecting
|
||||||
self._client.remove_object(
|
self._client.remove_object(
|
||||||
@@ -210,8 +245,9 @@ class MinioAdapter(
|
|||||||
raise ValueError("prefix must be a string")
|
raise ValueError("prefix must be a string")
|
||||||
# Check connection
|
# Check connection
|
||||||
# N.B. bucket name is set when connecting
|
# N.B. bucket name is set when connecting
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Minio")
|
raise ConnectionError("Not connected to Minio")
|
||||||
|
assert self._client is not None and self._bucket_name is not None
|
||||||
# List objects in bucket
|
# List objects in bucket
|
||||||
objects = self._client.list_objects(
|
objects = self._client.list_objects(
|
||||||
bucket_name=self._bucket_name,
|
bucket_name=self._bucket_name,
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
from typing import Self, cast
|
from typing import Self, cast
|
||||||
from importlib.util import find_spec
|
|
||||||
import os
|
import os
|
||||||
import structlog
|
import structlog
|
||||||
|
import time
|
||||||
|
|
||||||
from python_utils import check_env
|
from python_utils import check_env
|
||||||
|
|
||||||
@@ -14,10 +14,14 @@ from python_repositories.interfaces import (
|
|||||||
JsonRepositoryInterface,
|
JsonRepositoryInterface,
|
||||||
)
|
)
|
||||||
|
|
||||||
# Handle optional dependencies
|
try:
|
||||||
if find_spec("redis") is not None:
|
|
||||||
import redis
|
import redis
|
||||||
from redis.commands.json.path import Path as RedisPath
|
from redis.commands.json.path import Path as RedisPath
|
||||||
|
except ImportError as exc:
|
||||||
|
raise ImportError(
|
||||||
|
"Redis support requires the redis extra. "
|
||||||
|
"Install with: pip install python-repositories[redis]"
|
||||||
|
) from exc
|
||||||
|
|
||||||
|
|
||||||
class RedisAdapter(
|
class RedisAdapter(
|
||||||
@@ -30,6 +34,7 @@ class RedisAdapter(
|
|||||||
uri_env_var_name: str = "REDIS_URI"
|
uri_env_var_name: str = "REDIS_URI"
|
||||||
path: str = "." # JSON root path, updated in __init__
|
path: str = "." # JSON root path, updated in __init__
|
||||||
encoding: str = "UTF-8"
|
encoding: str = "UTF-8"
|
||||||
|
health_check_ttl_seconds: float = 1.0
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
# Setup logger
|
# Setup logger
|
||||||
@@ -41,6 +46,8 @@ class RedisAdapter(
|
|||||||
# Prepare internal variables
|
# Prepare internal variables
|
||||||
self._client: redis.Redis | None = None
|
self._client: redis.Redis | None = None
|
||||||
self.path: str = RedisPath.root_path()
|
self.path: str = RedisPath.root_path()
|
||||||
|
self._health_check_at: float | None = None
|
||||||
|
self._health_check_ok: bool = False
|
||||||
|
|
||||||
def __enter__(self) -> Self:
|
def __enter__(self) -> Self:
|
||||||
"""Enter the context."""
|
"""Enter the context."""
|
||||||
@@ -64,6 +71,10 @@ class RedisAdapter(
|
|||||||
|
|
||||||
def connect(self) -> None:
|
def connect(self) -> None:
|
||||||
"""Connect to the Redis server."""
|
"""Connect to the Redis server."""
|
||||||
|
if self._client is not None:
|
||||||
|
self._client.close()
|
||||||
|
self._client = None
|
||||||
|
self._invalidate_health_cache()
|
||||||
# Prepare arguments
|
# Prepare arguments
|
||||||
uri = str(os.getenv(self.uri_env_var_name))
|
uri = str(os.getenv(self.uri_env_var_name))
|
||||||
# Connect client
|
# Connect client
|
||||||
@@ -78,6 +89,7 @@ class RedisAdapter(
|
|||||||
raise ConnectionError(f"Could not connect to Redis at {uri}") from exc
|
raise ConnectionError(f"Could not connect to Redis at {uri}") from exc
|
||||||
# Persist client
|
# Persist client
|
||||||
self._client = client
|
self._client = client
|
||||||
|
self._invalidate_health_cache()
|
||||||
|
|
||||||
def disconnect(self) -> None:
|
def disconnect(self) -> None:
|
||||||
"""Disconnect from the Redis server."""
|
"""Disconnect from the Redis server."""
|
||||||
@@ -86,13 +98,36 @@ class RedisAdapter(
|
|||||||
self._client.close()
|
self._client.close()
|
||||||
# Reset client
|
# Reset client
|
||||||
self._client = None
|
self._client = None
|
||||||
|
self._invalidate_health_cache()
|
||||||
|
|
||||||
|
def _invalidate_health_cache(self) -> None:
|
||||||
|
self._health_check_at = None
|
||||||
|
self._health_check_ok = False
|
||||||
|
|
||||||
|
def _probe_connection(self) -> bool:
|
||||||
|
assert self._client is not None
|
||||||
|
try:
|
||||||
|
return bool(self._client.ping())
|
||||||
|
except (redis.ConnectionError, redis.TimeoutError):
|
||||||
|
return False
|
||||||
|
|
||||||
@property
|
|
||||||
def is_connected(self) -> bool:
|
def is_connected(self) -> bool:
|
||||||
"""Check if connected to Redis server."""
|
"""Check if connected to the Redis server."""
|
||||||
res = bool(isinstance(self._client, redis.Redis))
|
if self._client is None:
|
||||||
self.logger.debug(res)
|
return False
|
||||||
return res
|
now = time.monotonic()
|
||||||
|
if self._health_check_at is not None:
|
||||||
|
seconds_since_last_health_check = now - self._health_check_at
|
||||||
|
cache_is_fresh = (
|
||||||
|
seconds_since_last_health_check < self.health_check_ttl_seconds
|
||||||
|
)
|
||||||
|
if cache_is_fresh:
|
||||||
|
return self._health_check_ok
|
||||||
|
result = self._probe_connection()
|
||||||
|
self._health_check_at = now
|
||||||
|
self._health_check_ok = result
|
||||||
|
self.logger.debug("Connection status", connected=result)
|
||||||
|
return result
|
||||||
|
|
||||||
def set(self, key: str, data: dict) -> None:
|
def set(self, key: str, data: dict) -> None:
|
||||||
"""Set a JSON object in Redis."""
|
"""Set a JSON object in Redis."""
|
||||||
@@ -102,8 +137,9 @@ class RedisAdapter(
|
|||||||
if not isinstance(data, dict) or len(data) == 0:
|
if not isinstance(data, dict) or len(data) == 0:
|
||||||
raise ValueError("Data must be a non-empty dictionary")
|
raise ValueError("Data must be a non-empty dictionary")
|
||||||
# Check connection
|
# Check connection
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Redis")
|
raise ConnectionError("Not connected to Redis")
|
||||||
|
assert self._client is not None
|
||||||
# Set data
|
# Set data
|
||||||
self._client.json().set(key, self.path, data)
|
self._client.json().set(key, self.path, data)
|
||||||
self.logger.debug(f"Set {key} to {data}")
|
self.logger.debug(f"Set {key} to {data}")
|
||||||
@@ -114,8 +150,9 @@ class RedisAdapter(
|
|||||||
if not isinstance(key, str) or len(key) == 0:
|
if not isinstance(key, str) or len(key) == 0:
|
||||||
raise ValueError("Key must be a non-empty string")
|
raise ValueError("Key must be a non-empty string")
|
||||||
# Check connection
|
# Check connection
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Redis")
|
raise ConnectionError("Not connected to Redis")
|
||||||
|
assert self._client is not None
|
||||||
# Get data
|
# Get data
|
||||||
data = cast(
|
data = cast(
|
||||||
dict | None,
|
dict | None,
|
||||||
@@ -130,8 +167,9 @@ class RedisAdapter(
|
|||||||
if not isinstance(key, str) or len(key) == 0:
|
if not isinstance(key, str) or len(key) == 0:
|
||||||
raise ValueError("Key must be a non-empty string")
|
raise ValueError("Key must be a non-empty string")
|
||||||
# Check connection
|
# Check connection
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Redis")
|
raise ConnectionError("Not connected to Redis")
|
||||||
|
assert self._client is not None
|
||||||
# Delete data
|
# Delete data
|
||||||
self._client.json().delete(key)
|
self._client.json().delete(key)
|
||||||
self.logger.debug(f"Deleted {key}")
|
self.logger.debug(f"Deleted {key}")
|
||||||
@@ -142,8 +180,9 @@ class RedisAdapter(
|
|||||||
if not isinstance(pattern, str) or len(pattern) == 0:
|
if not isinstance(pattern, str) or len(pattern) == 0:
|
||||||
raise ValueError("Pattern must be a non-empty string")
|
raise ValueError("Pattern must be a non-empty string")
|
||||||
# Check connection
|
# Check connection
|
||||||
if self._client is None or not self.is_connected:
|
if not self.is_connected():
|
||||||
raise ConnectionError("Not connected to Redis")
|
raise ConnectionError("Not connected to Redis")
|
||||||
|
assert self._client is not None
|
||||||
# List keys
|
# List keys
|
||||||
keys_raw = cast(
|
keys_raw = cast(
|
||||||
list[bytes],
|
list[bytes],
|
||||||
|
|||||||
@@ -16,8 +16,10 @@ class ConnectionAwareInterface(ABC):
|
|||||||
"""Disconnect from resource."""
|
"""Disconnect from resource."""
|
||||||
...
|
...
|
||||||
|
|
||||||
@property
|
|
||||||
@abstractmethod
|
@abstractmethod
|
||||||
def is_connected(self) -> bool:
|
def is_connected(self) -> bool:
|
||||||
"""Check if connected to resource."""
|
"""Return whether the adapter has an active, reachable connection.
|
||||||
|
|
||||||
|
Implementations may perform a cached network probe to verify liveness.
|
||||||
|
"""
|
||||||
...
|
...
|
||||||
|
|||||||
Executable
+37
@@ -0,0 +1,37 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
# shellcheck source=common.sh
|
||||||
|
source "${SCRIPT_DIR}/common.sh"
|
||||||
|
|
||||||
|
usage() {
|
||||||
|
echo "Usage: bump-version.sh <major|minor|patch>" >&2
|
||||||
|
echo " bump-version.sh --from-tag <vX.Y.Z>" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ $# -lt 1 ]]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$1" == "--from-tag" ]]; then
|
||||||
|
if [[ $# -ne 2 ]]; then
|
||||||
|
usage
|
||||||
|
fi
|
||||||
|
VERSION="${2#v}"
|
||||||
|
else
|
||||||
|
BUMP_TYPE="$1"
|
||||||
|
CURRENT=$(latest_tag_version)
|
||||||
|
VERSION=$(bump_semver "$CURRENT" "$BUMP_TYPE")
|
||||||
|
fi
|
||||||
|
|
||||||
|
set_pyproject_version "$VERSION"
|
||||||
|
|
||||||
|
if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
|
||||||
|
echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "version=${VERSION}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Updated pyproject.toml to version ${VERSION}" >&2
|
||||||
Executable
+41
@@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
# shellcheck source=common.sh
|
||||||
|
source "${SCRIPT_DIR}/common.sh"
|
||||||
|
|
||||||
|
PR_TITLE="${1:-${PR_TITLE:-}}"
|
||||||
|
|
||||||
|
if [[ -z "$PR_TITLE" ]]; then
|
||||||
|
echo "Usage: check-pr-title.sh <pr-title> (changed files on stdin)" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
CHANGED_FILES=$(cat)
|
||||||
|
|
||||||
|
if ! has_source_changes "$CHANGED_FILES"; then
|
||||||
|
echo "No changes under ${SOURCE_DIR}/ — PR title prefix not required."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
if title_has_bump_prefix "$PR_TITLE"; then
|
||||||
|
echo "PR title has a valid version bump prefix."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat >&2 <<EOF
|
||||||
|
PR changes files under ${SOURCE_DIR}/ but the title lacks a version bump prefix.
|
||||||
|
|
||||||
|
Title: ${PR_TITLE}
|
||||||
|
|
||||||
|
When changing package source, start the PR title with one of:
|
||||||
|
[patch] or [fix] — bug fix
|
||||||
|
[minor] or [feat] — new feature
|
||||||
|
[major] or [breaking] — breaking change
|
||||||
|
|
||||||
|
Example: [patch] Fix connection retry in RedisAdapter
|
||||||
|
|
||||||
|
See .gitea/PULL_REQUEST_TEMPLATE.md for details.
|
||||||
|
EOF
|
||||||
|
exit 1
|
||||||
Executable
+89
@@ -0,0 +1,89 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Shared helpers for release and PR title CI scripts.
|
||||||
|
|
||||||
|
SOURCE_DIR="python_repositories"
|
||||||
|
|
||||||
|
# Returns bump type (major|minor|patch) or empty if no valid prefix.
|
||||||
|
bump_type_from_title() {
|
||||||
|
local title="$1"
|
||||||
|
local lower
|
||||||
|
lower=$(echo "$title" | tr '[:upper:]' '[:lower:]')
|
||||||
|
|
||||||
|
if echo "$lower" | grep -qE '^\[(major|breaking)\]'; then
|
||||||
|
echo "major"
|
||||||
|
elif echo "$lower" | grep -qE '^\[(minor|feat)\]'; then
|
||||||
|
echo "minor"
|
||||||
|
elif echo "$lower" | grep -qE '^\[(patch|fix)\]'; then
|
||||||
|
echo "patch"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
title_has_bump_prefix() {
|
||||||
|
[[ -n "$(bump_type_from_title "$1")" ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
strip_bump_prefix() {
|
||||||
|
local title="$1"
|
||||||
|
echo "$title" | sed -E 's/^\[(patch|fix|minor|feat|major|breaking)\][[:space:]]*//i'
|
||||||
|
}
|
||||||
|
|
||||||
|
extract_pr_title_from_merge_commit() {
|
||||||
|
local msg="$1"
|
||||||
|
echo "$msg" | sed -n "s/^Merge pull request '\(.*\)' (#.*/\1/p"
|
||||||
|
}
|
||||||
|
|
||||||
|
changed_source_files() {
|
||||||
|
grep -E "^${SOURCE_DIR}/" || true
|
||||||
|
}
|
||||||
|
|
||||||
|
has_source_changes() {
|
||||||
|
local files="$1"
|
||||||
|
echo "$files" | changed_source_files | grep -q .
|
||||||
|
}
|
||||||
|
|
||||||
|
read_pyproject_version() {
|
||||||
|
sed -n 's/^version = "\(.*\)"/\1/p' pyproject.toml | head -1
|
||||||
|
}
|
||||||
|
|
||||||
|
latest_tag_version() {
|
||||||
|
local tag
|
||||||
|
tag=$(git describe --tags --abbrev=0 2>/dev/null || true)
|
||||||
|
if [[ -n "$tag" ]]; then
|
||||||
|
echo "${tag#v}"
|
||||||
|
else
|
||||||
|
read_pyproject_version
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
set_pyproject_version() {
|
||||||
|
local version="$1"
|
||||||
|
sed -i.bak -E "s/^version = \".*\"/version = \"${version}\"/" pyproject.toml
|
||||||
|
rm -f pyproject.toml.bak
|
||||||
|
}
|
||||||
|
|
||||||
|
bump_semver() {
|
||||||
|
local current="$1"
|
||||||
|
local bump_type="$2"
|
||||||
|
local major minor patch
|
||||||
|
|
||||||
|
IFS=. read -r major minor patch <<< "$current"
|
||||||
|
case "$bump_type" in
|
||||||
|
major)
|
||||||
|
major=$((major + 1))
|
||||||
|
minor=0
|
||||||
|
patch=0
|
||||||
|
;;
|
||||||
|
minor)
|
||||||
|
minor=$((minor + 1))
|
||||||
|
patch=0
|
||||||
|
;;
|
||||||
|
patch)
|
||||||
|
patch=$((patch + 1))
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "Unknown bump type: $bump_type" >&2
|
||||||
|
return 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
echo "${major}.${minor}.${patch}"
|
||||||
|
}
|
||||||
Executable
+64
@@ -0,0 +1,64 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
: "${API_URL:?API_URL is required}"
|
||||||
|
: "${REPO_OWNER:?REPO_OWNER is required}"
|
||||||
|
: "${REPO_NAME:?REPO_NAME is required}"
|
||||||
|
: "${CI_RUNNER_TOKEN:?CI_RUNNER_TOKEN is required}"
|
||||||
|
: "${GITHUB_SERVER_URL:?GITHUB_SERVER_URL is required}"
|
||||||
|
: "${GITHUB_REPOSITORY:?GITHUB_REPOSITORY is required}"
|
||||||
|
|
||||||
|
BRANCH="${BRANCH:-renovate/auto-deps-update}"
|
||||||
|
BASE_BRANCH="${BASE_BRANCH:-main}"
|
||||||
|
LOCKFILE="${LOCKFILE:-uv.lock}"
|
||||||
|
|
||||||
|
if git diff --quiet "$LOCKFILE"; then
|
||||||
|
echo "No dependency updates available."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
git config user.name "CI Bot"
|
||||||
|
git config user.email "[email protected]"
|
||||||
|
git add "$LOCKFILE"
|
||||||
|
git commit -m "chore(deps): update dependencies [automated]"
|
||||||
|
|
||||||
|
git remote set-url origin "https://x-access-token:${CI_RUNNER_TOKEN}@${GITHUB_SERVER_URL#https://}/${GITHUB_REPOSITORY}.git"
|
||||||
|
git push origin "HEAD:${BRANCH}"
|
||||||
|
|
||||||
|
if curl -s "${API_URL}/repos/${REPO_OWNER}/${REPO_NAME}/pulls?state=open" \
|
||||||
|
-H "Authorization: token ${CI_RUNNER_TOKEN}" \
|
||||||
|
| BRANCH="$BRANCH" python3 -c '
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
branch = os.environ["BRANCH"]
|
||||||
|
prs = json.load(sys.stdin)
|
||||||
|
sys.exit(0 if any(pr.get("head", {}).get("ref") == branch for pr in prs) else 1)
|
||||||
|
'; then
|
||||||
|
echo "Pull request already exists; branch push updates it."
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
PAYLOAD=$(BRANCH="$BRANCH" BASE_BRANCH="$BASE_BRANCH" python3 -c '
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
print(
|
||||||
|
json.dumps(
|
||||||
|
{
|
||||||
|
"title": "chore(deps): update dependencies",
|
||||||
|
"body": "This PR was created automatically to update dependencies.",
|
||||||
|
"head": os.environ["BRANCH"],
|
||||||
|
"base": os.environ["BASE_BRANCH"],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
)
|
||||||
|
')
|
||||||
|
|
||||||
|
curl -sf -X POST "${API_URL}/repos/${REPO_OWNER}/${REPO_NAME}/pulls" \
|
||||||
|
-H "Authorization: token ${CI_RUNNER_TOKEN}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$PAYLOAD"
|
||||||
|
|
||||||
|
echo "Created pull request."
|
||||||
Executable
+54
@@ -0,0 +1,54 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
# shellcheck source=common.sh
|
||||||
|
source "${SCRIPT_DIR}/common.sh"
|
||||||
|
|
||||||
|
NEW_TAG="${1:-}"
|
||||||
|
SUMMARY="${2:-}"
|
||||||
|
PREV_TAG="${3:-}"
|
||||||
|
|
||||||
|
if [[ -z "$NEW_TAG" ]]; then
|
||||||
|
echo "Usage: generate-release-notes.sh <new-tag> [summary] [prev-tag]" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -z "$PREV_TAG" ]]; then
|
||||||
|
PREV_TAG=$(git describe --tags --abbrev=0 "${NEW_TAG}^" 2>/dev/null || git describe --tags --abbrev=0 2>/dev/null || true)
|
||||||
|
fi
|
||||||
|
|
||||||
|
NOTES="## Summary"
|
||||||
|
if [[ -n "$SUMMARY" ]]; then
|
||||||
|
NOTES="${NOTES}
|
||||||
|
|
||||||
|
$(strip_bump_prefix "$SUMMARY")"
|
||||||
|
else
|
||||||
|
NOTES="${NOTES}
|
||||||
|
|
||||||
|
Automated release ${NEW_TAG}."
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "$PREV_TAG" ]]; then
|
||||||
|
NOTES="${NOTES}
|
||||||
|
|
||||||
|
## Changes since ${PREV_TAG}
|
||||||
|
|
||||||
|
$(git log "${PREV_TAG}..HEAD" --pretty=format:'- %h %s' || true)"
|
||||||
|
else
|
||||||
|
NOTES="${NOTES}
|
||||||
|
|
||||||
|
## Changes
|
||||||
|
|
||||||
|
$(git log --pretty=format:'- %h %s' -20 || true)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
|
||||||
|
{
|
||||||
|
echo 'body<<EOF'
|
||||||
|
echo "$NOTES"
|
||||||
|
echo 'EOF'
|
||||||
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "$NOTES"
|
||||||
|
fi
|
||||||
Executable
+36
@@ -0,0 +1,36 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
# shellcheck source=common.sh
|
||||||
|
source "${SCRIPT_DIR}/common.sh"
|
||||||
|
|
||||||
|
COMMIT_MSG="${1:-${COMMIT_MSG:-}}"
|
||||||
|
|
||||||
|
if [[ -z "$COMMIT_MSG" ]]; then
|
||||||
|
echo "Usage: parse-merge-commit.sh <commit-message>" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
PR_TITLE=$(extract_pr_title_from_merge_commit "$COMMIT_MSG")
|
||||||
|
|
||||||
|
if [[ -z "$PR_TITLE" ]]; then
|
||||||
|
bump="skip"
|
||||||
|
else
|
||||||
|
bump_type=$(bump_type_from_title "$PR_TITLE")
|
||||||
|
if [[ -n "$bump_type" ]]; then
|
||||||
|
bump="$bump_type"
|
||||||
|
else
|
||||||
|
bump="skip"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "${GITHUB_OUTPUT:-}" ]]; then
|
||||||
|
{
|
||||||
|
echo "pr_title=${PR_TITLE}"
|
||||||
|
echo "bump=${bump}"
|
||||||
|
} >> "$GITHUB_OUTPUT"
|
||||||
|
else
|
||||||
|
echo "pr_title=${PR_TITLE}"
|
||||||
|
echo "bump=${bump}"
|
||||||
|
fi
|
||||||
@@ -1,16 +1,19 @@
|
|||||||
"""Integration tests configuration."""
|
"""Integration tests configuration."""
|
||||||
|
|
||||||
|
import logging
|
||||||
import os
|
import os
|
||||||
from collections.abc import Generator
|
from collections.abc import Generator
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import redis
|
import redis
|
||||||
import structlog
|
import structlog
|
||||||
import logging
|
|
||||||
from minio import Minio
|
from minio import Minio
|
||||||
|
|
||||||
from testcontainers.redis import RedisContainer
|
|
||||||
from testcontainers.minio import MinioContainer
|
from testcontainers.minio import MinioContainer
|
||||||
|
|
||||||
|
from tests.integration.redis_container_test import REDIS_PORT, RedisTestContainer
|
||||||
|
|
||||||
|
collect_ignore = ["redis_container_test.py"]
|
||||||
|
|
||||||
MINIO_ACCESS_KEY = "minioadmin"
|
MINIO_ACCESS_KEY = "minioadmin"
|
||||||
MINIO_SECRET_KEY = "minioadmin"
|
MINIO_SECRET_KEY = "minioadmin"
|
||||||
MINIO_BUCKET = "test-bucket"
|
MINIO_BUCKET = "test-bucket"
|
||||||
@@ -37,16 +40,16 @@ def configure_logging() -> None:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def redis_container() -> Generator[str]:
|
def redis_container() -> Generator[str, None, None]:
|
||||||
"""Set up a Redis container for testing and yield the Redis URI."""
|
"""Set up a Redis container for testing and yield the Redis URI."""
|
||||||
# Start container
|
# Start container
|
||||||
container = RedisContainer(
|
container = RedisTestContainer(
|
||||||
image="redis/redis-stack:7.2.0-v0",
|
image="redis/redis-stack:7.2.0-v0",
|
||||||
)
|
)
|
||||||
container.start()
|
container.start()
|
||||||
# Set environment variable for Redis URI
|
# Set environment variable for Redis URI
|
||||||
redis_host = container.get_container_host_ip()
|
redis_host = container.get_container_host_ip()
|
||||||
redis_port = container.get_exposed_port(6379)
|
redis_port = container.get_exposed_port(REDIS_PORT)
|
||||||
redis_uri = f"redis://{redis_host}:{redis_port}"
|
redis_uri = f"redis://{redis_host}:{redis_port}"
|
||||||
|
|
||||||
yield redis_uri
|
yield redis_uri
|
||||||
@@ -56,7 +59,7 @@ def redis_container() -> Generator[str]:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def minio_container() -> Generator[dict[str, str]]:
|
def minio_container() -> Generator[dict[str, str], None, None]:
|
||||||
"""Set up a Minio container for testing and yield the Minio URI."""
|
"""Set up a Minio container for testing and yield the Minio URI."""
|
||||||
# Start container
|
# Start container
|
||||||
container = MinioContainer(
|
container = MinioContainer(
|
||||||
@@ -86,7 +89,7 @@ def minio_container() -> Generator[dict[str, str]]:
|
|||||||
def set_environment_variables(
|
def set_environment_variables(
|
||||||
redis_container: str,
|
redis_container: str,
|
||||||
minio_container: dict[str, str],
|
minio_container: dict[str, str],
|
||||||
) -> Generator[dict[str, str]]:
|
) -> Generator[dict[str, str], None, None]:
|
||||||
"""Set environment variables needed for tests."""
|
"""Set environment variables needed for tests."""
|
||||||
# Build environment variables dictionary
|
# Build environment variables dictionary
|
||||||
env_vars = {"REDIS_URI": redis_container}
|
env_vars = {"REDIS_URI": redis_container}
|
||||||
@@ -103,7 +106,7 @@ def set_environment_variables(
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def raw_redis_client(redis_container: str) -> Generator[redis.Redis]:
|
def raw_redis_client(redis_container: str) -> Generator[redis.Redis, None, None]:
|
||||||
"""Provide a raw Redis client connected to the test Redis container."""
|
"""Provide a raw Redis client connected to the test Redis container."""
|
||||||
# Connect client
|
# Connect client
|
||||||
client = redis.Redis.from_url(
|
client = redis.Redis.from_url(
|
||||||
@@ -119,7 +122,7 @@ def raw_redis_client(redis_container: str) -> Generator[redis.Redis]:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def raw_minio_client(minio_container: dict[str, str]) -> Generator[Minio]:
|
def raw_minio_client(minio_container: dict[str, str]) -> Generator[Minio, None, None]:
|
||||||
"""Provide a raw Minio client connected to the test Minio container."""
|
"""Provide a raw Minio client connected to the test Minio container."""
|
||||||
# Connect client
|
# Connect client
|
||||||
client = Minio(
|
client = Minio(
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ def test_instantiation_fails_when_connect_not_implemented() -> None:
|
|||||||
def disconnect(self) -> None:
|
def disconnect(self) -> None:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@property
|
|
||||||
def is_connected(self) -> bool:
|
def is_connected(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@@ -32,7 +31,6 @@ def test_instantiation_fails_when_disconnect_not_implemented() -> None:
|
|||||||
def connect(self) -> None:
|
def connect(self) -> None:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@property
|
|
||||||
def is_connected(self) -> bool:
|
def is_connected(self) -> bool:
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import random
|
|||||||
import os
|
import os
|
||||||
import logging
|
import logging
|
||||||
from minio import S3Error
|
from minio import S3Error
|
||||||
|
from urllib3.response import BaseHTTPResponse
|
||||||
from python_repositories.adapters.minio_adapter import MinioAdapter
|
from python_repositories.adapters.minio_adapter import MinioAdapter
|
||||||
from python_repositories.interfaces import ObjectRepositoryInterface
|
from python_repositories.interfaces import ObjectRepositoryInterface
|
||||||
|
|
||||||
@@ -42,7 +43,7 @@ def same_data(
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def data() -> Generator[BytesIO]:
|
def data() -> Generator[BytesIO, None, None]:
|
||||||
"""Provide a sample data bytes for tests."""
|
"""Provide a sample data bytes for tests."""
|
||||||
# Generate random bytes
|
# Generate random bytes
|
||||||
random_bytes = random.randbytes(2**21) # 2 MiB
|
random_bytes = random.randbytes(2**21) # 2 MiB
|
||||||
@@ -53,7 +54,7 @@ def data() -> Generator[BytesIO]:
|
|||||||
def data_in_minio(
|
def data_in_minio(
|
||||||
raw_minio_client: Minio,
|
raw_minio_client: Minio,
|
||||||
data: BytesIO,
|
data: BytesIO,
|
||||||
) -> Generator[tuple[str, BytesIO]]:
|
) -> Generator[tuple[str, BytesIO], None, None]:
|
||||||
"""Fixture to set up a known value in Minio before each test."""
|
"""Fixture to set up a known value in Minio before each test."""
|
||||||
object_name = "test_object"
|
object_name = "test_object"
|
||||||
bucket_name = str(os.getenv("MINIO_BUCKET"))
|
bucket_name = str(os.getenv("MINIO_BUCKET"))
|
||||||
@@ -77,7 +78,7 @@ def data_in_minio(
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def minio_adapter() -> Generator[MinioAdapter]:
|
def minio_adapter() -> Generator[MinioAdapter, None, None]:
|
||||||
"""Fixture to provide a connected MinioAdapter instance."""
|
"""Fixture to provide a connected MinioAdapter instance."""
|
||||||
adapter = MinioAdapter()
|
adapter = MinioAdapter()
|
||||||
adapter.connect()
|
adapter.connect()
|
||||||
@@ -114,7 +115,7 @@ def test_should_have_logger_when_instantiated() -> None:
|
|||||||
def test_should_not_be_connected_when_instantiated() -> None:
|
def test_should_not_be_connected_when_instantiated() -> None:
|
||||||
"""Test that the MinioAdapter is not connected when instantiated."""
|
"""Test that the MinioAdapter is not connected when instantiated."""
|
||||||
adapter = MinioAdapter()
|
adapter = MinioAdapter()
|
||||||
assert not adapter.is_connected
|
assert not adapter.is_connected()
|
||||||
|
|
||||||
|
|
||||||
def test_should_log_info_when_already_connected(
|
def test_should_log_info_when_already_connected(
|
||||||
@@ -136,7 +137,7 @@ def test_should_raise_connection_error_when_unable_to_connect(
|
|||||||
adapter = MinioAdapter()
|
adapter = MinioAdapter()
|
||||||
with pytest.raises(ConnectionError):
|
with pytest.raises(ConnectionError):
|
||||||
adapter.connect()
|
adapter.connect()
|
||||||
assert not adapter.is_connected
|
assert not adapter.is_connected()
|
||||||
|
|
||||||
|
|
||||||
def test_should_log_info_when_creating_expected_bucket(
|
def test_should_log_info_when_creating_expected_bucket(
|
||||||
@@ -162,7 +163,7 @@ def test_should_log_error_on_exception_during_exit(
|
|||||||
"""Test that the MinioAdapter logs an error if an exception occurs during __exit__."""
|
"""Test that the MinioAdapter logs an error if an exception occurs during __exit__."""
|
||||||
try:
|
try:
|
||||||
with MinioAdapter() as adapter:
|
with MinioAdapter() as adapter:
|
||||||
assert adapter.is_connected
|
assert adapter.is_connected()
|
||||||
raise ValueError("Simulated error")
|
raise ValueError("Simulated error")
|
||||||
except ValueError:
|
except ValueError:
|
||||||
pass # Expected
|
pass # Expected
|
||||||
@@ -234,12 +235,12 @@ def test_should_log_warning_when_getting_nonexistent_object(
|
|||||||
adapter = MinioAdapter()
|
adapter = MinioAdapter()
|
||||||
adapter._client = MagicMock(spec=Minio)
|
adapter._client = MagicMock(spec=Minio)
|
||||||
adapter._client.get_object.side_effect = S3Error(
|
adapter._client.get_object.side_effect = S3Error(
|
||||||
code="NoSuchKey",
|
MagicMock(spec=BaseHTTPResponse),
|
||||||
message="",
|
"NoSuchKey",
|
||||||
resource="",
|
"",
|
||||||
request_id="",
|
"",
|
||||||
host_id="",
|
"",
|
||||||
response="",
|
"",
|
||||||
bucket_name="test-bucket",
|
bucket_name="test-bucket",
|
||||||
object_name="missing-object",
|
object_name="missing-object",
|
||||||
)
|
)
|
||||||
@@ -264,12 +265,12 @@ def test_should_log_error_when_getting_with_s3error_other_than_no_such_key(
|
|||||||
adapter = MinioAdapter()
|
adapter = MinioAdapter()
|
||||||
adapter._client = MagicMock(spec=Minio)
|
adapter._client = MagicMock(spec=Minio)
|
||||||
other_s3error = S3Error(
|
other_s3error = S3Error(
|
||||||
code="UnhandledError",
|
MagicMock(spec=BaseHTTPResponse),
|
||||||
message="",
|
"UnhandledError",
|
||||||
resource="",
|
"",
|
||||||
request_id="",
|
"",
|
||||||
host_id="",
|
"",
|
||||||
response="",
|
"",
|
||||||
bucket_name="test-bucket",
|
bucket_name="test-bucket",
|
||||||
object_name="missing-object",
|
object_name="missing-object",
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ from python_repositories.interfaces import JsonRepositoryInterface
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def data() -> Generator[dict[str, str]]:
|
def data() -> Generator[dict[str, str], None, None]:
|
||||||
"""Provide a sample data dictionary for tests."""
|
"""Provide a sample data dictionary for tests."""
|
||||||
yield {"foo": "bar"}
|
yield {"foo": "bar"}
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ def data() -> Generator[dict[str, str]]:
|
|||||||
def data_in_redis(
|
def data_in_redis(
|
||||||
raw_redis_client: redis.Redis,
|
raw_redis_client: redis.Redis,
|
||||||
data: dict[str, str],
|
data: dict[str, str],
|
||||||
) -> Generator[tuple[str, dict[str, str]]]:
|
) -> Generator[tuple[str, dict[str, str]], None, None]:
|
||||||
"""Fixture to set up a known value in Redis before each test."""
|
"""Fixture to set up a known value in Redis before each test."""
|
||||||
key = "test_key"
|
key = "test_key"
|
||||||
path = RedisPath.root_path()
|
path = RedisPath.root_path()
|
||||||
@@ -31,7 +31,7 @@ def data_in_redis(
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="module")
|
@pytest.fixture(scope="module")
|
||||||
def redis_adapter(redis_container: str) -> Generator[RedisAdapter]:
|
def redis_adapter(redis_container: str) -> Generator[RedisAdapter, None, None]:
|
||||||
"""Fixture to provide a connected RedisAdapter instance."""
|
"""Fixture to provide a connected RedisAdapter instance."""
|
||||||
adapter = RedisAdapter()
|
adapter = RedisAdapter()
|
||||||
adapter.connect()
|
adapter.connect()
|
||||||
@@ -63,7 +63,7 @@ def test_should_not_be_connected_when_instantiated(redis_container: str) -> None
|
|||||||
"""Test that the RedisAdapter is not connected when instantiated."""
|
"""Test that the RedisAdapter is not connected when instantiated."""
|
||||||
adapter = RedisAdapter()
|
adapter = RedisAdapter()
|
||||||
assert adapter._client is None
|
assert adapter._client is None
|
||||||
assert not adapter.is_connected
|
assert not adapter.is_connected()
|
||||||
|
|
||||||
|
|
||||||
def test_should_raise_connection_error_when_unable_to_connect(
|
def test_should_raise_connection_error_when_unable_to_connect(
|
||||||
@@ -77,7 +77,7 @@ def test_should_raise_connection_error_when_unable_to_connect(
|
|||||||
with pytest.raises(ConnectionError):
|
with pytest.raises(ConnectionError):
|
||||||
adapter.connect()
|
adapter.connect()
|
||||||
assert adapter._client is None
|
assert adapter._client is None
|
||||||
assert not adapter.is_connected
|
assert not adapter.is_connected()
|
||||||
|
|
||||||
|
|
||||||
def test_connect_raises_connection_error_when_unable_to_ping(
|
def test_connect_raises_connection_error_when_unable_to_ping(
|
||||||
@@ -109,7 +109,7 @@ def test_should_log_error_on_exception_during_exit(
|
|||||||
"""Test that the RedisAdapter logs an error when an exception occurs during context exit."""
|
"""Test that the RedisAdapter logs an error when an exception occurs during context exit."""
|
||||||
try:
|
try:
|
||||||
with RedisAdapter() as adapter:
|
with RedisAdapter() as adapter:
|
||||||
assert adapter.is_connected
|
assert adapter.is_connected()
|
||||||
raise ValueError("Simulated error")
|
raise ValueError("Simulated error")
|
||||||
except ValueError:
|
except ValueError:
|
||||||
pass # Expected
|
pass # Expected
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
"""Redis test container without testcontainers' deprecated wait decorator."""
|
||||||
|
|
||||||
|
from typing import Any, cast
|
||||||
|
|
||||||
|
import redis
|
||||||
|
from testcontainers.core.container import DockerContainer
|
||||||
|
from testcontainers.core.waiting_utils import WaitStrategy, WaitStrategyTarget
|
||||||
|
|
||||||
|
REDIS_PORT = 6379
|
||||||
|
|
||||||
|
|
||||||
|
class _RedisPingWaitStrategy(WaitStrategy):
|
||||||
|
def __init__(self) -> None:
|
||||||
|
super().__init__()
|
||||||
|
self.with_transient_exceptions(redis.exceptions.ConnectionError)
|
||||||
|
|
||||||
|
def wait_until_ready(self, container: WaitStrategyTarget) -> None:
|
||||||
|
redis_container = cast("RedisTestContainer", container)
|
||||||
|
if not self._poll(lambda: redis_container.get_client().ping()):
|
||||||
|
raise redis.exceptions.ConnectionError("Could not connect to Redis")
|
||||||
|
|
||||||
|
|
||||||
|
class RedisTestContainer(DockerContainer):
|
||||||
|
"""Redis container using wait strategies instead of the deprecated decorator."""
|
||||||
|
|
||||||
|
def __init__(self, image: str, port: int = REDIS_PORT) -> None:
|
||||||
|
super().__init__(image, _wait_strategy=_RedisPingWaitStrategy())
|
||||||
|
self.port = port
|
||||||
|
self.with_exposed_ports(self.port)
|
||||||
|
|
||||||
|
def get_client(self, **kwargs: Any) -> redis.Redis:
|
||||||
|
return redis.Redis(
|
||||||
|
host=self.get_container_host_ip(),
|
||||||
|
port=self.get_exposed_port(self.port),
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
"""Tests for TTL-cached connection health checks on adapters."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from unittest.mock import MagicMock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
import redis
|
||||||
|
|
||||||
|
from python_repositories.adapters.minio_adapter import MinioAdapter
|
||||||
|
from python_repositories.adapters.redis_adapter import RedisAdapter
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def redis_adapter(monkeypatch: pytest.MonkeyPatch) -> RedisAdapter:
|
||||||
|
monkeypatch.setenv("REDIS_URI", "redis://localhost:6379")
|
||||||
|
return RedisAdapter()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.fixture
|
||||||
|
def minio_adapter(monkeypatch: pytest.MonkeyPatch) -> MinioAdapter:
|
||||||
|
monkeypatch.setenv("MINIO_ENDPOINT", "localhost:9000")
|
||||||
|
monkeypatch.setenv("MINIO_ACCESS_KEY", "minioadmin")
|
||||||
|
monkeypatch.setenv("MINIO_SECRET_KEY", "minioadmin")
|
||||||
|
monkeypatch.setenv("MINIO_BUCKET", "test-bucket")
|
||||||
|
return MinioAdapter()
|
||||||
|
|
||||||
|
|
||||||
|
class TestRedisConnectionHealth:
|
||||||
|
def test_not_connected_when_no_client(self, redis_adapter: RedisAdapter) -> None:
|
||||||
|
assert not redis_adapter.is_connected()
|
||||||
|
|
||||||
|
def test_connected_when_probe_succeeds(self, redis_adapter: RedisAdapter) -> None:
|
||||||
|
mock_client = MagicMock(spec=redis.Redis)
|
||||||
|
mock_client.ping.return_value = True
|
||||||
|
redis_adapter._client = mock_client
|
||||||
|
|
||||||
|
assert redis_adapter.is_connected()
|
||||||
|
mock_client.ping.assert_called_once()
|
||||||
|
|
||||||
|
def test_stale_connection_when_probe_fails(
|
||||||
|
self, redis_adapter: RedisAdapter
|
||||||
|
) -> None:
|
||||||
|
mock_client = MagicMock(spec=redis.Redis)
|
||||||
|
mock_client.ping.side_effect = redis.ConnectionError("connection lost")
|
||||||
|
redis_adapter._client = mock_client
|
||||||
|
|
||||||
|
assert not redis_adapter.is_connected()
|
||||||
|
|
||||||
|
def test_cache_hit_avoids_second_probe(self, redis_adapter: RedisAdapter) -> None:
|
||||||
|
mock_client = MagicMock(spec=redis.Redis)
|
||||||
|
mock_client.ping.return_value = True
|
||||||
|
redis_adapter._client = mock_client
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.redis_adapter.time.monotonic",
|
||||||
|
return_value=100.0,
|
||||||
|
):
|
||||||
|
assert redis_adapter.is_connected()
|
||||||
|
assert redis_adapter.is_connected()
|
||||||
|
|
||||||
|
mock_client.ping.assert_called_once()
|
||||||
|
|
||||||
|
def test_cache_miss_runs_probe_again(self, redis_adapter: RedisAdapter) -> None:
|
||||||
|
mock_client = MagicMock(spec=redis.Redis)
|
||||||
|
mock_client.ping.return_value = True
|
||||||
|
redis_adapter._client = mock_client
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.redis_adapter.time.monotonic",
|
||||||
|
side_effect=[100.0, 102.0],
|
||||||
|
):
|
||||||
|
assert redis_adapter.is_connected()
|
||||||
|
assert redis_adapter.is_connected()
|
||||||
|
|
||||||
|
assert mock_client.ping.call_count == 2
|
||||||
|
|
||||||
|
def test_disconnect_clears_cache(self, redis_adapter: RedisAdapter) -> None:
|
||||||
|
mock_client = MagicMock(spec=redis.Redis)
|
||||||
|
mock_client.ping.return_value = True
|
||||||
|
redis_adapter._client = mock_client
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.redis_adapter.time.monotonic",
|
||||||
|
return_value=100.0,
|
||||||
|
):
|
||||||
|
assert redis_adapter.is_connected()
|
||||||
|
|
||||||
|
redis_adapter.disconnect()
|
||||||
|
redis_adapter._client = mock_client
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.redis_adapter.time.monotonic",
|
||||||
|
return_value=100.0,
|
||||||
|
):
|
||||||
|
assert redis_adapter.is_connected()
|
||||||
|
|
||||||
|
assert mock_client.ping.call_count == 2
|
||||||
|
|
||||||
|
|
||||||
|
class TestMinioConnectionHealth:
|
||||||
|
def test_not_connected_when_no_client(self, minio_adapter: MinioAdapter) -> None:
|
||||||
|
assert not minio_adapter.is_connected()
|
||||||
|
|
||||||
|
def test_not_connected_when_bucket_name_missing(
|
||||||
|
self, minio_adapter: MinioAdapter
|
||||||
|
) -> None:
|
||||||
|
minio_adapter._client = MagicMock()
|
||||||
|
minio_adapter._bucket_name = None
|
||||||
|
|
||||||
|
assert not minio_adapter.is_connected()
|
||||||
|
|
||||||
|
def test_connected_when_probe_succeeds(self, minio_adapter: MinioAdapter) -> None:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_client.bucket_exists.return_value = True
|
||||||
|
minio_adapter._client = mock_client
|
||||||
|
minio_adapter._bucket_name = "test-bucket"
|
||||||
|
|
||||||
|
assert minio_adapter.is_connected()
|
||||||
|
mock_client.bucket_exists.assert_called_once_with("test-bucket")
|
||||||
|
|
||||||
|
def test_stale_connection_when_probe_fails(
|
||||||
|
self, minio_adapter: MinioAdapter
|
||||||
|
) -> None:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_client.bucket_exists.side_effect = Exception("connection lost")
|
||||||
|
minio_adapter._client = mock_client
|
||||||
|
minio_adapter._bucket_name = "test-bucket"
|
||||||
|
|
||||||
|
assert not minio_adapter.is_connected()
|
||||||
|
|
||||||
|
def test_cache_hit_avoids_second_probe(self, minio_adapter: MinioAdapter) -> None:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_client.bucket_exists.return_value = True
|
||||||
|
minio_adapter._client = mock_client
|
||||||
|
minio_adapter._bucket_name = "test-bucket"
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.minio_adapter.time.monotonic",
|
||||||
|
return_value=100.0,
|
||||||
|
):
|
||||||
|
assert minio_adapter.is_connected()
|
||||||
|
assert minio_adapter.is_connected()
|
||||||
|
|
||||||
|
mock_client.bucket_exists.assert_called_once()
|
||||||
|
|
||||||
|
def test_cache_miss_runs_probe_again(self, minio_adapter: MinioAdapter) -> None:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_client.bucket_exists.return_value = True
|
||||||
|
minio_adapter._client = mock_client
|
||||||
|
minio_adapter._bucket_name = "test-bucket"
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.minio_adapter.time.monotonic",
|
||||||
|
side_effect=[100.0, 102.0],
|
||||||
|
):
|
||||||
|
assert minio_adapter.is_connected()
|
||||||
|
assert minio_adapter.is_connected()
|
||||||
|
|
||||||
|
assert mock_client.bucket_exists.call_count == 2
|
||||||
|
|
||||||
|
def test_disconnect_clears_cache(self, minio_adapter: MinioAdapter) -> None:
|
||||||
|
mock_client = MagicMock()
|
||||||
|
mock_client.bucket_exists.return_value = True
|
||||||
|
minio_adapter._client = mock_client
|
||||||
|
minio_adapter._bucket_name = "test-bucket"
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.minio_adapter.time.monotonic",
|
||||||
|
return_value=100.0,
|
||||||
|
):
|
||||||
|
assert minio_adapter.is_connected()
|
||||||
|
|
||||||
|
minio_adapter.disconnect()
|
||||||
|
minio_adapter._client = mock_client
|
||||||
|
minio_adapter._bucket_name = "test-bucket"
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"python_repositories.adapters.minio_adapter.time.monotonic",
|
||||||
|
return_value=100.0,
|
||||||
|
):
|
||||||
|
assert minio_adapter.is_connected()
|
||||||
|
|
||||||
|
assert mock_client.bucket_exists.call_count == 2
|
||||||
@@ -0,0 +1,119 @@
|
|||||||
|
"""Tests for optional dependency import behavior."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import builtins
|
||||||
|
import importlib
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import sys
|
||||||
|
from collections.abc import Callable, Mapping, Sequence
|
||||||
|
from pathlib import Path
|
||||||
|
from types import ModuleType
|
||||||
|
from unittest.mock import patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
import python_repositories
|
||||||
|
|
||||||
|
_ROOT = Path(__file__).resolve().parents[2]
|
||||||
|
|
||||||
|
|
||||||
|
def _block_backend_import(blocked_prefix: str) -> Callable[..., ModuleType]:
|
||||||
|
real_import = builtins.__import__
|
||||||
|
|
||||||
|
def fake_import(
|
||||||
|
name: str,
|
||||||
|
globals: Mapping[str, object] | None = None,
|
||||||
|
locals: Mapping[str, object] | None = None,
|
||||||
|
fromlist: Sequence[str] = (),
|
||||||
|
level: int = 0,
|
||||||
|
) -> ModuleType:
|
||||||
|
if name == blocked_prefix or name.startswith(f"{blocked_prefix}."):
|
||||||
|
raise ImportError(f"No module named '{name}'")
|
||||||
|
return real_import(name, globals, locals, fromlist, level)
|
||||||
|
|
||||||
|
return fake_import
|
||||||
|
|
||||||
|
|
||||||
|
def test_base_import_does_not_load_adapters() -> None:
|
||||||
|
"""Base package import does not eagerly load backend adapter modules."""
|
||||||
|
script = """
|
||||||
|
import sys
|
||||||
|
from python_repositories import JsonRepositoryInterface
|
||||||
|
|
||||||
|
assert JsonRepositoryInterface is not None
|
||||||
|
assert "python_repositories.adapters.redis_adapter" not in sys.modules
|
||||||
|
assert "python_repositories.adapters.minio_adapter" not in sys.modules
|
||||||
|
"""
|
||||||
|
result = subprocess.run(
|
||||||
|
[sys.executable, "-c", script],
|
||||||
|
cwd=_ROOT,
|
||||||
|
env={**os.environ, "PYTHONPATH": str(_ROOT)},
|
||||||
|
capture_output=True,
|
||||||
|
text=True,
|
||||||
|
)
|
||||||
|
assert result.returncode == 0, result.stderr or result.stdout
|
||||||
|
|
||||||
|
|
||||||
|
def test_lazy_adapter_load_succeeds_when_extra_present() -> None:
|
||||||
|
"""Adapters load when their optional dependencies are installed."""
|
||||||
|
from python_repositories import MinioAdapter, RedisAdapter
|
||||||
|
|
||||||
|
assert RedisAdapter.__name__ == "RedisAdapter"
|
||||||
|
assert MinioAdapter.__name__ == "MinioAdapter"
|
||||||
|
|
||||||
|
|
||||||
|
def test_redis_adapter_import_error_without_extra() -> None:
|
||||||
|
"""Missing redis extra raises ImportError with install hint."""
|
||||||
|
import python_repositories.adapters.redis_adapter as redis_adapter_module
|
||||||
|
|
||||||
|
with patch.object(builtins, "__import__", new=_block_backend_import("redis")):
|
||||||
|
with pytest.raises(ImportError, match=r"python-repositories\[redis\]"):
|
||||||
|
importlib.reload(redis_adapter_module)
|
||||||
|
|
||||||
|
importlib.reload(redis_adapter_module)
|
||||||
|
|
||||||
|
|
||||||
|
def test_minio_adapter_import_error_without_extra() -> None:
|
||||||
|
"""Missing minio extra raises ImportError with install hint."""
|
||||||
|
import python_repositories.adapters.minio_adapter as minio_adapter_module
|
||||||
|
|
||||||
|
with patch.object(builtins, "__import__", new=_block_backend_import("minio")):
|
||||||
|
with pytest.raises(ImportError, match=r"python-repositories\[minio\]"):
|
||||||
|
importlib.reload(minio_adapter_module)
|
||||||
|
|
||||||
|
importlib.reload(minio_adapter_module)
|
||||||
|
|
||||||
|
|
||||||
|
def test_top_level_lazy_import_propagates_redis_import_error() -> None:
|
||||||
|
"""Top-level RedisAdapter access surfaces adapter import errors."""
|
||||||
|
with patch(
|
||||||
|
"importlib.import_module",
|
||||||
|
side_effect=ImportError(
|
||||||
|
"Redis support requires the redis extra. "
|
||||||
|
"Install with: pip install python-repositories[redis]"
|
||||||
|
),
|
||||||
|
):
|
||||||
|
with pytest.raises(ImportError, match=r"python-repositories\[redis\]"):
|
||||||
|
_ = python_repositories.RedisAdapter
|
||||||
|
|
||||||
|
|
||||||
|
def test_top_level_lazy_import_propagates_minio_import_error() -> None:
|
||||||
|
"""Top-level MinioAdapter access surfaces adapter import errors."""
|
||||||
|
with patch(
|
||||||
|
"importlib.import_module",
|
||||||
|
side_effect=ImportError(
|
||||||
|
"MinIO support requires the minio extra. "
|
||||||
|
"Install with: pip install python-repositories[minio]"
|
||||||
|
),
|
||||||
|
):
|
||||||
|
with pytest.raises(ImportError, match=r"python-repositories\[minio\]"):
|
||||||
|
_ = python_repositories.MinioAdapter
|
||||||
|
|
||||||
|
|
||||||
|
def test_adapters_subpackage_lazy_import_succeeds() -> None:
|
||||||
|
"""Adapter subpackage imports delegate to the same lazy loader."""
|
||||||
|
from python_repositories.adapters import RedisAdapter
|
||||||
|
|
||||||
|
assert RedisAdapter.__name__ == "RedisAdapter"
|
||||||
Reference in New Issue
Block a user