Undo part of last July 15 commit: BatchTable.batch_row

Author: hugetim

client_code/_users.py

@@ -1,4 +1,4 @@
-from .auto_batch import unwrap_any_input_rows, BatchRow
+from .auto_batch import unwrap_any_input_rows, wrap_row
 import anvil.users
 
 
@@ -7,5 +7,4 @@ def force_login(*args, **kwargs):
 
 
 def get_user(*args, **kwargs):
-    raw_out = anvil.users.get_user(*args, **kwargs)
-    return BatchRow(raw_out) if raw_out else None
+    return wrap_row(anvil.users.get_user(*args, **kwargs))

client_code/auto_batch.py

@@ -69,14 +69,21 @@ def wrapper(self, *args, **kwargs):
     return wrapper
 
 
+def wrap_row(row):
+    if row is None:
+        return None
+    batch_table = get_table_by_id(row._table_id)
+    return batch_table.batch_row(row)
+
+
 def _wrap_any_rows(value):
     def _is_row_but_not_batch_row(thing):
         return isinstance(thing, anvil.tables.Row) and not isinstance(thing, BatchRow)
 
     if _is_row_but_not_batch_row(value):
-        return BatchRow(value)
+        return wrap_row(value)
     elif isinstance(value, list) and value and _is_row_but_not_batch_row(value[0]):
-        return [BatchRow(row) for row in value]
+        return [wrap_row(row) for row in value]
     else:
         return value
 
@@ -227,7 +234,7 @@ def __init__(self, search_iterator):
         self._search_iterator = search_iterator
 
     def __getitem__(self, index):
-        return BatchRow(self._search_iterator[index])
+        return wrap_row(self._search_iterator[index])
 
     def __len__(self):
         return len(self._search_iterator)
@@ -259,13 +266,14 @@ def get(self, *args, **kwargs):
             print("AutoBatch: process_batch triggered early by get")
         process_batch()
         raw_out = unwrap_any_input_rows(self.table.get)(*args, **kwargs)
-        return BatchRow(raw_out) if raw_out else None
+        return self.batch_row(raw_out) if raw_out else None
 
     def get_by_id(self, row_id, *args, **kwargs):
         if row_id in self._batch_rows:
             return self._batch_rows[row_id]
         else:
-            return BatchRow(self.table.get_by_id(row_id, *args, **kwargs))
+            row = self.table.get_by_id(row_id, *args, **kwargs)
+            return BatchRow(row)
 
     def add_row(self, **column_values):
         global _add_queue
@@ -284,7 +292,11 @@ def delete_all_rows(self, *args, **kwargs):
 
     def add_batch_row(self, batch_row):
         self._batch_rows[batch_row.get_id()] = batch_row
-
+    
+    def batch_row(self, row):
+        retrieved = self._batch_rows.get(row.get_id())
+        return retrieved if retrieved else BatchRow(row)
+    
     def __serialize__(self, global_data):
         if _add_queue or _update_queue or _delete_queue:
             print("AutoBatch: process_batch triggered early by table __serialize__")