prefect-client 3.0.7__py3-none-any.whl → 3.0.9__py3-none-any.whl

prefect/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-10-09T17:55:58-0500",
+ "date": "2024-10-15T10:11:48-0400",
  "dirty": true,
  "error": null,
- "full-revisionid": "8fee9e1ef3f2b4f71adcf080bf9cb36db79c5f5a",
- "version": "3.0.7"
+ "full-revisionid": "fd8cef25431a01f5b6ff2f031c2d53b3094797cb",
+ "version": "3.0.9"
 }
 '''  # END VERSION_JSON
 

prefect/context.py

@@ -453,23 +453,6 @@ class SettingsContext(ContextModel):
     def __hash__(self) -> int:
         return hash(self.settings)
 
-    def __enter__(self):
-        """
-        Upon entrance, we ensure the home directory for the profile exists.
-        """
-        return_value = super().__enter__()
-
-        try:
-            prefect_home = self.settings.home
-            prefect_home.mkdir(mode=0o0700, exist_ok=True)
-        except OSError:
-            warnings.warn(
-                (f"Failed to create the Prefect home directory at {prefect_home}"),
-                stacklevel=2,
-            )
-
-        return return_value
-
     @classmethod
     def get(cls) -> "SettingsContext":
         # Return the global context instead of `None` if no context exists
@@ -567,9 +550,9 @@ def tags(*new_tags: str) -> Generator[Set[str], None, None]:
         {"a", "b", "c", "d", "e", "f"}
     """
     current_tags = TagsContext.get().current_tags
-    new_tags = current_tags.union(new_tags)
-    with TagsContext(current_tags=new_tags):
-        yield new_tags
+    _new_tags = current_tags.union(new_tags)
+    with TagsContext(current_tags=_new_tags):
+        yield _new_tags
 
 
 @contextmanager
@@ -659,7 +642,16 @@ def root_settings_context():
         )
         active_name = "ephemeral"
 
-    return SettingsContext(profile=profiles[active_name], settings=Settings())
+    if not (settings := Settings()).home.exists():
+        try:
+            settings.home.mkdir(mode=0o0700, exist_ok=True)
+        except OSError:
+            warnings.warn(
+                (f"Failed to create the Prefect home directory at {settings.home}"),
+                stacklevel=2,
+            )
+
+    return SettingsContext(profile=profiles[active_name], settings=settings)
 
     # Note the above context is exited and the global settings context is used by
     # an override in the `SettingsContext.get` method.

prefect/runner/runner.py

@@ -41,6 +41,7 @@ import subprocess
 import sys
 import tempfile
 import threading
+from contextlib import AsyncExitStack
 from copy import deepcopy
 from functools import partial
 from pathlib import Path
@@ -185,6 +186,7 @@ class Runner:
         self.query_seconds = query_seconds or PREFECT_RUNNER_POLL_FREQUENCY.value()
         self._prefetch_seconds = prefetch_seconds
 
+        self._exit_stack = AsyncExitStack()
         self._limiter: Optional[anyio.CapacityLimiter] = None
         self._client = get_client()
         self._submitting_flow_run_ids = set()
@@ -398,38 +400,37 @@ class Runner:
         start_client_metrics_server()
 
         async with self as runner:
-            async with self._loops_task_group as tg:
-                for storage in self._storage_objs:
-                    if storage.pull_interval:
-                        tg.start_soon(
-                            partial(
-                                critical_service_loop,
-                                workload=storage.pull_code,
-                                interval=storage.pull_interval,
-                                run_once=run_once,
-                                jitter_range=0.3,
-                            )
+            for storage in self._storage_objs:
+                if storage.pull_interval:
+                    self._runs_task_group.start_soon(
+                        partial(
+                            critical_service_loop,
+                            workload=storage.pull_code,
+                            interval=storage.pull_interval,
+                            run_once=run_once,
+                            jitter_range=0.3,
                         )
-                    else:
-                        tg.start_soon(storage.pull_code)
-                tg.start_soon(
-                    partial(
-                        critical_service_loop,
-                        workload=runner._get_and_submit_flow_runs,
-                        interval=self.query_seconds,
-                        run_once=run_once,
-                        jitter_range=0.3,
                     )
+                else:
+                    self._runs_task_group.start_soon(storage.pull_code)
+            self._runs_task_group.start_soon(
+                partial(
+                    critical_service_loop,
+                    workload=runner._get_and_submit_flow_runs,
+                    interval=self.query_seconds,
+                    run_once=run_once,
+                    jitter_range=0.3,
                 )
-                tg.start_soon(
-                    partial(
-                        critical_service_loop,
-                        workload=runner._check_for_cancelled_flow_runs,
-                        interval=self.query_seconds * 2,
-                        run_once=run_once,
-                        jitter_range=0.3,
-                    )
+            )
+            self._runs_task_group.start_soon(
+                partial(
+                    critical_service_loop,
+                    workload=runner._check_for_cancelled_flow_runs,
+                    interval=self.query_seconds * 2,
+                    run_once=run_once,
+                    jitter_range=0.3,
                 )
+            )
 
     def execute_in_background(self, func, *args, **kwargs):
         """
@@ -1264,14 +1265,16 @@ class Runner:
         if not hasattr(self, "_loop") or not self._loop:
             self._loop = asyncio.get_event_loop()
 
+        await self._exit_stack.__aenter__()
+
+        await self._exit_stack.enter_async_context(self._client)
         if not hasattr(self, "_runs_task_group") or not self._runs_task_group:
             self._runs_task_group: anyio.abc.TaskGroup = anyio.create_task_group()
+        await self._exit_stack.enter_async_context(self._runs_task_group)
 
         if not hasattr(self, "_loops_task_group") or not self._loops_task_group:
             self._loops_task_group: anyio.abc.TaskGroup = anyio.create_task_group()
-
-        await self._client.__aenter__()
-        await self._runs_task_group.__aenter__()
+        await self._exit_stack.enter_async_context(self._loops_task_group)
 
         self.started = True
         return self
@@ -1283,11 +1286,9 @@ class Runner:
         self.started = False
         for scope in self._scheduled_task_scopes:
             scope.cancel()
-        if self._runs_task_group:
-            await self._runs_task_group.__aexit__(*exc_info)
-        if self._client:
-            await self._client.__aexit__(*exc_info)
+        await self._exit_stack.__aexit__(*exc_info)
         shutil.rmtree(str(self._tmp_dir))
+        del self._runs_task_group, self._loops_task_group
 
     def __repr__(self):
         return f"Runner(name={self.name!r})"

prefect/settings.py

@@ -10,7 +10,6 @@ After https://github.com/pydantic/pydantic/issues/9789 is resolved, we will be a
 for settings, at which point we will not need to use the "after" model_validator.
 """
 
-import inspect
 import os
 import re
 import sys
@@ -63,11 +62,7 @@ from typing_extensions import Literal, Self
 
 from prefect.exceptions import ProfileSettingsValidationError
 from prefect.types import ClientRetryExtraCodes, LogLevel
-from prefect.utilities.collections import (
-    deep_merge_dicts,
-    set_in_dict,
-    visit_collection,
-)
+from prefect.utilities.collections import visit_collection
 from prefect.utilities.pydantic import handle_secret_render
 
 T = TypeVar("T")
@@ -77,12 +72,10 @@ DEFAULT_PROFILES_PATH = Path(__file__).parent.joinpath("profiles.toml")
 _SECRET_TYPES: Tuple[Type, ...] = (Secret, SecretStr)
 
 
-def env_var_to_accessor(env_var: str) -> str:
+def env_var_to_attr_name(env_var: str) -> str:
     """
-    Convert an environment variable name to a settings accessor.
+    Convert an environment variable name to an attribute name.
     """
-    if SETTING_VARIABLES.get(env_var) is not None:
-        return SETTING_VARIABLES[env_var].accessor
     return env_var.replace("PREFECT_", "").lower()
 
 
@@ -94,21 +87,19 @@ def is_test_mode() -> bool:
 class Setting:
     """Mimics the old Setting object for compatibility with existing code."""
 
-    def __init__(
-        self, name: str, default: Any, type_: Any, accessor: Optional[str] = None
-    ):
+    def __init__(self, name: str, default: Any, type_: Any):
         self._name = name
         self._default = default
         self._type = type_
-        if accessor is None:
-            self.accessor = env_var_to_accessor(name)
-        else:
-            self.accessor = accessor
 
     @property
     def name(self):
         return self._name
 
+    @property
+    def field_name(self):
+        return env_var_to_attr_name(self.name)
+
     @property
     def is_secret(self):
         if self._type in _SECRET_TYPES:
@@ -128,19 +119,13 @@ class Setting:
             else:
                 return None
 
-        path = self.accessor.split(".")
-        current_value = get_current_settings()
-        for key in path:
-            current_value = getattr(current_value, key, None)
+        current_value = getattr(get_current_settings(), self.field_name)
         if isinstance(current_value, _SECRET_TYPES):
             return current_value.get_secret_value()
         return current_value
 
     def value_from(self: Self, settings: "Settings") -> Any:
-        path = self.accessor.split(".")
-        current_value = settings
-        for key in path:
-            current_value = getattr(current_value, key, None)
+        current_value = getattr(settings, self.field_name)
         if isinstance(current_value, _SECRET_TYPES):
             return current_value.get_secret_value()
         return current_value
@@ -172,7 +157,7 @@ def default_ui_url(settings: "Settings") -> Optional[str]:
         return value
 
     # Otherwise, infer a value from the API URL
-    ui_url = api_url = settings.api.url
+    ui_url = api_url = settings.api_url
 
     if not api_url:
         return None
@@ -258,7 +243,7 @@ def warn_on_misconfigured_api_url(values):
     """
     Validator for settings warning if the API URL is misconfigured.
     """
-    api_url = values.get("api", {}).get("url")
+    api_url = values["api_url"]
     if api_url is not None:
         misconfigured_mappings = {
             "app.prefect.cloud": (
@@ -396,16 +381,13 @@ class ProfileSettingsTomlLoader(PydanticBaseSettingsSource):
 
         if not active_profile or active_profile not in profiles_data:
             return {}
-
         return profiles_data[active_profile]
 
     def get_field_value(
         self, field: FieldInfo, field_name: str
     ) -> Tuple[Any, str, bool]:
         """Concrete implementation to get the field value from the profile settings"""
-        value = self.profile_settings.get(
-            f"{self.config.get('env_prefix','')}{field_name.upper()}"
-        )
+        value = self.profile_settings.get(f"PREFECT_{field_name.upper()}")
         return value, field_name, self.field_is_complex(field)
 
     def __call__(self) -> Dict[str, Any]:
@@ -425,7 +407,21 @@ class ProfileSettingsTomlLoader(PydanticBaseSettingsSource):
 
 ###########################################################################
 # Settings
-class PrefectBaseSettings(BaseSettings):
+
+
+class Settings(BaseSettings):
+    """
+    Settings for Prefect using Pydantic settings.
+
+    See https://docs.pydantic.dev/latest/concepts/pydantic_settings
+    """
+
+    model_config = SettingsConfigDict(
+        env_file=".env",
+        env_prefix="PREFECT_",
+        extra="ignore",
+    )
+
     @classmethod
     def settings_customise_sources(
         cls,
@@ -450,104 +446,6 @@ class PrefectBaseSettings(BaseSettings):
             ProfileSettingsTomlLoader(settings_cls),
         )
 
-    @classmethod
-    def valid_setting_names(cls) -> Set[str]:
-        """
-        A set of valid setting names, e.g. "PREFECT_API_URL" or "PREFECT_API_KEY".
-        """
-        settings_fields = set()
-        for field_name, field in cls.model_fields.items():
-            if inspect.isclass(field.annotation) and issubclass(
-                field.annotation, PrefectBaseSettings
-            ):
-                settings_fields.update(field.annotation.valid_setting_names())
-            else:
-                settings_fields.add(
-                    f"{cls.model_config.get('env_prefix')}{field_name.upper()}"
-                )
-        return settings_fields
-
-    def to_environment_variables(
-        self,
-        exclude_unset: bool = False,
-        include_secrets: bool = True,
-    ) -> Dict[str, str]:
-        """Convert the settings object to a dictionary of environment variables."""
-
-        env: Dict[str, Any] = self.model_dump(
-            exclude_unset=exclude_unset,
-            mode="json",
-            context={"include_secrets": include_secrets},
-        )
-        env_variables = {}
-        for key, value in env.items():
-            if isinstance(value, dict) and isinstance(
-                child_settings := getattr(self, key), PrefectBaseSettings
-            ):
-                child_env = child_settings.to_environment_variables(
-                    exclude_unset=exclude_unset,
-                    include_secrets=include_secrets,
-                )
-                env_variables.update(child_env)
-            elif value is not None:
-                env_variables[
-                    f"{self.model_config.get('env_prefix')}{key.upper()}"
-                ] = str(value)
-        return env_variables
-
-
-class APISettings(PrefectBaseSettings):
-    """
-    Settings for interacting with the Prefect API
-    """
-
-    model_config = SettingsConfigDict(
-        env_prefix="PREFECT_API_", env_file=".env", extra="ignore"
-    )
-    url: Optional[str] = Field(
-        default=None,
-        description="The URL of the Prefect API. If not set, the client will attempt to infer it.",
-    )
-    key: Optional[SecretStr] = Field(
-        default=None,
-        description="The API key used for authentication with the Prefect API. Should be kept secret.",
-    )
-    tls_insecure_skip_verify: bool = Field(
-        default=False,
-        description="If `True`, disables SSL checking to allow insecure requests. This is recommended only during development, e.g. when using self-signed certificates.",
-    )
-    ssl_cert_file: Optional[str] = Field(
-        default=os.environ.get("SSL_CERT_FILE"),
-        description="This configuration settings option specifies the path to an SSL certificate file.",
-    )
-    enable_http2: bool = Field(
-        default=False,
-        description="If true, enable support for HTTP/2 for communicating with an API. If the API does not support HTTP/2, this will have no effect and connections will be made via HTTP/1.1.",
-    )
-    request_timeout: float = Field(
-        default=60.0,
-        description="The default timeout for requests to the API",
-    )
-    default_limit: int = Field(
-        default=200,
-        description="The default limit applied to queries that can return multiple objects, such as `POST /flow_runs/filter`.",
-    )
-
-
-class Settings(PrefectBaseSettings):
-    """
-    Settings for Prefect using Pydantic settings.
-
-    See https://docs.pydantic.dev/latest/concepts/pydantic_settings
-    """
-
-    model_config = SettingsConfigDict(
-        env_file=".env",
-        env_prefix="PREFECT_",
-        env_nested_delimiter=None,
-        extra="ignore",
-    )
-
     ###########################################################################
     # CLI
 
@@ -605,9 +503,33 @@ class Settings(PrefectBaseSettings):
     ###########################################################################
     # API settings
 
-    api: APISettings = Field(
-        default_factory=APISettings,
-        description="Settings for interacting with the Prefect API",
+    api_url: Optional[str] = Field(
+        default=None,
+        description="The URL of the Prefect API. If not set, the client will attempt to infer it.",
+    )
+    api_key: Optional[SecretStr] = Field(
+        default=None,
+        description="The API key used for authentication with the Prefect API. Should be kept secret.",
+    )
+
+    api_tls_insecure_skip_verify: bool = Field(
+        default=False,
+        description="If `True`, disables SSL checking to allow insecure requests. This is recommended only during development, e.g. when using self-signed certificates.",
+    )
+
+    api_ssl_cert_file: Optional[str] = Field(
+        default=os.environ.get("SSL_CERT_FILE"),
+        description="This configuration settings option specifies the path to an SSL certificate file.",
+    )
+
+    api_enable_http2: bool = Field(
+        default=False,
+        description="If true, enable support for HTTP/2 for communicating with an API. If the API does not support HTTP/2, this will have no effect and connections will be made via HTTP/1.1.",
+    )
+
+    api_request_timeout: float = Field(
+        default=60.0,
+        description="The default timeout for requests to the API",
     )
 
     api_blocks_register_on_start: bool = Field(
@@ -1506,7 +1428,7 @@ class Settings(PrefectBaseSettings):
 
     def __getattribute__(self, name: str) -> Any:
         if name.startswith("PREFECT_"):
-            field_name = env_var_to_accessor(name)
+            field_name = env_var_to_attr_name(name)
             warnings.warn(
                 f"Accessing `Settings().{name}` is deprecated. Use `Settings().{field_name}` instead.",
                 DeprecationWarning,
@@ -1533,10 +1455,8 @@ class Settings(PrefectBaseSettings):
             self.ui_url = default_ui_url(self)
             self.__pydantic_fields_set__.remove("ui_url")
         if self.ui_api_url is None:
-            if self.api.url:
-                self.ui_api_url = self.api.url
-            if self.api.url:
-                self.ui_api_url = self.api.url
+            if self.api_url:
+                self.ui_api_url = self.api_url
                 self.__pydantic_fields_set__.remove("ui_api_url")
             else:
                 self.ui_api_url = (
@@ -1588,7 +1508,7 @@ class Settings(PrefectBaseSettings):
         return self
 
     @model_validator(mode="after")
-    def emit_warnings(self):
+    def emit_warnings(self) -> Self:
         """More post-hoc validation of settings, including warnings for misconfigurations."""
         values = self.model_dump()
         values = max_log_size_smaller_than_batch_size(values)
@@ -1600,6 +1520,16 @@ class Settings(PrefectBaseSettings):
     ##########################################################################
     # Settings methods
 
+    @classmethod
+    def valid_setting_names(cls) -> Set[str]:
+        """
+        A set of valid setting names, e.g. "PREFECT_API_URL" or "PREFECT_API_KEY".
+        """
+        return set(
+            f"{cls.model_config.get('env_prefix')}{key.upper()}"
+            for key in cls.model_fields.keys()
+        )
+
     def copy_with_update(
         self: Self,
         updates: Optional[Mapping[Setting, Any]] = None,
@@ -1619,26 +1549,14 @@ class Settings(PrefectBaseSettings):
         Returns:
             A new Settings object.
         """
-        restore_defaults_obj = {}
-        for r in restore_defaults or []:
-            set_in_dict(restore_defaults_obj, r.accessor, True)
+        restore_defaults_names = set(r.field_name for r in restore_defaults or [])
         updates = updates or {}
         set_defaults = set_defaults or {}
 
-        set_defaults_obj = {}
-        for setting, value in set_defaults.items():
-            set_in_dict(set_defaults_obj, setting.accessor, value)
-
-        updates_obj = {}
-        for setting, value in updates.items():
-            set_in_dict(updates_obj, setting.accessor, value)
-
         new_settings = self.__class__(
-            **deep_merge_dicts(
-                set_defaults_obj,
-                self.model_dump(exclude_unset=True, exclude=restore_defaults_obj),
-                updates_obj,
-            )
+            **{setting.field_name: value for setting, value in set_defaults.items()}
+            | self.model_dump(exclude_unset=True, exclude=restore_defaults_names)
+            | {setting.field_name: value for setting, value in updates.items()}
         )
         return new_settings
 
@@ -1650,6 +1568,37 @@ class Settings(PrefectBaseSettings):
         env_variables = self.to_environment_variables()
         return str(hash(tuple((key, value) for key, value in env_variables.items())))
 
+    def to_environment_variables(
+        self,
+        include: Optional[Iterable[Setting]] = None,
+        exclude: Optional[Iterable[Setting]] = None,
+        exclude_unset: bool = False,
+        include_secrets: bool = True,
+    ) -> Dict[str, str]:
+        """Convert the settings object to a dictionary of environment variables."""
+        included_names = {s.field_name for s in include} if include else None
+        excluded_names = {s.field_name for s in exclude} if exclude else None
+
+        if exclude_unset:
+            if included_names is None:
+                included_names = set(self.model_dump(exclude_unset=True).keys())
+            else:
+                included_names.intersection_update(
+                    {key for key in self.model_dump(exclude_unset=True)}
+                )
+
+        env: Dict[str, Any] = self.model_dump(
+            include=included_names,
+            exclude=excluded_names,
+            mode="json",
+            context={"include_secrets": include_secrets},
+        )
+        return {
+            f"{self.model_config.get('env_prefix')}{key.upper()}": str(value)
+            for key, value in env.items()
+            if value is not None
+        }
+
     @model_serializer(
         mode="wrap", when_used="always"
     )  # TODO: reconsider `when_used` default for more control
@@ -1659,11 +1608,7 @@ class Settings(PrefectBaseSettings):
         ctx = info.context
         jsonable_self = handler(self)
         if ctx and ctx.get("include_secrets") is True:
-            dump_kwargs = dict(
-                include=info.include,
-                exclude=info.exclude,
-                exclude_unset=info.exclude_unset,
-            )
+            dump_kwargs = dict(include=info.include, exclude=info.exclude)
             jsonable_self.update(
                 {
                     field_name: visit_collection(
@@ -1693,7 +1638,12 @@ def _cast_settings(
     for k, value in settings.items():
         try:
             if isinstance(k, str):
-                setting = SETTING_VARIABLES[k]
+                field = Settings.model_fields[env_var_to_attr_name(k)]
+                setting = Setting(
+                    name=k,
+                    default=field.default,
+                    type_=field.annotation,
+                )
             else:
                 setting = k
             casted_settings[setting] = value
@@ -1788,16 +1738,9 @@ class Profile(BaseModel):
         errors: List[Tuple[Setting, ValidationError]] = []
         for setting, value in self.settings.items():
             try:
-                model_fields = Settings.model_fields
-                annotation = None
-                for section in setting.accessor.split("."):
-                    annotation = model_fields[section].annotation
-                    if inspect.isclass(annotation) and issubclass(
-                        annotation, BaseSettings
-                    ):
-                        model_fields = annotation.model_fields
-
-                TypeAdapter(annotation).validate_python(value)
+                TypeAdapter(
+                    Settings.model_fields[setting.field_name].annotation
+                ).validate_python(value)
             except ValidationError as e:
                 errors.append((setting, e))
         if errors:
@@ -2114,38 +2057,26 @@ def update_current_profile(
 # Allow traditional env var access
 
 
-def _collect_settings_fields(
-    settings_cls: Type[BaseSettings], accessor_prefix: Optional[str] = None
-) -> Dict[str, Setting]:
-    settings_fields: Dict[str, Setting] = {}
-    for field_name, field in settings_cls.model_fields.items():
-        if inspect.isclass(field.annotation) and issubclass(
-            field.annotation, BaseSettings
-        ):
-            accessor = (
-                field_name
-                if accessor_prefix is None
-                else f"{accessor_prefix}.{field_name}"
-            )
-            settings_fields.update(_collect_settings_fields(field.annotation, accessor))
-        else:
-            accessor = (
-                field_name
-                if accessor_prefix is None
-                else f"{accessor_prefix}.{field_name}"
-            )
+class _SettingsDict(dict):
+    """allow either `field_name` or `ENV_VAR_NAME` access
+    ```
+    d = _SettingsDict(Settings)
+    d["api_url"] == d["PREFECT_API_URL"]
+    ```
+    """
+
+    def __init__(self: Self, settings_cls: Type[BaseSettings]):
+        super().__init__()
+        for field_name, field in settings_cls.model_fields.items():
             setting = Setting(
                 name=f"{settings_cls.model_config.get('env_prefix')}{field_name.upper()}",
                 default=field.default,
                 type_=field.annotation,
-                accessor=accessor,
             )
-            settings_fields[setting.name] = setting
-            settings_fields[setting.accessor] = setting
-    return settings_fields
+            self[field_name] = self[setting.name] = setting
 
 
-SETTING_VARIABLES: dict[str, Setting] = _collect_settings_fields(Settings)
+SETTING_VARIABLES: dict[str, Setting] = _SettingsDict(Settings)
 
 
 def __getattr__(name: str) -> Setting:

prefect/task_worker.py

@@ -102,7 +102,7 @@ class TaskWorker:
                 "TaskWorker must be initialized within an async context."
             )
 
-        self._runs_task_group: anyio.abc.TaskGroup = anyio.create_task_group()
+        self._runs_task_group: Optional[anyio.abc.TaskGroup] = None
         self._executor = ThreadPoolExecutor(max_workers=limit if limit else None)
         self._limiter = anyio.CapacityLimiter(limit) if limit else None
 
@@ -230,6 +230,9 @@ class TaskWorker:
 
             token_acquired = await self._acquire_token(task_run.id)
             if token_acquired:
+                assert (
+                    self._runs_task_group is not None
+                ), "Task group was not initialized"
                 self._runs_task_group.start_soon(
                     self._safe_submit_scheduled_task_run, task_run
                 )
@@ -349,7 +352,9 @@ class TaskWorker:
 
         if self._client._closed:
             self._client = get_client()
+        self._runs_task_group = anyio.create_task_group()
 
+        await self._exit_stack.__aenter__()
         await self._exit_stack.enter_async_context(self._client)
         await self._exit_stack.enter_async_context(self._runs_task_group)
         self._exit_stack.enter_context(self._executor)

prefect/utilities/collections.py

@@ -513,73 +513,3 @@ def get_from_dict(dct: Dict, keys: Union[str, List[str]], default: Any = None) -
         return dct
     except (TypeError, KeyError, IndexError):
         return default
-
-
-def set_in_dict(dct: Dict, keys: Union[str, List[str]], value: Any):
-    """
-    Sets a value in a nested dictionary using a sequence of keys.
-
-    This function allows to set a value in a deeply nested structure
-    of dictionaries and lists using either a dot-separated string or a list
-    of keys. If a requested key does not exist, the function will create it as
-    a new dictionary.
-
-    Args:
-        dct: The dictionary to set the value in.
-        keys: The sequence of keys to use for access. Can be a
-            dot-separated string or a list of keys.
-        value: The value to set in the dictionary.
-
-    Returns:
-        The modified dictionary with the value set at the specified key path.
-
-    Raises:
-        KeyError: If the key path exists and is not a dictionary.
-    """
-    if isinstance(keys, str):
-        keys = keys.replace("[", ".").replace("]", "").split(".")
-    for k in keys[:-1]:
-        if not isinstance(dct.get(k, {}), dict):
-            raise KeyError(f"Key path exists and contains a non-dict value: {keys}")
-        if k not in dct:
-            dct[k] = {}
-        dct = dct[k]
-    dct[keys[-1]] = value
-
-
-def deep_merge(dct: Dict, merge: Dict):
-    """
-    Recursively merges `merge` into `dct`.
-
-    Args:
-        dct: The dictionary to merge into.
-        merge: The dictionary to merge from.
-
-    Returns:
-        A new dictionary with the merged contents.
-    """
-    result = dct.copy()  # Start with keys and values from `dct`
-    for key, value in merge.items():
-        if key in result and isinstance(result[key], dict) and isinstance(value, dict):
-            # If both values are dictionaries, merge them recursively
-            result[key] = deep_merge(result[key], value)
-        else:
-            # Otherwise, overwrite with the new value
-            result[key] = value
-    return result
-
-
-def deep_merge_dicts(*dicts):
-    """
-    Recursively merges multiple dictionaries.
-
-    Args:
-        dicts: The dictionaries to merge.
-
-    Returns:
-        A new dictionary with the merged contents.
-    """
-    result = {}
-    for dictionary in dicts:
-        result = deep_merge(result, dictionary)
-    return result

prefect/utilities/dockerutils.py

@@ -57,7 +57,7 @@ def get_prefect_image_name(
         flavor: An optional alternative image flavor to build, like 'conda'
     """
     parsed_version = Version(prefect_version or prefect.__version__)
-    is_prod_build = parsed_version.post is None
+    is_prod_build = parsed_version.local is None
     prefect_version = (
         parsed_version.base_version
         if is_prod_build

{prefect_client-3.0.7.dist-info → prefect_client-3.0.9.dist-info}/METADATA

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

{prefect_client-3.0.7.dist-info → prefect_client-3.0.9.dist-info}/RECORD

@@ -1,11 +1,11 @@
 prefect/.prefectignore,sha256=awSprvKT0vI8a64mEOLrMxhxqcO-b0ERQeYpA2rNKVQ,390
 prefect/__init__.py,sha256=2jnhqiLx5v3iQ2JeTVp4V85uSC_3Yg3HlE05JjjQSGc,3223
-prefect/_version.py,sha256=jqEjAI_Kp3atL4qJXq1JRhm42odFAcak8SXsWeCHGNM,496
+prefect/_version.py,sha256=QLTgLPVEvLsYFCm962aIPUtbC_nIkpFEL8GSLFDWi6w,496
 prefect/agent.py,sha256=BOVVY5z-vUIQ2u8LwMTXDaNys2fjOZSS5YGDwJmTQjI,230
 prefect/artifacts.py,sha256=dsxFWmdg2r9zbHM3KgKOR5YbJ29_dXUYF9kipJpbxkE,13009
 prefect/automations.py,sha256=NlQ62GPJzy-gnWQqX7c6CQJKw7p60WLGDAFcy82vtg4,5613
 prefect/cache_policies.py,sha256=PWUzyJue4h5XHVeIVolfPKhRGrx1hyWJt58AJyHbcqU,9104
-prefect/context.py,sha256=4CsGsfn8Kt8SHcTor5vhfcSIRm3qcQkO9vb9rfsKD3E,21571
+prefect/context.py,sha256=U-IBDEQsmeZmTcNWjeeELTnYpbKKKUh0thM-S8cXRI8,21381
 prefect/engine.py,sha256=BpmDbe6miZcTl1vRkxfCPYcWSXADLigGPCagFwucMz0,1976
 prefect/exceptions.py,sha256=V_nRpS2Z93PvJMoQdXbx8zepVaFb-pWanCqVi7T1ngI,11803
 prefect/filesystems.py,sha256=CxwMmKY8LBUed_9IqE2jUqxVCWhXa1r2fjKgLbIC2Vg,17893
@@ -19,12 +19,12 @@ prefect/profiles.toml,sha256=kTvqDNMzjH3fsm5OEI-NKY4dMmipor5EvQXRB6rPEjY,522
 prefect/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prefect/results.py,sha256=-V_JRaWeY2WXWhY2d_zL7KVIro660mIU6F3heNaih0o,47391
 prefect/serializers.py,sha256=Lo41EM0_qGzcfB_63390Izeo3DdK6cY6VZfxa9hpSGQ,8712
-prefect/settings.py,sha256=US-wUpMEw8sRWklW-FfDFxZOFhjTs9_2IPHfnX4cw0o,76065
+prefect/settings.py,sha256=siuZyTdsiLd9pNXOfGh7HlcIyNEdo7u4e6JZ57GOYLA,73565
 prefect/states.py,sha256=2lysq6X5AvqPfE3eD3D0HYt-KpFA2OUgA0c4ZQ22A_U,24906
 prefect/task_engine.py,sha256=gjSpoLecy1gyPavNPOw40DFZonvqXIzLLqiGooqyhM0,57945
 prefect/task_runners.py,sha256=Ef8JENamKGWGyAGkuB_QwSLGWbWKRsmvemZGDkyRWCQ,15021
 prefect/task_runs.py,sha256=jkaQOkRKOHS8fgHUijteriFpjMSKv4zldn1D8tZHkUI,8777
-prefect/task_worker.py,sha256=a8Uw78Ms4p3ikt_la50lENmPLIa-jjbuvunvjVXvRKQ,16785
+prefect/task_worker.py,sha256=VfLF0W_RAahAZM-M75vC0zxDFwcHY0V20qsQX4cDKuw,17007
 prefect/tasks.py,sha256=35eOv7VfhziiC3hL9FxB3spYtG6tpxZBLzk5KP_8Ux8,68371
 prefect/transactions.py,sha256=NTzflkehGQ5jKmuChpvsUv1-ZPBqLI7OmUeq-nZJGHQ,16558
 prefect/variables.py,sha256=023cfSj_ydwvz6lyChRKnjHFfkdoYZKK_zdTtuSxrYo,4665
@@ -149,7 +149,7 @@ prefect/records/filesystem.py,sha256=X-h7r5deiHH5IaaDk4ugOCmR5ZKnJeU2cLgp0AkMt0E
 prefect/records/memory.py,sha256=YdzQvEfb-CX0sKxAZK5TaNxVvAlyYlZse9qdoer6Xbk,6447
 prefect/records/result_store.py,sha256=3ZUFNHCCv_qBQhmIFdvlK_GMnPZcFacaI9dVdDKWdwA,2431
 prefect/runner/__init__.py,sha256=7U-vAOXFkzMfRz1q8Uv6Otsvc0OrPYLLP44srwkJ_8s,89
-prefect/runner/runner.py,sha256=G9OfJRRGLaerUAF7Gt1WUwGsdiFIiLLs8t9CXDCiw48,48672
+prefect/runner/runner.py,sha256=MkN_ZAKXlFzEQBf4JdAAwMOrEZLpSzXyVwfxL_HjyeI,48760
 prefect/runner/server.py,sha256=2o5vhrL7Zbn-HBStWhCjqqViex5Ye9GiQ1EW9RSEzdo,10500
 prefect/runner/storage.py,sha256=OsBa4nWdFxOTiAMNLFpexBdi5K3iuxidQx4YWZwditE,24734
 prefect/runner/submit.py,sha256=RuyDr-ved9wjYYarXiehY5oJVFf_HE3XKKACNWpxpPc,8131
@@ -166,11 +166,11 @@ prefect/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 prefect/utilities/annotations.py,sha256=Ocj2s5zhnGr8uXUBnOli-OrybXVJdu4-uZvCRpKpV_Q,2820
 prefect/utilities/asyncutils.py,sha256=jWj2bMx2yLOd2QTouMOQFOtqy2DLnfefJNlujbMZZYU,20198
 prefect/utilities/callables.py,sha256=53yqDgkx7Zb_uS4v1_ltrPrvdqjwkHvqK8A0E958dFk,24859
-prefect/utilities/collections.py,sha256=pELjVX3fCioBGe8l9yMYCdiQInhw2ZDT9-kEQDw3GE4,19434
+prefect/utilities/collections.py,sha256=_YVHZfT49phrXq7aDUmn4pqWwEtJQTPy2nJD0M1sz0o,17264
 prefect/utilities/compat.py,sha256=mNQZDnzyKaOqy-OV-DnmH_dc7CNF5nQgW_EsA4xMr7g,906
 prefect/utilities/context.py,sha256=BThuUW94-IYgFYTeMIM9KMo8ShT3oiI7w5ajZHzU1j0,1377
 prefect/utilities/dispatch.py,sha256=EthEmyRwv-4W8z2BJclrsOQHJ_pJoZYL0t2cyYPEa-E,6098
-prefect/utilities/dockerutils.py,sha256=nrekaN-ZpiKMhTH586pw4LZdjig3_XQrGgW-yCfc1UA,20371
+prefect/utilities/dockerutils.py,sha256=zjqeyE4gK8r0n5l3b2XK2AKviQ2F-pOd1LE2O4qfJt0,20372
 prefect/utilities/engine.py,sha256=KaGtKWNZ-EaSTTppL7zpqWWjDLpMcPTVK0Gfd4zXpRM,32087
 prefect/utilities/filesystem.py,sha256=frAyy6qOeYa7c-jVbEUGZQEe6J1yF8I_SvUepPd59gI,4415
 prefect/utilities/hashing.py,sha256=EOwZLmoIZImuSTxAvVqInabxJ-4RpEfYeg9e2EDQF8o,1752
@@ -197,8 +197,8 @@ prefect/workers/cloud.py,sha256=BOVVY5z-vUIQ2u8LwMTXDaNys2fjOZSS5YGDwJmTQjI,230
 prefect/workers/process.py,sha256=tcJ3fbiraLCfpVGpv8dOHwMSfVzeD_kyguUOvPuIz6I,19796
 prefect/workers/server.py,sha256=lgh2FfSuaNU7b6HPxSFm8JtKvAvHsZGkiOo4y4tW1Cw,2022
 prefect/workers/utilities.py,sha256=VfPfAlGtTuDj0-Kb8WlMgAuOfgXCdrGAnKMapPSBrwc,2483
-prefect_client-3.0.7.dist-info/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
-prefect_client-3.0.7.dist-info/METADATA,sha256=6ziE5lT3HvRwjjhf4o70h8v4SHATB2FIkestFr026z0,7332
-prefect_client-3.0.7.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-prefect_client-3.0.7.dist-info/top_level.txt,sha256=MJZYJgFdbRc2woQCeB4vM6T33tr01TmkEhRcns6H_H4,8
-prefect_client-3.0.7.dist-info/RECORD,,
+prefect_client-3.0.9.dist-info/LICENSE,sha256=MCxsn8osAkzfxKC4CC_dLcUkU8DZLkyihZ8mGs3Ah3Q,11357
+prefect_client-3.0.9.dist-info/METADATA,sha256=MRsROVJ93m69z-jP70E1ngKyw75Nrioc7bLMfP34rZE,7332
+prefect_client-3.0.9.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+prefect_client-3.0.9.dist-info/top_level.txt,sha256=MJZYJgFdbRc2woQCeB4vM6T33tr01TmkEhRcns6H_H4,8
+prefect_client-3.0.9.dist-info/RECORD,,