prefect-client 3.4.2.dev3__tar.gz → 3.4.2.dev4__tar.gz

{prefect_client-3.4.2.dev3 → prefect_client-3.4.2.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.4.2.dev3
+Version: 3.4.2.dev4
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -60,7 +60,6 @@ Requires-Dist: sniffio<2.0.0,>=1.3.0
 Requires-Dist: toml>=0.10.0
 Requires-Dist: typing-extensions<5.0.0,>=4.10.0
 Requires-Dist: ujson<6.0.0,>=5.8.0
-Requires-Dist: uuid7>=0.1.0
 Requires-Dist: uvicorn!=0.29.0,>=0.14.0
 Requires-Dist: websockets<16.0,>=13.0
 Requires-Dist: whenever<0.9.0,>=0.7.3; python_version >= '3.13'

{prefect_client-3.4.2.dev3 → prefect_client-3.4.2.dev4}/pyproject.toml

@@ -65,7 +65,6 @@ dependencies = [
     "typing_extensions>=4.10.0,<5.0.0",
     "ujson>=5.8.0,<6.0.0",
     "uvicorn>=0.14.0,!=0.29.0",
-    "uuid7>=0.1.0",
     "websockets>=13.0,<16.0",
     "whenever>=0.7.3,<0.9.0; python_version>='3.13'",
 ]

prefect_client-3.4.2.dev4/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.2.dev4"
+__build_date__ = "2025-05-15 08:08:41.435561+00:00"
+__git_commit__ = "95a0ccedd4626c1a737d41a2d4aac25072d606cd"
+__dirty__ = False

prefect_client-3.4.2.dev4/src/prefect/_internal/uuid7.py

@@ -0,0 +1,119 @@
+from __future__ import annotations
+
+import os
+import time
+import uuid
+from typing import Callable, Optional
+
+
+def _time_ms() -> int:
+    return time.time_ns() // 1_000_000
+
+
+def uuid7(
+    ms: Optional[int] = None,
+    time_func: Callable[[], int] = _time_ms,
+) -> uuid.UUID:
+    """
+    UUID v7, following the proposed extension to RFC4122 described in
+    https://www.ietf.org/id/draft-peabody-dispatch-new-uuid-format-02.html.
+    All representations (string, byte array, int) sort chronologically,
+    with a potential time resolution of 50ns (if the system clock
+    supports this).
+
+    Parameters
+    ----------
+
+    ms      - Optional integer with the whole number of milliseconds
+                since Unix epoch, to set the "as of" timestamp.
+
+    as_type - Optional string to return the UUID in a different format.
+                A uuid.UUID (version 7, variant 0x10) is returned unless
+                this is one of 'str', 'int', 'hex' or 'bytes'.
+
+    time_func - Set the time function, which must return integer
+                milliseconds since the Unix epoch, midnight on 1-Jan-1970.
+                Defaults to time.time_ns()/1e6. This is exposed because
+                time.time_ns() may have a low resolution on Windows.
+
+    Returns
+    -------
+
+    A UUID object, or if as_type is specified, a string, int or
+    bytes of length 16.
+
+    Implementation notes
+    --------------------
+
+    The 128 bits in the UUID are allocated as follows:
+    - 36 bits of whole seconds
+    - 24 bits of fractional seconds, giving approx 50ns resolution
+    - 14 bits of sequential counter, if called repeatedly in same time tick
+    - 48 bits of randomness
+    plus, at locations defined by RFC4122, 4 bits for the
+    uuid version (0b111) and 2 bits for the uuid variant (0b10).
+
+     0                   1                   2                   3
+    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                           unix_ts_ms                          |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |          unix_ts_ms           |  ver  |       rand_a          |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |var|                        rand_b                             |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+    |                            rand_b                             |
+    +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+
+    Indicative timings:
+    - uuid.uuid4()            2.4us
+    - uuid7()                 3.7us
+    - uuid7(as_type='int')    1.6us
+    - uuid7(as_type='str')    2.5us
+
+    Examples
+    --------
+
+    >>> uuid7()
+    UUID('061cb26a-54b8-7a52-8000-2124e7041024')
+
+    >>> for fmt in ('bytes', 'hex', 'int', 'str', 'uuid', None):
+    ...     print(fmt, repr(uuid7(as_type=fmt)))
+    bytes b'\x06\x1c\xb8\xfe\x0f\x0b|9\x80\x00\tjt\x85\xb3\xbb'
+    hex '061cb8fe0f0b7c3980011863b956b758'
+    int 8124504378724980906989670469352026642
+    str '061cb8fe-0f0b-7c39-8003-d44a7ee0bdf6'
+    uuid UUID('061cb8fe-0f0b-7c39-8004-0489578299f6')
+    None UUID('061cb8fe-0f0f-7df2-8000-afd57c2bf446')
+    """
+    if ms is None:
+        ms = time_func()
+    else:
+        ms = int(ms)  # Fail fast if not an int
+
+    rand_a = int.from_bytes(bytes=os.urandom(2), byteorder="big")
+    rand_b = int.from_bytes(bytes=os.urandom(8), byteorder="big")
+    uuid_bytes = uuidfromvalues(ms, rand_a, rand_b)
+
+    uuid_int = int.from_bytes(bytes=uuid_bytes, byteorder="big")
+    return uuid.UUID(int=uuid_int)
+
+
+def uuidfromvalues(unix_ts_ms: int, rand_a: int, rand_b: int):
+    version = 0x07
+    var = 2
+    rand_a &= 0xFFF
+    rand_b &= 0x3FFFFFFFFFFFFFFF
+
+    final_bytes = unix_ts_ms.to_bytes(length=6, byteorder="big")
+    final_bytes += ((version << 12) + rand_a).to_bytes(length=2, byteorder="big")
+    final_bytes += ((var << 62) + rand_b).to_bytes(length=8, byteorder="big")
+
+    return final_bytes
+
+
+def format_byte_array_as_uuid(arr: bytes):
+    return f"{arr[:4].hex()}-{arr[4:6].hex()}-{arr[6:8].hex()}-{arr[8:10].hex()}-{arr[10:].hex()}"
+
+
+__all__ = ("uuid7",)

{prefect_client-3.4.2.dev3 → prefect_client-3.4.2.dev4}/src/prefect/settings/models/tasks.py

@@ -1,9 +1,10 @@
-from typing import ClassVar, Optional, Union
+from typing import ClassVar, Optional
 
 from pydantic import AliasChoices, AliasPath, Field
 from pydantic_settings import SettingsConfigDict
 
 from prefect.settings.base import PrefectBaseSettings, build_settings_config
+from prefect.types import TaskRetryDelaySeconds
 
 
 class TasksRunnerSettings(PrefectBaseSettings):
@@ -73,7 +74,7 @@ class TasksSettings(PrefectBaseSettings):
         ),
     )
 
-    default_retry_delay_seconds: Union[int, float, list[float]] = Field(
+    default_retry_delay_seconds: TaskRetryDelaySeconds = Field(
         default=0,
         description="This value sets the default retry delay seconds for all tasks.",
         validation_alias=AliasChoices(

{prefect_client-3.4.2.dev3 → prefect_client-3.4.2.dev4}/src/prefect/types/__init__.py

@@ -1,8 +1,7 @@
 from __future__ import annotations
 
 from functools import partial
-from typing import Annotated, Any, Optional, TypeVar, Union, cast
-from uuid import UUID
+from typing import Annotated, Any, Optional, TypeVar, Union
 from typing_extensions import Literal
 import orjson
 import pydantic
@@ -132,6 +131,52 @@ ClientRetryExtraCodes = Annotated[
     BeforeValidator(partial(validate_set_T_from_delim_string, type_=StatusCode)),
 ]
 
+
+def parse_retry_delay_input(value: Any) -> Any:
+    """
+    Parses various inputs (string, int, float, list) into a format suitable
+    for TaskRetryDelaySeconds (int, float, list[float], or None).
+    Handles comma-separated strings for lists of delays.
+    """
+    if isinstance(value, str):
+        stripped_value = value.strip()
+        if not stripped_value:
+            return None  # Treat empty or whitespace-only string as None
+
+        delim = ","
+        # Split and filter empty strings that result from multiple commas (e.g., "10,,20")
+        parts = [s.strip() for s in stripped_value.split(delim) if s.strip()]
+
+        if not parts:  # e.g., value was just "," or " , "
+            return None
+
+        def _parse_num_part(part_str: str) -> Union[float, int]:
+            try:
+                # Prefer float to align with list[float] in TaskRetryDelaySeconds
+                return TypeAdapter(float).validate_strings(part_str)
+            except pydantic.ValidationError:
+                try:
+                    return TypeAdapter(int).validate_strings(part_str)
+                except pydantic.ValidationError as e_int:
+                    raise ValueError(
+                        f"Invalid number format '{part_str}' for retry delay."
+                    ) from e_int
+
+        if len(parts) == 1:
+            return _parse_num_part(parts[0])
+        else:
+            return [_parse_num_part(p) for p in parts]
+
+    # For non-string inputs (int, float, list, None, etc.), pass them through.
+    # Pydantic will then validate them against Union[int, float, list[float], None].
+    return value
+
+
+TaskRetryDelaySeconds = Annotated[
+    Union[str, int, float, list[float], None],
+    BeforeValidator(parse_retry_delay_input),
+]
+
 LogLevel = Annotated[
     Literal["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
     BeforeValidator(lambda x: x.upper()),
@@ -173,4 +218,5 @@ __all__ = [
     "SecretDict",
     "StatusCode",
     "StrictVariableValue",
+    "TaskRetryDelaySeconds",
 ]

prefect_client-3.4.2.dev3/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.4.2.dev3"
-__build_date__ = "2025-05-14 08:08:44.736788+00:00"
-__git_commit__ = "951cfc2519e6d8677c42565c3e7b24fd647f31c8"
-__dirty__ = False

prefect_client-3.4.2.dev3/src/prefect/_internal/uuid7.py

@@ -1,11 +0,0 @@
-from typing import cast
-from uuid import UUID
-
-from uuid_extensions import uuid7 as _uuid7  # pyright: ignore[reportMissingTypeStubs]
-
-
-def uuid7() -> UUID:
-    return cast(UUID, _uuid7())
-
-
-__all__ = ["uuid7"]