ApiLogicServer 12.0.4__py3-none-any.whl → 12.1.26__py3-none-any.whl

api_logic_server_cli/logging.yml

@@ -26,6 +26,11 @@ root:
 
 loggers:
 
+    api_logic_server_cli.api_logic_server:
+        # level: DEBUG
+        handlers: [console]
+        propagate: no
+
     create_from_model.api_logic_server_utils:   
 #        level: DEBUG
         handlers: [console]

api_logic_server_cli/prototypes/base/api_logic_server_run.py

@@ -68,8 +68,6 @@ import ui.admin.admin_loader as AdminLoader
 from security.system.authentication import configure_auth
 import database.multi_db as multi_db
 import oracledb
-import integration.kafka.kafka_producer as kafka_producer
-import integration.kafka.kafka_consumer as kafka_consumer
 
 
 app_logger = server_setup.logging_setup()

api_logic_server_cli/prototypes/base/config/server_setup.py

@@ -317,7 +317,21 @@ def api_logic_server_setup(flask_app: Flask, args: Args):
             if logic_logger_activate_debug == False:
                 logic_logger.setLevel(logging.INFO)
             app_logger.info("")
-            LogicBank.activate(session=session, activator=declare_logic.declare_logic, constraint_event=constraint_handler)
+            disable_rules = False
+            if os.getenv('APILOGICPROJECT_DISABLE_RULES'):
+                disable_rules = os.getenv('APILOGICPROJECT_DISABLE_RULES').startswith("1") or \
+                                os.getenv('APILOGICPROJECT_DISABLE_RULES').startswith("T") or \
+                                os.getenv('APILOGICPROJECT_DISABLE_RULES').startswith("t") or \
+                                os.getenv('APILOGICPROJECT_DISABLE_RULES').startswith("Y") or \
+                                os.getenv('APILOGICPROJECT_DISABLE_RULES').startswith("y")   
+            if disable_rules:
+                app_logger.info("LogicBank rules disabled")  # db opened 1st access
+            else:  # genai may insert rules with no columns... WebG restarts with rules disabled
+                try:
+                    LogicBank.activate(session=session, activator=declare_logic.declare_logic, constraint_event=constraint_handler)
+                except Exception as e:
+                    app_logger.error("Logic Bank Activation Error: " + str(e))
+                    app_logger.exception(e)
             logic_logger.setLevel(logic_logger_level)
             app_logger.info("Declare   Logic complete - logic/declare_logic.py (rules + code)"
                 + f' -- {len(database.models.metadata.tables)} tables loaded\n')  # db opened 1st access

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

@@ -1,5 +1,5 @@
 """
-Invoked at server start (api_logic_server_run.py)
+Invoked at server start (api_logic_server_run.py -> config/setup.py)
 
 Listen/consume Kafka topis, if KAFKA_CONSUMER specified in Config.py
 

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

@@ -2,7 +2,7 @@
 
 Version 1.1
 
-Invoked at server start (api_logic_server_run.py)
+Invoked at server start (api_logic_server_run.py -> config/setup.py)
 
 Connect to Kafka, if KAFKA_CONNECT specified in Config.py
 

api_logic_server_cli/prototypes/base/readme.md

@@ -98,19 +98,32 @@ As shown above:
 
 Your project is ready to run, but it's likely you'll want to customize it - declare logic, new endpoints, etc.
 
->> Tip: in particular, use the sample app to explore the value of ___declarative logic and security.___  Unique to API Logic Server, this is critical to unlocking the full value of API Logic Server.
 
-The ___Key Customization Files___ listed in the table below are created as stubs, intended for you to add customizations that extend the created API, Logic and Web App.
+<details markdown>
 
-* Since they are separate files, the project can be
-[rebuilt](https://apilogicserver.github.io/Docs/Project-Rebuild/) (e.g., synchronized with a revised schema), preserving your customizations.
+<summary>Important: explore customization examples</summary>
+<br>
+In particular, use the sample app to explore the value of declarative logic and security.  Unique to API Logic Server, these are critical to unlocking the full value of API Logic Server.
 
-> Tip: create the sample app for customization examples: `ApiLogicServer create --project-name=nw_sample --db_url=nw+`
-> <br>Or, open it in GitHub (use Shift + "." to view in project mode) - [click here](https://github.com/ApiLogicServer/demo)
+<br>
+
+To create the sample app for customization examples: 
+
+* `ApiLogicServer create --project-name=nw_sample --db_url=nw+`
+* Or, open it in GitHub (use Shift + "." to view in project mode) - [click here](https://github.com/ApiLogicServer/demo)
 
-To make customizations easy to explore, **search for:**
+To make customizations easy to explore, search for:
 * `#als` will reveal key customization examples
-* `Your Code Goes Here` to find key files to customize, summarized below:
+* `Your Code Goes Here` to find key files to customize, summarized in the table below.
+
+</details>
+
+&nbsp;
+
+The ___Key Customization Files___ listed in the table below are created as stubs, intended for you to add customizations that extend the created API, Logic and Web App.
+
+* Since they are separate files, the project can be
+[rebuilt](https://apilogicserver.github.io/Docs/Project-Rebuild/) (e.g., synchronized with a revised schema), preserving your customizations.
 
 <br>
 

api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py

@@ -37,17 +37,19 @@ def declare_logic():
 
     from logic_bank.logic_bank import Rule
 
-    # 1. Customer.Balance <= CreditLimit
-    Rule.constraint(validate=Customer,
-                    error_msg="balance exceeds credit limit",
-                    as_condition=lambda row: row.Balance <= row.CreditLimit)
-
-    # 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)
+    from logic.logic_discovery.auto_discovery import discover_logic
+    discover_logic()
 
-    # 3. Order.AmountTotal = Sum(Items.Amount)
+    # Logic from GenAI: (or, use your IDE w/ code completion)n
+    Rule.sum(derive=Customer.Balance, as_sum_of=Order.AmountTotal, where=lambda row: row.ShipDate is None)
     Rule.sum(derive=Order.AmountTotal, as_sum_of=Item.Amount)
+    # Rule.formula(derive=Item.amount, as_expression=lambda row: row.quantity * row.unit_price)
+    Rule.copy(derive=Item.UnitPrice, from_parent=Product.UnitPrice)
+    Rule.constraint(validate=Customer,
+                    as_condition=lambda row: row.Balance <= row.CreditLimit,
+                    error_msg="Customer balance ({row.balance}) exceeds credit limit ({row.credit_limit})")
+
+    # End Logic from GenAI
 
     def derive_amount(row: Item, old_row: Item, logic_row: LogicRow):
         amount = row.Quantity * row.UnitPrice
@@ -58,9 +60,6 @@ def declare_logic():
     # 4. Items.Amount = Quantity * UnitPrice
     Rule.formula(derive=Item.Amount, calling=derive_amount)
 
-    # 5. Store the Items.UnitPrice as a copy from Product.UnitPrice
-    Rule.copy(Item.UnitPrice, from_parent=Product.UnitPrice)
-
     #als: Demonstrate that logic == Rules + Python (for extensibility)
 
     def send_order_to_shipping(row: Order, old_row: Order, logic_row: LogicRow):

api_logic_server_cli/prototypes/manager/.vscode/launch.json

@@ -5,7 +5,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "GENAI",
+            "name": " * GENAI",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -218,6 +218,103 @@
                 "NODE_ENV": "development"
             }
         },
+        {
+            "name": "Internal - GenAI smoke test - genai_demo",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
+            "redirectOutput": true,
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "PYTHONPATH": "", 
+                "SECURITY_ENABLED": "False", 
+                "PYTHONHASHSEED": "0", 
+                "APILOGICSERVER_DEBUG": "False",
+                "OPT_LOCKING": "optional"},
+            "justMyCode": false,
+            "args": [ "genai", "--retries=-1",
+                "--using=${workspaceFolder}/system/genai/examples/genai_demo/genai_demo.prompt"],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "  - GenAI informal logic - genai_demo",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
+            "redirectOutput": true,
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "PYTHONPATH": "", 
+                "SECURITY_ENABLED": "False", 
+                "PYTHONHASHSEED": "0", 
+                "APILOGICSERVER_DEBUG": "False",
+                "OPT_LOCKING": "optional"},
+            "justMyCode": false,
+            "args": [ "genai", "--retries=-1",
+                "--using=${workspaceFolder}/system/genai/examples/genai_demo/genai_demo_informal.prompt"],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "  - GenAI informal logic - emp_depts",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
+            "redirectOutput": true,
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "PYTHONPATH": "", 
+                "SECURITY_ENABLED": "False", 
+                "PYTHONHASHSEED": "0", 
+                "APILOGICSERVER_DEBUG": "False",
+                "OPT_LOCKING": "optional"},
+            "justMyCode": false,
+            "args": [ "genai", "--retries=-1",
+                "--using=${workspaceFolder}/system/genai/examples/emp_depts/emp_dept.prompt"],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "  - retry repaired-response",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
+            "redirectOutput": true,
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "PYTHONPATH": "", 
+                "SECURITY_ENABLED": "False", 
+                "PYTHONHASHSEED": "0", 
+                "APILOGICSERVER_DEBUG": "False",
+                "OPT_LOCKING": "optional"},
+            "justMyCode": false,
+            "args": [ "genai", "--retries=-1",
+                "--using=genai_demo",
+                "--repaired-response=system/genai/examples/genai_demo/genai_demo.response_example"],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
+        {
+            "name": "  - retry conversation",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
+            "redirectOutput": true,
+            "cwd": "${workspaceFolder}",
+            "env": {
+                "PYTHONPATH": "", 
+                "SECURITY_ENABLED": "False", 
+                "PYTHONHASHSEED": "0", 
+                "APILOGICSERVER_DEBUG": "False",
+                "OPT_LOCKING": "optional"},
+            "justMyCode": false,
+            "args": [ "genai", "--retries=-1",
+                "--using=retry-project",
+                "--using=system/genai/retry/conv"],
+            "console": "internalConsole",
+            "internalConsoleOptions": "openOnSessionStart"
+        },
         {
             "name": "Python: Module",
             "type": "debugpy",

api_logic_server_cli/prototypes/manager/README.md

@@ -1,5 +1,5 @@
 ---
-version info: 0.7 (9/15/2024)
+version info: 0.8 (10/24/2024)
 ---
 ## Welcome to API Logic Server
 
@@ -152,7 +152,7 @@ als genai --using=system/genai/examples/genai_demo/genai_demo.prompt
 
 
 ```bash
-als genai --using=genai_demo.prompt --repaired-response=system/genai/temp/chatgpt_retry.response
+als genai --using=genai_demo.prompt --repaired-response=system/genai/examples/genai_demo/genai_demo_conversation/genai_demo_conversation_005.response-example
 ```
 </br>
 
@@ -194,6 +194,43 @@ als genai --project-name='genai_demo_conversation' --using=system/genai/examples
 ```
 </details>
 </br>
+<details markdown>
+
+<summary> You can iterate with logic</summary>
+
+<br>You can add new columns/tables, while keeping the prior model intact:
+
+```bash title="Iterate With Logic"
+als genai --project-name='genai_demo_iterative_logic' --using=system/genai/examples/genai_demo/genai_demo_iterative_logic
+# open Docs/db.dbml
+```
+</details>
+</br>
+
+<details markdown>
+
+<summary> You can declare informal logic</summary>
+
+<br>You can declare rules using dot notation, or more informally:
+
+```bash title="Informal Logic (no dot notation)"
+als genai --using=system/genai/examples/genai_demo/genai_demo_informal.prompt
+```
+</details>
+</br>
+
+
+<details markdown>
+
+<summary> Multi-Rule Logic</summary>
+
+<br>You can add new columns/tables, while keeping the prior model intact:
+
+```bash title="Multi-Rule Logic"
+als genai --using=system/genai/examples/emp_depts/emp_dept.prompt
+```
+</details>
+</br>
 
 <details markdown>
 
@@ -225,7 +262,7 @@ als create --project-name=genai_demo --from-model=system/genai/temp/create_db_mo
 Or, correct the chatgpt response, and
 
 ```bash
-als genai --using=genai_demo.prompt --repaired-response=system/genai/temp/chatgpt_retry.response
+als genai --using=genai_demo.prompt --repaired-response=system/genai/examples/genai_demo/genai_demo.response_example
 ```
 
 We have seen failures such as:

api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_create_db.py

@@ -0,0 +1,11 @@
+
+
+# ALS/GenAI: Create an SQLite database
+engine = create_engine('sqlite:///system/genai/temp/create_db_models.sqlite')
+Base.metadata.create_all(engine)
+
+Session = sessionmaker(bind=engine)
+session = Session()
+
+# ALS/GenAI: Prepare for sample data
+

api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_imports.py

@@ -0,0 +1,22 @@
+# created from response, to create create_db_models.sqlite, with test data
+#    that is used to create project
+# should run without error in manager 
+#    if not, check for decimal, indent, or import issues
+
+import decimal
+import logging
+import sqlalchemy
+from sqlalchemy.sql import func 
+from logic_bank.logic_bank import Rule
+from sqlalchemy import create_engine, Column, Integer, String, Float, ForeignKey, Date, DateTime, Numeric, Boolean, Text
+from sqlalchemy.types import *
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy.orm import relationship
+from datetime import date   
+from datetime import datetime
+
+
+logging.getLogger('sqlalchemy.engine.Engine').disabled = True  # remove for additional logging
+
+Base = declarative_base()  # from system/genai/create_db_models_inserts/create_db_models_prefix.py

api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_test_data.py

@@ -0,0 +1,7 @@
+# Create an SQLite database
+engine = create_engine('sqlite:///system/genai/temp/create_db_models.sqlite')
+Base.metadata.create_all(engine)
+
+Session = sessionmaker(bind=engine)
+session = Session()  # from create_db_models_test_data.py
+

api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept.prompt

@@ -0,0 +1,4 @@
+System for Departments and Employees.
+
+LogicBank:
+1. Sum of employee salaries cannot exceed department budget

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

@@ -2,7 +2,7 @@ Create a system with customers, orders, items and products.
 
 Include a notes field for orders.
 
-Use LogicBank to create declare_logic() to enforce the Check Credit requirement (do not generate check constraints):
+Use LogicBank to enforce the Check Credit requirement:
 1. Customer.balance <= credit_limit
 2. Customer.balance = Sum(Order.amount_total where date_shipped is null)
 3. Order.amount_total = Sum(Item.amount)