Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
93bef6b
Updated NodeNorm loader to v2.3.27 and Babel 2025nov1.
gaurav Nov 6, 2025
f5c9701
Upgraded NodeNorm Web to v2.3.27.
gaurav Oct 30, 2025
ae2af70
Switched translator-exp to load.
gaurav Nov 10, 2025
3f4f863
Updated NameRes Solr to v9.
gaurav Nov 10, 2025
1a55b11
Updated NameRes to 2025nov4.
gaurav Nov 10, 2025
13d426f
Upgraded NodeNorm to 2025nov4.
gaurav Nov 10, 2025
29edb39
Updated NodeNorm renci-exp to v2.3.27.
gaurav Nov 11, 2025
b494a45
Upgraded backup scripts to 2025nov4.
gaurav Nov 14, 2025
a09d608
Reverted compressed file transfers.
gaurav Nov 14, 2025
d76900a
Updated compressed download for db3.
gaurav Nov 14, 2025
fc72834
Added NodeNorm Exp to whitelist.
gaurav Nov 16, 2025
c7270f9
Merge branch 'update-nodenorm-nameres-2025nov4' of github.com:helxpla…
gaurav Nov 16, 2025
d8d7c03
Added taxon_specific field.
gaurav Nov 17, 2025
20ed899
Upgraded NodeNorm to v2.3.28.
gaurav Dec 4, 2025
91437c4
Updated NodeNorm Loader to v2.3.28.
gaurav Dec 4, 2025
03c97dd
Upgraded NameRes to v1.6.0.
gaurav Dec 4, 2025
8549953
Updated NodeNorm Loader to v0.8.0.
gaurav Dec 8, 2025
c675a15
Switched NodeNorm Loader Dev to restore.
gaurav Dec 8, 2025
47b0f32
Replaced redis-rdb-cli with new reader.
gaurav Dec 8, 2025
912df0e
Replaced tag with the development code.
gaurav Dec 8, 2025
fec5cc0
Attempted to add redis_version everywhere.
gaurav Dec 8, 2025
94d5a5a
Changed NodeNorm Exp to use the Dev database.
gaurav Dec 8, 2025
7d0458f
Corrected redis_config.redis_version.
gaurav Dec 8, 2025
a0a280d
Switched NodeNorm Exp to add-clique-leaders-option for testing.
gaurav Dec 15, 2025
e68df36
Add a LOGLEVEL to NameRes deployments.
gaurav Dec 18, 2025
d3c8d97
Updated Solr to 9 so we use the latest Solr 9 (currently 9.10).
gaurav Dec 18, 2025
c37c8ae
Updated NameRes Exp to use replace-scaled-clique-identifier-count.
gaurav Dec 18, 2025
fe5034e
Added a Biolink Model Tag.
gaurav Dec 18, 2025
aa74e7b
Reverting to Solr 9.1 to see if that can get it to work.
gaurav Dec 18, 2025
d6d2257
Reverted NCATS Solr to 9.1 as well, just in case.
gaurav Dec 18, 2025
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
4 changes: 2 additions & 2 deletions helm/name-lookup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 0.5.1
version: 0.5.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
#
# NameRes versions are based on the version of the NameRes Docker image concatenated with the
# Babel release date.
appVersion: 1.5.1_2025sep1
appVersion: 1.6.0_2025nov4
2 changes: 1 addition & 1 deletion helm/name-lookup/ncats-images-meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
nameLookup:
image: ghcr.io/ncatstranslator/nameresolution
version: v1.5.1
version: v1.6.0

solr:
image: solr
Expand Down
Binary file modified helm/name-lookup/renci-dev-values-populated.yaml
Binary file not shown.
Binary file modified helm/name-lookup/renci-exp-values-populated.yaml
Binary file not shown.
9 changes: 8 additions & 1 deletion helm/name-lookup/templates/scripts-config-map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ data:
rm -rf $DATA_DIR/*

# Download the file with retries if the download fails or if there is an existing file we can continue.
wget -c --progress=dot:giga --tries=10 --waitretry=10 --timeout=60 --read-timeout=30 -O $DATA_DIR/$BACKUP_ZIP $BACKUP_URL
wget -c --progress=dot:giga --tries=10 --waitretry=10 --timeout=60 --read-timeout=30 -O $DATA_DIR/$BACKUP_ZIP $BACKUP_URL

cd $DATA_DIR
tar -xf $DATA_DIR/$BACKUP_ZIP -C $DATA_DIR
Expand Down Expand Up @@ -159,6 +159,13 @@ data:
"stored": true,
"multiValued": true
},
{
"name":"taxon_specific",
"type":"boolean",
"stored":true,
"multiValued":false,
"sortMissingLast":true
},
{
"name": "shortest_name_length",
"type": "pint",
Expand Down
3 changes: 3 additions & 0 deletions helm/name-lookup/templates/web-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ spec:
value: "{{ .Values.app.otel.jaegerHost }}"
- name: "JAEGER_PORT"
value: "{{ .Values.app.otel.jaegerPort }}"
# Logging level.
- name: LOGLEVEL
value: "{{ .Values.app.logLevel }}"
# Babel version information.
- name: BABEL_VERSION
value: "{{ .Values.data.babelVersion }}"
Expand Down
9 changes: 5 additions & 4 deletions helm/name-lookup/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ webServer:
port: 2433
image:
repository: ghcr.io/ncatstranslator/nameresolution
tag: v1.5.1
tag: v1.6.0

dataUrl: "https://stars.renci.org/var/babel_outputs/2025sep1/nameres/snapshot.backup.tar.gz"
dataUrl: "https://stars.renci.org/var/babel_outputs/2025nov4/nameres/snapshot.backup.tar.gz"
forceRun: false
data:
babelVersion: 2025sep1
babelVersionURL: https://github.com/ncatstranslator/Babel/blob/master/releases/2025sep1.md
babelVersion: 2025nov4
babelVersionURL: https://github.com/ncatstranslator/Babel/blob/master/releases/2025nov4.md

downloader:
image:
Expand Down Expand Up @@ -97,6 +97,7 @@ app:
enabled: false
jaegerHost:
jaegerPort:
logLevel: INFO
nodeSelector:
affinity:
tolerations:
Expand Down
4 changes: 2 additions & 2 deletions helm/node-normalization-loader/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.7.0
version: 0.8.0

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
#
# NodeNorm versions are based on the version of the NodeNorm Docker image concatenated with the
# Babel release date.
appVersion: 2.3.26_2025sep1
appVersion: 2.3.28_2025nov4
Binary file modified helm/node-normalization-loader/ncats-dev-values.yaml
Binary file not shown.
2 changes: 1 addition & 1 deletion helm/node-normalization-loader/ncats-images-meta.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
nodeNormalizationLoader:
image: "ghcr.io/ncatstranslator/nodenormalization-data-loading"
version: "v2.3.26"
version: "v2.3.28"
Binary file modified helm/node-normalization-loader/ncats-prod-values.yaml
Binary file not shown.
Binary file modified helm/node-normalization-loader/ncats-test-values.yaml
Binary file not shown.
Binary file modified helm/node-normalization-loader/renci-dev-values-populated.yaml
Binary file not shown.
Binary file modified helm/node-normalization-loader/renci-exp-values-populated.yaml
Binary file not shown.
8 changes: 6 additions & 2 deletions helm/node-normalization-loader/templates/loader-pipe-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{- $tag := .Values.restore.tag }}
{{- $pullPolicy := .Values.restore.pullPolicy }}
{{- $ephemeralStorage := .Values.restore.ephemeralStorage }}
{{- $redisConfig := .Values.redis_config }}
{{- range $dbName, $dbConf := .Values.redis_backend_config }}
{{- $dbKubeName := $dbName | replace "_" "-"}}
{{- $dataStorageSize := $dbConf.storageSize }}
Expand All @@ -18,6 +19,7 @@
{{- $sslEnabled := $connectionDetails.ssl_enabled }}
{{- $isCluster := $connectionDetails.is_cluster }}
{{- $redisPassword := $connectionDetails.password }}
{{- $redisVersion := $connectionDetails.redis_version | default $redisConfig.redis_version | default "6.2" }}
apiVersion: batch/v1
kind: Job
metadata:
Expand Down Expand Up @@ -103,6 +105,7 @@ data:
gunzip "{{ $dataDir }}/{{ $dbName }}.rdb.gz"

# Restore the file into the specified database.
# We no longer need to support cluster mode, so we can just pipe the data directly to the target host.
# The `-c` option doesn't work in pipe mode, which is why we generate a ton of MOVED errors when we run this. The `grep -v MOVED` should suppress them
# to avoid filling up the log.
# Instead, what we will do is to get the list of cluster nodes and then stream ALL the data to ALL the nodes. Very inefficient, but it should get the job done.
Expand All @@ -115,8 +118,9 @@ data:
for node in $sub_nodes; do
IFS=':' read -ra node_host_port <<< $node
sub_host_name="${node_host_port[0]}"
echo "... Started piping data to ${sub_host_name} as part of {{ $hostName }} ..."
rdb -c protocol "{{ $dataDir }}/{{ $dbName }}.rdb" | redis-cli {{ if $isCluster }}-c{{end}} -h ${sub_host_name} -p {{ $port }} --pipe {{ if $sslEnabled -}}--tls{{ end }} 2>&1 | grep -v MOVED
echo "... Started piping data to ${sub_host_name} as part of {{ $hostName }} ..."
bash /home/nru/rdb-to-resp.sh "{{ $dataDir }}/{{ $dbName }}.rdb" "{{$redisVersion}}" | redis-cli {{ if $isCluster }}-c{{end}} -h ${sub_host_name} -p {{ $port }} --pipe {{ if $sslEnabled -}}--tls{{ end }} 2>&1 | grep -v MOVED
# rdb -c protocol "{{ $dataDir }}/{{ $dbName }}.rdb" | redis-cli {{ if $isCluster }}-c{{end}} -h ${sub_host_name} -p {{ $port }} --pipe {{ if $sslEnabled -}}--tls{{ end }} 2>&1 | grep -v MOVED
echo "... Done piping data to ${sub_host_name} as part of {{ $hostName }} ..."
done

Expand Down
32 changes: 15 additions & 17 deletions helm/node-normalization-loader/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ logLevel: INFO

image:
repository: "ghcr.io/ncatstranslator/nodenormalization"
tag: "v2.3.26"
tag: "v2.3.28"
pullPolicy: Always
fullnameOverride: ""

# Settings to use for a restore job.
restore:
repository: "ghcr.io/ncatstranslator/nodenormalization-data-loading"
tag: "v2.3.26"
tag: "replace-rdb-reader"
pullPolicy: Always
dataDir: "/data"
dataSize: 50G
Expand All @@ -33,7 +33,7 @@ app:
data:
compendia:
storageSize: 10G
sourceBaseUrl: "https://stars.renci.org/var/babel_outputs/2025sep1/compendia/"
sourceBaseUrl: "https://stars.renci.org/var/babel_outputs/2025nov4/compendia/"
files:
- AnatomicalEntity.txt
- BiologicalProcess.txt
Expand All @@ -45,14 +45,14 @@ data:
- ComplexMolecularMixture.txt
- Disease.txt
- Drug.txt
- GeneFamily.txt
- Gene.txt.00
- Gene.txt.01
- Gene.txt.02
- Gene.txt.03
- Gene.txt.04
- Gene.txt.05
- Gene.txt.06
- GeneFamily.txt
- GrossAnatomicalStructure.txt
- MacromolecularComplex.txt
- MolecularActivity.txt
Expand Down Expand Up @@ -82,11 +82,6 @@ data:
- Protein.txt.18
- Protein.txt.19
- Protein.txt.20
- Protein.txt.21
- Protein.txt.22
- Protein.txt.23
- Protein.txt.24
- Protein.txt.25
- Publication.txt.00
- Publication.txt.01
- Publication.txt.02
Expand All @@ -106,7 +101,7 @@ data:
- umls.txt
conflations:
storageSize: 1G
sourceBaseUrl: "https://stars.renci.org/var/babel_outputs/2025sep1/conflation/"
sourceBaseUrl: "https://stars.renci.org/var/babel_outputs/2025nov4/conflation/"
configs:
- file: "GeneProtein.txt"
types:
Expand All @@ -120,33 +115,36 @@ data:
redis_db: "chemical_drug_db"
codeDir: /code

redis_config:
redis_version: "6.2"

redis_backend_config:
"eq_id_to_id_db":
restoreURL: "https://stars.renci.org/var/babel_outputs/2025sep1/rdb-backups/id-id.rdb.gz"
restoreURL: "https://stars.renci.org/var/babel_outputs/2025nov4/rdb-backups/id-id.rdb.gz"
storageSize: 100G

"id_to_eqids_db":
restoreURL: "https://stars.renci.org/var/babel_outputs/2025sep1/rdb-backups/id-eq-id.rdb.gz"
restoreURL: "https://stars.renci.org/var/babel_outputs/2025nov4/rdb-backups/id-eq-id.rdb.gz"
storageSize: 150G

"id_to_type_db":
restoreURL: "https://stars.renci.org/var/babel_outputs/2025sep1/rdb-backups/id-categories.rdb.gz"
restoreURL: "https://stars.renci.org/var/babel_outputs/2025nov4/rdb-backups/id-categories.rdb.gz"
storageSize: 30G

"curie_to_bl_type_db":
restoreURL: "https://stars.renci.org/var/babel_outputs/2025sep1/rdb-backups/semantic-count.rdb.gz"
restoreURL: "https://stars.renci.org/var/babel_outputs/2025nov4/rdb-backups/semantic-count.rdb.gz"
storageSize: 1G

"gene_protein_db":
restoreURL: "https://stars.renci.org/var/babel_outputs/2025sep1/rdb-backups/conflation-db.rdb.gz"
restoreURL: "https://stars.renci.org/var/babel_outputs/2025nov4/rdb-backups/conflation-db.rdb.gz"
storageSize: 10G

"info_content_db":
restoreURL: "https://stars.renci.org/var/babel_outputs/2025sep1/rdb-backups/info-content.rdb.gz"
restoreURL: "https://stars.renci.org/var/babel_outputs/2025nov4/rdb-backups/info-content.rdb.gz"
storageSize: 1G

"chemical_drug_db":
restoreURL: "https://stars.renci.org/var/babel_outputs/2025sep1/rdb-backups/chemical-drug-db.rdb.gz"
restoreURL: "https://stars.renci.org/var/babel_outputs/2025nov4/rdb-backups/chemical-drug-db.rdb.gz"
storageSize: 1G

securityContext:
Expand Down
4 changes: 2 additions & 2 deletions helm/node-normalization-web-server/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.4.1
version: 0.4.3

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
#
# NodeNorm versions are based on the version of the NodeNorm Docker image concatenated with the
# Babel release date.
appVersion: 2.3.26_2025sep1
appVersion: 2.3.28_2025nov4
3 changes: 1 addition & 2 deletions helm/node-normalization-web-server/ncats-images-meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
nodeNormalization:
image: ghcr.io/ncatstranslator/nodenormalization
version: v2.3.26

version: v2.3.28
Binary file not shown.
Binary file modified helm/node-normalization-web-server/renci-exp-values-populated.yaml
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ spec:
value: "{{ .Values.data.babelVersion }}"
- name: "BABEL_VERSION_URL"
value: "{{ .Values.data.babelVersionURL }}"
- name: "BIOLINK_MODEL_TAG"
value: "{{ .Values.data.biolinkModelTag }}"
- name: "SERVER_ROOT"
value: "{{ .Values.web.serverHostName }}"
- name: "MATURITY_VALUE"
Expand Down
7 changes: 4 additions & 3 deletions helm/node-normalization-web-server/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@

image:
repository: ghcr.io/ncatstranslator/nodenormalization
tag: v2.3.26
tag: v2.3.28
pullPolicy: Always

data:
babelVersion: "2025sep1"
babelVersionURL: "https://github.com/ncatstranslator/Babel/blob/master/releases/2025sep1.md"
babelVersion: "2025nov4"
babelVersionURL: "https://github.com/ncatstranslator/Babel/blob/master/releases/2025nov4.md"
biolinkModelTag: "v4.3.2"

web:
port: 8080
Expand Down
8 changes: 5 additions & 3 deletions helm/redis-r3-external/scripts/backup-nn-redis-db0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#

# Configuration
NN_VERSION="${NN_VERSION:-2025sep1}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-dev}"
NN_VERSION="${NN_VERSION:-2025nov4}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-exp}"
RETRIES=10

# Copy all the dump files.
Expand All @@ -22,7 +22,9 @@ function check_and_download() {
echo Checking RDB file.
kubectl exec -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0" -- bash -c 'redis-check-rdb /data/dump.rdb'
# Backup file.
kubectl cp -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0:/data/compressed.rdb.gz" ./$name.rdb.gz --retries $RETRIES
kubectl cp -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0:/data/dump.rdb" ./$name.rdb --retries $RETRIES && \
md5 ./$name.rdb && \
gzip ./$name.rdb
}

# Download files
Expand Down
8 changes: 5 additions & 3 deletions helm/redis-r3-external/scripts/backup-nn-redis-db1.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#

# Configuration
NN_VERSION="${NN_VERSION:-2025sep1}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-dev}"
NN_VERSION="${NN_VERSION:-2025nov4}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-exp}"

# Copy all the dump files.
function check_and_download() {
Expand All @@ -21,7 +21,9 @@ function check_and_download() {
echo Checking RDB file.
kubectl exec -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0" -- bash -c 'redis-check-rdb /data/dump.rdb'
# Backup file.
kubectl cp -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0:/data/compressed.rdb.gz" ./$name.rdb.gz --retries 10
kubectl cp -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0:/data/dump.rdb" ./$name.rdb --retries 10 && \
md5 ./$name.rdb && \
gzip ./$name.rdb
}

# Download files
Expand Down
4 changes: 2 additions & 2 deletions helm/redis-r3-external/scripts/backup-nn-redis-db2-5-6.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#

# Configuration
NN_VERSION="${NN_VERSION:-2025sep1}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-dev}"
NN_VERSION="${NN_VERSION:-2025nov4}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-exp}"

# Copy all the dump files.
function check_and_download() {
Expand Down
8 changes: 5 additions & 3 deletions helm/redis-r3-external/scripts/backup-nn-redis-db3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#

# Configuration
NN_VERSION="${NN_VERSION:-2025sep1}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-dev}"
NN_VERSION="${NN_VERSION:-2025nov4}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-exp}"

# Copy all the dump files.
function check_and_download() {
Expand All @@ -21,7 +21,9 @@ function check_and_download() {
echo Checking RDB file.
kubectl exec -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0" -- bash -c 'redis-check-rdb /data/dump.rdb'
# Backup file.
kubectl cp -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0:/data/compressed.rdb.gz" ./$name.rdb.gz --retries 10
kubectl cp -n "$NN_NAMESPACE" "nn-redis-$NN_VERSION-$name-master-0:/data/dump.rdb" ./$name.rdb --retries 10 && \
md5 ./$name.rdb && \
gzip ./$name.rdb
}

# Download files
Expand Down
4 changes: 2 additions & 2 deletions helm/redis-r3-external/scripts/backup-nn-redis-db4.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#

# Configuration
NN_VERSION="${NN_VERSION:-2025sep1}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-dev}"
NN_VERSION="${NN_VERSION:-2025nov4}"
NN_NAMESPACE="${NN_NAMESPACE:-translator-exp}"

# Copy all the dump files.
function check_and_download() {
Expand Down
Binary file modified helm/redis-r3-external/scripts/backup-nn-redis.sh
Binary file not shown.