Allow enref() caller to get back id and object as tuple

ga4gh · Dec 26, 2023 · 8581e03 · 8581e03
1 parent 39eae07
commit 8581e03
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ga4gh/core/_internal/enderef.py b/src/ga4gh/core/_internal/enderef.py
@@ -22,7 +22,7 @@
 _logger = logging.getLogger(__name__)
 
 
-def ga4gh_enref(o, cra_map, object_store=None):
+def ga4gh_enref(o, cra_map, object_store=None, return_id_obj_tuple=False):
     """Recursively convert "referable attributes" from inlined to
     referenced form.  Returns a new object.
 
@@ -65,8 +65,8 @@ def _enref(o):
 
     # in-place replacement on object copy
     o = pydantic_copy(o)
-    _enref(o)
-    return o
+    _id = _enref(o)
+    return (_id, o) if return_id_obj_tuple else o
 
 
 def ga4gh_deref(o, cra_map, object_store):

diff --git a/src/ga4gh/vrs/_internal/enderef.py b/src/ga4gh/vrs/_internal/enderef.py
@@ -3,8 +3,8 @@
 from .models import class_refatt_map
 
 
-def vrs_enref(o, object_store=None):
-    return ga4gh_enref(o, cra_map=class_refatt_map, object_store=object_store)
+def vrs_enref(o, object_store=None, return_id_obj_tuple=False):
+    return ga4gh_enref(o, cra_map=class_refatt_map, object_store=object_store, return_id_obj_tuple=return_id_obj_tuple)
 
 
 def vrs_deref(o, object_store):