prefect-client 2.19.3__tar.gz → 2.19.4__tar.gz

{prefect-client-2.19.3/src/prefect_client.egg-info → prefect-client-2.19.4}/PKG-INFO

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

{prefect-client-2.19.3 → prefect-client-2.19.4}/src/prefect/deployments/base.py

@@ -396,7 +396,13 @@ async def _find_flow_functions_in_file(filename: str) -> List[Dict]:
             return decorated_functions
 
     for node in ast.walk(tree):
-        if isinstance(node, ast.FunctionDef):
+        if isinstance(
+            node,
+            (
+                ast.FunctionDef,
+                ast.AsyncFunctionDef,
+            ),
+        ):
             for decorator in node.decorator_list:
                 # handles @flow
                 is_name_match = (

{prefect-client-2.19.3 → prefect-client-2.19.4}/src/prefect/flows.py

@@ -1830,7 +1830,14 @@ def load_flow_argument_from_entrypoint(
         (
             node
             for node in ast.walk(parsed_code)
-            if isinstance(node, ast.FunctionDef) and node.name == func_name
+            if isinstance(
+                node,
+                (
+                    ast.FunctionDef,
+                    ast.AsyncFunctionDef,
+                ),
+            )
+            and node.name == func_name
         ),
         None,
     )

{prefect-client-2.19.3 → prefect-client-2.19.4}/src/prefect/utilities/callables.py

@@ -448,7 +448,14 @@ def _generate_signature_from_source(
         (
             node
             for node in ast.walk(parsed_code)
-            if isinstance(node, ast.FunctionDef) and node.name == func_name
+            if isinstance(
+                node,
+                (
+                    ast.FunctionDef,
+                    ast.AsyncFunctionDef,
+                ),
+            )
+            and node.name == func_name
         ),
         None,
     )
@@ -456,6 +463,26 @@ def _generate_signature_from_source(
         raise ValueError(f"Function {func_name} not found in source code")
     parameters = []
 
+    # Handle annotations for positional only args e.g. def func(a, /, b, c)
+    for arg in func_def.args.posonlyargs:
+        name = arg.arg
+        annotation = arg.annotation
+        if annotation is not None:
+            try:
+                ann_code = compile(ast.Expression(annotation), "<string>", "eval")
+                annotation = eval(ann_code, namespace)
+            except Exception as e:
+                logger.debug("Failed to evaluate annotation for %s: %s", name, e)
+                annotation = inspect.Parameter.empty
+        else:
+            annotation = inspect.Parameter.empty
+
+        param = inspect.Parameter(
+            name, inspect.Parameter.POSITIONAL_ONLY, annotation=annotation
+        )
+        parameters.append(param)
+
+    # Determine the annotations for args e.g. def func(a: int, b: str, c: float)
     for arg in func_def.args.args:
         name = arg.arg
         annotation = arg.annotation
@@ -478,6 +505,7 @@ def _generate_signature_from_source(
         )
         parameters.append(param)
 
+    # Handle default values for args e.g. def func(a=1, b="hello", c=3.14)
     defaults = [None] * (
         len(func_def.args.args) - len(func_def.args.defaults)
     ) + func_def.args.defaults
@@ -493,6 +521,42 @@ def _generate_signature_from_source(
                 default = None  # Set to None if evaluation fails
             parameters[parameters.index(param)] = param.replace(default=default)
 
+    # Handle annotations for keyword only args e.g. def func(*, a: int, b: str)
+    for kwarg in func_def.args.kwonlyargs:
+        name = kwarg.arg
+        annotation = kwarg.annotation
+        if annotation is not None:
+            try:
+                ann_code = compile(ast.Expression(annotation), "<string>", "eval")
+                annotation = eval(ann_code, namespace)
+            except Exception as e:
+                logger.debug("Failed to evaluate annotation for %s: %s", name, e)
+                annotation = inspect.Parameter.empty
+        else:
+            annotation = inspect.Parameter.empty
+
+        param = inspect.Parameter(
+            name, inspect.Parameter.KEYWORD_ONLY, annotation=annotation
+        )
+        parameters.append(param)
+
+    # Handle default values for keyword only args e.g. def func(*, a=1, b="hello")
+    defaults = [None] * (
+        len(func_def.args.kwonlyargs) - len(func_def.args.kw_defaults)
+    ) + func_def.args.kw_defaults
+    for param, default in zip(parameters[-len(func_def.args.kwonlyargs) :], defaults):
+        if default is not None:
+            try:
+                def_code = compile(ast.Expression(default), "<string>", "eval")
+                default = eval(def_code, namespace)
+            except Exception as e:
+                logger.debug(
+                    "Failed to evaluate default value for %s: %s", param.name, e
+                )
+                default = None
+            parameters[parameters.index(param)] = param.replace(default=default)
+
+    # Handle annotations for varargs and kwargs e.g. def func(*args: int, **kwargs: str)
     if func_def.args.vararg:
         parameters.append(
             inspect.Parameter(
@@ -504,7 +568,7 @@ def _generate_signature_from_source(
             inspect.Parameter(func_def.args.kwarg.arg, inspect.Parameter.VAR_KEYWORD)
         )
 
-    # Handle return annotation
+    # Handle return annotation e.g. def func() -> int
     return_annotation = func_def.returns
     if return_annotation is not None:
         try:
@@ -536,7 +600,14 @@ def _get_docstring_from_source(source_code: str, func_name: str) -> Optional[str
         (
             node
             for node in ast.walk(parsed_code)
-            if isinstance(node, ast.FunctionDef) and node.name == func_name
+            if isinstance(
+                node,
+                (
+                    ast.FunctionDef,
+                    ast.AsyncFunctionDef,
+                ),
+            )
+            and node.name == func_name
         ),
         None,
     )

{prefect-client-2.19.3 → prefect-client-2.19.4}/src/prefect/utilities/importtools.py

@@ -379,7 +379,7 @@ def safe_load_namespace(source_code: str):
     """
     parsed_code = ast.parse(source_code)
 
-    namespace = {}
+    namespace = {"__name__": "prefect_safe_namespace_loader"}
 
     # Walk through the AST and find all import statements
     for node in ast.walk(parsed_code):
@@ -413,11 +413,11 @@ def safe_load_namespace(source_code: str):
             except ImportError as e:
                 logger.debug("Failed to import from %s: %s", node.module, e)
 
-    # Handle local class definitions
+    # Handle local definitions
     for node in ast.walk(parsed_code):
-        if isinstance(node, (ast.ClassDef, ast.FunctionDef)):
+        if isinstance(node, (ast.ClassDef, ast.FunctionDef, ast.Assign)):
             try:
-                # Compile and execute each class and function definition locally
+                # Compile and execute each class and function definition and assignment
                 code = compile(
                     ast.Module(body=[node], type_ignores=[]),
                     filename="<ast>",
@@ -425,5 +425,5 @@ def safe_load_namespace(source_code: str):
                 )
                 exec(code, namespace)
             except Exception as e:
-                logger.debug("Failed to compile class definition: %s", e)
+                logger.debug("Failed to compile: %s", e)
     return namespace

{prefect-client-2.19.3 → prefect-client-2.19.4/src/prefect_client.egg-info}/PKG-INFO

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