prefect-client 2.19.8__tar.gz → 2.19.9__tar.gz

{prefect-client-2.19.8/src/prefect_client.egg-info → prefect-client-2.19.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.19.8
+Version: 2.19.9
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.

{prefect-client-2.19.8 → prefect-client-2.19.9}/requirements-client.txt

@@ -6,7 +6,7 @@ coolname >= 1.0.4, < 3.0.0
 croniter >= 1.0.12, < 3.0.0
 fsspec >= 2022.5.0
 graphviz >= 0.20.1
-griffe >= 0.20.0
+griffe >= 0.20.0, <0.48.0
 httpcore >=1.0.5, < 2.0.0
 httpx[http2] >= 0.23, != 0.23.2
 importlib_metadata >= 4.4; python_version < '3.10'

{prefect-client-2.19.8 → prefect-client-2.19.9}/requirements.txt

@@ -9,7 +9,7 @@ cryptography >= 36.0.1
 dateparser >= 1.1.1, < 2.0.0
 docker >= 4.0
 graphviz >= 0.20.1
-griffe >= 0.20.0
+griffe >= 0.20.0, <0.48.0
 jinja2 >= 3.0.0, < 4.0.0
 jinja2-humanize-extension >= 0.4.0
 humanize >= 4.9.0

{prefect-client-2.19.8 → prefect-client-2.19.9}/setup.cfg

@@ -52,6 +52,7 @@ filterwarnings =
 	ignore::ResourceWarning
 	ignore::pytest.PytestUnraisableExceptionWarning
 	ignore::pluggy.PluggyTeardownRaisedWarning
+	ignore::prefect._internal.compatibility.deprecated.PrefectDeprecationWarning
 
 [mypy]
 plugins = 

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect/client/schemas/objects.py

@@ -17,6 +17,7 @@ import pendulum
 
 from prefect._internal.compatibility.deprecated import (
     DeprecatedInfraOverridesField,
+    deprecated_class,
 )
 from prefect._internal.pydantic import HAS_PYDANTIC_V2
 from prefect.types import NonNegativeInteger, PositiveInteger
@@ -917,6 +918,10 @@ class Flow(ObjectBaseModel):
         return raise_on_name_with_banned_characters(v)
 
 
+@deprecated_class(
+    start_date="Jun 2024",
+    help="Will be removed in Prefect 3 in favor of prefect.client.schemas.actions.DeploymentScheduleCreate",
+)
 class MinimalDeploymentSchedule(PrefectBaseModel):
     schedule: SCHEDULE_TYPES = Field(
         default=..., description="The schedule for the deployment."

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect/deployments/deployments.py

@@ -238,12 +238,17 @@ async def run_deployment(
     return flow_run
 
 
+@deprecated_callable(
+    start_date="Jun 2024",
+    help="Will be moved in Prefect 3 to prefect.flows:load_flow_from_flow_run",
+)
 @inject_client
 async def load_flow_from_flow_run(
     flow_run: FlowRun,
     client: PrefectClient,
     ignore_storage: bool = False,
     storage_base_path: Optional[str] = None,
+    use_placeholder_flow: bool = True,
 ) -> Flow:
     """
     Load a flow from the location/script provided in a deployment's storage document.
@@ -270,7 +275,7 @@ async def load_flow_from_flow_run(
             f"Importing flow code from module path {deployment.entrypoint}"
         )
         flow = await run_sync_in_worker_thread(
-            load_flow_from_entrypoint, deployment.entrypoint
+            load_flow_from_entrypoint, deployment.entrypoint, use_placeholder_flow
         )
         return flow
 
@@ -314,7 +319,9 @@ async def load_flow_from_flow_run(
             ).absolute()
     run_logger.debug(f"Importing flow code from '{import_path}'")
 
-    flow = await run_sync_in_worker_thread(load_flow_from_entrypoint, str(import_path))
+    flow = await run_sync_in_worker_thread(
+        load_flow_from_entrypoint, str(import_path), use_placeholder_flow
+    )
 
     return flow
 

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect/engine.py

@@ -113,7 +113,10 @@ from typing_extensions import Literal
 import prefect
 import prefect.context
 import prefect.plugins
-from prefect._internal.compatibility.deprecated import deprecated_parameter
+from prefect._internal.compatibility.deprecated import (
+    deprecated_callable,
+    deprecated_parameter,
+)
 from prefect._internal.compatibility.experimental import experimental_parameter
 from prefect._internal.concurrency.api import create_call, from_async, from_sync
 from prefect._internal.concurrency.calls import get_current_call
@@ -417,9 +420,12 @@ async def retrieve_flow_then_begin_flow_run(
 
     try:
         flow = (
-            load_flow_from_entrypoint(entrypoint)
+            # We do not want to use a placeholder flow at runtime
+            load_flow_from_entrypoint(entrypoint, use_placeholder_flow=False)
             if entrypoint
-            else await load_flow_from_flow_run(flow_run, client=client)
+            else await load_flow_from_flow_run(
+                flow_run, client=client, use_placeholder_flow=False
+            )
         )
     except Exception:
         message = (
@@ -975,6 +981,10 @@ async def orchestrate_flow_run(
     return state
 
 
+@deprecated_callable(
+    start_date="Jun 2024",
+    help="Will be moved in Prefect 3 to prefect.flow_runs:pause_flow_run",
+)
 @overload
 async def pause_flow_run(
     wait_for_input: None = None,
@@ -987,6 +997,10 @@ async def pause_flow_run(
     ...
 
 
+@deprecated_callable(
+    start_date="Jun 2024",
+    help="Will be moved in Prefect 3 to prefect.flow_runs:pause_flow_run",
+)
 @overload
 async def pause_flow_run(
     wait_for_input: Type[T],
@@ -1095,6 +1109,10 @@ async def pause_flow_run(
         )
 
 
+@deprecated_callable(
+    start_date="Jun 2024",
+    help="Will be moved in Prefect 3 to prefect.flow_runs:_in_process_pause",
+)
 @inject_client
 async def _in_process_pause(
     timeout: int = 3600,
@@ -1190,6 +1208,10 @@ async def _in_process_pause(
     raise FlowPauseTimeout("Flow run was paused and never resumed.")
 
 
+@deprecated_callable(
+    start_date="Jun 2024",
+    help="Will be moved in Prefect 3 to prefect.flow_runs.pause_flow_run.",
+)
 @inject_client
 async def _out_of_process_pause(
     flow_run_id: UUID,
@@ -1212,6 +1234,10 @@ async def _out_of_process_pause(
         raise RuntimeError(response.details.reason)
 
 
+@deprecated_callable(
+    start_date="Jun 2024",
+    help="Will be moved in Prefect 3 to prefect.flow_runs:suspend_flow_run",
+)
 @overload
 async def suspend_flow_run(
     wait_for_input: None = None,
@@ -1343,6 +1369,10 @@ async def suspend_flow_run(
         raise Pause()
 
 
+@deprecated_callable(
+    start_date="Jun 2024",
+    help="Will be moved in Prefect 3 to prefect.flow_runs:resume_flow_run",
+)
 @sync_compatible
 async def resume_flow_run(flow_run_id, run_input: Optional[Dict] = None):
     """

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect/flows.py

@@ -1650,6 +1650,7 @@ def load_flow_from_script(path: str, flow_name: str = None) -> Flow:
 
 def load_flow_from_entrypoint(
     entrypoint: str,
+    use_placeholder_flow: bool = True,
 ) -> Flow:
     """
     Extract a flow object from a script at an entrypoint by running all of the code in the file.
@@ -1657,6 +1658,9 @@ def load_flow_from_entrypoint(
     Args:
         entrypoint: a string in the format `<path_to_script>:<flow_func_name>` or a module path
             to a flow function
+        use_placeholder_flow: If True, a placeholder flow will be used if the entrypoint
+            cannot be loaded for any reason (e.g. dependencies are missing). If False, an
+            exception will be raised.
 
     Returns:
         The flow object from the script
@@ -1687,7 +1691,10 @@ def load_flow_from_entrypoint(
             # function, so we create a placeholder flow that will re-raise this
             # exception when called.
 
-            flow = load_placeholder_flow(entrypoint=entrypoint, raises=exc)
+            if use_placeholder_flow:
+                flow = load_placeholder_flow(entrypoint=entrypoint, raises=exc)
+            else:
+                raise
 
         if not isinstance(flow, Flow):
             raise MissingFlowError(

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect/tasks.py

@@ -6,7 +6,6 @@ Module containing the base workflow task class and decorator - for most use case
 
 import datetime
 import inspect
-import os
 from copy import copy
 from functools import partial, update_wrapper
 from typing import (
@@ -76,6 +75,8 @@ P = ParamSpec("P")  # The parameters of the task
 
 logger = get_logger("tasks")
 
+NUM_CHARS_DYNAMIC_KEY: int = 8
+
 
 def task_input_hash(
     context: "TaskRunContext", arguments: Dict[str, Any]
@@ -125,6 +126,28 @@ def exponential_backoff(backoff_factor: float) -> Callable[[int], List[float]]:
     return retry_backoff_callable
 
 
+def _generate_task_key(fn: Callable[..., Any]) -> str:
+    """Generate a task key based on the function name and source code.
+    We may eventually want some sort of top-level namespace here to
+    disambiguate tasks with the same function name in different modules,
+    in a more human-readable way, while avoiding relative import problems (see #12337).
+    As long as the task implementations are unique (even if named the same), we should
+    not have any collisions.
+    Args:
+        fn: The function to generate a task key for.
+    """
+    if not hasattr(fn, "__qualname__"):
+        return to_qualified_name(type(fn))
+
+    qualname = fn.__qualname__.split(".")[-1]
+
+    code_hash = (
+        h[:NUM_CHARS_DYNAMIC_KEY] if (h := hash_objects(fn.__code__)) else "unknown"
+    )
+
+    return f"{qualname}-{code_hash}"
+
+
 @PrefectObjectRegistry.register_instances
 class Task(Generic[P, R]):
     """
@@ -292,17 +315,7 @@ class Task(Generic[P, R]):
 
         self.tags = set(tags if tags else [])
 
-        if not hasattr(self.fn, "__qualname__"):
-            self.task_key = to_qualified_name(type(self.fn))
-        else:
-            try:
-                task_origin_hash = hash_objects(
-                    self.name, os.path.abspath(inspect.getsourcefile(self.fn))
-                )
-            except TypeError:
-                task_origin_hash = "unknown-source-file"
-
-            self.task_key = f"{self.fn.__qualname__}-{task_origin_hash}"
+        self.task_key = _generate_task_key(self.fn)
 
         self.cache_key_fn = cache_key_fn
         self.cache_expiration = cache_expiration

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect/utilities/asyncutils.py

@@ -261,14 +261,14 @@ def sync_compatible(async_fn: T) -> T:
     """
 
     @wraps(async_fn)
-    def coroutine_wrapper(*args, **kwargs):
+    def coroutine_wrapper(*args, _sync: Optional[bool] = None, **kwargs):
         from prefect._internal.concurrency.api import create_call, from_sync
         from prefect._internal.concurrency.calls import get_current_call, logger
         from prefect._internal.concurrency.event_loop import get_running_loop
         from prefect._internal.concurrency.threads import get_global_loop
         from prefect.settings import PREFECT_EXPERIMENTAL_DISABLE_SYNC_COMPAT
 
-        if PREFECT_EXPERIMENTAL_DISABLE_SYNC_COMPAT:
+        if PREFECT_EXPERIMENTAL_DISABLE_SYNC_COMPAT or _sync is False:
             return async_fn(*args, **kwargs)
 
         global_thread_portal = get_global_loop()
@@ -276,12 +276,17 @@ def sync_compatible(async_fn: T) -> T:
         current_call = get_current_call()
         current_loop = get_running_loop()
 
-        if current_thread.ident == global_thread_portal.thread.ident:
+        if (
+            current_thread.ident == global_thread_portal.thread.ident
+            and _sync is not True
+        ):
             logger.debug(f"{async_fn} --> return coroutine for internal await")
             # In the prefect async context; return the coro for us to await
             return async_fn(*args, **kwargs)
-        elif in_async_main_thread() and (
-            not current_call or is_async_fn(current_call.fn)
+        elif (
+            in_async_main_thread()
+            and (not current_call or is_async_fn(current_call.fn))
+            and _sync is not True
         ):
             # In the main async context; return the coro for them to await
             logger.debug(f"{async_fn} --> return coroutine for user await")

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect/workers/block.py

@@ -4,6 +4,7 @@ from typing import TYPE_CHECKING, Any, Dict, List, Optional
 import anyio
 import anyio.abc
 
+from prefect._internal.compatibility.deprecated import deprecated_class
 from prefect._internal.pydantic import HAS_PYDANTIC_V2
 from prefect._internal.schemas.validators import validate_block_is_infrastructure
 from prefect.blocks.core import Block
@@ -27,6 +28,10 @@ if TYPE_CHECKING:
     from prefect.client.schemas.responses import DeploymentResponse
 
 
+@deprecated_class(
+    start_date="Jun 2024",
+    help="Refer to the upgrade guide for more information: https://docs.prefect.io/latest/guides/upgrade-guide-agents-to-workers/",
+)
 class BlockWorkerJobConfiguration(BaseModel):
     block: Block = Field(
         default=..., description="The infrastructure block to use for job creation."
@@ -144,6 +149,10 @@ class BlockWorkerResult(BaseWorkerResult):
     """Result of a block worker job"""
 
 
+@deprecated_class(
+    start_date="Jun 2024",
+    help="Refer to the upgrade guide for more information: https://docs.prefect.io/latest/guides/upgrade-guide-agents-to-workers/",
+)
 class BlockWorker(BaseWorker):
     type = "block"
     job_configuration = BlockWorkerJobConfiguration

{prefect-client-2.19.8 → prefect-client-2.19.9/src/prefect_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.19.8
+Version: 2.19.9
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.

{prefect-client-2.19.8 → prefect-client-2.19.9}/src/prefect_client.egg-info/requires.txt

@@ -6,7 +6,7 @@ coolname<3.0.0,>=1.0.4
 croniter<3.0.0,>=1.0.12
 fsspec>=2022.5.0
 graphviz>=0.20.1
-griffe>=0.20.0
+griffe<0.48.0,>=0.20.0
 httpcore<2.0.0,>=1.0.5
 httpx[http2]!=0.23.2,>=0.23
 importlib-resources<6.2.0,>=6.1.3