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
21 changes: 21 additions & 0 deletions src/nodenorm/babel.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
from urllib.parse import urlparse

BABEL_RELEASES_URL = "https://github.com/NCATSTranslator/Babel/blob/main/releases"


def get_babel_version(index_mapping: dict) -> str:
"""Return the explicit Babel source version, with legacy URL fallback."""

source_metadata = index_mapping["mappings"]["_meta"]["src"]["nodenorm"]
if babel_version := source_metadata.get("version"):
return babel_version

compendia_url = source_metadata["url"]
parsed_compendia_url = urlparse(compendia_url)
return parsed_compendia_url.path.rstrip("/").rsplit("/", maxsplit=1)[-1]


def get_babel_release_url(version: str) -> str:
"""Return the canonical Babel release-notes URL for a build version."""

return f"{BABEL_RELEASES_URL}/{version}/README.md"
2 changes: 1 addition & 1 deletion src/nodenorm/biolink.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# > get_normalized_nodes
# > get_semantic_types

DEFAULT_BIOLINK_MODEL_VERSION = "v4.2.6-rc5"
DEFAULT_BIOLINK_MODEL_VERSION = "v4.3.3"
BIOLINK_MODEL_VERSION = os.getenv("BIOLINK_VERSION", DEFAULT_BIOLINK_MODEL_VERSION)
BIOLINK_MODEL_URL = (
f"https://raw.githubusercontent.com/biolink/biolink-model/{BIOLINK_MODEL_VERSION}/biolink-model.yaml"
Expand Down
12 changes: 5 additions & 7 deletions src/nodenorm/handlers/health.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import importlib.resources
import json
from functools import lru_cache
from urllib.parse import urlparse

from elasticsearch import AsyncElasticsearch

import nodenorm
from nodenorm.babel import get_babel_release_url, get_babel_version
from nodenorm.biolink import BIOLINK_MODEL_VERSION
from nodenorm.handlers.base import NodeNormalizationBaseHandler

Expand All @@ -32,10 +32,8 @@ async def get(self):

mapping_response = await async_client.indices.get_mapping(index=search_indices)
index_mapping = next(iter(mapping_response.values()))
compendia_url = index_mapping["mappings"]["_meta"]["src"]["nodenorm"]["url"]
parsed_compendia_url = urlparse(compendia_url)
babel_version = parsed_compendia_url.path.rstrip("/").rsplit("/", maxsplit=1)[-1]
babel_markdown = f"https://github.com/ncatstranslator/Babel/blob/master/releases/{babel_version}.md"
babel_version = get_babel_version(index_mapping)
babel_version_url = get_babel_release_url(babel_version)
version = get_openapi_version()
try:
attributes = [
Expand All @@ -61,15 +59,15 @@ async def get(self):
"status": "error",
"version": version,
"babel_version": babel_version,
"babel_version_url": babel_markdown,
"babel_version_url": babel_version_url,
"backend": "elasticsearch",
}
else:
status_response = {
"status": "running",
"version": version,
"babel_version": babel_version,
"babel_version_url": babel_markdown,
"babel_version_url": babel_version_url,
"backend": "elasticsearch",
"biolink_model_toolkit_version": BIOLINK_MODEL_VERSION,
**nodes,
Expand Down
44 changes: 44 additions & 0 deletions tests/test_health.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
from nodenorm.babel import get_babel_release_url, get_babel_version


def index_mapping(source_metadata):
return {
"mappings": {
"_meta": {
"src": {
"nodenorm": source_metadata,
}
}
}
}


def test_babel_version_uses_explicit_source_version():
mapping = index_mapping(
{
"version": "2026jul22",
"url": "https://stars.renci.org/var/babel_outputs/latest/VERSION.txt",
}
)

babel_version = get_babel_version(mapping)

assert babel_version == "2026jul22"
assert get_babel_release_url(babel_version) == (
"https://github.com/NCATSTranslator/Babel/blob/main/releases/2026jul22/README.md"
)


def test_babel_version_falls_back_to_legacy_source_url():
mapping = index_mapping(
{
"url": "https://stars.renci.org/var/babel_outputs/2025sep1/",
}
)

babel_version = get_babel_version(mapping)

assert babel_version == "2025sep1"
assert get_babel_release_url(babel_version) == (
"https://github.com/NCATSTranslator/Babel/blob/main/releases/2025sep1/README.md"
)
Loading