From 4c25b9e04067558f5e484ccef2f1d2df7a478bee Mon Sep 17 00:00:00 2001
From: Diogo Sousa <montezdesousa@gmail.com>
Date: Wed, 5 Jul 2023 17:03:53 +0100
Subject: [PATCH] another round of cleaning in command.router

---
 .../openbb_sdk_core/app/provider_interface.py |  1 -
 .../openbb_sdk_core/app/router.py             | 71 ++++++++++++++-----
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/provider_interface.py b/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/provider_interface.py
index 03b72fa7b73..c3766093e5c 100644
--- a/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/provider_interface.py
+++ b/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/provider_interface.py
@@ -3,7 +3,6 @@ from typing import Any, Dict, List, Literal, Optional, Tuple, Union
 
 from fastapi import Query
 from openbb_provider.provider.provider_map import build_provider_mapping
-
 from pydantic import BaseConfig, BaseModel, Extra, Field, create_model
 
 
diff --git a/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/router.py b/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/router.py
index 6b325bf6124..7cf34a5dba1 100644
--- a/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/router.py
+++ b/openbb_sdk/openbb_sdk_core/openbb_sdk_core/app/router.py
@@ -24,6 +24,7 @@ from openbb_sdk_core.app.model.command_context import CommandContext
 from openbb_sdk_core.app.model.command_output import CommandOutput
 from openbb_sdk_core.app.provider_interface import (
     ProviderChoices,
+    StandardParams,
     get_provider_interface,
 )
 
@@ -185,6 +186,37 @@ class Router:
             router=router.api_router, prefix=prefix, tags=tags  # type: ignore
         )
 
+    @staticmethod
+    def validate_signature(func: Callable[P, CommandOutput]) -> None:
+        """Validate function signature before binding to query."""
+        if "provider_choices" not in func.__annotations__:
+            raise AttributeError(
+                f"Invalid signature: {func.__name__}. Missing provider_choices parameter."
+            )
+
+        if func.__annotations__["provider_choices"] != ProviderChoices:
+            raise TypeError(
+                f"Invalid signature: {func.__name__}. provider_choices parameter must be of type ProviderChoices."
+            )
+
+        if "standard_params" not in func.__annotations__:
+            raise AttributeError(
+                f"Invalid signature: {func.__name__}. Missing standard_params parameter."
+            )
+
+        if func.__annotations__["standard_params"] != StandardParams:
+            raise TypeError(
+                f"Invalid signature: {func.__name__}. standard_params parameter must be of type StandardParams."
+            )
+
+    @staticmethod
+    def inject_dependency(
+        func: Callable[P, CommandOutput], arg: str, callable_: Any
+    ) -> Callable[P, CommandOutput]:
+        """Annotate function with dependency injection."""
+        func.__annotations__[arg] = Annotated[callable_, Depends()]  # type: ignore
+        return func
+
     @staticmethod
     def bind_signature(
         func: Callable[P, CommandOutput], query: str
@@ -192,32 +224,33 @@ class Router:
         """Bind function signature to a query."""
         provider_interface = get_provider_interface()
         if query:
-            if (
-                "provider_choices" not in func.__annotations__
-                or "standard_params" not in func.__annotations__
-            ):  # "extra_params" not in func.__annotations__:
-                raise AttributeError(f"Invalid signature: {func.__name__}")
-
             if query not in provider_interface.queries:
                 raise AttributeError(
-                    f"Invalid query: {query}. Check available queries with get_provider_interface().queries"
+                    f"Invalid query: {query}. Check available queries in ProviderInterface().queries"
                 )
 
-            # provider
-            provider_choices = provider_interface.query_providers[query]
-            func.__annotations__["provider_choices"] = Annotated[provider_choices, Depends()]  # type: ignore
+            Router.validate_signature(func=func)
 
-            # standard_params
-            standard_params = provider_interface.params[query]["standard"]
-            func.__annotations__["standard_params"] = Annotated[standard_params, Depends()]  # type: ignore
+            func = Router.inject_dependency(
+                func=func,
+                arg="provider_choices",
+                callable_=provider_interface.query_providers[query],
+            )
 
-            # extra_params
-            extra_params = provider_interface.params[query]["extra"]
-            func.__annotations__["extra_params"] = Annotated[extra_params, Depends()]  # type: ignore
+            func = Router.inject_dependency(
+                func=func,
+                arg="standard_params",
+                callable_=provider_interface.params[query]["standard"],
+            )
 
-            # return
-            data = provider_interface.merged_data[query]
-            func.__annotations__["return"] = CommandOutput[List[data]]  # type: ignore
+            func = Router.inject_dependency(
+                func=func,
+                arg="extra_params",
+                callable_=provider_interface.params[query]["extra"],
+            )
+
+            data_type = provider_interface.merged_data[query]
+            func.__annotations__["return"] = CommandOutput[List[data_type]]  # type: ignore
         elif (
             "provider_choices" in func.__annotations__
             and func.__annotations__["provider_choices"] == ProviderChoices