omop-constructs 0.2.2__tar.gz → 0.2.4__tar.gz

{omop_constructs-0.2.2 → omop_constructs-0.2.4}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.3
 Name: omop-constructs
-Version: 0.2.2
+Version: 0.2.4
 Summary: For building complex constructs on top of the omop-alchemy library.
 Author: Georgie Kennedy
 Author-email: Georgie Kennedy <georgina.kennedy@unsw.edu.au>
 Requires-Dist: omop-alchemy>=0.5.12
-Requires-Dist: omop-semantics>=0.1.8
+Requires-Dist: omop-semantics>=0.1.10
 Requires-Dist: psycopg2-binary>=2.9.11
 Requires-Dist: sqlalchemy>=2.0.45
 Requires-Dist: urllib3>=2.6.3

{omop_constructs-0.2.2 → omop_constructs-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "omop-constructs"
-version = "0.2.2"
+version = "0.2.4"
 description = "For building complex constructs on top of the omop-alchemy library."
 readme = "README.md"
 authors = [
@@ -9,7 +9,7 @@ authors = [
 requires-python = ">=3.12"
 dependencies = [
     "omop-alchemy>=0.5.12",
-    "omop-semantics>=0.1.8",
+    "omop-semantics>=0.1.10",
     "psycopg2-binary>=2.9.11",
     "sqlalchemy>=2.0.45",
     "urllib3>=2.6.3",

omop_constructs-0.2.4/src/omop_constructs/alchemy/conditions/__init__.py

@@ -0,0 +1,7 @@
+from .condition_joins import condition_window
+from .condition_mappers import Condition_Window
+
+__all__ = [
+    "condition_window",
+    "Condition_Window"
+]

omop_constructs-0.2.4/src/omop_constructs/alchemy/episodes/__init__.py

@@ -0,0 +1,13 @@
+from .condition_episode_mv import OverarchingDiseaseEpisodeMV
+from .episode_joins import episode_of_care_select, disease_extent_select, overarching_disease_episode
+from .episode_factories import get_episode_query, require_condition_anchor, get_episode_hierarchy_query
+
+__all__ = [
+    "OverarchingDiseaseEpisodeMV",
+    "episode_of_care_select",
+    "disease_extent_select",
+    "overarching_disease_episode",
+    "get_episode_query",
+    "require_condition_anchor",
+    "get_episode_hierarchy_query",
+]

{omop_constructs-0.2.2 → omop_constructs-0.2.4}/src/omop_constructs/alchemy/episodes/episode_factories.py

@@ -76,18 +76,18 @@ def get_episode_hierarchy_query(
 
     return (
         sa.select(
-            parent_episode_subq.c.episode_id.label("parent_episode_id"),
+            parent_episode_subq.c.episode_id.label("disease_episode_id"),
             parent_episode_subq.c.person_id.label("person_id"),
-            parent_episode_subq.c.episode_concept_id.label("parent_episode_concept_id"),
-            parent_episode_subq.c.episode_label.label("parent_episode_label"),
-            parent_episode_subq.c.episode_start_date.label("parent_start_date"),
-            parent_episode_subq.c.episode_end_date.label("parent_end_date"),
+            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"),
 
-            child_episode_subq.c.episode_id.label("child_episode_id"),
-            child_episode_subq.c.episode_concept_id.label("child_episode_concept_id"),
-            child_episode_subq.c.episode_label.label("child_episode_label"),
-            child_episode_subq.c.episode_start_date.label("child_start_date"),
-            child_episode_subq.c.episode_end_date.label("child_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"),
         )
         .join(
             child_episode_subq,

{omop_constructs-0.2.2 → omop_constructs-0.2.4}/src/omop_constructs/alchemy/episodes/episode_joins.py

@@ -3,14 +3,14 @@ from omop_semantics.runtime.default_valuesets import runtime
 
 episode_of_care_select = require_condition_anchor(
     get_episode_query(
-        [runtime.episodes.disease_episode_types.episode_of_care],  # type: ignore
+        [runtime.types.disease_episode_types.episode_of_care],  # type: ignore
         name="episode_of_care"
     )
 )
 
 disease_extent_select = require_condition_anchor(
     get_episode_query(
-        [runtime.episodes.disease_episode_types.metastatic, runtime.episodes.disease_episode_types.disease_progression],  # type: ignore
+        [runtime.types.disease_episode_types.disease_progression, runtime.types.disease_episode_types.metastatic],  # type: ignore
         name="disease_extent"
     )
 )