Skip to content
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

rm pendulum use in schedules.py #16943

Merged
merged 1 commit into from
Feb 3, 2025
Merged

rm pendulum use in schedules.py #16943

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 16 deletions src/prefect/client/schemas/schedules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import dateutil
import dateutil.rrule
import dateutil.tz
import pendulum
from pydantic import AfterValidator, ConfigDict, Field, field_validator, model_validator
from typing_extensions import TypeAlias, TypeGuard

Expand All @@ -19,14 +18,7 @@
validate_cron_string,
validate_rrule_string,
)

if TYPE_CHECKING:
# type checkers have difficulty accepting that
# pydantic_extra_types.pendulum_dt and pendulum.DateTime can be used
# together.
DateTime = pendulum.DateTime
else:
from prefect.types import DateTime
from prefect.types._datetime import Date, DateTime

MAX_ITERATIONS = 1000
# approx. 1 years worth of RDATEs + buffer
Expand Down Expand Up @@ -83,7 +75,7 @@ class IntervalSchedule(PrefectBaseModel):

interval: datetime.timedelta = Field(gt=datetime.timedelta(0))
anchor_date: Annotated[DateTime, AfterValidator(default_anchor_date)] = Field(
default_factory=lambda: pendulum.now("UTC"),
default_factory=lambda: DateTime.now("UTC"),
examples=["2020-01-01T00:00:00Z"],
)
timezone: Optional[str] = Field(default=None, examples=["America/New_York"])
Expand All @@ -99,9 +91,7 @@ def __init__(
self,
/,
interval: datetime.timedelta,
anchor_date: Optional[
Union[pendulum.DateTime, datetime.datetime, str]
] = None,
anchor_date: Optional[Union[DateTime, datetime.datetime, str]] = None,
timezone: Optional[str] = None,
) -> None: ...

Expand Down Expand Up @@ -153,7 +143,7 @@ def valid_cron_string(cls, v: str) -> str:
return validate_cron_string(v)


DEFAULT_ANCHOR_DATE = pendulum.date(2020, 1, 1)
DEFAULT_ANCHOR_DATE = Date(2020, 1, 1)


def _rrule_dt(
Expand Down Expand Up @@ -219,7 +209,7 @@ def from_rrule(
return RRuleSchedule(rrule=str(rrule), timezone=timezone)
rrules = _rrule(rrule)
dtstarts = [dts for rr in rrules if (dts := _rrule_dt(rr)) is not None]
unique_dstarts = set(pendulum.instance(d).in_tz("UTC") for d in dtstarts)
unique_dstarts = set(DateTime.instance(d).in_tz("UTC") for d in dtstarts)
unique_timezones = set(d.tzinfo for d in dtstarts if d.tzinfo is not None)

if len(unique_timezones) > 1:
Expand Down Expand Up @@ -380,7 +370,7 @@ def construct_schedule(
if isinstance(interval, (int, float)):
interval = datetime.timedelta(seconds=interval)
if not anchor_date:
anchor_date = pendulum.DateTime.now()
anchor_date = DateTime.now()
schedule = IntervalSchedule(
interval=interval, anchor_date=anchor_date, timezone=timezone
)
Expand Down