Skip to content

concurrent rt #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gkennos merged 2 commits into from
Jul 13, 2026
Merged

concurrent rt #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
743f05a
concurrent rt
gkennos Jul 13, 2026
05f86b9
Regenerate stale registry schema snapshot artifact
gkennos Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,4 @@

## 0.5.0
- integrated oa-configurator package configuration and adapted omop-constructs to current orm-loader / omop-alchemy compatibility changes

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "omop-constructs"
version = "0.5.0"
version = "0.5.1"
description = "For building complex constructs on top of the omop-alchemy library."
readme = "README.md"
authors = [
Expand Down
16 changes: 15 additions & 1 deletion src/omop_constructs/alchemy/episodes/modality_intent_mv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from ...core.constructs import register_construct
from ...core.sql import select_all_columns
from .modality_intent_join import episode_join
from .treatment_envelope_mv import TreatmentEnvelopeMV

@register_construct
class TreatmentIntentMV(
Expand Down Expand Up @@ -58,12 +59,20 @@ class TreatmentIntentMV(
sa.func.coalesce(TreatmentIntentMV.rt, False).label("rt"),
sa.func.coalesce(TreatmentIntentMV.sact, False).label("sact"),
sa.func.coalesce(TreatmentIntentMV.concurrent, False).label("concurrent"),
sa.and_(
sa.func.coalesce(TreatmentIntentMV.rt, False),
sa.func.coalesce(TreatmentEnvelopeMV.concurrent_chemort, False)
).label("concurrent_rt"),
)
.outerjoin(
TreatmentIntentMV,
TreatmentIntentMV.treatment_episode_parent_id
== ConditionEpisodeMV.episode_id
)
.outerjoin(
TreatmentEnvelopeMV,
TreatmentEnvelopeMV.condition_episode == ConditionEpisodeMV.episode_id
)
)

@register_construct
Expand All @@ -74,7 +83,11 @@ class ConditionTreatmentIntentMV(
__mv_name__ = "condition_episode_intent_mv"
__mv_select__ = episode_summary_select
__mv_index__ = "episode_id"
__deps__ = (ConditionEpisodeMV.__mv_name__, TreatmentIntentMV.__mv_name__)
__deps__ = (
ConditionEpisodeMV.__mv_name__,
TreatmentIntentMV.__mv_name__,
TreatmentEnvelopeMV.__mv_name__,
)
__tablename__ = __mv_name__
__table_args__ = {"extend_existing": True}

Expand All @@ -98,3 +111,4 @@ class ConditionTreatmentIntentMV(
rt: so.Mapped[bool | None] = so.mapped_column(sa.Boolean, nullable=True)
sact: so.Mapped[bool | None] = so.mapped_column(sa.Boolean, nullable=True)
concurrent: so.Mapped[bool | None] = so.mapped_column(sa.Boolean, nullable=True)
concurrent_rt: so.Mapped[bool | None] = so.mapped_column(sa.Boolean, nullable=True)
31 changes: 16 additions & 15 deletions tests/artifacts/construct_registry_schema.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,22 @@ bsa_dx_mv,omop_constructs.alchemy.events.dx_linked_event_mv,BSADxMV,materialized
bsa_dx_mv,omop_constructs.alchemy.events.dx_linked_event_mv,BSADxMV,materialized_view,condition_episode_mv,person_id,,12,episode_start_date,DATE,true,false
bsa_dx_mv,omop_constructs.alchemy.events.dx_linked_event_mv,BSADxMV,materialized_view,condition_episode_mv,person_id,,13,episode_end_date,DATE,true,false
bsa_dx_mv,omop_constructs.alchemy.events.dx_linked_event_mv,BSADxMV,materialized_view,condition_episode_mv,person_id,,14,episode_delta_days,INTEGER,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,1,mv_id,INTEGER,false,true
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,2,episode_id,INTEGER,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,3,person_id,INTEGER,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,4,episode_concept_id,INTEGER,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,5,episode_label,VARCHAR,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,6,episode_start_date,DATE,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,7,episode_end_date,DATE,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,8,treatment_episode_id,INTEGER,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,9,treatment_episode_start_date,DATE,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,10,treatment_episode_end_date,DATE,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,11,treatment_intent_concept_id,INTEGER,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,12,treatment_intent_name,VARCHAR,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,13,rt,BOOLEAN,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,14,sact,BOOLEAN,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv,episode_id,,15,concurrent,BOOLEAN,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,1,mv_id,INTEGER,false,true
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,2,episode_id,INTEGER,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,3,person_id,INTEGER,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,4,episode_concept_id,INTEGER,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,5,episode_label,VARCHAR,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,6,episode_start_date,DATE,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,7,episode_end_date,DATE,false,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,8,treatment_episode_id,INTEGER,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,9,treatment_episode_start_date,DATE,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,10,treatment_episode_end_date,DATE,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,11,treatment_intent_concept_id,INTEGER,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,12,treatment_intent_name,VARCHAR,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,13,rt,BOOLEAN,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,14,sact,BOOLEAN,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,15,concurrent,BOOLEAN,true,false
condition_episode_intent_mv,omop_constructs.alchemy.episodes.modality_intent_mv,ConditionTreatmentIntentMV,materialized_view,condition_episode_mv|episode_treatment_mv|treatment_envelope_mv,episode_id,,16,concurrent_rt,BOOLEAN,true,false
condition_episode_mv,omop_constructs.alchemy.episodes.condition_episode_mv,ConditionEpisodeMV,materialized_view,,episode_id,,1,episode_id,INTEGER,false,true
condition_episode_mv,omop_constructs.alchemy.episodes.condition_episode_mv,ConditionEpisodeMV,materialized_view,,episode_id,,2,person_id,INTEGER,false,false
condition_episode_mv,omop_constructs.alchemy.episodes.condition_episode_mv,ConditionEpisodeMV,materialized_view,,episode_id,,3,episode_concept_id,INTEGER,false,false
Expand Down
Loading