Merge pull request #13 from Medical-Event-Data-Standard/static_measur…

…ements Re-add static measurements
Medical-Event-Data-Standard · Feb 19, 2024 · 419caa7 · 419caa7
2 parents 274ba5c + 245104a
commit 419caa7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ The Python type signature for the schema is as follows:
 
 Patient = TypedDict('Patient', {
   'patient_id': int,
+  'static_measurements': List[Measurement],
   'events': List[Event],
 })
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "meds"
-version = "0.1.1"
+version = "0.1.2"
 description = "A data standard for working with event stream data"
 readme = "README.md"
 license = {text = "Apache-2.0"}

diff --git a/src/meds/schema.py b/src/meds/schema.py
@@ -39,6 +39,7 @@ def patient_schema(per_event_metadata_schema=pa.null()):
     patient = pa.schema(
         [
             ("patient_id", pa.int64()),
+            ("static_measurements", pa.list_(measurement)),
             ("events", pa.list_(event)),  # Require ordered by time
         ]
     )
@@ -61,7 +62,7 @@ def patient_schema(per_event_metadata_schema=pa.null()):
 
 Event = TypedDict("Event", {"time": datetime.datetime, "measurements": List[Measurement]})
 
-Patient = TypedDict("Patient", {"patient_id": int, "events": List[Event]})
+Patient = TypedDict("Patient", {"patient_id": int, "static_measurements": List[Measurement], "events": List[Event]})
 
 ############################################################
 

diff --git a/tests/test_schema.py b/tests/test_schema.py
@@ -15,6 +15,13 @@ def test_patient_schema():
     patient_data = [
         {
             "patient_id": 123,
+            "static_measurements": [{
+                "code": "some_static_code",
+                "text_value": "example",
+                "numeric_value": 1.0,
+                "datetime_value": datetime.datetime(2019, 1, 1, 0, 0, 0),
+                "metadata": None,
+            }],
             "events": [{  # Nested list for events
                 "time": datetime.datetime(2020, 1, 1, 12, 0, 0),
                 "measurements": [{  # Nested list for measurements