BatchJob.logs: filter on log_level client-side AND server-side.

No need to decide based on api_version. Open-EO/openeo-python-driver#170
Open-EO · Apr 6, 2023 · fac21be · fac21be
1 parent 4cabb19
commit fac21be
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/openeo/rest/connection.py b/openeo/rest/connection.py
@@ -237,7 +237,7 @@ def __init__(
         self._capabilities_cache = LazyLoadCache()
 
         # Initial API version check.
-        self.api_version.require_at_least(self._MINIMUM_API_VERSION)
+        self._api_version.require_at_least(self._MINIMUM_API_VERSION)
 
         self._auth_config = auth_config
         self._refresh_token_store = refresh_token_store
@@ -897,7 +897,7 @@ def validate_process_graph(self, process_graph: dict) -> List[dict]:
         return self.post(path="/validation", json=request, expected_status=200).json()["errors"]
 
     @property
-    def api_version(self) -> ComparableVersion:
+    def _api_version(self) -> ComparableVersion:
         # TODO make this a public property (it's also useful outside the Connection class)
         return self.capabilities().api_version_check
 

diff --git a/openeo/rest/job.py b/openeo/rest/job.py
@@ -177,21 +177,16 @@ def logs(
             url, params={"offset": offset, "log_level": log_level}, expected_status=200
         ).json()["logs"]
 
-        #
-        # TODO: we should still support client-side log_level filtering when the backend
-        #   itself doesn't support filtering. What is the best way to check that, the API version?
-        #   https://github.com/Open-EO/openeo-python-driver/issues/170
-        #
-
         # Only filter logs when specified.
-        if self.connection.api_version.at_most("1.1.0"):
-            if log_level is not None:
-                log_level = normalize_log_level(log_level)
-                logs = (
-                    log
-                    for log in logs
-                    if normalize_log_level(log.get("level")) >= log_level
-                )
+        # We should still support client-side log_level filtering because not all backends
+        # support the log_level option.
+        if log_level is not None:
+            log_level = normalize_log_level(log_level)
+            logs = (
+                log
+                for log in logs
+                if normalize_log_level(log.get("level")) >= log_level
+            )
 
         entries = [LogEntry(log) for log in logs]
         return VisualList("logs", data=entries)