prefect-client 3.7.9.dev5__tar.gz → 3.7.9.dev6__tar.gz

{prefect_client-3.7.9.dev5 → prefect_client-3.7.9.dev6}/PKG-INFO

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

prefect_client-3.7.9.dev6/src/prefect/_build_info.py

@@ -0,0 +1,5 @@
+# Generated by versioningit
+__version__ = "3.7.9.dev6"
+__build_date__ = "2026-07-22 08:57:13.722964+00:00"
+__git_commit__ = "4b510e42620dacb947f207c12271c435f9ef41e9"
+__dirty__ = False

prefect_client-3.7.9.dev6/src/prefect/logging/filters.py

@@ -0,0 +1,105 @@
+import logging
+from collections.abc import Mapping
+from typing import Any
+
+from prefect.utilities.names import obfuscate
+
+
+class _RedactedString(str):
+    """
+    A `str` subclass that stores a separate `repr` value.
+
+    This allows logging's `%r` and `%a` conversions to use a redacted
+    representation while `%s` and JSON serialization use the redacted
+    `str` value.
+    """
+
+    __slots__ = ("_repr",)
+
+    def __new__(cls, str_value: str, repr_value: str) -> "_RedactedString":
+        instance = super().__new__(cls, str_value)
+        instance._repr = repr_value
+        return instance
+
+    def __repr__(self) -> str:
+        return self._repr
+
+    def __reduce__(self) -> tuple[type, tuple[str, str]]:
+        return (type(self), (str(self), self._repr))
+
+
+def redact_substr(obj: Any, substr: str) -> Any:
+    """
+    Redact a string from a potentially nested object.
+
+    Standard collections (list, tuple, set, dict, and other `Mapping`
+    instances) are traversed recursively and have their string values redacted
+    while preserving shape. Non-container objects are redacted by replacing
+    their `str` and `repr` values with obfuscated versions, avoiding the
+    need to reconstruct arbitrary user objects (e.g. dataclasses with
+    `init=False` fields or Pydantic models).
+
+    Args:
+        obj: The object to redact the string from
+        substr: The string to redact.
+
+    Returns:
+        Any: The object with the API key redacted.
+    """
+    if isinstance(obj, str):
+        return obj.replace(substr, obfuscate(substr))
+
+    if isinstance(obj, (list, tuple, set)):
+        seq = obj
+        items = [redact_substr(item, substr) for item in seq]
+        if all(item is orig for item, orig in zip(items, seq)):
+            return obj
+        # Preserve namedtuple types.
+        if hasattr(type(seq), "_make"):
+            return type(seq)._make(items)
+        return type(seq)(items)
+
+    if isinstance(obj, Mapping):
+        mapping = obj
+        items = [
+            (redact_substr(key, substr), redact_substr(value, substr))
+            for key, value in mapping.items()
+        ]
+        if all(
+            k1 is k2 and v1 is v2 for (k1, v1), (k2, v2) in zip(items, mapping.items())
+        ):
+            return obj
+        # Return a plain dict so that arbitrary Mapping types (e.g. ChainMap)
+        # can still be formatted by logging's `%` operator and serialized as
+        # JSON without reconstructing the original mapping type.
+        return dict(items)
+
+    # For opaque objects, redact their rendered string representations.  This
+    # handles exceptions, dataclasses, Pydantic models, and other lazy logging
+    # arguments whose `__str__` or `__repr__` may contain the secret.
+    str_value = str(obj)
+    repr_value = repr(obj)
+    redacted_str = str_value.replace(substr, obfuscate(substr))
+    redacted_repr = repr_value.replace(substr, obfuscate(substr))
+    if redacted_str is not str_value or redacted_repr is not repr_value:
+        return _RedactedString(redacted_str, redacted_repr)
+
+    return obj
+
+
+class ObfuscateApiKeyFilter(logging.Filter):
+    """
+    A logging filter that obfuscates any string that matches the obfuscate_string function.
+    """
+
+    def filter(self, record: logging.LogRecord) -> bool:
+        # Need to import here to avoid circular imports
+        from prefect.settings import PREFECT_API_KEY
+
+        api_key = PREFECT_API_KEY.value()
+        if api_key:
+            record.msg = redact_substr(record.msg, api_key)
+            if record.args is not None:
+                record.args = redact_substr(record.args, api_key)
+
+        return True

{prefect_client-3.7.9.dev5 → prefect_client-3.7.9.dev6}/src/prefect/runner/_workspace_starter.py

@@ -126,7 +126,7 @@ def _stdlib_prefixes() -> tuple[str, ...]:
 
 @functools.lru_cache(maxsize=1)
 def _site_packages_dirs() -> tuple[str, ...]:
-    """Resolved site-packages directories that should always be kept."""
+    """Resolved site-packages directories that should not be promoted to PYTHONPATH."""
     dirs: set[str] = set()
     paths = sysconfig.get_paths()
     for key in ("purelib", "platlib"):
@@ -147,12 +147,14 @@ def _site_packages_dirs() -> tuple[str, ...]:
     return tuple(sorted(dirs))
 
 
-def _is_stdlib_path(entry: str) -> bool:
-    """True when *entry* is a stdlib, lib-dynload, or stdlib zip path.
+def _is_interpreter_path(entry: str) -> bool:
+    """True when *entry* is managed by the interpreter rather than the workspace.
 
-    Site-packages directories that live under the stdlib tree are kept.
-    Only interpreter stdlib zip archives next to stdlib directories are filtered;
-    user archives like `/app/python_deps.zip` are preserved.
+    The interpreter already adds stdlib, lib-dynload, and site-packages directories
+    in the correct order. Adding any of them to PYTHONPATH changes that ordering and
+    can let a site-packages backport shadow a standard-library module. Only
+    interpreter stdlib zip archives next to stdlib directories are filtered; user
+    archives like `/app/python_deps.zip` are preserved.
     """
     if not entry:
         return False
@@ -160,9 +162,11 @@ def _is_stdlib_path(entry: str) -> bool:
     resolved_path = Path(entry).resolve()
     resolved = str(resolved_path)
 
-    for sp in _site_packages_dirs():
-        if resolved == sp or resolved.startswith(sp + os.sep):
-            return False
+    site_packages_dirs = _site_packages_dirs()
+    if resolved in site_packages_dirs:
+        return True
+    if any(resolved.startswith(sp + os.sep) for sp in site_packages_dirs):
+        return False
 
     for root in _stdlib_prefixes():
         if resolved == root or resolved.startswith(root + os.sep):
@@ -187,7 +191,11 @@ def workspace_environment(workspace: PreparedWorkspace) -> dict[str, str]:
         candidate_entries.extend(existing_pythonpath.split(os.pathsep))
 
     for entry in candidate_entries:
-        if entry and entry not in pythonpath_entries and not _is_stdlib_path(entry):
+        if (
+            entry
+            and entry not in pythonpath_entries
+            and not _is_interpreter_path(entry)
+        ):
             pythonpath_entries.append(entry)
 
     environment["PYTHONPATH"] = os.pathsep.join(pythonpath_entries)

{prefect_client-3.7.9.dev5 → prefect_client-3.7.9.dev6}/src/prefect/server/api/deployments.py

@@ -609,7 +609,7 @@ async def paginate_deployments(
         results=results,
         count=count,
         limit=limit,
-        pages=(count + limit - 1) // limit,
+        pages=(count + limit - 1) // limit if limit > 0 else 0,
         page=page,
     )
 

{prefect_client-3.7.9.dev5 → prefect_client-3.7.9.dev6}/src/prefect/server/api/flow_runs.py

@@ -1044,7 +1044,7 @@ async def paginate_flow_runs(
         results=results,
         count=count,
         limit=limit,
-        pages=(count + limit - 1) // limit,
+        pages=(count + limit - 1) // limit if limit > 0 else 0,
         page=page,
     ).model_dump(mode="json")
 

{prefect_client-3.7.9.dev5 → prefect_client-3.7.9.dev6}/src/prefect/server/api/flows.py

@@ -255,6 +255,6 @@ async def paginate_flows(
         results=results,
         count=count,
         limit=limit,
-        pages=(count + limit - 1) // limit,
+        pages=(count + limit - 1) // limit if limit > 0 else 0,
         page=page,
     )

{prefect_client-3.7.9.dev5 → prefect_client-3.7.9.dev6}/src/prefect/server/api/task_runs.py

@@ -264,7 +264,7 @@ async def paginate_task_runs(
             results=runs,
             count=total_count,
             limit=limit,
-            pages=(total_count + limit - 1) // limit,
+            pages=(total_count + limit - 1) // limit if limit > 0 else 0,
             page=page,
         )
     )

prefect_client-3.7.9.dev5/src/prefect/_build_info.py

@@ -1,5 +0,0 @@
-# Generated by versioningit
-__version__ = "3.7.9.dev5"
-__build_date__ = "2026-07-21 08:58:32.807456+00:00"
-__git_commit__ = "e8d311f1f3f3b947f585f520f9dcfd9e96720dce"
-__dirty__ = False

prefect_client-3.7.9.dev5/src/prefect/logging/filters.py

@@ -1,41 +0,0 @@
-import logging
-from typing import Any
-
-from prefect.utilities.collections import visit_collection
-from prefect.utilities.names import obfuscate
-
-
-def redact_substr(obj: Any, substr: str) -> Any:
-    """
-    Redact a string from a potentially nested object.
-
-    Args:
-        obj: The object to redact the string from
-        substr: The string to redact.
-
-    Returns:
-        Any: The object with the API key redacted.
-    """
-
-    def redact_item(item: Any) -> Any:
-        if isinstance(item, str):
-            return item.replace(substr, obfuscate(substr))
-        return item
-
-    redacted_obj = visit_collection(obj, visit_fn=redact_item, return_data=True)
-    return redacted_obj
-
-
-class ObfuscateApiKeyFilter(logging.Filter):
-    """
-    A logging filter that obfuscates any string that matches the obfuscate_string function.
-    """
-
-    def filter(self, record: logging.LogRecord) -> bool:
-        # Need to import here to avoid circular imports
-        from prefect.settings import PREFECT_API_KEY
-
-        if PREFECT_API_KEY:
-            record.msg = redact_substr(record.msg, PREFECT_API_KEY.value())
-
-        return True