ApiLogicServer 15.0.28__tar.gz → 15.0.32__tar.gz

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/ApiLogicServer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ApiLogicServer
-Version: 15.0.28
+Version: 15.0.32
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://www.genai-logic.com

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/ApiLogicServer.egg-info/SOURCES.txt

@@ -458,6 +458,7 @@ api_logic_server_cli/database/basic_demo.txt
 api_logic_server_cli/database/basic_demo_wg.sqlite
 api_logic_server_cli/database/classicmodels.sqlite
 api_logic_server_cli/database/customize_models.py
+api_logic_server_cli/database/mcp.sqlite
 api_logic_server_cli/database/model_using_numeric.py
 api_logic_server_cli/database/new.sqlite
 api_logic_server_cli/database/nw-gold-fix.sql
@@ -479,17 +480,18 @@ api_logic_server_cli/fragments/declare_logic.py
 api_logic_server_cli/fragments/declare_logic_begin.py
 api_logic_server_cli/fragments/declare_logic_end.py
 api_logic_server_cli/fragments/docker-compose.yml
+api_logic_server_cli/fragments/mcp_admin.yml
 api_logic_server_cli/fragments/modelsZZ.py
 api_logic_server_cli/fragments/nw_virtual_attrs.py
 api_logic_server_cli/fragments/ui_basic_web_app_runZZ.py
 api_logic_server_cli/genai/__init__.py
 api_logic_server_cli/genai/client.py
 api_logic_server_cli/genai/genai.py
-api_logic_server_cli/genai/genai_admin_app copy.py
 api_logic_server_cli/genai/genai_admin_app.py
 api_logic_server_cli/genai/genai_fatal_excp.py
 api_logic_server_cli/genai/genai_graphics.py
 api_logic_server_cli/genai/genai_logic_builder.py
+api_logic_server_cli/genai/genai_mcp.py
 api_logic_server_cli/genai/genai_svcs.py
 api_logic_server_cli/genai/genai_utils.py
 api_logic_server_cli/genai/json2rules.py
@@ -728,7 +730,6 @@ api_logic_server_cli/prototypes/basic_demo/customizations/docs/mcp_learning/mcp_
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/cocktail-napkin.jpg
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/declare_logic.py
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/email_request.py
-api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/mcp_client_executor_request.py
 api_logic_server_cli/prototypes/basic_demo/customizations/logic/logic_discovery/simple_constraints.py
 api_logic_server_cli/prototypes/basic_demo/customizations/security/declare_security.py
 api_logic_server_cli/prototypes/basic_demo/customizations/ui/.DS_Store
@@ -826,6 +827,8 @@ api_logic_server_cli/prototypes/manager/settings.txt
 api_logic_server_cli/prototypes/manager/.vscode/ApiLogicServer.code-workspace
 api_logic_server_cli/prototypes/manager/.vscode/launch.json
 api_logic_server_cli/prototypes/manager/.vscode/settings.json
+api_logic_server_cli/prototypes/manager/samples/readme_samples.md
+api_logic_server_cli/prototypes/manager/samples/dbs/readme_samples.md
 api_logic_server_cli/prototypes/manager/system/Manager_workspace.code-workspace
 api_logic_server_cli/prototypes/manager/system/style-guide.yaml
 api_logic_server_cli/prototypes/manager/system/app_model_editor/.gitignore
@@ -1266,13 +1269,10 @@ api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv-
 api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.ps1
 api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.sh
 api_logic_server_cli/prototypes/manager/system/genai/.DS_Store
-api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-Resource-Learning-Prompt copy.md
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-Resource-Learning-Prompt.md
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-App-js-Learning-Prompt.md
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-config-prompt.md
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/Admin-json-api-model-prompt.md
-api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/notes.md
-api_logic_server_cli/prototypes/manager/system/genai/app_templates/app_learning/z-unused-Admin-App-Learning-Prompt.md
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/react-admin-template/.DS_Store
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/react-admin-template/README.md
 api_logic_server_cli/prototypes/manager/system/genai/app_templates/react-admin-template/README_create_react_app.md
@@ -2336,6 +2336,7 @@ api_logic_server_cli/templates/app_fiddle.txt
 api_logic_server_cli/templates/index.html
 api_logic_server_cli/templates/login_endpoint.txt
 api_logic_server_cli/templates/login_endpoint_imports.txt
+api_logic_server_cli/templates/mcp_client_executor_request.py
 api_logic_server_cli/templates/opt_locking.txt
 api_logic_server_cli/tools/mini_skel/run.py
 api_logic_server_cli/tools/mini_skel/database/__init__.py

apilogicserver-15.0.32/ApiLogicServer.egg-info/entry_points.txt

@@ -0,0 +1,7 @@
+[console_scripts]
+ApiLogicServer = api_logic_server_cli.cli:start
+als = api_logic_server_cli.cli:start
+gail = api_logic_server_cli.cli:start
+gal = api_logic_server_cli.cli:start
+genai-logic = api_logic_server_cli.cli:start
+gl = api_logic_server_cli.cli:start

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ApiLogicServer
-Version: 15.0.28
+Version: 15.0.32
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://www.genai-logic.com

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/add_cust/add_cust.py

@@ -158,7 +158,7 @@ def add_basic_demo_customizations(project: Project, do_show_messages: bool = Tru
         # log.info(".. curl -X 'POST' 'http://localhost:5656/api/SysMcp/' -H 'accept: application/vnd.api+json' -H 'Content-Type: application/json' -d '{ \"data\": { \"attributes\": {\"request\": \"List the orders date_shipped is null and CreatedOn before 2023-07-14, and send a discount email (subject: '\\''Discount Offer'\\'') to the customer for each one.\"}, \"type\": \"SysMcp\"}}'")
         log.info('')
         log.info(f'Next Steps: activate security')
-        log.info(f'..ApiLogicServer add-auth --db_url=auth')
+        log.info(f'..genai-logic add-auth --db_url=auth')
         if project.is_tutorial == False:
             log.info(".. complete\n")
 
@@ -178,7 +178,7 @@ def add_basic_demo_iteration(project: Project, do_show_messages: bool = True, do
     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(f'..genai-logic rebuild-from-database --db_url=sqlite:///database/db.sqlite')
         log.info(".. complete\n")
 
 
@@ -210,7 +210,7 @@ def add_sample_ai_customizations(project: Project, do_show_messages: bool = True
         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')
+        log.info(f'..genai-logic add-auth --db_url=auth')
         if project.is_tutorial == False:
             log.info(".. complete\n")
 
@@ -230,7 +230,7 @@ def add_sample_ai_iteration(project: Project, do_show_messages: bool = True, do_
     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(f'..genai-logic rebuild-from-database --project_name=./ --db_url=sqlite:///database/db.sqlite')
         log.info(".. complete\n")
 
 

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/api_logic_server.py

@@ -12,10 +12,10 @@ 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.28"  # last public release: 15.00.25 (15.00.12)
+__version__ = "15.00.32"  # last public release: 15.00.25 (15.00.12)
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t06/26/2024 - 15.00.28: Tech Preview: als genai-app w/ sra provider+model+grid_cascadeAdd, imports+, bug [96] \n"\
+    "\t06/29/2024 - 15.00.32: Tech Preview: genai-logic genai-add-app --vibe, bug [96] \n"\
     "\t06/10/2024 - 15.00.12: MCP Security, win fixes for readme, graphics quotes \n"\
     "\t06/08/2024 - 15.00.10: MCP, optional shortening of stacktrace lines, bugfix[92] \n"\
     "\t05/16/2024 - 14.05.00: safrs 3.1.7, running mcp preview \n"\
@@ -946,9 +946,16 @@ class ProjectRun(Project):
                     defaultInterpreterPath = self.api_logic_server_dir_path.parent.parent.parent.joinpath('clean/ApiLogicServer/venv/bin/python')
         self.default_interpreter_path = defaultInterpreterPath
         """ used to compute manager_path """
-        self.manager_path = self.default_interpreter_path.parent.parent.parent
-        log.debug(f'.. ..Manager path: {self.manager_path}')  # eg ApiLogicServer/ApiLogicServer-dev/clean/ApiLogicServer
-        log.debug(f'.. ..Interp path: manager_path / venv/bin/python')
+        self.venv_path = Path(sys.prefix) if is_docker() == False else Path('/home/api_logic_server/api_logic_server_cli')
+        self.manager_path = self.venv_path.parent
+        check_system_genai = self.manager_path.joinpath('system/genai/temp')
+        if not check_system_genai.exists():
+            self.manager_path = (self.venv_path / '../api_logic_server_cli/prototypes/manager').resolve()
+            log.debug(f'.. ..Manager path from dev env - customizations not active')  # eg ...ApiLogicServer-src/api_logic_server_cli/prototypes/manager
+        log.debug(f'.. ..Manager path: {self.manager_path}')  
+        # log.debug(f'.. ..Interp path: {self.manager_path / 'venv/bin/python'}')
+        if sys.prefix == sys.base_prefix:
+            log.warning(f'.. ..Warning - venv not being used: {self.venv_path}')
 
         self.api_logic_server_home = self.api_logic_server_dir_path.parent
 
@@ -1591,6 +1598,14 @@ from database import <project.bind_key>_models
             log.debug("1. Not Deleting Existing Project")
             log.debug("2. Using Existing Project")
             if self.command == "add_db":
+                check_bind_key_exists = 'DATABASE_URI_' + self.bind_key.upper()
+                config_path = self.project_directory_path / 'config/config.py'
+                bind_key_exists = create_utils.does_file_contain(in_file=config_path,
+                                                                 search_for=check_bind_key_exists)
+                if bind_key_exists and self.bind_key != 'authentication':
+                    log.error(f'\nLooks like database already added')
+                    log.error(f'..`{check_bind_key_exists}` found in `config/config.py`\n\n')
+                    sys.exit(1)
                 self.abs_db_url = self.update_config_and_copy_sqlite_db(
                     f".. ..Adding Database [{self.bind_key}] to existing project")
         else:                                                                            # normal path - clone, [overlay nw]

apilogicserver-15.0.32/api_logic_server_cli/api_logic_server_info.yaml

@@ -0,0 +1,3 @@
+last_created_date: June 29, 2025 14:48:38
+last_created_project_name: /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/servers/NW_NoCust
+last_created_version: 15.00.31

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/cli.py

@@ -12,6 +12,8 @@ To add a new arg:
     * update Project.run() 
 
 Main code is api_logic_server.py (PR)
+
+To expand commands: ctx.forward(existing_command))
 '''
 
 from contextlib import closing
@@ -447,7 +449,7 @@ def curl_test(ctx, message):
               help="App directory name")
 @click.option('--admin-app', 'admin_app',
               default='admin',
-              help="Input admin app")
+              help="Input admin app (schema)")
 @click.pass_context
 def app_create(ctx, project_name, app, admin_app):
     """
@@ -778,13 +780,16 @@ def genai_graphics(ctx, using, genai_version: str, replace_with: str):
     pass
     log.info("")
 
-
-
-
-@main.command("genai-app", cls=HideDunderCommand)
+@main.command("genai-add-app", cls=HideDunderCommand)
 @click.option('--app-name', 'app_name',
               default='react_app',
               help="Name of generated app in ui/")
+@click.option('--vibe/--no-vibe',
+              default=True, is_flag=True,
+              help="Show vibe docs")
+@click.option('--retries',
+              default=1,
+              help="lint retries - 1 means none (see setup)")
 @click.option('--schema',
               default='admin.yaml',
               help="Model file in ui/admin/")
@@ -792,9 +797,9 @@ def genai_graphics(ctx, using, genai_version: str, replace_with: str):
               default='gpt-4o',
               help="Eg, gpt-3.5-turbo, gpt-4o")
 @click.pass_context
-def genai_admin_app(ctx, app_name: str, schema: str, genai_version: str):
+def genai_add_app(ctx, app_name: str, vibe: click.BOOL, retries: int, schema: str, genai_version: str):
     """
-        Adds a customizable react app to project
+        Creates a customizable react app in ui/, ready for vibe
     """
     global command
     project_dir = resolve_blank_project_name('')
@@ -817,11 +822,57 @@ def genai_admin_app(ctx, app_name: str, schema: str, genai_version: str):
         log.info(f'... Typical usage - cd into project, use --project_name=. \n')
         exit (1)
     from api_logic_server_cli.genai.genai_admin_app import GenAIAdminApp
-    genai_admin = GenAIAdminApp(project=project, app_name=app_name, schema=schema, genai_version=genai_version)
+    genai_admin = GenAIAdminApp(project=project, app_name=app_name, vibe=vibe, schema=schema, retries=retries, genai_version=genai_version)
+    pass
+    log.info("")
+
+
+@main.command("genai-add-mcp-client", cls=HideDunderCommand)
+@click.option('--admin-app', is_flag=True,
+              default=True,
+              help="Update Admin App")
+@click.pass_context
+def genai_add_mcp_client(ctx, admin_app: click.BOOL):
+    """
+        Adds mcp-client to project: db, logic, admin app
+    """
+    global command
+
+    project_name = resolve_blank_project_name('')
+    log.info("")
+
+    mcp_db_path = get_api_logic_server_path().joinpath("database/mcp.sqlite")
+    assert mcp_db_path.exists(), "Unable to find api_logic_server_cli/database/mcp.sqlite"
+    mcp_uri = fr"sqlite:////{str(mcp_db_path)}"
+    project = PR.ProjectRun(command="add_db", 
+              project_name=project_name, 
+              api_name='api', 
+              db_url=mcp_uri, 
+              bind_key='mcp',
+              bind_key_url_separator=default_bind_key_url_separator
+              )
+    print("MCP DB Added")
+
+    project.project_directory, project.api_name, project.merge_into_prototype = \
+        create_utils.get_project_directory_and_api_name(project)
+    project.project_directory_actual = os.path.abspath(os.getcwd())  # make path absolute, not relative (no /../)
+    project.project_directory_path = Path(project.project_directory_actual)
+    models_py_path = project.project_directory_path.joinpath('database/models.py')
+    project.abs_db_url, project.nw_db_status, project.model_file_name = \
+        create_utils.get_abs_db_url("0. Using Sample DB", project, is_auth=True)
+
+    if not models_py_path.exists():
+        log.info(f'... Error - does not appear to be a project: {str(project.project_directory_path)}')
+        log.info(f'... Typical usage - cd into project, use --project_name=. \n')
+        exit (1)
+    from api_logic_server_cli.genai.genai_mcp import GenMCP
+    genai_mcp = GenMCP(project=project, admin_app=admin_app, api_logic_server_path=get_api_logic_server_path())
     pass
+
     log.info("")
 
 
+
 @main.command("genai-create", cls=HideDunderCommand) 
 @click.option('--project-name', 'project_name',
               default=f'{last_created_project_name}',
@@ -1386,7 +1437,7 @@ def rebuild_from_database(ctx, project_name: str, db_url: str, api_name: str, no
 \b
         ex
 \b
-        ApiLogicServer rebuild-from-database --project_name=~/dev/servers/ApiLogicProject --db_url=nw
+        genai-logic rebuild-from-database --project_name=~/dev/servers/ApiLogicProject --db_url=nw
 
     """
     db_types = ""
@@ -2053,7 +2104,7 @@ def check_ports():
 
 
 def start():               # target of setup.py
-    sys.stdout.write("\nWelcome to API Logic Server " + PR.__version__ + "\n\n")
+    sys.stdout.write("\nWelcome to Genai-Logic " + PR.__version__ + "\n\n")
     hostname, local_ip = check_ports()  #  = socket.gethostname()
     # sys.stdout.write("    SQLAlchemy Database URI help: https://docs.sqlalchemy.org/en/14/core/engines.html\n")
     main(obj={})

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/cli_args_base.py

@@ -1,5 +1,5 @@
 from enum import Enum
-
+from pathlib import Path
 
 class ExtendedEnum(Enum):
     """

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/create_from_model/dbml.py

@@ -210,7 +210,7 @@ class DBMLCreator(object):
         # copy mcp learning from manager (to enable user to extend)
         docs_path = Path(self.mod_gen.project_directory).joinpath('docs')
         docs_path.mkdir(parents=True, exist_ok=True)
-        mcp_learning_src = genai_svcs.get_manager_path(use_env=True).joinpath('system/genai/mcp_learning')
+        mcp_learning_src = genai_svcs.get_manager_path(project=self.mod_gen.project).joinpath('system/genai/mcp_learning')
         mcp_learning_dst = Path(self.mod_gen.project_directory).joinpath('docs/mcp_learning')
         if mcp_learning_dst.exists():
             shutil.rmtree(mcp_learning_dst)

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/create_from_model/ont_create.py

@@ -120,6 +120,11 @@ class OntCreator(object):
             if each_resource["hidden"] == True:
                 continue
             each_entity = self.create_model_entity(each_resource, resources=resources)
+            is_missing = not each_resource_name in resources
+            if is_missing:  # might occur with add-db
+                log.warning(f"\n⚠️ Warning - ont_create() finds admin.yaml resource '{each_resource_name}' - not present in database model")
+                log.warning(f"..Can occur when using multiple databases - update your ontimize app as required")
+                continue
             app_model_out.entities[each_resource_name] = each_entity
 
             app_model_out.entities[each_resource_name].columns = []
@@ -249,7 +254,7 @@ class OntCreator(object):
             if compute_type:
                 is_missing = not each_resource_name in resources
                 if is_missing:  # might occur with add-db, using wrong model
-                    sys.exit(f"Sys Err - ont_create missing resource: {each_resource_name}\n\n")
+                    sys.exit(f"❌ Sys Err - ont_create missing resource: {each_resource_name}\n\n")
                 else:
                     resource = resources[each_resource_name]
                     resource_attributes = resource.attributes

apilogicserver-15.0.32/api_logic_server_cli/fragments/mcp_admin.yml

@@ -0,0 +1,11 @@
+  mcp-SysMcp:
+    attributes:
+    - name: request
+      type: textarea
+    - label: ' id*'
+      name: id
+      search: true
+      sort: true
+      show_when: isInserting == false
+    type: SysMcp
+    user_key: id

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/genai/genai_admin_app.py

@@ -6,7 +6,7 @@ from pathlib import Path
 import importlib
 from api_logic_server_cli.genai.genai_utils import call_chatgpt
 import requests
-import os, time
+import os, time, sys
 import datetime
 import create_from_model.api_logic_server_utils as utils
 import time
@@ -27,6 +27,7 @@ import json
 from pathlib import Path
 from openai import OpenAI
 import yaml
+import subprocess
 import api_logic_server_cli.genai.genai_svcs as genai_svcs
 
 log = logging.getLogger(__name__)
@@ -38,12 +39,15 @@ class JSResponseFormat(BaseModel):  # must match system/genai/prompt_inserts/res
 
 class GenAIAdminApp:
 
-    def __init__(self, project: Project, app_name: str, schema: str, genai_version: str):
+    def __init__(self, project: Project, app_name: str, vibe: bool, schema: str, genai_version: str, retries: int):
         self.start_time = time.time()
         
+        self.project = project
         self.api_version = genai_version
+        self.retries = retries
+
         self.project_root = project.project_directory_path
-        self.app_templates_path = genai_svcs.get_manager_path(use_env=True).joinpath('system/genai/app_templates')
+        self.app_templates_path = genai_svcs.get_manager_path(project=project).joinpath('system/genai/app_templates')
 
         log.info(f'\ngenai_app here..')
         log.info(f'..model: {schema}')
@@ -56,13 +60,18 @@ class GenAIAdminApp:
         self.admin_yaml_path = self.project_root / f"ui/admin/{schema}"
         self.admin_config_prompt_path = self.app_templates_path / f"app_learning/Admin-config-prompt.md"
         self.admin_json_api_model_prompt_path = self.app_templates_path / f"app_learning/Admin-json-api-model-prompt.md"
-        assert self.admin_config_prompt_path.exists(), "sys err - self.admin_config_prompt_path"
-        assert self.admin_json_api_model_prompt_path.exists(), "sys err - self.admin_json_api_model_prompt_path"
+        if not self.admin_config_prompt_path.exists():
+            log.error('\nUnable to find Manager for app_learning/Admin-config-prompt.md')
+            log.error('..Please set env variable APILOGICSERVER_HOME to manager root\n')
+            sys.exit(1)
+        if not self.admin_json_api_model_prompt_path.exists():
+            log.error('\nUnable to find Manager for app_learning/Admin-json-api-model-prompt.md')
+            log.error('..Please set env variable APILOGICSERVER_HOME to manager root\n')
+            sys.exit(1)
 
         self.ui_project_path = self.project_root / f"ui/{app_name}"
         self.ui_src_path = self.ui_project_path / "src"
 
-        self.app_templates_path = genai_svcs.get_manager_path(use_env=True).joinpath('system/genai/app_templates')
         self.react_admin_template_path = self.app_templates_path / 'react-admin-template'
         self.prompts_path = self.app_templates_path / "app_learning"
         # self.admin_app_learning = utils.read_file(self.prompts_path / "Admin-App-Learning-Prompt.md")
@@ -99,6 +108,8 @@ class GenAIAdminApp:
         log.info(f'> cd ui/{app_name}')
         log.info('> npm install')
         log.info('> npm start\n')
+        if vibe:
+            log.info('\n💡 Suggestion: Customize with Vibe: https://apilogicserver.github.io/Docs/Admin-Vibe/#vibe-customization')
 
     def read_standard_imports(self) -> List[str]:
         '''grr
@@ -127,7 +138,6 @@ class GenAIAdminApp:
         def fix_resource(genai_app: GenAIAdminApp, raw_source: str) -> str:
             ''' Remove occasional begin/end code markers <br>
             And horrific override of ChatGPT refusal to generate imports AS DIRECTED!<br>
-            ToDo: lint, and repeat generation if errors detected
             '''
 
             source_lines = raw_source.splitlines()
@@ -140,13 +150,38 @@ class GenAIAdminApp:
                         continue
                     else:
                         break
-                if do_mandatory_imports := True and not imports_done and ' props ' in each_line:
+                if do_mandatory_imports := True and not imports_done and 'props' in each_line:
                     result_lines = list(genai_app.standard_imports)
                     imports_done = True
                 result_lines.append(each_line)              
+            parse_result = True
             # return source_lines as a string
             return "\n".join(result_lines)
 
+        def js_lint_source_code(target_file: Path):
+            # js lint target_file: npx eslint target_file.js
+            # needs: eslint
+            # needs: npm install eslint-plugin-jsdoc
+            # works manually: npx eslint /Users/val/dev/ApiLogicServer/ApiLogicServer-dev/servers/basic_demo/ui/basic_demo_app/src/Customer.js -c .eslintrc.js
+            # failing: Value for 'config' of type 'path::String' required.\nYou're using eslint.config.js
+            config = self.project.api_logic_server_dir_path / 'tools/.eslintrc.js'
+            assert config.exists()
+            try:  
+                result = subprocess.run(
+                    ["npx", "eslint", str(target_file), '-c ' + str(config)[1:]],
+                    capture_output=True,
+                    text=True
+                )
+                if result.returncode == 0:
+                    source_code_fixed = True
+                else:
+                    log.warning(f"ESLint issues in {target_file}:\n{result.stdout}\n{result.stderr}")
+                    source_code_fixed = False
+            except Exception as e:
+                log.warning(f"Could not lint {target_file}: {e}")
+                # If linting fails, assume code is okay to proceed
+                source_code_fixed = True
+            return source_code_fixed
 
         for each_resource_name, each_resource in self.resources.items():
             learning = self.admin_app_resource_learning
@@ -154,20 +189,33 @@ class GenAIAdminApp:
             messages = [
                 {"role": "user", "content": "You are a helpful expert in react and JavaScript"},
                 {"role": "user", "content": learning},
-                # {"role": "user", "content": example_image_content},
-                # {"role": "user", "content": f'Schema:\n{self.schema_yaml}'},
                 {"role": "user", "content": f'Schema:\n{self.schema}'},
                 {"role": "user", "content": f'Generate the full javascript source code for the `{each_resource_name}.js` React Admin file, formatted as a JSResponseFormat'}]
             save_response = self.project_root / f"docs/admin_app/{each_resource_name}"
-            output = genai_svcs.call_chatgpt(messages = messages, 
-                                             api_version=self.api_version,
-                                             using=save_response,
-                                             response_as=JSResponseFormat)
-            response_dict = json.loads(output)
-            target_file = self.ui_src_path / f"{each_resource_name}.js"
-            source_code = fix_resource(self, response_dict['code'])
-            utils.write_file(target_file, source_code)
-            log.info(f"..✅ Wrote: {each_resource_name}.js")
+            retry_number = 0
+            
+            max_retries = 2
+            while retry_number <= self.retries:  # loop until lint succeeds, max retry_number times
+                retry_number += 1
+                output = genai_svcs.call_chatgpt(
+                    messages=messages,
+                    api_version=self.api_version,
+                    using=save_response,
+                    response_as=JSResponseFormat
+                )
+                response_dict = json.loads(output)
+                target_file = self.ui_src_path / f"{each_resource_name}.js"
+                source_code = fix_resource(self, response_dict['code'])
+                utils.write_file(target_file, source_code)
+                source_code_fixed = True
+                if self.retries > 1:  # 1 retry (current , per setup issues) means no lint
+                    source_code_fixed = js_lint_source_code(target_file=target_file)
+                    if source_code_fixed:
+                        break
+            if source_code_fixed:
+                log.info(f"..✅ Wrote: {each_resource_name}.js")
+            else:
+                log.warning(f"..❌ {self.retries} retries did not fix: {each_resource_name}.js")
 
 
     def b_generate_app_js(self):

apilogicserver-15.0.32/api_logic_server_cli/genai/genai_mcp.py

@@ -0,0 +1,43 @@
+import shutil
+from typing import Dict, List
+from api_logic_server_cli.cli_args_project import Project
+import logging
+from pathlib import Path
+import importlib
+import requests
+import os, time
+import datetime
+import json
+from typing import List, Dict
+from pydantic import BaseModel
+import create_from_model.api_logic_server_utils as create_utils
+import json
+
+log = logging.getLogger(__name__)
+
+
+class JSResponseFormat(BaseModel):  # must match system/genai/prompt_inserts/response_format.prompt
+    code : str # generated javascript code (only)
+
+
+class GenMCP:
+
+    def __init__(self, project: Project, admin_app: bool, api_logic_server_path: Path):
+        self.start_time = time.time()
+        
+        self.project_root = project.project_directory_path
+
+        log.info(f'\ngenai_mcp here..')
+
+        shutil.copyfile(api_logic_server_path / 'templates/mcp_client_executor_request.py',
+                        project.project_directory_path / 'logic/logic_discovery/mcp_client_executor_request.py')
+        
+        if admin_app:
+            lines = create_utils.read_file(path = api_logic_server_path / 'fragments/mcp_admin.yml')
+            admin_yaml_path = project.project_directory_path / 'ui/admin/admin.yaml'
+            create_utils.insert_lines_at(lines = lines,
+                                         at = 'settings:',
+                                         file_name = admin_yaml_path)
+            pass
+        pass
+

{apilogicserver-15.0.28 → apilogicserver-15.0.32}/api_logic_server_cli/genai/genai_svcs.py

@@ -966,7 +966,7 @@ def call_chatgpt(messages: List[Dict[str, str]], api_version: str, using: str, r
         log.error(f"\n\nError: ChatGPT call failed\n- please see https://apilogicserver.github.io/Docs/WebGenAI-CLI/#configuratio\n{inst}\n\n")
         sys.exit(1)
 
-def get_manager_path(use_env: bool = False) -> Path:
+def get_manager_path(project: object = None) -> Path:
     """ Checks cwd, parent, and grandparent for system/genai
 
     * Possibly could add cli arg later
@@ -978,46 +978,47 @@ def get_manager_path(use_env: bool = False) -> Path:
         Path: Manager path (contains system/genai)
     """
 
-    if use_env and os.getenv("APILOGICSERVER_HOME") is not None:
-        result_path = Path(os.getenv("APILOGICSERVER_HOME")).joinpath('api_logic_server_cli/prototypes/manager')
+    if project is not None:
+        result_path = project.manager_path
+        check_system_genai = result_path.joinpath('system/genai/temp')    
+        if check_system_genai.exists():
+            return result_path
         return result_path
 
     result_path = Path(os.getcwd())  # normal case - project at manager root
-    check_system_genai = result_path.joinpath('system/genai')    
+    check_system_genai = result_path.joinpath('system/genai/temp')    
     if check_system_genai.exists():
         return result_path
     
     result_path = result_path.parent  # try pwd parent
-    check_system_genai = result_path.joinpath('system/genai')
+    check_system_genai = result_path.joinpath('system/genai/temp')
     if check_system_genai.exists():
         return result_path
     
     result_path = result_path.parent  # try pwd grandparent
-    check_system_genai = result_path.joinpath('system/genai')
+    check_system_genai = result_path.joinpath('system/genai/temp')
     if check_system_genai.exists():
         return result_path
     
     result_path = result_path.parent 
-    check_system_genai = result_path.joinpath('system/genai')
+    check_system_genai = result_path.joinpath('system/genai/temp')
     if check_system_genai.exists():
         return result_path
     
     result_path = result_path.parent  
-    check_system_genai = result_path.joinpath('system/genai')
+    check_system_genai = result_path.joinpath('system/genai/temp')
     if check_system_genai.exists():
         return result_path
     
     result_path = result_path.parent  
-    check_system_genai = result_path.joinpath('system/genai')
+    check_system_genai = result_path.joinpath('system/genai/temp')
     if check_system_genai.exists():
         return result_path
 
     result_path = result_path.parent  # try ancestors - this is for import testing
-    check_system_genai = result_path.joinpath('system/genai')
+    check_system_genai = result_path.joinpath('system/genai/temp')
 
     if not check_system_genai.exists():
-        if use_env:
-            result_path = Path(create_utils.get_api_logic_server_dir()).joinpath('prototypes/manager')
         check_system_genai.exists(), f"Manager Directory not found and APILOGICSERVER_HOME not set: {check_system_genai}"
     return result_path