Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ jobs:
wd: ./
steps:
- name: Check out code
uses: actions/checkout@v4
uses: actions/checkout@v6
with:
ref: ${{github.head_ref}}
lfs: true

- name: Set up Terraform
uses: hashicorp/setup-terraform@v3
uses: hashicorp/setup-terraform@v4

- name: Set up tesseract
run: sudo apt-get install -y tesseract-ocr

- name: Install uv
uses: astral-sh/setup-uv@v5
uses: astral-sh/setup-uv@v8.1.0

- name: Set up Python3.x
uses: actions/setup-python@v5
uses: actions/setup-python@v6
id: py

- name: Get requirements
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
api_release_channel: ${{ steps.api.outputs.channel }}
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
ref: ${{github.head_ref}}
lfs: false
Expand Down Expand Up @@ -76,27 +76,27 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
ref: ${{github.head_ref}}
lfs: false
persist-credentials: false

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Login to private registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: blindchargingapi.azurecr.io
username: blindchargingapi
password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}

- name: Build and push API image
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
# Apply new version tag, as well as a tag based on release channel.
push: true
Expand All @@ -108,14 +108,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
ref: ${{github.head_ref}}
lfs: false
persist-credentials: false

- name: Create release
uses: softprops/action-gh-release@v2
uses: softprops/action-gh-release@v3
with:
name: v${{ needs.tag.outputs.api_version }}
tag_name: api-${{ needs.tag.outputs.api_version }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/research.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,27 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
ref: ${{github.head_ref}}
lfs: false
persist-credentials: false

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Login to private registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: blindchargingapi.azurecr.io
username: blindchargingapi
password: ${{ secrets.AZURE_REGISTRY_PASSWORD }}

- name: Build and push research image
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: terraform/research
file: terraform/research/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.12.7
3.14.5
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/astral-sh/uv:python3.13-bookworm-slim AS buildbox
FROM ghcr.io/astral-sh/uv:python3.14-bookworm-slim AS buildbox

RUN apt-get update && apt-get install -y apt-transport-https curl gnupg2 git gcc
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
Expand Down
2 changes: 1 addition & 1 deletion app/server/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ async def ensure_db(store: RdbmsConfig) -> DbDriver:
"The database migrations are in an invalid state. "
"Please fix manually."
)
except (NameError, ValueError, KeyError, RuntimeError, SQLAlchemyError):
except NameError, ValueError, KeyError, RuntimeError, SQLAlchemyError:
logger.error(
"Failed to apply database migrations. Seems like the migration is invalid."
)
Expand Down
2 changes: 1 addition & 1 deletion app/server/tasks/http.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def _get_open_file_count() -> Tuple[int, int]:
try:
if proc.username() == cur_proc.username():
user_open_files += len(proc.open_files())
except (psutil.NoSuchProcess, psutil.AccessDenied):
except psutil.NoSuchProcess, psutil.AccessDenied:
continue

return (cur_proc_open_files, user_open_files)
Expand Down
28 changes: 14 additions & 14 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,43 @@
authors = [
{name = "Joe Nudell", email = "jnudell@hks.harvard.edu"},
]
requires-python = "<4.0,>=3.12"
requires-python = "<4.0,>=3.14"
dependencies = [
"aiohttp==3.13.5",
"aiohttp>=3.13.5,<4.0.0",
"fastapi[standard]<1.0.0,>=0.115.0",
"pyjwt>=2.12.1,<3.0.0",
"pydantic<3.0.0,>=2.7.1",
"sqlalchemy==2.0.49",
"sqlalchemy>=2.0.49,<3.0.0",
"pyodbc>=5.3.0,<6.0.0",
"aioodbc<1.0.0,>=0.5.0",
"python-glowplug==0.3.10",
"python-glowplug>=0.3.10",
"typer>=0.24.1,<1.0.0",
"pydantic-settings<3.0.0,>=2.2.1",
"uuid-utils==0.15.0",
"greenlet==3.1.1",
"gunicorn==26.0.0",
"uvicorn==0.47.0",
"uuid-utils>=0.15.0",
"greenlet>=3.5.0,<4.0.0",
"gunicorn>=26.0.0",
"uvicorn>=0.47.0,<1.0.0",
"jinja2<4.0.0,>=3.1.4",
"openai>=2.17",
"aiosqlite<1.0.0,>=0.20.0",
"nameparser<2.0.0,>=1.1.3",
"redis<6.0.0,>=5.2.1",
"azure-storage-blob<13.0.0,>=12.20.0",
"urllib3==2.7.0",
"urllib3>=2.7.0",
"pytz==2026.1.post1",
"flower<3.0.0,>=2.0.1",
"argon2-cffi>=25.1.0,<26.0.0",
"opentelemetry-sdk<2.0.0,>=1.27.0",
"opentelemetry-api<2.0.0,>=1.27.0",
"python-hcl2>=8.1.2,<9.0.0",
"alembic==1.13.3",
"fakeredis==2.24.1",
"alembic>=1.13.3,<=2.0.0",
"fakeredis>=2.24.1",
"azure-monitor-opentelemetry>=1.8.8,<2.0.0",
"opentelemetry-instrumentation-celery<1.0,>=0.49b1",
"certifi<2025.0.0,>=2024.12.14",
"alligater>=0.5.0,<1.0.0",
"kombu @ git+https://github.com/jnu/kombu.git@bb38b12eec4b79dc95caf75bf4ccdd12a78216c1",
"celery==5.4",
"kombu @ git+https://github.com/jnu/kombu.git@a37798c43c740ac7bc8253915588f675e45bd04b",
"celery>=5.6,<6.0.0",
"tiktoken>=0.13.0",
"bc2",
]
Expand All @@ -53,7 +53,7 @@ dev = [
"pre-commit>=4.6.0,<5.0.0",
"fakeredis<3.0.0,>=2.23.3",
"pytest-asyncio==1.3.0",
"celery[pytest]<6.0.0,>=5.4.0",
"pytest-celery>=1.3.0,<2.0.0",
"responses>=0.26.0,<1.0.0",
"alembic<2.0.0,>=1.13.2",
"mypy>=2.1.0,<3.0.0",
Expand Down
Loading