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

api_logic_server_cli/genai/genai.py

@@ -315,8 +315,14 @@ class GenAI(object):
                 log.debug(f'.. from file: {self.project.genai_using}')
                 raw_prompt = file.read()
             prompt = self.get_prompt__with_inserts(raw_prompt=raw_prompt, for_iteration=False)  # insert db-specific logic
-            self.logic_enabled = False
-            if 'LogicBank' in prompt and K_LogicBankOff not in prompt:  # if prompt has logic, we need to insert the training
+            self.logic_enabled = True
+            if os.environ.get("APILOGICPROJECT_LOGIC_ENABLED") is not None and \
+                            os.environ.get("APILOGICPROJECT_LOGIC_ENABLED") == 'False':
+                self.logic_enabled = False
+                log.info("*** Initial Logic Disabled: {self.logic_enabled}")
+            else:
+                log.debug(f'.. Initial Logic enabled: {self.logic_enabled}')            
+            if self.logic_enabled == True or ('LogicBank' in prompt and K_LogicBankOff not in prompt):  # if prompt has logic, we need to insert the training
                 prompt_messages.extend( self.get_prompt_learning_requests())
                 self.logic_enabled = True
             if prompt.startswith('You are a '):  # if it's a preset, we need to insert the prompt
@@ -329,7 +335,7 @@ class GenAI(object):
                     active_rules_json_path = Path(self.project.genai_using).joinpath('logic/active_rules.json')
                     # assert active_rules_json_path.exists(), f"Missing active_rules.json: {active_rules_json_path}"
                     if not active_rules_json_path.exists():
-                        log.info("*** Internal error: --active_rules specified, but no --using/logic/active_rules.json found - try to proced")
+                        log.info("*** Internal error: --active_rules specified, but no --using/logic/active_rules.json found - try to proceed")
                     else:
                         with open(active_rules_json_path, 'r') as file:
                             active_rules_str = file.read()

api_logic_server_cli/prototypes/base/devops/docker-image/env.list

@@ -40,11 +40,16 @@
 # whether to invoke dbinit befoce connecting...
 # APILOGICSERVER_ORACLE_THICK=~/Downloads/instantclient_19_16
 
+# enables aggregate defaulting, and defaulting for all numerics and strings
+# used to initialize rows prior to logic, to avoid excessive None testing
+# AGGREGATE_DEFAULTS=True
+# ALL_DEFAULTS=True
+
 APILOGICPROJECT_VERBOSE=True
 
 # APILOGICPROJECT_LOG_CONFIG=
-""" name of log.yml file (eg, config/logging_prod.yml) """
+# name of log.yml file (eg, config/logging_prod.yml) 
 
 # APILOGICPROJECT_STOP_OK=FALSE
-""" dev only - enable stop url: http://localhost:5656/stop?msg=reason """
+# dev only - enable stop url: http://localhost:5656/stop?msg=reason
 

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

@@ -1,6 +1,6 @@
 """
 
-Version 2.0
+Version 2.1
 
 Invoked at server start (api_logic_server_run.py -> config/setup.py)
 
@@ -117,5 +117,4 @@ def send_kafka_message(kafka_topic: str, kafka_key: str = None, msg: str="", jso
 
 
 def send_row_to_kafka(row: object, old_row: object, logic_row: LogicRow, with_args: dict):
-    if logic_row.row.date_shipped is not None:
-        send_kafka_message(logic_row=logic_row, kafka_topic=with_args["topic"])
+    send_kafka_message(logic_row=logic_row, kafka_topic=with_args["topic"])

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/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/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/create_from_model/safrs-react-admin-npm-build/build-0106.txt

@@ -1 +0,0 @@
-Mon Jan 6 08:27:06 CET 2025