fix: incomplete query options, cache read

toargridding/toar_rest_client.py

@@ -22,10 +22,10 @@ class QueryOptions:
     variable_id: str
     statistics: str
     sampling: str
-    min_data_capture = "0"  # TODO check effect on NaNs
-    metadata_scheme = "basic"
-    limit = "None"
-    format = "by_statistic"
+    min_data_capture: str = "0"  # TODO check effect on NaNs
+    metadata_scheme: str = "basic"
+    limit: str = "None"
+    format: str = "by_statistic"
 
     @staticmethod
     def from_metadata(metadata: Metadata):
@@ -45,11 +45,11 @@ class Cache:
     def __init__(self, cache_dir):
         self.cache_file = cache_dir / "status_endpoints.json"
 
-        if not self.cache_file.is_file():  # initialize cache
+        if not self.cache_file.is_file():  # initialize cache with dummy values
             with open(self.cache_file, "w") as cache:
                 json.dump({"foo": "bar"}, cache)
 
-    def __contains__(self, item):
+    def __contains__(self, item: str):
         with self.storage_dict() as storage:
             return item in storage.keys()
 
@@ -97,7 +97,7 @@ class Connection:
             )
 
     def get_status_endpoint(self, query_options: QueryOptions):
-        if query_options in self.cache:
+        if query_options.cache_key in self.cache:
             status_endpoint = self.cache.get(query_options.cache_key)
 
             try:  # test for stale cache
@@ -107,6 +107,8 @@ class Connection:
             else:
                 print("load status endpoint from cache")
                 return status_endpoint
+        else:
+            print("query not in cache")
 
         status_endpoint = self.query_for_status_endpoint(query_options)
         return status_endpoint