ApiLogicServer 15.0.47__py3-none-any.whl → 15.0.54__py3-none-any.whl

api_logic_server_cli/api_logic_server.py

@@ -12,10 +12,12 @@ ApiLogicServer CLI: given a database url, create [and run] customizable ApiLogic
 Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
 '''
 
-__version__ = "15.00.47"  # last public release: 15.00.41 (15.00.12)
+__version__ = "15.00.54"  # last public release: 15.00.52 (15.00.12)
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t07/14/2024 - 15.00.47: venv fix, copilot vibe tweaks - creation, mcp logic, basic_demo autonums \n"\
+    "\t07/23/2024 - 15.00.54: system vibe support \n"\
+    "\t07/20/2024 - 15.00.52: Python 3.13 compatibility fixes - psycopg2→psycopg3, SQLAlchemy 2.0+, pkg_resources→importlib.metadata.  mgr dbs \n"\
+    "\t07/17/2024 - 15.00.49: venv fix+, ext bldr * fix, copilot vibe tweaks - creation, mcp logic, basic_demo autonums \n"\
     "\t07/10/2024 - 15.00.41: copilot vibe support for logic, UI, MCP,  bug[98] \n"\
     "\t06/30/2024 - 15.00.33: Tech Preview: genai-logic genai-add-app --vibe, bug [96, 97] \n"\
     "\t06/10/2024 - 15.00.12: MCP Security, win fixes for readme, graphics quotes \n"\
@@ -389,6 +391,7 @@ def create_project_and_overlay_prototypes(project: 'ProjectRun', msg: str) -> st
                 joinpath('prototypes/basic_demo')
             recursive_overwrite(nw_dir, project.project_directory)
             create_utils.copy_md(project = project, from_doc_file = "Sample-Basic-Demo.md")
+            create_utils.copy_md(project = project, from_doc_file = "Sample-Basic-Demo-Vibe.md", to_project_file="README-VIBE.md")
 
 
         if project.db_url == "mysql+pymysql://root:p@localhost:3306/classicmodels":
@@ -463,6 +466,13 @@ def create_project_and_overlay_prototypes(project: 'ProjectRun', msg: str) -> st
         copy_sqlite = True
         if copy_sqlite == False or "sqlite" not in project.abs_db_url:
             db_uri = get_windows_path_with_slashes(project.abs_db_url)
+            
+            # Convert PostgreSQL URL for Python 3.13+ compatibility
+            import sys
+            if sys.version_info >= (3, 13) and db_uri.startswith('postgresql://'):
+                db_uri = db_uri.replace('postgresql://', 'postgresql+psycopg://')
+                log.debug(f'.. ..Converted PostgreSQL URL for Python 3.13+: {db_uri}')
+            
             create_utils.replace_string_in_file(search_for="replace_db_url",
                                 replace_with=db_uri,
                                 in_file=f'{project.project_directory}/config/config.py')
@@ -915,7 +925,10 @@ def start_open_with(project: Project):
 
 def invoke_extended_builder(builder_path, db_url, project_directory, model_creation_services):
     # spec = importlib.util.spec_from_file_location("module.name", "/path/to/file.py")
-    spec = importlib.util.spec_from_file_location("module.name", builder_path)
+    use_builder_path = builder_path
+    if builder_path == '*':
+        use_builder_path = Path('extended_builder.py')
+    spec = importlib.util.spec_from_file_location("module.name", use_builder_path)
     extended_builder = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(extended_builder)  # runs "bare" module code (e.g., initialization)
     extended_builder.extended_builder(db_url, project_directory, model_creation_services)  # extended_builder.MyClass()
@@ -1194,8 +1207,8 @@ class ProjectRun(Project):
             log.debug(f'.. .. ..Copying sqlite database to: database/{self.bind_key}_db.sqlite')
             db_loc = self.abs_db_url.replace("sqlite:///", "")
             if os.name == "nt":
-                if db_loc.startswith("C:\C:"):  # windows
-                    db_loc = db_loc.replace("C:\C:", "C:")  # remove unk junk
+                if db_loc.startswith(r"C:\C:"):  # windows
+                    db_loc = db_loc.replace(r"C:\C:", "C:")  # remove unk junk
             target_db_loc_actual = str(self.project_directory_path.joinpath(f'database/{self.bind_key}_db.sqlite'))
             # target: /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/servers/NW_NoCust/database/Todo_db.sqlite
             # e.g.,   /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/servers/NW_NoCust/database

api_logic_server_cli/api_logic_server_info.yaml

@@ -1,3 +1,3 @@
-last_created_date: July 14, 2025 19:56:50
-last_created_project_name: ApiLogicProject
-last_created_version: 15.00.46
+last_created_date: July 23, 2025 12:12:14
+last_created_project_name: ../../../servers/basic_demo
+last_created_version: 15.00.53

api_logic_server_cli/cli.py

@@ -188,14 +188,16 @@ def main(ctx):
         Creation is from your database (--db-url identifies a SQLAlchemy database)
 
 \b
-        Doc: https://apilogicserver.github.io/Docs
+        Synonym to genai-logic: gail | gal
+\b
+        Doc: https://apilogicserver.github.io/Docs/Doc-Home/
         And: https://apilogicserver.github.io/Docs/Database-Connectivity/
 \b
     Suggestions:
 
 \b
-        ApiLogicServer start                                # create and manage projects
-        ApiLogicServer create --db-url= --project-name=     # defaults to Northwind sample
+        genai-logic start                                # create and manage projects
+        genai-logic create --db-url= --project-name=     # defaults to Northwind sample
     """
     pass  # all commands come through here
 
@@ -1083,13 +1085,13 @@ def genai_iterate(ctx, project_name: str, using: str):
               help="your_code.py for additional build automation")
 @click.option('--include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include, exclude")
 @click.option('--include-tables', 'include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include, exclude")
 @click.option('--infer_primary_key/--no_infer_primary_key',
               default=False, is_flag=True,
-              help="xInfer primary_key for unique cols")
+              help="Infer primary_key for unique cols")
 @click.option('--infer-primary-key/--no-infer-primary-key', 'infer_primary_key',
               default=False, is_flag=True,
               help="Infer primary-key for unique cols")
@@ -1250,22 +1252,22 @@ def create(ctx, project_name: str, db_url: str, not_exposed: str, api_name: str,
               help="Swagger hostname (default is localhost)")
 @click.option('--extended_builder',
               default=f'',
-              help="your_code.py for additional build automation")
+              help="your python for additional build automation")
 @click.option('--extended-builder', 'extended_builder',
               default=f'',
-              help="your_code.py for additional build automation")
+              help="your python for additional build automation")
 @click.option('--include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include / exclude")
 @click.option('--include-tables', 'include_tables',
               default=f'',
-              help="yml for include: exclude:")
+              help="yml for include / exclude")
 @click.option('--infer_primary_key/--no_infer_primary_key',
               default=False, is_flag=True,
-              help="Infer primary-key for unique cols")
+              help="Infer primary key for unique cols")
 @click.option('--infer-primary-key/--no-infer-primary-key', 'infer_primary_key',
               default=False, is_flag=True,
-              help="Infer primary-key for unique cols")
+              help="Unique cols infer primary key")
 @click.pass_context
 def create_and_run(ctx, project_name: str, db_url: str, not_exposed: str, api_name: str,
         from_git: str,
@@ -1280,11 +1282,13 @@ def create_and_run(ctx, project_name: str, db_url: str, not_exposed: str, api_na
         host: str,
         port: str,
         swagger_host: str,
-        favorites: str, non_favorites: str,
+        favorites: str, 
+        non_favorites: str,
         extended_builder: str,
         include_tables: str,
         multi_api: click.BOOL,
-        opt_locking: str, opt_locking_attr: str,
+        opt_locking: str, 
+        opt_locking_attr: str,
         id_column_alias: str,
         infer_primary_key: click.BOOL):
     """
@@ -2122,7 +2126,7 @@ if __name__ == '__main__':  # debugger & python command line start here
             "show-args" in api_logic_server_info_file_dict:
         print_args(commands, f'\nCommand Line Arguments:')
     python_version = sys.version_info
-    assert python_version[0] >= 3 and python_version[1] in [10,11,12], \
-        "... Requires Python >=3.10, !=3.11.0, !=3.11.1, 3.12"
+    assert python_version[0] >= 3 and python_version[1] in [10,11,12, 13], \
+        "... Requires Python >=3.10, !=3.11.0, !=3.11.1, 3.12, 3.13"
     main()
 

api_logic_server_cli/create_from_model/api_logic_server_utils.py

@@ -197,6 +197,12 @@ def copy_md(project, from_doc_file: str, to_project_file: str = "README.md"):
                     else:
                         each_line = each_line.replace('.md', '')  # hmm... todo: find out why this exists
                     pass
+                if from_doc_file == 'Sample-Basic-Demo-Vibe.md' and 'title=' in each_line:
+                    # extract the quoted text after 'title=' into title
+                    match = re.search(r'title\s*=\s*["\']([^"\']+)["\']', each_line)
+                    if match:
+                        title = match.group(1)
+                    readme_lines_md.append('**' + title + ':**\n')
                 readme_lines_md.append(each_line)
         with open(str(to_file), "w") as readme_file:
             readme_file.writelines(readme_lines_md)
@@ -293,10 +299,13 @@ def get_abs_db_url(msg, project: Project, is_auth: bool = False):
             else:
                 rtn_abs_db_url = f'sqlite:///{str(project.api_logic_server_dir_path.joinpath("prototypes/sample_ai/database/chatgpt/sample_ai_items.sqlite"))}'
                 # log.info('.. using installed nw sample database')
-        else:
+        else:  # for win, might be: sqlite:////C:\\Users\\val\\dev\\ApiLogicServer\\ApiLogicServer-dev\\org_git\\ApiLogicServer-src\\api_logic_server_cli\\database\\mcp.sqlite
             url = url_to_process[10: len(url_to_process)]
+            if url_to_process.startswith('sqlite:////c:'):
+                url = url_to_process[11: len(url_to_process)]
             rtn_abs_db_url = abspath(url)
             rtn_abs_db_url = 'sqlite:///' + rtn_abs_db_url
+            pass
     elif url_to_process == 'sqlsvr-sample':  # work-around - VSCode run config arg parsing
         rtn_abs_db_url = 'mssql+pyodbc://sa:Posey3861@localhost:1433/SampleDB?driver=ODBC+Driver+18+for+SQL+Server&trusted_connection=no&Encrypt=no'
     elif url_to_process == 'sqlsvr-nwlogic':  # work-around - VSCode run config arg parsing

api_logic_server_cli/manager.py

@@ -36,9 +36,9 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
         samples (bool, optional): Whether to create large samples (prevent win max file length)
     """    
     
-    def create_sym_links(cli_path: Path, mgr_path: Path):
+    def copy_sqlite_dbs(cli_path: Path, mgr_path: Path):
         """
-        Creates symbolic links to sample dbs and prompts (clearer than db abbreviations).
+        Copy sample sqlite databases to mgr/samples/dbs (clearer than db abbreviations).
 
         Args:
             cli_path (Path): loc of cli.py in the manager's venv
@@ -48,16 +48,27 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
             Creates a symbolic link from 'cli_path/database/basic_demo.sqlite' to 'mgr_path/samples/dbs/basic_demo'.
 
         """
-        
-        # create symbolic link - thanks https://www.geeksforgeeks.org/python/python-os-symlink-method/
-        try:
-            os.symlink(cli_path.parent / 'database/basic_demo.sqlite', mgr_path / 'samples/dbs/basic_demo.sqlite')
-            os.symlink(cli_path.parent / 'database/nw-gold.sqlite', mgr_path / 'samples/dbs/nw.sqlite')
-            os.symlink(cli_path.parent / 'database/Chinook_Sqlite.sqlite', mgr_path / 'samples/dbs/chinook.sqlite')
-            os.symlink(cli_path.parent / 'database/classicmodels.sqlite', mgr_path / 'samples/dbs/classicmodels.sqlite')
-            log.debug("✅ Manager Creation - SymLink created: samples/dbs/")
-        except Exception as e:
-            log.debug(f"❌ Manager Creation - SymLink creation failed: {str(e)}")
+        if use_syn_link := False:
+            # could create symbolic link - thanks https://www.geeksforgeeks.org/python/python-os-symlink-method/
+            # but this fails on windows due to permissions
+            try:
+                os.symlink(cli_path.parent / 'database/basic_demo.sqlite', mgr_path / 'samples/dbs/basic_demo.sqlite')
+                os.symlink(cli_path.parent / 'database/nw-gold.sqlite', mgr_path / 'samples/dbs/nw.sqlite')
+                os.symlink(cli_path.parent / 'database/Chinook_Sqlite.sqlite', mgr_path / 'samples/dbs/chinook.sqlite')
+                os.symlink(cli_path.parent / 'database/classicmodels.sqlite', mgr_path / 'samples/dbs/classicmodels.sqlite')
+                log.debug("✅ Manager Creation - SymLink created: samples/dbs/")
+            except Exception as e:
+                log.debug(f"❌ Manager Creation - Copy samples/dbs SymLink creation failed: {str(e)}")
+        else:
+            try:
+                copyfile(cli_path.parent / 'database/basic_demo.sqlite', mgr_path / 'samples/dbs/basic_demo.sqlite')
+                copyfile(cli_path.parent / 'database/nw-gold.sqlite', mgr_path / 'samples/dbs/nw.sqlite')
+                copyfile(cli_path.parent / 'database/Chinook_Sqlite.sqlite', mgr_path / 'samples/dbs/chinook.sqlite')
+                copyfile(cli_path.parent / 'database/classicmodels.sqlite', mgr_path / 'samples/dbs/classicmodels.sqlite')
+                copyfile(cli_path.parent / 'database/todos.sqlite', mgr_path / 'samples/dbs/todos.sqlite')
+                log.debug("✅ Manager Creation - Created: samples/dbs/")
+            except Exception as e:
+                log.debug(f"❌ Manager Creation - Copy samples/dbs creation failed: {str(e)}")
 
 
     log = logging.getLogger(__name__)
@@ -218,7 +229,7 @@ def create_manager(clean: bool, open_with: str, api_logic_server_path: Path,
         create_utils.replace_string_in_file(search_for = 'cli_path',
                                             replace_with=str(cli_str),
                                             in_file=vscode_launch_path)
-        create_sym_links(cli_path=cli_path, mgr_path=to_dir)
+        copy_sqlite_dbs(cli_path=cli_path, mgr_path=to_dir)
 
     if env_path.exists():
         create_utils.replace_string_in_file(search_for = 'APILOGICSERVER_AUTO_OPEN=code',

api_logic_server_cli/prototypes/base/.github/.copilot-instructions.md

@@ -37,11 +37,14 @@ python api_logic_server_run.py
 Rule.sum(derive=Customer.Balance, as_sum_of=Order.AmountTotal)
 Rule.constraint(validate=Customer, as_condition=lambda row: row.Balance <= row.CreditLimit)
 ```
+
+As described in `docs/training/logic_bank_api.prompt`, logic includes rules for sums, formulas, constraints, and more.  They also include events, which are used to trigger actions like sending emails or updating related records.
+
 For project `basic_demo`, the best place to begin is to provide CoPilot with the natural language logic below.  CoPilot will then offer to translate the logic into LogicBank rules. Also 
 1. Provide the analysis (below) showing the 44X code reduction.
 2. Stress the importance of business logic - it's half the project, and requires an underlying rules engine.  Using AI alone is not sufficient - you will wind up with procedural code, with the issues noted in the analysis below.
 
-Here's the natural language logic to provide to CoPilotP
+Here's the natural language logic to provide to CoPilot:
 
 ```text
 Use case: Check Credit    
@@ -126,6 +129,8 @@ Then, `npm install` and `npm start`
 
 Temporary restriction: security must be disabled.
 
+**IMPORTANT**: When working with React apps, ALWAYS read `docs/training` first. This file contains critical data access provider configuration that was built when the project was created. The data provider handles JSON:API communication and record context - ignore this at your peril.
+
 Customize using CoPilot chat, with `docs/training`.
 
 ### Security - Role-Based Access Control
@@ -164,9 +169,13 @@ def my_endpoint():
     return {"message": "Custom endpoint"}
 ```
 
-### Customize Models - Add Attributes
+### Customize Models - Add Tables, Attributes
+
+Update `database/model.py`, and use `database/alembic` to update the database (highly impactful - request permission).  This is *generally* preferrable to updating the database directly, since some platforms may not have database CLI tools.
 
-Update the model, and use `database/alembic` to update the database (highly impactful - request permission).
+If altering `database/models.py`, be sure to follow the patterns shown in the existing models.  Note they not typically contain a `__bind_key__`.
+
+```python
 
 ### Addressing `Missing Attributes` during logic loading at project startup
 
@@ -216,6 +225,33 @@ Convert to Python values first using float(), int(), str()
 Use property() function instead of @jsonapi_attr for computed properties
 Always add error handling for type conversions
 
+### Adding events
+LogicBank rules are the preferred approach to logic, but you will sometimes need to add events.  This is done in `logic/declare_logic.py` (important: the function MUST come first):
+
+```python
+# Example: Log email activity after SysEmail is committed
+
+def sys_email_after_commit(row: models.SysEmail, old_row: models.SysEmail, logic_row: LogicRow):
+    """
+    After SysEmail is committed, log 'email sent' 
+    unless the customer has opted out
+    """
+    if not row.customer.email_opt_out:
+        logic_row.log(f"📧 Email sent to {row.customer.name} - Subject: {row.subject}")
+    else:
+        logic_row.log(f"🚫 Email blocked for {row.customer.name} - Customer opted out")
+
+Rule.commit_row_event(on_class=SysEmail, calling=sys_email_after_commit)
+```
+
+LogicBank event types include:
+- `Rule.commit_row_event()` - fires after transaction commits
+- `Rule.after_insert()` - fires after row insert
+- `Rule.after_update()` - fires after row update  
+- `Rule.after_delete()` - fires after row delete
+
+All events receive `(row, old_row, logic_row)` parameters and should use `logic_row.log()` for logging.
+
 ## 📁 Key Directories
 
 - `logic/` - Business rules (declarative)

api_logic_server_cli/prototypes/base/config/config.py

@@ -133,6 +133,12 @@ class Config:
     SQLALCHEMY_DATABASE_URI : typing.Optional[str] = f"replace_db_url"
     # override SQLALCHEMY_DATABASE_URI here as required
 
+    # Python 3.13+ compatibility: Convert PostgreSQL URLs to use psycopg3
+    import sys
+    if sys.version_info >= (3, 13) and SQLALCHEMY_DATABASE_URI.startswith('postgresql://'):
+        SQLALCHEMY_DATABASE_URI = SQLALCHEMY_DATABASE_URI.replace('postgresql://', 'postgresql+psycopg://')
+        app_logger.debug(f'config.py - converted PostgreSQL URL for Python 3.13+: {SQLALCHEMY_DATABASE_URI}')
+
     BACKTIC_AS_QUOTE = False # use backtic as quote for table names for API Bridge
     if SQLALCHEMY_DATABASE_URI.startswith("mysql") or SQLALCHEMY_DATABASE_URI.startswith("mariadb"):
         BACKTIC_AS_QUOTE = True
@@ -145,6 +151,11 @@ class Config:
     if os.getenv('SQLALCHEMY_DATABASE_URI'):  # e.g. export SECURITY_ENABLED=true
         SQLALCHEMY_DATABASE_URI = os.getenv('SQLALCHEMY_DATABASE_URI')
         app_logger.debug(f'.. overridden from env variable: {SQLALCHEMY_DATABASE_URI}')
+        
+        # Python 3.13+ compatibility: Convert PostgreSQL URLs to use psycopg3 (for env override)
+        if sys.version_info >= (3, 13) and SQLALCHEMY_DATABASE_URI.startswith('postgresql://'):
+            SQLALCHEMY_DATABASE_URI = SQLALCHEMY_DATABASE_URI.replace('postgresql://', 'postgresql+psycopg://')
+            app_logger.debug(f'config.py - converted PostgreSQL URL for Python 3.13+: {SQLALCHEMY_DATABASE_URI}')
 
 
     # KEYCLOAK Args
@@ -178,6 +189,10 @@ class Config:
     # Begin Multi-Database URLs (from ApiLogicServer add-db...)
     auth_db_path = str(project_path.joinpath('database/authentication_db.sqlite'))
     SQLALCHEMY_DATABASE_URI_AUTHENTICATION = f'sqlite:///{auth_db_path}'
+    # Python 3.13+ compatibility: Convert PostgreSQL URLs to use psycopg3 (for env override)
+    if sys.version_info >= (3, 13) and SQLALCHEMY_DATABASE_URI_AUTHENTICATION.startswith('postgresql://'):
+        SQLALCHEMY_DATABASE_URI_AUTHENTICATION = SQLALCHEMY_DATABASE_URI_AUTHENTICATION.replace('postgresql://', 'postgresql+psycopg://')
+        app_logger.debug(f'config.py - converted PostgreSQL URL for Python 3.13+: {SQLALCHEMY_DATABASE_URI_AUTHENTICATION}')
     app_logger.info(f'config.py - SQLALCHEMY_DATABASE_URI_AUTHENTICATION: {SQLALCHEMY_DATABASE_URI_AUTHENTICATION}\n')
 
     # as desired, use env variable: export SQLALCHEMY_DATABASE_URI='sqlite:////Users/val/dev/servers/docker_api_logic_project/database/db.sqliteXX'

api_logic_server_cli/prototypes/base/database/alembic/alembic_run.py

@@ -0,0 +1,98 @@
+import os
+import subprocess
+import sys
+
+'''
+Pushes the current database/models.py to the database.
+python database/alembic/alembic_run.py [--non-interactive]
+'''
+
+def prompt(msg, non_interactive=False):
+    if non_interactive:
+        print(f"{msg}")
+        print("Running in non-interactive mode...")
+        return
+    try:
+        input(f"{msg}\nPress Enter to continue or Ctrl+C to abort...")
+    except EOFError:
+        print("Running in non-interactive mode (no stdin available)...")
+        return
+
+def run(cmd, env=None):
+    print(f"Running: {cmd}")
+    result = subprocess.run(cmd, shell=True, env=env)
+    if result.returncode != 0:
+        print(f"Command failed: {cmd}")
+        sys.exit(result.returncode)
+
+def main():
+    # Check for non-interactive mode more safely
+    non_interactive = "--non-interactive" in sys.argv
+    if not non_interactive:
+        try:
+            non_interactive = not sys.stdin.isatty()
+        except:
+            # If we can't check stdin, assume non-interactive
+            non_interactive = True
+    
+    orig_dir = os.getcwd()
+    # Change to the database directory (parent of alembic directory) where alembic.ini is located
+    db_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+    print(f"Changing directory to {db_dir}")
+    os.chdir(db_dir)
+
+    env = os.environ.copy()
+    env["APILOGICPROJECT_NO_FLASK"] = "True"  # ~ export APILOGICPROJECT_NO_FLASK=True
+
+    print("\n\nThis script will update your database schema to match models.py using Alembic.")
+    print("Steps:")
+    print("1. Set APILOGICPROJECT_NO_FLASK=True -- eg, export APILOGICPROJECT_NO_FLASK=True")
+    print("2. Run: alembic upgrade head")
+    print("3. Run: alembic revision --autogenerate -m \"message\"")
+    prompt("Ready to proceed?", non_interactive)
+
+    run("alembic upgrade head", env=env)
+    print("Database schema updated to latest migration.")
+
+    prompt("Now, a new migration will be generated to match models.py.", non_interactive)
+    if non_interactive:
+        msg = "autogenerated"
+    else:
+        try:
+            msg = input("Enter a message for the migration (default: 'autogenerated'): ") or "autogenerated"
+        except EOFError:
+            msg = "autogenerated"
+    run(f'alembic revision --autogenerate -m "{msg}"', env=env)
+
+    # Find the latest migration file
+    versions_dir = os.path.join(db_dir, "alembic", "versions")
+    migration_files = sorted(
+        [f for f in os.listdir(versions_dir) if f.endswith(".py")],
+        key=lambda x: os.path.getmtime(os.path.join(versions_dir, x)),
+        reverse=True
+    )
+    if migration_files:
+        latest_file = os.path.join(versions_dir, migration_files[0])
+        with open(latest_file, "r") as f:
+            lines = f.readlines()
+        with open(latest_file, "w") as f:
+            for line in lines:
+                f.write(line)
+                if line.strip().startswith("def downgrade"):
+                    f.write("    return\n")
+                    break
+    else:
+        print("No migration file found.")
+        sys.exit(1)
+
+    # Apply the newly generated migration after modifying the migration file
+    prompt(f"Migration file generated: {latest_file}\nIt is recommended to review this migration file before proceeding.", non_interactive)
+    run("alembic upgrade head", env=env)
+
+    print("Migration file updated: downgrade will do nothing.")
+    print("Consider updating ui/admin/admin.yaml to reflect schema changes.")
+    os.chdir(orig_dir)
+    print("\nSuccess! Database schema and migrations are up to date.\n\n")
+
+if __name__ == "__main__":
+    main()

api_logic_server_cli/prototypes/base/database/alembic/readme_alembic.md

@@ -0,0 +1,36 @@
+You can push changes to `database/models.py' to your database automatically, or manually.
+
+<br>
+
+## Automatic
+
+Use:
+
+```bash
+python database/alembic/alembic_run.py [--non-interactive]
+```
+
+<br>
+
+## Manual
+
+The diagram below illustrates a path for enacting changes to the data model, and using [Alembic](https://alembic.sqlalchemy.org/en/latest/index.html) to automate the database changes:
+
+1. Update `database/models.py` (e.g., add columns, tables)
+2. Use alembic to compute the revisions
+```bash
+cd database
+export APILOGICPROJECT_NO_FLASK=True
+alembic revision --autogenerate -m "Added Tables and Columns"
+```
+3. **Edit the revision file** to signify your understanding (see below)
+4. Activate the change
+```bash
+alembic upgrade head 
+unset APILOGICPROJECT_NO_FLASK
+```
+
+![alembic example](https://github.com/ApiLogicServer/Docs/blob/main/docs/images/database/alembic/alembic-overview.png?raw=true)
+
+
+To update your admin app, run `rebuild-from-model`.  For more information, see [Database Design Changes](https://apilogicserver.github.io/Docs/Database-Changes/).

api_logic_server_cli/prototypes/base/docs/training/admin_app_1_context.prompt.md

@@ -1,3 +1,43 @@
 
 Generate a full React Admin application using the following instructions.  
 The result must be a runnable React app (`npm start`) that connects to the supplied JSON:API, with fully implemented components (no placeholders or empty files).
+
+## Critical Data Access Provider Configuration
+
+This project uses a **pre-configured JSON:API data provider** that was built when the project was created. 
+
+### Key Requirements:
+
+1. **Data Provider**: Use the existing `jsonapiClient` from `./rav4-jsonapi-client/ra-jsonapi-client`
+2. **Record Context**: For custom components (like cards), ALWAYS wrap with `<RecordContextProvider value={record}>` 
+3. **List Data Access**: Use `useListContext()` to get data and loading state
+4. **Individual Records**: Use `useRecordContext()` to access record data within providers
+5. **API Root**: The data provider connects to `conf.api_root` (typically `http://localhost:5656/api`)
+
+### Example Pattern for Custom List Views:
+```javascript
+import { useListContext, RecordContextProvider, useRecordContext } from 'react-admin';
+
+const CustomGrid = () => {
+    const { data, isLoading } = useListContext();
+    
+    return (
+        <Grid container>
+            {data?.map(record => (
+                <Grid item key={record.id}>
+                    <RecordContextProvider value={record}>
+                        <CustomCard />
+                    </RecordContextProvider>
+                </Grid>
+            ))}
+        </Grid>
+    );
+};
+
+const CustomCard = () => {
+    const record = useRecordContext();
+    return <Card>{record.name}</Card>;
+};
+```
+
+### CRITICAL: Do NOT create new data providers or modify the existing JSON:API client configuration. The project's data flow depends on the pre-built provider.

api_logic_server_cli/prototypes/base/integration/mcp/mcp_client_executor.py

@@ -147,12 +147,12 @@ def query_llm_with_nl(learnings_and_schema: str, nl_query: str):
     else:
         # read integration/mcp/mcp_tool_context.json
         tool_context_file_path = os.path.join(os.path.dirname(__file__), "../../integration/mcp/examples/mcp_tool_context_response_get.json")
-        if nl_query == default_query_email:
+        if 'send email' in nl_query:
             tool_context_file_path = os.path.join(os.path.dirname(__file__), "../../integration/mcp/examples/mcp_tool_context_response.json")
         try:    
             with open(tool_context_file_path, "r") as tool_context_file:
                 tool_context_str = tool_context_file.read()
-                # log.info(f"\n\n2c. Tool context from file {tool_context_file_path}:\n" + tool_context_str)
+                log.info(f"\n\n2c. Tool context from file {tool_context_file_path}:\n" + tool_context_str)
         except FileNotFoundError:
             raise ConstraintException(f"Tool context file not found at {tool_context_file_path}.")
 

api_logic_server_cli/prototypes/base/venv_setup/requirements-no-cli.txt

@@ -1,9 +1,9 @@
 PyJWT==2.6.0
 python-dateutil==2.8.2
 six==1.16.0
-SQLAlchemy==1.4.29
-Flask-SQLAlchemy==2.5.1
-SQLAlchemy-Utils==0.38.2
+SQLAlchemy>=2.0.0
+Flask-SQLAlchemy>=3.0.0
+SQLAlchemy-Utils>=0.38.2
 Werkzeug==2.2.3
 logicbankutils==0.6.0
 inflect==5.0.2
@@ -25,7 +25,8 @@ PyMySQL==1.0.2
 cryptography==36.0.1
 requests==2.27.1
 gunicorn==20.1.0
-psycopg2-binary==2.9.5
+psycopg2-binary>=2.9.5; python_version < '3.13'
+psycopg[binary]>=3.1.0; python_version >= '3.13'
 DotMap==1.3.25
 WTForms==2.3.3
 behave==1.2.6

api_logic_server_cli/prototypes/basic_demo/_config.yml

@@ -0,0 +1,8 @@
+# GitHub Pages / Jekyll Configuration
+# Enable processing of markdown files
+markdown: kramdown
+highlighter: rouge
+
+# Include the _layouts directory
+include:
+  - _layouts

api_logic_server_cli/prototypes/basic_demo/_layouts/redirect.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="refresh" content="1;url={{ page.redirect }}" />
+    <link rel="canonical" href="{{ page.redirect }}" />
+    <script type="text/javascript">
+      window.location.href = "{{ page.redirect }}"
+    </script>
+    <title>Page Redirection</title>
+  </head>
+  <body>
+    If you are not redirected automatically, follow <a href='{{ page.redirect }}'>this link</a>.
+  </body>
+</html>