omop-constructs 0.2.5__tar.gz → 0.2.7__tar.gz

{omop_constructs-0.2.5 → omop_constructs-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: omop-constructs
-Version: 0.2.5
+Version: 0.2.7
 Summary: For building complex constructs on top of the omop-alchemy library.
 Author: Georgie Kennedy
 Author-email: Georgie Kennedy <georgina.kennedy@unsw.edu.au>

{omop_constructs-0.2.5 → omop_constructs-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "omop-constructs"
-version = "0.2.5"
+version = "0.2.7"
 description = "For building complex constructs on top of the omop-alchemy library."
 readme = "README.md"
 authors = [

{omop_constructs-0.2.5 → omop_constructs-0.2.7}/src/omop_constructs/alchemy/episodes/condition_episode_mv.py

@@ -39,8 +39,8 @@ class OverarchingDiseaseEpisodeMV(
     extent_episode_concept_id: so.Mapped[Optional[int]] = so.mapped_column(sa.Integer, nullable=True)
     extent_episode_label: so.Mapped[Optional[str]] = so.mapped_column(sa.String, nullable=True)
 
-    extent_start_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
-    extent_end_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
+    extent_episode_start_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
+    extent_episode_end_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
 
     def __repr__(self) -> str:
         if self.has_extent:
@@ -62,7 +62,7 @@ class OverarchingDiseaseEpisodeMV(
     def extent_interval(self):
         if self.extent_episode_id is None:
             return None
-        return (self.extent_start_date, self.extent_end_date)
+        return (self.extent_episode_start_date, self.extent_episode_end_date)
     
 @register_construct
 class TreatmentRegimenCycleMV(
@@ -89,15 +89,15 @@ class TreatmentRegimenCycleMV(
     regimen_episode_concept_id: so.Mapped[int] = so.mapped_column(sa.Integer)
     regimen_episode_label: so.Mapped[str] = so.mapped_column(sa.String)
 
-    regimen_start_date: so.Mapped[date] = so.mapped_column(sa.Date)
-    regimen_end_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
+    regimen_episode_start_date: so.Mapped[date] = so.mapped_column(sa.Date)
+    regimen_episode_end_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
 
     cycle_episode_id: so.Mapped[Optional[int]] = so.mapped_column(sa.Integer, nullable=True)
     cycle_episode_concept_id: so.Mapped[Optional[int]] = so.mapped_column(sa.Integer, nullable=True)
     cycle_episode_label: so.Mapped[Optional[str]] = so.mapped_column(sa.String, nullable=True)
 
-    cycle_start_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
-    cycle_end_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
+    cycle_episode_start_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
+    cycle_episode_end_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date, nullable=True)
 
 
     def __repr__(self) -> str:
@@ -114,10 +114,10 @@ class TreatmentRegimenCycleMV(
 
     @property
     def regimen_interval(self):
-        return (self.regimen_start_date, self.regimen_end_date)
+        return (self.regimen_episode_start_date, self.regimen_episode_end_date)
 
     @property
     def cycle_interval(self):
         if self.cycle_episode_id is None:
             return None
-        return (self.cycle_start_date, self.cycle_end_date)
+        return (self.cycle_episode_start_date, self.cycle_episode_end_date)

{omop_constructs-0.2.5 → omop_constructs-0.2.7}/src/omop_constructs/alchemy/episodes/episode_factories.py

@@ -48,6 +48,8 @@ def get_episode_hierarchy_query(
     parent_episode_subq: sa.Subquery,
     child_episode_subq: sa.Subquery,
     name: str = "episode_optional_children",
+    parent_label: str = 'disease_episode',
+    child_label: str = 'extent_episode'
 ) -> sa.Subquery:
     """
     Expands an episode subquery to optionally include child episodes.
@@ -55,18 +57,18 @@ def get_episode_hierarchy_query(
 
     return (
         sa.select(
-            parent_episode_subq.c.episode_id.label("disease_episode_id"),
+            parent_episode_subq.c.episode_id.label(f"{parent_label}_id"),
             parent_episode_subq.c.person_id.label("person_id"),
-            parent_episode_subq.c.episode_concept_id.label("disease_episode_concept_id"),
-            parent_episode_subq.c.episode_label.label("disease_episode_label"),
-            parent_episode_subq.c.episode_start_date.label("disease_episode_start_date"),
-            parent_episode_subq.c.episode_end_date.label("disease_episode_end_date"),
+            parent_episode_subq.c.episode_concept_id.label(f"{parent_label}_concept_id"),
+            parent_episode_subq.c.episode_label.label(f"{parent_label}_label"),
+            parent_episode_subq.c.episode_start_date.label(f"{parent_label}_start_date"),
+            parent_episode_subq.c.episode_end_date.label(f"{parent_label}_end_date"),
 
-            child_episode_subq.c.episode_id.label("extent_episode_id"),
-            child_episode_subq.c.episode_concept_id.label("extent_episode_concept_id"),
-            child_episode_subq.c.episode_label.label("extent_episode_label"),
-            child_episode_subq.c.episode_start_date.label("extent_start_date"),
-            child_episode_subq.c.episode_end_date.label("extent_end_date"),
+            child_episode_subq.c.episode_id.label(f"{child_label}_id"),
+            child_episode_subq.c.episode_concept_id.label(f"{child_label}_concept_id"),
+            child_episode_subq.c.episode_label.label(f"{child_label}_label"),
+            child_episode_subq.c.episode_start_date.label(f"{child_label}_start_date"),
+            child_episode_subq.c.episode_end_date.label(f"{child_label}_end_date"),
         )
         .join(
             child_episode_subq,

{omop_constructs-0.2.5 → omop_constructs-0.2.7}/src/omop_constructs/alchemy/episodes/episode_joins.py

@@ -31,4 +31,6 @@ treatment_regimen_with_cycles = get_episode_hierarchy_query(
     parent_episode_subq=treatment_regimen_select,
     child_episode_subq=treatment_cycle_select,
     name="treatment_regimen_with_cycles",
+    parent_label="regimen_episode",
+    child_label="cycle_episode"
 )