fix'

Author: JqRrt

cozeloop/decorator/decorator.py

@@ -337,14 +337,15 @@ def decorator(func: Callable):
 
             @wraps(func)
             def sync_wrapper(*args: Any, **kwargs: Any):
-                config = _get_config(**kwargs)
+                config = kwargs.pop("config", None)
+                config = _convert_config(config)
                 res = None
                 try:
                     inp = {
                         "args": args,
                         "kwargs": kwargs
                     }
-                    res = RunnableLambda(_param_wrapped_func).invoke(input=inp, config=config, **kwargs)
+                    res = RunnableLambda(_param_wrapped_func).invoke(input=inp, config=config)
                     if hasattr(res, "__iter__"):
                         return res
                 except StopIteration:
@@ -357,14 +358,15 @@ def sync_wrapper(*args: Any, **kwargs: Any):
 
             @wraps(func)
             async def async_wrapper(*args: Any, **kwargs: Any):
-                config = _get_config(**kwargs)
+                config = kwargs.pop("config", None)
+                config = _convert_config(config)
                 res = None
                 try:
                     inp = {
                         "args": args,
                         "kwargs": kwargs
                     }
-                    res = await RunnableLambda(_param_wrapped_func_async).ainvoke(input=inp, config=config, **kwargs)
+                    res = await RunnableLambda(_param_wrapped_func_async).ainvoke(input=inp, config=config)
                     if hasattr(res, "__aiter__"):
                         return res
                 except StopIteration:
@@ -382,13 +384,14 @@ async def async_wrapper(*args: Any, **kwargs: Any):
 
             @wraps(func)
             def gen_wrapper(*args: Any, **kwargs: Any):
-                config = _get_config(**kwargs)
+                config = kwargs.pop("config", None)
+                config = _convert_config(config)
                 try:
                     inp = {
                         "args": args,
                         "kwargs": kwargs
                     }
-                    gen = RunnableLambda(_param_wrapped_func).invoke(input=inp, config=config, **kwargs)
+                    gen = RunnableLambda(_param_wrapped_func).invoke(input=inp, config=config)
                     try:
                         for item in gen:
                             yield item
@@ -399,13 +402,14 @@ def gen_wrapper(*args: Any, **kwargs: Any):
 
             @wraps(func)
             async def async_gen_wrapper(*args: Any, **kwargs: Any):
-                config = _get_config(**kwargs)
+                config = kwargs.pop("config", None)
+                config = _convert_config(config)
                 try:
                     inp = {
                         "args": args,
                         "kwargs": kwargs
                     }
-                    gen = RunnableLambda(_param_wrapped_func_async).invoke(input=inp, config=config, **kwargs)
+                    gen = RunnableLambda(_param_wrapped_func_async).invoke(input=inp, config=config)
                     items = []
                     try:
                         async for item in gen:
@@ -434,8 +438,7 @@ async def _param_wrapped_func_async(input_dict: dict) -> Any:
                 kwargs = input_dict.get("kwargs", {})
                 return await func(*args, **kwargs)
 
-            def _get_config(**kwargs: Any) -> RunnableConfig | None:
-                config = kwargs.pop("config", None)
+            def _convert_config(config: RunnableConfig = None) -> RunnableConfig | None:
                 if config is None:
                     config = RunnableConfig(run_name=func.__name__)
                     config['run_name'] = func.__name__