Fix #414 more robust billing currency/plans handling in capabilities

CHANGELOG.md

@@ -54,6 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `VectorCube.create_job()` and `MlModel.create_job()` are properly aligned with `DataCube.create_job()`
   regarding setting job title, description, etc.
   ([#412](https://github.com/Open-EO/openeo-python-client/issues/412)).
+- More robust handling of billing currency/plans in capabilities
+  ([#414](https://github.com/Open-EO/openeo-python-client/issues/414))
 
 
 ## [0.15.0] - 2023-03-03

openeo/capabilities.py

@@ -4,7 +4,7 @@
 from typing import Union, Tuple
 
 
-# Is this base class (still) useful?
+# TODO Is this base class (still) useful?
 
 
 class Capabilities(ABC):

openeo/rest/rest_capabilities.py

@@ -1,5 +1,8 @@
+from typing import List, Optional
+
 from openeo.capabilities import Capabilities
 from openeo.internal.jupyter import render_component
+from openeo.util import deep_get
 
 
 class RESTCapabilities(Capabilities):
@@ -13,6 +16,9 @@ def __init__(self, data: dict, url: str = None):
     def get(self, key: str, default=None):
         return self.capabilities.get(key, default)
 
+    def deep_get(self, *keys, default=None):
+        return deep_get(self.capabilities, *keys, default=default)
+
     def api_version(self) -> str:
         """ Get openEO version."""
         if 'api_version' in self.capabilities:
@@ -36,13 +42,13 @@ def supports_endpoint(self, path: str, method="GET"):
             for endpoint in self.capabilities.get("endpoints", [])
         )
 
-    def currency(self):
-        """ Get default billing currency."""
-        return self.capabilities.get('billing', {}).get('currency')
+    def currency(self) -> Optional[str]:
+        """Get default billing currency."""
+        return self.deep_get("billing", "currency", default=None)
 
-    def list_plans(self):
-        """ List all billing plans."""
-        return self.capabilities.get('billing', {}).get('plans')
+    def list_plans(self) -> List[dict]:
+        """List all billing plans."""
+        return self.deep_get("billing", "plans", default=[])
 
     def _repr_html_(self):
         return render_component("capabilities", data = self.capabilities, parameters = {"url": self.url})

tests/rest/test_capabilities.py

@@ -0,0 +1,16 @@
+from openeo.rest.rest_capabilities import RESTCapabilities
+
+
+class TestCapabilities:
+    def test_currency(self):
+        assert RESTCapabilities({}).currency() is None
+        assert RESTCapabilities({"billing": None}).currency() is None
+        assert RESTCapabilities({"billing": {"currency": "EUR"}}).currency() == "EUR"
+
+    def test_list_plans(self):
+        assert RESTCapabilities({}).list_plans() == []
+        assert RESTCapabilities({"billing": None}).list_plans() == []
+        assert RESTCapabilities({"billing": {"plans": []}}).list_plans() == []
+        assert RESTCapabilities(
+            {"billing": {"plans": [{"name": "free"}]}}
+        ).list_plans() == [{"name": "free"}]