ApiLogicServer 14.3.25__py3-none-any.whl → 14.5.0__py3-none-any.whl

api_logic_server_cli/add_cust/add_cust.py

@@ -0,0 +1,283 @@
+from api_logic_server_cli.cli_args_project import Project
+from pathlib import Path
+import sqlalchemy
+from sqlalchemy.orm import Session
+from sqlalchemy.ext.declarative import declarative_base
+import logging
+import importlib.util
+from api_logic_server_cli.create_from_model import api_logic_server_utils as api_logic_server_utils
+from shutil import copyfile
+import shutil, os
+import create_from_model.api_logic_server_utils as create_utils
+
+log = logging.getLogger('create_from_model.model_creation_services')
+
+
+'''
+samples and demos - simulate customizations - https://apilogicserver.github.io/Docs/Doc-Home/#start-install-samples-training
+    1. nw - sample code
+    2. genai_demo - GenAI (ChatGPT to create model, add rules VSC)
+    3. basic_demo - small db, no GenAI (w/ iteration)
+    4. sample_ai - CoPilot, no GenAI   (w/ iteration)
+    5. Tech AI - just an article, no automated customizations...
+
+Note: many require: rebuild-from-database --project_name=./ --db_url=sqlite:///database/db.sqlite
+'''
+
+def add_genai_customizations(project: Project, do_show_messages: bool = True, do_security: bool = True):
+    """ Add customizations to genai (default creation)
+
+    0. Initial: create_project_and_overlay_prototypes() -- minor: just creates the readme
+            * When done with genai logic prompt, logic is pre-created (in logic/declare_logic.py)
+    1. Deep copy prototypes/genai_demo (adds logic and security, and custom end point)
+
+    WebGenAI DX:
+
+    0. Convention: click the Blue Button
+            * Home/Create Project
+            * Home/Open App
+            * Landing
+            * Overview[Manager]/Open
+            * Overview/GitHub
+            * App Home / Develop --> GitHub
+    0. demo --> codespaces.  Where are instructions (what is CS, how do I load/run)?
+    1. Name can be any, iff created with APILOGICPROJECT_IS_GENAI_DEMO
+    2. Bypass duplicate discovery logic iff created with APILOGICPROJECT_IS_GENAI_DEMO
+    3. TODO:
+            * cd project
+            * als add-cust  # add customizations
+            * run, and use place b2b order service - end point is not activated.
+
+    Args:
+    """
+
+    log.debug("\n\n==================================================================")
+    nw_messages = ""
+    do_security = True  # other demos can explain security, here just make it work
+    if do_security:
+        if do_show_messages:
+            nw_messages = "Add sample_ai / genai_demo customizations - enabling security"
+        project.add_auth(is_nw=True, msg=nw_messages)
+
+    # overlay genai_demo := sample_ai + sample_ai_iteration
+    nw_path = (project.api_logic_server_dir_path).\
+        joinpath('prototypes/genai_demo')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
+    create_utils.recursive_overwrite(nw_path, project.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
+
+    if do_show_messages:
+        log.info("\nExplore key customization files:")
+        log.info(f'..api/customize_api.py')
+        log.info(f'..logic/declare_logic.py')
+        log.info(f'..security/declare_security.py\n')
+        if project.is_tutorial == False:
+            log.info(".. all customizations complete\n")
+
+def fix_nw_datamodel(project_directory: str):
+    """update sqlite data model for cascade delete, aliases  -- fixme moving to add_cust
+
+    Args:
+        project_directory (str): project creation dir
+    """
+    models_file_name = Path(project_directory).joinpath('database/models.py')
+    do_add_manual = True if models_file_name.is_file() and not create_utils.does_file_contain(search_for="manual fix", in_file=models_file_name) else False
+    if not do_add_manual:
+        log.debug(f'.. .. ..ALREADY SET cascade delete and column alias for sample database database/models.py')
+        pass  # should not occur, just being careful
+    else:
+        log.debug(f'.. .. ..Setting cascade delete and column alias for sample database database/models.py')
+        create_utils.replace_string_in_file(in_file=models_file_name,
+            search_for='OrderDetailList : Mapped[List["OrderDetail"]] = relationship(back_populates="Order")',
+            replace_with='OrderDetailList : Mapped[List["OrderDetail"]] = relationship(cascade="all, delete", back_populates="Order")  # manual fix')
+        create_utils.replace_string_in_file(in_file=models_file_name,
+            search_for="ShipPostalCode = Column(String(8000))",
+            replace_with="ShipZip = Column('ShipPostalCode', String(8000))  # manual fix - alias")
+        create_utils.replace_string_in_file(in_file=models_file_name,
+            search_for="CategoryName_ColumnName = Column(String(8000))",
+            replace_with="CategoryName = Column('CategoryName_ColumnName', String(8000))  # manual fix - alias")
+
+def add_nw_customizations(project: Project, do_show_messages: bool = True, do_security: bool = True):
+    """ Add customizations to nw (default creation)
+
+    1. Add-sqlite-security (optionally - not used for initial creation)
+
+    2. Deep copy project_prototype_nw (adds logic)
+
+    3. Create readme files: Tutorial (copy_md), api/integration_defs/readme.md
+
+    4. Add database customizations
+
+    Args:
+    """
+
+    log.debug("\n\n==================================================================")
+    nw_messages = ""
+    if do_security:
+        if do_show_messages:
+            nw_messages = "Add northwind customizations - enabling security"
+        project.add_auth(is_nw=True, msg=nw_messages)
+
+    nw_path = (project.api_logic_server_dir_path).\
+        joinpath('prototypes/nw')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
+    if os.path.isfile(project.project_directory_path.joinpath('ui/admin/admin.yaml')):
+        copyfile(src = project.project_directory_path.joinpath('ui/admin/admin.yaml'),
+                dst = project.project_directory_path.joinpath('ui/admin/admin_no_customizations.yaml'))
+    create_utils.recursive_overwrite(nw_path, project.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
+
+    project.create_nw_tutorial_and_readme()
+
+    # z_copy_md(project = project, from_doc_file="Sample-Integration.md", to_project_file='integration/Sample-Integration.md')
+    create_utils.copy_md(project = project, from_doc_file = "Sample-Integration.md", to_project_file='integration/Sample-Integration.md')
+
+    fix_nw_datamodel(project_directory=project.project_directory)
+
+    if do_show_messages:
+        log.info("\nExplore key customization files:")
+        log.info(f'..api/customize_api.py')
+        log.info(f'..database/customize_models.py')
+        log.info(f'..logic/declare_logic.py')
+        log.info(f'..security/declare_security.py\n')
+        if project.is_tutorial == False:
+            log.info(".. all customizations complete\n")
+
+
+def add_basic_demo_customizations(project: Project, do_show_messages: bool = True):
+    """ Add customizations to basic_demo (default creation)
+
+    1. Deep copy prototypes/basic_demo (adds logic and security)
+
+    2. Create readme files: Sample-AI (copy_md), api/integration_defs/readme.md  TODO not done, fix cmts
+
+    Args:
+    """
+
+    log.debug("\n\n==================================================================")
+    nw_messages = ""
+    do_security = False  # disabled - keep clear what "activate security" means for reader
+    if do_security:
+        if do_show_messages:
+            nw_messages = "Add basic_demo customizations - enabling security"
+        project.add_auth(is_nw=True, msg=nw_messages)
+
+    nw_path = (project.api_logic_server_dir_path).\
+        joinpath('prototypes/basic_demo/customizations')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/basic_demo/customizations')
+    create_utils.recursive_overwrite(nw_path, project.project_directory) 
+
+    if do_show_messages:
+        log.info("\nExplore key customization files:")
+        log.info(f'..logic/declare_logic.py')
+        log.info(f'..security/declare_security.py\n')
+        log.info(f'Explore MCP (Model Context Protocol): https://apilogicserver.github.io/Docs/Integration-MCP/\n')
+        log.info(f'Next Steps: activate security')
+        log.info(f'..ApiLogicServer add-auth --db_url=auth')
+        if project.is_tutorial == False:
+            log.info(".. complete\n")
+
+
+def add_basic_demo_iteration(project: Project, do_show_messages: bool = True, do_security: bool = True):
+    """ Iterate data model for basic_demo (default creation)
+
+    1. Deep copy prototypes/basic_demo/iteration (adds db, logic)
+
+    Args:
+    """
+
+    log.debug("\n\n==================================================================")
+
+    nw_path = (project.api_logic_server_dir_path).\
+        joinpath('prototypes/basic_demo/iteration')
+    create_utils.recursive_overwrite(nw_path, project.project_directory)  # ~/dev/ApiLogicServer/ApiLogicServer-dev/servers/basic_demo
+    if do_show_messages:
+        log.info("\nNext Step:")
+        log.info(f'..ApiLogicServer rebuild-from-database --db_url=sqlite:///database/db.sqlite')
+        log.info(".. complete\n")
+
+
+def add_sample_ai_customizations(project: Project, do_show_messages: bool = True):
+    """ Add customizations to sample_ai (default creation)
+
+    1. Deep copy prototypes/sample_ai (adds logic and security)
+
+    2. Create readme files: Sample-AI (copy_md), api/integration_defs/readme.md  TODO not done, fix cmts
+
+    Args:
+    """
+
+    log.debug("\n\n==================================================================")
+    nw_messages = ""
+    do_security = False  # disabled - keep clear what "activate security" means for reader
+    if do_security:
+        if do_show_messages:
+            nw_messages = "Add sample_ai customizations - enabling security"
+        project.add_auth(is_nw=True, msg=nw_messages)
+
+    nw_path = (project.api_logic_server_dir_path).\
+        joinpath('prototypes/sample_ai')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
+    create_utils.recursive_overwrite(nw_path, project.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
+
+    if do_show_messages:
+        log.info("\nExplore key customization files:")
+        log.info(f'..api/customize_api.py')
+        log.info(f'..logic/declare_logic.py')
+        log.info(f'..security/declare_security.py\n')
+        log.info(f'Next Steps: activate security')
+        log.info(f'..ApiLogicServer add-auth --db_url=auth')
+        if project.is_tutorial == False:
+            log.info(".. complete\n")
+
+
+def add_sample_ai_iteration(project: Project, do_show_messages: bool = True, do_security: bool = True):
+    """ Iterate data model for sample_ai (default creation)
+
+    1. Deep copy prototypes/sample_ai_iteration (adds db, logic)
+
+    Args:
+    """
+
+    log.debug("\n\n==================================================================")
+
+    nw_path = (project.api_logic_server_dir_path).\
+        joinpath('prototypes/sample_ai_iteration')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
+    create_utils.recursive_overwrite(nw_path, project.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
+    if do_show_messages:
+        log.info("\nNext Step:")
+        log.info(f'..ApiLogicServer rebuild-from-database --project_name=./ --db_url=sqlite:///database/db.sqlite')
+        log.info(".. complete\n")
+
+
+def add_cust(project: Project, models_py_path: Path, project_name: str):
+    ''' determine which project, then call a customizer above '''
+    
+    log.debug(f"\ncli[add-cust] models_py_path={models_py_path}")
+    if not models_py_path.exists():
+        raise Exception("Customizations are northwind/genai-specific - models.py does not exist")
+
+    project_is_genai_demo = False  # can't use project.is_genai_demo because this is not the create command...
+    if project.project_directory_path.joinpath('docs/project_is_genai_demo.txt').exists():
+        project_is_genai_demo = True
+    
+    project.abs_db_url, project.nw_db_status, project.model_file_name = create_utils.get_abs_db_url("0. Using Sample DB", project)
+    if create_utils.does_file_contain(search_for="CategoryTableNameTest", in_file=models_py_path):
+        add_nw_customizations(project=project, do_security=False)
+        log.info("\nNext step - add authentication:\n  $ ApiLogicServer add-auth --db_url=auth\n\n")
+
+    elif project_is_genai_demo and create_utils.does_file_contain(search_for="Customer", in_file=models_py_path):
+        add_genai_customizations(project=project, do_security=False)
+
+    elif project_name == 'sample_ai' and create_utils.does_file_contain(search_for="CustomerName = Column(Text", in_file=models_py_path):
+        cocktail_napkin_path = project.project_directory_path.joinpath('logic/cocktail-napkin.jpg')
+        is_customized = cocktail_napkin_path.exists()
+        if not is_customized:
+            add_sample_ai_customizations(project=project)
+        else:
+            add_sample_ai_iteration(project=project)
+
+    elif project_name == 'basic_demo' and create_utils.does_file_contain(search_for="Customer", in_file=models_py_path):
+        cocktail_napkin_path = project.project_directory_path.joinpath('logic/cocktail-napkin.jpg')
+        is_customized = cocktail_napkin_path.exists()
+        if not is_customized:
+            add_basic_demo_customizations(project=project)
+        else:
+            add_basic_demo_iteration(project=project)
+
+    else:
+        raise Exception("Customizations are northwind/genai-specific - models.py has neither CategoryTableNameTest nor Customer")

api_logic_server_cli/api_logic_server.py

@@ -3,7 +3,7 @@
 '''
 ApiLogicServer CLI: given a database url, create [and run] customizable ApiLogicProject.
     * Basically clones prototype project (api_logic_server_cli/prototypes/base), and creates:
-        * database/models.py for SQLAlchemy,` using modified sqlacodegen & safrs metadata
+        * database/models.py for SQLAlchemy, using modified sqlacodegen & safrs metadata
         * ui/admin/admin.yaml for the Admin App     - using introspected models.py
         * api/expose_api_models.py for a safrs api  - using introspected models.py
     * Special provisions for NW Sample, to show customizations.
@@ -12,26 +12,19 @@ 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.25"
+__version__ = "14.05.00"  # last public release: 14.04.00
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
+    "\t05/16/2024 - 14.05.00: safrs 3.1.7, running mcp preview \n"\
+    "\t04/27/2024 - 14.04.00: Graphics preview, Vibe install fix, Improved IDE Chat Logic, MCP Exploration \n"\
     "\t03/30/2024 - 14.03.25: WebGenAI fixes for Kafka and Keycloak \n"\
     "\t03/19/2024 - 14.03.20: licensed webgenai docker, [87] sra fix for home.js \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"\
-    "\t01/26/2024 - 14.02.31: genai_logic fail-safe, Issue 74: Multi-db fix, support models named Rule, wg logic discovery, if formula \n"\
     "\t01/17/2024 - 14.02.20: WebGenAI support, genai_demo \n"\
     "\t01/06/2024 - 14.01.00: N8N, Rebuild test data, Fixup, Project Import, Improved reporting of missing attributes, Simplified RowDictMaper  \n"\
     "\t11/18/2024 - 12.02.00: genai: 'qualified any' now supported in logic training \n"\
     "\t10/31/2024 - 12.01.00: genai: informal rules (eg, Sum of employee salaries cannot exceed department budget) \n"\
-    "\t10/21/2024 - 12.00.04: sra 10-22, Prelim support genai --using=dir/project \n"\
     "\t10/12/2024 - 12.00.02: Natural Language Logic \n"\
-    "\t10/17/2024 - 11.02.19: singular classes, expanded doc/prompts, logic work-arounds, docs/logic, logic learning, readme \n"\
-    "\t10/11/2024 - 11.02.14: NL/Logic with test data calcs, sra 10-07-2024, genai-logic, cs, iteration rebuild \n"\
-    "\t08/02/2024 - 11.00.07: App Model Editor UI rework, docs and fix for kc and export \n"\
     "\t07/25/2024 - 11.00.00: Keycloak, App Model Editor \n"\
     "\t03/28/2024 - 10.03.46: Python 3.12, View support, CLI option-names, Keycloak preview \n"\
     "\t12/19/2023 - 10.00.00: Kafka pub/sub, Fix MySQL CHAR/String, list/hash/set types \n"\
@@ -39,8 +32,6 @@ recent_changes = \
     "\t09/14/2023 - 09.03.00: Oracle support \n"\
     "\t06/22/2023 - 09.00.00: Optimistic Locking, safrs 310, SQLAlchemy 2.0.15 \n"\
     "\t05/01/2023 - 08.03.06: allocation sample \n"\
-    "\t04/26/2023 - 08.03.00: virt attrs (Issue 56), safrs 3.0.2, readme updates, LogicBank 1.8.4 \n"\
-    "\t04/13/2023 - 08.02.00: integratedConsole, logic logging (66), table relns fix (65) \n"\
     "\t02/15/2023 - 08.00.01: Declarative Authorization and Authentication, Werkzeug==2.2.3 \n"\
     "\t01/06/2023 - 07.00.00: Multi-db, sqlite test dbs, tests run, security prototype, env config  \n"\
 
@@ -70,7 +61,7 @@ import importlib
 import fnmatch
 from dotmap import DotMap
 import api_logic_server_cli.create_from_model.create_db_from_model as create_db_from_model
-
+import add_cust.add_cust as add_cust
 
 def is_docker() -> bool:
     """ running docker?  dir exists: /home/api_logic_server """
@@ -189,7 +180,7 @@ def delete_dir(dir_path, msg):
 
 
 def recursive_overwrite(src, dest, ignore=None):
-    """
+    """  moving to api_logic_server_utils
     copyTree, with overwrite
     thanks: https://stackoverflow.com/questions/12683834/how-to-copy-directory-recursively-in-python-and-overwrite-all
     """
@@ -344,7 +335,8 @@ def create_project_and_overlay_prototypes(project: 'ProjectRun', msg: str) -> st
             log.debug(".. ..Copying nw customizations: logic, custom api, readme, tests, admin app")
             if project.nw_db_status == 'nw':
                 log.error("\n==> System Error: Unexpected customization for nw.  Please contact support.\n")
-            project.add_nw_customizations(do_security=False, do_show_messages=False)
+
+            add_cust.add_nw_customizations(project=project, do_security=False, do_show_messages=False)
             
         if project.nw_db_status in ["nw+"]:
             log.debug(".. ..Copy in nw+ customizations: readme, perform_customizations")
@@ -535,7 +527,7 @@ def resolve_home(name: str) -> str:
     return result
 
 def fix_nw_datamodel(project_directory: str):
-    """update sqlite data model for cascade delete, aliases
+    """update sqlite data model for cascade delete, aliases  -- fixme moving to add_cust
 
     Args:
         project_directory (str): project creation dir
@@ -1229,8 +1221,9 @@ from database import <project.bind_key>_models
                 # log.info(".. docs: https://apilogicserver.github.io/Docs/Security-Activation")
 
         config_file = f'{self.project_directory}/config/config.py'
+        env_file    = f'{self.project_directory}/config/default.env'
         is_enabled = create_utils.does_file_contain(search_for="SECURITY_ENABLED = True",
-                                        in_file=config_file)
+                                        in_file=env_file)
         is_sql = create_utils.does_file_contain(search_for="authentication_provider.sql.auth_provider import",
                                         in_file=config_file)
         was_provider_type = "sql" if is_sql else "keycloak"
@@ -1250,8 +1243,8 @@ from database import <project.bind_key>_models
             if is_enabled:
                 log.info(f'\n\n.. ..Disabling security for current provider type: {was_provider_type}\n')
                 create_utils.assign_value_to_key_in_file(value=False, 
-                            key="    SECURITY_ENABLED",
-                            in_file=config_file)                    
+                            key="SECURITY_ENABLED",
+                            in_file=env_file)                    
             else:
                 log.info(f'\n.. .. ..No action taken - already disabled for current provider type: {was_provider_type}\n')
             return
@@ -1270,8 +1263,8 @@ from database import <project.bind_key>_models
                 log.info("\n.. Authorization is declared in security/declare_security.py")
 
         log.info(f'\n..{provider_note}')  # set enabled, provider in config
-        create_utils.assign_value_to_key_in_file(in_file=config_file, \
-                    key="    SECURITY_ENABLED", value=True)                    
+        create_utils.assign_value_to_key_in_file(in_file=env_file, \
+                    key="SECURITY_ENABLED", value=True)                    
         self.set_provider(from_value=was_provider_type, to_value=self.auth_provider_type, config_file=config_file)
         if self.auth_provider_type == "keycloak":
             use_keycloak =True
@@ -1549,231 +1542,6 @@ from database import <project.bind_key>_models
             create_utils.copy_md(project = self, from_doc_file = "Tutorial-3.md", to_project_file='Tutorial.md')
             # z_copy_md(project = self, from_doc_file="Tutorial-3.md", to_project_file='Tutorial.md')
 
-    '''
-    samples and demos - simulate customizations - https://apilogicserver.github.io/Docs/Doc-Home/#start-install-samples-training
-        1. nw - sample code
-        2. genai_demo - GenAI (ChatGPT to create model, add rules VSC)
-        3. basic_demo - small db, no GenAI (w/ iteration)
-        4. sample_ai - CoPilot, no GenAI   (w/ iteration)
-        5. Tech AI - just an article, no automated customizations...
-    '''
-
-    def add_genai_customizations(self, do_show_messages: bool = True, do_security: bool = True):
-        """ Add customizations to genai (default creation)
-
-        0. Initial: create_project_and_overlay_prototypes() -- minor: just creates the readme
-                * When done with genai logic prompt, logic is pre-created (in logic/declare_logic.py)
-        1. Deep copy prototypes/genai_demo (adds logic and security, and custom end point)
-
-        WebGenAI DX:
-
-        0. Convention: click the Blue Button
-                * Home/Create Project
-                * Home/Open App
-                * Landing
-                * Overview[Manager]/Open
-                * Overview/GitHub
-                * App Home / Develop --> GitHub
-        0. demo --> codespaces.  Where are instructions (what is CS, how do I load/run)?
-        1. Name can be any, iff created with APILOGICPROJECT_IS_GENAI_DEMO
-        2. Bypass duplicate discovery logic iff created with APILOGICPROJECT_IS_GENAI_DEMO
-        3. TODO:
-                * cd project
-                * als add-cust  # add customizations
-                * run, and use place b2b order service - end point is not activated.
-
-        Args:
-        """
-
-        log.debug("\n\n==================================================================")
-        nw_messages = ""
-        do_security = True  # other demos can explain security, here just make it work
-        if do_security:
-            if do_show_messages:
-                nw_messages = "Add sample_ai / genai_demo customizations - enabling security"
-            self.add_auth(is_nw=True, msg=nw_messages)
-
-        # overlay genai_demo := sample_ai + sample_ai_iteration
-        nw_path = (self.api_logic_server_dir_path).\
-            joinpath('prototypes/genai_demo')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
-        recursive_overwrite(nw_path, self.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
-
-        if do_show_messages:
-            log.info("\nExplore key customization files:")
-            log.info(f'..api/customize_api.py')
-            log.info(f'..logic/declare_logic.py')
-            log.info(f'..security/declare_security.py\n')
-            if self.is_tutorial == False:
-                log.info(".. all customizations complete\n")
-
-
-    def add_nw_customizations(self, do_show_messages: bool = True, do_security: bool = True):
-        """ Add customizations to nw (default creation)
-
-        1. Add-sqlite-security (optionally - not used for initial creation)
-
-        2. Deep copy project_prototype_nw (adds logic)
-
-        3. Create readme files: Tutorial (copy_md), api/integration_defs/readme.md
-
-        4. Add database customizations
-
-        Args:
-        """
-
-        log.debug("\n\n==================================================================")
-        nw_messages = ""
-        if do_security:
-            if do_show_messages:
-                nw_messages = "Add northwind customizations - enabling security"
-            self.add_auth(is_nw=True, msg=nw_messages)
-
-        nw_path = (self.api_logic_server_dir_path).\
-            joinpath('prototypes/nw')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
-        if os.path.isfile(self.project_directory_path.joinpath('ui/admin/admin.yaml')):
-            copyfile(src = self.project_directory_path.joinpath('ui/admin/admin.yaml'),
-                 dst = self.project_directory_path.joinpath('ui/admin/admin_no_customizations.yaml'))
-        recursive_overwrite(nw_path, self.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
-
-        self.create_nw_tutorial_and_readme()
-
-        # z_copy_md(project = self, from_doc_file="Sample-Integration.md", to_project_file='integration/Sample-Integration.md')
-        create_utils.copy_md(project = self, from_doc_file = "Sample-Integration.md", to_project_file='integration/Sample-Integration.md')
-
-        fix_nw_datamodel(project_directory=self.project_directory)
-
-        if do_show_messages:
-            log.info("\nExplore key customization files:")
-            log.info(f'..api/customize_api.py')
-            log.info(f'..database/customize_models.py')
-            log.info(f'..logic/declare_logic.py')
-            log.info(f'..security/declare_security.py\n')
-            if self.is_tutorial == False:
-                log.info(".. all customizations complete\n")
-
-
-    def add_basic_demo_customizations(self, do_show_messages: bool = True):
-        """ Add customizations to basic_demo (default creation)
-
-        1. Deep copy prototypes/basic_demo (adds logic and security)
-
-        2. Create readme files: Sample-AI (copy_md), api/integration_defs/readme.md  TODO not done, fix cmts
-
-        Args:
-        """
-
-        log.debug("\n\n==================================================================")
-        nw_messages = ""
-        do_security = False  # disabled - keep clear what "activate security" means for reader
-        if do_security:
-            if do_show_messages:
-                nw_messages = "Add basic_demo customizations - enabling security"
-            self.add_auth(is_nw=True, msg=nw_messages)
-
-        nw_path = (self.api_logic_server_dir_path).\
-            joinpath('prototypes/basic_demo/customizations')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/basic_demo/customizations')
-        recursive_overwrite(nw_path, self.project_directory) 
-
-        if do_show_messages:
-            log.info("\nExplore key customization files:")
-            log.info(f'..logic/declare_logic.py')
-            log.info(f'..security/declare_security.py\n')
-            log.info(f'Next Steps: activate security')
-            log.info(f'..ApiLogicServer add-auth --db_url=auth')
-            if self.is_tutorial == False:
-                log.info(".. complete\n")
-
-
-    def add_basic_demo_iteration(self, do_show_messages: bool = True, do_security: bool = True):
-        """ Iterate data model for basic_demo (default creation)
-
-        1. Deep copy prototypes/basic_demo/iteration (adds db, logic)
-
-        Args:
-        """
-
-        log.debug("\n\n==================================================================")
-
-        nw_path = (self.api_logic_server_dir_path).\
-            joinpath('prototypes/basic_demo/iteration')
-        recursive_overwrite(nw_path, self.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
-        if do_show_messages:
-            log.info("\nNext Step:")
-            log.info(f'..ApiLogicServer rebuild-from-database --db_url=sqlite:///database/db.sqlite')
-            log.info(".. complete\n")
-
-
-    def add_sample_ai_customizations(self, do_show_messages: bool = True):
-        """ Add customizations to sample_ai (default creation)
-
-        1. Deep copy prototypes/sample_ai (adds logic and security)
-
-        2. Create readme files: Sample-AI (copy_md), api/integration_defs/readme.md  TODO not done, fix cmts
-
-        Args:
-        """
-
-        log.debug("\n\n==================================================================")
-        nw_messages = ""
-        do_security = False  # disabled - keep clear what "activate security" means for reader
-        if do_security:
-            if do_show_messages:
-                nw_messages = "Add sample_ai customizations - enabling security"
-            self.add_auth(is_nw=True, msg=nw_messages)
-
-        nw_path = (self.api_logic_server_dir_path).\
-            joinpath('prototypes/sample_ai')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
-        recursive_overwrite(nw_path, self.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
-
-        if do_show_messages:
-            log.info("\nExplore key customization files:")
-            log.info(f'..api/customize_api.py')
-            log.info(f'..logic/declare_logic.py')
-            log.info(f'..security/declare_security.py\n')
-            log.info(f'Next Steps: activate security')
-            log.info(f'..ApiLogicServer add-auth --db_url=auth')
-            if self.is_tutorial == False:
-                log.info(".. complete\n")
-
-
-    def add_sample_ai_iteration(self, do_show_messages: bool = True, do_security: bool = True):
-        """ Iterate data model for sample_ai (default creation)
-
-        1. Deep copy prototypes/sample_ai_iteration (adds db, logic)
-
-        Args:
-        """
-
-        log.debug("\n\n==================================================================")
-
-        nw_path = (self.api_logic_server_dir_path).\
-            joinpath('prototypes/sample_ai_iteration')  # PosixPath('/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/ApiLogicServer-src/api_logic_server_cli/prototypes/nw')
-        recursive_overwrite(nw_path, self.project_directory)  # '/Users/val/dev/ApiLogicServer/ApiLogicServer-dev/org_git/tutorial/1. Instant_Creation'
-        if do_show_messages:
-            log.info("\nNext Step:")
-            log.info(f'..ApiLogicServer rebuild-from-database --project_name=./ --db_url=sqlite:///database/db.sqlite')
-            log.info(".. complete\n")
-
-
-    def genai_get_logic(self, prompt: str) -> list[str]:  # TODO drop old code
-        """ Get logic from ChatGPT prompt
-        Args:
-        """
-
-        prompt_array = prompt.split('\n')
-        logic_text = list()
-        line_num = 0
-        logic_lines = 0
-        writing = False
-        for each_line in prompt_array:
-            line_num += 1
-            if "Enforce" in each_line:
-                writing = True
-            elif writing:
-                logic_lines += 1
-                logic_text.append(each_line)
-        return logic_text
-
 
     def tutorial(self, msg: str="", create: str='tutorial'):
         """
@@ -1826,7 +1594,7 @@ from database import <project.bind_key>_models
         
         self.project_name = with_cust
         self.command = "add-cust"
-        self.add_nw_customizations(do_show_messages=False, do_security=False)
+        add_cust.add_nw_customizations(project = self, do_show_messages=False, do_security=False)
         self.run = save_run  # remove logic below
 
 
@@ -1839,7 +1607,7 @@ from database import <project.bind_key>_models
         
         self.project_name = with_cust
         self.command = "add-cust"
-        self.add_nw_customizations(do_show_messages=False)
+        add_cust.add_nw_customizations(project = self, do_show_messages=False)
         self.run = save_run
 
         if create != "tutorial":
@@ -1960,7 +1728,7 @@ from database import <project.bind_key>_models
                     ont_creator = OntCreator(project = build.project)
                     ont_creator.create_application(show_messages=False)
 
-            if False and self.project_directory_path.joinpath('ui/app_model_custom.yaml').exists():
+            if self.project_directory_path.joinpath('ui/app_model_custom.yaml').exists():
                 # eg, nw project contains this for demo purposes
                 copyfile (src=self.project_directory_path.joinpath('ui/app_model_custom.yaml'),
                             dst=self.project_directory_path.joinpath('ui/app/app_model.yaml'))

api_logic_server_cli/api_logic_server_info.yaml

@@ -1,3 +1,3 @@
-last_created_date: March 26, 2025 13:40:07
-last_created_project_name: genai_demo
-last_created_version: 14.03.22
+last_created_date: May 15, 2025 12:52:13
+last_created_project_name: ../../../servers/basic_demo
+last_created_version: 14.04.08