prefect 3.2.15.dev2__tar.gz → 3.2.15.dev3__tar.gz

{prefect-3.2.15.dev2 → prefect-3.2.15.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect
-Version: 3.2.15.dev2
+Version: 3.2.15.dev3
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -69,7 +69,7 @@ Requires-Dist: sniffio<2.0.0,>=1.3.0
 Requires-Dist: sqlalchemy[asyncio]<3.0.0,>=2.0
 Requires-Dist: toml>=0.10.0
 Requires-Dist: typer!=0.12.2,<0.16.0,>=0.12.0
-Requires-Dist: typing-extensions<5.0.0,>=4.5.0
+Requires-Dist: typing-extensions<5.0.0,>=4.10.0
 Requires-Dist: ujson<6.0.0,>=5.8.0
 Requires-Dist: uv>=0.6.0
 Requires-Dist: uvicorn!=0.29.0,>=0.14.0

{prefect-3.2.15.dev2 → prefect-3.2.15.dev3}/pyproject.toml

@@ -76,7 +76,7 @@ dependencies = [
     "ruamel.yaml>=0.17.0",
     "sniffio>=1.3.0,<2.0.0",
     "toml>=0.10.0",
-    "typing_extensions>=4.5.0,<5.0.0",
+    "typing_extensions>=4.10.0,<5.0.0",
     "ujson>=5.8.0,<6.0.0",
     "uvicorn>=0.14.0,!=0.29.0",
     "websockets>=13.0,<16.0",

prefect-3.2.15.dev3/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.2.15.dev3"
+__build_date__ = "2025-03-25 08:08:51.922590+00:00"
+__git_commit__ = "4a9dba70ca15f3b4b9006fd375db8bd2601d0a86"
+__dirty__ = False

{prefect-3.2.15.dev2 → prefect-3.2.15.dev3}/src/prefect/flows.py

@@ -196,7 +196,7 @@ class Flow(Generic[P, R]):
     #       exactly in the @flow decorator
     def __init__(
         self,
-        fn: Callable[P, R],
+        fn: Callable[P, R] | "classmethod[Any, P, R]" | "staticmethod[P, R]",
         name: Optional[str] = None,
         version: Optional[str] = None,
         flow_run_name: Optional[Union[Callable[[], str], str]] = None,
@@ -270,6 +270,13 @@ class Flow(Generic[P, R]):
                             " my_flow():\n\tpass"
                         )
 
+        if isinstance(fn, classmethod):
+            fn = cast(Callable[P, R], fn.__func__)
+
+        if isinstance(fn, staticmethod):
+            fn = cast(Callable[P, R], fn.__func__)
+            setattr(fn, "__prefect_static__", True)
+
         if not callable(fn):
             raise TypeError("'fn' must be callable")
 
@@ -396,16 +403,28 @@ class Flow(Generic[P, R]):
     def ismethod(self) -> bool:
         return hasattr(self.fn, "__prefect_self__")
 
+    @property
+    def isclassmethod(self) -> bool:
+        return hasattr(self.fn, "__prefect_cls__")
+
+    @property
+    def isstaticmethod(self) -> bool:
+        return getattr(self.fn, "__prefect_static__", False)
+
     def __get__(self, instance: Any, owner: Any) -> "Flow[P, R]":
         """
-        Implement the descriptor protocol so that the flow can be used as an instance method.
+        Implement the descriptor protocol so that the flow can be used as an instance or class method.
         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
 
-        # if no instance is provided, it's being accessed on the class
+        # wrapped function is a classmethod
         if instance is None:
-            return self
+            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
@@ -636,6 +655,10 @@ class Flow(Generic[P, R]):
             # do not serialize the bound self object
             if self.ismethod and value is getattr(self.fn, "__prefect_self__", None):
                 continue
+            if self.isclassmethod and value is getattr(
+                self.fn, "__prefect_cls__", None
+            ):
+                continue
             if isinstance(value, (PrefectFuture, State)):
                 # Don't call jsonable_encoder() on a PrefectFuture or State to
                 # avoid triggering a __getitem__ call
@@ -1895,11 +1918,6 @@ class FlowDecorator:
             >>>     pass
         """
         if __fn:
-            if isinstance(__fn, (classmethod, staticmethod)):
-                method_decorator = type(__fn).__name__
-                raise TypeError(
-                    f"@{method_decorator} should be applied on top of @flow"
-                )
             return Flow(
                 fn=__fn,
                 name=name,

{prefect-3.2.15.dev2 → prefect-3.2.15.dev3}/src/prefect/tasks.py

@@ -1,8 +1,10 @@
 """
 Module containing the base workflow task class and decorator - for most use cases, using the [`@task` decorator][prefect.tasks.task] is preferred.
 """
+
 # This file requires type-checking with pyright because mypy does not yet support PEP612
 # See https://github.com/python/mypy/issues/8645
+from __future__ import annotations
 
 import asyncio
 import datetime
@@ -314,7 +316,7 @@ class Task(Generic[P, R]):
     #       exactly in the @task decorator
     def __init__(
         self,
-        fn: Callable[P, R],
+        fn: Callable[P, R] | "classmethod[Any, P, R]" | "staticmethod[P, R]",
         name: Optional[str] = None,
         description: Optional[str] = None,
         tags: Optional[Iterable[str]] = None,
@@ -378,6 +380,13 @@ class Task(Generic[P, R]):
                             " my_task():\n\tpass"
                         )
 
+        if isinstance(fn, classmethod):
+            fn = cast(Callable[P, R], fn.__func__)
+
+        if isinstance(fn, staticmethod):
+            fn = cast(Callable[P, R], fn.__func__)
+            setattr(fn, "__prefect_static__", True)
+
         if not callable(fn):
             raise TypeError("'fn' must be callable")
 
@@ -536,6 +545,14 @@ class Task(Generic[P, R]):
     def ismethod(self) -> bool:
         return hasattr(self.fn, "__prefect_self__")
 
+    @property
+    def isclassmethod(self) -> bool:
+        return hasattr(self.fn, "__prefect_cls__")
+
+    @property
+    def isstaticmethod(self) -> bool:
+        return getattr(self.fn, "__prefect_static__", False)
+
     def __get__(self, instance: Any, owner: Any) -> "Task[P, R]":
         """
         Implement the descriptor protocol so that the task can be used as an instance method.
@@ -543,10 +560,15 @@ class Task(Generic[P, R]):
         an argument. We return a copy of the task with that instance bound to the task's function.
         """
 
-        # if no instance is provided, it's being accessed on the class
-        if instance is None:
+        if self.isstaticmethod:
             return self
 
+        # wrapped function is a classmethod
+        if not instance:
+            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:
@@ -1851,9 +1873,6 @@ def task(
     """
 
     if __fn:
-        if isinstance(__fn, (classmethod, staticmethod)):
-            method_decorator = type(__fn).__name__
-            raise TypeError(f"@{method_decorator} should be applied on top of @task")
         return Task(
             fn=__fn,
             name=name,

{prefect-3.2.15.dev2 → prefect-3.2.15.dev3}/src/prefect/utilities/callables.py

@@ -63,6 +63,8 @@ def get_call_parameters(
     """
     if hasattr(fn, "__prefect_self__"):
         call_args = (getattr(fn, "__prefect_self__"), *call_args)
+    if hasattr(fn, "__prefect_cls__"):
+        call_args = (getattr(fn, "__prefect_cls__"), *call_args)
 
     try:
         bound_signature = inspect.signature(fn).bind(*call_args, **call_kwargs)

prefect-3.2.15.dev2/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.2.15.dev2"
-__build_date__ = "2025-03-24 08:09:28.230748+00:00"
-__git_commit__ = "8954815ddc767d674de646a300215fd6b4cce715"
-__dirty__ = False