prefect-client 3.0.8__tar.gz → 3.0.9__tar.gz

{prefect-client-3.0.8/src/prefect_client.egg-info → prefect-client-3.0.9}/PKG-INFO

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

{prefect-client-3.0.8 → prefect-client-3.0.9}/setup.cfg

@@ -57,7 +57,7 @@ ignore_missing_imports = True
 
 [versioneer]
 VCS = git
-style = pep440-pre
+style = pep440
 versionfile_source = src/prefect/_version.py
 versionfile_build = prefect/_version.py
 version_regex = ^(\d+\.\d+\.\d+(?:[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)*)?)$

{prefect-client-3.0.8 → prefect-client-3.0.9}/src/prefect/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-10-10T10:17:25-0500",
+ "date": "2024-10-15T10:11:48-0400",
  "dirty": true,
  "error": null,
- "full-revisionid": "0894bad49e256657cab8208205623c4c7b75ad1f",
- "version": "3.0.8"
+ "full-revisionid": "fd8cef25431a01f5b6ff2f031c2d53b3094797cb",
+ "version": "3.0.9"
 }
 '''  # END VERSION_JSON
 

{prefect-client-3.0.8 → prefect-client-3.0.9}/src/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-client-3.0.8 → prefect-client-3.0.9}/src/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-client-3.0.8 → prefect-client-3.0.9}/src/prefect/settings.py

@@ -381,7 +381,6 @@ class ProfileSettingsTomlLoader(PydanticBaseSettingsSource):
 
         if not active_profile or active_profile not in profiles_data:
             return {}
-
         return profiles_data[active_profile]
 
     def get_field_value(
@@ -1509,7 +1508,7 @@ class Settings(BaseSettings):
         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)

{prefect-client-3.0.8 → prefect-client-3.0.9}/src/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-client-3.0.8 → prefect-client-3.0.9}/src/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.8 → prefect-client-3.0.9/src/prefect_client.egg-info}/PKG-INFO

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

{prefect-client-3.0.8 → prefect-client-3.0.9}/versioneer.py

@@ -923,8 +923,6 @@ def render_pep440(pieces: Dict[str, Any]) -> str:
         if pieces["distance"] or pieces["dirty"]:
             rendered += plus_or_dot(pieces)
             rendered += "%%d.g%%s" %% (pieces["distance"], pieces["short"])
-            if pieces["dirty"]:
-                rendered += ".dirty"
     else:
         # exception #1
         rendered = "0+untagged.%%d.g%%s" %% (pieces["distance"],
@@ -1581,11 +1579,9 @@ def render_pep440(pieces: Dict[str, Any]) -> str:
     """
     if pieces["closest-tag"]:
         rendered = pieces["closest-tag"]
-        if pieces["distance"] or pieces["dirty"]:
+        if pieces["distance"]:
             rendered += plus_or_dot(pieces)
             rendered += "%d.g%s" % (pieces["distance"], pieces["short"])
-            if pieces["dirty"]:
-                rendered += ".dirty"
     else:
         # exception #1
         rendered = "0+untagged.%d.g%s" % (pieces["distance"], pieces["short"])