Release v1.7.4

Author: Robbie1977

RELEASE_NOTES_v1.7.4.md

@@ -0,0 +1,5 @@
+## What's Changed
+
+- Relax HA API FlyBase ID rewriting so `resolve_entity` and `resolve_combination` fall back to the canonical FlyBase ID when VFB term info cannot provide a preferred symbol or label.
+- Keep the preferred VFB term name rewrite path when term info is available.
+- Update HA API validation tests to cover the canonical-ID fallback behavior.

setup.py

@@ -3,7 +3,7 @@
 
 here = path.abspath(path.dirname(__file__))
 
-__version__ = "1.7.3"
+__version__ = "1.7.4"
 
 # Get the long description from the README file
 with open(path.join(here, 'README.md')) as f:

src/test/test_ha_api_validation.py

@@ -39,7 +39,7 @@ def get_term_info(self, query, preview=False):
     assert query == "GMR37H08-ZpGAL4DBD in attP2"
 
 
-def test_rewrite_resolve_entity_query_returns_none_when_no_term_info_name(monkeypatch):
+def test_rewrite_resolve_entity_query_falls_back_to_canonical_id(monkeypatch):
     class DummyVfb:
         def get_term_info(self, query, preview=False):
             assert query == "FBst0007144"
@@ -50,41 +50,43 @@ def get_term_info(self, query, preview=False):
 
     query = ha_api._rewrite_resolve_entity_query("fbst0007144")
 
-    assert query is None
+    assert query == "FBst0007144"
 
 
-def test_run_resolve_entity_returns_not_found_when_id_cannot_be_rewritten(monkeypatch):
+def test_run_resolve_entity_falls_back_to_canonical_id_when_id_cannot_be_rewritten(monkeypatch):
     class DummyVfb:
         def get_term_info(self, query, preview=False):
             assert query == "FBst0007144"
             assert preview is False
             return None
 
         def resolve_entity(self, query):
-            raise AssertionError("Chado resolver should not receive raw IDs")
+            assert query == "FBst0007144"
+            return {"match_type": "EXACT", "results": [{"uniquename": "FBst0007144"}]}
 
     monkeypatch.setattr(ha_api, "_vfb", DummyVfb(), raising=False)
 
     result = ha_api._run_resolve_entity("fbst0007144")
 
-    assert result == {"match_type": "NOT_FOUND", "results": []}
+    assert result == {"match_type": "EXACT", "results": [{"uniquename": "FBst0007144"}]}
 
 
-def test_run_resolve_combination_returns_not_found_when_id_cannot_be_rewritten(monkeypatch):
+def test_run_resolve_combination_falls_back_to_canonical_id_when_id_cannot_be_rewritten(monkeypatch):
     class DummyVfb:
         def get_term_info(self, query, preview=False):
             assert query == "FBco0000052"
             assert preview is False
             return None
 
         def resolve_combination(self, query):
-            raise AssertionError("Chado resolver should not receive raw IDs")
+            assert query == "FBco0000052"
+            return {"match_type": "EXACT", "results": [{"uniquename": "FBco0000052"}]}
 
     monkeypatch.setattr(ha_api, "_vfb", DummyVfb(), raising=False)
 
     result = ha_api._run_resolve_combination("fbco0000052")
 
-    assert result == {"match_type": "NOT_FOUND", "results": []}
+    assert result == {"match_type": "EXACT", "results": [{"uniquename": "FBco0000052"}]}
 
 
 def test_parse_resolver_query_requires_query():

src/vfbquery/__init__.py

@@ -98,4 +98,4 @@ def clear_solr_cache(query_type: str, term_id: str) -> bool:
     __solr_caching_available__ = False
 
 # Version information
-__version__ = "1.7.3"
+__version__ = "1.7.4"

src/vfbquery/ha_api.py

@@ -327,8 +327,6 @@ def _run_query(short_form, func_name):
 def _run_resolve_entity(name_or_id):
     """Execute resolve_entity in a worker process."""
     query = _rewrite_resolve_entity_query(name_or_id)
-    if query is None:
-        return {"match_type": "NOT_FOUND", "results": []}
     return _vfb.resolve_entity(query)
 
 
@@ -340,8 +338,6 @@ def _run_find_stocks(feature_id, collection_filter):
 def _run_resolve_combination(name_or_id):
     """Execute resolve_combination in a worker process."""
     query = _rewrite_resolve_combination_query(name_or_id)
-    if query is None:
-        return {"match_type": "NOT_FOUND", "results": []}
     return _vfb.resolve_combination(query)
 
 
@@ -428,25 +424,25 @@ def _preferred_term_info_query(term_info):
 
 
 def _rewrite_resolve_entity_query(name_or_id):
-    """Rewrite a FlyBase feature ID to a preferred VFB term name."""
+    """Rewrite a FlyBase feature ID to a preferred VFB term name when available."""
     query = _parse_resolver_query(name_or_id)
     if not _FLYBASE_FEATURE_ID_RE.match(query):
         return query
 
     canonical_id = _canonicalize_flybase_feature_id(query)
     term_info = _vfb.get_term_info(canonical_id, preview=False)
-    return _preferred_term_info_query(term_info)
+    return _preferred_term_info_query(term_info) or canonical_id
 
 
 def _rewrite_resolve_combination_query(name_or_id):
-    """Rewrite an FBco ID to a preferred VFB term name."""
+    """Rewrite an FBco ID to a preferred VFB term name when available."""
     query = _parse_resolver_query(name_or_id)
     if not _FBCO_ID_RE.match(query):
         return query
 
     canonical_id = _canonicalize_fbco_id(query)
     term_info = _vfb.get_term_info(canonical_id, preview=False)
-    return _preferred_term_info_query(term_info)
+    return _preferred_term_info_query(term_info) or canonical_id
 
 
 # ---------------------------------------------------------------------------