runnable 0.37.0__tar.gz → 0.38.0__tar.gz

{runnable-0.37.0 → runnable-0.38.0}/PKG-INFO

@@ -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 → runnable-0.38.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "runnable"
-version = "0.37.0"
+version = "0.38.0"
 description = "Add your description here"
 readme = "README.md"
 authors = [
@@ -8,8 +8,6 @@ authors = [
 ]
 requires-python = ">=3.10"
 dependencies = [
-    "click-plugins>=1.1.1",
-    "click<=8.1.3",
     "pydantic>=2.10.3",
     "ruamel-yaml>=0.18.6",
     "stevedore>=5.4.0",
@@ -17,7 +15,7 @@ dependencies = [
     "dill>=0.3.9",
     "setuptools>=75.6.0",
     "python-dotenv>=1.0.1",
-    "typer>=0.15.1",
+    "typer>=0.17.3",
     "cloudpathlib>=0.20.0",
 ]
 
@@ -151,7 +149,7 @@ file-system = "extensions.run_log_store.file_system:FileSystemRunLogstore"
 
 # Release configuration
 [tool.semantic_release]
-commit_parser = "angular"
+commit_parser = "conventional"
 major_on_zero = true
 allow_zero_version = true
 tag_format = "{version}"

{runnable-0.37.0 → runnable-0.38.0}/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-0.38.0/runnable/parameters.py

@@ -0,0 +1,215 @@
+import argparse
+import inspect
+import json
+import logging
+import os
+from typing import Any, Dict, Type
+
+from pydantic import BaseModel, ConfigDict
+from typing_extensions import Callable
+
+from runnable import defaults
+from runnable.datastore import JsonParameter, ObjectParameter
+from runnable.defaults import MapVariableType
+from runnable.utils import remove_prefix
+
+logger = logging.getLogger(defaults.LOGGER_NAME)
+
+
+def get_user_set_parameters(remove: bool = False) -> Dict[str, JsonParameter]:
+    """
+    Scans the environment variables for any user returned parameters that have a prefix runnable_PRM_.
+
+    This function does not deal with any type conversion of the parameters.
+    It just deserializes the parameters and returns them as a dictionary.
+
+    Args:
+        remove (bool, optional): Flag to remove the parameter if needed. Defaults to False.
+
+    Returns:
+        dict: The dictionary of found user returned parameters
+    """
+    parameters: Dict[str, JsonParameter] = {}
+    for env_var, value in os.environ.items():
+        if env_var.startswith(defaults.PARAMETER_PREFIX):
+            key = remove_prefix(env_var, defaults.PARAMETER_PREFIX)
+            try:
+                parameters[key.lower()] = JsonParameter(
+                    kind="json", value=json.loads(value)
+                )
+            except json.decoder.JSONDecodeError:
+                logger.warning(
+                    f"Parameter {key} could not be JSON decoded, adding the literal value"
+                )
+                parameters[key.lower()] = JsonParameter(kind="json", value=value)
+
+            if remove:
+                del os.environ[env_var]
+    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],
+    map_variable: MapVariableType = None,
+) -> 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 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
+        parameters (dict): The parameters available for the run
+
+    Returns:
+        dict: The parameters matching the function signature
+    """
+    function_args = inspect.signature(func).parameters
+
+    # Update parameters with the map variables
+    for key, v in (map_variable or {}).items():
+        params[key] = JsonParameter(kind="json", value=v)
+
+    bound_args = {}
+    missing_required_args: list[str] = []
+    var_keyword_param = None
+    namespace_param = None
+
+    # 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
+
+        # Check for **kwargs parameter
+        if value.kind == inspect.Parameter.VAR_KEYWORD:
+            var_keyword_param = name
+            continue
+
+        # Check for argparse.Namespace parameter
+        if value.annotation == argparse.Namespace:
+            namespace_param = name
+            continue
+
+        # 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:
+            # 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
+
+
+def bind_args_for_pydantic_model(
+    params: Dict[str, Any], model: Type[BaseModel]
+) -> BaseModel:
+    class EasyModel(model):  # type: ignore
+        model_config = ConfigDict(extra="ignore")
+
+    swallow_all = EasyModel(**params)
+    bound_model = model(**swallow_all.model_dump())
+    return bound_model

runnable-0.37.0/runnable/parameters.py

@@ -1,144 +0,0 @@
-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
-
-from runnable import defaults
-from runnable.datastore import JsonParameter, ObjectParameter
-from runnable.defaults import MapVariableType
-from runnable.utils import remove_prefix
-
-logger = logging.getLogger(defaults.LOGGER_NAME)
-
-
-def get_user_set_parameters(remove: bool = False) -> Dict[str, JsonParameter]:
-    """
-    Scans the environment variables for any user returned parameters that have a prefix runnable_PRM_.
-
-    This function does not deal with any type conversion of the parameters.
-    It just deserializes the parameters and returns them as a dictionary.
-
-    Args:
-        remove (bool, optional): Flag to remove the parameter if needed. Defaults to False.
-
-    Returns:
-        dict: The dictionary of found user returned parameters
-    """
-    parameters: Dict[str, JsonParameter] = {}
-    for env_var, value in os.environ.items():
-        if env_var.startswith(defaults.PARAMETER_PREFIX):
-            key = remove_prefix(env_var, defaults.PARAMETER_PREFIX)
-            try:
-                parameters[key.lower()] = JsonParameter(
-                    kind="json", value=json.loads(value)
-                )
-            except json.decoder.JSONDecodeError:
-                logger.warning(
-                    f"Parameter {key} could not be JSON decoded, adding the literal value"
-                )
-                parameters[key.lower()] = JsonParameter(kind="json", value=value)
-
-            if remove:
-                del os.environ[env_var]
-    return parameters
-
-
-def filter_arguments_for_func(
-    func: Callable[..., Any],
-    params: Dict[str, Any],
-    map_variable: MapVariableType = None,
-) -> 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.
-
-
-    Args:
-        func (Callable): The function to inspect
-        parameters (dict): The parameters available for the run
-
-    Returns:
-        dict: The parameters matching the function signature
-    """
-    function_args = inspect.signature(func).parameters
-
-    # Update parameters with the map variables
-    for key, v in (map_variable or {}).items():
-        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()
-
-        return bound_args
-
-    # Lets return what is asked for then!!
-    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.
-            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
-
-        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())
-        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
-
-    return bound_args
-
-
-def bind_args_for_pydantic_model(
-    params: Dict[str, Any], model: Type[BaseModel]
-) -> BaseModel:
-    class EasyModel(model):  # type: ignore
-        model_config = ConfigDict(extra="ignore")
-
-    swallow_all = EasyModel(**params)
-    bound_model = model(**swallow_all.model_dump())
-    return bound_model