ApiLogicServer 14.2.2__tar.gz → 14.2.20__tar.gz

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/ApiLogicServer.egg-info/PKG-INFO

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

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/ApiLogicServer.egg-info/SOURCES.txt

@@ -477,6 +477,7 @@ 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_logic_builder.py
 api_logic_server_cli/genai/genai_svcs.py

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/PKG-INFO

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

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/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__ = "14.02.02"
+__version__ = "14.02.20"
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
-    "\t01/13/2024 - 14.02.01: webg logic, support for import/merge of WebGenAI projects into Dev projects, rebuilt test data \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"\
@@ -296,7 +296,7 @@ def create_project_and_overlay_prototypes(project: 'ProjectRun', msg: str) -> st
 
         from_dir = project.from_git
         api_logic_server_dir_str = str(get_api_logic_server_dir())  # todo not req'd
-        if project.from_git.startswith("https://"):
+        if project.from_git.startswith("https://"):  # warning - very old code, not tested in a long time
             cmd = 'git clone --quiet https://github.com/valhuber/ApiLogicServerProto.git ' + project.project_directory
             cmd = f'git clone --quiet {project.from_gitfrom_git} {project.project_directory}'
             result = create_utils.run_command(cmd, msg=msg)  # "2. Create Project")
@@ -409,8 +409,15 @@ def create_project_and_overlay_prototypes(project: 'ProjectRun', msg: str) -> st
         if project.db_url == 'sqlite:///sample_ai.sqlite':  # work-around - VSCode run config arg parsing (dbviz STRESS)
             create_utils.copy_md(project = project, from_doc_file = "Sample-AI.md", to_project_file='Sample-AI.md')
 
-        if project.project_name == 'genai_demo':
-            create_utils.copy_md(project = project, from_doc_file = "Sample-Genai.md", to_project_file='Sample-Genai.md')
+        if project.is_genai_demo:  # overwrite logic & db, add readme
+            genai_demo_dir = (Path(api_logic_server_dir_str)).joinpath('prototypes/genai_demo')
+            # recursive_overwrite(genai_demo_dir, project.project_directory)
+            # log.info('.. ..Copy in genai_demo customizations')
+            # exit(1)
+            # readme now opens automatically, so use that...
+            shutil.move(project.project_directory_path.joinpath('readme.md'), 
+                        project.project_directory_path.joinpath('readme_standard.md'))   
+            create_utils.copy_md(project = project, from_doc_file = "Sample-Genai.md", to_project_file='readme.md')
 
         if "postgres" or "mysql" in project.db_url:
             fixup_devops_for_postgres_mysql(project)
@@ -464,12 +471,14 @@ def create_project_and_overlay_prototypes(project: 'ProjectRun', msg: str) -> st
             # strip sqlite://// from sqlite:////Users/val/dev/ApiLogicServer/api_logic_server_cli/database/nw-gold.sqlite
             db_loc = project.abs_db_url.replace("sqlite:///", "")
             target_db_loc_actual = str(project.project_directory_path.joinpath('database/db.sqlite'))
-            copyfile(db_loc, target_db_loc_actual)
+            if True:  # project.is_genai_demo == False:  genai_demo using db from genai, not prototypes
+                copyfile(db_loc, target_db_loc_actual)
             config_url = str(project.api_logic_server_dir_path)
             # build this:  SQLALCHEMY_DATABASE_URI = sqlite:///{str(project_abs_dir.joinpath('database/db.sqlite'))}
             # into  this:  SQLALCHEMY_DATABASE_URI = f"replace_db_url"
             replace_db_url_value = "sqlite:///{str(project_abs_dir.joinpath('database/db.sqlite'))}"
             replace_db_url_value = f"sqlite:///../database/db.sqlite"  # relative for portable sqlite
+            replace_db_url_value = "sqlite:///{db_path}"
 
             if os.name == "nt":  # windows
                 target_db_loc_actual = get_windows_path_with_slashes(target_db_loc_actual)
@@ -1123,7 +1132,7 @@ class ProjectRun(Project):
         """
 
         imports = """
-# FIXME remove from api import <project.bind_key>_expose_api_models
+# TODO remove from api import <project.bind_key>_expose_api_models
 from database import <project.bind_key>_models
         """
 
@@ -1538,7 +1547,26 @@ from database import <project.bind_key>_models
     def add_genai_customizations(self, do_show_messages: bool = True, do_security: bool = True):
         """ Add customizations to genai (default creation)
 
-        1. Deep copy prototypes/genai_demo (adds logic and security)
+        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:
         """
@@ -1713,7 +1741,7 @@ from database import <project.bind_key>_models
             log.info(".. complete\n")
 
 
-    def genai_get_logic(self, prompt: str) -> list[str]:  # FIXME drop old code
+    def genai_get_logic(self, prompt: str) -> list[str]:  # TODO drop old code
         """ Get logic from ChatGPT prompt
         Args:
         """
@@ -1838,12 +1866,18 @@ from database import <project.bind_key>_models
 
     def create_database_from_genai_or_model(self) -> 'GenAI':
         gen_ai = None
+
+        self.is_genai_demo = False
+        if os.getenv('APILOGICPROJECT_IS_GENAI_DEMO') is not None or self.project_name == 'genai_demo':
+            self.is_genai_demo = True
+
+
         if self.genai_using != "":
             from api_logic_server_cli.genai.genai import GenAI
             gen_ai = GenAI(self)  
             gen_ai.create_db_models()  # create_db_models.py used to create database to build project
 
-        if self.from_model != "" or self.genai_using != "":
+        if (self.from_model != "" or self.genai_using != ""):  # and not self.is_genai_demo:  # use create_db_from_model.py
             try:
                 create_db_from_model.create_db(self)
                 # halt execution if genai already discovered errors, eg, response contains table definitions

apilogicserver-14.2.20/api_logic_server_cli/api_logic_server_info.yaml

@@ -0,0 +1,3 @@
+last_created_date: January 16, 2025 20:48:28
+last_created_project_name: genai_demo_informal
+last_created_version: 14.02.11

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/cli.py

@@ -563,8 +563,7 @@ def tutorial(ctx, create):
 @main.command("genai", cls=HideDunderCommand)
 @click.option('--using',
               default=f'genai_demo',
-              prompt="File or dir (determines project name)",
-              help="File or dir (determines project name)")
+              help="File or dir of prompt")
 @click.option('--db-url', 'db_url',
               default=f'sqlite',
               help="SQLAlchemy Database URL\n")
@@ -614,6 +613,9 @@ def genai(ctx, using, db_url, repaired_response: str,
     """
     global command
     import api_logic_server_cli.genai.genai as genai_svcs
+    if using is None and repaired_response is None:
+        log.error("Error - must provide --using or --repaired-response")
+        exit(1) 
     defaulted_using = using
     if defaulted_using == 'genai_demo': # default to genai_demo.prompt
         defaulted_using = 'system/genai/examples/genai_demo/genai_demo.prompt'
@@ -1546,12 +1548,16 @@ def add_cust(ctx, bind_key_url_separator: str, api_name: str, project_name: str)
     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):
         project.add_nw_customizations(do_security=False)
         log.info("\nNext step - add authentication:\n  $ ApiLogicServer add-auth --db_url=auth\n\n")
-    elif project_name == 'genai_demo' and create_utils.does_file_contain(search_for="Customer", in_file=models_py_path):
+    elif project_is_genai_demo and create_utils.does_file_contain(search_for="Customer", in_file=models_py_path):
         project.add_genai_customizations(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')

apilogicserver-14.2.20/api_logic_server_cli/genai/client.py

@@ -0,0 +1,24 @@
+import os
+from openai import AzureOpenAI
+from openai import OpenAI
+
+
+def get_ai_client():
+    api_key = os.getenv("APILOGICSERVER_CHATGPT_APIKEY")
+
+    if not api_key:
+        raise Exception("APILOGICSERVER_CHATGPT_APIKEY environment variable not set")
+
+    azure_endpoint = os.getenv("APILOGICSERVER_CHATGPT_AZURE_ENDPOINT")
+    if azure_endpoint:
+        api_version = os.getenv("APILOGICSERVER_CHATGPT_AZURE_API_VERSION", "2024-10-21")
+        client = AzureOpenAI(
+            azure_endpoint = azure_endpoint, 
+            api_key=api_key,  
+            api_version=api_version)
+        print(f"Using Azure OpenAI, endpoint: {azure_endpoint}, version: {api_version}")
+    else:
+        client = OpenAI(api_key=api_key)
+    
+    return client
+

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/genai/genai.py

@@ -493,19 +493,18 @@ class GenAI(object):
                     log.debug(f'.. removed hallucination: {each_line}')
             return return_line
 
-        logic_enabled = True
         logic_file = self.project.project_directory_path.joinpath('logic/declare_logic.py')
-        in_logic = False
-        translated_logic = "\n    # Logic from GenAI: (or, use your IDE w/ code completion)\n"
-        translated_logic += genai_svcs.get_code(self.response_dict.rules)
-        if self.logic_enabled == False:
+        if True:  # self.project.is_genai_demo == False: translate logic
             translated_logic = "\n    # Logic from GenAI: (or, use your IDE w/ code completion)\n"
-            translated_logic += "\n    # LogicBank Disabled \n"  
-        translated_logic += "\n    # End Logic from GenAI\n\n"
-        utils.insert_lines_at(lines=translated_logic, 
-                              file_name=logic_file, 
-                              at='discover_logic()', 
-                              after=True)
+            translated_logic += genai_svcs.get_code(self.response_dict.rules)
+            if self.logic_enabled == False:
+                translated_logic = "\n    # Logic from GenAI: (or, use your IDE w/ code completion)\n"
+                translated_logic += "\n    # LogicBank Disabled \n"  
+            translated_logic += "\n    # End Logic from GenAI\n\n"
+            utils.insert_lines_at(lines=translated_logic, 
+                                file_name=logic_file, 
+                                at='discover_logic()', 
+                                after=True)
 
         readme_lines = \
             f'\n**GenAI Microservice Automation:** after verifying, apply logic:\n' +\
@@ -535,12 +534,20 @@ class GenAI(object):
 
             response_file = self.project.project_directory_path.joinpath("docs/response.json")
             if Path(self.project.genai_using).stem == 'logic_suggestions':
-                response_file = self.project.project_directory_path.joinpath("docs/logic_suggestions/response.json")  
-            genai_svcs.rebuild_test_data_for_project(
-                use_project_path = self.project.project_directory_path, 
-                project = self.project,
-                use_existing_response = True,
-                response = response_file)
+                response_file = self.project.project_directory_path.joinpath("docs/logic_suggestions/response.json")
+            elif not response_file.exists():
+                if Path(self.project.genai_repaired_response).is_file():
+                    shutil.copyfile(self.project.genai_repaired_response, response_file)
+            is_genai_demo = False
+            if os.getenv('APILOGICPROJECT_IS_GENAI_DEMO') is not None or self.project.project_name == 'genai_demo':
+                self.project.project_directory_path.joinpath('docs/project_is_genai_demo.txt').touch()
+                # and DON'T create test data (db.sqlite already set up in recurive copy)
+            else:  # normal path
+                genai_svcs.rebuild_test_data_for_project(
+                    use_project_path = self.project.project_directory_path, 
+                    project = self.project,
+                    use_existing_response = True,
+                    response = response_file)
 
         except:  # intentional try/catch/bury - it's just docs, so don't fail
             import traceback

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/genai/genai_logic_builder.py

@@ -298,30 +298,13 @@ class GenAILogic(object):
         suggest_or_get_code_prompt = get_suggest_or_get_code_prompt()
         self.messages.append({"role": "user", "content": suggest_or_get_code_prompt})
 
-
-        if use_svs := True:
-            response_dict_str = call_chatgpt(
-                messages=self.messages,
-                api_version=self.project.genai_version,
-                using=self.project.project_directory_path.joinpath('docs/logic_suggestions')
-            )
-            response_dict = json.loads(response_dict_str)
-        else:
-            debug_key = os.getenv("APILOGICSERVER_CHATGPT_APIKEY")
-            client = OpenAI(api_key=os.getenv("APILOGICSERVER_CHATGPT_APIKEY"))
-            model = os.getenv("APILOGICSERVER_CHATGPT_MODEL_SUGGESTION")
-            if model is None or model == "*":  # system default chatgpt model
-                model = "gpt-4o-2024-08-06"
-                model = 'gpt-4o-mini'  # reduces from 40 -> 7 secs
-            # 0 = 'you are', 1 = the classes, 2 = rule training
-            # FIXME - use gena0_svcs.call_chatgpt()
-            completion = client.beta.chat.completions.parse(
-                messages=self.messages, response_format=WGResult,
-                model=model  # for own model, use "ft:gpt-4o-2024-08-06:personal:logicbank:ARY904vS" 
-            )
-            
-            data = completion.choices[0].message.content
-            response_dict = json.loads(data)
+        response_dict_str = call_chatgpt(
+            messages=self.messages,
+            api_version=self.project.genai_version,
+            using=self.project.project_directory_path.joinpath('docs/logic_suggestions')
+        )
+        response_dict = json.loads(response_dict_str)
+        
         self.response_dict = DotMap(response_dict)
 
         # starting creating files in docs/logic_suggestions, starting with response

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/genai/genai_svcs.py

@@ -21,6 +21,8 @@ import ast
 import astor
 import yaml
 
+from genai.client import get_ai_client
+
 K_LogicBankOff = "LBX"
 ''' LBX Disable Logic (for demos) '''
 K_LogicBankTraining = "Here is the simplified API for LogicBank"
@@ -65,7 +67,7 @@ try:  # this is just for WebGenAI
     # Add the file handler to the logger
     log.addHandler(file_handler)
     log.setLevel(logging.DEBUG)
-    log.info(f"Svcs log file: /tmp/genai_svcs.log")
+    
 except Exception as exc:
     pass # this is just for WebGenAI, ok to ignore error
 
@@ -759,11 +761,9 @@ def call_chatgpt(messages: List[Dict[str, str]], api_version: str, using: str) -
         using (str): str to save response.json (relative to cwd)
     Returns:
         str: response from ChatGPT
-    """    
+    """
     try:
         start_time = time.time()
-        db_key = os.getenv("APILOGICSERVER_CHATGPT_APIKEY")
-        client = OpenAI(api_key=os.getenv("APILOGICSERVER_CHATGPT_APIKEY"))
         model = api_version
         if model == "":  # default from CLI is '', meaning fall back to env variable or system default...
             model = os.getenv("APILOGICSERVER_CHATGPT_MODEL")
@@ -772,9 +772,10 @@ def call_chatgpt(messages: List[Dict[str, str]], api_version: str, using: str) -
         with open(Path(using).joinpath('request.json'), "w") as request_file:  # save for debug
             json.dump(messages, request_file, indent=4)
         log.info(f'.. saved request: {using}/request.json')
-
+        client = get_ai_client()
         completion = client.beta.chat.completions.parse(
-            messages=messages, response_format=WGResult,
+            messages=messages,
+            response_format=WGResult,
             # temperature=self.project.genai_temperature,  values .1 and .7 made students / charges fail
             model=model  # for own model, use "ft:gpt-4o-2024-08-06:personal:logicbank:ARY904vS" 
         )

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/genai/genai_utils.py

@@ -98,7 +98,6 @@ class GenAIUtils:
         api_version = f"{self.genai_version}"
         start_time = time.time()
         db_key = os.getenv("APILOGICSERVER_CHATGPT_APIKEY", "")
-        client = OpenAI(api_key=db_key)
         model = api_version if api_version else os.getenv("APILOGICSERVER_CHATGPT_MODEL", "gpt-4o-2024-08-06")
         self.resolved_model = model
 

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/prototypes/base/config/config.py

@@ -46,6 +46,7 @@ class OptLocking(ExtendedEnum):
 
 basedir = path.abspath(path.dirname(__file__))
 load_dotenv(path.join(basedir, "default.env"))
+project_path = Path(__file__).parent.parent
 app_logger = logging.getLogger('api_logic_server_app')
 
 def is_docker() -> bool:
@@ -89,11 +90,10 @@ class Config:
     FLASK_APP = environ.get("FLASK_APP")
     FLASK_ENV = environ.get("FLASK_ENV")
     DEBUG = environ.get("DEBUG")
-            
-    running_at = Path(__file__)
-    project_abs_dir = running_at.parent.absolute()
+
 
     # Database
+    db_path = str(project_path.joinpath('database/db.sqlite'))
     SQLALCHEMY_DATABASE_URI : typing.Optional[str] = f"replace_db_url"
     # override SQLALCHEMY_DATABASE_URI here as required
 
@@ -143,9 +143,8 @@ class Config:
         app_logger.info(f'config.py - security disabled')
 
     # Begin Multi-Database URLs (from ApiLogicServer add-db...)
-
-
-    SQLALCHEMY_DATABASE_URI_AUTHENTICATION = 'sqlite:///../database/authentication_db.sqlite'
+    auth_db_path = str(project_path.joinpath('database/authentication_db.sqlite'))
+    SQLALCHEMY_DATABASE_URI_AUTHENTICATION = f'sqlite:///{auth_db_path}'
     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'
@@ -153,6 +152,11 @@ class Config:
         SQLALCHEMY_DATABASE_URI_AUTHENTICATION = os.getenv('SQLALCHEMY_DATABASE_URI_AUTHENTICATION')  # type: ignore # type: str
         app_logger.debug(f'.. overridden from env variable: SQLALCHEMY_DATABASE_URI_AUTHENTICATION')
 
+    # Single Page App (SPA) Landing Page Database
+    landing_db_path = project_path.joinpath('database/db_spa.sqlite')
+    SQLALCHEMY_DATABASE_URI_LANDING = f'sqlite:///{landing_db_path}'
+    if landing_db_path.exists():
+        app_logger.info(f'config.py - SQLALCHEMY_DATABASE_URI_LANDING: {SQLALCHEMY_DATABASE_URI_LANDING}\n')
 
     # End Multi-Database URLs (from ApiLogicServer add-db...)
 

{apilogicserver-14.2.2/api_logic_server_cli/tools/mini_skel → apilogicserver-14.2.20/api_logic_server_cli/prototypes/base}/database/bind_dbs.py

@@ -14,7 +14,8 @@ def bind_dbs(flask_app):
     """ called by api_logic_server_run to open/bind each additional database"""
 
     flask_app.config.update(SQLALCHEMY_BINDS = {
-		'authentication': flask_app.config['SQLALCHEMY_DATABASE_URI_AUTHENTICATION']
+      'authentication': flask_app.config['SQLALCHEMY_DATABASE_URI_AUTHENTICATION'],
+      'landing_page' : flask_app.config['SQLALCHEMY_DATABASE_URI_LANDING'],
     })  # make multiple databases available to SQLAlchemy
 
     return

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/prototypes/base/logic/logic_discovery/auto_discovery.py

@@ -23,6 +23,9 @@ def discover_logic():
                     spec.loader.exec_module(each_logic_file)  # runs "bare" module code (e.g., initialization)
                     each_logic_file.declare_logic()  # invoke create function
 
+    if False and Path(__file__).parent.parent.parent.joinpath("docs/project_is_genai_demo.txt").exists():
+        return  # for genai_demo, logic is in logic/declare_logic.py (so ignore logic_discovery)
+    
     wg_logic_path = Path(__file__).parent.parent.joinpath("wg_rules")
     for root, dirs, files in os.walk(wg_logic_path):
         for file in files:

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/prototypes/genai_demo/database/models.py

@@ -16,9 +16,9 @@ from sqlalchemy.ext.declarative import declarative_base
 # mypy: ignore-errors
 ########################################################################################################################
 
-from safrs import SAFRSBase
+from database.system.SAFRSBaseX import SAFRSBaseX, TestBase
 from flask_login import UserMixin
-import safrs, flask_sqlalchemy
+import safrs, flask_sqlalchemy, os
 from safrs import jsonapi_attr
 from flask_sqlalchemy import SQLAlchemy
 from sqlalchemy.orm import relationship
@@ -35,12 +35,16 @@ metadata = Base.metadata
 
 from sqlalchemy.dialects.sqlite import *
 
+if os.getenv('APILOGICPROJECT_NO_FLASK') is None or os.getenv('APILOGICPROJECT_NO_FLASK') == 'None':
+    Base = SAFRSBaseX   # enables rules to be used outside of Flask, e.g., test data loading
+else:
+    Base = TestBase     # ensure proper types, so rules work for data loading
+    print('*** Models.py Using TestBase ***')
 
 
-class Customer(SAFRSBase, Base):
+class Customer(Base):
     __tablename__ = 'Customers'
     _s_collection_name = 'Customer'  # type: ignore
-    __bind_key__ = 'None'
 
     CustomerID = Column(Integer, primary_key=True)
     CustomerName = Column(Text, nullable=False)
@@ -54,23 +58,10 @@ class Customer(SAFRSBase, Base):
     # child relationships (access children)
     OrderList : Mapped[List["Order"]] = relationship(back_populates="Customer")
 
-    @jsonapi_attr
-    def _check_sum_(self):  # type: ignore [no-redef]
-        return None if isinstance(self, flask_sqlalchemy.model.DefaultMeta) \
-            else self._check_sum_property if hasattr(self,"_check_sum_property") \
-                else None  # property does not exist during initialization
 
-    @_check_sum_.setter
-    def _check_sum_(self, value):  # type: ignore [no-redef]
-        self._check_sum_property = value
-
-    S_CheckSum = _check_sum_
-
-
-class Product(SAFRSBase, Base):
+class Product(Base):
     __tablename__ = 'Products'
     _s_collection_name = 'Product'  # type: ignore
-    __bind_key__ = 'None'
 
     ProductID = Column(Integer, primary_key=True)
     ProductName = Column(Text, nullable=False)
@@ -82,23 +73,11 @@ class Product(SAFRSBase, Base):
     # child relationships (access children)
     ItemList : Mapped[List["Item"]] = relationship(back_populates="Product")
 
-    @jsonapi_attr
-    def _check_sum_(self):  # type: ignore [no-redef]
-        return None if isinstance(self, flask_sqlalchemy.model.DefaultMeta) \
-            else self._check_sum_property if hasattr(self,"_check_sum_property") \
-                else None  # property does not exist during initialization
-
-    @_check_sum_.setter
-    def _check_sum_(self, value):  # type: ignore [no-redef]
-        self._check_sum_property = value
-
-    S_CheckSum = _check_sum_
 
 
-class Order(SAFRSBase, Base):
+class Order(Base):
     __tablename__ = 'Orders'
     _s_collection_name = 'Order'  # type: ignore
-    __bind_key__ = 'None'
 
     OrderID = Column(Integer, primary_key=True)
     CustomerID = Column(ForeignKey('Customers.CustomerID'))
@@ -113,23 +92,11 @@ class Order(SAFRSBase, Base):
     # child relationships (access children)
     ItemList : Mapped[List["Item"]] = relationship(back_populates="Order")
 
-    @jsonapi_attr
-    def _check_sum_(self):  # type: ignore [no-redef]
-        return None if isinstance(self, flask_sqlalchemy.model.DefaultMeta) \
-            else self._check_sum_property if hasattr(self,"_check_sum_property") \
-                else None  # property does not exist during initialization
 
-    @_check_sum_.setter
-    def _check_sum_(self, value):  # type: ignore [no-redef]
-        self._check_sum_property = value
 
-    S_CheckSum = _check_sum_
-
-
-class Item(SAFRSBase, Base):
+class Item(Base):
     __tablename__ = 'Items'
     _s_collection_name = 'Item'  # type: ignore
-    __bind_key__ = 'None'
 
     ItemID = Column(Integer, primary_key=True)
     OrderID = Column(ForeignKey('Orders.OrderID'))
@@ -144,14 +111,3 @@ class Item(SAFRSBase, Base):
 
     # child relationships (access children)
 
-    @jsonapi_attr
-    def _check_sum_(self):  # type: ignore [no-redef]
-        return None if isinstance(self, flask_sqlalchemy.model.DefaultMeta) \
-            else self._check_sum_property if hasattr(self,"_check_sum_property") \
-                else None  # property does not exist during initialization
-
-    @_check_sum_.setter
-    def _check_sum_(self, value):  # type: ignore [no-redef]
-        self._check_sum_property = value
-
-    S_CheckSum = _check_sum_

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py

@@ -47,7 +47,7 @@ def declare_logic():
     Rule.copy(derive=Item.UnitPrice, from_parent=Product.UnitPrice)
     Rule.constraint(validate=Customer,
                     as_condition=lambda row: row.Balance <= row.CreditLimit,
-                    error_msg="Customer balance ({row.balance}) exceeds credit limit ({row.credit_limit})")
+                    error_msg="Customer balance ({row.Balance}) exceeds credit limit ({row.CreditLimit})")
 
     # End Logic from GenAI
 

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/prototypes/manager/.vscode/launch.json

@@ -5,7 +5,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "1. GENAI - Create a project from one of the system/genai/examples",
+            "name": "1. GENAI - Create genai_logic demo project",
             "type": "debugpy",
             "request": "launch",
             "program": "${workspaceFolder}/venv/lib/python3.12/site-packages/api_logic_server_cli/cli.py",
@@ -18,8 +18,8 @@
                 "APILOGICSERVER_DEBUG": "False",
                 "OPT_LOCKING": "optional"},
             "justMyCode": false,
-            "args": [ "genai", "--retries=-1",
-                "--using=${workspaceFolder}/system/genai/examples/${input:inputGenaiProjectName}"],
+            "args": [ "genai", "--retries=-1", "--project-name=genai_demo",
+                "--using=${workspaceFolder}/system/genai/examples/genai_demo/genai_demo_informal.prompt"],
             "console": "internalConsole",
             "internalConsoleOptions": "openOnSessionStart"
         },

{apilogicserver-14.2.2 → apilogicserver-14.2.20}/api_logic_server_cli/prototypes/manager/README.md

@@ -101,7 +101,7 @@ Then, try your own databases [(db-url examples here)](https://apilogicserver.git
 1. If you have signed up, this will create and open a project called `genai_demo` from `genai_demo.prompt` (available in left Explorer pane):
 
 ```bash
-als genai --using=system/genai/examples/genai_demo/genai_demo.prompt
+als genai --using=system/genai/examples/genai_demo/genai_demo.prompt --project-name=genai_demo
 ```
 
 
@@ -109,7 +109,7 @@ als genai --using=system/genai/examples/genai_demo/genai_demo.prompt
 
 
 ```bash
-als genai --using=genai_demo.prompt --repaired-response=system/genai/examples/genai_demo/genai_demo_iteration/005_create_db_models.response-example
+als genai --repaired-response=system/genai/examples/genai_demo/genai_demo_iteration/005_create_db_models.response-example --project-name=genai_demo
 ```
 
 Verify it's operating properly:
@@ -140,7 +140,7 @@ Verify it's operating properly:
 
 2. Your created project is opened in your IDE, ready to execute and customize.  
 
-    a. Review `Sample-Genai.md`, Explore Customizations.
+    a. Review `Tutorial.md`, Explore Customizations.
 
 ![GenAI Automation](system/images/genai.png)
 
@@ -274,7 +274,7 @@ After starting the [Manager](https://apilogicserver.github.io/Docs/Manager):
 
 ```bash title="0. Create Project Requiring Fixup"
 # 0. Create a project requiring fixup
-als genai --using=genai_demo.prompt --repaired-response=system/genai/examples/genai_demo/genai_demo_fixup_required.json --project-name=genai_demo_fixup_required
+als genai --repaired-response=system/genai/examples/genai_demo/genai_demo_fixup_required.json --project-name=genai_demo_fixup_required
 ```
 
 If you run this project, you will observe that it fails with:
@@ -298,7 +298,7 @@ Finally, use the created [fixup files](genai_demo_fixup_required/docs/fixup/) to
 ```bash title="2. Rebuild the project from the fixup response data model"
 # 2. Rebuild the project from the fixup response data model
 cd ../
-als genai --using=genai_demo.prompt --repaired-response=genai_demo_fixup_required/docs/fixup/response_fixup.json --project-name=fixed_project
+als genai --repaired-response=genai_demo_fixup_required/docs/fixup/response_fixup.json --project-name=fixed_project
 ```
     
  
@@ -390,7 +390,7 @@ als create --project-name=genai_demo --from-model=system/genai/temp/create_db_mo
 Or, correct the chatgpt response, and
 
 ```bash
-als genai --using=genai_demo.prompt --repaired-response=system/genai/examples/genai_demo/genai_demo.response_example --project-name=genai_demo
+als genai --repaired-response=system/genai/examples/genai_demo/genai_demo.response_example --project-name=genai_demo
 ```
 
 We have seen failures such as:
@@ -583,7 +583,7 @@ als genai --using=system/genai/examples/genai_demo/genai_demo.prompt
 
 # Or, Microservice Automation from Saved Response
 # Admin App, API, Project
-als genai --using=genai_demo.prompt --repaired-response=system/genai/temp/chatgpt_retry.response
+als genai --repaired-response=system/genai/temp/chatgpt_retry.response
 
 # Logic and Security
 #   - see logic (logic/declare_logic.py, logic/cocktail-napkin.jpg);  add an Order and Item