prefect-client 3.4.1.dev1__py3-none-any.whl → 3.4.1.dev2__py3-none-any.whl

prefect/_build_info.py

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

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/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/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.dist-info → prefect_client-3.4.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prefect-client
-Version: 3.4.1.dev1
+Version: 3.4.1.dev2
 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.dev1.dist-info → prefect_client-3.4.1.dev2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 prefect/.prefectignore,sha256=awSprvKT0vI8a64mEOLrMxhxqcO-b0ERQeYpA2rNKVQ,390
 prefect/__init__.py,sha256=iCdcC5ZmeewikCdnPEP6YBAjPNV5dvfxpYCTpw30Hkw,3685
 prefect/__main__.py,sha256=WFjw3kaYJY6pOTA7WDOgqjsz8zUEUZHCcj3P5wyVa-g,66
-prefect/_build_info.py,sha256=S2FR6y1xQ3ZKOstDGJZLDW2Sml9MbnhZ9zMjp4hX7qw,185
+prefect/_build_info.py,sha256=qHCpV6KpRqnsAiZVjqF9RvA2dX5er6gG6lSsXYjxJw4,185
 prefect/_result_records.py,sha256=S6QmsODkehGVSzbMm6ig022PYbI6gNKz671p_8kBYx4,7789
 prefect/_versioning.py,sha256=YqR5cxXrY4P6LM1Pmhd8iMo7v_G2KJpGNdsf4EvDFQ0,14132
 prefect/_waiters.py,sha256=Ia2ITaXdHzevtyWIgJoOg95lrEXQqNEOquHvw3T33UQ,9026
@@ -28,7 +28,7 @@ prefect/task_engine.py,sha256=j0rr8IyBinJmKPD-486RYWKZakhifkEE9ppPCJ9Es-U,62463
 prefect/task_runners.py,sha256=vzJ1kiW1z90Fkkg21QNhPwjfLoDy6rVsUAToXqb6FUE,16206
 prefect/task_runs.py,sha256=7LIzfo3fondCyEUpU05sYFN5IfpZigBDXrhG5yc-8t0,9039
 prefect/task_worker.py,sha256=gMj_rl4EjTrnJ5YSOXinC6y-7KSK7fRQt_UYbZbrrV8,17879
-prefect/tasks.py,sha256=EpMw5O1B9pAFVraC0KzytMOKi8iy7ZYnKWRs7WtvogU,74742
+prefect/tasks.py,sha256=DODF_1xPDQVvj_paJDWm43RS46Jdx9_7b2huqT_QyiM,74778
 prefect/transactions.py,sha256=uIoPNudzJzH6NrMJhrgr5lyh6JxOJQqT1GvrXt69yNw,26068
 prefect/variables.py,sha256=dCK3vX7TbkqXZhnNT_v7rcGh3ISRqoR6pJVLpoll3Js,8342
 prefect/_experimental/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -82,9 +82,9 @@ prefect/client/base.py,sha256=7VAMyoy8KtmtI-H8KYsI16_uw9TlrXSrcxChFuMp65Q,26269
 prefect/client/cloud.py,sha256=jnFgg0osMVDGbLjdWkDX3rQg_0pI_zvfSlU480XCWGQ,6523
 prefect/client/collections.py,sha256=t9XkVU_onQMZ871L21F1oZnAiPSQeeVfd_MuDEBS3iM,1050
 prefect/client/constants.py,sha256=Z_GG8KF70vbbXxpJuqW5pLnwzujTVeHbcYYRikNmGH0,29
-prefect/client/subscriptions.py,sha256=b2gjoWjrTjshnv_s6zlPN3t0JIe2EKAdMqEzj3-kc6w,3879
+prefect/client/subscriptions.py,sha256=PTYi1Pp7rX-aGdcxZkxRBZkZnpzBt1P17APsm05EDR8,4376
 prefect/client/utilities.py,sha256=UEJD6nwYg2mD8-GSmru-E2ofXaBlmSFZ2-8T_5rIK6c,3472
-prefect/client/orchestration/__init__.py,sha256=O6tItUwU1NBycVPf0PoYVT8bF8gfrVoe9eaSmTQTNFU,55485
+prefect/client/orchestration/__init__.py,sha256=DPbazZvQDgoSZipuNk4z_AILgJbM6zBld-1OsVH55ME,55831
 prefect/client/orchestration/base.py,sha256=HM6ryHBZSzuHoCFQM9u5qR5k1dN9Bbr_ah6z1UPNbZQ,1542
 prefect/client/orchestration/routes.py,sha256=_-HC-EmgMhsYdmGwZTxIXlINaVzYuX7RZAvzjHbVp-4,4266
 prefect/client/orchestration/_artifacts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -319,7 +319,7 @@ prefect/workers/cloud.py,sha256=dPvG1jDGD5HSH7aM2utwtk6RaJ9qg13XjkA0lAIgQmY,287
 prefect/workers/process.py,sha256=Yi5D0U5AQ51wHT86GdwtImXSefe0gJf3LGq4r4z9zwM,11090
 prefect/workers/server.py,sha256=2pmVeJZiVbEK02SO6BEZaBIvHMsn6G8LzjW8BXyiTtk,1952
 prefect/workers/utilities.py,sha256=VfPfAlGtTuDj0-Kb8WlMgAuOfgXCdrGAnKMapPSBrwc,2483
-prefect_client-3.4.1.dev1.dist-info/METADATA,sha256=IFwUWcPPlE7Z-2A_Xn2tZef9WEqSXbfjlRRx0TQnbfI,7471
-prefect_client-3.4.1.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-prefect_client-3.4.1.dev1.dist-info/licenses/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
-prefect_client-3.4.1.dev1.dist-info/RECORD,,
+prefect_client-3.4.1.dev2.dist-info/METADATA,sha256=SrQm0IQPihKCyz3wiIcpgc7slcilDL4wdt9-gV9G2xk,7471
+prefect_client-3.4.1.dev2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+prefect_client-3.4.1.dev2.dist-info/licenses/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
+prefect_client-3.4.1.dev2.dist-info/RECORD,,