prefect-client 3.3.8.dev4__tar.gz → 3.4.1__tar.gz

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.3.8.dev4
+Version: 3.4.1
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io
@@ -40,7 +40,7 @@ Requires-Dist: jsonpatch<2.0,>=1.32
 Requires-Dist: jsonschema<5.0.0,>=4.0.0
 Requires-Dist: opentelemetry-api<2.0.0,>=1.27.0
 Requires-Dist: orjson<4.0,>=3.7
-Requires-Dist: packaging<24.3,>=21.3
+Requires-Dist: packaging<25.1,>=21.3
 Requires-Dist: pathspec>=0.8.0
 Requires-Dist: pendulum<4,>=3.0.0; python_version < '3.13'
 Requires-Dist: prometheus-client>=0.20.0
@@ -60,9 +60,10 @@ 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.8.0,>=0.7.3; python_version >= '3.13'
+Requires-Dist: whenever<0.9.0,>=0.7.3; python_version >= '3.13'
 Provides-Extra: notifications
 Requires-Dist: apprise<2.0.0,>=1.1.0; extra == 'notifications'
 Description-Content-Type: text/markdown

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/pyproject.toml

@@ -44,7 +44,7 @@ dependencies = [
     "jsonschema>=4.0.0,<5.0.0",
     "opentelemetry-api>=1.27.0,<2.0.0",
     "orjson>=3.7,<4.0",
-    "packaging>=21.3,<24.3",
+    "packaging>=21.3,<25.1",
     "pathspec>=0.8.0",
     "pendulum>=3.0.0,<4; python_version<'3.13'",
     "prometheus-client>=0.20.0",
@@ -65,8 +65,9 @@ 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.8.0; python_version>='3.13'",
+    "whenever>=0.7.3,<0.9.0; python_version>='3.13'",
 ]
 [project.urls]
 Changelog = "https://github.com/PrefectHQ/prefect/releases"

prefect_client-3.4.1/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.1"
+__build_date__ = "2025-05-08 20:42:09.281364+00:00"
+__git_commit__ = "b47ad8e12d507c5f24bb8a6582db409ad6ba21be"
+__dirty__ = False

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/_experimental/bundles/__init__.py

@@ -30,7 +30,7 @@ def _get_uv_path() -> str:
         import uv
 
         uv_path = uv.find_uv_bin()
-    except (ImportError, ModuleNotFoundError):
+    except (ImportError, ModuleNotFoundError, FileNotFoundError):
         uv_path = "uv"
 
     return uv_path

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/_internal/schemas/bases.py

@@ -10,6 +10,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from rich.repr import RichReprResult
 from typing_extensions import Self
 
+from prefect._internal.uuid7 import uuid7
 from prefect.types._datetime import (
     DateTime,
     human_friendly_diff,
@@ -100,7 +101,7 @@ class PrefectBaseModel(BaseModel):
 
 class IDBaseModel(PrefectBaseModel):
     """
-    A PrefectBaseModel with an auto-generated UUID ID value.
+    A PrefectBaseModel with a randomly-generated UUID ID value.
 
     The ID is reset on copy() and not included in equality comparisons.
     """
@@ -109,6 +110,15 @@ class IDBaseModel(PrefectBaseModel):
     id: UUID = Field(default_factory=uuid4)
 
 
+class TimeSeriesBaseModel(IDBaseModel):
+    """
+    A PrefectBaseModel with a time-oriented UUIDv7 ID value.  Used for models that
+    operate like timeseries, such as runs, states, and logs.
+    """
+
+    id: UUID = Field(default_factory=uuid7)
+
+
 class ObjectBaseModel(IDBaseModel):
     """
     A PrefectBaseModel with an auto-generated UUID ID value and created /

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/_internal/schemas/validators.py

@@ -10,7 +10,6 @@ from __future__ import annotations
 
 import datetime
 import os
-import re
 import urllib.parse
 import warnings
 from collections.abc import Iterable, Mapping, MutableMapping
@@ -36,59 +35,6 @@ M = TypeVar("M", bound=Mapping[str, Any])
 MM = TypeVar("MM", bound=MutableMapping[str, Any])
 
 
-LOWERCASE_LETTERS_NUMBERS_AND_DASHES_ONLY_REGEX = "^[a-z0-9-]*$"
-LOWERCASE_LETTERS_NUMBERS_AND_UNDERSCORES_REGEX = "^[a-z0-9_]*$"
-
-
-@overload
-def raise_on_name_alphanumeric_dashes_only(
-    value: str, field_name: str = ...
-) -> str: ...
-
-
-@overload
-def raise_on_name_alphanumeric_dashes_only(
-    value: None, field_name: str = ...
-) -> None: ...
-
-
-def raise_on_name_alphanumeric_dashes_only(
-    value: Optional[str], field_name: str = "value"
-) -> Optional[str]:
-    if value is not None and not bool(
-        re.match(LOWERCASE_LETTERS_NUMBERS_AND_DASHES_ONLY_REGEX, value)
-    ):
-        raise ValueError(
-            f"{field_name} must only contain lowercase letters, numbers, and dashes."
-        )
-    return value
-
-
-@overload
-def raise_on_name_alphanumeric_underscores_only(
-    value: str, field_name: str = ...
-) -> str: ...
-
-
-@overload
-def raise_on_name_alphanumeric_underscores_only(
-    value: None, field_name: str = ...
-) -> None: ...
-
-
-def raise_on_name_alphanumeric_underscores_only(
-    value: Optional[str], field_name: str = "value"
-) -> Optional[str]:
-    if value is not None and not re.match(
-        LOWERCASE_LETTERS_NUMBERS_AND_UNDERSCORES_REGEX, value
-    ):
-        raise ValueError(
-            f"{field_name} must only contain lowercase letters, numbers, and"
-            " underscores."
-        )
-    return value
-
-
 def validate_values_conform_to_schema(
     values: Optional[Mapping[str, Any]],
     schema: Optional[Mapping[str, Any]],
@@ -610,47 +556,3 @@ def validate_working_dir(v: Optional[Path | str]) -> Optional[Path]:
     if isinstance(v, str):
         return relative_path_to_current_platform(v)
     return v
-
-
-### UNCATEGORIZED VALIDATORS ###
-
-# the above categories seem to be getting a bit unwieldy, so this is a temporary
-# catch-all for validators until we organize these into files
-
-
-@overload
-def validate_block_document_name(value: str) -> str: ...
-
-
-@overload
-def validate_block_document_name(value: None) -> None: ...
-
-
-def validate_block_document_name(value: Optional[str]) -> Optional[str]:
-    if value is not None:
-        raise_on_name_alphanumeric_dashes_only(value, field_name="Block document name")
-    return value
-
-
-def validate_artifact_key(value: str) -> str:
-    raise_on_name_alphanumeric_dashes_only(value, field_name="Artifact key")
-    return value
-
-
-@overload
-def validate_variable_name(value: str) -> str: ...
-
-
-@overload
-def validate_variable_name(value: None) -> None: ...
-
-
-def validate_variable_name(value: Optional[str]) -> Optional[str]:
-    if value is not None:
-        raise_on_name_alphanumeric_underscores_only(value, field_name="Variable name")
-    return value
-
-
-def validate_block_type_slug(value: str):
-    raise_on_name_alphanumeric_dashes_only(value, field_name="Block type slug")
-    return value

prefect_client-3.4.1/src/prefect/_internal/uuid7.py

@@ -0,0 +1,11 @@
+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"]

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/_versioning.py

@@ -422,6 +422,8 @@ async def get_inferred_version_info(
         get_git_version_info,
     ]
 
+    if version_type is VersionType.SIMPLE:
+        return None
     if version_type:
         if version_type not in type_to_getter:
             raise ValueError(f"Unknown version type: {version_type}")

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/blocks/core.py

@@ -95,6 +95,12 @@ class InvalidBlockRegistration(Exception):
     """
 
 
+class UnknownBlockType(Exception):
+    """
+    Raised when a block type is not found in the registry.
+    """
+
+
 def _collect_nested_reference_strings(
     obj: dict[str, Any] | list[Any],
 ) -> list[dict[str, Any]]:
@@ -786,7 +792,20 @@ class Block(BaseModel, ABC):
         # before looking up the block class, but only do this once
         load_prefect_collections()
 
-        return lookup_type(cls, key)
+        try:
+            return lookup_type(cls, key)
+        except KeyError:
+            message = f"No block class found for slug {key!r}."
+            # Handle common blocks types used for storage, which is the primary use case for looking up blocks by key
+            if key == "s3-bucket":
+                message += " Please ensure that `prefect-aws` is installed."
+            elif key == "gcs-bucket":
+                message += " Please ensure that `prefect-gcp` is installed."
+            elif key == "azure-blob-storage-container":
+                message += " Please ensure that `prefect-azure` is installed."
+            else:
+                message += " Please ensure that the block class is available in the current environment."
+            raise UnknownBlockType(message)
 
     def _define_metadata_on_nested_blocks(
         self, block_document_references: dict[str, dict[str, Any]]

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/client/orchestration/__init__.py

@@ -322,12 +322,16 @@ class PrefectClient(
         if api_version is None:
             api_version = SERVER_API_VERSION
         httpx_settings["headers"].setdefault("X-PREFECT-API-VERSION", api_version)
-        if api_key:
-            httpx_settings["headers"].setdefault("Authorization", f"Bearer {api_key}")
-
+        # Prioritize auth_string if provided, otherwise use api_key
         if auth_string:
             token = base64.b64encode(auth_string.encode("utf-8")).decode("utf-8")
-            httpx_settings["headers"].setdefault("Authorization", f"Basic {token}")
+            httpx_settings["headers"]["Authorization"] = (
+                f"Basic {token}"  # Overwrite if exists
+            )
+        elif api_key:
+            httpx_settings["headers"]["Authorization"] = (
+                f"Bearer {api_key}"  # Set if auth_string is not present
+            )
 
         # Context management
         self._context_stack: int = 0
@@ -1189,12 +1193,16 @@ class SyncPrefectClient(
         if api_version is None:
             api_version = SERVER_API_VERSION
         httpx_settings["headers"].setdefault("X-PREFECT-API-VERSION", api_version)
-        if api_key:
-            httpx_settings["headers"].setdefault("Authorization", f"Bearer {api_key}")
-
+        # Prioritize auth_string if provided, otherwise use api_key
         if auth_string:
             token = base64.b64encode(auth_string.encode("utf-8")).decode("utf-8")
-            httpx_settings["headers"].setdefault("Authorization", f"Basic {token}")
+            httpx_settings["headers"]["Authorization"] = (
+                f"Basic {token}"  # Overwrite if exists
+            )
+        elif api_key:
+            httpx_settings["headers"]["Authorization"] = (
+                f"Bearer {api_key}"  # Set if auth_string is not present
+            )
 
         # Context management
         self._context_stack: int = 0

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/client/schemas/actions.py

@@ -12,12 +12,8 @@ from prefect._internal.schemas.bases import ActionBaseModel
 from prefect._internal.schemas.validators import (
     convert_to_strings,
     remove_old_deployment_fields,
-    validate_artifact_key,
-    validate_block_document_name,
-    validate_block_type_slug,
     validate_name_present_on_nonanonymous_blocks,
     validate_schedule_max_scheduled_runs,
-    validate_variable_name,
 )
 from prefect.client.schemas.objects import (
     StateDetails,
@@ -34,7 +30,6 @@ from prefect.client.schemas.schedules import (
 from prefect.schedules import Schedule
 from prefect.settings import PREFECT_DEPLOYMENT_SCHEDULE_MAX_SCHEDULED_RUNS
 from prefect.types import (
-    MAX_VARIABLE_NAME_LENGTH,
     DateTime,
     KeyValueLabelsField,
     Name,
@@ -45,6 +40,12 @@ from prefect.types import (
     PositiveInteger,
     StrictVariableValue,
 )
+from prefect.types.names import (
+    ArtifactKey,
+    BlockDocumentName,
+    BlockTypeSlug,
+    VariableName,
+)
 from prefect.utilities.collections import visit_collection
 from prefect.utilities.pydantic import get_class_fields_only
 
@@ -216,7 +217,7 @@ class DeploymentCreate(ActionBaseModel):
     flow_id: UUID = Field(..., description="The ID of the flow to deploy.")
     paused: Optional[bool] = Field(default=None)
     schedules: list[DeploymentScheduleCreate] = Field(
-        default_factory=list,
+        default_factory=lambda: [],
         description="A list of schedules for the deployment.",
     )
     concurrency_limit: Optional[int] = Field(
@@ -537,7 +538,7 @@ class SavedSearchCreate(ActionBaseModel):
 
     name: str = Field(default=..., description="The name of the saved search.")
     filters: list[objects.SavedSearchFilter] = Field(
-        default_factory=list, description="The filter set for the saved search."
+        default_factory=lambda: [], description="The filter set for the saved search."
     )
 
 
@@ -585,7 +586,7 @@ class BlockTypeCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a block type."""
 
     name: str = Field(default=..., description="A block type's name")
-    slug: str = Field(default=..., description="A block type's slug")
+    slug: BlockTypeSlug = Field(default=..., description="A block type's slug")
     logo_url: Optional[objects.HttpUrl] = Field(
         default=None, description="Web URL for the block type's logo"
     )
@@ -601,9 +602,6 @@ class BlockTypeCreate(ActionBaseModel):
         description="A code snippet demonstrating use of the corresponding block",
     )
 
-    # validators
-    _validate_slug_format = field_validator("slug")(validate_block_type_slug)
-
 
 class BlockTypeUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update a block type."""
@@ -638,7 +636,7 @@ class BlockSchemaCreate(ActionBaseModel):
 class BlockDocumentCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a block document."""
 
-    name: Optional[Name] = Field(
+    name: Optional[BlockDocumentName] = Field(
         default=None, description="The name of the block document"
     )
     data: dict[str, Any] = Field(
@@ -658,8 +656,6 @@ class BlockDocumentCreate(ActionBaseModel):
         ),
     )
 
-    _validate_name_format = field_validator("name")(validate_block_document_name)
-
     @model_validator(mode="before")
     def validate_name_is_present_if_not_anonymous(
         cls, values: dict[str, Any]
@@ -814,7 +810,7 @@ class WorkQueueUpdate(ActionBaseModel):
 class ArtifactCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create an artifact."""
 
-    key: Optional[str] = Field(default=None)
+    key: Optional[ArtifactKey] = Field(default=None)
     type: Optional[str] = Field(default=None)
     description: Optional[str] = Field(default=None)
     data: Optional[Union[dict[str, Any], Any]] = Field(default=None)
@@ -822,8 +818,6 @@ class ArtifactCreate(ActionBaseModel):
     flow_run_id: Optional[UUID] = Field(default=None)
     task_run_id: Optional[UUID] = Field(default=None)
 
-    _validate_artifact_format = field_validator("key")(validate_artifact_key)
-
 
 class ArtifactUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update an artifact."""
@@ -836,12 +830,7 @@ class ArtifactUpdate(ActionBaseModel):
 class VariableCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a Variable."""
 
-    name: str = Field(
-        default=...,
-        description="The name of the variable",
-        examples=["my_variable"],
-        max_length=MAX_VARIABLE_NAME_LENGTH,
-    )
+    name: VariableName = Field(default=...)
     value: StrictVariableValue = Field(
         default=...,
         description="The value of the variable",
@@ -849,19 +838,11 @@ class VariableCreate(ActionBaseModel):
     )
     tags: Optional[list[str]] = Field(default=None)
 
-    # validators
-    _validate_name_format = field_validator("name")(validate_variable_name)
-
 
 class VariableUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update a Variable."""
 
-    name: Optional[str] = Field(
-        default=None,
-        description="The name of the variable",
-        examples=["my_variable"],
-        max_length=MAX_VARIABLE_NAME_LENGTH,
-    )
+    name: Optional[VariableName] = Field(default=None)
     value: StrictVariableValue = Field(
         default=None,
         description="The value of the variable",
@@ -869,9 +850,6 @@ class VariableUpdate(ActionBaseModel):
     )
     tags: Optional[list[str]] = Field(default=None)
 
-    # validators
-    _validate_name_format = field_validator("name")(validate_variable_name)
-
 
 class GlobalConcurrencyLimitCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a global concurrency limit."""

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/client/schemas/objects.py

@@ -15,10 +15,11 @@ from typing import (
     Union,
     overload,
 )
-from uuid import UUID, uuid4
+from uuid import UUID
 
 import orjson
 from pydantic import (
+    AfterValidator,
     ConfigDict,
     Discriminator,
     Field,
@@ -35,20 +36,23 @@ from typing_extensions import Literal, Self, TypeVar
 
 from prefect._internal.compatibility.async_dispatch import async_dispatch
 from prefect._internal.compatibility.migration import getattr_migration
-from prefect._internal.schemas.bases import ObjectBaseModel, PrefectBaseModel
+from prefect._internal.schemas.bases import (
+    ObjectBaseModel,
+    PrefectBaseModel,
+    TimeSeriesBaseModel,
+)
 from prefect._internal.schemas.fields import CreatedBy, UpdatedBy
 from prefect._internal.schemas.validators import (
     get_or_create_run_name,
     list_length_50_or_less,
-    raise_on_name_alphanumeric_dashes_only,
     set_run_policy_deprecated_fields,
-    validate_block_document_name,
     validate_default_queue_id_not_none,
     validate_max_metadata_length,
     validate_name_present_on_nonanonymous_blocks,
     validate_not_negative,
     validate_parent_and_ref_diff,
 )
+from prefect._internal.uuid7 import uuid7
 from prefect._result_records import ResultRecordMetadata
 from prefect.client.schemas.schedules import SCHEDULE_TYPES
 from prefect.settings import PREFECT_CLOUD_API_URL, PREFECT_CLOUD_UI_URL
@@ -61,6 +65,10 @@ from prefect.types import (
     StrictVariableValue,
 )
 from prefect.types._datetime import DateTime, now
+from prefect.types.names import (
+    BlockDocumentName,
+    raise_on_name_alphanumeric_dashes_only,
+)
 from prefect.utilities.asyncutils import run_coro_as_sync
 from prefect.utilities.collections import AutoEnum, visit_collection
 from prefect.utilities.names import generate_slug
@@ -181,7 +189,7 @@ def data_discriminator(x: Any) -> str:
     return "Any"
 
 
-class State(ObjectBaseModel, Generic[R]):
+class State(TimeSeriesBaseModel, ObjectBaseModel, Generic[R]):
     """
     The state of a run.
     """
@@ -412,7 +420,7 @@ class State(ObjectBaseModel, Generic[R]):
         """
         return self.model_copy(
             update={
-                "id": uuid4(),
+                "id": uuid7(),
                 "created": now("UTC"),
                 "updated": now("UTC"),
                 "timestamp": now("UTC"),
@@ -508,7 +516,7 @@ class FlowRunPolicy(PrefectBaseModel):
         return values
 
 
-class FlowRun(ObjectBaseModel):
+class FlowRun(TimeSeriesBaseModel, ObjectBaseModel):
     name: str = Field(
         default_factory=lambda: generate_slug(2),
         description=(
@@ -764,7 +772,7 @@ class Constant(TaskRunInput):
     type: str
 
 
-class TaskRun(ObjectBaseModel):
+class TaskRun(TimeSeriesBaseModel, ObjectBaseModel):
     name: str = Field(
         default_factory=lambda: generate_slug(2), examples=["my-task-run"]
     )
@@ -1000,7 +1008,7 @@ class BlockSchema(ObjectBaseModel):
 class BlockDocument(ObjectBaseModel):
     """An ORM representation of a block document."""
 
-    name: Optional[Name] = Field(
+    name: Optional[BlockDocumentName] = Field(
         default=None,
         description=(
             "The block document's name. Not required for anonymous block documents."
@@ -1029,8 +1037,6 @@ class BlockDocument(ObjectBaseModel):
         ),
     )
 
-    _validate_name_format = field_validator("name")(validate_block_document_name)
-
     @model_validator(mode="before")
     @classmethod
     def validate_name_is_present_if_not_anonymous(
@@ -1133,7 +1139,8 @@ class Deployment(ObjectBaseModel):
         default=None, description="The concurrency limit for the deployment."
     )
     schedules: list[DeploymentSchedule] = Field(
-        default_factory=list, description="A list of schedules for the deployment."
+        default_factory=lambda: [],
+        description="A list of schedules for the deployment.",
     )
     job_variables: dict[str, Any] = Field(
         default_factory=dict,
@@ -1219,7 +1226,7 @@ class ConcurrencyLimit(ObjectBaseModel):
     )
     concurrency_limit: int = Field(default=..., description="The concurrency limit.")
     active_slots: list[UUID] = Field(
-        default_factory=list,
+        default_factory=lambda: [],
         description="A list of active run ids using a concurrency slot",
     )
 
@@ -1300,11 +1307,12 @@ class SavedSearch(ObjectBaseModel):
 
     name: str = Field(default=..., description="The name of the saved search.")
     filters: list[SavedSearchFilter] = Field(
-        default_factory=list, description="The filter set for the saved search."
+        default_factory=lambda: [],
+        description="The filter set for the saved search.",
     )
 
 
-class Log(ObjectBaseModel):
+class Log(TimeSeriesBaseModel, ObjectBaseModel):
     """An ORM representation of log data."""
 
     name: str = Field(default=..., description="The logger name.")
@@ -1459,6 +1467,10 @@ class WorkPoolStorageConfiguration(PrefectBaseModel):
     bundle_execution_step: Optional[dict[str, Any]] = Field(
         default=None, description="The bundle execution step for the work pool."
     )
+    default_result_storage_block_id: Optional[UUID] = Field(
+        default=None,
+        description="The block document ID of the default result storage block.",
+    )
 
 
 class WorkPool(ObjectBaseModel):
@@ -1640,7 +1652,9 @@ class Variable(ObjectBaseModel):
 
 class FlowRunInput(ObjectBaseModel):
     flow_run_id: UUID = Field(description="The flow run ID associated with the input.")
-    key: str = Field(description="The key of the input.")
+    key: Annotated[str, AfterValidator(raise_on_name_alphanumeric_dashes_only)] = Field(
+        description="The key of the input."
+    )
     value: str = Field(description="The value of the input.")
     sender: Optional[str] = Field(default=None, description="The sender of the input.")
 
@@ -1654,12 +1668,6 @@ class FlowRunInput(ObjectBaseModel):
         """
         return orjson.loads(self.value)
 
-    @field_validator("key", check_fields=False)
-    @classmethod
-    def validate_name_characters(cls, v: str) -> str:
-        raise_on_name_alphanumeric_dashes_only(v)
-        return v
-
 
 class GlobalConcurrencyLimit(ObjectBaseModel):
     """An ORM representation of a global concurrency limit"""

{prefect_client-3.3.8.dev4 → prefect_client-3.4.1}/src/prefect/client/subscriptions.py

@@ -13,7 +13,7 @@ from typing_extensions import Self
 from prefect._internal.schemas.bases import IDBaseModel
 from prefect.events.clients import websocket_connect
 from prefect.logging import get_logger
-from prefect.settings import PREFECT_API_KEY
+from prefect.settings import get_current_settings
 
 logger: Logger = get_logger(__name__)
 
@@ -76,10 +76,17 @@ class Subscription(Generic[S]):
         websocket = await self._connect.__aenter__()
 
         try:
+            settings = get_current_settings()
+            auth_token = (
+                settings.api.auth_string.get_secret_value()
+                if settings.api.auth_string
+                else None
+            )
+            api_key = settings.api.key.get_secret_value() if settings.api.key else None
+            token = auth_token or api_key  # Prioritize auth_token
+
             await websocket.send(
-                orjson.dumps(
-                    {"type": "auth", "token": PREFECT_API_KEY.value()}
-                ).decode()
+                orjson.dumps({"type": "auth", "token": token}).decode()
             )
 
             auth: dict[str, Any] = orjson.loads(await websocket.recv())
@@ -107,11 +114,13 @@ class Subscription(Generic[S]):
                 reason = None
 
             if reason:
-                raise Exception(
-                    "Unable to authenticate to the subscription. Please "
-                    "ensure the provided `PREFECT_API_KEY` you are using is "
-                    f"valid for this environment. Reason: {reason}"
-                ) from e
+                error_message = (
+                    "Unable to authenticate to the subscription. Please ensure the provided "
+                    "`PREFECT_API_AUTH_STRING` (for self-hosted with auth string) or "
+                    "`PREFECT_API_KEY` (for Cloud or self-hosted with API key) "
+                    f"you are using is valid for this environment. Reason: {reason}"
+                )
+                raise Exception(error_message) from e
             raise
         else:
             self._websocket = websocket