Refactoring DataGrid to use DataService.py

src/myfasthtml/core/DataGridsRegistry.py

@@ -37,75 +37,10 @@ class DataGridsRegistry(SingleInstance):
       del all_entries[datagrid_id]
       self._db_manager.save(DATAGRIDS_REGISTRY_ENTRY_KEY, all_entries)
   
-  def get_all_tables(self):
-    all_entries = self._get_all_entries()
-    return [f"{namespace}.{name}" for (namespace, name) in all_entries.values()]
-  
-  def get_columns(self, table_name):
-    try:
-      as_fullname_dict = self._get_entries_as_full_name_dict()
-      grid_id = as_fullname_dict[table_name]
-      
-      # load datagrid state
-      state_id = f"{grid_id}#state"
-      state = self._db_manager.load(state_id)
-      return [c.col_id for c in state["columns"]] if state else []
-    except KeyError:
-      return []
-  
-  def get_column_values(self, table_name, column_name):
-    try:
-      as_fullname_dict = self._get_entries_as_full_name_dict()
-      grid_id = as_fullname_dict[table_name]
-      
-      # load dataframe from dedicated store
-      store = self._db_manager.load(f"{grid_id}#df")
-      df = store["ne_df"] if store else None
-      return df[column_name].tolist() if df is not None else []
-    
-    except KeyError:
-      return []
-  
-  def get_row_count(self, table_name):
-    try:
-      as_fullname_dict = self._get_entries_as_full_name_dict()
-      grid_id = as_fullname_dict[table_name]
-      
-      # load dataframe from dedicated store
-      store = self._db_manager.load(f"{grid_id}#df")
-      df = store["ne_df"] if store else None
-      return len(df) if df is not None else 0
-    
-    except KeyError:
-      return 0
-  
-  def get_column_type(self, table_name, column_name):
-    """
-    Get the type of a column.
+  def get_all_entries(self) -> dict:
+    """Return all registry entries as {datagrid_id: (namespace, name)}."""
+    return self._get_all_entries()
 
-    Args:
-        table_name: The DataGrid name
-        column_name: The column name
-
-    Returns:
-        ColumnType enum value or None if not found
-    """
-    try:
-      as_fullname_dict = self._get_entries_as_full_name_dict()
-      grid_id = as_fullname_dict[table_name]
-      
-      # load datagrid state
-      state_id = f"{grid_id}#state"
-      state = self._db_manager.load(state_id)
-      
-      if state and "columns" in state:
-        for col in state["columns"]:
-          if col.col_id == column_name:
-            return col.type
-      return None
-    except KeyError:
-      return None
-  
   def _get_all_entries(self):
     return {k: v for k, v in self._db_manager.load(DATAGRIDS_REGISTRY_ENTRY_KEY).items()
             if not k.startswith("__")}

src/myfasthtml/core/data/DataService.py

@@ -82,6 +82,7 @@ class DataService(MultipleInstance):
     super().__init__(parent, _id=_id)
     self._state = DataServiceState(self, save_state=save_state)
     self._store = DataStore(self, save_state=save_state)
+    self._init_store()
   
   @property
   def columns(self) -> list[ColumnDefinition]:
@@ -128,12 +129,7 @@ class DataService(MultipleInstance):
       self._state.columns = self._build_column_definitions(df)
       self._state.save()
     
-    self._store.ns_fast_access = self._build_fast_access(df)
-    self._store.ns_row_data = df.to_dict(orient="records")
-    self._store.ns_total_rows = len(df)
-    self._store.save()
-    
-    self._register_existing_formulas()
+    self._init_store()
   
   # ------------------------------------------------------------------
   # Mutations
@@ -302,6 +298,16 @@ class DataService(MultipleInstance):
   # Private helpers
   # ------------------------------------------------------------------
   
+  def _init_store(self):
+    df = self._store.ne_df
+    if df is None:
+      return
+    self._store.ns_fast_access = self._build_fast_access(df)
+    self._store.ns_row_data = df.to_dict(orient="records")
+    self._store.ns_total_rows = len(df)
+    self._store.save()
+    self._register_existing_formulas()
+  
   def _build_column_definitions(self, df: pd.DataFrame) -> list[ColumnDefinition]:
     """Build ColumnDefinition objects from DataFrame columns.