runnable 0.37.0__py3-none-any.whl → 0.38.0__py3-none-any.whl

runnable/graph.py

@@ -329,7 +329,7 @@ def create_graph(dag_config: Dict[str, Any], internal_branch_name: str = "") ->
     Returns:
         Graph: The created graph object
     """
-    description: str = dag_config.get("description", None)
+    description: str | None = dag_config.get("description", None)
     start_at: str = cast(
         str, dag_config.get("start_at")
     )  # Let the start_at be relative to the graph

runnable/parameters.py

@@ -1,10 +1,10 @@
+import argparse
 import inspect
 import json
 import logging
 import os
 from typing import Any, Dict, Type
 
-import pydantic
 from pydantic import BaseModel, ConfigDict
 from typing_extensions import Callable
 
@@ -48,6 +48,25 @@ def get_user_set_parameters(remove: bool = False) -> Dict[str, JsonParameter]:
     return parameters
 
 
+def return_json_parameters(params: Dict[str, Any]) -> Dict[str, Any]:
+    """
+    Returns the parameters as a JSON serializable dictionary.
+
+    Args:
+        params (dict): The parameters to serialize.
+
+    Returns:
+        dict: The JSON serializable dictionary.
+    """
+    return_params = {}
+    for key, value in params.items():
+        if isinstance(value, ObjectParameter):
+            continue
+
+        return_params[key] = value.get_value()
+    return return_params
+
+
 def filter_arguments_for_func(
     func: Callable[..., Any],
     params: Dict[str, Any],
@@ -55,8 +74,14 @@ def filter_arguments_for_func(
 ) -> Dict[str, Any]:
     """
     Inspects the function to be called as part of the pipeline to find the arguments of the function.
-    Matches the function arguments to the parameters available either by command line or by up stream steps.
+    Matches the function arguments to the parameters available either by static parameters or by up stream steps.
 
+    The function "func" signature could be:
+    - def my_function(arg1: int, arg2: str, arg3: float):
+    - def my_function(arg1: int, arg2: str, arg3: float, **kwargs):
+        in this case, we would need to send in remaining keyword arguments as a dictionary.
+    - def my_function(arg1: int, arg2: str, arg3: float, args: argparse.Namespace):
+        In this case, we need to send the rest of the parameters as attributes of the args object.
 
     Args:
         func (Callable): The function to inspect
@@ -72,63 +97,109 @@ def filter_arguments_for_func(
         params[key] = JsonParameter(kind="json", value=v)
 
     bound_args = {}
-    unassigned_params = set(params.keys())
-    # Check if VAR_KEYWORD is used, it is we send back everything
-    # If **kwargs is present in the function signature, we send back everything
-    for name, value in function_args.items():
-        if value.kind != inspect.Parameter.VAR_KEYWORD:
-            continue
-        # Found VAR_KEYWORD, we send back everything as found
-        for key, value in params.items():
-            bound_args[key] = params[key].get_value()
+    missing_required_args: list[str] = []
+    var_keyword_param = None
+    namespace_param = None
 
-        return bound_args
-
-    # Lets return what is asked for then!!
+    # First pass: Handle regular parameters and identify special parameters
     for name, value in function_args.items():
         # Ignore any *args
         if value.kind == inspect.Parameter.VAR_POSITIONAL:
             logger.warning(f"Ignoring parameter {name} as it is VAR_POSITIONAL")
             continue
 
-        if name not in params:
-            # No parameter of this name was provided
-            if value.default == inspect.Parameter.empty:
-                # No default value is given in the function signature. error as parameter is required.
-                raise ValueError(
-                    f"Parameter {name} is required for {func.__name__} but not provided"
-                )
-            # default value is given in the function signature, nothing further to do.
+        # Check for **kwargs parameter
+        if value.kind == inspect.Parameter.VAR_KEYWORD:
+            var_keyword_param = name
             continue
 
-        param_value = params[name]
-
-        if type(value.annotation) in [
-            BaseModel,
-            pydantic._internal._model_construction.ModelMetaclass,
-        ] and not isinstance(param_value, ObjectParameter):
-            # Even if the annotation is a pydantic model, it can be passed as an object parameter
-            # We try to cast it as a pydantic model if asked
-            named_param = params[name].get_value()
-
-            if not isinstance(named_param, dict):
-                # A case where the parameter is a one attribute model
-                named_param = {name: named_param}
-
-            bound_model = bind_args_for_pydantic_model(named_param, value.annotation)
-            bound_args[name] = bound_model
+        # Check for argparse.Namespace parameter
+        if value.annotation == argparse.Namespace:
+            namespace_param = name
+            continue
 
-        elif value.annotation in [str, int, float, bool]:
-            # Cast it if its a primitive type. Ensure the type matches the annotation.
-            bound_args[name] = value.annotation(params[name].get_value())
+        # Handle regular parameters
+        if name not in params:
+            if value.default != inspect.Parameter.empty:
+                # Default value is given in the function signature, we can use it
+                bound_args[name] = value.default
+            else:
+                # This is a required parameter that's missing
+                missing_required_args.append(name)
         else:
-            bound_args[name] = params[name].get_value()
-
-        unassigned_params.remove(name)
-
-        params = {
-            key: params[key] for key in unassigned_params
-        }  # remove keys from params if they are assigned
+            # We have a parameter of this name, lets bind it
+            param_value = params[name]
+
+            if (
+                inspect.isclass(value.annotation)
+                and issubclass(value.annotation, BaseModel)
+            ) and not isinstance(param_value, ObjectParameter):
+                # Even if the annotation is a pydantic model, it can be passed as an object parameter
+                # We try to cast it as a pydantic model if asked
+                named_param = params[name].get_value()
+
+                if not isinstance(named_param, dict):
+                    # A case where the parameter is a one attribute model
+                    named_param = {name: named_param}
+
+                bound_model = bind_args_for_pydantic_model(
+                    named_param, value.annotation
+                )
+                bound_args[name] = bound_model
+
+            elif value.annotation in [str, int, float, bool] and callable(
+                value.annotation
+            ):
+                # Cast it if its a primitive type. Ensure the type matches the annotation.
+                try:
+                    bound_args[name] = value.annotation(params[name].get_value())
+                except (ValueError, TypeError) as e:
+                    raise ValueError(
+                        f"Cannot cast parameter '{name}' to {value.annotation.__name__}: {e}"
+                    )
+            else:
+                # We do not know type of parameter, we send the value as found
+                bound_args[name] = params[name].get_value()
+
+    # Find extra parameters (parameters in params but not consumed by regular function parameters)
+    consumed_param_names = set(bound_args.keys()) | set(missing_required_args)
+    extra_params = {k: v for k, v in params.items() if k not in consumed_param_names}
+
+    # Second pass: Handle **kwargs and argparse.Namespace parameters
+    if var_keyword_param is not None:
+        # Function accepts **kwargs - add all extra parameters directly to bound_args
+        for param_name, param_value in extra_params.items():
+            bound_args[param_name] = param_value.get_value()
+    elif namespace_param is not None:
+        # Function accepts argparse.Namespace - create namespace with extra parameters
+        args_namespace = argparse.Namespace()
+        for param_name, param_value in extra_params.items():
+            setattr(args_namespace, param_name, param_value.get_value())
+        bound_args[namespace_param] = args_namespace
+    elif extra_params:
+        # Function doesn't accept **kwargs or namespace, but we have extra parameters
+        # This should only be an error if we also have missing required parameters
+        # or if the function truly can't handle the extra parameters
+        if missing_required_args:
+            # We have both missing required and extra parameters - this is an error
+            raise ValueError(
+                f"Function {func.__name__} has parameters {missing_required_args} that are not present in the parameters"
+            )
+        # If we only have extra parameters and no missing required ones, we just ignore the extras
+        # This allows for more flexible parameter passing
+
+    # Check for missing required parameters
+    if missing_required_args:
+        if var_keyword_param is None and namespace_param is None:
+            # No way to handle missing parameters
+            raise ValueError(
+                f"Function {func.__name__} has parameters {missing_required_args} that are not present in the parameters"
+            )
+        # If we have **kwargs or namespace, missing parameters might be handled there
+        # But if they're truly required (no default), we should still error
+        raise ValueError(
+            f"Function {func.__name__} has parameters {missing_required_args} that are not present in the parameters"
+        )
 
     return bound_args
 

{runnable-0.37.0.dist-info → runnable-0.38.0.dist-info}/METADATA

@@ -1,12 +1,10 @@
 Metadata-Version: 2.4
 Name: runnable
-Version: 0.37.0
+Version: 0.38.0
 Summary: Add your description here
 Author-email: "Vammi, Vijay" <vijay.vammi@astrazeneca.com>
 License-File: LICENSE
 Requires-Python: >=3.10
-Requires-Dist: click-plugins>=1.1.1
-Requires-Dist: click<=8.1.3
 Requires-Dist: cloudpathlib>=0.20.0
 Requires-Dist: dill>=0.3.9
 Requires-Dist: pydantic>=2.10.3
@@ -15,7 +13,7 @@ Requires-Dist: rich>=13.9.4
 Requires-Dist: ruamel-yaml>=0.18.6
 Requires-Dist: setuptools>=75.6.0
 Requires-Dist: stevedore>=5.4.0
-Requires-Dist: typer>=0.15.1
+Requires-Dist: typer>=0.17.3
 Provides-Extra: docker
 Requires-Dist: docker>=7.1.0; extra == 'docker'
 Provides-Extra: examples

{runnable-0.37.0.dist-info → runnable-0.38.0.dist-info}/RECORD

@@ -56,17 +56,17 @@ runnable/defaults.py,sha256=4UYuShnjEyWP529UlFnubvkBpOcczKIdE4jEOhPBwl4,3076
 runnable/entrypoints.py,sha256=46prgr3_FYtBMlRbUXIDSpgZUBgaxcdJAekXhgEIj7M,6578
 runnable/exceptions.py,sha256=t5tSlYqe_EjU5liXu32yLLh_yrnXeFL93BuXfmQzV98,3268
 runnable/executor.py,sha256=CwzHkeGVpocACZLzfFS94TzKeiaPLv4NtXtvT3eoocY,15222
-runnable/graph.py,sha256=poQz5zcvq89ju_u5sYlunQLPbHnXTaUmjcvstPwvT4U,16536
+runnable/graph.py,sha256=ukJo_sqtBRD_ZX7ULbd2GnvpToAwGHcAowXPcqKjC4Q,16543
 runnable/names.py,sha256=A9ldUyULXuWjJ1MoXihHqlg-xeTVX-oWYTO5Ah0trmo,8128
 runnable/nodes.py,sha256=JHBxJib7SSQXY51bLHBXUvb0DlNSLNvyqz3JNEDLt8c,16926
-runnable/parameters.py,sha256=zEehAliVvCOLOnNZ4ExJvSDJM_2PWY0URZ0bmZUgCQA,5289
+runnable/parameters.py,sha256=HZW0bhAYxgMyvRZzUlwp29MVxmzoFU5ZoVJMJHnOcX8,8734
 runnable/pickler.py,sha256=ydJ_eti_U1F4l-YacFp7BWm6g5vTn04UXye25S1HVok,2684
 runnable/sdk.py,sha256=blLBWzXV2x7jxKQXWpjmeJ9k22jt5CKBQBqQpnt4agk,32587
 runnable/secrets.py,sha256=4L_dBFxTgr8r_hHUD6RlZEtqaOHDRsFG5PXO5wlvMI0,2324
 runnable/tasks.py,sha256=7yuoeG4ZqfxFUmN4mPS4i6kbQmzEpAwbPQweAUWY-ic,31366
 runnable/utils.py,sha256=amHW3KR_NGTDysGHcSafhh5WJUX7GPBSxqdPyzAIhao,11350
-runnable-0.37.0.dist-info/METADATA,sha256=nD9ezWOwkWw3Yi5_NBE_xqjRGKxqf_FnSsYb8P9oqxo,10047
-runnable-0.37.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-runnable-0.37.0.dist-info/entry_points.txt,sha256=KkxihZ0LLEiwvFl7RquyqZ0tp2fJDIs7DgzHYDlmc3U,2018
-runnable-0.37.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-runnable-0.37.0.dist-info/RECORD,,
+runnable-0.38.0.dist-info/METADATA,sha256=HbM0-0hNd9E3aI5BFrzlQiEdkxSdxkfLaTwhvAIkmd0,9983
+runnable-0.38.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+runnable-0.38.0.dist-info/entry_points.txt,sha256=KkxihZ0LLEiwvFl7RquyqZ0tp2fJDIs7DgzHYDlmc3U,2018
+runnable-0.38.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+runnable-0.38.0.dist-info/RECORD,,