ApiLogicServer 14.4.0__py3-none-any.whl → 14.5.0__py3-none-any.whl

api_logic_server_cli/prototypes/basic_demo/customizations/logic/declare_logic.py

@@ -1,87 +1,105 @@
-#############################################
-# copy this file over logic/declare_logic.py
-#############################################
-
-import datetime
+import datetime, os
 from decimal import Decimal
 from logic_bank.exec_row_logic.logic_row import LogicRow
 from logic_bank.extensions.rule_extensions import RuleExtension
 from logic_bank.logic_bank import Rule
-from database.models import *
+from logic_bank.logic_bank import DeclareRule
+import database.models as models
 import api.system.opt_locking.opt_locking as opt_locking
-from security.system.authorization import Grant
-import logging, os
+from security.system.authorization import Grant, Security
+from logic.load_verify_rules import load_verify_rules
+import integration.kafka.kafka_producer as kafka_producer
+import logging
 
 app_logger = logging.getLogger(__name__)
 
-declare_logic_message = "Sample Rules  Loaded"
+declare_logic_message = "ALERT:  *** No Rules Yet ***"  # printed in api_logic_server.py
 
 def declare_logic():
-
-    """ Declarative multi-table derivations and constraints, extensible with Python. 
-
+    ''' Declarative multi-table derivations and constraints, extensible with Python.
+ 
     Brief background: see readme_declare_logic.md
+    
+    Your Code Goes Here - Use code completion (Rule.) to declare rules
+    '''
 
-    Use code completion (Rule.) to declare rules here
-
-    Check Credit - Logic Design:
-
-    1. Customer.Balance <= CreditLimit
+    if os.environ.get("WG_PROJECT"):
+        # Inside WG: Load rules from docs/expprt/export.json
+        load_verify_rules()
+    else:
+        # Outside WG: load declare_logic function
+        from logic.logic_discovery.auto_discovery import discover_logic
+        discover_logic()
 
-    2. Customer.Balance = Sum(Order.AmountTotal where unshipped)
+    # Logic from GenAI: (or, use your IDE w/ code completion)
+    from database.models import Product, Order, Item, Customer
 
-    3. Order.AmountTotal = Sum(Items.Amount)
+    # Ensure the customer's balance is less than their credit limit
+    Rule.constraint(validate=Customer, as_condition=lambda row: row.balance <= row.credit_limit, error_msg="Customer balance ({row.balance}) exceeds credit limit ({row.credit_limit})")
 
-    4. Items.Amount = Quantity * UnitPrice
+    # Derive the customer's balance as the sum of order totals where not yet shipped.
+    Rule.sum(derive=Customer.balance, as_sum_of=Order.amount_total, where=lambda row: row.date_shipped is None)
 
-    5. Items.UnitPrice = copy from Product
-    """
+    # Derive the order's total amount from the sum of item amounts.
+    Rule.sum(derive=Order.amount_total, as_sum_of=Item.amount)
 
-    Rule.constraint(validate=Customer,       # logic design translates directly into rules
-        as_condition=lambda row: row.Balance <= row.CreditLimit,
-        error_msg="balance ({round(row.Balance, 2)}) exceeds credit ({round(row.CreditLimit, 2)})")
+    # Calculate item amount based on quantity and unit price.
+    Rule.formula(derive=Item.amount, as_expression=lambda row: row.quantity * row.unit_price)
 
-    Rule.sum(derive=Customer.Balance,        # adjust iff AmountTotal or ShippedDate or CustomerID changes
-        as_sum_of=Order.AmountTotal,
-        where=lambda row: row.ShipDate is None)     # adjusts - *not* a sql select sum...
+    # Copy unit price from product to item.
+    Rule.copy(derive=Item.unit_price, from_parent=Product.unit_price)
 
-    Rule.sum(derive=Order.AmountTotal,       # adjust iff Amount or OrderID changes
-        as_sum_of=Item.Amount)
+    # Send order details to Kafka if order is shipped.
+    Rule.after_flush_row_event(on_class=Order, calling=kafka_producer.send_row_to_kafka, if_condition=lambda row: row.date_shipped is not None, with_args={'topic': 'order_shipping'})
 
-    Rule.formula(derive=Item.Amount,    # compute price * qty
-        as_expression=lambda row: row.UnitPrice * row.Quantity)
+    # End Logic from GenAI
 
-    Rule.copy(derive=Item.UnitPrice,    # get Product Price (e,g., on insert, or ProductId change)
-        from_parent=Product.UnitPrice)
 
-
-    def handle_all(logic_row: LogicRow):  # OPTIMISTIC LOCKING, [TIME / DATE STAMPING]
+    def handle_all(logic_row: LogicRow):  # #als: TIME / DATE STAMPING, OPTIMISTIC LOCKING
         """
         This is generic - executed for all classes.
 
-        Invokes optimistic locking.
+        Invokes optimistic locking, and checks Grant permissions.
 
-        You can optionally do time and date stamping here, as shown below.
+        Also provides user/date stamping.
 
         Args:
             logic_row (LogicRow): from LogicBank - old/new row, state
         """
 
-        if not os.getenv("APILOGICPROJECT_NO_FLASK") is not None:
+        if os.getenv("APILOGICPROJECT_NO_FLASK") is not None:
+            print("\ndeclare_logic.py Using TestBase\n")
             return  # enables rules to be used outside of Flask, e.g., test data loading
 
         if logic_row.is_updated() and logic_row.old_row is not None and logic_row.nest_level == 0:
             opt_locking.opt_lock_patch(logic_row=logic_row)
-        enable_creation_stamping = False  # CreatedOn time stamping
-        if enable_creation_stamping:
+
+        Grant.process_updates(logic_row=logic_row)
+
+        did_stamping = False
+        if enable_stamping := False:  # #als:  DATE / USER STAMPING
             row = logic_row.row
             if logic_row.ins_upd_dlt == "ins" and hasattr(row, "CreatedOn"):
                 row.CreatedOn = datetime.datetime.now()
-                logic_row.log("early_row_event_all_classes - handle_all sets 'Created_on"'')
-            Grant.process_updates(logic_row=logic_row)
-
+                did_stamping = True
+            if logic_row.ins_upd_dlt == "ins" and hasattr(row, "CreatedBy"):
+                row.CreatedBy = Security.current_user().id
+                #    if Config.SECURITY_ENABLED == True else 'public'
+                did_stamping = True
+            if logic_row.ins_upd_dlt == "upd" and hasattr(row, "UpdatedOn"):
+                row.UpdatedOn = datetime.datetime.now()
+                did_stamping = True
+            if logic_row.ins_upd_dlt == "upd" and hasattr(row, "UpdatedBy"):
+                row.UpdatedBy = Security.current_user().id  \
+                    if Config.SECURITY_ENABLED == True else 'public'
+                did_stamping = True
+            if did_stamping:
+                logic_row.log("early_row_event_all_classes - handle_all did stamping")     
     Rule.early_row_event_all_classes(early_row_event_all_classes=handle_all)
 
+    #als rules report
+    from api.system import api_utils
+    # api_utils.rules_report()
 
     app_logger.debug("..logic/declare_logic.py (logic == rules + code)")
 

api_logic_server_cli/prototypes/basic_demo/customizations/security/declare_security.py

@@ -35,26 +35,25 @@ DefaultRolePermission(to_role = Roles.renter, can_read=True, can_delete=False)
 DefaultRolePermission(to_role = Roles.manager, can_read=True, can_delete=False)
 DefaultRolePermission(to_role = Roles.sales, can_read=True, can_delete=False)
 
+
 #############################################
 # Observe: Filters are AND'd, Grants are OR'd 
 #############################################
-GlobalFilter(   global_filter_attribute_name = "Region",  # sales see only Customers in British Isles (9 rows)
-                roles_not_filtered = ["sa", "manager", "tenant", "renter"],  # ie, just sales
-                filter = '{entity_class}.Region == Security.current_user().region')
-        
+
+GlobalFilter(   global_filter_attribute_name = "name",  # sales does not see Bob (yes, silly - see nw & multi-tenant))
+                roles_not_filtered = ["sa", "manager", "tenant", "renter"],     # ie, just sales
+                filter = '{entity_class}.name != \'Bob\' ')                     # poor Bob
+
+
 Grant(  on_entity = models.Customer,
         to_role = Roles.sales,
-        filter = lambda : models.Customer.CreditLimit > 300,
-        filter_debug = "CreditLimit > 0")     # this eliminates all rows, but...
+        filter = lambda : models.Customer.credit_limit >= 3000,
+        filter_debug = "credit_limit > 3000")                                   # this eliminates Charlie, but...
 
 Grant(  on_entity = models.Customer,
         to_role = Roles.sales,
-        filter = lambda : models.Customer.ContactName == "Mike",
-        filter_debug = "ContactName == Mike (see security/declare_security.py)")
-
-# so user s1 sees the CTWSR customer row, per the resulting where from 2 global filters and 2 Grants:
-# where (Client_id=2 and region="British Isles") and (CreditLimit>300 or ContactName="Mike")
-#       <---- Filters AND'd ------------------->     <--- Grants OR'd --------------------->
+        filter = lambda : models.Customer.balance > 0,
+        filter_debug = "balance > 0 (see security/declare_security.py)")        # this let's us see Charlie (grants OR'd)
 
 
 app_logger.debug("Declare Security complete - security/declare_security.py"

api_logic_server_cli/prototypes/basic_demo/customizations/ui/admin/admin.yaml

@@ -0,0 +1,166 @@
+about:
+  date: May 13, 2025 20:12:31
+  merged:
+    at: May 13, 2025 20:15:21
+    new_attributes: 'Customer.email Order.CreatedOn '
+    new_resources: 'Email '
+    new_tab_groups: 'Customer.EmailList '
+  recent_changes: works with modified safrs-react-admin
+  version: 0.0.0
+api_root: '{http_type}://{swagger_host}:{port}/{api}'
+authentication: '{system-default}'
+info:
+  number_relationships: 4
+  number_tables: 5
+info_toggle_checked: true
+resources:
+  Customer:
+    attributes:
+    - label: ' name*'
+      name: name
+      search: true
+      sort: true
+    - name: balance
+      type: DECIMAL
+    - name: credit_limit
+      type: DECIMAL
+    - name: id
+    - name: email
+    - name: email_opt_out
+      type: BOOLEAN
+    tab_groups:
+    - direction: tomany
+      fks:
+      - customer_id
+      name: OrderList
+      resource: Order
+    - direction: tomany
+      fks:
+      - customer_id
+      name: EmailList
+      resource: Email
+    type: Customer
+    user_key: name
+  Email:
+    attributes:
+    - label: ' id*'
+      name: id
+      search: true
+      sort: true
+    - name: customer_id
+      required: true
+    - name: message
+    - name: CreatedOn
+      type: DATE
+    tab_groups:
+    - direction: toone
+      fks:
+      - customer_id
+      name: customer
+      resource: Customer
+    type: Email
+    user_key: id
+  Item:
+    attributes:
+    - label: ' id*'
+      name: id
+      search: true
+      sort: true
+    - name: order_id
+    - name: product_id
+      required: true
+    - name: quantity
+      required: true
+    - name: amount
+      type: DECIMAL
+    - name: unit_price
+      type: DECIMAL
+    tab_groups:
+    - direction: toone
+      fks:
+      - order_id
+      name: order
+      resource: Order
+    - direction: toone
+      fks:
+      - product_id
+      name: product
+      resource: Product
+    type: Item
+    user_key: id
+  Order:
+    attributes:
+    - label: ' id*'
+      name: id
+      search: true
+      sort: true
+    - name: customer_id
+      required: true
+    - name: notes
+    - name: amount_total
+      type: DECIMAL
+    - name: date_shipped
+      type: DATE
+    - name: CreatedOn
+      type: DATE
+    tab_groups:
+    - direction: tomany
+      fks:
+      - order_id
+      name: ItemList
+      resource: Item
+    - direction: toone
+      fks:
+      - customer_id
+      name: customer
+      resource: Customer
+    type: Order
+    user_key: id
+  Product:
+    attributes:
+    - label: ' name*'
+      name: name
+      search: true
+      sort: true
+    - name: unit_price
+      type: DECIMAL
+    - name: id
+    tab_groups:
+    - direction: tomany
+      fks:
+      - product_id
+      name: ItemList
+      resource: Item
+    type: Product
+    user_key: name
+settings:
+  HomeJS: /admin-app/home.js
+  max_list_columns: 8
+  style_guide:
+    applicationLocales:
+    - en
+    - es
+    currency_symbol: $
+    currency_symbol_position: left
+    date_format: LL
+    decimal_max: '1000000000'
+    decimal_min: '2'
+    decimal_separator: .
+    detail_mode: tab
+    edit_on_mode: dblclick
+    exclude_listpicker: false
+    include_translation: 'false'
+    keycloak_client_id: alsclient
+    keycloak_realm: kcals
+    keycloak_url: http://localhost:8080
+    locale: en
+    max_decimal_digits: '4'
+    min_decimal_digits: '2'
+    new_mode: dialog
+    pick_style: list
+    row_height: small,
+    serviceType: JSONAPI
+    startSessionPath: /auth/login
+    style: light
+    thousand_separator: ','
+    use_keycloak: 'false'

api_logic_server_cli/prototypes/basic_demo/iteration/api/{customize_api.py → api_discovery/order_b2b.py}

@@ -1,35 +1,29 @@
-import logging
-import api.system.api_utils as api_utils
-import safrs
 from flask import request, jsonify
+import logging
+
 from safrs import jsonapi_rpc
-from database import models
-import integration.system.RowDictMapper as row_dict_mapper
-from integration.row_dict_maps.OrderShipping import OrderShipping
+import safrs
+
 from integration.row_dict_maps.OrderB2B import OrderB2B
 
-# called by api_logic_server_run.py, to customize api (new end points, services).
-# separate from expose_api_models.py, to simplify merge if project recreated
+app_logger = logging.getLogger("api_logic_server_app")
 
-app_logger = logging.getLogger(__name__)
+def add_service(app, api, project_dir, swagger_host: str, PORT: str, method_decorators = []):
+    pass
 
-def expose_services(app, api, project_dir, swagger_host: str, PORT: str):
-    """ Customize API - new end points for services 
-    
-        Brief background: see readme_customize_api.md
 
-        Your Code Goes Here
-    
     """
+    Illustrates #als: custom end point with swagger, RowDictMapper
 
-    from api.api_discovery.auto_discovery import discover_services
-    discover_services(app, api, project_dir, swagger_host, PORT)
-    
-    app_logger.debug("api/customize_api.py - expose custom services")
+    * Custom service - visible in swagger
+    * Services *not* requiring authentication (contrast to CategoriesEndPoint, below)
+    * Use OrderB2B (extends RowDictMapper) to map json to rows with aliasing, joins and lookups
+    * Recall business logic is not in service, but encapsulated for reuse in logic/declare_logic.py
+    """
+    # class B2BSvcs(safrs.JABase):
 
     api.expose_object(ServicesEndPoint)  # Swagger-visible services
 
-
 """
 Illustrates #als: custom end point with swagger, RowDictMapper
 
@@ -47,12 +41,12 @@ class ServicesEndPoint(safrs.JABase):
         """ # yaml creates Swagger description
             args :
                 order:
-                    Account: "Customer 1"
+                    Account: "Alice"
                     Notes: "Please Rush"
                     Items :
-                    - Name: "Product A"
+                    - Name: "Gadget"
                       QuantityOrdered: 1
-                    - Name: "Product B"
+                    - Name: "Widget"
                       QuantityOrdered: 2
                     - Name: "Green"
                       QuantityOrdered: 3

api_logic_server_cli/prototypes/basic_demo/iteration/integration/row_dict_maps/OrderB2B.py

@@ -19,16 +19,17 @@ class OrderB2B(RowDictMapper):
         order = super(OrderB2B, self).__init__(
             model_class=models.Order
             , alias = "order"
-            , fields = [(models.Order.Notes)]
+            , fields = [(models.Order.notes, "Notes")]
             , parent_lookups = [( models.Customer, 
-                                  [(models.Customer.Name, 'Account')]
+                                  [(models.Customer.name, 'Account')]
                                 )]
             , related = [
                 (RowDictMapper(model_class=models.Item
                     , alias="Items"
-                    , fields = [(models.Item.Quantity, "QuantityOrdered")]
-                    , parent_lookups = [( models.Product, [models.Product.Name] )]
-                    )
+                    , fields = [(models.Item.quantity, "QuantityOrdered")]
+                    , parent_lookups = [( models.Product, 
+                                         [(models.Product.name, "Name" )]
+                    )])
                 )
             ]
         )

api_logic_server_cli/prototypes/basic_demo/iteration/integration/row_dict_maps/OrderShipping.py

@@ -17,11 +17,11 @@ class OrderShipping(RowDictMapper):
         order = super(OrderShipping, self).__init__(
             model_class=models.Order
             , alias = "order"
-            , fields = [models.Order.OrderID, (models.Order.AmountTotal, "Total"), (models.Order.ShipDate, "Order Date"), models.Order.CustomerID]
+            , fields = [models.Order.id, (models.Order.amount_total, "Total"), (models.Order.date_shipped, "Order Date"), models.Order.customer_id]
             , related = RowDictMapper(model_class=models.Item, alias="Items"
-                , fields = [models.Item.OrderID, models.Item.Quantity, models.Item.Amount]
-                , related = RowDictMapper(model_class=models.Product, alias="product"
-                    , fields=[models.Product.Name, models.Product.UnitPrice]
+                , fields = [models.Item.order_id, models.Item.quantity, models.Item.amount]
+                , related = RowDictMapper(model_class=models.Product, alias="product", role_name='product'
+                    , fields=[models.Product.name, models.Product.unit_price]
                     , isParent=True
                 )
             )

api_logic_server_cli/prototypes/basic_demo/iteration/logic/declare_logic.py

@@ -1,16 +1,16 @@
-import datetime
+import datetime, os
 from decimal import Decimal
 from logic_bank.exec_row_logic.logic_row import LogicRow
 from logic_bank.extensions.rule_extensions import RuleExtension
 from logic_bank.logic_bank import Rule
-from database import models
-from database.models import Customer, Order, Item, Product
+from logic_bank.logic_bank import DeclareRule
+import database.models as models
 import api.system.opt_locking.opt_locking as opt_locking
-from security.system.authorization import Grant
-import logging, os
 from integration.row_dict_maps.OrderShipping import OrderShipping
-from confluent_kafka import Producer, KafkaException
+from security.system.authorization import Grant, Security
+from logic.load_verify_rules import load_verify_rules
 import integration.kafka.kafka_producer as kafka_producer
+import logging
 
 app_logger = logging.getLogger(__name__)
 
@@ -22,45 +22,55 @@ def declare_logic():
     Brief background: see readme_declare_logic.md
     
     Your Code Goes Here - Use code completion (Rule.) to declare rules
-
-    GenAI: Paste the following into Copilot Chat, and paste the result below.
-        
-    Use Logic Bank to enforce these requirements:
-    
-    Enforce the Check Credit requirement (do not generate check constraints):
-    1. Customer.Balance <= CreditLimit
-    2. Customer.Balance = Sum(Order.AmountTotal where date shipped is null)
-    3. Order.AmountTotal = Sum(Items.Amount)
-    4. Items.Amount = Quantity * UnitPrice
-    5. Store the Items.UnitPrice as a copy from Product.UnitPrice
     '''
 
-    from logic_bank.logic_bank import Rule
+    if os.environ.get("WG_PROJECT"):
+        # Inside WG: Load rules from docs/expprt/export.json
+        load_verify_rules()
+    else:
+        # Outside WG: load declare_logic function
+        from logic.logic_discovery.auto_discovery import discover_logic
+        discover_logic()
+
+    # Logic from GenAI: (or, use your IDE w/ code completion)
+    from database.models import Product, Order, Item, Customer
+
+    # Ensure the customer's balance is less than their credit limit
+    Rule.constraint(validate=Customer, as_condition=lambda row: row.balance <= row.credit_limit, error_msg="Customer balance ({row.balance}) exceeds credit limit ({row.credit_limit})")
+
+    # Derive the customer's balance as the sum of order totals where not yet shipped.
+    Rule.sum(derive=Customer.balance, as_sum_of=Order.amount_total, where=lambda row: row.date_shipped is None)
 
-    # 1. Customer.Balance <= CreditLimit
-    Rule.constraint(validate=Customer,
-                    error_msg="balance exceeds credit limit",
-                    as_condition=lambda row: row.Balance <= row.CreditLimit)
+    # Derive the order's total amount from the sum of item amounts.
+    Rule.sum(derive=Order.amount_total, as_sum_of=Item.amount)
 
-    # 2. Customer.Balance = Sum(Order.AmountTotal where date shipped is null)
-    Rule.sum(derive=Customer.Balance, as_sum_of=Order.AmountTotal,
-            where=lambda row: row.ShipDate is None)
 
-    # 3. Order.AmountTotal = Sum(Items.Amount)
-    Rule.sum(derive=Order.AmountTotal, as_sum_of=Item.Amount)
+    # ************   Python Customization Example ****************
 
+    # Calculate item amount based on quantity and unit price.
+    # Formerly, we had this rule:
+    #       Rule.formula(derive=Item.amount, as_expression=lambda row: row.quantity * row.unit_price)
+    # If the derivation were more complex, we could use a Python function, like this:
     def derive_amount(row: models.Item, old_row: models.Item, logic_row: LogicRow):
-        amount = row.Quantity * row.UnitPrice
-        if row.Product.CarbonNeutral == True and row.Quantity >= 10:
+        amount = row.quantity * row.unit_price
+        product = row.product
+        if product.carbon_neutral == True and row.quantity >= 10:
            amount = amount * Decimal(0.9)  # breakpoint here
         return amount
 
     # 4. Items.Amount = Quantity * UnitPrice
-    Rule.formula(derive=models.Item.Amount, calling=derive_amount)
+    Rule.formula(derive=models.Item.amount, calling=derive_amount)
 
-    # 5. Store the Items.UnitPrice as a copy from Product.UnitPrice
-    Rule.copy(Item.UnitPrice, from_parent=Product.UnitPrice)
+    # Copy unit price from product to item.
+    Rule.copy(derive=Item.unit_price, from_parent=Product.unit_price)
 
+
+    # ************   Python Customization Example ****************
+
+    # Send order details to Kafka if order is shipped.
+    # Formeraly, we had this rule:
+    #       Rule.after_flush_row_event(on_class=Order, calling=kafka_producer.send_row_to_kafka, if_condition=lambda row: row.date_shipped is not None, with_args={'topic': 'order_shipping'})
+    # If the integration were more complex, we could use Python, like this:
     #als: Demonstrate that logic == Rules + Python (for extensibility)
 
     def send_order_to_shipping(row: models.Order, old_row: models.Order, logic_row: LogicRow):
@@ -68,7 +78,7 @@ def declare_logic():
 
         Format row per shipping requirements, and send (e.g., a message)
 
-        NB: the after_flush event makes Order.Id avaible.  Contrast to congratulate_sales_rep().
+        NB: the after_flush event makes Order.Id avaible.
 
         Args:
             row (models.Order): inserted Order
@@ -79,38 +89,54 @@ def declare_logic():
             kafka_producer.send_kafka_message(logic_row=logic_row,
                                               row_dict_mapper=OrderShipping,
                                               kafka_topic="order_shipping",
-                                              kafka_key=str(row.OrderID),
+                                              kafka_key=str(row.id),
                                               msg="Sending Order to Shipping")
             
     Rule.after_flush_row_event(on_class=models.Order, calling=send_order_to_shipping)  # see above
 
+    # End Logic from GenAI
 
 
-    def handle_all(logic_row: LogicRow):  # OPTIMISTIC LOCKING, [TIME / DATE STAMPING]
+    def handle_all(logic_row: LogicRow):  # #als: TIME / DATE STAMPING, OPTIMISTIC LOCKING
         """
         This is generic - executed for all classes.
 
-        Invokes optimistic locking.
+        Invokes optimistic locking, and checks Grant permissions.
 
-        You can optionally do time and date stamping here, as shown below.
+        Also provides user/date stamping.
 
         Args:
             logic_row (LogicRow): from LogicBank - old/new row, state
         """
 
-        if not os.getenv("APILOGICPROJECT_NO_FLASK") is not None:
+        if os.getenv("APILOGICPROJECT_NO_FLASK") is not None:
+            print("\ndeclare_logic.py Using TestBase\n")
             return  # enables rules to be used outside of Flask, e.g., test data loading
 
         if logic_row.is_updated() and logic_row.old_row is not None and logic_row.nest_level == 0:
             opt_locking.opt_lock_patch(logic_row=logic_row)
-        enable_creation_stamping = False  # CreatedOn time stamping
-        if enable_creation_stamping:
+
+        Grant.process_updates(logic_row=logic_row)
+
+        did_stamping = False
+        if enable_stamping := False:  # #als:  DATE / USER STAMPING
             row = logic_row.row
             if logic_row.ins_upd_dlt == "ins" and hasattr(row, "CreatedOn"):
                 row.CreatedOn = datetime.datetime.now()
-                logic_row.log("early_row_event_all_classes - handle_all sets 'Created_on"'')
-            Grant.process_updates(logic_row=logic_row)
-
+                did_stamping = True
+            if logic_row.ins_upd_dlt == "ins" and hasattr(row, "CreatedBy"):
+                row.CreatedBy = Security.current_user().id
+                #    if Config.SECURITY_ENABLED == True else 'public'
+                did_stamping = True
+            if logic_row.ins_upd_dlt == "upd" and hasattr(row, "UpdatedOn"):
+                row.UpdatedOn = datetime.datetime.now()
+                did_stamping = True
+            if logic_row.ins_upd_dlt == "upd" and hasattr(row, "UpdatedBy"):
+                row.UpdatedBy = Security.current_user().id  \
+                    if Config.SECURITY_ENABLED == True else 'public'
+                did_stamping = True
+            if did_stamping:
+                logic_row.log("early_row_event_all_classes - handle_all did stamping")     
     Rule.early_row_event_all_classes(early_row_event_all_classes=handle_all)
 
     #als rules report