Add auto_batch.USE_WRAPPED toggle

Author: hugetim

.anvil_editor.yaml

@@ -4,6 +4,7 @@ unique_ids:
     _demo_startup: '1719087683748644303970981.0312'
     auto_batch: '1720557189347558051799744.9072'
     tables: '1720711436314890422194670.1993'
+    tables._tables: '1721062590178633669568195.047'
     tables.query: '1720557765872560470139563.91'
     users: '1720885720127965548016217.2301'
   server_modules:

client_code/auto_batch.py

@@ -4,6 +4,7 @@
 from functools import wraps
 
 
+USE_WRAPPED = True
 _add_queue = defaultdict(list)
 _update_queue = defaultdict(dict)
 _delete_queue = []

client_code/tables/__init__.py

@@ -1,66 +1,21 @@
-from . import query
-from ..auto_batch import batch_tables as app_tables
-from ..auto_batch import get_table_by_id, AutoBatch, BatchRow, BatchSearchIterator, BatchTable
-import anvil.tables
-from functools import wraps
-#from contextlib import nullcontext
+from ..auto_batch import USE_WRAPPED, AutoBatch, BatchRow, BatchSearchIterator, BatchTable
 
 
-class _NullContext: # b/c Skulpt lacks contextlib
-    def __enter__(self):
-        return None
-    
-    def __exit__(self, exc_type, exc_value, traceback):
-        return False
+WRAPPED_ATTRS = [
+    'query',
+    'batch_update',
+    'batch_delete',
+    'Transaction',
+    'in_transaction',
+    'app_tables',
+    'get_table_by_id',
+]
 
 
 def __getattr__(attr):
-    return getattr(anvil.tables, attr)
-
-
-batch_update = _NullContext()
-batch_delete = _NullContext()
-
-
-class Transaction:
-    def __init__(self, *args, **kwargs):
-        self.transaction = anvil.tables.Transaction(*args, **kwargs)
-        self.auto_batch = AutoBatch()
-
-    def __enter__(self):
-        txn = self.transaction.__enter__()
-        self.auto_batch.__enter__()
-        return txn
-
-    def __exit__(self, exc_type, exc_value, traceback):
-        self.auto_batch.__exit__(exc_type, exc_value, traceback)
-        return self.transaction.__exit__(exc_type, exc_value, traceback)
-
-    def abort(self):
-        self.transaction.abort()
-
-
-def in_transaction(*d_args, **d_kwargs):
-    # added complications due to @in_transaction's optional 'relaxed' argument:
-    only_arg_is_func_to_decorate = (len(d_args) == 1 and callable(d_args[0]) and not d_kwargs)
-    if only_arg_is_func_to_decorate:
-        func_to_decorate = d_args[0]
-        tables_in_transaction = anvil.tables.in_transaction
-    else: #decorator was specified with arg(s) (i.e. 'relaxed')
-        # func-to-decorate not known yet
-        tables_in_transaction = anvil.tables.in_transaction(*d_args, **d_kwargs)
-    
-    def in_transaction_with_auto_batch(func):
-        @tables_in_transaction
-        @wraps(func)
-        def out_function(*args, **kwargs):
-            with AutoBatch():
-              result = func(*args, **kwargs) # Call the original function
-            return result
-        return out_function
-    
-    if only_arg_is_func_to_decorate:
-        return in_transaction_with_auto_batch(func_to_decorate)
-    else: # composite decorator now configured for 'relaxed' transaction
-        # Return composite decorator as a function, to then be applied to func-to-decorate
-        return in_transaction_with_auto_batch
+    if USE_WRAPPED and attr in WRAPPED_ATTRS:
+        from . import _tables
+        return getattr(_tables, attr)
+    else:
+        import anvil.tables
+        return getattr(anvil.tables, attr)

client_code/tables/_tables.py

@@ -0,0 +1,61 @@
+import anvil.tables
+from . import query
+from ..auto_batch import batch_tables as app_tables
+from ..auto_batch import get_table_by_id, AutoBatch, BatchRow, BatchSearchIterator, BatchTable
+from functools import wraps
+#from contextlib import nullcontext
+
+class _NullContext: # b/c Skulpt lacks contextlib
+    def __enter__(self):
+        return None
+    
+    def __exit__(self, exc_type, exc_value, traceback):
+        return False
+
+
+batch_update = _NullContext()
+batch_delete = _NullContext()
+
+
+class Transaction:
+    def __init__(self, *args, **kwargs):
+        self.transaction = anvil.tables.Transaction(*args, **kwargs)
+        self.auto_batch = AutoBatch()
+
+    def __enter__(self):
+        txn = self.transaction.__enter__()
+        self.auto_batch.__enter__()
+        return txn
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.auto_batch.__exit__(exc_type, exc_value, traceback)
+        return self.transaction.__exit__(exc_type, exc_value, traceback)
+
+    def abort(self):
+        self.transaction.abort()
+
+
+def in_transaction(*d_args, **d_kwargs):
+    # added complications due to @in_transaction's optional 'relaxed' argument:
+    only_arg_is_func_to_decorate = (len(d_args) == 1 and callable(d_args[0]) and not d_kwargs)
+    if only_arg_is_func_to_decorate:
+        func_to_decorate = d_args[0]
+        tables_in_transaction = anvil.tables.in_transaction
+    else: #decorator was specified with arg(s) (i.e. 'relaxed')
+        # func-to-decorate not known yet
+        tables_in_transaction = anvil.tables.in_transaction(*d_args, **d_kwargs)
+    
+    def in_transaction_with_auto_batch(func):
+        @tables_in_transaction
+        @wraps(func)
+        def out_function(*args, **kwargs):
+            with AutoBatch():
+              result = func(*args, **kwargs) # Call the original function
+            return result
+        return out_function
+    
+    if only_arg_is_func_to_decorate:
+        return in_transaction_with_auto_batch(func_to_decorate)
+    else: # composite decorator now configured for 'relaxed' transaction
+        # Return composite decorator as a function, to then be applied to func-to-decorate
+        return in_transaction_with_auto_batch

client_code/tables/query.py

@@ -1,14 +1,15 @@
 import anvil.tables.query
-from ..auto_batch import debatchify_inputs
+from ..auto_batch import USE_WRAPPED
+
+
+def batch_row_handling(cls):
+    from ..auto_batch import debatchify_inputs
+    cls.__init__ = debatchify_inputs(cls.__init__)
+    return cls
 
 
 def __getattr__(attr):
-    if attr in ('all_of', 'any_of', 'none_of', 'not_'):
+    if USE_WRAPPED and attr in ('all_of', 'any_of', 'none_of', 'not_'):
         return batch_row_handling(getattr(anvil.tables.query, attr))
     else:
         return getattr(anvil.tables.query, attr)
-
-
-def batch_row_handling(cls):
-    cls.__init__ = debatchify_inputs(cls.__init__)
-    return cls