prefect-client 3.1.11__py3-none-any.whl → 3.1.13__py3-none-any.whl

prefect/blocks/system.py

@@ -1,8 +1,11 @@
+from __future__ import annotations
+
 import json
 from typing import Annotated, Any, Generic, TypeVar, Union
 
 from pydantic import (
     Field,
+    HttpUrl,
     JsonValue,
     SecretStr,
     StrictStr,
@@ -43,8 +46,10 @@ class JSON(Block):
         ```
     """
 
-    _logo_url = "https://cdn.sanity.io/images/3ugk85nk/production/4fcef2294b6eeb423b1332d1ece5156bf296ff96-48x48.png"
-    _documentation_url = "https://docs.prefect.io/latest/develop/blocks"
+    _logo_url = HttpUrl(
+        "https://cdn.sanity.io/images/3ugk85nk/production/4fcef2294b6eeb423b1332d1ece5156bf296ff96-48x48.png"
+    )
+    _documentation_url = HttpUrl("https://docs.prefect.io/latest/develop/blocks")
 
     value: Any = Field(default=..., description="A JSON-compatible value.")
 
@@ -70,8 +75,10 @@ class String(Block):
         ```
     """
 
-    _logo_url = "https://cdn.sanity.io/images/3ugk85nk/production/c262ea2c80a2c043564e8763f3370c3db5a6b3e6-48x48.png"
-    _documentation_url = "https://docs.prefect.io/latest/develop/blocks"
+    _logo_url = HttpUrl(
+        "https://cdn.sanity.io/images/3ugk85nk/production/c262ea2c80a2c043564e8763f3370c3db5a6b3e6-48x48.png"
+    )
+    _documentation_url = HttpUrl("https://docs.prefect.io/latest/develop/blocks")
 
     value: str = Field(default=..., description="A string value.")
 
@@ -98,8 +105,10 @@ class DateTime(Block):
     """
 
     _block_type_name = "Date Time"
-    _logo_url = "https://cdn.sanity.io/images/3ugk85nk/production/8b3da9a6621e92108b8e6a75b82e15374e170ff7-48x48.png"
-    _documentation_url = "https://docs.prefect.io/latest/develop/blocks"
+    _logo_url = HttpUrl(
+        "https://cdn.sanity.io/images/3ugk85nk/production/8b3da9a6621e92108b8e6a75b82e15374e170ff7-48x48.png"
+    )
+    _documentation_url = HttpUrl("https://docs.prefect.io/latest/develop/blocks")
 
     value: PydanticDateTime = Field(
         default=...,
@@ -128,8 +137,10 @@ class Secret(Block, Generic[T]):
         ```
     """
 
-    _logo_url = "https://cdn.sanity.io/images/3ugk85nk/production/c6f20e556dd16effda9df16551feecfb5822092b-48x48.png"
-    _documentation_url = "https://docs.prefect.io/latest/develop/blocks"
+    _logo_url = HttpUrl(
+        "https://cdn.sanity.io/images/3ugk85nk/production/c6f20e556dd16effda9df16551feecfb5822092b-48x48.png"
+    )
+    _documentation_url = HttpUrl("https://docs.prefect.io/latest/develop/blocks")
     _description = "A block that represents a secret value. The value stored in this block will be obfuscated when this block is viewed or edited in the UI."
 
     value: Union[SecretStr, PydanticSecret[T]] = Field(
@@ -151,9 +162,11 @@ class Secret(Block, Generic[T]):
         else:
             return PydanticSecret[type(value)](value)
 
-    def get(self) -> T:
+    def get(self) -> T | str:
+        value = self.value.get_secret_value()
         try:
-            value = self.value.get_secret_value()
-            return json.loads(value)
+            if isinstance(value, (str)):
+                return json.loads(value)
+            return value
         except (TypeError, json.JSONDecodeError):
             return value

prefect/blocks/webhook.py

@@ -1,7 +1,9 @@
-from typing import Optional
+from __future__ import annotations
+
+from typing import Any
 
 from httpx import AsyncClient, AsyncHTTPTransport, Response
-from pydantic import Field, SecretStr
+from pydantic import Field, HttpUrl, SecretStr
 from typing_extensions import Literal
 
 from prefect.blocks.core import Block
@@ -21,7 +23,7 @@ class Webhook(Block):
 
     _block_type_name = "Webhook"
     _logo_url = "https://cdn.sanity.io/images/3ugk85nk/production/c7247cb359eb6cf276734d4b1fbf00fb8930e89e-250x250.png"  # type: ignore
-    _documentation_url = (
+    _documentation_url = HttpUrl(
         "https://docs.prefect.io/latest/automate/events/webhook-triggers"
     )
 
@@ -50,13 +52,13 @@ class Webhook(Block):
         description="Whether or not to enforce a secure connection to the webhook.",
     )
 
-    def block_initialization(self):
+    def block_initialization(self) -> None:
         if self.verify:
             self._client = AsyncClient(transport=_http_transport)
         else:
             self._client = AsyncClient(transport=_insecure_http_transport)
 
-    async def call(self, payload: Optional[dict] = None) -> Response:
+    async def call(self, payload: dict[str, Any] | None = None) -> Response:
         """
         Call the webhook.
 

prefect/cache_policies.py

@@ -2,7 +2,7 @@ import inspect
 from copy import deepcopy
 from dataclasses import dataclass, field
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Dict, List, Literal, Optional, Union
+from typing import TYPE_CHECKING, Any, Callable, Dict, Literal, Optional, Union
 
 from typing_extensions import Self
 
@@ -73,8 +73,8 @@ class CachePolicy:
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Dict[str, Any],
-        flow_parameters: Dict[str, Any],
+        inputs: dict[str, Any],
+        flow_parameters: dict[str, Any],
         **kwargs: Any,
     ) -> Optional[str]:
         raise NotImplementedError
@@ -132,14 +132,14 @@ class CacheKeyFnPolicy(CachePolicy):
 
     # making it optional for tests
     cache_key_fn: Optional[
-        Callable[["TaskRunContext", Dict[str, Any]], Optional[str]]
+        Callable[["TaskRunContext", dict[str, Any]], Optional[str]]
     ] = None
 
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Dict[str, Any],
-        flow_parameters: Dict[str, Any],
+        inputs: dict[str, Any],
+        flow_parameters: dict[str, Any],
         **kwargs: Any,
     ) -> Optional[str]:
         if self.cache_key_fn:
@@ -155,13 +155,13 @@ class CompoundCachePolicy(CachePolicy):
     Any keys that return `None` will be ignored.
     """
 
-    policies: List[CachePolicy] = field(default_factory=list)
+    policies: list[CachePolicy] = field(default_factory=list)
 
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Dict[str, Any],
-        flow_parameters: Dict[str, Any],
+        inputs: dict[str, Any],
+        flow_parameters: dict[str, Any],
         **kwargs: Any,
     ) -> Optional[str]:
         keys: list[str] = []
@@ -183,14 +183,14 @@ class CompoundCachePolicy(CachePolicy):
 class _None(CachePolicy):
     """
     Policy that always returns `None` for the computed cache key.
-    This policy prevents persistence.
+    This policy prevents persistence and avoids caching entirely.
     """
 
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Dict[str, Any],
-        flow_parameters: Dict[str, Any],
+        inputs: dict[str, Any],
+        flow_parameters: dict[str, Any],
         **kwargs: Any,
     ) -> Optional[str]:
         return None
@@ -209,8 +209,8 @@ class TaskSource(CachePolicy):
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Optional[Dict[str, Any]],
-        flow_parameters: Optional[Dict[str, Any]],
+        inputs: Optional[dict[str, Any]],
+        flow_parameters: Optional[dict[str, Any]],
         **kwargs: Any,
     ) -> Optional[str]:
         if not task_ctx:
@@ -236,8 +236,8 @@ class FlowParameters(CachePolicy):
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Dict[str, Any],
-        flow_parameters: Dict[str, Any],
+        inputs: dict[str, Any],
+        flow_parameters: dict[str, Any],
         **kwargs: Any,
     ) -> Optional[str]:
         if not flow_parameters:
@@ -255,8 +255,8 @@ class RunId(CachePolicy):
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Dict[str, Any],
-        flow_parameters: Dict[str, Any],
+        inputs: dict[str, Any],
+        flow_parameters: dict[str, Any],
         **kwargs: Any,
     ) -> Optional[str]:
         if not task_ctx:
@@ -273,13 +273,13 @@ class Inputs(CachePolicy):
     Policy that computes a cache key based on a hash of the runtime inputs provided to the task..
     """
 
-    exclude: List[str] = field(default_factory=list)
+    exclude: list[str] = field(default_factory=list)
 
     def compute_key(
         self,
         task_ctx: TaskRunContext,
-        inputs: Dict[str, Any],
-        flow_parameters: Dict[str, Any],
+        inputs: dict[str, Any],
+        flow_parameters: dict[str, Any],
         **kwargs: Any,
     ) -> Optional[str]:
         hashed_inputs = {}
@@ -302,7 +302,7 @@ class Inputs(CachePolicy):
                 "like locks, file handles, or other system resources.\n\n"
                 "To resolve this, you can:\n"
                 "  1. Exclude these arguments by defining a custom `cache_key_fn`\n"
-                "  2. Disable caching by passing `cache_policy=NONE`\n"
+                "  2. Disable caching by passing `cache_policy=NO_CACHE`\n"
             )
             raise ValueError(msg) from exc
 
@@ -314,6 +314,7 @@ class Inputs(CachePolicy):
 
 INPUTS = Inputs()
 NONE = _None()
+NO_CACHE = _None()
 TASK_SOURCE = TaskSource()
 FLOW_PARAMETERS = FlowParameters()
 RUN_ID = RunId()