From 2001fd2763da9548235749157fba7062a74d0446 Mon Sep 17 00:00:00 2001 From: quinnwai Date: Mon, 10 Feb 2025 16:07:27 -0800 Subject: [PATCH] create uuid // bump version --- gen3_tracker/meta/dataframer.py | 8 ++++---- setup.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gen3_tracker/meta/dataframer.py b/gen3_tracker/meta/dataframer.py index cb4a366..90354a5 100644 --- a/gen3_tracker/meta/dataframer.py +++ b/gen3_tracker/meta/dataframer.py @@ -2,6 +2,7 @@ # LOCAL FHIR DATABASE ### ########################### +import uuid import inflection import json import ndjson @@ -15,6 +16,7 @@ from functools import lru_cache from typing import Dict, Generator, List +from gen3_tracker import ACED_NAMESPACE from gen3_tracker.meta.entities import ( SimplifiedGroup, SimplifiedResource, @@ -634,9 +636,7 @@ def flattened_group_members(self) -> Generator[dict, None, None]: # for each member in a group, yield a group member dict for member_id in group_resource.members: # unique primary key from group and member ids - group_member_id = ( - simplified_group["id"] + "," + member_id - ) + group_member_id = str(uuid.uuid5(ACED_NAMESPACE, simplified_group["id"] + "," + member_id)) # group member dict composed of a simple group dict, unique primary key, and unique member_id yield { @@ -663,7 +663,7 @@ def create_dataframe( "DocumentReference": db.flattened_document_references, "ResearchSubject": db.flattened_research_subjects, "MedicationAdministration": db.flattened_medication_administrations, - "Specimen": db.flattened_specimen, + "Specimen": db.flattened_specimens, "GroupMember": db.flattened_group_members, } diff --git a/setup.py b/setup.py index f03cb66..f9e828b 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setup( name='gen3_tracker', - version='0.0.7rc9', + version='0.0.7rc10', description='A CLI for adding version control to Gen3 data submission projects.', long_description=long_description, long_description_content_type='text/markdown',