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

api_logic_server_cli/api_logic_server.py

@@ -12,9 +12,11 @@ ApiLogicServer CLI: given a database url, create [and run] customizable ApiLogic
 Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
 '''
 
-__version__ = "14.03.11"
+__version__ = "14.03.14"
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
+    "\t02/26/2024 - 14.03.14: [85: reserved words], genai_demo fixes \n"\
+    "\t02/16/2024 - 14.03.12: Docker w/ std container, mgr assistant for local WebG \n"\
     "\t02/13/2024 - 14.03.11: fixes [78: Keycloak, 79: boolean defaulting, 80: Send If missing attribute] \n"\
     "\t01/31/2024 - 14.03.00: Issue 76: exp ending in right paren, Issue 74: Multi-db fix, extended default options, if-based Nat Lang formulas \n"\
     "\t01/29/2024 - 14.02.34: save docs/response.json to fix bad rules for IS_GENAI_DEMO, LogicBank 1.20.23 (all defaults) \n"\

api_logic_server_cli/api_logic_server_info.yaml

@@ -1,3 +1,3 @@
-last_created_date: February 05, 2025 18:22:21
-last_created_project_name: trk
-last_created_version: 14.03.07
+last_created_date: February 17, 2025 13:08:45
+last_created_project_name: ../../../servers/ucf
+last_created_version: 14.03.12

api_logic_server_cli/cli.py

@@ -595,7 +595,7 @@ def tutorial(ctx, create):
               default=f'_genai_default',
               help="Project location")
 @click.option('--tables', 
-              default=4,
+              default=12,
               help="Number of tables")
 @click.option('--test-data-rows', 'test_data_rows', 
               default=4,

api_logic_server_cli/genai/genai.py

@@ -582,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}')
@@ -645,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

@@ -53,3 +53,18 @@ APILOGICPROJECT_VERBOSE=True
 # APILOGICPROJECT_STOP_OK=FALSE
 # 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/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.

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/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/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.11.dist-info → apilogicserver-14.3.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ApiLogicServer
-Version: 14.3.11
+Version: 14.3.14
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://apilogicserver.github.io/Docs/

{ApiLogicServer-14.3.11.dist-info → apilogicserver-14.3.14.dist-info}/RECORD

@@ -1,7 +1,7 @@
 api_logic_server_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_logic_server_cli/api_logic_server.py,sha256=ugtA9gONRKOxXgwLL_JSx5nSEUJg7XUsuE7LbB6JaOg,113773
-api_logic_server_cli/api_logic_server_info.yaml,sha256=B3p_TJirI-BMqwyD5rULFQ4sJS1nd_xkP1M6k9SXuUw,108
-api_logic_server_cli/cli.py,sha256=IIz3frEJiZSi1q0HtRxLl7i-R4ABhPDqlBa7LTI6vcw,80765
+api_logic_server_cli/api_logic_server.py,sha256=Kz5-fZRLHGXfh3ywAX1drmihsm5k0yKEtdXiPgPxyOA,113936
+api_logic_server_cli/api_logic_server_info.yaml,sha256=WU6oSE-ugtlDCfMuVqRfri9PNBgGXefZr-YQgq3MHLc,125
+api_logic_server_cli/cli.py,sha256=t4jyVgA1OoO2AXbgwdQP3I_ZJS1A-ZirFl18e4VU3co,80766
 api_logic_server_cli/cli_args_base.py,sha256=lr27KkOB7_WpZwTs7LgiK8LKDIHMKQkoZCTnE99BFxw,3280
 api_logic_server_cli/cli_args_project.py,sha256=I5no_fGRV_ZsK3SuttVDAaQYI4Q5zCjx6LojGkM024w,4645
 api_logic_server_cli/extended_builder.py,sha256=EhtXGAt_RrDR2tCtgvc2U82we7fr-F6pP-e6HS6dQWQ,13867
@@ -26,7 +26,7 @@ api_logic_server_cli/create_from_model/__pycache__/create_db_from_model.cpython-
 api_logic_server_cli/create_from_model/__pycache__/dbml.cpython-312.pyc,sha256=E4oR4UFDjW7Z7SCfo-USc7vUVfwQFma1O_qldAT7L7c,8952
 api_logic_server_cli/create_from_model/__pycache__/meta_model.cpython-312.pyc,sha256=Ylu_fwSC4BHfTr4xzXCfyY6ChXu9seDx_LphGw_Tl6Y,7133
 api_logic_server_cli/create_from_model/__pycache__/model_creation_services.cpython-312.pyc,sha256=ZItAlFMbjQopl5EJ5zVKvSMweEczeky1o2uKewW-aus,36599
-api_logic_server_cli/create_from_model/__pycache__/ont_build.cpython-312.pyc,sha256=TDNj_xZu8dpfTeYTPxUi-J4zyNPNifUz-YfWLmOjm_E,68547
+api_logic_server_cli/create_from_model/__pycache__/ont_build.cpython-312.pyc,sha256=PtUuxzrSRLwxSvD3LG5B3W9Yb-YwqVeExtST59Skj8M,69030
 api_logic_server_cli/create_from_model/__pycache__/ont_create.cpython-312.pyc,sha256=M9PIKa6_15c-il2FKP-fqeCGse_tbof3mvg_ZVlPy4I,14478
 api_logic_server_cli/create_from_model/__pycache__/ui_admin_creator.cpython-312.pyc,sha256=dW3OP8i2imShiMvCVxfTu5w5t4renKVrIuATDSvDs9k,38555
 api_logic_server_cli/create_from_model/__pycache__/uri_info.cpython-312.pyc,sha256=_xZHwvPJzehSzH-ueuTKwNqNLTJfUMDwYl5ddYNTxRM,2728
@@ -471,10 +471,11 @@ api_logic_server_cli/fragments/nw_virtual_attrs.py,sha256=7hgvhnO1UcJ6OoPKCxR5bn
 api_logic_server_cli/fragments/ui_basic_web_app_runZZ.py,sha256=UllBIkKHlUE3nyDE1qtFWCA-NTE1ltYxPvVUd7lZI5U,870
 api_logic_server_cli/genai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_logic_server_cli/genai/client.py,sha256=36gyz-dqxj4dJj1SGtO9NZsy9-cfnf4d7uahHimwqHk,772
-api_logic_server_cli/genai/genai.py,sha256=PMBdcKAMXbmM7mdl6QB-_60dY6QiNXP8mVwhBEA0Zfg,59523
+api_logic_server_cli/genai/genai.py,sha256=ue5gElZS22d3Ro8ECw9PrPhu3o5OKUvf47gkJqDvKBc,44247
+api_logic_server_cli/genai/genai_fatal_excp.py,sha256=1FmDVcXVRqmG0JMVZ7l4KqMOdpff3KGZ2LPAGtw304Q,179
 api_logic_server_cli/genai/genai_logic_builder.py,sha256=VkgOG0s17sdt-ElQmfTRuMCUnQLtxtyaH8Qfr0x1TrE,23552
-api_logic_server_cli/genai/genai_svcs.py,sha256=1J1LyzLpcjEBLYPsdqYzqR_6HvS5A69olD4v9B9fbYE,45989
-api_logic_server_cli/genai/genai_utils.py,sha256=DKhIb0P-7Ps1a1jIXyDOlTT8DwXn4-c7LRrV83GgnC8,17128
+api_logic_server_cli/genai/genai_svcs.py,sha256=OEeecUl0erraodfn-P9ICzdTLyewXOVl42PZpI31QEA,46698
+api_logic_server_cli/genai/genai_utils.py,sha256=DTlWTnW5_2pzX4q1VG1tWqoZPVObDHR97SVe0z8Z3rs,17102
 api_logic_server_cli/genai/json2rules.py,sha256=ykoxxgZgqllzt8Ud06S-R_3QtumxXfmF5ksYC0Hh2Sk,2645
 api_logic_server_cli/model_migrator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_logic_server_cli/model_migrator/gen_behave_tests.py,sha256=2EOPlY2up_kv80LCRvxOiV-PxHW_Muq6IW8p1AwFpVU,9491
@@ -508,7 +509,7 @@ api_logic_server_cli/prototypes/allocation/logic/declare_logic.py,sha256=Wqk1kpu
 api_logic_server_cli/prototypes/allocation/test/test.sh,sha256=ndw_D7IOFTEUZxbcOL5Y-spvF8pJCe8OOSroqBfjXPM,645
 api_logic_server_cli/prototypes/base/.DS_Store,sha256=xMhewDC6Svrxt7lCSkNtbYvtSyWxUMSTtAAlVdI8XJI,6148
 api_logic_server_cli/prototypes/base/.gitignore,sha256=PAO98cVvjgAL_mvXCMS_Vfk7bT2Vd1-j9a8_nB2qxqs,190
-api_logic_server_cli/prototypes/base/api_logic_server_run.py,sha256=Rn-XM_ttIHsOQOABvlwUOppHPy8q6atyg_IzuJtZkNQ,6532
+api_logic_server_cli/prototypes/base/api_logic_server_run.py,sha256=LgPBLuITuoH2Q51m1l5mtBQFsw68FtrjLyte4P6dUCY,6568
 api_logic_server_cli/prototypes/base/readme.md,sha256=CtWAiMpRfJiA83y90RYVLQ_E1Mntya7Xd8SWcsaHWBc,11710
 api_logic_server_cli/prototypes/base/requirements.txt,sha256=we6X5fRBJVqN8SacwV7oPDtGk5IAiNbUDbUwCGHkCrc,107
 api_logic_server_cli/prototypes/base/run.ps1,sha256=lrZgw8SEntPam3ZYKVzsRo7rOKSGWqgO7qUNJ3CbP44,801
@@ -527,7 +528,7 @@ api_logic_server_cli/prototypes/base/.vscode/launch.json,sha256=5sR621KUgIhwTdxl
 api_logic_server_cli/prototypes/base/.vscode/settings.json,sha256=vS3gt0PpFbZ3fdGeiVGaE4v9PyRydjrrdGWb27w9UUo,470
 api_logic_server_cli/prototypes/base/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_logic_server_cli/prototypes/base/api/customize_api.py,sha256=-_eoaIukB4v1dF1TXTOqRRyU_nLbXXEhphI43GPtdoI,2236
-api_logic_server_cli/prototypes/base/api/expose_api_models.py,sha256=s2H8_e0_E5S7xHvU6fMcPcrNJN4r4t7iQ98pp1fobeI,1832
+api_logic_server_cli/prototypes/base/api/expose_api_models.py,sha256=17ql1DgNFnnclE8NM1GDCgm7umdI8nGbRuoR-v7bWGM,1827
 api_logic_server_cli/prototypes/base/api/json_encoder.py,sha256=3EFDSi9jdaS4jSOs5EwyltWwTy-8QEoBN2afYknpCdQ,521
 api_logic_server_cli/prototypes/base/api/readme_customize_api.md,sha256=AEeBybDsXSDr2IlqGZCo17ZModZnrflAOCx2a6gP_rE,4165
 api_logic_server_cli/prototypes/base/api/api_discovery/auto_discovery.py,sha256=y6uQ_i9t8qqmjsM69rZzzp2q3OaAbSrwlfeRIrR_sRY,1099
@@ -537,7 +538,7 @@ api_logic_server_cli/prototypes/base/api/api_discovery/ontimize_api.py,sha256=_g
 api_logic_server_cli/prototypes/base/api/api_discovery/system.py,sha256=Cv4qtnEG5s6vtk2alHmPAvwKlbtlHsd3Ugse_YKIk7Q,3345
 api_logic_server_cli/prototypes/base/api/system/api_utils.py,sha256=cCwujmQRE3gb6756GAVlypx7r30eH_-aZzo-hi3BNTU,5812
 api_logic_server_cli/prototypes/base/api/system/custom_endpoint.py,sha256=191JrBIhRM1-gjCdJhfy0VFTZtMHoGXIIXcwEGAPbeI,49786
-api_logic_server_cli/prototypes/base/api/system/expression_parser.py,sha256=4kPnwihBTP-APE5xQ8_5M9lK8cd_z6z783GFY47-8eM,28008
+api_logic_server_cli/prototypes/base/api/system/expression_parser.py,sha256=PXvmRmPte2bY00GvwnTYwp819e3q8dtk95Ns5IVHVbo,28035
 api_logic_server_cli/prototypes/base/api/system/gen_csv_report.py,sha256=GDAFJV3v1phmjLDE-vfvp8jgZnu2R6sTdQ6UWgdk64c,1410
 api_logic_server_cli/prototypes/base/api/system/gen_pdf_report.py,sha256=gOe5mSYbh17q94UDh_YQI4qUr7jjck7UfnTNe7CEXhA,8783
 api_logic_server_cli/prototypes/base/api/system/opt_locking/opt_locking.py,sha256=ib-hb-ZLZ7P7XbyQ08teUKM_p-5WMAmo0Cyjao2GA9o,6432
@@ -571,7 +572,7 @@ api_logic_server_cli/prototypes/base/database/test_data/readme.md,sha256=T_uBlZt
 api_logic_server_cli/prototypes/base/database/test_data/response2code.py,sha256=PTeAXHU-r6r0EBknSGXnbkdySAAzch_3gOuRlyUyVF8,4414
 api_logic_server_cli/prototypes/base/database/test_data/test_data_preamble.py,sha256=zmGdhH-Lm_BLeTkDSAb_7jQd4OD10LivzEOisdHT_fU,2892
 api_logic_server_cli/prototypes/base/devops/.DS_Store,sha256=Cy2EHccNO2W84kaA9RvGJWq3tlZOj1YR7XYzgFTXIvg,6148
-api_logic_server_cli/prototypes/base/devops/readme-devops.md,sha256=BgR3H0qb4Nm6OBVG4tze0aWKpUBpNsVGylHke0QV7vA,1035
+api_logic_server_cli/prototypes/base/devops/readme-devops.md,sha256=KxoCpgjKN3U8GZ48VF1yH2hF_i2kC7QViZacgP4iN8s,1340
 api_logic_server_cli/prototypes/base/devops/auth-db/authdb_mysql.Dockerfile,sha256=FIdVnGfT5DDW-OyEjARpoYr3Gm33s_gbFVrnjNU_rpg,2604
 api_logic_server_cli/prototypes/base/devops/auth-db/authdb_mysql.sql,sha256=1S-QufT8KK0IlUqzu02g-yFLmav3rPgPXukBz0sCgNw,3648
 api_logic_server_cli/prototypes/base/devops/auth-db/authdb_postgres.sql,sha256=RBYP5uT1acvn0O1n8veRVDb8m3mA3Y-ifNvA1kVY2ho,1246
@@ -592,8 +593,10 @@ api_logic_server_cli/prototypes/base/devops/docker-compose-dev-local-nginx/unuse
 api_logic_server_cli/prototypes/base/devops/docker-compose-dev-local-nginx/unused/unused-requirements-slim.txt,sha256=tbSwU7qdwcp_5ILWgEcLLeS7frnLkLif9Gyf5r3Ou-E,14
 api_logic_server_cli/prototypes/base/devops/docker-image/build_image.dockerfile,sha256=RVvOirRyqEloaZHgByW2_ux9ajL2ixRdEpc14JJHyg0,647
 api_logic_server_cli/prototypes/base/devops/docker-image/build_image.sh,sha256=3PTPAr8cwYtxMgLYExzpXHZ-fiOY4EEp_7B7qhKtdbs,2025
-api_logic_server_cli/prototypes/base/devops/docker-image/env.list,sha256=cSp4UlVVZdbuGOaMHcZP9a3Kws92fWSnQvDyae01Q4M,2243
+api_logic_server_cli/prototypes/base/devops/docker-image/env.list,sha256=RNFOENsRVvvj-Y_QYCrtbP4N1Jmufj6OKXx4bq8B7cc,3431
 api_logic_server_cli/prototypes/base/devops/docker-image/run_image.sh,sha256=D94avWpEftzC6nIoWHtjJPmIkTQtckc69ulSIsqbGiY,1176
+api_logic_server_cli/prototypes/base/devops/docker-standard-image/docker-compose-standard-image.yml,sha256=D2gHgYB16U4_ebcg7i4AZHj2AJ9j1e6kq8Ulw-cmIqM,976
+api_logic_server_cli/prototypes/base/devops/docker-standard-image/env.list,sha256=NqtUvek7VKp-g5l8WVNFZTzWIHeYiAnSL53boiK8k8w,2165
 api_logic_server_cli/prototypes/base/devops/keycloak/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 api_logic_server_cli/prototypes/base/devops/keycloak/docker-compose-dev-network.yml,sha256=19HvUXnEczbOi2dMSlVY9aqaHzeFiZ30f2gBZ9fxelE,1090
 api_logic_server_cli/prototypes/base/devops/keycloak/docker-compose-nginx.yml,sha256=iWTFHcjxWCRHtotuDsoR2w7sUNug0LOclMh5JjGwSFc,1676
@@ -617,7 +620,7 @@ api_logic_server_cli/prototypes/base/devops/keycloak/nginx/nginx.conf,sha256=nsp
 api_logic_server_cli/prototypes/base/devops/keycloak/unused/auth_provider.py,sha256=e8PoH9Ck4nrMe-QY99Lh0G02gzn2ubnMauFVEpNbeQ8,2771
 api_logic_server_cli/prototypes/base/devops/keycloak/unused/unused-docker-compose-keycloak.sh,sha256=YvYRD4ID8v7znslXKOlzu3hpN17h0O_zwGPkFYy1G20,353
 api_logic_server_cli/prototypes/base/devops/python-anywhere/python_anywhere_wsgi.py,sha256=xs3ZT1gg8C4tMzUW6OfOzV8dXHtUW5KVJdyyEbooPFs,3820
-api_logic_server_cli/prototypes/base/docs/logic/readme.md,sha256=s0s5FIF0TVPfinEPdNNSUy9f2HJwGQQdJ1h3xrJm3lA,590
+api_logic_server_cli/prototypes/base/docs/logic/readme.md,sha256=fIQypEQ7Ny7q385AhpwndYRBFquG6P6xpM41-zrIseE,871
 api_logic_server_cli/prototypes/base/docs/logic_suggestions/readme_logic_suggestions.md,sha256=44ibQYGOy84J4zGFaChLCOf-GU9pOBrbgBbprujMtIs,184
 api_logic_server_cli/prototypes/base/integration/kafka/kafka_consumer.py,sha256=2DOsFpYnsJ71gZzzfJweEmL-i99uCtEFU0hVwIKFGMw,1516
 api_logic_server_cli/prototypes/base/integration/kafka/kafka_producer.py,sha256=nza_seZJhI7OSnaIXgOGmLv68NrPojt7_uvE7_2agDU,4131
@@ -630,13 +633,13 @@ api_logic_server_cli/prototypes/base/integration/system/FlaskKafka.py,sha256=_Us
 api_logic_server_cli/prototypes/base/integration/system/RowDictMapper.py,sha256=DSdmeAQZZ_wUWHHiSS_6ZgeTKIuEycNlgX140l3fnSE,19986
 api_logic_server_cli/prototypes/base/logic/declare_logic.py,sha256=vglpAfVRM3QONLDbWIXcZrXTSttO8vUpwLbSJ51Fmw0,3290
 api_logic_server_cli/prototypes/base/logic/load_verify_rules.py,sha256=dYEb-UxqQ5N08ry22I04vtFy8JtQe2pL7Jw8gR8nGu4,7742
-api_logic_server_cli/prototypes/base/logic/readme_declare_logic.md,sha256=CFC13f9Z4rTkNiRoJTBEz3A2F_yRThOj-HrHDsSdKsw,6630
+api_logic_server_cli/prototypes/base/logic/readme_declare_logic.md,sha256=ZC1a0e_tob6UNXcoPGgYEf_BPUlwpdD-bYwtNPUeORQ,7105
 api_logic_server_cli/prototypes/base/logic/logic_discovery/auto_discovery.py,sha256=m97W6DYi6ouTDuFCiU1rPq1UqzJuNnVePyOeLU33D1s,2645
 api_logic_server_cli/prototypes/base/logic/logic_discovery/__pycache__/__init__.cpython-312.pyc,sha256=5--1medTaKN83y-D_iv9EPiLD2uja_Q0r5ZkxX_pJM4,199
 api_logic_server_cli/prototypes/base/logic/logic_discovery/__pycache__/auto_discovery.cpython-312.pyc,sha256=OHyWfpKrY0UbeSEwBnxsiIHPgpjzDSpCoyIa6ha4NVk,1579
 api_logic_server_cli/prototypes/base/logic/logic_discovery/__pycache__/error_testing.cpython-312.pyc,sha256=NQKJ0pHsE53Nwmob8c03X_vkSV-MP_mj-1VFmJ3kRs0,2225
 api_logic_server_cli/prototypes/base/security/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_logic_server_cli/prototypes/base/security/declare_security.py,sha256=6EGMOOiJ4GgCboqC38-tvIFTSRnrtHSiKS7wt18kvko,1828
+api_logic_server_cli/prototypes/base/security/declare_security.py,sha256=RRRvRMRR6_EsM61VbkWA-D99rNSaQTByTI06eOzRtao,1946
 api_logic_server_cli/prototypes/base/security/authentication_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 api_logic_server_cli/prototypes/base/security/authentication_provider/abstract_authentication_provider.py,sha256=RPPA48kdYiXx5zQ6epbfAEB1se8E10Ra9NxYRjIBShk,895
 api_logic_server_cli/prototypes/base/security/authentication_provider/keycloak/auth_provider.py,sha256=7z2aY7BAcy31EiGbmvGgSRLjQOooU1bM3g-bbyxdOac,10433
@@ -734,7 +737,7 @@ api_logic_server_cli/prototypes/genai_demo/integration/row_dict_maps/OrderB2B.py
 api_logic_server_cli/prototypes/genai_demo/integration/row_dict_maps/OrderShipping.py,sha256=4wM45eRNkDNl7vcX689VSR7BgdKvae5hD26L8XZYGfc,1197
 api_logic_server_cli/prototypes/genai_demo/integration/row_dict_maps/row_dict_maps_readme.md,sha256=5tOPwErjkcCQONrNcaGsttEwybxCIq-5j45dkOcDh1Q,206
 api_logic_server_cli/prototypes/genai_demo/integration/row_dict_maps/__pycache__/OrderB2B.cpython-312.pyc,sha256=GAhE6t6Hd1OshSdpG7T10GapxWgU4lM95n7zd2jwN6Q,1955
-api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py,sha256=_YUZsl6B6WHV4f9R-obOKniDtdYNCxfd5vJpLLdRXgw,4930
+api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py,sha256=gP4_Zr2nM8qXmmrCwtSM6D2ITZkLvwanBQhIo9UNiuo,4932
 api_logic_server_cli/prototypes/genai_demo/logic/load_verify_rules.py,sha256=TWqzJ_KWX_QvpxWQv4ujqc487W1P9ZglrciSLor_NHA,7681
 api_logic_server_cli/prototypes/genai_demo/logic/readme_declare_logic.md,sha256=CFC13f9Z4rTkNiRoJTBEz3A2F_yRThOj-HrHDsSdKsw,6630
 api_logic_server_cli/prototypes/genai_demo/logic/__pycache__/declare_logic.cpython-312.pyc,sha256=heB0NPW04Ede5hY4x-lF8_Hj2TtfYSQrBSEaDOUEiuw,6990
@@ -755,7 +758,7 @@ api_logic_server_cli/prototypes/manager/.vscode/ApiLogicServer.code-workspace,sh
 api_logic_server_cli/prototypes/manager/.vscode/launch.json,sha256=UMyprDcKb7bWjhTVaTFLW1l_1WYoTCg9JMzAIt5F0Z8,32527
 api_logic_server_cli/prototypes/manager/.vscode/settings.json,sha256=wQgpFvviPbZCmsf02UgrJSGAz7g3i4chDZ_AdSIOr5Y,625
 api_logic_server_cli/prototypes/manager/system/.DS_Store,sha256=r4gY37tWmhc60MVHeHWD-ZbqQBPlXqcC7xX2NhV42AA,6148
-api_logic_server_cli/prototypes/manager/system/Manager_workspace.code-workspace,sha256=19Acdi2ZvX5U_IMokLiVaKkIMwsSxgbw5YjaRMpBAAI,333
+api_logic_server_cli/prototypes/manager/system/Manager_workspace.code-workspace,sha256=EqvNleSV4PRL_tJIYy8gC0TKc0S2x3h3Vxba5QGyN4c,304
 api_logic_server_cli/prototypes/manager/system/style-guide.yaml,sha256=tgMp7e2IbOys7nymIM9onv65P0G2SIBJSe1qa-rRBtA,676
 api_logic_server_cli/prototypes/manager/system/app_model_editor/.gitignore,sha256=07msA6EiXJT_unwoat2B8vI6ANcIn9E-ntgIpQZj7g0,477
 api_logic_server_cli/prototypes/manager/system/app_model_editor/api_logic_server_run.py,sha256=vf9Jc2vAz5npI6pD4kLNNdFTkqK8rO4erA03-k_mkcY,6363
@@ -1214,11 +1217,11 @@ api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept
 api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/logic_notes.md,sha256=mrEBKE1OQxEqFoRLD1zYL-SeC5ITPcWEZKaumRDw7U4,100
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/.DS_Store,sha256=zQYgpeXOUqrfba9eGY89I8y4TzyXt6KeFI8mi4jUJFk,6148
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/create_db_models.py,sha256=QyGtjgsuYkVF5UYOn35V8ZnAdI76s-1KyM7nnGM4lPI,3588
-api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.prompt,sha256=OwdxIKDO60meoYFLuA4b2W3727npv5g7gp6xdSoVa-A,771
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.prompt,sha256=TTeQkOzxrA-HSrJtJ1FuEM9CsECZ2hiz4lDZLJQWhtw,783
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example,sha256=AW8V5VmeSEfGMPsTDYY77kIWqlnZ9-rpk-7OfboBiwM,8755
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_fixup_required.json,sha256=b7SO0wkrV7DxIkW2UxmEF07wXONMwzC4UOw1ZG2cvAw,9670
-api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_formal.prompt,sha256=V8QdPiytwb1jqWeo6fZvaoPE5OkPTJZ2KsKrvo17f7k,432
-api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_informal.prompt,sha256=OwdxIKDO60meoYFLuA4b2W3727npv5g7gp6xdSoVa-A,771
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_formal.prompt,sha256=k5U0obVyjLfD2kzqiFHF6FyucTCa47BEo6gdQJp3e34,390
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_informal.prompt,sha256=u8MO_zBIDDqcx33cnBE8zjMUvkom_hJHFOb-vHVR6NA,729
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_informal_rules_only.prompt,sha256=rR-ZCr3knseA9ButjkZ80hxhy-Rxw5FbvVEbEXImo58,521
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_no_logic.prompt,sha256=IIsO4mxLpKccSoIE1dMNsQQ2efhhCpFnAcoGtbcHv50,95
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/__pycache__/create_db_models.cpython-312.pyc,sha256=GuOEED9cvP4Q9M73S2zAdHybuhe8W36kb1j5HRZb5YU,5578
@@ -5888,6 +5891,15 @@ api_logic_server_cli/prototypes/manager/system/genai/temp/$notes.txt,sha256=FMmb
 api_logic_server_cli/prototypes/manager/system/genai/temp/chatgpt_original.response,sha256=pXPPj8lg0nJ82YGDu4Yrj9yVMUiSDptvjiudkNoB2ac,4628
 api_logic_server_cli/prototypes/manager/system/genai/temp/chatgpt_retry.response,sha256=pXPPj8lg0nJ82YGDu4Yrj9yVMUiSDptvjiudkNoB2ac,4628
 api_logic_server_cli/prototypes/manager/system/genai/temp/create_db_models.py,sha256=-OZ9PHKd0Igvt-VDV26HbkjLX8t-ozAScP-CNjNyf-4,3581
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/.DS_Store,sha256=XYdFi4HKsh2uAbbSX1lGyTufnlYykTWjfRpwpcLV69Y,8196
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/run_web_genai.sh,sha256=YoqH3HlgOWQjjOewpJKCD7vr6Z7AAA33B3p_wgZ5-QI,562
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg-projects/.DS_Store,sha256=Bmp6az8vHo25tJ7g4hYMKYhYjcc-cNEc9CE22BUL__E,6148
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg-projects/by-ulid/.DS_Store,sha256=oDv5WcRzbU9xt2tdH5TzzS8jjkCNJl1zexqxLVquXVk,6148
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg-projects/public/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg-projects/wgadmin/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg-temp/.DS_Store,sha256=CPykieh8Ma-zQAP23vf2cE3ermOFzN96bktWzPJzH_w,10244
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg_config/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
+api_logic_server_cli/prototypes/manager/system/genai/webg_local/webg_config/web_genai.txt,sha256=2f9M2V8aKFrrv8idloh_bxR_ldt8tkSOcZD2PlMeqFU,232
 api_logic_server_cli/prototypes/manager/system/images/copilot-clean.png,sha256=R3coCCU40UIg55fqQVAoOviiX1ERcyGqrd_EYHo6Oac,597600
 api_logic_server_cli/prototypes/manager/system/images/copilot.png,sha256=N8WsgqwOLD3DxkmQvpnLxx7KbMirXViUgNgumg-lbIA,1175570
 api_logic_server_cli/prototypes/manager/system/images/genai.png,sha256=jqC_qRwR6Y3DIfWaYnLPWKn1KF1UUezEnMeRpvRwv5s,117507
@@ -6228,7 +6240,7 @@ api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/setup.py,sha256=ekn0wq_leWE
 api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/tox.ini,sha256=mVlmM_uI-7K4pLs-jBfu8ZOQpHwQj8fh7LogvwjXJyE,440
 api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/__pycache__/__init__.cpython-312.pyc,sha256=TCTs9PqY75qnKtNXXWS41XVG_wGzHyRQ2eA3IWNY-Ss,237
 api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/codegen.py,sha256=p3MnTFVGE7vIzE2DqfWvoG43tJE9frkXjzODXA9UQeE,77486
+api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/codegen.py,sha256=DpymzpfQJiW-x6E63wZ-cxfft3BsmwVOraTZA95Ks40,77512
 api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/main.py,sha256=_kSzjbpJRgQURKP391SdIjYJOzBuyADEIP0qSSu8Nv0,3252
 api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/__pycache__/__init__.cpython-312.pyc,sha256=KHmbHH1vUKhS8pIGx1wyXxO6iwO9X3znNZROjYUzTnI,249
 api_logic_server_cli/sqlacodegen_wrapper/sqlacodegen/sqlacodegen/__pycache__/codegen.cpython-312.pyc,sha256=4hnUU0c1-SbhvP6ElD5usSEzhc2UJCxdct0jC9iz7d0,81261
@@ -6264,9 +6276,9 @@ api_logic_server_cli/tools/mini_skel/database/system/SAFRSBaseX.py,sha256=p8C7AF
 api_logic_server_cli/tools/mini_skel/database/system/TestDataBase.py,sha256=U02SYqThsbY5g3DX7XGaiMxjZBuOpzvtPS6RfI1WQFg,371
 api_logic_server_cli/tools/mini_skel/logic/declare_logic.py,sha256=fTrlHyqMeZsw_TyEXFa1VlYBL7fzjZab5ONSXO7aApo,175
 api_logic_server_cli/tools/mini_skel/logic/load_verify_rules.py,sha256=Rr5bySJpYCZmNPF2h-phcPJ53nAOPcT_ohZpCD93-a0,7530
-ApiLogicServer-14.3.11.dist-info/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
-ApiLogicServer-14.3.11.dist-info/METADATA,sha256=jjQkv_uYPcSfjC-ClPq1xjx2_vRgEK9VYrT-506rwe0,6447
-ApiLogicServer-14.3.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ApiLogicServer-14.3.11.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
-ApiLogicServer-14.3.11.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
-ApiLogicServer-14.3.11.dist-info/RECORD,,
+apilogicserver-14.3.14.dist-info/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
+apilogicserver-14.3.14.dist-info/METADATA,sha256=d4RHqiI5jboiE2yCOxqbZoHTAKDYvedMwyZlkGunnQs,6447
+apilogicserver-14.3.14.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+apilogicserver-14.3.14.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
+apilogicserver-14.3.14.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
+apilogicserver-14.3.14.dist-info/RECORD,,

{ApiLogicServer-14.3.11.dist-info → apilogicserver-14.3.14.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any