Skip to content

[bot] Merge master/7f747008 into rel/dev #1007

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
yenkins-admin merged 2 commits into from
Mar 21, 2025
Merged

[bot] Merge master/7f747008 into rel/dev #1007

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
e0ab45a
feat: add other params for InlineFilter
hkad98 Mar 21, 2025
7f74700
Merge pull request #1006 from hkad98/jkd/inline-filter
hkad98 Mar 21, 2025
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
4 changes: 2 additions & 2 deletions gooddata-sdk/gooddata_sdk/compute/model/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ def as_api_model(self) -> OpenApiModel:


class Filter(ExecModelEntity):
def __init__(self) -> None:
def __init__(self, _apply_on_result: Optional[bool] = None) -> None:
super().__init__()

self._apply_on_result = None
self._apply_on_result = _apply_on_result

@property
def apply_on_result(self) -> Union[bool, None]:
Expand Down
22 changes: 15 additions & 7 deletions gooddata-sdk/gooddata_sdk/compute/model/filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from datetime import datetime
from importlib.util import find_spec
from typing import Optional, Union
from typing import Any, Optional, Union

from gooddata_api_client.model.inline_filter_definition_inline import InlineFilterDefinitionInline

Expand Down Expand Up @@ -510,10 +510,10 @@ def description(self, labels: dict[str, str], format_locale: Optional[str] = Non
class InlineFilter(Filter):
"""Filter using a custom MAQL expression.

Automatically decides, whether to create or update.
Automatically decides, whether to create or update.

Args:
maql (str): The MAQL expression string that defines the filter condition.
Args:
maql (str): The MAQL expression string that defines the filter condition.

Example:
```python
Expand All @@ -529,14 +529,22 @@ class InlineFilter(Filter):
```
"""

def __init__(self, maql: str):
super().__init__()
def __init__(
self, maql: str, apply_on_result: Optional[bool] = None, local_identifier: Optional[Union[ObjId, str]] = None
) -> None:
super().__init__(apply_on_result)

self.maql = maql
self.local_identifier = local_identifier

def is_noop(self) -> bool:
return False

def as_api_model(self) -> afm_models.InlineFilterDefinition:
body = InlineFilterDefinitionInline(self.maql)
kwargs: dict[str, Any] = {}
if self.apply_on_result is not None:
kwargs["apply_on_result"] = self.apply_on_result
if self.local_identifier is not None:
kwargs["local_identifier"] = str(self.local_identifier)
body = InlineFilterDefinitionInline(self.maql, **kwargs)
return afm_models.InlineFilterDefinition(body, _check_type=False)
Loading