From ab4fbc24e75f48602d722cd79815091ad6dae2af Mon Sep 17 00:00:00 2001
From: Daniel Timmers <43832218+timmers20@users.noreply.github.com>
Date: Thu, 19 Oct 2023 17:35:08 +0100
Subject: [PATCH] Update table_formatters.py

Limit FmtHeatmap and FmtHeatmapWithCenter rows and columns to existing row/columns to prevent Key Error in .loc for pandas versions >0.25.0
---
 pybloqs/block/table_formatters.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pybloqs/block/table_formatters.py b/pybloqs/block/table_formatters.py
index eb13131..b3e7383 100644
--- a/pybloqs/block/table_formatters.py
+++ b/pybloqs/block/table_formatters.py
@@ -537,8 +537,12 @@ def _get_selected_cell_values(self, rows, columns, df):
         """Return all cell values within selected rows/columns range."""
         if rows is None:
             rows = df.index.tolist()
+        else:
+            rows = df.index.isin(rows)
         if columns is None:
             columns = df.columns.tolist()
+        else:
+            columns = df.columns.isin(columns)
         # If multi-index, user full index tuple from ORG_ROW_NAMES column
         if isinstance(rows[0], tuple):
             selection = df[df[ORG_ROW_NAMES].isin(rows)][columns]
@@ -1080,8 +1084,12 @@ def _get_selected_cell_values(self, rows, columns, df):
         """Return all cell values within selected rows/columns range."""
         if rows is None:
             rows = df.index.tolist()
+        else:
+            rows = df.index.isin(rows)
         if columns is None:
             columns = df.columns.tolist()
+        else:
+            columns = df.columns.isin(columns)
         # If multi-index, user full index tuple from ORG_ROW_NAMES column
         if isinstance(rows[0], tuple):
             selection = df[df[ORG_ROW_NAMES].isin(rows)][columns]