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

api_logic_server_cli/prototypes/base/integration/kafka/kafka_producer.py

@@ -44,8 +44,12 @@ def kafka_producer():
         if "client.id" not in conf:
             conf["client.id"] = socket.gethostname()
         # conf = {'bootstrap.servers': 'localhost:9092', 'client.id': socket.gethostname()}
-        producer = Producer(conf)
-        logger.debug(f'\nKafka producer connected')
+        try:
+            producer = Producer(conf)
+            logger.debug(f'\nKafka producer connected')
+        except Exception as ke:
+            logger.debug(f'Kafka producer error: {ke}')
+            producer = None
 
 from sqlalchemy.inspection import inspect
 
@@ -64,7 +68,7 @@ def get_primary_key(logic_row: LogicRow):
 
 
 def send_kafka_message(kafka_topic: str, kafka_key: str = None, msg: str="", json_root_name: str = "", 
-                       logic_row: LogicRow = None, row_dict_mapper: RowDictMapper = None, payload: dict = None):
+                        logic_row: LogicRow = None, row_dict_mapper: RowDictMapper = None, payload: dict = None):
     """ Send Kafka message regarding logic_row, mapped by row_dict_mapper
 
     * Typically called from declare_logic event

api_logic_server_cli/prototypes/base/integration/system/FlaskKafka.py

@@ -64,7 +64,11 @@ class FlaskKafka():
         logger.info(f" - FlaskKafka._start: begin polling (v {__version__}), with \n -- conf: {self.conf} \n -- topics: {topics}")
         consumer = Consumer(self.conf)
         consumer.subscribe(topics=list(topics))
-        while True:
+        while True and len(topics) > 0:
+            if self.interrupt_event.is_set():
+                logger.info("Kafka thread interrupted")
+                break
+    
             msg = consumer.poll(1.0)
             logger.debug(f' - KafkaConnect._start - consuming consumer.poll(1.0): {msg}')
             if msg is None:

api_logic_server_cli/prototypes/base/security/authentication_provider/keycloak/auth_provider.py

@@ -78,7 +78,7 @@ class Authentication_Provider(Abstract_Authentication_Provider):
         from flask import jsonify, request
         from config.config import Args  # circular import error if at top
         
-        jwks_uri = Args.instance.keycloak_base + '/protocol/openid-connect/certs'
+        jwks_uri = Args.instance.keycloak_base_url + '/protocol/openid-connect/certs'
         for i in range(100):
             # we retry a couple of times in case there are connection problems
             try:

api_logic_server_cli/prototypes/base/security/declare_security.py

@@ -34,6 +34,8 @@ class Roles():
     admin = "CS_ADMIN"
     public="public"             # p1/p (no roles, but gets public)
     sa="sa"
+    default_roles_kcals = "default-roles-kcals"
+    uma_authorization = "uma_authorization"
     
 DefaultRolePermission(to_role=Roles.sa, can_read=True, can_update=True, can_insert=True, can_delete=True)
 DefaultRolePermission(to_role=Roles.tenant, can_read=True, can_delete=True)
@@ -43,3 +45,5 @@ DefaultRolePermission(to_role=Roles.teller, can_read=True, can_insert=True,can_u
 DefaultRolePermission(to_role=Roles.customer, can_read=True, can_insert=True,can_update=True, can_delete=False)
 DefaultRolePermission(to_role=Roles.read_only, can_read=True, can_insert=False,can_update=False, can_delete=False)
 DefaultRolePermission(to_role=Roles.public, can_read=True, can_insert=False,can_update=False, can_delete=False)
+DefaultRolePermission(to_role=Roles.default_roles_kcals, can_read=True, can_insert=True,can_update=True, can_delete=False)
+DefaultRolePermission(to_role=Roles.uma_authorization, can_read=True, can_insert=True,can_update=True, can_delete=False)

api_logic_server_cli/prototypes/base/ui/admin/admin_loader.py

@@ -140,7 +140,7 @@ def admin_events(flask_app: Flask, args: Args, validation_error: ValidationError
                 if "keycloak" in provider_name:
                     s = (f'\n'
                         f'  keycloak:\n'
-                        f'    url: {args.keycloak_base_url}\n'
+                        f'    url: {args.keycloak_base}\n'
                         f'    realm: {args.keycloak_realm}\n'
                         f'    clientId: {args.keycloak_client_id}\n'
                     )   
@@ -148,6 +148,8 @@ def admin_events(flask_app: Flask, args: Args, validation_error: ValidationError
                 elif "sql" in provider_name:
                     sql_auth_config = f'\n  endpoint: {args.http_scheme}://{args.swagger_host}:{args.swagger_port}/{args.api_prefix[1:]}/auth/login\n'
                     content = content.replace("'{system-default}'", sql_auth_config)
+                elif getattr(Config.SECURITY_PROVIDER, 'auth_config', None):
+                    content = content.replace("'{system-default}'", Config.SECURITY_PROVIDER.auth_config)
                 else:
                     sys.exit(f"ERROR[admin_loader]: unknown security type: {Config.SECURITY_PROVIDER}")         
 

api_logic_server_cli/prototypes/base/ui/templates/bar_chart.jinja

@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Sales by Region</title>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+    <style>
+        body {
+            margin: 0;
+            padding: 0;
+            display: flex;
+            overflow: hidden;
+            justify-content: center;
+            align-items: center;
+            height: 100%;
+            box-sizing: border-box;
+        }
+        canvas {
+            display: block;
+        }
+    </style>
+</head>
+<body>
+    <canvas id="salesChart" width="200" height="200"></canvas>
+    <script>
+        const labels = [];
+        const data = [];
+        result = {{ result | tojson }};
+        console.log(result);
+        const type = result.chart_type;
+        const title = result.title;
+        const columns = result.columns;
+        console.log(JSON.stringify(result));
+        result.results.forEach(item => {
+            labels.push(item[columns[0]]);
+            data.push(parseFloat(item[columns[1]]));
+        });
+        const ctx = document.getElementById('salesChart').getContext('2d');
+        const salesChart = new Chart(ctx, {
+            type: type,
+            data: {
+                labels: labels,
+                datasets: [{
+                    label: title,
+                    data: data,
+                    backgroundColor: {{ color | tojson }},
+                    borderColor: 'rgba(75, 192, 192, 1)',
+                    borderWidth: 1
+                }]
+            },
+            options: {
+                responsive: true,
+                maintainAspectRatio: false,
+                scales: {
+                    y: {
+                        beginAtZero: true
+                    }
+                }
+            }
+        });
+    </script>
+</body>
+</html>

api_logic_server_cli/prototypes/genai_demo/ui/admin/admin.yaml

@@ -135,7 +135,7 @@ settings:
     new_mode: dialog
     pick_style: list
     row_height: small,
-    serviceType: OntimizeEE
+    serviceType: JSONAPI
     startSessionPath: /auth/login
     style: light
     thousand_separator: ','

api_logic_server_cli/prototypes/manager/README.md

@@ -98,7 +98,7 @@ Then, try your own databases [(db-url examples here)](https://apilogicserver.git
 
 <br>You can do this with or without signup:
 
-1. If you have signed up, this will create and open a project called `genai_demo` from `genai_demo.prompt` (available in left Explorer pane):
+1. If you have signed up (see *To obtain a ChatGPT API Key*, below), this will create and open a project called `genai_demo` from `genai_demo.prompt` (available in left Explorer pane):
 
 ```bash
 als genai --using=system/genai/examples/genai_demo/genai_demo.prompt --project-name=genai_demo
@@ -122,6 +122,20 @@ Verify it's operating properly:
 
 </br>
 
+
+<details markdown>
+
+<summary> To obtain a ChatGPT API Key</summary>
+
+<br>GenAI-Logic uses OpenAI, which requires an Open API Key:
+
+1. Obtain one from [here](https://platform.openai.com/account/api-keys) or [here](https://platform.openai.com/api-keys)
+2. Authorize payments [here](https://platform.openai.com/settings/organization/billing/overview)
+
+</details>
+
+</br>
+
 <details markdown>
 
 <summary> What Just Happened? &nbsp;&nbsp;&nbsp;Next Steps...</summary>
@@ -151,20 +165,28 @@ Verify it's operating properly:
 
 <summary> You can iterate the logic and data model</summary>
 
-<br>Logic iterations are particuarly useful.  For example, here we take the basic check-credit logic, and add:
+<br>The approach for an iteration is to create a new project from an existing one:
+
+1. add another prompt to an existing projects `docs` directory, specifying your changes
+2. use `als genai`, specifying 
+    * `--using` existing projects `docs` directory, and 
+    * `--project-name` as the output project
+ 
+ **Logic iterations** are particuarly useful.  For example, here we take the basic check-credit logic, and add:
 
 > Provide a 10% discount when buying more than 10 carbon neutral products.<br><br>The Item carbon neutral is copied from the Product carbon neutral
 
-Explore [genai_demo_iteration_discount](system/genai/examples/genai_demo/genai_demo_iteration_discount).  This will add carbon_neutral to the data model, and update the logic to provide the discount:
+Explore [genai_demo_iteration_discount](system/genai/examples/genai_demo/genai_demo_iteration_discount).  It's an iteration of basic_demo (see system/genai/examples/genai_demo/genai_demo_iteration_discount/002_create_db_models.prompt).  This will add carbon_neutral to the data model, and update the logic to provide the discount:
 
 ```bash title='Iterate Business Logic'
 # Iterate with data model and logic
-als genai --project-name='genai_demo_with_logic' --using=system/genai/examples/genai_demo/genai_demo_iteration
+als genai --project-name='genai_demo_with_discount' --using=system/genai/examples/genai_demo/genai_demo_iteration_discount
 # open Docs/db.dbml
 ```
+
 <br>
 
-You can add new columns/tables, while keeping the prior model intact:
+You can perform **model iterations:** add new columns/tables, while keeping the prior model intact.  First, we create a project with no logic, perhaps just to see the screens (this step is optional, provided just to illustrate that iterations create new projects from existing ones):
 
 ```bash title='Iterate Without Logic'
 # Step 1 - create without logic
@@ -172,6 +194,8 @@ als genai --project-name='genai_demo_no_logic' --using=system/genai/examples/gen
 # open Docs/db.dbml
 ```
 
+Then, we would create another prompt in the docs directory with our model changes. We've already created these for you in `system/genai/examples/genai_demo/genai_demo_iteration` - we use that to alter the data model (see `system/genai/examples/genai_demo/genai_demo_iteration/004_iteration_renames_logic.prompt`):
+
 ```bash title='Iterate With Logic'
 # Iterate with data model and logic
 als genai --project-name='genai_demo_with_logic' --using=system/genai/examples/genai_demo/genai_demo_iteration
@@ -488,6 +512,18 @@ als create --project-name=sample_ai --from-model=sample_ai.py --db-url=sqlite
 
 4. This will create your database, create an API Logic Project from it, and launch your IDE.
 
+5. Create business logic
+
+    * You can create logic with either your IDE (and code completion), or Natural Language
+    * To use Natural Language:
+
+        1. Use the CoPilot chat,
+        2. Paste the logic above
+        3. Copy it to `logic/declare_logic.py` after `discover_logic()`
+        
+            * Alert:  Table and Column Names may require correction to conform to the model
+            * Alert: you may to apply [defaulting](https://apilogicserver.github.io/Docs/Logic-Use/#insert-defaulting), and initialize derived attributes in your database
+
 </details>
 </br>
 
@@ -544,6 +580,21 @@ ApiLogicServer create --project-name=samples/nw_sample_nocust --db-url=nw
 
 &nbsp;
 
+## Explore WebGenAI
+
+In addition to the CLI examples above, you can use [WebGenAI](https://apilogicserver.github.io/Docs/WebGenAI/) - a web interface for creating projects from prompts.  You can install WebGenAI on a server, so that created projects are easy to review with colleagues.
+
+To try WebGenAI:
+
+```bash
+cd webgenai
+docker compose up
+```
+
+You will be directed to the registration process.  You will also require a ChatGPT API Key as described above.
+
+&nbsp;
+
 &nbsp;
 
 ## Appendix: Quick Basic Demo

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.prompt

@@ -2,8 +2,6 @@ Create a system with customers, orders, items and products.
 
 Include a notes field for orders.
 
-Use LogicBank to enforce business logic.
-
 Use case: Check Credit    
     1. The Customer's balance is less than the credit limit
     2. The Customer's balance is the sum of the Order amount_total where date_shipped is null
@@ -13,9 +11,3 @@ Use case: Check Credit
 
 Use case: App Integration
     1. Send the Order to Kafka topic 'order_shipping' if the date_shipped is not None.
-
-Ensure each customer and product has a unique name.
-
-Ensure each Item quantity is not null.
-
-Ensure each order has a valid customer_id that exists in the Customer table.

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example

@@ -2,140 +2,170 @@
     "models": [
         {
             "classname": "Customer",
-            "code": "class Customer(Base):\n    __tablename__ = 'customer'\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    name = Column(String, unique=True)\n    balance = Column(DECIMAL)\n    credit_limit = Column(DECIMAL)",
-            "description": "Represents a customer in the system with unique name, balance, and credit limit attributes.",
+            "code": "class Customer(Base):\n    __tablename__ = 'customer'\n\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    name = Column(String, unique=True)\n    balance = Column(DECIMAL)\n    credit_limit = Column(DECIMAL)",
+            "description": "Defines the Customer entity with a unique name, balance, and credit limit.",
             "name": "Customer"
         },
         {
             "classname": "Order",
-            "code": "class Order(Base):\n    __tablename__ = 'order'\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    customer_id = Column(Integer, ForeignKey('customer.id'))\n    date_shipped = Column(Date)\n    amount_total = Column(DECIMAL)\n    notes = Column(String)",
-            "description": "Represents an order made by a customer, including a notes field.",
+            "code": "class Order(Base):\n    __tablename__ = 'order'\n\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    notes = Column(String)\n    customer_id = Column(Integer, ForeignKey('customer.id'), nullable=False)\n    date_shipped = Column(Date)\n    amount_total = Column(DECIMAL)",
+            "description": "Defines the Order entity which belongs to a customer. Includes notes and amount total.",
             "name": "Order"
         },
         {
             "classname": "Item",
-            "code": "class Item(Base):\n    __tablename__ = 'item'\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    order_id = Column(Integer, ForeignKey('order.id'))\n    product_id = Column(Integer, ForeignKey('product.id'))\n    quantity = Column(Integer, nullable=False)\n    unit_price = Column(DECIMAL)\n    amount = Column(DECIMAL)",
-            "description": "Represents an item in an order, including quantity and pricing details.",
+            "code": "class Item(Base):\n    __tablename__ = 'item'\n\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    order_id = Column(Integer, ForeignKey('order.id'))\n    product_id = Column(Integer, ForeignKey('product.id'), nullable=False)\n    quantity = Column(Integer, nullable=False)\n    amount = Column(DECIMAL)\n    unit_price = Column(DECIMAL)",
+            "description": "Defines the Item entity with quantity, amounts, and unit price details.",
             "name": "Item"
         },
         {
             "classname": "Product",
-            "code": "class Product(Base):\n    __tablename__ = 'product'\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    name = Column(String)\n    unit_price = Column(DECIMAL)",
-            "description": "Represents a product available in the system with a unit price.",
+            "code": "class Product(Base):\n    __tablename__ = 'product'\n\n    id = Column(Integer, primary_key=True, autoincrement=True)\n    name = Column(String, unique=True)\n    unit_price = Column(DECIMAL)",
+            "description": "Defines the Product entity with a unique name and unit price.",
             "name": "Product"
         }
     ],
     "rules": [
         {
             "name": "Customer Balance Constraint",
-            "description": "Ensures the customer's balance is aligned with the credit limit.",
-            "use_case": "Customer.balance <= credit_limit",
+            "description": "Ensure the customer's balance is less than their credit limit.",
+            "use_case": "Check Credit",
             "entity": "Customer",
-            "code": "Rule.constraint(validate=Customer,\n                as_condition=lambda row: row.balance <= row.credit_limit,\n                error_msg='Customer balance ({row.balance}) exceeds credit limit ({row.credit_limit})')"
+            "code": "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})\")"
         },
         {
             "name": "Customer Balance Derivation",
-            "description": "Calculates the customer's balance as the sum of orders' amount_total where date_shipped is null.",
-            "use_case": "Customer.balance = Sum(Order.amount_total where date_shipped is null)",
+            "description": "Derive the customer's balance as the sum of order totals where not yet shipped.",
+            "use_case": "Check Credit",
             "entity": "Customer",
             "code": "Rule.sum(derive=Customer.balance, as_sum_of=Order.amount_total, where=lambda row: row.date_shipped is None)"
         },
         {
-            "name": "Order Amount Total Derivation",
-            "description": "Calculates order's amount_total as the sum of item amounts.",
-            "use_case": "Order.amount_total = Sum(Item.amount)",
+            "name": "Order Total Derivation",
+            "description": "Derive the order's total amount from the sum of item amounts.",
+            "use_case": "Check Credit",
             "entity": "Order",
             "code": "Rule.sum(derive=Order.amount_total, as_sum_of=Item.amount)"
         },
         {
-            "name": "Item Amount Derivation",
-            "description": "Calculates item amount as quantity multiplied by unit price.",
-            "use_case": "Item.amount = quantity * unit_price",
+            "name": "Item Amount Calculation",
+            "description": "Calculate item amount based on quantity and unit price.",
+            "use_case": "Check Credit",
             "entity": "Item",
             "code": "Rule.formula(derive=Item.amount, as_expression=lambda row: row.quantity * row.unit_price)"
         },
         {
-            "name": "Copy Item Unit Price",
-            "description": "Copies the product's unit price to the item.",
-            "use_case": "Store the Item.unit_price as a copy from Product.unit_price",
+            "name": "Item Unit Price Copy",
+            "description": "Copy unit price from product to item.",
+            "use_case": "Check Credit",
             "entity": "Item",
             "code": "Rule.copy(derive=Item.unit_price, from_parent=Product.unit_price)"
         },
         {
-            "name": "Order Kafka Integration",
-            "description": "Sends the order to Kafka topic 'order_shipping' if the date shipped is not None.",
+            "name": "Order Kafka Notification",
+            "description": "Send order details to Kafka if order is shipped.",
             "use_case": "App Integration",
             "entity": "Order",
-            "code": "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\"})"
+            "code": "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'})"
         }
     ],
-    "test_data": "Insert test data into the tables with values compatible with the derived logic.",
+    "graphics": [
+        {
+            "sqlalchemy_query": "session.query(Product.name, func.sum(Item.amount).label('TotalSales')).join(Item, Product.id == Item.product_id).filter(Order.date_shipped.isnot(None)).group_by(Product.name).order_by(func.sum(Item.amount).desc())",
+            "sql_query": "SELECT Product.name, SUM(Item.amount) AS TotalSales FROM Product JOIN Item ON Product.id = Item.product_id JOIN Order ON Item.order_id = Order.id WHERE Order.date_shipped IS NOT NULL GROUP BY Product.name ORDER BY TotalSales DESC",
+            "classes_used": "Product, Item, Order",
+            "class_x_axis": "Product",
+            "name": "sales_by_product",
+            "prompt": "Graph Sales by Product",
+            "title": "Sales by Product",
+            "xAxis": "Product",
+            "yAxis": "Total Sales",
+            "dashboard": true,
+            "graph_type": "Bar",
+            "html_code": "var data = result.result; var categories = data.map(item => item[0]); var totals = data.map(item => item[1]); var ctx = document.getElementById('salesByProductChart').getContext('2d'); new Chart(ctx, {type: 'bar', data: {labels: categories, datasets: [{label: 'Sales by Product', data: totals}]}});"
+        },
+        {
+            "sqlalchemy_query": "session.query(Customer.name, func.sum(Order.amount_total).label('TotalCustomerSales')).join(Order, Customer.id == Order.customer_id).filter(Order.date_shipped.isnot(None)).group_by(Customer.name).order_by(func.sum(Order.amount_total).desc())",
+            "sql_query": "SELECT Customer.name, SUM(Order.amount_total) AS TotalCustomerSales FROM Customer JOIN Order ON Customer.id = Order.customer_id WHERE Order.date_shipped IS NOT NULL GROUP BY Customer.name ORDER BY TotalCustomerSales DESC",
+            "classes_used": "Customer, Order",
+            "class_x_axis": "Customer",
+            "name": "sales_by_customer",
+            "prompt": "Graph Sales by Customer",
+            "title": "Sales by Customer",
+            "xAxis": "Customer",
+            "yAxis": "Total Sales",
+            "dashboard": true,
+            "graph_type": "Bar",
+            "html_code": "var data = result.result; var customers = data.map(item => item[0]); var sales = data.map(item => item[1]); var ctx = document.getElementById('salesByCustomerChart').getContext('2d'); new Chart(ctx, {type: 'bar', data: {labels: customers, datasets: [{label: 'Sales by Customer', data: sales}]}});"
+        }
+    ],
+    "test_data": "This is the test data generated for Customers, Orders, Items, and Products in the new system.",
     "test_data_rows": [
         {
-            "test_data_row_variable": "test_customer_1",
-            "code": "test_customer_1 = Customer(name='Customer 1', balance=150, credit_limit=1000)"
+            "test_data_row_variable": "customer1",
+            "code": "customer1 = Customer(name=\"Alice\", balance=90.00, credit_limit=5000.00)"
         },
         {
-            "test_data_row_variable": "test_customer_2",
-            "code": "test_customer_2 = Customer(name='Customer 2', balance=275, credit_limit=750)"
+            "test_data_row_variable": "customer2",
+            "code": "customer2 = Customer(name=\"Bob\", balance=0.00, credit_limit=3000.00)"
         },
         {
-            "test_data_row_variable": "test_customer_3",
-            "code": "test_customer_3 = Customer(name='Customer 3', balance=150, credit_limit=1500)"
+            "test_data_row_variable": "customer3",
+            "code": "customer3 = Customer(name=\"Charlie\", balance=220.00, credit_limit=2000.00)"
         },
         {
-            "test_data_row_variable": "test_customer_4",
-            "code": "test_customer_4 = Customer(name='Customer 4', balance=0, credit_limit=1200)"
+            "test_data_row_variable": "customer4",
+            "code": "customer4 = Customer(name=\"Diana\", balance=0.00, credit_limit=1000.00)"
         },
         {
-            "test_data_row_variable": "test_order_1",
-            "code": "test_order_1 = Order(customer_id=1, notes='Order 1 notes', amount_total=150)"
+            "test_data_row_variable": "product1",
+            "code": "product1 = Product(name=\"Gadget\", unit_price=150.00)"
         },
         {
-            "test_data_row_variable": "test_order_2",
-            "code": "test_order_2 = Order(customer_id=2, notes='Order 2 notes', amount_total=225)"
+            "test_data_row_variable": "product2",
+            "code": "product2 = Product(name=\"Widget\", unit_price=90.00)"
         },
         {
-            "test_data_row_variable": "test_order_3",
-            "code": "test_order_3 = Order(customer_id=2, notes='Order 3 notes', amount_total=50)"
+            "test_data_row_variable": "product3",
+            "code": "product3 = Product(name=\"Thingamajig\", unit_price=75.00)"
         },
         {
-            "test_data_row_variable": "test_order_4",
-            "code": "test_order_4 = Order(customer_id=3, notes='Order 4 notes', amount_total=150)"
+            "test_data_row_variable": "product4",
+            "code": "product4 = Product(name=\"Doodad\", unit_price=110.00)"
         },
         {
-            "test_data_row_variable": "test_item_1",
-            "code": "test_item_1 = Item(order_id=1, product_id=1, quantity=3, unit_price=50, amount=150)"
+            "test_data_row_variable": "order1",
+            "code": "order1 = Order(notes=\"First Order\", customer_id=2, date_shipped=date(2023, 3, 22), amount_total=300.00)"
         },
         {
-            "test_data_row_variable": "test_item_2",
-            "code": "test_item_2 = Item(order_id=2, product_id=2, quantity=2, unit_price=25, amount=50)"
+            "test_data_row_variable": "order2",
+            "code": "order2 = Order(notes=\"Second Order\", customer_id=1, date_shipped=None, amount_total=90.00)"
         },
         {
-            "test_data_row_variable": "test_item_3",
-            "code": "test_item_3 = Item(order_id=3, product_id=3, quantity=3, unit_price=75, amount=225)"
+            "test_data_row_variable": "order3",
+            "code": "order3 = Order(notes=\"Pending Shipment\", customer_id=3, date_shipped=None, amount_total=220.00)"
         },
         {
-            "test_data_row_variable": "test_item_4",
-            "code": "test_item_4 = Item(order_id=4, product_id=1, quantity=3, unit_price=50, amount=150)"
+            "test_data_row_variable": "order4",
+            "code": "order4 = Order(notes=\"Urgent Order\", customer_id=4, date_shipped=date(2023, 7, 15), amount_total=220.00)"
         },
         {
-            "test_data_row_variable": "test_product_1",
-            "code": "test_product_1 = Product(name='Product 1', unit_price=50)"
+            "test_data_row_variable": "item1",
+            "code": "item1 = Item(order_id=1, product_id=1, quantity=2, amount=300.00, unit_price=150.00)"
         },
         {
-            "test_data_row_variable": "test_product_2",
-            "code": "test_product_2 = Product(name='Product 2', unit_price=25)"
+            "test_data_row_variable": "item2",
+            "code": "item2 = Item(order_id=2, product_id=2, quantity=1, amount=90.00, unit_price=90.00)"
         },
         {
-            "test_data_row_variable": "test_product_3",
-            "code": "test_product_3 = Product(name='Product 3', unit_price=75)"
+            "test_data_row_variable": "item3",
+            "code": "item3 = Item(order_id=3, product_id=4, quantity=2, amount=220.00, unit_price=110.00)"
         },
         {
-            "test_data_row_variable": "test_product_4",
-            "code": "test_product_4 = Product(name='Product 4', unit_price=100)"
+            "test_data_row_variable": "item4",
+            "code": "item4 = Item(order_id=4, product_id=3, quantity=4, amount=300.00, unit_price=75.00)"
         }
     ],
-    "test_data_sqlite": "INSERT INTO customers (name, balance, credit_limit) VALUES ('Customer 1', 300, 1000);\nINSERT INTO customers (name, balance, credit_limit) VALUES ('Customer 2', 500, 750);\nINSERT INTO customers (name, balance, credit_limit) VALUES ('Customer 3', 0, 1500);\nINSERT INTO customers (name, balance, credit_limit) VALUES ('Customer 4', 200, 1200);\n\nINSERT INTO orders (customer_id, notes, date_shipped, amount_total) VALUES (1, 'Order 1 notes', NULL, 150);\nINSERT INTO orders (customer_id, notes, date_shipped, amount_total) VALUES (2, 'Order 2 notes', NULL, 0);\nINSERT INTO orders (customer_id, notes, date_shipped, amount_total) VALUES (2, 'Order 3 notes', NULL, 0);\nINSERT INTO orders (customer_id, notes, date_shipped, amount_total) VALUES (3, 'Order 4 notes', NULL, 150);\n\nINSERT INTO items (order_id, product_id, quantity, unit_price, amount) VALUES (1, 1, 3, 50, 150);\nINSERT INTO items (order_id, product_id, quantity, unit_price, amount) VALUES (2, 2, 2, 25, 0);\nINSERT INTO items (order_id, product_id, quantity, unit_price, amount) VALUES (3, 3, 1, 75, 0);\nINSERT INTO items (order_id, product_id, quantity, unit_price, amount) VALUES (4, 1, 3, 50, 150);\n\nINSERT INTO products (name, unit_price) VALUES ('Product 1', 50);\nINSERT INTO products (name, unit_price) VALUES ('Product 2', 25);\nINSERT INTO products (name, unit_price) VALUES ('Product 3', 75);\nINSERT INTO products (name, unit_price) VALUES ('Product 4', 100);",
-    "name": "OrderManagementSystem"
+    "test_data_sqlite": "INSERT INTO customer (name, balance, credit_limit) VALUES ('Alice', 1000.00, 5000.00);\nINSERT INTO customer (name, balance, credit_limit) VALUES ('Bob', 2000.00, 3000.00);\nINSERT INTO customer (name, balance, credit_limit) VALUES ('Charlie', 500.00, 2000.00);\nINSERT INTO customer (name, balance, credit_limit) VALUES ('Diana', 0.00, 1000.00);\n\nINSERT INTO product (name, unit_price) VALUES ('Gadget', 150.00);\nINSERT INTO product (name, unit_price) VALUES ('Widget', 90.00);\nINSERT INTO product (name, unit_price) VALUES ('Thingamajig', 75.00);\nINSERT INTO product (name, unit_price) VALUES ('Doodad', 110.00);\n\nINSERT INTO [order] (notes, customer_id, date_shipped, amount_total) VALUES ('First Order', 1, '2023-03-22', 300.00);\nINSERT INTO [order] (notes, customer_id, date_shipped, amount_total) VALUES ('Second Order', 2, NULL, 0.00);\nINSERT INTO [order] (notes, customer_id, date_shipped, amount_total) VALUES ('Pending Shipment', 3, NULL, 300.00);\nINSERT INTO [order] (notes, customer_id, date_shipped, amount_total) VALUES ('Urgent Order', 4, '2023-07-15', 220.00);\n\nINSERT INTO item (order_id, product_id, quantity, amount, unit_price) VALUES (1, 1, 2, 300.00, 150.00);\nINSERT INTO item (order_id, product_id, quantity, amount, unit_price) VALUES (2, 2, 1, 90.00, 90.00);\nINSERT INTO item (order_id, product_id, quantity, amount, unit_price) VALUES (3, 4, 2, 220.00, 110.00);\nINSERT INTO item (order_id, product_id, quantity, amount, unit_price) VALUES (4, 3, 4, 300.00, 75.00);",
+    "name": "CustomerOrderSystem"
 }

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_docs_logic/docs/002_create_db_models.prompt

@@ -5,8 +5,6 @@ Create a system with customers, orders, items and products.
 
 Include a notes field for orders.
 
-Use LogicBank to enforce these requirements (do not generate check constraints); be sure to update the data model and *all* test data with any attributes used in the logic:
-
 Use case: Check Credit    
     1. The Customer's balance is less than the credit limit
     2. The Customer's balance is the sum of the Order amount_total where date_shipped is null
@@ -17,12 +15,14 @@ Use case: Check Credit
 Use case: App Integration
     1. Send the Order to Kafka topic 'order_shipping' if the date_shipped is not None.
 
-Ensure each customer and product has a unique name.
+Ensure each customer has a unique name.
 
 Ensure each Item quantity is not null.
 
 Ensure each order has a valid customer_id that exists in the Customer table.
-.
+
+Graph sales by month, for dashboard.
+Graph Sales by Product, for dashboard.
 </Requirements>
 
 Hints: use autonum keys (for all tables - including for link/join/junction/intersection tables), allow nulls, foreign keys, no check constraints.