prefect-client 3.4.1.dev1__tar.gz → 3.4.1.dev3__tar.gz

{prefect_client-3.4.1.dev1 → prefect_client-3.4.1.dev3}/PKG-INFO

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

prefect_client-3.4.1.dev3/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.4.1.dev3"
+__build_date__ = "2025-05-06 08:08:45.922388+00:00"
+__git_commit__ = "3232581c69f5c912aa32787ca327ae549bc6eac7"
+__dirty__ = False

{prefect_client-3.4.1.dev1 → prefect_client-3.4.1.dev3}/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.4.1.dev1 → prefect_client-3.4.1.dev3}/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

{prefect_client-3.4.1.dev1 → prefect_client-3.4.1.dev3}/src/prefect/tasks.py

@@ -1551,7 +1551,7 @@ class Task(Generic[P, R]):
             validated_state=task_run.state,
         )
 
-        if task_run_url := url_for(task_run):
+        if get_current_settings().ui_url and (task_run_url := url_for(task_run)):
             logger.info(
                 f"Created task run {task_run.name!r}. View it in the UI at {task_run_url!r}"
             )

prefect_client-3.4.1.dev1/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.4.1.dev1"
-__build_date__ = "2025-05-04 08:07:31.383855+00:00"
-__git_commit__ = "378fc4f6b72aace32343264ee6cea198d949ba6a"
-__dirty__ = False