This cache code is ugly.

Author: jmcvey3

mhkit/utils/cache.py

@@ -120,13 +120,12 @@ def _load_cache(file_extension, cache_filepath):
         elif file_extension == ".pkl":
             with open(cache_filepath, "rb") as f:
                 data_dict = pickle.load(f)  # some format of 'data' and 'metadata'
-                # TODO Must be a better way to handle these if we are writing the cache.
                 if isinstance(data_dict, tuple):
-                    # CDIP call returns dictionary in size 1 tuple
-                    if len(data_dict) == 1 and isinstance(data_dict[0], dict):
+                    # CDIP call returns dictionary in size 2 tuple with the dictionary in first element
+                    if isinstance(data_dict[0], dict):
                         data_dict = data_dict[0]
-                    # WPTO hindcast call returns size 2 tuple
-                    if len(data_dict) == 2:
+                    # WPTO hindcast call returns size 2 tuple with data and metadata as separate elements
+                    elif len(data_dict) == 2:
                         return data_dict[0], data_dict[1]
                 data, metadata = data_dict["data"], data_dict["metadata"]