prefect 3.4.1.dev4__tar.gz → 3.4.1.dev5__tar.gz

{prefect-3.4.1.dev4 → prefect-3.4.1.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect
-Version: 3.4.1.dev4
+Version: 3.4.1.dev5
 Summary: Workflow orchestration and management.
 Project-URL: Changelog, https://github.com/PrefectHQ/prefect/releases
 Project-URL: Documentation, https://docs.prefect.io

prefect-3.4.1.dev5/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.1.dev5"
+__build_date__ = "2025-05-08 08:09:47.969062+00:00"
+__git_commit__ = "7e7a18743f5fd0bd4e513ca22c5408e7176390b8"
+__dirty__ = False

{prefect-3.4.1.dev4 → prefect-3.4.1.dev5}/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,60 +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_]*$"
-SLUG_REGEX = "^[a-z0-9]+([_-]+[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]],
@@ -611,50 +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:
-        if not bool(re.match(SLUG_REGEX, value)):
-            raise ValueError(
-                "Variable name must only contain lowercase letters, numbers, dashes, and underscores"
-            )
-    return value
-
-
-def validate_block_type_slug(value: str):
-    raise_on_name_alphanumeric_dashes_only(value, field_name="Block type slug")
-    return value

{prefect-3.4.1.dev4 → prefect-3.4.1.dev5}/src/prefect/cli/work_pool.py

@@ -980,14 +980,14 @@ async def gcs(
                             "prefect_gcp.experimental.bundles.upload": {
                                 "requires": "prefect-gcp",
                                 "bucket": bucket,
-                                "credentials_block_name": credentials_block_name,
+                                "gcp_credentials_block_name": credentials_block_name,
                             }
                         },
                         bundle_execution_step={
                             "prefect_gcp.experimental.bundles.execute": {
                                 "requires": "prefect-gcp",
                                 "bucket": bucket,
-                                "credentials_block_name": credentials_block_name,
+                                "gcp_credentials_block_name": credentials_block_name,
                             }
                         },
                         default_result_storage_block_id=block_document.id,

{prefect-3.4.1.dev4 → prefect-3.4.1.dev5}/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-3.4.1.dev4 → prefect-3.4.1.dev5}/src/prefect/client/schemas/objects.py

@@ -19,6 +19,7 @@ from uuid import UUID, uuid4
 
 import orjson
 from pydantic import (
+    AfterValidator,
     ConfigDict,
     Discriminator,
     Field,
@@ -40,9 +41,7 @@ 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,
@@ -61,6 +60,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
@@ -1000,7 +1003,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 +1032,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 +1134,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 +1221,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,7 +1302,8 @@ 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.",
     )
 
 
@@ -1644,7 +1647,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.")
 
@@ -1658,12 +1663,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-3.4.1.dev4 → prefect-3.4.1.dev5}/src/prefect/server/schemas/actions.py

@@ -6,15 +6,20 @@ from __future__ import annotations
 
 import json
 from copy import deepcopy
-from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Annotated, Any, ClassVar, Dict, List, Optional, Union
 from uuid import UUID, uuid4
 
-from pydantic import ConfigDict, Field, field_validator, model_validator
+from pydantic import (
+    AfterValidator,
+    ConfigDict,
+    Field,
+    field_validator,
+    model_validator,
+)
 
 import prefect.server.schemas as schemas
 from prefect._internal.schemas.validators import (
     get_or_create_run_name,
-    raise_on_name_alphanumeric_dashes_only,
     remove_old_deployment_fields,
     validate_cache_key_length,
     validate_max_metadata_length,
@@ -23,13 +28,11 @@ from prefect._internal.schemas.validators import (
     validate_parameters_conform_to_schema,
     validate_parent_and_ref_diff,
     validate_schedule_max_scheduled_runs,
-    validate_variable_name,
 )
 from prefect.server.utilities.schemas import get_class_fields_only
 from prefect.server.utilities.schemas.bases import PrefectBaseModel
 from prefect.settings import PREFECT_DEPLOYMENT_SCHEDULE_MAX_SCHEDULED_RUNS
 from prefect.types import (
-    MAX_VARIABLE_NAME_LENGTH,
     DateTime,
     KeyValueLabels,
     Name,
@@ -40,27 +43,16 @@ from prefect.types import (
     StrictVariableValue,
 )
 from prefect.types._datetime import now
+from prefect.types.names import (
+    ArtifactKey,
+    BlockDocumentName,
+    BlockTypeSlug,
+    VariableName,
+)
 from prefect.utilities.names import generate_slug
 from prefect.utilities.templating import find_placeholders
 
 
-def validate_block_type_slug(value: str) -> str:
-    raise_on_name_alphanumeric_dashes_only(value, field_name="Block type slug")
-    return value
-
-
-def validate_block_document_name(value: str | None) -> str | None:
-    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 | None) -> str | None:
-    if value is not None:
-        raise_on_name_alphanumeric_dashes_only(value, field_name="Artifact key")
-    return value
-
-
 class ActionBaseModel(PrefectBaseModel):
     model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
 
@@ -166,8 +158,8 @@ class DeploymentCreate(ActionBaseModel):
     paused: bool = Field(
         default=False, description="Whether or not the deployment is paused."
     )
-    schedules: List[DeploymentScheduleCreate] = Field(
-        default_factory=list,
+    schedules: list[DeploymentScheduleCreate] = Field(
+        default_factory=lambda: [],
         description="A list of schedules for the deployment.",
     )
     concurrency_limit: Optional[PositiveInteger] = Field(
@@ -296,8 +288,8 @@ class DeploymentUpdate(ActionBaseModel):
     paused: bool = Field(
         default=False, description="Whether or not the deployment is paused."
     )
-    schedules: List[DeploymentScheduleUpdate] = Field(
-        default_factory=list,
+    schedules: list[DeploymentScheduleUpdate] = Field(
+        default_factory=lambda: [],
         description="A list of schedules for the deployment.",
     )
     concurrency_limit: Optional[PositiveInteger] = Field(
@@ -684,8 +676,8 @@ class SavedSearchCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a saved search."""
 
     name: str = Field(default=..., description="The name of the saved search.")
-    filters: List[schemas.core.SavedSearchFilter] = Field(
-        default_factory=list, description="The filter set for the saved search."
+    filters: list[schemas.core.SavedSearchFilter] = Field(
+        default_factory=lambda: [], description="The filter set for the saved search."
     )
 
 
@@ -733,7 +725,7 @@ class BlockTypeCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a block type."""
 
     name: Name = 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[str] = Field(  # TODO: HttpUrl
         default=None, description="Web URL for the block type's logo"
     )
@@ -749,9 +741,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."""
@@ -769,7 +758,7 @@ class BlockTypeUpdate(ActionBaseModel):
 class BlockSchemaCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a block schema."""
 
-    fields: Dict[str, Any] = Field(
+    fields: dict[str, Any] = Field(
         default_factory=dict, description="The block schema's field schema"
     )
     block_type_id: UUID = Field(default=..., description="A block type ID")
@@ -787,7 +776,7 @@ class BlockSchemaCreate(ActionBaseModel):
 class BlockDocumentCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create a block document."""
 
-    name: Optional[str] = Field(
+    name: Optional[BlockDocumentName] = Field(
         default=None,
         description=(
             "The block document's name. Not required for anonymous block documents."
@@ -808,10 +797,10 @@ 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):
+    def validate_name_is_present_if_not_anonymous(
+        cls, values: dict[str, Any]
+    ) -> dict[str, Any]:
         return validate_name_present_on_nonanonymous_blocks(values)
 
 
@@ -988,7 +977,7 @@ class WorkQueueUpdate(ActionBaseModel):
 class ArtifactCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create an artifact."""
 
-    key: Optional[str] = Field(
+    key: Optional[ArtifactKey] = Field(
         default=None, description="An optional unique reference key for this artifact."
     )
     type: Optional[str] = Field(
@@ -1008,7 +997,9 @@ class ArtifactCreate(ActionBaseModel):
             " the artifact type."
         ),
     )
-    metadata_: Optional[Dict[str, str]] = Field(
+    metadata_: Optional[
+        Annotated[dict[str, str], AfterValidator(validate_max_metadata_length)]
+    ] = Field(
         default=None,
         description=(
             "User-defined artifact metadata. Content must be string key and value"
@@ -1040,68 +1031,44 @@ class ArtifactCreate(ActionBaseModel):
 
         return cls(data=data, **artifact_info)
 
-    _validate_metadata_length = field_validator("metadata_")(
-        validate_max_metadata_length
-    )
-
-    _validate_artifact_format = field_validator("key")(validate_artifact_key)
-
 
 class ArtifactUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update an artifact."""
 
     data: Optional[Union[Dict[str, Any], Any]] = Field(None)
     description: Optional[str] = Field(None)
-    metadata_: Optional[Dict[str, str]] = Field(None)
-
-    _validate_metadata_length = field_validator("metadata_")(
-        validate_max_metadata_length
-    )
+    metadata_: Optional[
+        Annotated[dict[str, str], AfterValidator(validate_max_metadata_length)]
+    ] = Field(None)
 
 
 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",
         examples=["my-value"],
     )
-    tags: List[str] = Field(
+    tags: list[str] = Field(
         default_factory=list,
         description="A list of variable tags",
         examples=[["tag-1", "tag-2"]],
     )
 
-    # 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",
         examples=["my-value"],
     )
-    tags: Optional[List[str]] = Field(
+    tags: Optional[list[str]] = Field(
         default=None,
         description="A list of variable tags",
         examples=[["tag-1", "tag-2"]],
     )
-
-    # validators
-    _validate_name_format = field_validator("name")(validate_variable_name)