prefect 3.1.2.dev1__tar.gz → 3.1.2.dev2__tar.gz

{prefect-3.1.2.dev1/src/prefect.egg-info → prefect-3.1.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect
-Version: 3.1.2.dev1
+Version: 3.1.2.dev2
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.

{prefect-3.1.2.dev1 → prefect-3.1.2.dev2}/src/prefect/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-08T19:20:50-0600",
+ "date": "2024-11-11T17:06:50-0500",
  "dirty": false,
  "error": null,
- "full-revisionid": "ae50f95850ecb2510d8e0573d3ef6dc2266db474",
- "version": "3.1.2.dev1"
+ "full-revisionid": "98592bd40e9457718248345f21a5463bf9eab689",
+ "version": "3.1.2.dev2"
 }
 '''  # END VERSION_JSON
 

{prefect-3.1.2.dev1 → prefect-3.1.2.dev2}/src/prefect/client/orchestration.py

@@ -2613,7 +2613,7 @@ class PrefectClient:
             "heartbeat_interval_seconds": heartbeat_interval_seconds,
         }
         if worker_metadata:
-            params["worker_metadata"] = worker_metadata.model_dump(mode="json")
+            params["metadata"] = worker_metadata.model_dump(mode="json")
         if get_worker_id:
             params["return_id"] = get_worker_id
 

{prefect-3.1.2.dev1 → prefect-3.1.2.dev2}/src/prefect/server/api/variables.py

@@ -5,6 +5,7 @@ Routes for interacting with variable objects
 from typing import List, Optional
 from uuid import UUID
 
+import sqlalchemy as sa
 from fastapi import Body, Depends, HTTPException, Path, status
 from sqlalchemy.ext.asyncio import AsyncSession
 
@@ -50,9 +51,15 @@ async def create_variable(
     db: PrefectDBInterface = Depends(provide_database_interface),
 ) -> core.Variable:
     async with db.session_context(begin_transaction=True) as session:
-        model = await models.variables.create_variable(
-            session=session, variable=variable
-        )
+        try:
+            model = await models.variables.create_variable(
+                session=session, variable=variable
+            )
+        except sa.exc.IntegrityError:
+            raise HTTPException(
+                status_code=409,
+                detail=f"A variable with the name {variable.name!r} already exists.",
+            )
 
     return core.Variable.model_validate(model, from_attributes=True)
 

{prefect-3.1.2.dev1 → prefect-3.1.2.dev2}/src/prefect/utilities/urls.py

@@ -2,7 +2,8 @@ import inspect
 import ipaddress
 import socket
 import urllib.parse
-from typing import TYPE_CHECKING, Any, Literal, Optional, Union
+from string import Formatter
+from typing import TYPE_CHECKING, Any, Dict, Literal, Optional, Union
 from urllib.parse import urlparse
 from uuid import UUID
 
@@ -22,7 +23,6 @@ logger = get_logger("utilities.urls")
 
 # The following objects are excluded from UI URL generation because we lack a
 # directly-addressable URL:
-#   worker
 #   artifact
 #   variable
 #   saved-search
@@ -38,6 +38,7 @@ UI_URL_FORMATS = {
     "deployment": "deployments/deployment/{obj_id}",
     "automation": "automations/automation/{obj_id}",
     "received-event": "events/event/{occurred}/{obj_id}",
+    "worker": "work-pools/work-pool/{work_pool_name}/worker/{obj_id}",
 }
 
 # The following objects are excluded from API URL generation because we lack a
@@ -134,6 +135,7 @@ def url_for(
     obj_id: Optional[Union[str, UUID]] = None,
     url_type: URLType = "ui",
     default_base_url: Optional[str] = None,
+    **additional_format_kwargs: Optional[Dict[str, Any]],
 ) -> Optional[str]:
     """
     Returns the URL for a Prefect object.
@@ -149,6 +151,8 @@ def url_for(
             Whether to return the URL for the UI (default) or API.
         default_base_url (str, optional):
             The default base URL to use if no URL is configured.
+        additional_format_kwargs (Dict[str, Any], optional):
+            Additional keyword arguments to pass to the URL format.
 
     Returns:
         Optional[str]: The URL for the given object or None if the object is not supported.
@@ -246,7 +250,18 @@ def url_for(
             occurred=obj.occurred.strftime("%Y-%m-%d"), obj_id=obj_id
         )
     else:
-        url = url_format.format(obj_id=obj_id)
+        obj_keys = [
+            fname
+            for _, fname, _, _ in Formatter().parse(url_format)
+            if fname is not None and fname != "obj_id"
+        ]
+
+        if not all(key in additional_format_kwargs for key in obj_keys):
+            raise ValueError(
+                f"Unable to generate URL for {name} because the following keys are missing: {', '.join(obj_keys)}"
+            )
+
+        url = url_format.format(obj_id=obj_id, **additional_format_kwargs)
 
     if not base_url.endswith("/"):
         base_url += "/"

{prefect-3.1.2.dev1 → prefect-3.1.2.dev2}/src/prefect/workers/base.py

@@ -878,12 +878,18 @@ class BaseWorker(abc.ABC):
                     get_current_settings().experiments.worker_logging_to_api_enabled
                     and self.backend_id
                 ):
-                    worker_path = f"worker/{self.backend_id}"
-                    base_url = url_for("work-pool", self._work_pool.id)
+                    try:
+                        worker_url = url_for(
+                            "worker",
+                            obj_id=self.backend_id,
+                            work_pool_name=self._work_pool_name,
+                        )
 
-                    run_logger.info(
-                        f"Running on worker id: {self.backend_id}. See worker logs here: {base_url}/{worker_path}"
-                    )
+                        run_logger.info(
+                            f"Running on worker id: {self.backend_id}. See worker logs here: {worker_url}"
+                        )
+                    except ValueError as ve:
+                        run_logger.warning(f"Failed to generate worker URL: {ve}")
 
                 self._submitting_flow_run_ids.add(flow_run.id)
                 self._runs_task_group.start_soon(

{prefect-3.1.2.dev1 → prefect-3.1.2.dev2/src/prefect.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect
-Version: 3.1.2.dev1
+Version: 3.1.2.dev2
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.