prefect-client 3.1.3__py3-none-any.whl → 3.1.5__py3-none-any.whl

prefect/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-19T15:25:34-0600",
+ "date": "2024-12-02T18:57:11-0600",
  "dirty": true,
  "error": null,
- "full-revisionid": "39b6028cea9f2b0437546ba13cc08bb3bf6d94a4",
- "version": "3.1.3"
+ "full-revisionid": "3c06654ec8be4f9e9bf5c304814f163b7727d28e",
+ "version": "3.1.5"
 }
 '''  # END VERSION_JSON
 

prefect/client/cloud.py

@@ -13,7 +13,6 @@ from prefect.client.base import PrefectHttpxAsyncClient
 from prefect.client.schemas.objects import (
     IPAllowlist,
     IPAllowlistMyAccessResponse,
-    KeyValueLabels,
     Workspace,
 )
 from prefect.exceptions import ObjectNotFound, PrefectException
@@ -23,6 +22,7 @@ from prefect.settings import (
     PREFECT_CLOUD_API_URL,
     PREFECT_TESTING_UNIT_TEST_MODE,
 )
+from prefect.types import KeyValueLabels
 
 PARSE_API_URL_REGEX = re.compile(r"accounts/(.{36})/workspaces/(.{36})")
 

prefect/client/orchestration.py

@@ -1,5 +1,6 @@
 import asyncio
 import datetime
+import ssl
 import warnings
 from contextlib import AsyncExitStack
 from typing import (
@@ -283,12 +284,18 @@ class PrefectClient:
         httpx_settings.setdefault("headers", {})
 
         if PREFECT_API_TLS_INSECURE_SKIP_VERIFY:
-            httpx_settings.setdefault("verify", False)
+            # Create an unverified context for insecure connections
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
+            httpx_settings.setdefault("verify", ctx)
         else:
             cert_file = PREFECT_API_SSL_CERT_FILE.value()
             if not cert_file:
                 cert_file = certifi.where()
-            httpx_settings.setdefault("verify", cert_file)
+            # Create a verified context with the certificate file
+            ctx = ssl.create_default_context(cafile=cert_file)
+            httpx_settings.setdefault("verify", ctx)
 
         if api_version is None:
             api_version = SERVER_API_VERSION
@@ -2209,6 +2216,13 @@ class PrefectClient:
             response.json()
         )
 
+    async def set_flow_run_name(self, flow_run_id: UUID, name: str):
+        flow_run_data = FlowRunUpdate(name=name)
+        return await self._client.patch(
+            f"/flow_runs/{flow_run_id}",
+            json=flow_run_data.model_dump(mode="json", exclude_unset=True),
+        )
+
     async def set_task_run_name(self, task_run_id: UUID, name: str):
         task_run_data = TaskRunUpdate(name=name)
         return await self._client.patch(
@@ -3534,12 +3548,18 @@ class SyncPrefectClient:
         httpx_settings.setdefault("headers", {})
 
         if PREFECT_API_TLS_INSECURE_SKIP_VERIFY:
-            httpx_settings.setdefault("verify", False)
+            # Create an unverified context for insecure connections
+            ctx = ssl.create_default_context()
+            ctx.check_hostname = False
+            ctx.verify_mode = ssl.CERT_NONE
+            httpx_settings.setdefault("verify", ctx)
         else:
             cert_file = PREFECT_API_SSL_CERT_FILE.value()
             if not cert_file:
                 cert_file = certifi.where()
-            httpx_settings.setdefault("verify", cert_file)
+            # Create a verified context with the certificate file
+            ctx = ssl.create_default_context(cafile=cert_file)
+            httpx_settings.setdefault("verify", ctx)
 
         if api_version is None:
             api_version = SERVER_API_VERSION
@@ -3925,13 +3945,13 @@ class SyncPrefectClient:
     def read_flow_runs(
         self,
         *,
-        flow_filter: FlowFilter = None,
-        flow_run_filter: FlowRunFilter = None,
-        task_run_filter: TaskRunFilter = None,
-        deployment_filter: DeploymentFilter = None,
-        work_pool_filter: WorkPoolFilter = None,
-        work_queue_filter: WorkQueueFilter = None,
-        sort: FlowRunSort = None,
+        flow_filter: Optional[FlowFilter] = None,
+        flow_run_filter: Optional[FlowRunFilter] = None,
+        task_run_filter: Optional[TaskRunFilter] = None,
+        deployment_filter: Optional[DeploymentFilter] = None,
+        work_pool_filter: Optional[WorkPoolFilter] = None,
+        work_queue_filter: Optional[WorkQueueFilter] = None,
+        sort: Optional[FlowRunSort] = None,
         limit: Optional[int] = None,
         offset: int = 0,
     ) -> List[FlowRun]:
@@ -4019,7 +4039,7 @@ class SyncPrefectClient:
         return OrchestrationResult.model_validate(response.json())
 
     def set_flow_run_name(self, flow_run_id: UUID, name: str):
-        flow_run_data = TaskRunUpdate(name=name)
+        flow_run_data = FlowRunUpdate(name=name)
         return self._client.patch(
             f"/flow_runs/{flow_run_id}",
             json=flow_run_data.model_dump(mode="json", exclude_unset=True),

prefect/client/schemas/actions.py

@@ -27,6 +27,7 @@ from prefect.client.schemas.schedules import SCHEDULE_TYPES
 from prefect.settings import PREFECT_DEPLOYMENT_SCHEDULE_MAX_SCHEDULED_RUNS
 from prefect.types import (
     MAX_VARIABLE_NAME_LENGTH,
+    KeyValueLabelsField,
     Name,
     NonEmptyishName,
     NonNegativeFloat,
@@ -66,6 +67,7 @@ class FlowCreate(ActionBaseModel):
         description="A list of flow tags",
         examples=[["tag-1", "tag-2"]],
     )
+    labels: KeyValueLabelsField
 
 
 class FlowUpdate(ActionBaseModel):
@@ -159,6 +161,7 @@ class DeploymentCreate(ActionBaseModel):
         description="Parameters for flow runs scheduled by the deployment.",
     )
     tags: List[str] = Field(default_factory=list)
+    labels: KeyValueLabelsField
     pull_steps: Optional[List[dict]] = Field(None)
 
     work_queue_name: Optional[str] = Field(None)
@@ -315,6 +318,7 @@ class TaskRunCreate(ActionBaseModel):
         default_factory=objects.TaskRunPolicy,
     )
     tags: List[str] = Field(default_factory=list)
+    labels: KeyValueLabelsField
     task_inputs: Dict[
         str,
         List[
@@ -357,6 +361,7 @@ class FlowRunCreate(ActionBaseModel):
         default_factory=objects.FlowRunPolicy
     )
     tags: List[str] = Field(default_factory=list)
+    labels: KeyValueLabelsField
     idempotency_key: Optional[str] = Field(None)
 
 
@@ -697,23 +702,23 @@ class FlowRunNotificationPolicyCreate(ActionBaseModel):
 class FlowRunNotificationPolicyUpdate(ActionBaseModel):
     """Data used by the Prefect REST API to update a flow run notification policy."""
 
-    is_active: Optional[bool] = Field(None)
-    state_names: Optional[List[str]] = Field(None)
-    tags: Optional[List[str]] = Field(None)
-    block_document_id: Optional[UUID] = Field(None)
-    message_template: Optional[str] = Field(None)
+    is_active: Optional[bool] = Field(default=None)
+    state_names: Optional[List[str]] = Field(default=None)
+    tags: Optional[List[str]] = Field(default=None)
+    block_document_id: Optional[UUID] = Field(default=None)
+    message_template: Optional[str] = Field(default=None)
 
 
 class ArtifactCreate(ActionBaseModel):
     """Data used by the Prefect REST API to create an artifact."""
 
-    key: Optional[str] = Field(None)
-    type: Optional[str] = Field(None)
-    description: Optional[str] = Field(None)
-    data: Optional[Union[Dict[str, Any], Any]] = Field(None)
-    metadata_: Optional[Dict[str, str]] = Field(None)
-    flow_run_id: Optional[UUID] = Field(None)
-    task_run_id: Optional[UUID] = Field(None)
+    key: Optional[str] = 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)
+    metadata_: Optional[Dict[str, str]] = Field(default=None)
+    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)
 

prefect/client/schemas/filters.py

@@ -129,6 +129,11 @@ class FlowRunFilterTags(PrefectBaseModel, OperatorMixin):
             " superset of the list"
         ),
     )
+    any_: Optional[List[str]] = Field(
+        default=None,
+        examples=[["tag-1", "tag-2"]],
+        description="A list of tags to include",
+    )
     is_null_: Optional[bool] = Field(
         default=None, description="If true, only include flow runs without tags"
     )

prefect/client/schemas/objects.py

@@ -23,9 +23,6 @@ from pydantic import (
     HttpUrl,
     IPvAnyNetwork,
     SerializationInfo,
-    StrictBool,
-    StrictFloat,
-    StrictInt,
     Tag,
     field_validator,
     model_serializer,
@@ -56,6 +53,7 @@ from prefect.client.schemas.schedules import SCHEDULE_TYPES
 from prefect.settings import PREFECT_CLOUD_API_URL, PREFECT_CLOUD_UI_URL
 from prefect.types import (
     MAX_VARIABLE_NAME_LENGTH,
+    KeyValueLabelsField,
     Name,
     NonNegativeInteger,
     PositiveInteger,
@@ -71,8 +69,6 @@ if TYPE_CHECKING:
 
 R = TypeVar("R", default=Any)
 
-KeyValueLabels = dict[str, Union[StrictBool, StrictInt, StrictFloat, str]]
-
 
 DEFAULT_BLOCK_SCHEMA_VERSION = "non-versioned"
 DEFAULT_AGENT_WORK_POOL_NAME = "default-agent-pool"
@@ -563,11 +559,7 @@ class FlowRun(ObjectBaseModel):
         description="A list of tags on the flow run",
         examples=[["tag-1", "tag-2"]],
     )
-    labels: KeyValueLabels = Field(
-        default_factory=dict,
-        description="Prefect Cloud: A dictionary of key-value labels. Values can be strings, numbers, or booleans.",
-        examples=[{"key": "value1", "key2": 42}],
-    )
+    labels: KeyValueLabelsField
     parent_task_run_id: Optional[UUID] = Field(
         default=None,
         description=(
@@ -804,6 +796,7 @@ class TaskRun(ObjectBaseModel):
         description="A list of tags for the task run.",
         examples=[["tag-1", "tag-2"]],
     )
+    labels: KeyValueLabelsField
     state_id: Optional[UUID] = Field(
         default=None, description="The id of the current task run state."
     )
@@ -1059,6 +1052,7 @@ class Flow(ObjectBaseModel):
         description="A list of flow tags",
         examples=[["tag-1", "tag-2"]],
     )
+    labels: KeyValueLabelsField
 
 
 class DeploymentSchedule(ObjectBaseModel):
@@ -1117,6 +1111,7 @@ class Deployment(ObjectBaseModel):
         description="A list of tags for the deployment",
         examples=[["tag-1", "tag-2"]],
     )
+    labels: KeyValueLabelsField
     work_queue_name: Optional[str] = Field(
         default=None,
         description=(
@@ -1188,27 +1183,6 @@ class ConcurrencyLimit(ObjectBaseModel):
     )
 
 
-class BlockSchema(ObjectBaseModel):
-    """An ORM representation of a block schema."""
-
-    checksum: str = Field(default=..., description="The block schema's unique checksum")
-    fields: Dict[str, Any] = Field(
-        default_factory=dict, description="The block schema's field schema"
-    )
-    block_type_id: Optional[UUID] = Field(default=..., description="A block type ID")
-    block_type: Optional[BlockType] = Field(
-        default=None, description="The associated block type"
-    )
-    capabilities: List[str] = Field(
-        default_factory=list,
-        description="A list of Block capabilities",
-    )
-    version: str = Field(
-        default=DEFAULT_BLOCK_SCHEMA_VERSION,
-        description="Human readable identifier for the block schema",
-    )
-
-
 class BlockSchemaReference(ObjectBaseModel):
     """An ORM representation of a block schema reference."""
 

prefect/client/schemas/responses.py

@@ -9,6 +9,7 @@ from typing_extensions import Literal
 import prefect.client.schemas.objects as objects
 from prefect._internal.schemas.bases import ObjectBaseModel, PrefectBaseModel
 from prefect._internal.schemas.fields import CreatedBy, UpdatedBy
+from prefect.types import KeyValueLabelsField
 from prefect.utilities.collections import AutoEnum
 from prefect.utilities.names import generate_slug
 
@@ -201,6 +202,7 @@ class FlowRunResponse(ObjectBaseModel):
         description="A list of tags on the flow run",
         examples=[["tag-1", "tag-2"]],
     )
+    labels: KeyValueLabelsField
     parent_task_run_id: Optional[UUID] = Field(
         default=None,
         description=(
@@ -353,6 +355,7 @@ class DeploymentResponse(ObjectBaseModel):
         description="A list of tags for the deployment",
         examples=[["tag-1", "tag-2"]],
     )
+    labels: KeyValueLabelsField
     work_queue_name: Optional[str] = Field(
         default=None,
         description=(

prefect/concurrency/services.py

@@ -83,6 +83,9 @@ class ConcurrencySlotAcquisitionService(QueueService):
                         if max_retries is not None and max_retries <= 0:
                             raise exc
                         retry_after = float(exc.response.headers["Retry-After"])
+                        logger.debug(
+                            f"Unable to acquire concurrency slot. Retrying in {retry_after} second(s)."
+                        )
                         await asyncio.sleep(retry_after)
                         if max_retries is not None:
                             max_retries -= 1

prefect/deployments/runner.py

@@ -77,6 +77,7 @@ from prefect.settings import (
     PREFECT_DEFAULT_WORK_POOL_NAME,
     PREFECT_UI_URL,
 )
+from prefect.types import ListOfNonEmptyStrings
 from prefect.types.entrypoint import EntrypointType
 from prefect.utilities.asyncutils import sync_compatible
 from prefect.utilities.callables import ParameterSchema, parameter_schema
@@ -140,7 +141,7 @@ class RunnerDeployment(BaseModel):
     version: Optional[str] = Field(
         default=None, description="An optional version for the deployment."
     )
-    tags: List[str] = Field(
+    tags: ListOfNonEmptyStrings = Field(
         default_factory=list,
         description="One of more tags to apply to this deployment.",
     )