prefect 3.2.10.dev3__tar.gz → 3.2.10.dev4__tar.gz

{prefect-3.2.10.dev3 → prefect-3.2.10.dev4}/PKG-INFO

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

prefect-3.2.10.dev4/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.2.10.dev4"
+__build_date__ = "2025-03-05 08:09:00.166609+00:00"
+__git_commit__ = "99d94359bf5ea0f2f8a61e22c49fb25f8d7c7e33"
+__dirty__ = False

{prefect-3.2.10.dev3 → prefect-3.2.10.dev4}/src/prefect/deployments/flow_runs.py

@@ -3,6 +3,8 @@ from typing import TYPE_CHECKING, Any, Iterable, Optional, Union
 from uuid import UUID
 
 import anyio
+from opentelemetry import trace
+from opentelemetry.instrumentation.utils import is_instrumentation_enabled
 
 import prefect
 from prefect._result_records import ResultRecordMetadata
@@ -12,9 +14,7 @@ from prefect.context import FlowRunContext, TaskRunContext
 from prefect.logging import get_logger
 from prefect.states import Pending, Scheduled
 from prefect.tasks import Task
-from prefect.telemetry.run_telemetry import (
-    LABELS_TRACEPARENT_KEY,
-)
+from prefect.telemetry.run_telemetry import LABELS_TRACEPARENT_KEY, RunTelemetry
 from prefect.types._datetime import now
 from prefect.utilities.asyncutils import sync_compatible
 from prefect.utilities.slugify import slugify
@@ -164,6 +164,8 @@ async def run_deployment(
 
     if flow_run_ctx and flow_run_ctx.flow_run:
         traceparent = flow_run_ctx.flow_run.labels.get(LABELS_TRACEPARENT_KEY)
+    elif is_instrumentation_enabled():
+        traceparent = RunTelemetry.traceparent_from_span(span=trace.get_current_span())
     else:
         traceparent = None
 

{prefect-3.2.10.dev3 → prefect-3.2.10.dev4}/src/prefect/events/clients.py

@@ -21,6 +21,7 @@ from urllib.parse import urlparse
 from urllib.request import proxy_bypass
 from uuid import UUID
 
+import certifi
 import orjson
 from cachetools import TTLCache
 from prometheus_client import Counter
@@ -38,6 +39,7 @@ from prefect.events import Event
 from prefect.logging import get_logger
 from prefect.settings import (
     PREFECT_API_KEY,
+    PREFECT_API_SSL_CERT_FILE,
     PREFECT_API_TLS_INSECURE_SKIP_VERIFY,
     PREFECT_API_URL,
     PREFECT_CLOUD_API_URL,
@@ -123,12 +125,19 @@ class WebsocketProxyConnect(connect):
         self._host = host
         self._port = port
 
-        if PREFECT_API_TLS_INSECURE_SKIP_VERIFY:
+        if PREFECT_API_TLS_INSECURE_SKIP_VERIFY and u.scheme == "wss":
             # Create an unverified context for insecure connections
             ctx = ssl.create_default_context()
             ctx.check_hostname = False
             ctx.verify_mode = ssl.CERT_NONE
             self._kwargs.setdefault("ssl", ctx)
+        elif u.scheme == "wss":
+            cert_file = PREFECT_API_SSL_CERT_FILE.value()
+            if not cert_file:
+                cert_file = certifi.where()
+            # Create a verified context with the certificate file
+            ctx = ssl.create_default_context(cafile=cert_file)
+            self._kwargs.setdefault("ssl", ctx)
 
     async def _proxy_connect(self: Self) -> ClientConnection:
         if self._proxy:

{prefect-3.2.10.dev3 → prefect-3.2.10.dev4}/src/prefect/runner/storage.py

@@ -141,7 +141,8 @@ class GitRepository:
         self._credentials = credentials
         self._include_submodules = include_submodules
         repo_name = urlparse(url).path.split("/")[-1].replace(".git", "")
-        default_name = f"{repo_name}-{branch}" if branch else repo_name
+        safe_branch = branch.replace("/", "-") if branch else None
+        default_name = f"{repo_name}-{safe_branch}" if safe_branch else repo_name
         self._name = name or default_name
         self._logger = get_logger(f"runner.storage.git-repository.{self._name}")
         self._storage_base_path = Path.cwd()

{prefect-3.2.10.dev3 → prefect-3.2.10.dev4}/src/prefect/telemetry/run_telemetry.py

@@ -132,7 +132,7 @@ class RunTelemetry:
             },
         )
 
-        if traceparent := self._traceparent_from_span(self.span):
+        if traceparent := RunTelemetry.traceparent_from_span(self.span):
             run.labels[LABELS_TRACEPARENT_KEY] = traceparent
 
         return traceparent, self.span
@@ -150,7 +150,8 @@ class RunTelemetry:
         carrier = {TRACEPARENT_KEY: traceparent}
         return propagate.extract(carrier)
 
-    def _traceparent_from_span(self, span: Span) -> str | None:
+    @staticmethod
+    def traceparent_from_span(span: Span) -> str | None:
         carrier: dict[str, Any] = {}
         propagate.inject(carrier, context=trace.set_span_in_context(span))
         return carrier.get(TRACEPARENT_KEY)

{prefect-3.2.10.dev3 → prefect-3.2.10.dev4}/src/prefect/workers/base.py

@@ -933,40 +933,32 @@ class BaseWorker(abc.ABC, Generic[C, V, R]):
             )
         )
 
-    async def _check_flow_run(self, flow_run: "FlowRun") -> None:
+    async def _submit_run(self, flow_run: "FlowRun") -> None:
         """
-        Performs a check on a submitted flow run to warn the user if the flow run
-        was created from a deployment with a storage block.
+        Submits a given flow run for execution by the worker.
         """
+        run_logger = self.get_flow_run_logger(flow_run)
+
         if flow_run.deployment_id:
             assert self._client and self._client._started, (
                 "Client must be started to check flow run deployment."
             )
-            deployment = await self._client.read_deployment(flow_run.deployment_id)
-            if deployment.storage_document_id:
-                raise ValueError(
-                    f"Flow run {flow_run.id!r} was created from deployment"
-                    f" {deployment.name!r} which is configured with a storage block."
-                    " Please use an agent to execute this flow run."
-                )
-
-    async def _submit_run(self, flow_run: "FlowRun") -> None:
-        """
-        Submits a given flow run for execution by the worker.
-        """
-        run_logger = self.get_flow_run_logger(flow_run)
 
         try:
-            await self._check_flow_run(flow_run)
-        except (ValueError, ObjectNotFound):
+            await self._client.read_deployment(flow_run.deployment_id)
+        except ObjectNotFound:
             self._logger.exception(
-                (
-                    "Flow run %s did not pass checks and will not be submitted for"
-                    " execution"
-                ),
-                flow_run.id,
+                f"Deployment {flow_run.deployment_id} no longer exists. "
+                f"Flow run {flow_run.id} will not be submitted for"
+                " execution"
             )
             self._submitting_flow_run_ids.remove(flow_run.id)
+            await self._mark_flow_run_as_cancelled(
+                flow_run,
+                state_updates=dict(
+                    message=f"Deployment {flow_run.deployment_id} no longer exists, cancelled run."
+                ),
+            )
             return
 
         ready_to_submit = await self._propose_pending_state(flow_run)

{prefect-3.2.10.dev3 → prefect-3.2.10.dev4}/src/prefect/workers/process.py

@@ -16,7 +16,9 @@ checkout out the [Prefect docs](/concepts/work-pools/).
 
 from __future__ import annotations
 
+import contextlib
 import os
+import tempfile
 import threading
 from functools import partial
 from pathlib import Path
@@ -203,14 +205,20 @@ class ProcessWorker(
         configuration: ProcessJobConfiguration,
         task_status: Optional[anyio.abc.TaskStatus[int]] = None,
     ) -> ProcessWorkerResult:
-        process = await self._runner.execute_flow_run(
-            flow_run_id=flow_run.id,
-            command=configuration.command,
-            cwd=configuration.working_dir,
-            env=configuration.env,
-            stream_output=configuration.stream_output,
-            task_status=task_status,
+        working_dir_ctx = (
+            tempfile.TemporaryDirectory(suffix="prefect")
+            if not configuration.working_dir
+            else contextlib.nullcontext(configuration.working_dir)
         )
+        with working_dir_ctx as working_dir:
+            process = await self._runner.execute_flow_run(
+                flow_run_id=flow_run.id,
+                command=configuration.command,
+                cwd=working_dir,
+                env=configuration.env,
+                stream_output=configuration.stream_output,
+                task_status=task_status,
+            )
 
         if process is None or process.returncode is None:
             raise RuntimeError("Failed to start flow run process.")

prefect-3.2.10.dev3/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.2.10.dev3"
-__build_date__ = "2025-03-04 08:09:16.010983+00:00"
-__git_commit__ = "6973e47e57c2fd3442c8d4c49d2a21332583100a"
-__dirty__ = False