Skip to content

Change distinct sets to lists #1721

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
SFJohnson24 merged 5 commits into from
May 7, 2026
Merged

Change distinct sets to lists #1721

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
194fa7a
Change distinct sets to lists
gerrycampion May 5, 2026
717694f
more distinct fixes and test fixes
gerrycampion May 6, 2026
1668b82
Merge branch 'main' into give-distinct-determinisitic-ordering
gerrycampion May 6, 2026
65408ff
add none list to null_flavors
gerrycampion May 6, 2026
286a6ee
Merge branch 'main' into give-distinct-determinisitic-ordering
SFJohnson24 May 7, 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: 1 addition & 1 deletion cdisc_rules_engine/constants/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
" SAS\\s{5}.{8}SASDATA .{16}\\s{24}.{16}(?P<modified_date>.{16})\\s{16}.{40}"
)

NULL_FLAVORS = ["", None, {None}, [], {}, np.nan]
NULL_FLAVORS = ["", None, {}, {None}, [], [None], np.nan]

KNOWN_REPORT_EXTENSIONS = [".json", ".xlsx", ".xls"]

Expand Down
10 changes: 6 additions & 4 deletions cdisc_rules_engine/operations/distinct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def _execute_operation(self):
data = result[self.params.target].unique()
if len(data) > 0 and isinstance(data[0], bytes):
data = data.astype(str)
result = set(data)
result = list(data)
else:
grouped = result.groupby(
self.params.grouping, as_index=False, group_keys=False
Expand All @@ -52,7 +52,9 @@ def get_existing_column_names(group):
),
axis=1,
)
return pd.Series({operation_id: set(values.dropna().unique())})
return pd.Series(
{operation_id: list(values.dropna().sort_index().unique())}
)

result = grouped.apply(get_existing_column_names).reset_index()
elif isinstance(result.data, pd.DataFrame):
Expand All @@ -65,7 +67,7 @@ def get_existing_column_names(group):
.unique()
.rename({self.params.target: self.params.operation_id})
)
result = result.apply(set).to_frame().reset_index()
result = result.apply(list).to_frame().reset_index()
return result

def _get_referenced_datasets(self):
Expand All @@ -76,4 +78,4 @@ def _get_referenced_datasets(self):
return referenced_datasets

def _unique_values_for_column(self, column):
return pd.Series({self.params.operation_id: set(column.unique())})
return pd.Series({self.params.operation_id: list(column.unique())})
28 changes: 14 additions & 14 deletions tests/unit/test_operations/test_distinct.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
[
(
PandasDataset.from_dict({"values": [11, 12, 12, 5, 18, 9]}),
{5, 9, 11, 12, 18},
[11, 12, 5, 18, 9],
),
(
DaskDataset.from_dict({"values": [11, 12, 12, 5, 18, 9]}),
{5, 9, 11, 12, 18},
[11, 12, 5, 18, 9],
),
],
)
Expand All @@ -44,14 +44,14 @@ def test_distinct(data, expected, operation_params: OperationParams):
PandasDataset.from_dict(
{"values": [11, 12, 12, 5, 18, 9], "patient": [1, 2, 2, 1, 2, 1]}
),
{1: {5, 9, 11}, 2: {12, 18}},
{1: [11, 5, 9], 2: [12, 18]},
None,
),
(
DaskDataset.from_dict(
{"values": [11, 12, 12, 5, 18, 9], "patient": [1, 2, 2, 1, 2, 1]}
),
{1: {5, 9, 11}, 2: {12, 18}},
{1: [11, 5, 9], 2: [12, 18]},
None,
),
(
Expand All @@ -62,7 +62,7 @@ def test_distinct(data, expected, operation_params: OperationParams):
"subject": [1, 2, 2, 1, 2, 3],
}
),
{1: {5, 9, 11}, 2: {12, 18}, 3: None},
{1: [11, 5, 9], 2: [12, 18], 3: None},
["subject"],
),
(
Expand All @@ -73,7 +73,7 @@ def test_distinct(data, expected, operation_params: OperationParams):
"subject": [1, 2, 2, 1, 2, 3],
}
),
{1: {5, 9, 11}, 2: {12, 18}, 3: None},
{1: [11, 5, 9], 2: [12, 18], 3: None},
["subject"],
),
],
Expand Down Expand Up @@ -110,7 +110,7 @@ def test_grouped_distinct(
"scat": ["a", "a", "a", "a", "a", "b"],
}
),
{1: {5, 11}, 2: {12}},
{1: [11, 5], 2: [12]},
None,
{"cat": 1, "scat": "a"},
),
Expand All @@ -123,7 +123,7 @@ def test_grouped_distinct(
"scat": ["a", "a", "a", "a", "a", "b"],
}
),
{1: {5, 11}, 2: {12}},
{1: [11, 5], 2: [12]},
None,
{"cat": 1, "scat": "a"},
),
Expand All @@ -137,7 +137,7 @@ def test_grouped_distinct(
"subject": [1, 2, 2, 1, 2, 3],
}
),
{1: {5, 11}, 2: {12}, 3: None},
{1: [11, 5], 2: [12], 3: None},
["subject"],
{"cat": 1, "scat": "a"},
),
Expand All @@ -151,7 +151,7 @@ def test_grouped_distinct(
"subject": [1, 2, 2, 1, 2, 3],
}
),
{1: {5, 11}, 2: {12}, 3: None},
{1: [11, 5], 2: [12], 3: None},
["subject"],
{"cat": 1, "scat": "a"},
),
Expand Down Expand Up @@ -195,7 +195,7 @@ def test_filtered_grouped_distinct(
"LBCAT": ["CAT1", "CAT2"],
}
),
{"LBTEST", "LBSEQ"},
["LBTEST", "LBSEQ"],
),
(
DaskDataset.from_dict(
Expand All @@ -211,7 +211,7 @@ def test_filtered_grouped_distinct(
"LBCAT": ["CAT1", "CAT2"],
}
),
{"LBTEST", "LBSEQ"},
["LBTEST", "LBSEQ"],
),
],
)
Expand Down Expand Up @@ -262,7 +262,7 @@ def mock_get_dataset(dataset_name, **kwargs):
"LBCAT": ["CAT1", "CAT2"],
}
),
{1: {"LBTEST", "LBSEQ"}, 2: {"LBTEST", "LBSEQ", "LBCAT"}},
{1: ["LBTEST", "LBSEQ"], 2: ["LBTEST", "LBSEQ", "LBCAT"]},
["subject"],
),
(
Expand All @@ -281,7 +281,7 @@ def mock_get_dataset(dataset_name, **kwargs):
"LBCAT": ["CAT1", "CAT2"],
}
),
{1: {"LBTEST", "LBSEQ"}, 2: {"LBTEST", "LBSEQ", "LBCAT"}},
{1: ["LBTEST", "LBSEQ"], 2: ["LBTEST", "LBSEQ", "LBCAT"]},
["subject"],
),
],
Expand Down
18 changes: 9 additions & 9 deletions tests/unit/test_utilities/test_rule_processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def test_perform_rule_operation(mock_data_service, dataset_implementation):
assert result["$max_aestdy"][0] == df["AESTDY"].max()
assert result["$min_aestdy"][0] == df["AESTDY"].min()
assert result["$avg_aestdy"][0] == df["AESTDY"].mean()
assert result["$unique_aestdy"].equals(pd.Series([{11, 12, 40, 59}] * len(df)))
assert result["$unique_aestdy"].equals(pd.Series([[11, 12, 40, 59]] * len(df)))


@pytest.mark.parametrize("dataset_implementation", [PandasDataset, DaskDataset])
Expand Down Expand Up @@ -603,22 +603,22 @@ def test_perform_rule_operation_with_grouping(
200,
],
"$unique_aestdy": [
{
[
10,
40,
},
{
],
[
11,
59,
},
{
],
[
10,
40,
},
{
],
[
11,
59,
},
],
],
}
)
Expand Down
Loading