prefect-client 2.20.9__tar.gz → 2.20.11__tar.gz

{prefect-client-2.20.9/src/prefect_client.egg-info → prefect_client-2.20.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.9
+Version: 2.20.11
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.
@@ -21,8 +21,46 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: notifications
 License-File: LICENSE
+Requires-Dist: anyio<4.6.1,>=4.4.0
+Requires-Dist: asgi-lifespan<3.0,>=1.0
+Requires-Dist: cachetools<6.0,>=5.3
+Requires-Dist: cloudpickle<4.0,>=2.0
+Requires-Dist: coolname<3.0.0,>=1.0.4
+Requires-Dist: croniter<3.0.0,>=1.0.12
+Requires-Dist: fsspec>=2022.5.0
+Requires-Dist: exceptiongroup>=1.2.1
+Requires-Dist: graphviz>=0.20.1
+Requires-Dist: griffe<2.0.0,>=0.49.0
+Requires-Dist: httpcore<2.0.0,>=1.0.5
+Requires-Dist: httpx[http2]!=0.23.2,>=0.23
+Requires-Dist: importlib_metadata>=4.4; python_version < "3.10"
+Requires-Dist: importlib-resources<6.5.0,>=6.1.3
+Requires-Dist: jsonpatch<2.0,>=1.32
+Requires-Dist: jsonschema<5.0.0,>=4.0.0
+Requires-Dist: orjson<4.0,>=3.7
+Requires-Dist: packaging<24.3,>=21.3
+Requires-Dist: pathspec>=0.8.0
+Requires-Dist: pendulum<3.0; python_version < "3.12"
+Requires-Dist: pendulum<4,>=3.0.0; python_version >= "3.12"
+Requires-Dist: pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0,>=1.10.0
+Requires-Dist: pydantic_core<3.0.0,>=2.12.0
+Requires-Dist: python_dateutil<3.0.0,>=2.8.2
+Requires-Dist: python-slugify<9.0,>=5.0
+Requires-Dist: pyyaml<7.0.0,>=5.4.1
+Requires-Dist: rfc3339-validator<0.2.0,>=0.1.4
+Requires-Dist: rich<14.0,>=11.0
+Requires-Dist: ruamel.yaml>=0.17.0
+Requires-Dist: sniffio<2.0.0,>=1.3.0
+Requires-Dist: toml>=0.10.0
+Requires-Dist: typing_extensions<5.0.0,>=4.5.0
+Requires-Dist: ujson<6.0.0,>=5.8.0
+Requires-Dist: uvicorn!=0.29.0,>=0.14.0
+Requires-Dist: websockets<14.0,>=10.4
+Requires-Dist: itsdangerous
+Requires-Dist: python-multipart>=0.0.7
+Provides-Extra: notifications
+Requires-Dist: apprise<2.0.0,>=1.1.0; extra == "notifications"
 
 <p align="center"><img src="https://github.com/PrefectHQ/prefect/assets/3407835/c654cbc6-63e8-4ada-a92a-efd2f8f24b85" width=1000></p>
 

{prefect-client-2.20.9 → prefect_client-2.20.11}/requirements-client.txt

@@ -1,4 +1,4 @@
-anyio >= 4.4.0, < 5.0.0
+anyio >= 4.4.0, < 4.6.1
 asgi-lifespan >= 1.0, < 3.0
 cachetools >= 5.3, < 6.0
 cloudpickle >= 2.0, < 4.0
@@ -21,7 +21,7 @@ pathspec >= 0.8.0
 pendulum < 3.0; python_version < '3.12'
 pendulum >= 3.0.0, <4; python_version >= '3.12'
 # the version constraints for pydantic are merged with those from fastapi 0.103.2
-pydantic[email]>=1.10.0,!=2.0.0,!=2.0.1,!=2.1.0,<2.9.0
+pydantic[email]>=1.10.0,!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0
 pydantic_core >= 2.12.0, < 3.0.0
 python_dateutil >= 2.8.2, < 3.0.0
 python-slugify >= 5.0, < 9.0

{prefect-client-2.20.9 → prefect_client-2.20.11}/requirements.txt

@@ -3,7 +3,7 @@
 aiosqlite >= 0.17.0, < 1.0.0
 alembic >= 1.7.5, < 2.0.0
 apprise >= 1.8.0, < 2.0.0
-asyncpg >= 0.23, < 1.0.0
+asyncpg >= 0.23, < 0.30.0
 click >= 8.0, < 8.2
 cryptography >= 36.0.1
 dateparser >= 1.1.1, < 2.0.0
@@ -12,8 +12,8 @@ graphviz >= 0.20.1
 jinja2 >= 3.0.0, < 4.0.0
 jinja2-humanize-extension >= 0.4.0
 humanize >= 4.9.0, < 5.0.0
-kubernetes >= 24.2.0, < 30.0.0
+kubernetes >= 24.2.0, < 32.0.0
 pytz >= 2021.1, < 2025
 readchar >= 4.0.0, < 5.0.0
-sqlalchemy[asyncio] >= 1.4.22, != 1.4.33, < 3.0.0
+sqlalchemy[asyncio] >= 1.4.22, != 1.4.33, < 2.0.36
 typer >= 0.12.0, != 0.12.2, < 0.13.0

{prefect-client-2.20.9 → prefect_client-2.20.11}/setup.cfg

@@ -37,6 +37,7 @@ filterwarnings =
 	ignore:The `RayTaskRunner` has moved:DeprecationWarning
 	ignore:The `DaskTaskRunner` has moved:DeprecationWarning
 	ignore:`DeploymentSpec` has been replaced by `Deployment`:DeprecationWarning
+	ignore:Please use `import python_multipart` instead:PendingDeprecationWarning
 	ignore:the imp module is deprecated:DeprecationWarning
 	ignore:distutils Version classes are deprecated:DeprecationWarning
 	ignore:The distutils package is deprecated:DeprecationWarning

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect/_internal/pydantic/v2_schema.py

@@ -9,6 +9,8 @@ import pydantic
 from pydantic import BaseModel as V2BaseModel
 from pydantic import ConfigDict, PydanticUndefinedAnnotation, create_model
 from pydantic.type_adapter import TypeAdapter
+from pydantic.v1 import BaseModel as V1BaseModel
+from pydantic.v1 import SecretStr as V1SecretStr
 
 from prefect._internal.pydantic.annotations.pendulum import (
     PydanticPendulumDateTimeType,
@@ -30,6 +32,18 @@ def is_v2_model(v) -> bool:
     return False
 
 
+def is_v1_model(v) -> bool:
+    if isinstance(v, V1BaseModel):
+        return True
+    try:
+        if inspect.isclass(v) and issubclass(v, V1BaseModel):
+            return True
+    except TypeError:
+        pass
+
+    return False
+
+
 def is_v2_type(v) -> bool:
     if is_v2_model(v):
         return True
@@ -40,6 +54,18 @@ def is_v2_type(v) -> bool:
         return False
 
 
+def is_v1_type(v) -> bool:
+    if is_v1_model(v):
+        return True
+
+    try:
+        return v.__module__.startswith("pydantic.v1.types") or isinstance(
+            v, V1SecretStr
+        )
+    except AttributeError:
+        return False
+
+
 def has_v2_type_as_param(signature: inspect.Signature) -> bool:
     parameters = signature.parameters.values()
     for p in parameters:

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect/blocks/notifications.py

@@ -4,6 +4,7 @@ from typing import Dict, List, Optional
 
 from prefect._internal.pydantic import HAS_PYDANTIC_V2
 from prefect.logging import LogEavesdropper
+from prefect.utilities.urls import validate_restricted_url
 
 if HAS_PYDANTIC_V2:
     from pydantic.v1 import AnyHttpUrl, Field, SecretStr
@@ -88,6 +89,26 @@ class AppriseNotificationBlock(AbstractAppriseNotificationBlock, ABC):
         description="Incoming webhook URL used to send notifications.",
         examples=["https://hooks.example.com/XXX"],
     )
+    allow_private_urls: bool = Field(
+        default=True,
+        description="Whether to allow notifications to private URLs. Defaults to True.",
+    )
+
+    @sync_compatible
+    async def notify(
+        self,
+        body: str,
+        subject: Optional[str] = None,
+    ):
+        if not self.allow_private_urls:
+            try:
+                validate_restricted_url(self.url.get_secret_value())
+            except ValueError as exc:
+                if self._raise_on_failure:
+                    raise NotificationError(str(exc))
+                raise
+
+        await super().notify(body, subject)
 
 
 # TODO: Move to prefect-slack once collection block auto-registration is
@@ -281,6 +302,27 @@ class PagerDutyWebHook(AbstractAppriseNotificationBlock):
         )
         self._start_apprise_client(url)
 
+    @sync_compatible
+    async def notify(
+        self,
+        body: str,
+        subject: Optional[str] = None,
+    ):
+        """
+        Apprise will combine subject and body by default, so we need to move
+        the body into the custom_details field. custom_details is part of the
+        webhook url, so we need to update the url and restart the client.
+        """
+        if subject:
+            self.custom_details = self.custom_details or {}
+            self.custom_details.update(
+                {"Prefect Notification Body": body.replace(" ", "%20")}
+            )
+            body = " "
+            self.block_initialization()
+
+        await super().notify(body, subject)
+
 
 class TwilioSMS(AbstractAppriseNotificationBlock):
     """Enables sending notifications via Twilio SMS.

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect/blocks/webhook.py

@@ -3,6 +3,7 @@ from typing import Optional
 from httpx import AsyncClient, AsyncHTTPTransport, Response
 
 from prefect._internal.pydantic import HAS_PYDANTIC_V2
+from prefect.utilities.urls import validate_restricted_url
 
 if HAS_PYDANTIC_V2:
     from pydantic.v1 import Field, SecretStr
@@ -38,7 +39,10 @@ class Webhook(Block):
         description="The webhook URL.",
         examples=["https://hooks.slack.com/XXX"],
     )
-
+    allow_private_urls: bool = Field(
+        default=True,
+        description="Whether to allow notifications to private URLs. Defaults to True.",
+    )
     headers: SecretDict = Field(
         default_factory=lambda: SecretDict(dict()),
         title="Webhook Headers",
@@ -55,6 +59,9 @@ class Webhook(Block):
         Args:
             payload: an optional payload to send when calling the webhook.
         """
+        if not self.allow_private_urls:
+            validate_restricted_url(self.url.get_secret_value())
+
         async with self._client:
             return await self._client.request(
                 method=self.method,

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect/client/orchestration.py

@@ -8,12 +8,14 @@ from typing import (
     Dict,
     Iterable,
     List,
+    Literal,
     NoReturn,
     Optional,
     Set,
     Tuple,
     TypeVar,
     Union,
+    overload,
 )
 from uuid import UUID, uuid4
 
@@ -178,6 +180,20 @@ class ServerType(AutoEnum):
         return PREFECT_EXPERIMENTAL_EVENTS and PREFECT_API_SERVICES_TRIGGERS_ENABLED
 
 
+@overload
+def get_client(
+    httpx_settings: Optional[Dict[str, Any]] = None, sync_client: Literal[False] = False
+) -> "PrefectClient":
+    ...
+
+
+@overload
+def get_client(
+    httpx_settings: Optional[Dict[str, Any]] = None, sync_client: Literal[True] = True
+) -> "SyncPrefectClient":
+    ...
+
+
 def get_client(
     httpx_settings: Optional[Dict[str, Any]] = None, sync_client: bool = False
 ) -> Union["PrefectClient", "SyncPrefectClient"]:

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect/flows.py

@@ -45,11 +45,15 @@ from prefect._internal.pydantic import HAS_PYDANTIC_V2
 
 if HAS_PYDANTIC_V2:
     import pydantic.v1 as pydantic
+    from pydantic import BaseModel as V2BaseModel
     from pydantic import ValidationError as V2ValidationError
     from pydantic.v1 import BaseModel as V1BaseModel
     from pydantic.v1.decorator import ValidatedFunction as V1ValidatedFunction
 
-    from ._internal.pydantic.v2_schema import is_v2_type
+    from ._internal.pydantic.v2_schema import (
+        is_v1_type,
+        is_v2_type,
+    )
     from ._internal.pydantic.v2_validated_func import V2ValidatedFunction
     from ._internal.pydantic.v2_validated_func import (
         V2ValidatedFunction as ValidatedFunction,
@@ -339,6 +343,16 @@ class Flow(Generic[P, R]):
             # is not picklable in some environments
             try:
                 ValidatedFunction(self.fn, config={"arbitrary_types_allowed": True})
+            except TypeError as exc:
+                if (
+                    HAS_PYDANTIC_V2
+                    and "`__modify_schema__` method is not supported" in str(exc)
+                ):
+                    V1ValidatedFunction(
+                        self.fn, config={"arbitrary_types_allowed": True}
+                    )
+                else:
+                    raise
             except pydantic.ConfigError as exc:
                 raise ValueError(
                     "Flow function is not compatible with `validate_parameters`. "
@@ -510,19 +524,33 @@ class Flow(Generic[P, R]):
         args, kwargs = parameters_to_args_kwargs(self.fn, parameters)
 
         if HAS_PYDANTIC_V2:
-            has_v1_models = any(isinstance(o, V1BaseModel) for o in args) or any(
-                isinstance(o, V1BaseModel) for o in kwargs.values()
+            sig = inspect.signature(self.fn)
+
+            has_v1_types = any(
+                is_v1_type(param.annotation) for param in sig.parameters.values()
+            )
+            has_v1_models = any(
+                issubclass(param.annotation, V1BaseModel)
+                if isinstance(param.annotation, type)
+                else False
+                for param in sig.parameters.values()
             )
-            has_v2_types = any(is_v2_type(o) for o in args) or any(
-                is_v2_type(o) for o in kwargs.values()
+            has_v2_types = any(
+                is_v2_type(param.annotation) for param in sig.parameters.values()
+            )
+            has_v2_models = any(
+                issubclass(param.annotation, V2BaseModel)
+                if isinstance(param.annotation, type)
+                else False
+                for param in sig.parameters.values()
             )
 
-            if has_v1_models and has_v2_types:
+            if (has_v1_types and has_v2_types) or (has_v1_models and has_v2_models):
                 raise ParameterTypeError(
                     "Cannot mix Pydantic v1 and v2 types as arguments to a flow."
                 )
 
-            if has_v1_models:
+            if has_v1_models or has_v1_types:
                 validated_fn = V1ValidatedFunction(
                     self.fn, config={"arbitrary_types_allowed": True}
                 )
@@ -530,7 +558,6 @@ class Flow(Generic[P, R]):
                 validated_fn = V2ValidatedFunction(
                     self.fn, config={"arbitrary_types_allowed": True}
                 )
-
         else:
             validated_fn = ValidatedFunction(
                 self.fn, config={"arbitrary_types_allowed": True}

prefect_client-2.20.11/src/prefect/utilities/urls.py

@@ -0,0 +1,49 @@
+import ipaddress
+import socket
+from urllib.parse import urlparse
+
+
+def validate_restricted_url(url: str):
+    """
+    Validate that the provided URL is safe for outbound requests.  This prevents
+    attacks like SSRF (Server Side Request Forgery), where an attacker can make
+    requests to internal services (like the GCP metadata service, localhost addresses,
+    or in-cluster Kubernetes services)
+    Args:
+        url: The URL to validate.
+    Raises:
+        ValueError: If the URL is a restricted URL.
+    """
+
+    try:
+        parsed_url = urlparse(url)
+    except ValueError:
+        raise ValueError(f"{url!r} is not a valid URL.")
+
+    if parsed_url.scheme not in ("http", "https"):
+        raise ValueError(
+            f"{url!r} is not a valid URL.  Only HTTP and HTTPS URLs are allowed."
+        )
+
+    hostname = parsed_url.hostname or ""
+
+    # Remove IPv6 brackets if present
+    if hostname.startswith("[") and hostname.endswith("]"):
+        hostname = hostname[1:-1]
+
+    if not hostname:
+        raise ValueError(f"{url!r} is not a valid URL.")
+
+    try:
+        ip_address = socket.gethostbyname(hostname)
+        ip = ipaddress.ip_address(ip_address)
+    except socket.gaierror:
+        try:
+            ip = ipaddress.ip_address(hostname)
+        except ValueError:
+            raise ValueError(f"{url!r} is not a valid URL.  It could not be resolved.")
+
+    if ip.is_private:
+        raise ValueError(
+            f"{url!r} is not a valid URL.  It resolves to the private address {ip}."
+        )

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect/workers/base.py

@@ -137,6 +137,12 @@ class BaseJobConfiguration(BaseModel):
         variables = cls._get_base_config_defaults(
             variables_schema.get("properties", {})
         )
+
+        # copy variable defaults for `env` to job config before they're replaced by
+        # deployment overrides
+        if variables.get("env"):
+            job_config["env"] = variables.get("env")
+
         variables.update(values)
 
         # deep merge `env`

{prefect-client-2.20.9 → prefect_client-2.20.11/src/prefect_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: prefect-client
-Version: 2.20.9
+Version: 2.20.11
 Summary: Workflow orchestration and management.
 Home-page: https://www.prefect.io
 Author: Prefect Technologies, Inc.
@@ -21,8 +21,46 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
-Provides-Extra: notifications
 License-File: LICENSE
+Requires-Dist: anyio<4.6.1,>=4.4.0
+Requires-Dist: asgi-lifespan<3.0,>=1.0
+Requires-Dist: cachetools<6.0,>=5.3
+Requires-Dist: cloudpickle<4.0,>=2.0
+Requires-Dist: coolname<3.0.0,>=1.0.4
+Requires-Dist: croniter<3.0.0,>=1.0.12
+Requires-Dist: fsspec>=2022.5.0
+Requires-Dist: exceptiongroup>=1.2.1
+Requires-Dist: graphviz>=0.20.1
+Requires-Dist: griffe<2.0.0,>=0.49.0
+Requires-Dist: httpcore<2.0.0,>=1.0.5
+Requires-Dist: httpx[http2]!=0.23.2,>=0.23
+Requires-Dist: importlib_metadata>=4.4; python_version < "3.10"
+Requires-Dist: importlib-resources<6.5.0,>=6.1.3
+Requires-Dist: jsonpatch<2.0,>=1.32
+Requires-Dist: jsonschema<5.0.0,>=4.0.0
+Requires-Dist: orjson<4.0,>=3.7
+Requires-Dist: packaging<24.3,>=21.3
+Requires-Dist: pathspec>=0.8.0
+Requires-Dist: pendulum<3.0; python_version < "3.12"
+Requires-Dist: pendulum<4,>=3.0.0; python_version >= "3.12"
+Requires-Dist: pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0,>=1.10.0
+Requires-Dist: pydantic_core<3.0.0,>=2.12.0
+Requires-Dist: python_dateutil<3.0.0,>=2.8.2
+Requires-Dist: python-slugify<9.0,>=5.0
+Requires-Dist: pyyaml<7.0.0,>=5.4.1
+Requires-Dist: rfc3339-validator<0.2.0,>=0.1.4
+Requires-Dist: rich<14.0,>=11.0
+Requires-Dist: ruamel.yaml>=0.17.0
+Requires-Dist: sniffio<2.0.0,>=1.3.0
+Requires-Dist: toml>=0.10.0
+Requires-Dist: typing_extensions<5.0.0,>=4.5.0
+Requires-Dist: ujson<6.0.0,>=5.8.0
+Requires-Dist: uvicorn!=0.29.0,>=0.14.0
+Requires-Dist: websockets<14.0,>=10.4
+Requires-Dist: itsdangerous
+Requires-Dist: python-multipart>=0.0.7
+Provides-Extra: notifications
+Requires-Dist: apprise<2.0.0,>=1.1.0; extra == "notifications"
 
 <p align="center"><img src="https://github.com/PrefectHQ/prefect/assets/3407835/c654cbc6-63e8-4ada-a92a-efd2f8f24b85" width=1000></p>
 

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect_client.egg-info/SOURCES.txt

@@ -95,6 +95,7 @@ src/prefect/_vendor/fastapi/exceptions.py
 src/prefect/_vendor/fastapi/logger.py
 src/prefect/_vendor/fastapi/param_functions.py
 src/prefect/_vendor/fastapi/params.py
+src/prefect/_vendor/fastapi/py.typed
 src/prefect/_vendor/fastapi/requests.py
 src/prefect/_vendor/fastapi/responses.py
 src/prefect/_vendor/fastapi/routing.py
@@ -140,6 +141,7 @@ src/prefect/_vendor/starlette/datastructures.py
 src/prefect/_vendor/starlette/endpoints.py
 src/prefect/_vendor/starlette/exceptions.py
 src/prefect/_vendor/starlette/formparsers.py
+src/prefect/_vendor/starlette/py.typed
 src/prefect/_vendor/starlette/requests.py
 src/prefect/_vendor/starlette/responses.py
 src/prefect/_vendor/starlette/routing.py
@@ -285,6 +287,7 @@ src/prefect/utilities/slugify.py
 src/prefect/utilities/templating.py
 src/prefect/utilities/text.py
 src/prefect/utilities/timeout.py
+src/prefect/utilities/urls.py
 src/prefect/utilities/visualization.py
 src/prefect/utilities/schema_tools/__init__.py
 src/prefect/utilities/schema_tools/hydration.py
@@ -299,4 +302,30 @@ src/prefect_client.egg-info/PKG-INFO
 src/prefect_client.egg-info/SOURCES.txt
 src/prefect_client.egg-info/dependency_links.txt
 src/prefect_client.egg-info/requires.txt
-src/prefect_client.egg-info/top_level.txt
+src/prefect_client.egg-info/top_level.txt
+tests/test_artifacts.py
+tests/test_automations.py
+tests/test_background_tasks.py
+tests/test_context.py
+tests/test_deployments.py
+tests/test_engine.py
+tests/test_exceptions.py
+tests/test_filesystems.py
+tests/test_flow_runs.py
+tests/test_flows.py
+tests/test_flows_compat.py
+tests/test_futures.py
+tests/test_highlighters.py
+tests/test_import_interceptor.py
+tests/test_log_prints.py
+tests/test_logging.py
+tests/test_new_flow_engine.py
+tests/test_new_task_engine.py
+tests/test_plugins.py
+tests/test_serializers.py
+tests/test_settings.py
+tests/test_states.py
+tests/test_task_runners.py
+tests/test_task_server.py
+tests/test_tasks.py
+tests/test_variables.py

{prefect-client-2.20.9 → prefect_client-2.20.11}/src/prefect_client.egg-info/requires.txt

@@ -1,4 +1,4 @@
-anyio<5.0.0,>=4.4.0
+anyio<4.6.1,>=4.4.0
 asgi-lifespan<3.0,>=1.0
 cachetools<6.0,>=5.3
 cloudpickle<4.0,>=2.0
@@ -16,7 +16,7 @@ jsonschema<5.0.0,>=4.0.0
 orjson<4.0,>=3.7
 packaging<24.3,>=21.3
 pathspec>=0.8.0
-pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<2.9.0,>=1.10.0
+pydantic[email]!=2.0.0,!=2.0.1,!=2.1.0,<3.0.0,>=1.10.0
 pydantic_core<3.0.0,>=2.12.0
 python_dateutil<3.0.0,>=2.8.2
 python-slugify<9.0,>=5.0