Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 19 additions & 3 deletions packages/gooddata-sdk/src/gooddata_sdk/compute/model/filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,17 @@ def _to_identifier(val: Union[ObjId, str]) -> Union[afm_models.AfmLocalIdentifie


class AttributeFilter(Filter):
def __init__(self, label: Union[ObjId, str, Attribute], values: list[str] | None = None) -> None:
def __init__(
self,
label: Union[ObjId, str, Attribute],
values: list[str] | None = None,
uses_arbitrary_values: bool | None = None,
) -> None:
super().__init__()

self._label = _extract_id_or_local_id(label)
self._values = values or []
self._uses_arbitrary_values = uses_arbitrary_values

@property
def label(self) -> Union[ObjId, str]:
Expand All @@ -114,6 +120,10 @@ def label(self, label: Union[ObjId, str]) -> None:
def values(self) -> list[str]:
return self._values

@property
def uses_arbitrary_values(self) -> bool | None:
return self._uses_arbitrary_values

def is_noop(self) -> bool:
return False

Expand All @@ -128,7 +138,10 @@ class PositiveAttributeFilter(AttributeFilter):
def as_api_model(self) -> afm_models.PositiveAttributeFilter:
label_id = _to_identifier(self._label)
elements = afm_models.AttributeFilterElements(values=self.values)
body = PositiveAttributeFilterBody(label=label_id, _in=elements, _check_type=False)
kwargs: dict[str, Any] = {}
if self._uses_arbitrary_values is not None:
kwargs["uses_arbitrary_values"] = self._uses_arbitrary_values
body = PositiveAttributeFilterBody(label=label_id, _in=elements, _check_type=False, **kwargs)
return afm_models.PositiveAttributeFilter(body, _check_type=False)

def description(self, labels: dict[str, str], format_locale: str | None = None) -> str:
Expand All @@ -144,7 +157,10 @@ def is_noop(self) -> bool:
def as_api_model(self) -> afm_models.NegativeAttributeFilter:
label_id = _to_identifier(self._label)
elements = afm_models.AttributeFilterElements(values=self.values)
body = NegativeAttributeFilterBody(label=label_id, not_in=elements, _check_type=False)
kwargs: dict[str, Any] = {}
if self._uses_arbitrary_values is not None:
kwargs["uses_arbitrary_values"] = self._uses_arbitrary_values
body = NegativeAttributeFilterBody(label=label_id, not_in=elements, _check_type=False, **kwargs)
return afm_models.NegativeAttributeFilter(body)

def description(self, labels: dict[str, str], format_locale: str | None = None) -> str:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,3 +188,27 @@ def test_match_filter_inequality_different_case_sensitive():
f1 = MatchAttributeFilter(label="test", literal="foo", match_type="CONTAINS")
f2 = MatchAttributeFilter(label="test", literal="foo", match_type="CONTAINS", case_sensitive=True)
assert f1 != f2


def test_positive_filter_uses_arbitrary_values():
f = PositiveAttributeFilter(label="local_id", values=["val1"], uses_arbitrary_values=True)
api_dict = f.as_api_model().to_dict()
assert api_dict["positive_attribute_filter"]["uses_arbitrary_values"] is True


def test_positive_filter_uses_arbitrary_values_not_set():
f = PositiveAttributeFilter(label="local_id", values=["val1"])
api_dict = f.as_api_model().to_dict()
assert "uses_arbitrary_values" not in api_dict["positive_attribute_filter"]


def test_negative_filter_uses_arbitrary_values():
f = NegativeAttributeFilter(label="local_id", values=["val1"], uses_arbitrary_values=True)
api_dict = f.as_api_model().to_dict()
assert api_dict["negative_attribute_filter"]["uses_arbitrary_values"] is True


def test_negative_filter_uses_arbitrary_values_not_set():
f = NegativeAttributeFilter(label="local_id", values=["val1"])
api_dict = f.as_api_model().to_dict()
assert "uses_arbitrary_values" not in api_dict["negative_attribute_filter"]
Loading