prefect-client 3.3.8.dev3__tar.gz → 3.4.0__tar.gz

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.3.8.dev3
+Version: 3.4.0
 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
@@ -62,7 +62,7 @@ Requires-Dist: typing-extensions<5.0.0,>=4.10.0
 Requires-Dist: ujson<6.0.0,>=5.8.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.dev3 → prefect_client-3.4.0}/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",
@@ -66,7 +66,7 @@ dependencies = [
     "ujson>=5.8.0,<6.0.0",
     "uvicorn>=0.14.0,!=0.29.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.0/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.0"
+__build_date__ = "2025-05-02 20:01:04.986143+00:00"
+__git_commit__ = "c80e444246c8805f1dfb684267e0d88dbfcc8d38"
+__dirty__ = False

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/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.dev3 → prefect_client-3.4.0}/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]]:
@@ -374,15 +380,15 @@ class Block(BaseModel, ABC):
                     for field_name in type(self).model_fields
                 }
             )
-        if extra_fields := {
+        extra_fields = {
             "block_type_slug": self.get_block_type_slug(),
             "_block_document_id": self._block_document_id,
             "_block_document_name": self._block_document_name,
             "_is_anonymous": self._is_anonymous,
-        }:
-            jsonable_self |= {
-                key: value for key, value in extra_fields.items() if value is not None
-            }
+        }
+        jsonable_self |= {
+            key: value for key, value in extra_fields.items() if value is not None
+        }
         return jsonable_self
 
     @classmethod
@@ -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.dev3 → prefect_client-3.4.0}/src/prefect/client/schemas/objects.py

@@ -1453,14 +1453,16 @@ class Agent(ObjectBaseModel):
 class WorkPoolStorageConfiguration(PrefectBaseModel):
     """A work pool storage configuration"""
 
-    model_config: ClassVar[ConfigDict] = ConfigDict(extra="forbid")
-
     bundle_upload_step: Optional[dict[str, Any]] = Field(
         default=None, description="The bundle upload step for the work pool."
     )
     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):

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/deployments/runner.py

@@ -35,7 +35,15 @@ import importlib
 import tempfile
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, ClassVar, Iterable, List, Optional, Union
+from typing import (
+    TYPE_CHECKING,
+    Any,
+    ClassVar,
+    Iterable,
+    List,
+    Optional,
+    Union,
+)
 from uuid import UUID
 
 from pydantic import (
@@ -58,6 +66,7 @@ from prefect._internal.schemas.validators import (
     reconcile_paused_deployment,
     reconcile_schedules_runner,
 )
+from prefect._versioning import VersionType, get_inferred_version_info
 from prefect.client.base import ServerType
 from prefect.client.orchestration import PrefectClient, get_client
 from prefect.client.schemas.actions import DeploymentScheduleCreate, DeploymentUpdate
@@ -154,6 +163,13 @@ class RunnerDeployment(BaseModel):
     version: Optional[str] = Field(
         default=None, description="An optional version for the deployment."
     )
+    version_type: Optional[VersionType] = Field(
+        default=None,
+        description=(
+            "The type of version information to use for the deployment. The version type"
+            " will be inferred if not provided."
+        ),
+    )
     tags: ListOfNonEmptyStrings = Field(
         default_factory=list,
         description="One of more tags to apply to this deployment.",
@@ -219,6 +235,7 @@ class RunnerDeployment(BaseModel):
             " a built runner."
         ),
     )
+
     # (Experimental) SLA configuration for the deployment. May be removed or modified at any time. Currently only supported on Prefect Cloud.
     _sla: Optional[Union[SlaTypes, list[SlaTypes]]] = PrivateAttr(
         default=None,
@@ -232,6 +249,9 @@ class RunnerDeployment(BaseModel):
     _parameter_openapi_schema: ParameterSchema = PrivateAttr(
         default_factory=ParameterSchema,
     )
+    _version_from_flow: bool = PrivateAttr(
+        default=False,
+    )
 
     @property
     def entrypoint_type(self) -> EntrypointType:
@@ -241,6 +261,20 @@ class RunnerDeployment(BaseModel):
     def full_name(self) -> str:
         return f"{self.flow_name}/{self.name}"
 
+    def _get_deployment_version_info(
+        self, version_type: Optional[VersionType] = None
+    ) -> VersionInfo:
+        if inferred_version := run_coro_as_sync(
+            get_inferred_version_info(version_type)
+        ):
+            if not self.version or self._version_from_flow:
+                self.version = inferred_version.version  # TODO: maybe reconsider
+
+            inferred_version.version = self.version
+            return inferred_version
+
+        return VersionInfo(version=self.version or "", type="prefect:simple")
+
     @field_validator("name", mode="before")
     @classmethod
     def validate_name(cls, value: str) -> str:
@@ -387,7 +421,7 @@ class RunnerDeployment(BaseModel):
         update_payload = self.model_dump(
             mode="json",
             exclude_unset=True,
-            exclude={"storage", "name", "flow_name", "triggers"},
+            exclude={"storage", "name", "flow_name", "triggers", "version_type"},
         )
 
         if self.storage:
@@ -444,7 +478,7 @@ class RunnerDeployment(BaseModel):
         self,
         work_pool_name: Optional[str] = None,
         image: Optional[str] = None,
-        version_info: VersionInfo | None = None,
+        version_info: Optional[VersionInfo] = None,
     ) -> UUID:
         """
         Registers this deployment with the API and returns the deployment's ID.
@@ -455,11 +489,15 @@ class RunnerDeployment(BaseModel):
             image: The registry, name, and tag of the Docker image to
                 use for this deployment. Only used when the deployment is
                 deployed to a work pool.
-            version_info: Version information for the deployment.
+            version_info: The version information to use for the deployment.
         Returns:
             The ID of the created deployment.
         """
 
+        version_info = version_info or self._get_deployment_version_info(
+            self.version_type
+        )
+
         async with get_client() as client:
             try:
                 deployment = await client.read_deployment_by_name(self.full_name)
@@ -570,6 +608,7 @@ class RunnerDeployment(BaseModel):
 
         if not self.version:
             self.version = flow.version
+            self._version_from_flow = True
         if not self.description:
             self.description = flow.description
 
@@ -592,6 +631,7 @@ class RunnerDeployment(BaseModel):
         description: Optional[str] = None,
         tags: Optional[List[str]] = None,
         version: Optional[str] = None,
+        version_type: Optional[VersionType] = None,
         enforce_parameter_schema: bool = True,
         work_pool_name: Optional[str] = None,
         work_queue_name: Optional[str] = None,
@@ -622,6 +662,7 @@ class RunnerDeployment(BaseModel):
             tags: A list of tags to associate with the created deployment for organizational
                 purposes.
             version: A version for the created deployment. Defaults to the flow's version.
+            version_type: The type of version information to use for the deployment.
             enforce_parameter_schema: Whether or not the Prefect API should enforce the
                 parameter schema for this deployment.
             work_pool_name: The name of the work pool to use for this deployment.
@@ -662,6 +703,7 @@ class RunnerDeployment(BaseModel):
             parameters=parameters or {},
             description=description,
             version=version,
+            version_type=version_type,
             enforce_parameter_schema=enforce_parameter_schema,
             work_pool_name=work_pool_name,
             work_queue_name=work_queue_name,
@@ -837,6 +879,7 @@ class RunnerDeployment(BaseModel):
         description: Optional[str] = None,
         tags: Optional[List[str]] = None,
         version: Optional[str] = None,
+        version_type: Optional[VersionType] = None,
         enforce_parameter_schema: bool = True,
         work_pool_name: Optional[str] = None,
         work_queue_name: Optional[str] = None,
@@ -870,6 +913,8 @@ class RunnerDeployment(BaseModel):
             tags: A list of tags to associate with the created deployment for organizational
                 purposes.
             version: A version for the created deployment. Defaults to the flow's version.
+            version_type: The type of version information to use for the deployment. The version type
+                will be inferred if not provided.
             enforce_parameter_schema: Whether or not the Prefect API should enforce the
                 parameter schema for this deployment.
             work_pool_name: The name of the work pool to use for this deployment.
@@ -921,6 +966,7 @@ class RunnerDeployment(BaseModel):
             parameters=parameters or {},
             description=description,
             version=version,
+            version_type=version_type,
             entrypoint=entrypoint,
             enforce_parameter_schema=enforce_parameter_schema,
             storage=storage,
@@ -959,6 +1005,7 @@ class RunnerDeployment(BaseModel):
         description: Optional[str] = None,
         tags: Optional[List[str]] = None,
         version: Optional[str] = None,
+        version_type: Optional[VersionType] = None,
         enforce_parameter_schema: bool = True,
         work_pool_name: Optional[str] = None,
         work_queue_name: Optional[str] = None,
@@ -992,6 +1039,8 @@ class RunnerDeployment(BaseModel):
             tags: A list of tags to associate with the created deployment for organizational
                 purposes.
             version: A version for the created deployment. Defaults to the flow's version.
+            version_type: The type of version information to use for the deployment. The version type
+                will be inferred if not provided.
             enforce_parameter_schema: Whether or not the Prefect API should enforce the
                 parameter schema for this deployment.
             work_pool_name: The name of the work pool to use for this deployment.
@@ -1041,6 +1090,7 @@ class RunnerDeployment(BaseModel):
             parameters=parameters or {},
             description=description,
             version=version,
+            version_type=version_type,
             entrypoint=entrypoint,
             enforce_parameter_schema=enforce_parameter_schema,
             storage=storage,

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/flows.py

@@ -49,6 +49,7 @@ from typing_extensions import Literal, ParamSpec
 
 from prefect._experimental.sla.objects import SlaTypes
 from prefect._internal.concurrency.api import create_call, from_async
+from prefect._versioning import VersionType
 from prefect.blocks.core import Block
 from prefect.client.schemas.filters import WorkerFilter, WorkerFilterStatus
 from prefect.client.schemas.objects import ConcurrencyLimitConfig, FlowRun
@@ -704,6 +705,7 @@ class Flow(Generic[P, R]):
         description: Optional[str] = None,
         tags: Optional[list[str]] = None,
         version: Optional[str] = None,
+        version_type: Optional[VersionType] = None,
         enforce_parameter_schema: bool = True,
         work_pool_name: Optional[str] = None,
         work_queue_name: Optional[str] = None,
@@ -733,6 +735,8 @@ class Flow(Generic[P, R]):
             tags: A list of tags to associate with the created deployment for organizational
                 purposes.
             version: A version for the created deployment. Defaults to the flow's version.
+            version_type: The type of version to use for the created deployment. The version type
+                will be inferred if not provided.
             enforce_parameter_schema: Whether or not the Prefect API should enforce the
                 parameter schema for the created deployment.
             work_pool_name: The name of the work pool to use for this deployment.
@@ -787,6 +791,7 @@ class Flow(Generic[P, R]):
                 parameters=parameters or {},
                 description=description,
                 version=version,
+                version_type=version_type,
                 enforce_parameter_schema=enforce_parameter_schema,
                 work_pool_name=work_pool_name,
                 work_queue_name=work_queue_name,
@@ -809,6 +814,7 @@ class Flow(Generic[P, R]):
                 parameters=parameters or {},
                 description=description,
                 version=version,
+                version_type=version_type,
                 enforce_parameter_schema=enforce_parameter_schema,
                 work_pool_name=work_pool_name,
                 work_queue_name=work_queue_name,
@@ -840,6 +846,7 @@ class Flow(Generic[P, R]):
         description: Optional[str] = None,
         tags: Optional[list[str]] = None,
         version: Optional[str] = None,
+        version_type: Optional[VersionType] = None,
         enforce_parameter_schema: bool = True,
         work_pool_name: Optional[str] = None,
         work_queue_name: Optional[str] = None,
@@ -869,6 +876,8 @@ class Flow(Generic[P, R]):
             tags: A list of tags to associate with the created deployment for organizational
                 purposes.
             version: A version for the created deployment. Defaults to the flow's version.
+            version_type: The type of version to use for the created deployment. The version type
+                will be inferred if not provided.
             enforce_parameter_schema: Whether or not the Prefect API should enforce the
                 parameter schema for the created deployment.
             work_pool_name: The name of the work pool to use for this deployment.
@@ -925,6 +934,7 @@ class Flow(Generic[P, R]):
                     parameters=parameters or {},
                     description=description,
                     version=version,
+                    version_type=version_type,
                     enforce_parameter_schema=enforce_parameter_schema,
                     work_pool_name=work_pool_name,
                     work_queue_name=work_queue_name,
@@ -949,6 +959,7 @@ class Flow(Generic[P, R]):
                 parameters=parameters or {},
                 description=description,
                 version=version,
+                version_type=version_type,
                 enforce_parameter_schema=enforce_parameter_schema,
                 work_pool_name=work_pool_name,
                 work_queue_name=work_queue_name,
@@ -1375,6 +1386,7 @@ class Flow(Generic[P, R]):
         description: Optional[str] = None,
         tags: Optional[list[str]] = None,
         version: Optional[str] = None,
+        version_type: Optional[VersionType] = None,
         enforce_parameter_schema: bool = True,
         entrypoint_type: EntrypointType = EntrypointType.FILE_PATH,
         print_next_steps: bool = True,
@@ -1426,6 +1438,8 @@ class Flow(Generic[P, R]):
             tags: A list of tags to associate with the created deployment for organizational
                 purposes.
             version: A version for the created deployment. Defaults to the flow's version.
+            version_type: The type of version to use for the created deployment. The version type
+                will be inferred if not provided.
             enforce_parameter_schema: Whether or not the Prefect API should enforce the
                 parameter schema for the created deployment.
             entrypoint_type: Type of entrypoint to use for the deployment. When using a module path
@@ -1510,6 +1524,7 @@ class Flow(Generic[P, R]):
             description=description,
             tags=tags,
             version=version,
+            version_type=version_type,
             enforce_parameter_schema=enforce_parameter_schema,
             work_queue_name=work_queue_name,
             job_variables=job_variables,

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/futures.py

@@ -14,7 +14,7 @@ from typing_extensions import NamedTuple, Self, TypeVar
 from prefect._waiters import FlowRunWaiter
 from prefect.client.orchestration import get_client
 from prefect.exceptions import ObjectNotFound
-from prefect.logging.loggers import get_logger, get_run_logger
+from prefect.logging.loggers import get_logger
 from prefect.states import Pending, State
 from prefect.task_runs import TaskRunWaiter
 from prefect.utilities.annotations import quote
@@ -224,19 +224,6 @@ class PrefectConcurrentFuture(PrefectWrappedFuture[R, concurrent.futures.Future[
         )
         return _result
 
-    def __del__(self) -> None:
-        if self._final_state or self._wrapped_future.done():
-            return
-        try:
-            local_logger = get_run_logger()
-        except Exception:
-            local_logger = logger
-        local_logger.warning(
-            "A future was garbage collected before it resolved."
-            " Please call `.wait()` or `.result()` on futures to ensure they resolve."
-            "\nSee https://docs.prefect.io/latest/develop/task-runners for more details.",
-        )
-
 
 class PrefectDistributedFuture(PrefectTaskRunFuture[R]):
     """

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/infrastructure/provisioners/cloud_run.py

@@ -133,6 +133,7 @@ class CloudRunPushProvisioner:
             await self._run_command(
                 f"gcloud iam service-accounts create {self._service_account_name}"
                 ' --display-name "Prefect Cloud Run Service Account"'
+                f" --project={self._project}"
             )
         except subprocess.CalledProcessError as e:
             if "already exists" not in e.output.decode("utf-8"):

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/runner/runner.py

@@ -1301,7 +1301,7 @@ class Runner:
         except anyio.WouldBlock:
             if TYPE_CHECKING:
                 assert self._limiter is not None
-            self._logger.info(
+            self._logger.debug(
                 f"Flow run limit reached; {self._limiter.borrowed_tokens} flow runs"
                 " in progress. You can control this limit by adjusting the "
                 "PREFECT_RUNNER_PROCESS_LIMIT setting."

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/server/api/server.py

@@ -62,6 +62,19 @@ from prefect.settings import (
 )
 from prefect.utilities.hashing import hash_objects
 
+if os.environ.get("PREFECT_LOGFIRE_ENABLED"):
+    import logfire  # pyright: ignore
+
+    token: str | None = os.environ.get("PREFECT_LOGFIRE_WRITE_TOKEN")
+    if token is None:
+        raise ValueError(
+            "PREFECT_LOGFIRE_WRITE_TOKEN must be set when PREFECT_LOGFIRE_ENABLED is true"
+        )
+
+    logfire.configure(token=token)  # pyright: ignore
+else:
+    logfire = None
+
 if TYPE_CHECKING:
     import logging
 
@@ -250,7 +263,7 @@ def copy_directory(directory: str, path: str) -> None:
                 shutil.rmtree(destination)
             shutil.copytree(source, destination, symlinks=True)
             # ensure copied files are writeable
-            for root, dirs, files in os.walk(destination):
+            for root, _, files in os.walk(destination):
                 for f in files:
                     os.chmod(os.path.join(root, f), 0o700)
         else:
@@ -329,6 +342,10 @@ def create_api_app(
 
     fast_api_app_kwargs = fast_api_app_kwargs or {}
     api_app = FastAPI(title=API_TITLE, **fast_api_app_kwargs)
+
+    if logfire:
+        logfire.instrument_fastapi(api_app)  # pyright: ignore
+
     api_app.add_middleware(GZipMiddleware)
 
     @api_app.get(health_check_path, tags=["Root"])

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/server/api/workers.py

@@ -14,6 +14,7 @@ from fastapi import (
     Path,
     status,
 )
+from packaging.version import Version
 from sqlalchemy.ext.asyncio import AsyncSession
 
 import prefect.server.api.dependencies as dependencies
@@ -157,6 +158,9 @@ class WorkerLookups:
 async def create_work_pool(
     work_pool: schemas.actions.WorkPoolCreate,
     db: PrefectDBInterface = Depends(provide_database_interface),
+    prefect_client_version: Optional[str] = Depends(
+        dependencies.get_prefect_client_version
+    ),
 ) -> schemas.core.WorkPool:
     """
     Creates a new work pool. If a work pool with the same
@@ -186,7 +190,14 @@ async def create_work_pool(
                 work_pool=model,
             )
 
-            return schemas.core.WorkPool.model_validate(model, from_attributes=True)
+            ret = schemas.core.WorkPool.model_validate(model, from_attributes=True)
+            if prefect_client_version and Version(prefect_client_version) <= Version(
+                "3.3.7"
+            ):
+                # Client versions 3.3.7 and below do not support the default_result_storage_block_id field and will error
+                # when receiving it.
+                del ret.storage_configuration.default_result_storage_block_id
+            return ret
 
     except sa.exc.IntegrityError:
         raise HTTPException(
@@ -200,6 +211,9 @@ async def read_work_pool(
     work_pool_name: str = Path(..., description="The work pool name", alias="name"),
     worker_lookups: WorkerLookups = Depends(WorkerLookups),
     db: PrefectDBInterface = Depends(provide_database_interface),
+    prefect_client_version: Optional[str] = Depends(
+        dependencies.get_prefect_client_version
+    ),
 ) -> schemas.core.WorkPool:
     """
     Read a work pool by name
@@ -212,7 +226,18 @@ async def read_work_pool(
         orm_work_pool = await models.workers.read_work_pool(
             session=session, work_pool_id=work_pool_id
         )
-        return schemas.core.WorkPool.model_validate(orm_work_pool, from_attributes=True)
+        work_pool = schemas.core.WorkPool.model_validate(
+            orm_work_pool, from_attributes=True
+        )
+
+        if prefect_client_version and Version(prefect_client_version) <= Version(
+            "3.3.7"
+        ):
+            # Client versions 3.3.7 and below do not support the default_result_storage_block_id field and will error
+            # when receiving it.
+            del work_pool.storage_configuration.default_result_storage_block_id
+
+        return work_pool
 
 
 @router.post("/filter")
@@ -220,8 +245,10 @@ async def read_work_pools(
     work_pools: Optional[schemas.filters.WorkPoolFilter] = None,
     limit: int = dependencies.LimitBody(),
     offset: int = Body(0, ge=0),
-    worker_lookups: WorkerLookups = Depends(WorkerLookups),
     db: PrefectDBInterface = Depends(provide_database_interface),
+    prefect_client_version: Optional[str] = Depends(
+        dependencies.get_prefect_client_version
+    ),
 ) -> List[schemas.core.WorkPool]:
     """
     Read multiple work pools
@@ -233,10 +260,18 @@ async def read_work_pools(
             offset=offset,
             limit=limit,
         )
-        return [
+        ret = [
             schemas.core.WorkPool.model_validate(w, from_attributes=True)
             for w in orm_work_pools
         ]
+        if prefect_client_version and Version(prefect_client_version) <= Version(
+            "3.3.7"
+        ):
+            # Client versions 3.3.7 and below do not support the default_result_storage_block_id field and will error
+            # when receiving it.
+            for work_pool in ret:
+                del work_pool.storage_configuration.default_result_storage_block_id
+        return ret
 
 
 @router.post("/count")

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/settings/base.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import inspect
 from functools import partial
-from typing import Any, Dict, Tuple, Type
+from typing import Any
 
 from pydantic import (
     AliasChoices,
@@ -32,12 +32,12 @@ class PrefectBaseSettings(BaseSettings):
     @classmethod
     def settings_customise_sources(
         cls,
-        settings_cls: Type[BaseSettings],
+        settings_cls: type[BaseSettings],
         init_settings: PydanticBaseSettingsSource,
         env_settings: PydanticBaseSettingsSource,
         dotenv_settings: PydanticBaseSettingsSource,
         file_secret_settings: PydanticBaseSettingsSource,
-    ) -> Tuple[PydanticBaseSettingsSource, ...]:
+    ) -> tuple[PydanticBaseSettingsSource, ...]:
         """
         Define an order for Prefect settings sources.
 
@@ -93,9 +93,9 @@ class PrefectBaseSettings(BaseSettings):
         exclude_unset: bool = False,
         include_secrets: bool = True,
         include_aliases: bool = False,
-    ) -> Dict[str, str]:
+    ) -> dict[str, str]:
         """Convert the settings object to a dictionary of environment variables."""
-        env: Dict[str, Any] = self.model_dump(
+        env: dict[str, Any] = self.model_dump(
             exclude_unset=exclude_unset,
             mode="json",
             context={"include_secrets": include_secrets},
@@ -192,7 +192,7 @@ class PrefectSettingsConfigDict(SettingsConfigDict, total=False):
 
 
 def _add_environment_variables(
-    schema: Dict[str, Any], model: Type[PrefectBaseSettings]
+    schema: dict[str, Any], model: type[PrefectBaseSettings]
 ) -> None:
     for property in schema["properties"]:
         env_vars: list[str] = []
@@ -212,7 +212,7 @@ def _add_environment_variables(
 
 
 def build_settings_config(
-    path: Tuple[str, ...] = tuple(), frozen: bool = False
+    path: tuple[str, ...] = tuple(), frozen: bool = False
 ) -> PrefectSettingsConfigDict:
     env_prefix = f"PREFECT_{'_'.join(path).upper()}_" if path else "PREFECT_"
     return PrefectSettingsConfigDict(

{prefect_client-3.3.8.dev3 → prefect_client-3.4.0}/src/prefect/settings/models/experiments.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import ClassVar
 
 from pydantic import AliasChoices, AliasPath, Field