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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (40) hide show
  1. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/PKG-INFO +1 -1
  2. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/pyproject.toml +1 -1
  3. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/episodes/episode_factories.py +12 -10
  4. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/episodes/episode_joins.py +2 -0
  5. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/README.md +0 -0
  6. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/__init__.py +0 -0
  7. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/__init__.py +0 -0
  8. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/adapters.py +0 -0
  9. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/concepts/__init__.py +0 -0
  10. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/concepts/concept_mappers.py +0 -0
  11. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/concepts/concept_standardisation.py +0 -0
  12. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/conditions/__init__.py +0 -0
  13. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/conditions/condition_joins.py +0 -0
  14. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/conditions/condition_mappers.py +0 -0
  15. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/episodes/__init__.py +0 -0
  16. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/episodes/condition_episode_mv.py +0 -0
  17. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/modifiers/__init__.py +0 -0
  18. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/modifiers/condition_modifier_join.py +0 -0
  19. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/modifiers/condition_modifier_mv.py +0 -0
  20. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/modifiers/modifier_factories.py +0 -0
  21. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/modifiers/modifier_joins.py +0 -0
  22. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/modifiers/modifier_mappers.py +0 -0
  23. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/source_factories.py +0 -0
  24. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/__init__.py +0 -0
  25. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/base.py +0 -0
  26. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/constructs.py +0 -0
  27. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/ddl.py +0 -0
  28. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/errors.py +0 -0
  29. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/materialized.py +0 -0
  30. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/plan.py +0 -0
  31. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/core/registry.py +0 -0
  32. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/py.typed +0 -0
  33. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/semantics/__init__.py +0 -0
  34. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/semantics/adapters.py +0 -0
  35. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/semantics/lookups.py +0 -0
  36. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/semantics/runtime_lookups.py +0 -0
  37. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/services/__init__.py +0 -0
  38. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/services/concept.py +0 -0
  39. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/services/person.py +0 -0
  40. {omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/typing.py +0 -0
{omop_constructs-0.2.5 → omop_constructs-0.2.6}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: omop-constructs
3
- Version: 0.2.5
3
+ Version: 0.2.6
4
4
  Summary: For building complex constructs on top of the omop-alchemy library.
5
5
  Author: Georgie Kennedy
6
6
  Author-email: Georgie Kennedy <georgina.kennedy@unsw.edu.au>
{omop_constructs-0.2.5 → omop_constructs-0.2.6}/pyproject.toml RENAMED
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "omop-constructs"
3
- version = "0.2.5"
3
+ version = "0.2.6"
4
4
  description = "For building complex constructs on top of the omop-alchemy library."
5
5
  readme = "README.md"
6
6
  authors = [
{omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/episodes/episode_factories.py RENAMED
@@ -48,6 +48,8 @@ def get_episode_hierarchy_query(
48
48
  parent_episode_subq: sa.Subquery,
49
49
  child_episode_subq: sa.Subquery,
50
50
  name: str = "episode_optional_children",
51
+ parent_label: str = 'disease',
52
+ child_label: str = 'extent'
51
53
  ) -> sa.Subquery:
52
54
  """
53
55
  Expands an episode subquery to optionally include child episodes.
@@ -55,18 +57,18 @@ def get_episode_hierarchy_query(
55
57
 
56
58
  return (
57
59
  sa.select(
58
- parent_episode_subq.c.episode_id.label("disease_episode_id"),
60
+ parent_episode_subq.c.episode_id.label(f"{parent_label}_episode_id"),
59
61
  parent_episode_subq.c.person_id.label("person_id"),
60
- parent_episode_subq.c.episode_concept_id.label("disease_episode_concept_id"),
61
- parent_episode_subq.c.episode_label.label("disease_episode_label"),
62
- parent_episode_subq.c.episode_start_date.label("disease_episode_start_date"),
63
- parent_episode_subq.c.episode_end_date.label("disease_episode_end_date"),
62
+ parent_episode_subq.c.episode_concept_id.label(f"{parent_label}_episode_concept_id"),
63
+ parent_episode_subq.c.episode_label.label(f"{parent_label}_episode_label"),
64
+ parent_episode_subq.c.episode_start_date.label(f"{parent_label}_episode_start_date"),
65
+ parent_episode_subq.c.episode_end_date.label(f"{parent_label}_episode_end_date"),
64
66
 
65
- child_episode_subq.c.episode_id.label("extent_episode_id"),
66
- child_episode_subq.c.episode_concept_id.label("extent_episode_concept_id"),
67
- child_episode_subq.c.episode_label.label("extent_episode_label"),
68
- child_episode_subq.c.episode_start_date.label("extent_start_date"),
69
- child_episode_subq.c.episode_end_date.label("extent_end_date"),
67
+ child_episode_subq.c.episode_id.label(f"{child_label}_episode_id"),
68
+ child_episode_subq.c.episode_concept_id.label(f"{child_label}_episode_concept_id"),
69
+ child_episode_subq.c.episode_label.label(f"{child_label}_episode_label"),
70
+ child_episode_subq.c.episode_start_date.label(f"{child_label}_start_date"),
71
+ child_episode_subq.c.episode_end_date.label(f"{child_label}_end_date"),
70
72
  )
71
73
  .join(
72
74
  child_episode_subq,
{omop_constructs-0.2.5 → omop_constructs-0.2.6}/src/omop_constructs/alchemy/episodes/episode_joins.py RENAMED
@@ -31,4 +31,6 @@ treatment_regimen_with_cycles = get_episode_hierarchy_query(
31
31
  parent_episode_subq=treatment_regimen_select,
32
32
  child_episode_subq=treatment_cycle_select,
33
33
  name="treatment_regimen_with_cycles",
34
+ parent_label="regimen",
35
+ child_label="cycle"
34
36
  )