omop-constructs 0.4.2__tar.gz → 0.4.3__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 (74) hide show
  1. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/PKG-INFO +1 -1
  2. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/pyproject.toml +1 -1
  3. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/dx_linked_obs_mv.py +1 -3
  4. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/observation_queries.py +2 -0
  5. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/procedure_queries.py +5 -1
  6. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/README.md +0 -0
  7. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/__init__.py +0 -0
  8. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/__init__.py +0 -0
  9. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/adapters.py +0 -0
  10. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/concepts/__init__.py +0 -0
  11. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/concepts/concept_mappers.py +0 -0
  12. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/concepts/concept_standardisation.py +0 -0
  13. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/conditions/__init__.py +0 -0
  14. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/conditions/condition_joins.py +0 -0
  15. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/conditions/condition_mappers.py +0 -0
  16. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/demography/__init__.py +0 -0
  17. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/demography/demography_matview.py +0 -0
  18. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/demography/demography_queries.py +0 -0
  19. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/__init__.py +0 -0
  20. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/condition_episode_mv.py +0 -0
  21. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/condition_episode_objects.py +0 -0
  22. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/consult_window_mv.py +0 -0
  23. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/consult_window_query.py +0 -0
  24. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/course_joins.py +0 -0
  25. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/course_mv.py +0 -0
  26. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/cycle_join.py +0 -0
  27. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/cycle_mv.py +0 -0
  28. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/episode_factories.py +0 -0
  29. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/episode_joins.py +0 -0
  30. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/fraction_joins.py +0 -0
  31. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/fraction_mv.py +0 -0
  32. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/modality_intent_join.py +0 -0
  33. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/modality_intent_mv.py +0 -0
  34. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/surgical_joins.py +0 -0
  35. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/surgical_procedure_mv.py +0 -0
  36. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/systemic_treatment_joins.py +0 -0
  37. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/systemic_treatment_mv.py +0 -0
  38. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/treatment_envelope_mv.py +0 -0
  39. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/treatment_envelope_query.py +0 -0
  40. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/treatment_summary_joins.py +0 -0
  41. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/episodes/treatment_summary_mv.py +0 -0
  42. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/__init__.py +0 -0
  43. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/dx_linked_event_mv.py +0 -0
  44. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/dx_linked_procedure_mv.py +0 -0
  45. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/dx_linked_visit_mv.py +0 -0
  46. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/event_factories.py +0 -0
  47. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/event_queries.py +0 -0
  48. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/events/visit_queries.py +0 -0
  49. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/__init__.py +0 -0
  50. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/condition_modifier_join.py +0 -0
  51. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/condition_modifier_mv.py +0 -0
  52. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/modifier_factories.py +0 -0
  53. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/modifier_joins.py +0 -0
  54. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/modifier_mappers.py +0 -0
  55. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/procedure_modifier_joins.py +0 -0
  56. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/modifiers/procedure_modifier_mv.py +0 -0
  57. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/alchemy/source_factories.py +0 -0
  58. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/__init__.py +0 -0
  59. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/base.py +0 -0
  60. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/constructs.py +0 -0
  61. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/ddl.py +0 -0
  62. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/errors.py +0 -0
  63. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/materialized.py +0 -0
  64. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/plan.py +0 -0
  65. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/core/registry.py +0 -0
  66. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/py.typed +0 -0
  67. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/semantics/__init__.py +0 -0
  68. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/semantics/adapters.py +0 -0
  69. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/semantics/lookups.py +0 -0
  70. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/semantics/runtime_lookups.py +0 -0
  71. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/services/__init__.py +0 -0
  72. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/services/concept.py +0 -0
  73. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/services/person.py +0 -0
  74. {omop_constructs-0.4.2 → omop_constructs-0.4.3}/src/omop_constructs/typing.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.3
2
2
  Name: omop-constructs
3
- Version: 0.4.2
3
+ Version: 0.4.3
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>
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "omop-constructs"
3
- version = "0.4.2"
3
+ version = "0.4.3"
4
4
  description = "For building complex constructs on top of the omop-alchemy library."
5
5
  readme = "README.md"
6
6
  authors = [
@@ -46,6 +46,4 @@ class DxObservationMV(ConditionEpisodeObservationCols, MaterializedViewMixin, Ba
46
46
  __tablename__ = __mv_name__
47
47
 
48
48
  observation_concept_id: so.Mapped[int] = so.mapped_column(sa.Integer)
49
- observation_date: so.Mapped[Optional[date]] = so.mapped_column(sa.DateTime)
50
- value_concept_id: so.Mapped[Optional[int]] = so.mapped_column(sa.Integer, nullable=True)
51
- qualifier_concept_id: so.Mapped[Optional[int]] = so.mapped_column(sa.Integer, nullable=True)
49
+ observation_date: so.Mapped[Optional[date]] = so.mapped_column(sa.Date)
@@ -6,6 +6,8 @@ dx_all_observations = episode_relevant_window(
6
6
  include_cols=[
7
7
  Observation.value_as_number,
8
8
  Observation.qualifier_concept_id,
9
+ Observation.observation_concept_id.label("observation_concept_id"),
10
+ Observation.observation_date.label("observation_date"),
9
11
  ],
10
12
  name="dx_all_observations",
11
13
  unlinked_only=False,
@@ -1,9 +1,13 @@
1
1
  from .event_factories import procedure_attached_to_condition_episode, episode_relevant_window
2
+ from omop_alchemy.cdm.model import Procedure_Occurrence
2
3
 
3
4
  dx_all_procedures = episode_relevant_window(
4
5
  procedure_attached_to_condition_episode(
5
6
  concept_ids=None,
6
- include_cols=[],
7
+ include_cols=[
8
+ Procedure_Occurrence.procedure_concept_id.label("procedure_concept_id"),
9
+ Procedure_Occurrence.procedure_datetime.label("procedure_datetime"),
10
+ ],
7
11
  name="dx_all_procedures",
8
12
  ),
9
13
  name="dx_all_procedures_windowed",