fix

Author: jagath-jaikumar

.github/workflows/test.yml

@@ -16,6 +16,6 @@ jobs:
       - name: Run tests
         run: |
           pip install poetry
-          poetry install --with dev --with api
+          poetry install --with api --with dev 
           poetry run pytest
           

poetry.lock

@@ -31,7 +31,7 @@ pre-commit = "^4.0.1"
 
 [tool.poetry.group.api.dependencies]
 rb-api = { path = "src/rb-api", develop = true }
-jinja2 = "^3.1.4"
+
 
 [build-system]
 requires = ["poetry-core"]

pyproject.toml

@@ -10,11 +10,13 @@ python = "^3.11"
 fastapi = "^0.115.4"
 uvicorn = "^0.32.0"
 jinja2 = "^3.1.4"
-
+makefun = "^1.15.6"
+typer = "*"
 
 rescuebox = { path = "../../", develop = true }
 rb-lib = { path = "../rb-lib", develop = true }
 
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

src/rb-api/poetry.lock

@@ -1,7 +1,9 @@
-from functools import wraps
-from typing import Callable
+import inspect
+from typing import Callable, Optional
 
-from fastapi import APIRouter, Depends, HTTPException
+import typer
+from fastapi import APIRouter, HTTPException
+from makefun import with_signature
 from rb.api.models import CommandResult
 from rb.lib.stdout import Capturing  # type: ignore
 
@@ -10,10 +12,6 @@
 cli_router = APIRouter()
 
 
-def cli_flags(help: bool = False, stream: bool = False):
-    return {"help": help, "stream": stream}
-
-
 def static_endpoint(callback: Callable, *args, **kwargs) -> CommandResult:
     with Capturing() as stdout:
         try:
@@ -27,18 +25,54 @@ def static_endpoint(callback: Callable, *args, **kwargs) -> CommandResult:
     return CommandResult(result=result, stdout=stdout, success=success, error=error)
 
 
-def command_callback(callback: Callable):
-    @wraps(callback)
+def command_callback(command: typer.models.CommandInfo):
+    # Get the original callback signature
+    original_signature = inspect.signature(command.callback)
+
+    # Modify the signature to include `streaming` and `help` parameters
+    new_params = list(original_signature.parameters.values())
+    new_params.append(
+        inspect.Parameter(
+            "streaming",
+            inspect.Parameter.KEYWORD_ONLY,
+            default=False,
+            annotation=Optional[bool],
+        )
+    )
+    new_params.append(
+        inspect.Parameter(
+            "help",
+            inspect.Parameter.KEYWORD_ONLY,
+            default=False,
+            annotation=Optional[bool],
+        )
+    )
+    new_signature = original_signature.replace(parameters=new_params)
+
+    # Create a new function with the modified signature
+    @with_signature(new_signature)
     def wrapper(*args, **kwargs):
-        result = static_endpoint(callback, *args, **kwargs)
+        # Extract additional parameters
+        help = kwargs.pop("help", False)
+
+        if help:
+            return CommandResult(
+                result=command.callback.__doc__, stdout=[], success=True, error=None
+            )
+
+        # Call the static endpoint with the wrapped callback and arguments
+        result = static_endpoint(command.callback, *args, **kwargs)
         if not result.success:
-            # Return the last 10 lines of stdout
+            # Return the last 10 lines of stdout if there's an error
             raise HTTPException(
                 status_code=400,
                 detail={"error": result.error, "stdout": result.stdout[-10:]},
             )
         return result
 
+    wrapper.__name__ = command.callback.__name__
+    wrapper.__doc__ = command.callback.__doc__
+
     return wrapper
 
 
@@ -47,10 +81,9 @@ def wrapper(*args, **kwargs):
     for command in plugin.typer_instance.registered_commands:
         router.add_api_route(
             f"/{command.callback.__name__}/",
-            endpoint=command_callback(command.callback),
+            endpoint=command_callback(command),
             methods=["POST"],
             name=command.callback.__name__,
             response_model=CommandResult,
-            dependencies=[Depends(cli_flags)],
         )
     cli_router.include_router(router, prefix=f"/{plugin.name}", tags=[plugin.name])