feat: allow specify protocol and/or chain in feed/revenue detail

Author: martinkersner

datamaxi/defillama/__init__.py

@@ -4,6 +4,7 @@
 from datamaxi.lib.utils import check_required_parameter
 from datamaxi.lib.utils import check_required_parameters
 from datamaxi.lib.utils import check_required_parameter_list
+from datamaxi.lib.utils import check_at_least_one_set_parameters
 from datamaxi.lib.utils import encode_string_list
 from datamaxi.lib.utils import make_list
 from datamaxi.lib.utils import postprocess
@@ -438,7 +439,11 @@ def revenue(
 
     @postprocess(num_index=4)
     def fee_detail(
-        self, protocol: str, chain: str = None, daily: bool = True, pandas: bool = True
+        self,
+        protocol: str = None,
+        chain: str = None,
+        daily: bool = True,
+        pandas: bool = True,
     ) -> Union[List, pd.DataFrame]:
         """Get fee detail for given protocol and chain
 
@@ -448,26 +453,34 @@ def fee_detail(
 
         Args:
             protocol (str): Protocol name
-            chain (str): Chain name (optional)
+            chain (str): Chain name
             daily (bool): Daily fee or total fee
             pandas (bool): Return data as pandas DataFrame
 
         Returns:
             Timeseries of fee detail for a given protocol and chain
         """
-        check_required_parameters([[protocol, "protocol"], [daily, "daily"]])
+        check_required_parameter(daily, "daily")
         params = {
-            "protocol": protocol,
             "daily": str(daily).lower(),
         }
+
+        check_at_least_one_set_parameters([[protocol, "protocol"], [chain, "chain"]])
+        if protocol is not None:
+            params["protocol"] = protocol
+
         if chain is not None:
             params["chain"] = chain
 
         return self.query("/v1/defillama/fee/detail", params)
 
     @postprocess(num_index=4)
     def revenue_detail(
-        self, protocol: str, chain: str = None, daily: bool = True, pandas: bool = True
+        self,
+        protocol: str = None,
+        chain: str = None,
+        daily: bool = True,
+        pandas: bool = True,
     ) -> Union[List, pd.DataFrame]:
         """Get revenue detail for given protocol and chain
 
@@ -477,18 +490,22 @@ def revenue_detail(
 
         Args:
             protocol (str): Protocol name
-            chain (str): Chain name (optional)
+            chain (str): Chain name
             daily (bool): Daily revenue or total revenue
             pandas (bool): Return data as pandas DataFrame
 
         Returns:
             Timeseries of revenue detail for a given protocol and chain
         """
-        check_required_parameters([[protocol, "protocol"], [daily, "daily"]])
+        check_required_parameter(daily, "daily")
         params = {
-            "protocol": protocol,
             "daily": str(daily).lower(),
         }
+
+        check_at_least_one_set_parameters([[protocol, "protocol"], [chain, "chain"]])
+        if protocol is not None:
+            params["protocol"] = protocol
+
         if chain is not None:
             params["chain"] = chain
 

datamaxi/error.py

@@ -28,3 +28,8 @@ def __init__(self, params):
 
     def __str__(self):
         return "%s is mandatory, but received empty." % (", ".join(self.params))
+
+
+class AtLeastOneParameterRequiredError(Error):
+    def __str__(self):
+        return "At least one parameter is required."

datamaxi/lib/utils.py

@@ -38,6 +38,20 @@ def check_required_parameters(params):
         check_required_parameter(p[0], p[1])
 
 
+def check_at_least_one_set_parameters(params):
+    at_least_one_set = False
+    for p in params:
+        try:
+            check_required_parameter(p[0], p[1])
+            at_least_one_set = True
+            break
+        except:
+            pass
+
+    if not at_least_one_set:
+        raise AtLeastOneParameterRequiredError()
+
+
 def check_required_parameter_list(values: List, name: str):
     if len(values) == 0:
         raise ParameterRequiredError([name])