prefect-client 3.3.0__tar.gz → 3.3.1__tar.gz

{prefect_client-3.3.0 → prefect_client-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.3.0
+Version: 3.3.1
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -26,6 +26,7 @@ Requires-Dist: asgi-lifespan<3.0,>=1.0
 Requires-Dist: cachetools<6.0,>=5.3
 Requires-Dist: cloudpickle<4.0,>=2.0
 Requires-Dist: coolname<3.0.0,>=1.0.4
+Requires-Dist: dateparser<2.0.0,>=1.1.1
 Requires-Dist: exceptiongroup>=1.0.0
 Requires-Dist: fastapi<1.0.0,>=0.111.0
 Requires-Dist: fsspec>=2022.5.0

{prefect_client-3.3.0 → prefect_client-3.3.1}/pyproject.toml

@@ -30,6 +30,7 @@ dependencies = [
     "cachetools>=5.3,<6.0",
     "cloudpickle>=2.0,<4.0",
     "coolname>=1.0.4,<3.0.0",
+    "dateparser>=1.1.1,<2.0.0",
     "exceptiongroup>=1.0.0",
     "fastapi>=0.111.0,<1.0.0",
     "fsspec>=2022.5.0",

prefect_client-3.3.1/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.3.1"
+__build_date__ = "2025-04-01 02:38:39.208039+00:00"
+__git_commit__ = "6a1646202888ea59a3493f30ee9eaed6aea07960"
+__dirty__ = False

{prefect_client-3.3.0 → prefect_client-3.3.1}/src/prefect/_internal/compatibility/deprecated.py

@@ -10,12 +10,15 @@ will be calculated 6 months later. Start and end dates are always in the format
 e.g. Jan 2023.
 """
 
+from __future__ import annotations
+
 import datetime
 import functools
 import sys
 import warnings
 from typing import TYPE_CHECKING, Any, Callable, Optional, Union
 
+import dateparser
 from pydantic import BaseModel
 from typing_extensions import ParamSpec, TypeAlias, TypeVar
 
@@ -32,6 +35,9 @@ R = TypeVar("R", infer_variance=True)
 M = TypeVar("M", bound=BaseModel)
 T = TypeVar("T")
 
+# Note: A datetime is strongly preferred over a string, but a string is acceptable for
+# backwards compatibility until support is dropped from dateparser in Python 3.15.
+_AcceptableDate: TypeAlias = Optional[Union[datetime.datetime, str]]
 
 DEPRECATED_WARNING = (
     "{name} has been deprecated{when}. It will not be available in new releases after {end_date}."
@@ -51,18 +57,25 @@ class PrefectDeprecationWarning(DeprecationWarning):
     """
 
 
+def _coerce_datetime(
+    dt: Optional[_AcceptableDate],
+) -> Optional[datetime.datetime]:
+    if dt is None or isinstance(dt, datetime.datetime):
+        return dt
+    with warnings.catch_warnings():
+        warnings.filterwarnings("ignore", category=DeprecationWarning)
+        return dateparser.parse(dt)
+
+
 def generate_deprecation_message(
     name: str,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     help: str = "",
     when: str = "",
 ) -> str:
-    if start_date is not None and not isinstance(start_date, datetime.datetime):
-        raise ValueError("Must provide start_date as a datetime")
-
-    if end_date is not None and not isinstance(end_date, datetime.datetime):
-        raise ValueError("Must provide end_date as a datetime")
+    start_date = _coerce_datetime(start_date)
+    end_date = _coerce_datetime(end_date)
 
     if start_date is None and end_date is None:
         raise ValueError(
@@ -87,8 +100,8 @@ def generate_deprecation_message(
 
 def deprecated_callable(
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     stacklevel: int = 2,
     help: str = "",
 ) -> Callable[[Callable[P, R]], Callable[P, R]]:
@@ -112,8 +125,8 @@ def deprecated_callable(
 
 def deprecated_class(
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     stacklevel: int = 2,
     help: str = "",
 ) -> Callable[[type[T]], type[T]]:
@@ -141,8 +154,8 @@ def deprecated_class(
 def deprecated_parameter(
     name: str,
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     stacklevel: int = 2,
     help: str = "",
     when: Optional[Callable[[Any], bool]] = None,
@@ -197,8 +210,8 @@ JsonDict: TypeAlias = dict[str, JsonValue]
 def deprecated_field(
     name: str,
     *,
-    start_date: Optional[datetime.datetime] = None,
-    end_date: Optional[datetime.datetime] = None,
+    start_date: Optional[_AcceptableDate] = None,
+    end_date: Optional[_AcceptableDate] = None,
     when_message: str = "",
     help: str = "",
     when: Optional[Callable[[Any], bool]] = None,
@@ -279,9 +292,7 @@ def inject_renamed_module_alias_finder():
     sys.meta_path.insert(0, AliasedModuleFinder(DEPRECATED_MODULE_ALIASES))
 
 
-def register_renamed_module(
-    old_name: str, new_name: str, start_date: datetime.datetime
-):
+def register_renamed_module(old_name: str, new_name: str, start_date: _AcceptableDate):
     """
     Register a renamed module.
 

{prefect_client-3.3.0 → prefect_client-3.3.1}/src/prefect/_internal/concurrency/calls.py

@@ -374,8 +374,11 @@ class Call(Generic[T]):
 
         except CancelledError:
             # Report cancellation
-            if TYPE_CHECKING:
-                assert cancel_scope is not None
+            # in rare cases, enforce_sync_deadline raises CancelledError
+            # prior to yielding
+            if cancel_scope is None:
+                self.future.cancel()
+                return None
             if cancel_scope.timedout():
                 setattr(self.future, "_timed_out", True)
                 self.future.cancel()

{prefect_client-3.3.0 → prefect_client-3.3.1}/src/prefect/client/base.py

@@ -222,6 +222,10 @@ class PrefectHttpxAsyncClient(httpx.AsyncClient):
         if the request either raises an exception listed in `retry_exceptions` or
         receives a response with a status code listed in `retry_codes`.
 
+        Retries are not counted against the limit if the response headers contains
+        a reserved value, indicating that the server is undergoing maintenance. These
+        requests will retry indefinitely until the header is no longer returned.
+
         Retries will be delayed based on either the retry header (preferred) or
         exponential backoff if a retry header is not provided.
         """
@@ -239,18 +243,21 @@ class PrefectHttpxAsyncClient(httpx.AsyncClient):
             await self._add_csrf_headers(request=request)
 
         while try_count <= PREFECT_CLIENT_MAX_RETRIES.value():
-            try_count += 1
             retry_seconds = None
             exc_info = None
 
             try:
                 response = await send(request, *send_args, **send_kwargs)
             except retry_exceptions:  # type: ignore
+                try_count += 1
                 if try_count > PREFECT_CLIENT_MAX_RETRIES.value():
                     raise
                 # Otherwise, we will ignore this error but capture the info for logging
                 exc_info = sys.exc_info()
             else:
+                if response.headers.get("Prefect-Maintenance") != "true":
+                    try_count += 1
+
                 # We got a response; check if it's a CSRF error, otherwise
                 # return immediately if it is not retryable
                 if (
@@ -441,6 +448,10 @@ class PrefectHttpxSyncClient(httpx.Client):
         if the request either raises an exception listed in `retry_exceptions` or
         receives a response with a status code listed in `retry_codes`.
 
+        Retries are not counted against the limit if the response headers contains
+        a reserved value, indicating that the server is undergoing maintenance. These
+        requests will retry indefinitely until the header is no longer returned.
+
         Retries will be delayed based on either the retry header (preferred) or
         exponential backoff if a retry header is not provided.
         """
@@ -458,18 +469,21 @@ class PrefectHttpxSyncClient(httpx.Client):
             self._add_csrf_headers(request=request)
 
         while try_count <= PREFECT_CLIENT_MAX_RETRIES.value():
-            try_count += 1
             retry_seconds = None
             exc_info = None
 
             try:
                 response = send(request, *send_args, **send_kwargs)
             except retry_exceptions:  # type: ignore
+                try_count += 1
                 if try_count > PREFECT_CLIENT_MAX_RETRIES.value():
                     raise
                 # Otherwise, we will ignore this error but capture the info for logging
                 exc_info = sys.exc_info()
             else:
+                if response.headers.get("Prefect-Maintenance") != "true":
+                    try_count += 1
+
                 # We got a response; check if it's a CSRF error, otherwise
                 # return immediately if it is not retryable
                 if (

{prefect_client-3.3.0 → prefect_client-3.3.1}/src/prefect/flows.py

@@ -272,10 +272,11 @@ class Flow(Generic[P, R]):
 
         if isinstance(fn, classmethod):
             fn = cast(Callable[P, R], fn.__func__)
+            self._isclassmethod = True
 
         if isinstance(fn, staticmethod):
             fn = cast(Callable[P, R], fn.__func__)
-            setattr(fn, "__prefect_static__", True)
+            self._isstaticmethod = True
 
         if not callable(fn):
             raise TypeError("'fn' must be callable")
@@ -405,11 +406,11 @@ class Flow(Generic[P, R]):
 
     @property
     def isclassmethod(self) -> bool:
-        return hasattr(self.fn, "__prefect_cls__")
+        return getattr(self, "_isclassmethod", False)
 
     @property
     def isstaticmethod(self) -> bool:
-        return getattr(self.fn, "__prefect_static__", False)
+        return getattr(self, "_isstaticmethod", False)
 
     def __get__(self, instance: Any, owner: Any) -> "Flow[P, R]":
         """
@@ -417,21 +418,20 @@ class Flow(Generic[P, R]):
         When an instance method is loaded, this method is called with the "self" instance as
         an argument. We return a copy of the flow with that instance bound to the flow's function.
         """
-        if self.isstaticmethod:
-            return self
-
         # wrapped function is a classmethod
-        if instance is None:
-            bound_flow = copy(self)
-            setattr(bound_flow.fn, "__prefect_cls__", owner)
-            return bound_flow
-
-        # if the flow is being accessed on an instance, bind the instance to the __prefect_self__ attribute
-        # of the flow's function. This will allow it to be automatically added to the flow's parameters
-        else:
-            bound_flow = copy(self)
-            setattr(bound_flow.fn, "__prefect_self__", instance)
-            return bound_flow
+        if self.isclassmethod:
+            bound_task = copy(self)
+            setattr(bound_task.fn, "__prefect_cls__", owner)
+            return bound_task
+
+        # if the task is being accessed on an instance, bind the instance to the __prefect_self__ attribute
+        # of the task's function. This will allow it to be automatically added to the task's parameters
+        if instance:
+            bound_task = copy(self)
+            bound_task.fn.__prefect_self__ = instance  # type: ignore[attr-defined]
+            return bound_task
+
+        return self
 
     def with_options(
         self,

{prefect_client-3.3.0 → prefect_client-3.3.1}/src/prefect/tasks.py

@@ -382,10 +382,11 @@ class Task(Generic[P, R]):
 
         if isinstance(fn, classmethod):
             fn = cast(Callable[P, R], fn.__func__)
+            self._isclassmethod = True
 
         if isinstance(fn, staticmethod):
             fn = cast(Callable[P, R], fn.__func__)
-            setattr(fn, "__prefect_static__", True)
+            self._isstaticmethod = True
 
         if not callable(fn):
             raise TypeError("'fn' must be callable")
@@ -547,11 +548,11 @@ class Task(Generic[P, R]):
 
     @property
     def isclassmethod(self) -> bool:
-        return hasattr(self.fn, "__prefect_cls__")
+        return getattr(self, "_isclassmethod", False)
 
     @property
     def isstaticmethod(self) -> bool:
-        return getattr(self.fn, "__prefect_static__", False)
+        return getattr(self, "_isstaticmethod", False)
 
     def __get__(self, instance: Any, owner: Any) -> "Task[P, R]":
         """
@@ -559,23 +560,21 @@ class Task(Generic[P, R]):
         When an instance method is loaded, this method is called with the "self" instance as
         an argument. We return a copy of the task with that instance bound to the task's function.
         """
-
-        if self.isstaticmethod:
-            return self
-
         # wrapped function is a classmethod
-        if not instance:
+        if self.isclassmethod:
             bound_task = copy(self)
             setattr(bound_task.fn, "__prefect_cls__", owner)
             return bound_task
 
         # if the task is being accessed on an instance, bind the instance to the __prefect_self__ attribute
         # of the task's function. This will allow it to be automatically added to the task's parameters
-        else:
+        if instance:
             bound_task = copy(self)
             bound_task.fn.__prefect_self__ = instance  # type: ignore[attr-defined]
             return bound_task
 
+        return self
+
     def with_options(
         self,
         *,

{prefect_client-3.3.0 → prefect_client-3.3.1}/src/prefect/types/_datetime.py

@@ -130,7 +130,7 @@ def end_of_period(dt: datetime.datetime, period: str) -> datetime.datetime:
         ValueError: If an invalid unit is specified.
     """
     if sys.version_info >= (3, 13):
-        from whenever import Weekday, ZonedDateTime
+        from whenever import Weekday, ZonedDateTime, days
 
         if not isinstance(dt.tzinfo, ZoneInfo):
             zdt = ZonedDateTime.from_py_datetime(
@@ -150,8 +150,8 @@ def end_of_period(dt: datetime.datetime, period: str) -> datetime.datetime:
             days_till_end_of_week: int = (
                 Weekday.SUNDAY.value - zdt.date().day_of_week().value
             )
+            zdt = zdt + days(days_till_end_of_week)
             zdt = zdt.replace(
-                day=zdt.day + days_till_end_of_week,
                 hour=23,
                 minute=59,
                 second=59,

{prefect_client-3.3.0 → prefect_client-3.3.1}/src/prefect/utilities/callables.py

@@ -63,7 +63,7 @@ def get_call_parameters(
     """
     if hasattr(fn, "__prefect_self__"):
         call_args = (getattr(fn, "__prefect_self__"), *call_args)
-    if hasattr(fn, "__prefect_cls__"):
+    elif hasattr(fn, "__prefect_cls__"):
         call_args = (getattr(fn, "__prefect_cls__"), *call_args)
 
     try:

prefect_client-3.3.0/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.3.0"
-__build_date__ = "2025-03-31 15:28:57.721236+00:00"
-__git_commit__ = "ef73b2c49e26b05c55b52022048da00f0845dcf1"
-__dirty__ = False