endpoint partially working for now

Author: josephmaa

bridger/logging_utils/cache_entry_database.py

@@ -49,7 +49,7 @@ def get_top_n_by_sort_key(self, sort_key: "SortKey", n: int):
         print(f"Getting top {n} entries by {sort_key.key}")
         start_time = time.time()
         try:
-            sorted_entries = self.sort_by_key(sort_key)
+            sorted_entries = self.sort_by_key(sort_key())
             result = sorted_entries[:n]
             end_time = time.time()
             print(f"Retrieved top {n} entries in {end_time - start_time:.2f} seconds")

tools/web/sibyl.py

@@ -76,37 +76,40 @@ def _get_experiment_names() -> list[str]:
     ]
 
 
-@app.route("/n_fewest_steps_since_led_to_something_new_go_explore", methods=["GET"])
-def n_fewest_steps_since_led_to_something_new_go_explore_plot_data():
+@app.route("/go_explore", methods=["GET"])
+def go_explore_plot_data():
     """
     Provides plot data for the n states that have most recently seen a new cell.
     """
     n = _get_int_or_default("n", 10)
-    _CACHE_ENTRY_DATABASE = list(
+    _OCCURRENCE_LOG_ENTRIES = list(
         read_object_log(os.path.join(_LOG_DIR, "go_explore", "state_cache-6.pkl"))
     )
-    print(_CACHE_ENTRY_DATABASE)
+
+    caches = [cache.object._cache.values() for cache in _OCCURRENCE_LOG_ENTRIES]
+    cache_entries = [cache_entry for cache in caches for cache_entry in cache]
+    _CACHE_ENTRY_DATABASE = CacheEntryDatabase(cache_entries)
 
     return {
         "states": [
-            cache_entry.object.state
+            cache_entry.state_representative
             for cache_entry in _CACHE_ENTRY_DATABASE.cache_entries
         ],
-        # "trajectory_length": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
-        #     TrajectorySortKey, n
-        # ),
-        # "steps_since_led_to_something_new": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
-        #     StepsSinceLedToSomethingNewSortKey, n
-        # ),
-        # "steps_since_led_to_something_new_reset_count": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
-        #     StepsSinceLedToSomethingNewResetCountSortKey, n
-        # ),
-        # "sample_count": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
-        #     SampleCountSortKey, n
-        # ),
-        # "visit_count": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
-        #     VisitCountSortKey, n
-        # ),
+        "trajectory_length": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
+            TrajectorySortKey(), n
+        ),
+        "steps_since_led_to_something_new": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
+            StepsSinceLedToSomethingNewSortKey(), n
+        ),
+        "steps_since_led_to_something_new_reset_count": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
+            StepsSinceLedToSomethingNewResetCountSortKey(), n
+        ),
+        "sample_count": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
+            SampleCountSortKey(), n
+        ),
+        "visit_count": _CACHE_ENTRY_DATABASE.get_top_n_by_sort_key(
+            VisitCountSortKey(), n
+        ),
     }