ApiLogicServer 14.3.7__py3-none-any.whl → 14.3.14__py3-none-any.whl

api_logic_server_cli/prototypes/manager/.vscode/ApiLogicServer.code-workspace

@@ -9,7 +9,7 @@
 		"workbench.editorAssociations": {
 			"*.md": "vscode.markdown.preview.editor"
 		},
-		"workbench.colorTheme": "Office Theme (Excel)",
-		"workbench.preferredLightColorTheme": "Office Theme (Excel)"
+		"workbench.colorTheme": "Office Theme (Publisher)",
+		"workbench.preferredLightColorTheme": "Office Theme (Publisher)"
 	}
 }

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

@@ -24,7 +24,7 @@
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
-            "name": "  1.1  GENAI - Iterate (first, add prompt to system/genai/temp/<project>)",
+            "name": "  - 1.1  GENAI - Iterate (first, add prompt to system/genai/temp/<project>)",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -43,7 +43,7 @@
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
-            "name": "  1.2  GENAI - Retry from repaired chatgpt response",
+            "name": "  - 1.2  GENAI - Retry from repaired chatgpt response",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -63,7 +63,7 @@
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
-            "name": "  1.3  GENAI - Retry from repaired model",
+            "name": "  - 1.3  GENAI - Retry from repaired model",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -84,7 +84,7 @@
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
-            "name": "  1.4  GENAI - Postgresql",
+            "name": "  - 1.4  GENAI - Postgresql",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -124,21 +124,7 @@
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
-            "name": "  - API Logic Server Run (run project from manager)",
-            "type": "debugpy",
-            "request": "launch",
-            "cwd": "${workspaceFolder}/${input:runProjectName}",
-            "env": {
-                "PYTHONHASHSEED": "0", 
-                "APILOGICSERVER_DEBUG": "False",
-                "OPT_LOCKING": "optional"},
-            "justMyCode": false,
-            "program": "api_logic_server_run.py",
-            "redirectOutput": true,
-            "console": "integratedTerminal"
-        },
-        {
-            "name": "ApiLogicServer Create nw_sample_nocust",
+            "name": "  - ApiLogicServer Create nw_sample_nocust",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -157,7 +143,7 @@
             "internalConsoleOptions": "openOnSessionStart"
         },
         {
-            "name": "ApiLogicServer Create nw_sample With Customizations",
+            "name": "  - ApiLogicServer Create nw_sample With Customizations",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -175,6 +161,20 @@
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
         },
+        {
+            "name": "API Logic Server Run (run project from manager)",
+            "type": "debugpy",
+            "request": "launch",
+            "cwd": "${workspaceFolder}/${input:runProjectName}",
+            "env": {
+                "PYTHONHASHSEED": "0", 
+                "APILOGICSERVER_DEBUG": "False",
+                "OPT_LOCKING": "optional"},
+            "justMyCode": false,
+            "program": "api_logic_server_run.py",
+            "redirectOutput": true,
+            "console": "integratedTerminal"
+        },
         {
             "name": "App Model Editor - Prepare",
             "type": "node",

api_logic_server_cli/prototypes/manager/system/Manager_workspace.code-workspace

@@ -9,8 +9,7 @@
 		"workbench.editorAssociations": {
 			"*.md": "vscode.markdown.preview.editor"
 		},
-		"workbench.colorTheme": "Arduino",
-		"workbench.preferredHighContrastLightColorTheme": "Arduino",
-		"workbench.preferredLightColorTheme": "Arduino"
+		"workbench.colorTheme": "Office Theme (Publisher)",
+		"workbench.preferredLightColorTheme": "Office Theme (Publisher)"
 	}
 }

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

@@ -14,7 +14,7 @@ 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 has a unique name.
+Ensure each customer and product has a unique name.
 
 Ensure each Item quantity is not null.
 

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_formal.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. Customer.balance <= credit_limit
     2. Customer.balance = Sum(Order.amount_total where date_shipped is null)

api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_informal.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

api_logic_server_cli/prototypes/manager/system/genai/examples/time_tracking_billing/002_create_db_models.prompt

@@ -1,6 +1,4 @@
-Use SQLAlchemy to create a sqlite database named system/genai/temp/create_db_models.sqlite for the following requirements. These requirements are very important!
-Requirements:
-<Requirements>
+
 Generate a project time tracking and invoice application
 
 Use these names for tables and attributes:
@@ -53,142 +51,15 @@ Formula: is_paid when invoice balance is than or equal to zero
 Task Count is count of InvoiceItem 
 Task completed count is count of InvoiceItem where is_completed is True
 Formula: is ready when Task Count is equal to Task Completed Count
+When Invoice is_ready send row to Kafka with topic 'invoice_ready'
 
 
 Use Case: InvoiceItem
 InvoiceItem task amount is copied from Task total task amount billed
-InvoiceItem is_completed is sum of Task is_completed when True
+Task is_completed is sum of InvoiceItem is_completed
 
 
 
 .
 Create at least 8 tables (models)
 .
-</Requirements>
-
-Hints: use autonum keys (for all tables - including for link/join/junction/intersection tables), allow nulls, foreign keys, no check constraints.
-
-Be sure to create classes, never tables.
-Class names are singular, and first letter is capitalized.
-
-If you create sum, count or formula Logic Bank rules, then you MUST create a corresponding column in the data model.
-
-Remember that SQLite DateTime type only accepts Python datetime and date objects as input, 
-this means you can not enter string attributes where a date or datetime object is expected.
-
-Don't install additional packages.
-Don't use the faker pip package.
-
-When creating SQLAlchemy data model classes, follow these guidelines carefully:
-* Use foreign key columns instead of relationship names for the data.  
-* Do not specify nullable unless explicitly specified.
-* Do not use unique unless explicitly specified.
-* Do not use Float unless explicitly specified.
-* Generate the classes ONLY.
-* Do NOT generate imports.
-* Do NOT generate connect statements.
-* Do NOT generate engines.
-
-Create 4 rows of test data for each table, and follow these guidelines carefully:
-* Create separate objects for each test data row, not in arrays. 
-* Be sure to initialize derived attributes for test data rows - including all sums and counts, but do not rely on Logic Bank,
-and do not generate db.execute statements.
-* Do not create arrays of test data.
-* Do not create a function to load test data.  
-* Do not print the test data. 
-* Use double quotes " for strings.
-* For test data, format dates as date(year, month, day).
-
-<responseFormat>
-class Rule(BaseModel):
-    name: str
-    description: str
-    use_case: str # specified use case or requirement name (use 'General' if missing)
-    entity: str # the entity being constrained or derived
-    code: str # logicbank rule code
-    
-class Model(BaseModel):
-    classname: str
-    code: str # sqlalchemy model code
-    sqlite_create: str # sqlite create table statement
-    description: str
-    name: str
-
-class TestDataRow(BaseModel):
-    test_data_row_variable: str  # the Python test data row variable
-    code: str  # Python code to create a test data row instance
-
-class WGResult(BaseModel):  # must match system/genai/prompt_inserts/response_format.prompt
-    # response: str # result
-    models : List[Model] # list of sqlalchemy classes in the response
-    rules : List[Rule] # list rule declarations
-    test_data: str
-    test_data_rows: List[TestDataRow]  # list of test data rows
-    test_data_sqlite: str # test data as sqlite INSERT statements
-    name: str  # suggest a short name for the project
-
-Format the response as a WGResult.
-
-</responseFormat>
-
-<responseFormat>
-
-class Rule(BaseModel):
-
-    name: str
-
-    description: str
-
-    use_case: str # specified use case or requirement name (use 'General' if missing)
-
-    entity: str # the entity being constrained or derived
-
-    code: str # logicbank rule code
-
-    
-
-class Model(BaseModel):
-
-    classname: str
-
-    code: str # sqlalchemy model code
-
-    sqlite_create: str # sqlite create table statement
-
-    description: str
-
-    name: str
-
-
-
-class TestDataRow(BaseModel):
-
-    test_data_row_variable: str  # the Python test data row variable
-
-    code: str  # Python code to create a test data row instance
-
-
-
-class WGResult(BaseModel):  # must match system/genai/prompt_inserts/response_format.prompt
-
-    # response: str # result
-
-    models : List[Model] # list of sqlalchemy classes in the response
-
-    rules : List[Rule] # list rule declarations
-
-    test_data: str
-
-    test_data_rows: List[TestDataRow]  # list of test data rows
-
-    test_data_sqlite: str # test data as sqlite INSERT statements
-
-    name: str  # suggest a short name for the project
-
-
-
-Format the response as a WGResult.
-
-
-
-</responseFormat>

api_logic_server_cli/prototypes/manager/system/genai/examples/time_tracking_billing/readme.md

@@ -49,8 +49,8 @@ $npm install && npm start  # install and start the NodeJS/Angular app
 You can delete the existing sample data or you can start by entering new data.  To test the logic - follow these steps:
 ```
 1. Enter new Client
-2. Enter new Person (works for Client)
-3. Enter new Project for client (enter billing rate)
+2. Enter new Person (works for Client, Billing Rate 100)
+3. Enter new Project for client
 4. Enter new Task for Project
 5. Enter new Timesheet - enter task and person for client (enter hours worked)
 
@@ -58,4 +58,4 @@ Watch Rules fired in log and then review the sums, counts, formula and constrain
 Note: The Client total amount should be the same value as Project, Task, and Timesheet.
 
 Bonus: Enter an Invoice for a Client/Project then add Invoice Item for a specific Client Task. Once the invoice is ready - we can add a new Event (logic) to send to Kafka.
-```
+```

api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt

@@ -139,6 +139,13 @@ class 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"})
+            Prompt:
+                Send the Product to Kafka topic 'ready_to_ship' if the is_complete is True
+            Response:
+                Rule.after_flush_row_event(on_class=Product, calling=kafka_producer.send_row_to_kafka,
+                               if_condition=lambda row: row.is_complete is True,
+                               with_args={"topic": "ready_to_ship"})
+
 
 Expanded example:
 

api_logic_server_cli/prototypes/manager/system/genai/webg_local/run_web_genai.sh

@@ -0,0 +1,10 @@
+# Run WebGenAI locally from docker container
+
+# Before running, update ./system/genai/webg_local/webg_config/web_genai.txt
+# See: https://apilogicserver.github.io/Docs/WebGenAI-CLI/#configuration
+
+# cd <manager>
+# sh system/genai/webg_local/run_web_genai.sh
+# Find projects at: system/genai/webg_local/webg_projects/by-ulid
+
+docker run -it --rm --name webgenie -p 8282:80  --env-file ./system/genai/webg_local/webg_config/web_genai.txt -v ./system/genai/webg_local/webg_temp:/tmp  -v ./system/genai/webg_local/webg_projects:/opt/projects apilogicserver/web_genai

api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg_config/web_genai.txt

@@ -0,0 +1,8 @@
+# App configuration
+APILOGICPROJECT_EXTERNAL_PORT=8282
+APILOGICPROJECT_PORT=5657
+APILOGICSERVER_CHATGPT_APIKEY=sk-proj-< your api key >
+
+# WebGenAI security configuration
+# login password for the admin user
+# ADMIN_PASSWORD=password

api_logic_server_cli/prototypes/nw/logic/declare_logic.py

@@ -191,7 +191,7 @@ def declare_logic():
 
 
     def ship_ready_orders_only(row: Order, old_row: Order, logic_row: LogicRow) -> bool:
-        invalid_row = row.Ready == False and row.ShippedDate is not None and old_row.ShippedDate is None
+        invalid_row = logic_row.is_updated() and row.Ready == False and row.ShippedDate is not None and old_row.ShippedDate is None
         return not invalid_row
     
     Rule.constraint(validate=Order,       # Do not ship orders that are not ready

api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/codegen.py

@@ -360,8 +360,8 @@ class ModelClass(Model):
         camel-case and singlularize, with provisions for reserved word (Date) and collisions (Dates & _Dates)
         """
         tablename = cls._convert_to_valid_identifier(tablename)
-        if tablename in ["Dates"]:  # ApiLogicServer
-            tablename = tablename + "Classs"
+        if tablename in ["Dates", "dates", "Column", "column"]:  # ApiLogicServer
+            tablename = tablename + "Cls"
         camel_case_name = ''.join(part[:1].upper() + part[1:] for part in tablename.split('_'))
         if camel_case_name in ["Dates"]:
             camel_case_name = camel_case_name + "_Classs"

{ApiLogicServer-14.3.7.dist-info → apilogicserver-14.3.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ApiLogicServer
-Version: 14.3.7
+Version: 14.3.14
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://apilogicserver.github.io/Docs/
@@ -35,7 +35,7 @@ Requires-Dist: Flask-SQLAlchemy==3.0.3
 Requires-Dist: flask-swagger-ui>=4.11.1
 Requires-Dist: flask_bcrypt==1.0.1
 Requires-Dist: itsdangerous==2.1.2
-Requires-Dist: Jinja2==3.1.2
+Requires-Dist: Jinja2==3.1.5
 Requires-Dist: MarkupSafe==2.1.3
 Requires-Dist: six==1.16.0
 Requires-Dist: SQLAlchemy==2.0.15
@@ -47,7 +47,7 @@ Requires-Dist: Flask-Login==0.6.2
 Requires-Dist: Flask-OpenID==1.3.0
 Requires-Dist: python-dotenv==0.15.0
 Requires-Dist: email-validator==1.1.1
-Requires-Dist: LogicBank>=1.20.25
+Requires-Dist: LogicBank>=1.20.26
 Requires-Dist: cryptography==36.0.1
 Requires-Dist: rsa
 Requires-Dist: PyMySQL==1.0.3