prefect-client 2.20.4__tar.gz → 2.20.5__tar.gz

{prefect_client-2.20.4/src/prefect_client.egg-info → prefect_client-2.20.5}/PKG-INFO

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

prefect_client-2.20.5/src/prefect/_internal/integrations.py

@@ -0,0 +1,7 @@
+KNOWN_EXTRAS_FOR_PACKAGES = {
+    "prefect-kubernetes": "prefect[kubernetes]",
+    "prefect-aws": "prefect[aws]",
+    "prefect-gcp": "prefect[gcp]",
+    "prefect-azure": "prefect[azure]",
+    "prefect-docker": "prefect[docker]",
+}

{prefect_client-2.20.4 → prefect_client-2.20.5}/src/prefect/blocks/core.py

@@ -507,10 +507,9 @@ class Block(BaseModel, ABC):
         `<module>:11: No type or annotation for parameter 'write_json'`
         because griffe is unable to parse the types from pydantic.BaseModel.
         """
-        with disable_logger("griffe.docstrings.google"):
-            with disable_logger("griffe.agents.nodes"):
-                docstring = Docstring(cls.__doc__)
-                parsed = parse(docstring, Parser.google)
+        with disable_logger("griffe"):
+            docstring = Docstring(cls.__doc__)
+            parsed = parse(docstring, Parser.google)
         return parsed
 
     @classmethod

{prefect_client-2.20.4 → prefect_client-2.20.5}/src/prefect/deployments/steps/core.py

@@ -21,6 +21,7 @@ from typing import Any, Dict, List, Optional, Tuple, Union
 
 from prefect._internal.compatibility.deprecated import PrefectDeprecationWarning
 from prefect._internal.concurrency.api import Call, from_async
+from prefect._internal.integrations import KNOWN_EXTRAS_FOR_PACKAGES
 from prefect.logging.loggers import get_logger
 from prefect.settings import PREFECT_DEBUG_MODE
 from prefect.utilities.importtools import import_object
@@ -83,6 +84,11 @@ def _get_function_for_step(
             raise
 
     try:
+        packages = [
+            KNOWN_EXTRAS_FOR_PACKAGES.get(package, package)
+            for package in packages
+            if package
+        ]
         subprocess.check_call([sys.executable, "-m", "pip", "install", *packages])
     except subprocess.CalledProcessError:
         get_logger("deployments.steps.core").warning(

{prefect_client-2.20.4 → prefect_client-2.20.5}/src/prefect/tasks.py

@@ -141,8 +141,17 @@ def _generate_task_key(fn: Callable[..., Any]) -> str:
 
     qualname = fn.__qualname__.split(".")[-1]
 
+    try:
+        code_obj = getattr(fn, "__code__", None)
+        if code_obj is None:
+            code_obj = fn.__call__.__code__
+    except AttributeError:
+        raise AttributeError(
+            f"{fn} is not a standard Python function object and could not be converted to a task."
+        ) from None
+
     code_hash = (
-        h[:NUM_CHARS_DYNAMIC_KEY] if (h := hash_objects(fn.__code__)) else "unknown"
+        h[:NUM_CHARS_DYNAMIC_KEY] if (h := hash_objects(code_obj)) else "unknown"
     )
 
     return f"{qualname}-{code_hash}"

{prefect_client-2.20.4 → prefect_client-2.20.5}/src/prefect/utilities/callables.py

@@ -255,9 +255,7 @@ def parameter_docstrings(docstring: Optional[str]) -> Dict[str, str]:
     if not docstring:
         return param_docstrings
 
-    with disable_logger("griffe.docstrings.google"), disable_logger(
-        "griffe.agents.nodes"
-    ):
+    with disable_logger("griffe"):
         parsed = parse(Docstring(docstring), Parser.google)
         for section in parsed:
             if section.kind != DocstringSectionKind.parameters:

{prefect_client-2.20.4 → prefect_client-2.20.5}/src/prefect/variables.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Union
 
 from prefect._internal.compatibility.deprecated import deprecated_callable
 from prefect.client.schemas.actions import VariableCreate as VariableRequest
@@ -26,7 +26,7 @@ class Variable(VariableRequest):
         value: str,
         tags: Optional[List[str]] = None,
         overwrite: bool = False,
-    ) -> Optional[str]:
+    ) -> Optional["Variable"]:
         """
         Sets a new variable. If one exists with the same name, user must pass `overwrite=True`
         ```
@@ -47,8 +47,7 @@ class Variable(VariableRequest):
         """
         client, _ = get_or_create_client()
         variable = await client.read_variable_by_name(name)
-        var_dict = {"name": name, "value": value}
-        var_dict["tags"] = tags or []
+        var_dict = {"name": name, "value": value, "tags": tags or []}
         if variable:
             if not overwrite:
                 raise ValueError(
@@ -65,7 +64,9 @@ class Variable(VariableRequest):
 
     @classmethod
     @sync_compatible
-    async def get(cls, name: str, default: Optional[str] = None) -> Optional[str]:
+    async def get(
+        cls, name: str, default: Optional[str] = None
+    ) -> Optional[Union["Variable", str]]:
         """
         Get a variable by name. If doesn't exist return the default.
         ```
@@ -86,7 +87,12 @@ class Variable(VariableRequest):
         """
         client, _ = get_or_create_client()
         variable = await client.read_variable_by_name(name)
-        return variable if variable else default
+
+        return (
+            Variable(name=variable.name, value=variable.value, tags=variable.tags)
+            if variable
+            else default
+        )
 
 
 @deprecated_callable(start_date="Apr 2024")
@@ -110,5 +116,7 @@ async def get(name: str, default: Optional[str] = None) -> Optional[str]:
             var = await variables.get("my_var")
     ```
     """
-    variable = await Variable.get(name)
-    return variable.value if variable else default
+    variable = await Variable.get(name, default=default)
+    if isinstance(variable, Variable):
+        variable = variable.value
+    return variable

{prefect_client-2.20.4 → prefect_client-2.20.5/src/prefect_client.egg-info}/PKG-INFO

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

{prefect_client-2.20.4 → prefect_client-2.20.5}/src/prefect_client.egg-info/SOURCES.txt

@@ -37,6 +37,7 @@ src/prefect/tasks.py
 src/prefect/variables.py
 src/prefect/_internal/__init__.py
 src/prefect/_internal/_logging.py
+src/prefect/_internal/integrations.py
 src/prefect/_internal/pytz.py
 src/prefect/_internal/compatibility/__init__.py
 src/prefect/_internal/compatibility/deprecated.py

{prefect_client-2.20.4 → prefect_client-2.20.5}/tests/test_tasks.py

@@ -153,6 +153,21 @@ class TestTaskKey:
 
         assert noop.task_key.startswith("noop-")
 
+    def test_task_key_with_funky_class(self):
+        class Funky:
+            def __call__(self, x):
+                return x
+
+        # set up class to trigger certain code path
+        # see https://github.com/PrefectHQ/prefect/issues/15058
+        funky = Funky()
+        funky.__qualname__ = "__main__.Funky"
+        if hasattr(funky, "__code__"):
+            del funky.__code__
+
+        tt = task(funky)
+        assert tt.task_key.startswith("Funky-")
+
 
 class TestTaskRunName:
     def test_run_name_default(self):