Skip to content

Implementation of backwards compatable concept set support for TAB settings #27

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
azimov merged 5 commits into from
Mar 24, 2026
Merged

Implementation of backwards compatable concept set support for TAB settings #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aefdaf0
Implementaion of backwards compatable concept set support for TAB sup…
azimov Mar 19, 2026
af9484f
more TAB test cases
azimov Mar 19, 2026
da3a1df
Merge remote-tracking branch 'refs/remotes/origin/develop' into fixes…
azimov Mar 24, 2026
96d1b5e
Tests to improve coverage and quality
azimov Mar 24, 2026
3eaf1ba
Tests to improve tests on concept set checkers
azimov Mar 24, 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
2 changes: 0 additions & 2 deletions circe/cohortdefinition/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
BuildExpressionQueryOptions,
CohortExpressionQueryBuilder,
)
from .concept_set_expression_query_builder import ConceptSetExpressionQueryBuilder
from .core import ( # Supporting Classes
CollapseSettings,
CollapseType,
Expand Down Expand Up @@ -118,7 +117,6 @@
# Query Builders
"CohortExpressionQueryBuilder",
"BuildExpressionQueryOptions",
"ConceptSetExpressionQueryBuilder",
# Interfaces
"IGetCriteriaSqlDispatcher",
"IGetEndStrategySqlDispatcher",
Expand Down
2 changes: 1 addition & 1 deletion circe/cohortdefinition/cohort_expression_query_builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

from circe.extensions import get_registry

from ..vocabulary.concept_set_expression_query_builder import ConceptSetExpressionQueryBuilder
from .builders import (
ConditionEraSqlBuilder,
ConditionOccurrenceSqlBuilder,
Expand All @@ -34,7 +35,6 @@
)
from .builders.utils import BuilderOptions, BuilderUtils, CriteriaColumn
from .cohort import CohortExpression
from .concept_set_expression_query_builder import ConceptSetExpressionQueryBuilder
from .core import CustomEraStrategy, DateOffsetStrategy, Period
from .criteria import (
ConditionEra,
Expand Down
183 changes: 0 additions & 183 deletions circe/cohortdefinition/concept_set_expression_query_builder.py
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions circe/vocabulary/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@
Reference: JAVA_CLASS_MAPPINGS.md for Java equivalents.
"""

from .concept import Concept, ConceptSet, ConceptSetExpression, ConceptSetItem
from .concept import Concept, ConceptExpressionItem, ConceptSet, ConceptSetExpression, ConceptSetItem

__all__ = ["Concept", "ConceptSet", "ConceptSetExpression", "ConceptSetItem"]
# Note: ConceptSetExpressionQueryBuilder is not exported here to avoid circular imports
# Import it directly: from circe.vocabulary.concept_set_expression_query_builder import ConceptSetExpressionQueryBuilder

__all__ = [
"Concept",
"ConceptSet",
"ConceptSetExpression",
"ConceptSetItem", # Backward compatibility alias
"ConceptExpressionItem",
]
Loading
Loading