Skip to content

Commit e53554b

Browse files
committed
Merge remote-tracking branch 'origin/main' into uermel/affinity_organelles
# Conflicts: # ingestion_tools/poetry.lock
2 parents bf35bcd + 9baa0fe commit e53554b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+6856
-6080
lines changed

.github/workflows/argus-stack-staging-upsert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ jobs:
3232
with:
3333
appName: cryoet-apiv2
3434
envName: staging
35-
postStackDetails: false
35+
postStackDetails: comment

.github/workflows/push-ingestor-build.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ jobs:
3737
role-duration-seconds: 1200
3838
- name: Login to Amazon ECR
3939
id: login-ecr
40-
uses: aws-actions/amazon-ecr-login@v1
40+
uses: aws-actions/amazon-ecr-login@v2
41+
with:
42+
mask-password: 'true'
4143
- name: Checkout code
4244
uses: actions/checkout@v3
4345
- name: Docker build & Push

.infra/prod/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ stack:
22
services:
33
apiv2:
44
image:
5-
tag: sha-3a64fa9
5+
tag: sha-b16ba78
66
initContainers:
77
# Install cerbos policies where the cerbos sidecar can grab them.
88
- name: install-cerbos-policies
99
image:
1010
repository: 533267185808.dkr.ecr.us-west-2.amazonaws.com/core-platform/cryoet-data-portal-backend/apiv2/apiv2
11-
tag: sha-3a64fa9
11+
tag: sha-b16ba78
1212
command: ["cp", "-r", "./cerbos/", "/var/policies/"]
1313
volumeMounts:
1414
- mountPath: /var/policies
@@ -24,7 +24,7 @@ stack:
2424
- name: run-migrations
2525
image:
2626
repository: 533267185808.dkr.ecr.us-west-2.amazonaws.com/core-platform/cryoet-data-portal-backend/apiv2/apiv2
27-
tag: sha-3a64fa9
27+
tag: sha-b16ba78
2828
command: ["alembic", "upgrade", "head"]
2929
resources:
3030
limits:
@@ -37,7 +37,7 @@ stack:
3737
- name: gen-keypair
3838
image:
3939
repository: 533267185808.dkr.ecr.us-west-2.amazonaws.com/core-platform/cryoet-data-portal-backend/apiv2/apiv2
40-
tag: sha-3a64fa9
40+
tag: sha-b16ba78
4141
command: ["bash", "./etc/gen_keys.sh", "/var/keys/"]
4242
volumeMounts:
4343
- mountPath: /var/keys

.infra/rdev/Chart.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ apiVersion: v2
22
name: stack
33
type: application
44
version: 1.0.0
5-
65
dependencies:
76
- name: stack
8-
version: 2.7.0
7+
version: 2.23.1
98
repository: https://chanzuckerberg.github.io/argo-helm-charts

.infra/staging/Chart.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ apiVersion: v2
22
name: stack
33
type: application
44
version: 1.0.0
5-
65
dependencies:
76
- name: stack
8-
version: 2.7.0
7+
version: 2.23.1
98
repository: https://chanzuckerberg.github.io/argo-helm-charts

.infra/staging/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ stack:
22
services:
33
apiv2:
44
image:
5-
tag: sha-3a64fa9
5+
tag: sha-b16ba78
66
initContainers:
77
# Install cerbos policies where the cerbos sidecar can grab them.
88
- name: install-cerbos-policies
99
image:
1010
repository: 533267185808.dkr.ecr.us-west-2.amazonaws.com/core-platform/cryoet-data-portal-backend/apiv2/apiv2
11-
tag: sha-3a64fa9
11+
tag: sha-b16ba78
1212
command: ["cp", "-r", "./cerbos/", "/var/policies/"]
1313
volumeMounts:
1414
- mountPath: /var/policies
@@ -24,7 +24,7 @@ stack:
2424
- name: run-migrations
2525
image:
2626
repository: 533267185808.dkr.ecr.us-west-2.amazonaws.com/core-platform/cryoet-data-portal-backend/apiv2/apiv2
27-
tag: sha-3a64fa9
27+
tag: sha-b16ba78
2828
command: ["alembic", "upgrade", "head"]
2929
resources:
3030
limits:
@@ -37,7 +37,7 @@ stack:
3737
- name: gen-keypair
3838
image:
3939
repository: 533267185808.dkr.ecr.us-west-2.amazonaws.com/core-platform/cryoet-data-portal-backend/apiv2/apiv2
40-
tag: sha-3a64fa9
40+
tag: sha-b16ba78
4141
command: ["bash", "./etc/gen_keys.sh", "/var/keys/"]
4242
volumeMounts:
4343
- mountPath: /var/keys

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"apiv2": "1.14.0"
2+
"apiv2": "1.15.0"
33
}

apiv2/CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
# Changelog
22

3+
## [1.15.0](https://github.com/chanzuckerberg/cryoet-data-portal-backend/compare/apiv2-v1.14.1...apiv2-v1.15.0) (2026-01-23)
4+
5+
6+
### Features
7+
8+
* add support for uberon/chebi ontologies for annotation_object_id; update outdated ontology id fields in apiv2 schema ([#586](https://github.com/chanzuckerberg/cryoet-data-portal-backend/issues/586)) ([a26a6d3](https://github.com/chanzuckerberg/cryoet-data-portal-backend/commit/a26a6d3d84c0f02497a8b43860424604dcc31b87))
9+
10+
## [1.14.1](https://github.com/chanzuckerberg/cryoet-data-portal-backend/compare/apiv2-v1.14.0...apiv2-v1.14.1) (2026-01-23)
11+
12+
13+
### Bug Fixes
14+
15+
* update linkml package version, bugfix api codegen, bugfix ingestion validation ([#585](https://github.com/chanzuckerberg/cryoet-data-portal-backend/issues/585)) ([c972d59](https://github.com/chanzuckerberg/cryoet-data-portal-backend/commit/c972d596c10bfa430e820008372b59598a339e3c))
16+
317
## [1.14.0](https://github.com/chanzuckerberg/cryoet-data-portal-backend/compare/apiv2-v1.13.2...apiv2-v1.14.0) (2025-11-26)
418

519

apiv2/database/migrations/versions/20250819_111511_autogenerated.py

Lines changed: 18 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apiv2/database/models/alignment.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)