Skip to content

CDK: improve day_delta macro and MinMaxDatetime component #22400

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
merged 5 commits into from
Feb 8, 2023
Merged

CDK: improve day_delta macro and MinMaxDatetime component #22400

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
111024d
adjust_datetime added
grubberr Feb 6, 2023
78154f4
day_delta fixed
grubberr Feb 7, 2023
3dbc655
Merge branch 'master' into grubberr/cdk-declarative-macros-adjust_dat…
grubberr Feb 7, 2023
4e9dd73
Merge branch 'master' into grubberr/cdk-declarative-macros-adjust_dat…
grubberr Feb 8, 2023
68c22bd
test_min_max_datetime_lazy_eval added
grubberr Feb 8, 2023
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
12 changes: 8 additions & 4 deletions airbyte-cdk/python/airbyte_cdk/sources/declarative/datetime/min_max_datetime.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,15 @@ def get_datetime(self, config, **additional_options) -> dt.datetime:
time = self._parser.parse(str(self.datetime.eval(config, **additional_options)), datetime_format, self.timezone)

if self.min_datetime:
min_time = self._parser.parse(str(self.min_datetime.eval(config, **additional_options)), datetime_format, self.timezone)
time = max(time, min_time)
min_time = str(self.min_datetime.eval(config, **additional_options))
if min_time:
min_time = self._parser.parse(min_time, datetime_format, self.timezone)
time = max(time, min_time)
if self.max_datetime:
max_time = self._parser.parse(str(self.max_datetime.eval(config, **additional_options)), datetime_format, self.timezone)
time = min(time, max_time)
max_time = str(self.max_datetime.eval(config, **additional_options))
if max_time:
max_time = self._parser.parse(max_time, datetime_format, self.timezone)
time = min(time, max_time)
return time

@property
Expand Down
4 changes: 2 additions & 2 deletions airbyte-cdk/python/airbyte_cdk/sources/declarative/interpolation/macros.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def max(*args):
return builtins.max(*args)


def day_delta(num_days: int) -> str:
def day_delta(num_days: int, format: str = "%Y-%m-%dT%H:%M:%S.%f%z") -> str:
"""
Returns datetime of now() + num_days

Expand All @@ -93,7 +93,7 @@ def day_delta(num_days: int) -> str:
:param num_days: number of days to add to current date time
:return: datetime formatted as RFC3339
"""
return (datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=num_days)).strftime("%Y-%m-%dT%H:%M:%S.%f%z")
return (datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=num_days)).strftime(format)


def format_datetime(dt: Union[str, datetime.datetime], format: str):
Expand Down