ApiLogicServer 14.3.7__py3-none-any.whl → 14.3.14__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()
@@ -576,10 +582,18 @@ class GenAI(object):
         Save prompts / responses to system/genai/temp/{project}/genai.response
 
         Copy system/genai/temp/create_db_models.py to system/genai/temp/{project}/create_db_models.py
+
+        delete system/genai/temp/create_db_models.sqlite (avoid table collisions)
         """
         try:
             to_dir = Path(os.getcwd())
             gen_temp_dir = Path(to_dir).joinpath(f'system/genai/temp')
+
+            # delete system/genai/temp/create_db_models.sqlite
+            sqlite_file_path = Path(gen_temp_dir).joinpath('create_db_models.sqlite')
+            if sqlite_file_path.exists():
+                os.remove(sqlite_file_path)
+            
             to_dir_save_dir = Path(to_dir).joinpath(f'system/genai/temp/{self.project.project_name_last_node}')
             """ project work files saved to system/genai/temp/<project> """
             log.info(f'.. saving work files to: system/genai/temp/{self.project.project_name_last_node}')
@@ -639,282 +653,6 @@ class GenAI(object):
             pass  # intentional try/catch/bury - it's just diagnostics, so don't fail
         debug_string = "good breakpoint - return to main driver, and execute create_db_models.py"
 
-    def z_fix_and_write_model_file(self):
-        """
-        1. from response, create model file / models lines
-        2. from response, create model file / test lines
-        3. ChatGPT work-arounds (decimal, indent, bogus relns, etc etc)
-        4. Ensure the sqlite url is correct: sqlite:///system/genai/temp/create_db_models.sqlite
-        5. write model file to self.project.from_model
-
-        Args:
-            response_data (str): the chatgpt response
-
-        """
-   
-        def insert_model_lines(models, create_db_model_lines):
-
-            def get_model_class_lines(model: DotMap) -> list[str]:
-                """Get the model class from the model, with MAJOR fixes
-
-                Args:
-                    model (Model): the model
-
-                Returns:
-                    stlist[str]: the model class lines, fixed up
-                """
-
-                create_db_model_lines =  list()
-                create_db_model_lines.append('\n\n')
-                class_lines = model.code.split('\n')
-                line_num = 0
-                indents_to_remove = 0
-                for each_line in class_lines:
-                    line_num += 1
-                    ''' decimal issues
-
-                        1. bad import: see Run: tests/test_databases/ai-created/genai_demo/genai_demo_decimal
-                            from decimal import Decimal  # Decimal fix: needs to be from decimal import DECIMAL
-
-                        2. Missing missing import: from SQLAlchemy import .... DECIMAL
-
-                        3. Column(Decimal) -> Column(DECIMAL)
-                            see in: tests/test_databases/ai-created/budget_allocation/budget_allocations/budget_allocations_3_decimal
-
-                        4. Bad syntax on test data: see Run: blt/time_cards_decimal from RESPONSE
-                            got:    balance=DECIMAL('100.50')
-                            needed: balance=1000.0
-                            fixed with import in create_db_models_prefix.py
-
-                        5. Bad syntax on test data cals: see api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation_bad_decimal/genai_demo_03.response
-                            got: or Decimal('0.00')
-                            needed: or decimal.Decimal('0.00')
-
-                        6. Bad syntax on test data cals: see api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation_bad_decimal_2/genai_demo_conversation_002.response
-                            got: or DECIMAL('
-                            needed: or decimal.Decimal('0.00')
-                    '''
-
-                    # TODO - seeing several \\ in the response - should be \ (I think)
-                    if "= Table(" in each_line:  # tests/test_databases/ai-created/time_cards/time_card_kw_arg/genai.response
-                        log.debug(f'.. fix_and_write_model_file detects table - raise excp to trigger retry')
-                        self.post_error = "ChatGPT Response contains table (not class) definitions: " + each_line
-                    if 'sqlite:///' in each_line:  # must be sqlite:///system/genai/temp/create_db_models.sqlite
-                        current_url_rest = each_line.split('sqlite:///')[1]
-                        quote_type = "'"
-                        if '"' in current_url_rest:
-                            quote_type = '"'  # eg, tests/test_databases/ai-created/time_cards/time_card_decimal/genai.response
-                        current_url = current_url_rest.split(quote_type)[0]  
-                        proper_url = 'system/genai/temp/create_db_models.sqlite'
-                        each_line = each_line.replace(current_url, proper_url)
-                        if current_url != proper_url:
-                            log.debug(f'.. fixed sqlite url: {current_url} -> system/genai/temp/create_db_models.sqlite')
-                    if 'Decimal,' in each_line:  # SQLAlchemy import
-                        each_line = each_line.replace('Decimal,', 'DECIMAL,')
-                        # other Decimal bugs: see api_logic_server_cli/prototypes/manager/system/genai/reference/errors/chatgpt_decimal.txt
-                    if ', Decimal' in each_line:  # Cap'n K, at your service
-                        each_line = each_line.replace(', Decimal', ', DECIMAL')
-                    if 'rom decimal import Decimal' in each_line:
-                        each_line = each_line.replace('from decimal import Decimal', 'import decimal')
-                    if '=Decimal(' in each_line:
-                        each_line = each_line.replace('=Decimal(', '=decimal.Decimal(')
-                    if ' Decimal(' in each_line:
-                        each_line = each_line.replace(' Decimal(', ' decimal.Decimal(')
-                    if 'Column(Decimal' in each_line:
-                        each_line = each_line.replace('Column(Decimal', 'Column(DECIMAL')
-                    if "DECIMAL('" in each_line:
-                        each_line = each_line.replace("DECIMAL('", "decimal.Decimal('")
-                    if 'end_time(datetime' in each_line:  # tests/test_databases/ai-created/time_cards/time_card_kw_arg/genai.response
-                        each_line = each_line.replace('end_time(datetime', 'end_time=datetime')
-                    if 'datetime.date.today' in each_line:
-                        each_line = each_line.replace('datetime.today', 'end_time=datetime')
-                    if indents_to_remove > 0:
-                        each_line = each_line[indents_to_remove:]
-                    if 'relationship(' in each_line and self.project.genai_use_relns == False:
-                        # airport4 fails with could not determine join condition between parent/child tables on relationship Airport.flights
-                        if each_line.startswith('    '):
-                            each_line = each_line.replace('    ', '    # ')
-                        else:  # sometimes it puts relns outside the class (so, outdented)
-                            each_line = '# ' + each_line
-                    if 'sqlite:///system/genai/temp/model.sqlite':  # fix prior version
-                        each_line = each_line.replace('sqlite:///system/genai/temp/model.sqlite', 
-                                                    'sqlite:///system/genai/temp/create_db_models.sqlite')
-
-                    # logicbank fixes
-                    if 'from logic_bank' in each_line:  # we do our own imports
-                        each_line = each_line.replace('from', '# from')
-                    if 'LogicBank.activate' in each_line:
-                        each_line = each_line.replace('LogicBank.activate', '# LogicBank.activate')
-                    
-                    create_db_model_lines.append(each_line + '\n')
-                return create_db_model_lines
-
-
-            did_base = False
-            for each_model in models:
-                model_lines = get_model_class_lines(model=each_model)
-                for each_line in model_lines:
-                    each_fixed_line = each_line.replace('sa.', '')      # sometimes it puts sa. in front of Column
-                    if 'Base = declarative_base()' in each_fixed_line:  # sometimes created for each class
-                        if did_base:
-                            each_fixed_line = '# ' + each_fixed_line
-                        did_base = True 
-                    if 'datetime.datetime.utcnow' in each_fixed_line:
-                        each_fixed_line = each_fixed_line.replace('datetime.datetime.utcnow', 'datetime.now()') 
-                    if 'Column(date' in each_fixed_line:
-                        each_fixed_line = each_fixed_line.replace('Column(dat', 'column(Date') 
-                    create_db_model_lines.append(each_fixed_line)
-                
-                model_code = "\n".join(model_lines)
-                if '\\n' in model_code:
-                    log.debug(f'.. fix_and_write_model_file detects \\n - attempting fix')
-                    model_code = model_code.replace('\\n', '\n')
-                try:
-                    ast.parse(model_code)
-                except SyntaxError as exc:
-                    log.error(f"Model Class Error: {model_code}")
-                    self.post_error = f"Model Class Error: {exc}"
-            return create_db_model_lines
-        
-        def insert_test_data_lines(test_data_lines : list[str]) -> list[str]:
-            """Insert test data lines into the model file
-
-            Args:
-                test_data_lines (list(str)):  
-                                       * initially header (engine =, sesssion =)
-                                       * this function appends CPT test data
-
-            Returns:
-                list[str]: variable names for the test data rows (for create_all)
-            """
-            
-            def fix_test_data_line(each_fixed_line: str) -> str:
-                """Fix the test data line
-
-                Args:
-                    each_fixed_line (str): the test data line
-
-                Returns:
-                    str: the fixed test data line
-                """
-
-                if '=null' in each_fixed_line:
-                    each_fixed_line = each_fixed_line.replace('=None', '=date') 
-                if '=datetime' in each_fixed_line:
-                    each_fixed_line = each_fixed_line.replace('=datetime.date', '=date') 
-                if 'datetime.datetime.utcnow' in each_fixed_line:
-                    each_fixed_line = each_fixed_line.replace('datetime.datetime.utcnow', 'datetime.now()') 
-                if 'datetime.date.today' in each_fixed_line:
-                    each_fixed_line = each_fixed_line.replace('datetime.date.today', 'datetime.today')
-                if 'engine = create_engine' in each_fixed_line:  # CBT sometimes has engine = create_engine, so do we!
-                    each_fixed_line = each_fixed_line.replace('engine = create_engine', '# engine = create_engine')
-                    check_for_row_name = False
-                if each_fixed_line.startswith('Base') or each_fixed_line.startswith('engine'):
-                    check_for_row_name = False
-                if 'Base.metadata.create_all(engine)' in each_fixed_line:
-                    each_fixed_line = each_fixed_line.replace('Base.metadata.create_all(engine)', '# Base.metadata.create_all(engine)')
-                return each_fixed_line
-
-            row_names = list()
-            use_test_data_rows = True # CPT test data, new format - test_data_rows (*way* less variable)
-            if use_test_data_rows & hasattr(self.response_dict, 'test_data_rows'):
-                test_data_rows = self.response_dict.test_data_rows
-                log.debug(f'.... test_data_rows: {len(test_data_rows)}')
-                for each_row in test_data_rows:
-                    each_fixed_line = fix_test_data_line(each_row.code)
-                    test_data_lines.append(each_fixed_line) 
-                    row_names.append(each_row.test_data_row_variable)
-                pass
-            else:  # CPT test data, old format - rows, plus session, engine etc (quite variable)
-                test_data_lines_ori = self.response_dict.test_data.split('\n') # gpt response
-                log.debug(f'.... test_data_lines...')
-                for each_line in test_data_lines_ori:
-                    each_fixed_line = fix_test_data_line(each_line)
-                    check_for_row_name = True
-                    test_data_lines.append(each_fixed_line)  # append the fixed test data line
-                    if check_for_row_name and ' = ' in each_line and '(' in each_line:  # CPT test data might have: tests = []
-                        assign = each_line.split(' = ')[0]
-                        # no tokens for: Session = sessionmaker(bind=engine) or session = Session()
-                        if '.' not in assign and 'Session' not in each_line and 'session.' not in each_line:
-                            row_names.append(assign)
-            return row_names
-        
-        create_db_model_lines =  list()
-        create_db_model_lines.append(f'# using resolved_model {self.resolved_model}')
-        create_db_model_lines.extend(  # imports for classes (comes from api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_imports.py)
-            genai_svcs.get_lines_from_file(f'system/genai/create_db_models_inserts/create_db_models_imports.py'))
-        create_db_model_lines.append("\nfrom sqlalchemy.dialects.sqlite import *\n") # specific for genai 
-        
-        models = self.response_dict.models
-        
-        # Usage inside the class
-        create_db_model_lines = insert_model_lines(models, create_db_model_lines)
-
-        with open(f'{self.project.from_model}', "w") as create_db_model_file:
-            create_db_model_file.write("".join(create_db_model_lines))
-            create_db_model_file.write("\n\n# end of model classes\n\n")
-            
-        # classes done, create db and add test_data code
-        test_data_lines = genai_svcs.get_lines_from_file(f'system/genai/create_db_models_inserts/create_db_models_create_db.py')
-        test_data_lines.append('session.commit()')
-        
-        row_names = insert_test_data_lines(test_data_lines)
-
-        test_data_lines.append('\n\n')
-        row_name_list = ', '.join(row_names)
-        add_rows = f'session.add_all([{row_name_list}])'
-        test_data_lines.append(add_rows )  
-        test_data_lines.append('session.commit()')
-        test_data_lines.append('# end of test data\n\n')
-
-        test_data_lines_result = []
-        for line in test_data_lines:
-            test_data_lines_result += line.split('\n')
-        
-        with open(f'{self.project.from_model}', "a") as create_db_model_file:
-            create_db_model_file.write("\ntry:\n    ")
-            create_db_model_file.write("\n    ".join(test_data_lines_result))
-            create_db_model_file.write("\nexcept Exception as exc:\n")
-            create_db_model_file.write("    print(f'Test Data Error: {exc}')\n")
-        
-        log.debug(f'.. code for db creation and test data: {self.project.from_model}')
-    
- 
-    def get_lines_from_fileZZ(self, file_name: str) -> list[str]:
-        """Get lines from a file  todo: migrate to svcs
-
-        Args:
-            file_name (str): the file name
-
-        Returns:
-            list[str]: the lines from the file
-        """
-
-        with open(file_name, "r") as file:
-            lines = file.readlines()
-        return lines
-   
-    def z_get_and_save_raw_response_data(self, completion: object, response_dict: dict):
-        """
-        Write response_dict --> system/genai/temp/chatgpt_original/retry.response
-        """
-        
-        '''  TODO - is exception used instead of return_code...
-        # Check if the request was successful
-        if completion.status_code == 400:
-            raise Exception("Bad ChatGPT Request: " + completion.text)
-        
-        if completion.status_code != 200:
-            print("Error:", completion.status_code, completion.text)   # eg, You exceeded your current quota 
-        '''
-        with open(f'system/genai/temp/chatgpt_original.response', "w") as response_file:  # save for debug
-            json.dump(response_dict, response_file, indent=4)
-        with open(f'system/genai/temp/chatgpt_retry.response', "w") as response_file:     # repair this & retry
-            json.dump(response_dict, response_file, indent=4)
-        return
-
-def z_genai_cli_rule_suggesions_unused(project_name: str) -> dict:
-    pass
 
 def genai_cli_with_retry(using: str, db_url: str, repaired_response: str, genai_version: str, 
           retries: int, opt_locking: str, prompt_inserts: str, quote: bool,

api_logic_server_cli/genai/genai_fatal_excp.py

@@ -0,0 +1,5 @@
+class GenAIException(BaseException):
+    """Raise when unable to create db_models (missing Base, reserved word)"""
+
+    def __init__(self, message):
+        self.message = message

api_logic_server_cli/genai/genai_svcs.py

@@ -10,7 +10,7 @@ from pathlib import Path
 import os
 import sys
 import create_from_model.api_logic_server_utils as utils
-
+from api_logic_server_cli.genai.genai_fatal_excp import GenAIException
 import time
 from openai import OpenAI
 import json
@@ -322,6 +322,11 @@ def model2code(model: DotMap) -> str:
             tree = ast.parse(model_code.replace('\\n', '\n'))
         except Exception as exc:
             raise exc
+    # check for reserved words... these can fail before sqlacodegen can fix, and might inter-relate, so quit
+    if model.name in ['column', 'Column', 'table', 'Table', 'session', 'Session', 'base', 'Base']:
+        log.error(f"Reserved word in model name: {model.name}")
+        raise GenAIException(f"Reserved word in model name: {model.name}")
+
 
     # Function to add a docstring to a class node
     def add_docstring_to_class(node, docstring):
@@ -418,7 +423,7 @@ def fix_model_lines(model: DotMap, use_relns: bool = True, post_error: str = Non
                 if current_url != proper_url:
                     log.debug(f'.. fixed sqlite url: {current_url} -> system/genai/temp/create_db_models.sqlite')
         if 'class ' in each_line:
-            # yes, tempting fix... but it fails in SqlAlchemy with missing __tablename__
+            # yes, tempting to fix... but it fails in SqlAlchemy with missing __tablename__
             # each_line = each_line.replace(':', '(Base):')  # sometimes it forgets the Base
             if 'Base' not in each_line:
                 log.debug(f'.. fix_and_write_model_file detects class with no Base - raise excp to trigger retry')
@@ -469,6 +474,13 @@ def fix_and_write_model_file(response_dict: DotMap,  save_dir: str, post_error:
             try: # based on model_lines
                 model_code = model2code(each_model)  
                 log.info(f"Added description to model: {each_model.name}: {model_code}")
+            except GenAIException as exc:
+                ''' this does not work - creates a duplicate class, so let's just bail
+                if post_error is not None:
+                    post_error = exc.args[0]
+                continue
+                '''
+                raise exc
             except Exception as exc:
                 log.error(f"Failed to add description to model: {exc}")
                 log.debug(f"model: {each_model}")

api_logic_server_cli/genai/genai_utils.py

@@ -236,7 +236,7 @@ class GenAIUtils:
         create_fixup_files(self)
         log.info(f".. fixup complete: {self.using}/fixup")
         log.info(f".. .. next step: cd <manager>  eg, cd ..")
-        log.info(f".. .. and then, create fixed project: als genai --using=genai_demo.prompt --repaired-response={self.project.project_name}/{self.using}/fixup/response_fixup.json --project-name=fixed_project")
+        log.info(f".. .. and then, create fixed project: als genai --repaired-response={self.project.project_name}/{self.using}/fixup/response_fixup.json --project-name=fixed_project")
 
     def import_genai_project(self) -> None:
         """

api_logic_server_cli/prototypes/base/api/expose_api_models.py

@@ -40,7 +40,7 @@ def expose_models(api, method_decorators = []):
     """
 
     debug_inspect_list = inspect.getmembers(database.models)
-    pass  #vh
+    pass
     # Get all the subclasses of the Base class and expose them in the api
     for name, obj in inspect.getmembers(database.models):
         if inspect.isclass(obj) and issubclass(obj, database.models.SAFRSBaseX) and obj is not database.models.SAFRSBaseX:

api_logic_server_cli/prototypes/base/api/system/expression_parser.py

@@ -154,7 +154,7 @@ def fixup_sort(clz, data):
     return sort
 def fixup_data(data, sqltypes):
     new_data = None
-    if data:
+    if data and isinstance(data, dict):
         new_data = {}
         for key, value in data.items():
             new_data[key] = value

api_logic_server_cli/prototypes/base/api_logic_server_run.py

@@ -78,7 +78,7 @@ app_logger = server_setup.logging_setup()
 
 flask_app = Flask("API Logic Server", template_folder='ui/templates')  # templates to load ui/admin/admin.yaml
 
-CORS(flask_app, resources=[{r"/api/*": {"origins": "*"}}],
+CORS(flask_app, resources=[{r"/api/*": {"origins": "*"}},{r"/ontimizeweb/*": {"origins": "*"}}],
      allow_headers=["Content-Type", "Authorization", "Access-Control-Allow-Credentials"],supports_credentials=True)
 
 args = server_setup.get_args(flask_app)                        # creation defaults
@@ -100,7 +100,7 @@ server_setup.api_logic_server_setup(flask_app, args)
 AdminLoader.admin_events(flask_app = flask_app, args = args, validation_error = ValidationError)
 
 if __name__ == "__main__":
-    msg = f'API Logic Project loaded (not WSGI), version {api_logic_server__version}\n'
+    msg = f'API Logic Project loaded (not WSGI), version: api_logic_server_version\n'
     msg += f'.. startup message: {start_up_message}\n'
     if server_setup.is_docker():
         msg += f' (running from docker container at flask_host: {args.flask_host} - may require refresh)\n'

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

@@ -40,11 +40,31 @@
 # 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
+
+# APILOGICPROJECT_KAFKA_PRODUCER = '{"bootstrap.servers": "localhost:9092"}'  #  , "client.id": "aaa.b.c.d"}'
+# APILOGICPROJECT_KAFKA_CONSUMER = '{"bootstrap.servers": "localhost:9092", "group.id": "als-default-group1"}'KAFKA_CONSUMER = None  # comment out to enable Kafka consumer
 
+# N8N Webhook Args
+# see https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.webhook/?utm_source=n8n_app&utm_medium=node_settings_modal-credential_link&utm_campaign=n8n-nodes-base.webhook#path
+# APILOGICPROJECT_wh_scheme = "http"
+# APILOGICPROJECT_wh_server = "localhost" # or cloud.n8n.io...
+# APILOGICPROJECT_wh_port = 5678
+# APILOGICPROJECT_wh_endpoint = "webhook-test"
+# APILOGICPROJECT_wh_path = "002fa0e8-f7aa-4e04-b4e3-e81aa29c6e69"
+# APILOGICPROJECT_token = "YWRtaW46cA=="
+# APILOGICPROJECT_N8N_PRODUCER = {"authorization": f"Basic {token}", "n8n_url": f'"{wh_scheme}://{wh_server}:{wh_port}/{wh_endpoint}/{wh_path}"'} 
+# Or enter the n8n_url directly:
+# APILOGICPROJECT_N8N_PRODUCER = {"authorization": f"Basic {token}","n8n_url":"http://localhost:5678/webhook-test/002fa0e8-f7aa-4e04-b4e3-e81aa29c6e69"}  
+# APILOGICPROJECT_N8N_PRODUCER = None # comment out to enable N8N producer

api_logic_server_cli/prototypes/base/devops/docker-standard-image/docker-compose-standard-image.yml

@@ -0,0 +1,28 @@
+
+# cd <project>  
+# sh ./devops/docker-standard-image/docker-compose.sh
+# --> builds, runs at localhost:5656
+
+# docker-compose -f devops/docker-standard-image/docker-compose-standard-image.yml up
+# docker-compose -f devops/docker-standard-image/docker-compose-standard-image.yml down
+
+# if you have run docker compose up (above), you must run docker compose down to run directly:
+# docker run -it --rm --name api_logic_project -p 5656:5656  --env-file ./devops/docker-standard-image/env.list -v ./:/app apilogicserver/api_logic_server python3 /app/api_logic_server_run.py
+
+services:
+  api-logic-server:
+    image: apilogicserver/api_logic_server
+    container_name: api_logic_project
+    environment:
+      - APILOGICPROJECT_VERBOSE=true
+      - SECURITY_ENABLED=true
+    env_file:
+      - ./env.list
+    volumes:
+      - ./../..:/app
+    ports:
+      - 5656:5656
+    command: python3 /app/api_logic_server_run.py
+    stdin_open: true
+    tty: true
+    restart: unless-stopped

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

@@ -0,0 +1,55 @@
+# these values override the Config values, and the CLI arguments
+# the values below are for testing - uncomment and view them on console log on server start
+# #als: configure environment variables
+
+# ip to which flask will be bound (default: 0.0.0.0)
+# APILOGICPROJECT_FLASK_HOST=flask-host-e
+
+# port (Flask) (default: 5656)
+# APILOGICPROJECT_PORT=port-e
+
+# ip clients use to access API (default: localhost)
+# APILOGICPROJECT_SWAGGER_HOST=swagger-host-e
+
+# swagger port (eg, 443 for codespaces) (default: 5656)
+# APILOGICPROJECT_SWAGGER_PORT=swagger-port-e
+
+# http or https (default: http)
+# APILOGICPROJECT_HTTP_SCHEME=http-scheme-e
+
+# APILOGICPROJECT_HTTP_SCHEME=http
+
+# for reverse proxy cases where the entire URI must be specified
+# APILOGICPROJECT_CLIENT_URI=httpe://hoste:porte
+
+# TODO specify database uri's here, e.g:
+# APILOGICPROJECT_SQLALCHEMY_DATABASE_URI=postgresql://postgres:p@postgresql-container/basic_demo
+# APILOGICPROJECT_SQLALCHEMY_DATABASE_URI_AUTHENTICATION=postgresql://postgres:p@postgresql-container/authdb
+# APILOGICPROJECT_SQLALCHEMY_DATABASE_URI=mysql+pymysql://root:p@mysql-container:3306/basic_demo
+# APILOGICPROJECT_SQLALCHEMY_DATABASE_URI_AUTHENTICATION=mysql+pymysql://root:p@mysql-container:3306/authdb
+
+# APILOGICPROJECT_SECURITY_ENABLED=false
+# APILOGICPROJECT_KEYCLOAK_REALM=kcals
+# APILOGICPROJECT_KEYCLOAK_BASE=http://localhost:8080//realms/kcals
+# APILOGICPROJECT_KEYCLOAK_BASE_URL=http://localhost:8080
+# APILOGICPROJECT_KEYCLOAK_CLIENT_ID=alsclient
+
+# required if you are not running from venv or docker apilogicserver/api_logic_server
+# APILOGICPROJECT_APILOGICSERVERHOME=src/ApiLogicServer-src
+
+# 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) 
+
+# APILOGICPROJECT_STOP_OK=FALSE
+# dev only - enable stop url: http://localhost:5656/stop?msg=reason
+

api_logic_server_cli/prototypes/base/devops/readme-devops.md

@@ -1,4 +1,16 @@
-Use these directories to rapidly deploy your system to the cloud.  This means you can provide a preview of [working software](https://apilogicserver.github.io/Docs/Working-Software-Now/) for your team:
+## Using the standard container
+
+There are many, many ways of using docker.
+
+1. You can use the existing apilogicserver/api_logic_server container as shown in `devops/docker-standard-image`.
+
+2. Or, you can create your own container, as described in the next section.
+
+ 
+
+## Creating per-project containers
+
+Use these directories to deploy your system to the cloud.  This means you can provide a preview of [working software](https://apilogicserver.github.io/Docs/Working-Software-Now/) for your team:
 
 * **Developers** can use the API to begin custom User Interface development
 

api_logic_server_cli/prototypes/base/docs/logic/readme.md

@@ -1,6 +1,9 @@
-### Add Natural Languate Logic to Your Project
+### Add Natural Language Logic to Your Project
 
-You can add Natural Language logic files to this directory, e.g., `check_credit.prompt`.
+You can add Natural Language logic files to this directory, e.g. in `genai_demo/docs/logic`: 
+
+* `valid_names.prompt`: Customer and Product Names cannot be 'x'
+* `valid_currency.prompt`: Customer credit limits cannot be negative; Product prices must be positive.
 
 Then, use GenAI to create executable logic in your `logic/logic_discovery` directory, e.g.,
 
@@ -13,3 +16,4 @@ Notes:
 1. Ensure derived attributes exist in the data model (see [Database Design Changes](https://apilogicserver.github.io/Docs/Database-Changes/))
 2. Be sure to initialize such attributes in your database
 3. For more information, [click here](https://apilogicserver.github.io/Docs/WebGenAI-CLI/#add-logic-to-existing-projects)
+4. Consider renaming your logic files afterward (`valid_names.z-prompt`)so they are skipped on future runs

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/base/logic/readme_declare_logic.md

@@ -10,6 +10,14 @@ This describes how to use Logic; for more information, [see here](https://apilog
 
  
 
+## Natural Language vs. IDE
+
+If you are using WebGenAI, you can specify rules in Natural Language. You can also augment them in the IDE using code completion.  There are some important usage guidelines.  
+
+> You should generally not alter any files in the `wg_rules` directory.  For more information, see [WebGenAI](https://apilogicserver.github.io/Docs/WebGenAI/), and [WebGenAI Logic](https://apilogicserver.github.io/Docs/WebGenAI-CLI.md#natural-language-logic).
+
+ 
+
 ## Examples      
 Examples from tutorial project:
 * Examples drawn from [tutorial project](https://github.com/ApiLogicServer/demo/blob/main/logic/declare_logic.py)

api_logic_server_cli/prototypes/base/security/declare_security.py

@@ -33,7 +33,9 @@ class Roles():
     read_only = "readonly"
     admin = "CS_ADMIN"
     public="public"             # p1/p (no roles, but gets public)
+    sa="sa"
     
+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)
 DefaultRolePermission(to_role=Roles.admin, can_read=True, can_insert=True,can_update=True, can_delete=True)
 DefaultRolePermission(to_role=Roles.manager, can_read=True, can_insert=True,can_update=True, can_delete=False)

api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py

@@ -46,13 +46,13 @@ def declare_logic():
     Rule.sum(derive=Order.amount_total, as_sum_of=Item.amount)
 
     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
+        if row.product.carbon_neutral == True and row.quantity >= 10:
            amount = amount * Decimal(0.9)  # breakpoint here
         return amount
 
     # Items.Amount = Quantity * UnitPrice with discount for CarbonNeutral products.
-    Rule.formula(derive=models.Item.Amount, 
+    Rule.formula(derive=models.Item.amount, 
                  calling=derive_amount)
 
     # Item.unit_price is copied from Product.unit_price.