ApiLogicServer 12.0.4__tar.gz → 12.1.26__tar.gz

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/ApiLogicServer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ApiLogicServer
-Version: 12.0.4
+Version: 12.1.26
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://apilogicserver.github.io/Docs/
@@ -69,6 +69,7 @@ Requires-Dist: translate==3.6.1
 Requires-Dist: libretranslatepy==2.1.1
 Requires-Dist: reportlab==4.2.0
 Requires-Dist: xlsxwriter==3.2.0
+Requires-Dist: openai==1.52.1
 
 [![Downloads](https://pepy.tech/badge/apilogicserver)](https://pepy.tech/project/apilogicserver)
 [![Latest Version](https://img.shields.io/pypi/v/apilogicserver.svg)](https://pypi.python.org/pypi/apilogicserver/)

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/ApiLogicServer.egg-info/SOURCES.txt

@@ -656,11 +656,11 @@ api_logic_server_cli/prototypes/manager/.gitignore
 api_logic_server_cli/prototypes/manager/README.md
 api_logic_server_cli/prototypes/manager/sample_ai.py
 api_logic_server_cli/prototypes/manager/settings.txt
+api_logic_server_cli/prototypes/manager/.vscode/.DS_Store
 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/system/.DS_Store
-api_logic_server_cli/prototypes/manager/system/secrets.txt
 api_logic_server_cli/prototypes/manager/system/style-guide.yaml
 api_logic_server_cli/prototypes/manager/system/app_model_editor/.gitignore
 api_logic_server_cli/prototypes/manager/system/app_model_editor/api_logic_server_run.py
@@ -1099,8 +1099,12 @@ api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/requi
 api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv-linux.sh
 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/create_db_models_inserts/create_db_models_create_db.py
+api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_imports.py
 api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_prefix.py
 api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_prefix_iteration.py
+api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_test_data.py
 api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/logic_discovery_prefix.py
 api_logic_server_cli/prototypes/manager/system/genai/examples/.DS_Store
 api_logic_server_cli/prototypes/manager/system/genai/examples/airport/airport.prompt
@@ -1111,12 +1115,12 @@ api_logic_server_cli/prototypes/manager/system/genai/examples/cmdb/cmdb_002.prom
 api_logic_server_cli/prototypes/manager/system/genai/examples/cmdb/zcmdb_001.prompt_tp
 api_logic_server_cli/prototypes/manager/system/genai/examples/elections/elections.prompt
 api_logic_server_cli/prototypes/manager/system/genai/examples/elections/elections.response_example
-api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept_explicit.prompt
-api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept_implicit_fails.prompt
+api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept.prompt
 api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/logic_notes.md
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/create_db_models.py
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.prompt
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_informal.prompt
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/.DS_Store
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/create_db_models.py
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/db.dbml
@@ -1126,12 +1130,22 @@ api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_d
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/genai_demo_003.response
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/genai_demo_004.prompt
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/genai_demo_conversation_005.response-example
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_000.response
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_001.prompt
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_002.prompt
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_003.response
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_004.prompt
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_005.response_example
 api_logic_server_cli/prototypes/manager/system/genai/examples/postgres/genai_demo_pg.prompt
 api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt
 api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.promptZ
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/.DS_Store
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/logic_inserts.prompt
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/pre_post.prompt
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/response_format.prompt
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/web_genai.prompt
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/zsqlite_inserts_iterations.prompt
 api_logic_server_cli/prototypes/manager/system/genai/reference/chatgpt_original.txt
 api_logic_server_cli/prototypes/manager/system/genai/reference/declare_logic.py
 api_logic_server_cli/prototypes/manager/system/genai/reference/genai_demo_logic.txt
@@ -1146,6 +1160,15 @@ api_logic_server_cli/prototypes/manager/system/genai/reference/errors/model_bad_
 api_logic_server_cli/prototypes/manager/system/genai/reference/errors/model_float.py
 api_logic_server_cli/prototypes/manager/system/genai/reference/errors/model_unclosed_paren.py
 api_logic_server_cli/prototypes/manager/system/genai/reference/errors/modelz-bad-decimal.py
+api_logic_server_cli/prototypes/manager/system/genai/retry/readme.md
+api_logic_server_cli/prototypes/manager/system/genai/retry/retry.response
+api_logic_server_cli/prototypes/manager/system/genai/retry/conv/create_db_models.py
+api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_000.response
+api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_001.prompt
+api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_002.prompt
+api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_003.prompt
+api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_004.response
+api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_005.response
 api_logic_server_cli/prototypes/manager/system/genai/temp/$notes.txt
 api_logic_server_cli/prototypes/manager/system/genai/temp/chatgpt_original.response
 api_logic_server_cli/prototypes/manager/system/genai/temp/chatgpt_retry.response

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/ApiLogicServer.egg-info/requires.txt

@@ -46,3 +46,4 @@ translate==3.6.1
 libretranslatepy==2.1.1
 reportlab==4.2.0
 xlsxwriter==3.2.0
+openai==1.52.1

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ApiLogicServer
-Version: 12.0.4
+Version: 12.1.26
 Author-email: Val Huber <apilogicserver@gmail.com>
 License: BSD-3-Clause
 Project-URL: Homepage, https://apilogicserver.github.io/Docs/
@@ -69,6 +69,7 @@ Requires-Dist: translate==3.6.1
 Requires-Dist: libretranslatepy==2.1.1
 Requires-Dist: reportlab==4.2.0
 Requires-Dist: xlsxwriter==3.2.0
+Requires-Dist: openai==1.52.1
 
 [![Downloads](https://pepy.tech/badge/apilogicserver)](https://pepy.tech/project/apilogicserver)
 [![Latest Version](https://img.shields.io/pypi/v/apilogicserver.svg)](https://pypi.python.org/pypi/apilogicserver/)

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/api_logic_server_cli/api_logic_server.py

@@ -12,9 +12,12 @@ ApiLogicServer CLI: given a database url, create [and run] customizable ApiLogic
 Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
 '''
 
-__version__ = "12.00.04"
+__version__ = "12.01.26"
 recent_changes = \
     f'\n\nRecent Changes:\n' +\
+    "\t11/18/2024 - 12.01.26: genai: sqlite inserts, dataRows[], LogicBankOff (LBX), Readme Cleanup \n"\
+    "\t11/10/2024 - 12.01.22: genai: rule training, bug fix admin app Boolean fields, model via env \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"\
@@ -859,6 +862,9 @@ class ProjectRun(Project):
                      genai_version: str="",
                      genai_prompt_inserts: str="",
                      genai_use_relns: bool=True,
+                     genai_tables: int=0,
+                     genai_temperature: float=0.7,
+                     genai_test_data_rows: int=0,
                      host: str='localhost', 
                      port: str='5656', 
                      swagger_host: str="localhost", 
@@ -902,6 +908,9 @@ class ProjectRun(Project):
         self.genai_prompt_inserts = genai_prompt_inserts
         self.genai_use_relns = genai_use_relns
         """ Use relationships in create_db_models (internal) """
+        self.genai_tables = genai_tables
+        self.genai_test_data_rows = genai_test_data_rows
+        self.genai_temperature = genai_temperature
         self.user_db_url = db_url  # retained for debug
         self.bind_key = bind_key
         self.api_name = api_name
@@ -999,7 +1008,9 @@ class ProjectRun(Project):
             uri_info.print_uri_info()
             exit(0)
 
-        print_options = True
+        print_options = False
+        if log.getEffectiveLevel() >= logging.DEBUG:
+            print_options = True
         if print_options:
             creating_or_updating = "Creating"
             if self.command.startswith("add_"):
@@ -1839,203 +1850,6 @@ from database import <project.bind_key>_models
         log.info(f"Tutorial project successfully created.  Next steps:\n")
         log.info(f'  Open the tutorial project in your VSCode: code Tutorial\n')
 
-
-    def create_project_Z(self):
-        """
-        Creates logic-enabled Python safrs api/admin project, options for execution
-
-        main driver
-
-        :returns: none
-        """
-
-        # SQLALCHEMY_DATABASE_URI = "sqlite:///" + path.join(basedir, "database/db.sqlite")+ '?check_same_thread=False'
-        self.print_options()
-
-        log.debug(f"\nApiLogicServer {__version__} Creation Log:")
-
-        self.project_directory, self.api_name, self.merge_into_prototype = \
-            create_utils.get_project_directory_and_api_name(self)
-        self.project_directory_actual = os.path.abspath(self.project_directory)  # make path absolute, not relative (no /../)
-        self.project_directory_path = Path(self.project_directory_actual)
-        self.project_name_last_node = Path(self.project_directory_path).name  # for prototype, project_name='.'
-
-        # TODO - add this?  self.project_name = self.project_directory_path.parent.name if not self.project_directory_path.is_dir() else self.project_directory_path.name
-
-        gen_ai = None
-        if self.genai_using != "":
-            from genai import GenAI
-            gen_ai = GenAI(self)
-
-        if self.from_model != "" or self.genai_using != "":
-            try:
-                create_db_from_model.create_db(self)
-            except Exception as e:
-                if hasattr(self, 'gen_ai_save_dir'):
-                    log.error(f"Error creating database from model: {e}")
-                    with open(f"{self.gen_ai_save_dir.joinpath('create_db_models_failed.txt')}", "w") as log_file:
-                        log_file.write(f"Error creating database from model: {e}")
-                raise(e)
-
-        if self.add_auth_in_progress:
-            self.models_path_dir = 'database/database_discovery'
-            self.abs_db_url, self.nw_db_status, self.model_file_name = \
-                create_utils.get_abs_db_url("0. Using Sample DB", self, is_auth=True)    
-        else:  # normal path
-            self.abs_db_url, self.nw_db_status, self.model_file_name = create_utils.get_abs_db_url("0. Using Sample DB", self)
-            if self.nw_db_status in ["nw", "nw+"]:
-                self.auth_provider_type = 'sql'  # nw+ defaulting
-
-
-        if self.extended_builder == "$":
-            self.extended_builder = abspath(f'{self.api_logic_server_dir_path}/extended_builder.py')
-            log.debug(f'0. Using default extended_builder: {self.extended_builder}')
-
-        if self.extended_builder == "model_migrator":
-            self.extended_builder = abspath(f'{self.api_logic_server_dir_path}/model_migrator/model_migrator_start.py')
-            log.debug(f'0. Using model migrator: {self.extended_builder}')
-
-        if self.command.startswith("rebuild") or self.command == "add_db":
-            log.debug("1. Not Deleting Existing Project")
-            log.debug("2. Using Existing Project")
-            if self.command == "add_db":
-                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]
-            self.abs_db_url = create_project_and_overlay_prototypes(self, f"2. Create Project:")
-        log.debug(f'.. ..project_directory_actual: {self.project_directory_actual}')
-
-        log.debug(f'3. Create/verify database/{self.model_file_name}, then use that to create api/ and ui/ models')
-        model_creation_services = ModelCreationServices(project = self,   # Create database/models.py from db
-            project_directory=self.project_directory)
-        # ext builder can read alter the models.py
-        fix_database_models(self.project_directory, self.db_types, self.nw_db_status, self.is_tutorial)
-
-        ''' ****** MAJOR! creates api/expose_api_models, ui/admin & basic_web_app (Microservice Autmation) **** '''
-        invoke_creators(model_creation_services)
-
-        if self.extended_builder is not None and self.extended_builder != "":
-            log.debug(f'4. Invoke extended_builder: {self.extended_builder}, ({self.db_url}, {self.project_directory})')
-            invoke_extended_builder(self.extended_builder, self.abs_db_url, self.project_directory, model_creation_services)
-
-        final_project_fixup("4. Final project fixup", self)
-        if gen_ai is not None:
-            gen_ai.insert_logic_into_created_project()
-
-        if False and (self.auth_provider_type != '' or self.nw_db_status in ["nw", "nw+"]) and self.command != "add_db":
-            self.add_auth("\nApiLogicProject customizable project created.  \nAdding Security:")
-
-            auto_ontimize = True  # debug note - verify the model is user db, not the authdb...
-            """ disabled for now - api emulation replaces nw customizations, so BLT fails """
-            if auto_ontimize and self.add_auth_in_progress == False:
-                log.debug(" d.  Create Ontimize from models")
-                from api_logic_server_cli.create_from_model.ont_create import OntCreator
-                ont_creator = OntCreator(project = model_creation_services.project)
-                ont_creator.create_application(show_messages=False)
-
-                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'))
-
-                from api_logic_server_cli.create_from_model.ont_build import OntBuilder
-                ont_creator = OntBuilder(project = model_creation_services.project)
-                ont_creator.build_application(show_messages=False)
-
-        if (self.nw_db_status in ["nw+"]):
-            self.add_auth(f"\nApiLogicProject customizable project (for northwind) created.  \nAdding Security to {self.project_name_last_node}:")
-
-        if not self.add_auth_in_progress:
-            if self.command not in ["add_db", "add_auth", "add-auth", "add-db", "rebuild-from-database", "rebuild-from-model"]:
-                log.debug(" d.  Create Ontimize from models")
-                from api_logic_server_cli.create_from_model.ont_create import OntCreator
-                ont_creator = OntCreator(project = model_creation_services.project)
-                ont_creator.create_application(show_messages=False)
-
-            if self.command in ["rebuild-from-database", "rebuild-from-model"]:
-                app_list = create_utils.get_ontimize_apps(self.project_directory_path)
-                for app in app_list:
-                    from create_from_model import ont_build
-                    from api_logic_server_cli.create_from_model.ont_create import OntCreator
-                    build = ont_build.OntBuilder(self, app)
-                    log.debug(f" d.  Create Ontimize app_model_merge.yml from models for project: {build.project}")
-                    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():
-                # 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'))
-
-            from api_logic_server_cli.create_from_model.ont_build import OntBuilder
-            ont_creator = OntBuilder(project = model_creation_services.project)
-            ont_creator.build_application(show_messages=False)
-
-        # can be cli, or env variable: echo $APILOGICSERVER_OPEN_WITH
-        if self.open_with != "" and 'create' == self.command:  # open project with open_with (vscode, charm, atom) -- NOT for docker!!
-            start_open_with(project = self)
-            
-        if self.command.startswith("add_"):
-            pass  # keep silent for add-db, add-auth...
-        elif self.is_tutorial:
-            log.debug(f"\nTutorial created.  Next steps:\n")
-            log.debug(f'  Establish your Python environment - see https://apilogicserver.github.io/Docs/IDE-Execute/#execute-prebuilt-launch-configurations\n')
-        else:
-            disp_url = self.db_url
-            if disp_url == "":
-                disp_url = "nw"
-            log.debug(f"\n\nCustomizable project {self.project_name} created from database {disp_url}.  Next steps:\n")
-            if self.multi_api:
-                log.debug(f'Server already running.  To Access: Configuration > Load > //localhost:5656/{self.api_name}')
-            else:
-                log.debug("\nRun API Logic Server:")
-                if os.getenv('CODESPACES'):
-                    # log.debug(f'  Add port 5656, with Public visibility') - automated in .devcontainer.json
-                    log.info(f'  Execute using Launch Configuration "ApiLogicServer"')
-                else:
-                    log.debug(f'  cd {self.project_name};  python api_logic_server_run.py')
-        if self.command.startswith("add_"):
-            pass  # keep silent for add-db, add-auth...
-        elif self.is_tutorial:
-            log.debug(f"  Proceed as described in the readme\n")
-        else:
-            if (is_docker()):
-                os.rename(self.project_directory_path.joinpath('.devcontainer-option'),
-                          self.project_directory_path.joinpath('.devcontainer'))
-                if os.getenv('CODESPACES'):
-                    log.info(f'\nCustomize right here, in Browser/VSCode - just as you would locally')
-                    log.info(f'Save customized project to GitHub')
-                else:
-                    log.info(f'\nProject created.  Next steps:\n')
-
-                    log.info(f'  $ ApiLogicServer run      # Run created API and Admin App, or\n')
-
-                    log.info(f'  Customize using IDE on local machine:')
-                    docker_project_name = self.project_name
-                    if self.project_name.startswith('/localhost/'):
-                        docker_project_name = self.project_name[11:]
-                    else:
-                        docker_project_name = f'<local machine directory for: {self.project_name}>'
-                    log.info(f'    exit     # exit the Docker container ')
-                    log.info(f'    code {docker_project_name}  # e.g., open VSCode on created project\n')
-            else:
-                log.info(f'\nProject created at: {str(self.project_directory_path)}\n')
-
-                # log.info(f'  $ ApiLogicServer run                # Run created API and Admin App, or\n')
-
-                if self.open_with == "":
-                    log.info(f'  $ charm | code {self.project_name}      # Customize / debug in your IDE\n\n')
-
-                log.debug(f'  Establish your Python environment - see https://apilogicserver.github.io/Docs/IDE-Execute/#execute-prebuilt-launch-configurations\n')
-
-        if self.run:  # synchronous run of server - does not return
-            run_file = os.path.abspath(f'{resolve_home(self.project_name)}/api_logic_server_run.py')
-            run_file = '"' + run_file + '"'  # spaces in file names - with windows
-            run_args = ""
-            if self.command == "create-and-run":
-                run_args = "--create_and_run=True"
-            create_utils.run_command(f'python {run_file} {run_args}', msg="\nStarting created API Logic Project")
-
     def directory_setup(self):
         """ get project_directory, api names, project paths and project name """
         self.project_directory, self.api_name, self.merge_into_prototype = \
@@ -2055,11 +1869,15 @@ from database import <project.bind_key>_models
         if self.from_model != "" or self.genai_using != "":
             try:
                 create_db_from_model.create_db(self)
+                if gen_ai.post_error != '':  # eg, response contains table definitions
+                    raise Exception(gen_ai.post_error)
             except Exception as e:
                 if hasattr(self, 'gen_ai_save_dir'):
+                    failed_msg = str(datetime.datetime.now().strftime("%B %d, %Y %H:%M:%S"))
+                    failed_msg += f"\n{e}"
                     log.error(f"Error creating database from model: {e}")
                     with open(f"{self.gen_ai_save_dir.joinpath('create_db_models_failed.txt')}", "w") as log_file:
-                        log_file.write(f"Error creating database from model: {e}")
+                        log_file.write(f"Error creating database from model: {failed_msg}")
                 raise(e)
         return gen_ai
     
@@ -2149,8 +1967,9 @@ from database import <project.bind_key>_models
             log.debug(f"  Proceed as described in the readme\n")
         else:
             if (is_docker()):
-                os.rename(self.project_directory_path.joinpath('.devcontainer-option'),
-                          self.project_directory_path.joinpath('.devcontainer'))
+                dc_option = self.project_directory_path.joinpath('.devcontainer-option')
+                if os.path.exists(dc_option):
+                    os.rename(dc_option, self.project_directory_path.joinpath('.devcontainer'))
                 if os.getenv('CODESPACES'):
                     log.info(f'\nCustomize right here, in Browser/VSCode - just as you would locally')
                     log.info(f'Save customized project to GitHub')
@@ -2188,8 +2007,8 @@ from database import <project.bind_key>_models
         """
 
         self.print_options()
-        self.directory_setup()
         gen_ai = self.create_database_from_genai_or_model()                                 # sometimes we create db before creating project
+        self.directory_setup()
         self.abs_db_url, self.nw_db_status, self.model_file_name = self.call_abs_db_url()   # nw set here, dbname, db abbrevs
         self.set_standard_external_builder()
 
@@ -2288,4 +2107,4 @@ def key_module_map():
     ProjectRun.update_config_and_copy_sqlite_db()           # adds db (model, multi-db binds, api, app) to curr project
     ProjectRun.add_auth()                                   # update config (not via multi-db support)
     final_project_fixup('done', project=None)               # update config, etc
-    ProjectRun.tutorial()                                   # creates basic, nw, nw + cust
+    ProjectRun.tutorial()                                   # creates basic, nw, nw + cust

apilogicserver-12.1.26/api_logic_server_cli/api_logic_server_info.yaml

@@ -0,0 +1,3 @@
+last_created_date: November 18, 2024 05:49:03
+last_created_project_name: genai_demo
+last_created_version: 12.01.26

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/api_logic_server_cli/cli.py

@@ -561,8 +561,8 @@ def tutorial(ctx, create):
               default=f'sqlite',
               help="SQLAlchemy Database URL\n")
 @click.option('--genai-version', 'genai_version',
-              default='gpt-4o',
-              help="Eg, gpt-3.5-turbo, gpt-4o")
+              default='',
+              help="Eg, '', gpt-3.5-turbo, gpt-4o")
 @click.option('--repaired-response', 'repaired_response',
               default='',
               help="Retry from [repaired] response file")
@@ -582,95 +582,36 @@ def tutorial(ctx, create):
               default=True,
               help="Internal (create_db w/relns)")
 @click.option('--project-name', 'project_name',
-              default=f'',
+              default=f'_genai_default',
               help="Project location")
+@click.option('--tables', 
+              default=4,
+              help="Number of tables")
+@click.option('--test-data-rows', 'test_data_rows', 
+              default=4,
+              help="Number of test data rows")
+@click.option('--temperature',  
+              default=0.7,
+              help="Number of test data rows")
 @click.pass_context
-def genai(ctx, using, db_url, repaired_response: str, genai_version: str, 
+def genai(ctx, using, db_url, repaired_response: str, 
+          genai_version: str, temperature: float,
           retries: int, opt_locking: str, prompt_inserts: str, quote: click.BOOL,
-          use_relns: click.BOOL, project_name: str):
+          use_relns: click.BOOL, project_name: str, tables: int, test_data_rows: int):
     """
         Creates new customizable project (overwrites).
     """
     global command
-    if use_genai_module:
-        import genai as genai_svcs
-        defaulted_using = using
-        if defaulted_using == 'genai_demo': # default to genai_demo.prompt
-            defaulted_using = 'system/genai/examples/genai_demo/genai_demo.prompt'
-        genai_svcs.genai(using=defaulted_using, db_url=db_url, repaired_response=repaired_response, 
-                    genai_version=genai_version, retries=retries, opt_locking=opt_locking, 
-                    prompt_inserts=prompt_inserts, quote=quote, use_relns=use_relns,
-                    project_name=project_name)
-        pass
-    else:  # old code - delete
-        db_types = ""
-        # if no .prompt extension on using, then that's the prompt (no file)
-        # if using.endswith('.prompt'):
-        #    using = using.replace('.prompt','')
-        project_name = using  # this is the prompt file (or actual prompt)
-        if project_name.startswith("'"):
-            project_name = project_name.replace("'", "")
-        if using.endswith('.prompt') or Path(using).is_dir():       # regardless of repaired_response,
-            project_name = Path(using).stem                         # the project name is the <cwd>/last node of using
-        else:
-            project_name  = project_name.replace(' ', '_')
-        project_name  = project_name.replace(' ', '_')
-
-        try_number = 1
-        genai_use_relns = use_relns
-        """ if 'unable to determine join condition', we retry this with False """
-        if repaired_response != "":
-            try_number = retries  # if not calling GenAI, no need to retry:
-        # TODO or 0, right?
-        if retries < 0:  # for debug: catch exceptions at point of failure
-            PR.ProjectRun(command="create", genai_version=genai_version, 
-                        genai_using=using,                    # the prompt file, or the actual prompt
-                        repaired_response=repaired_response,    # retry from [repaired] response file
-                        opt_locking=opt_locking,
-                        genai_prompt_inserts=prompt_inserts,
-                        genai_use_relns=genai_use_relns,
-                        quote=quote,
-                        project_name=project_name, db_url=db_url)
-            log.info(f"GENAI successful")  
-        else:
-            while try_number <= retries:
-                try:
-                    failed = False
-                    PR.ProjectRun(command="create", genai_version=genai_version, 
-                                genai_using=using,                   # the prompt file, or the actual prompt
-                                repaired_response=repaired_response,    # retry from [repaired] response file
-                                opt_locking=opt_locking,
-                                genai_prompt_inserts=prompt_inserts,
-                                genai_use_relns=genai_use_relns,
-                                quote=quote,
-                                project_name=project_name, db_url=db_url)
-                    if do_force_failure := False:
-                        if try_number < 3:
-                            raise Exception("Forced Failure for Internal Testing")
-                    break  # success - exit the loop
-                except Exception as e:
-                    log.error(f"\n\nGenai failed With Error: {e}")
-                    # Could not determine join condition
-                    manager_dir = Path(os.getcwd())  # rename save dir (append retry) for diagnosis
-                    to_dir_save_dir = Path(manager_dir).joinpath(f'system/genai/temp/{project_name}')
-                    to_dir_save_dir_retry = Path(manager_dir).joinpath(f'system/genai/temp/{project_name}_{try_number}')
-                    if repaired_response != "":
-                        to_dir_save_dir_retry = Path(manager_dir).joinpath(f'system/genai/temp/{project_name}_retry')  
-                    if to_dir_save_dir_retry.exists():
-                        shutil.rmtree(to_dir_save_dir_retry)
-                    to_dir_save_dir.rename(to_dir_save_dir_retry) 
-                    failed = True
-                    if genai_use_relns and "Could not determine join condition" in str(e):
-                        genai_use_relns = False  # just for db_models (fk's still there!!)
-                        log.error(f"\n   Failed with join condition - retrying without relns\n")
-                        failed = False
-                    else:
-                        try_number += 1
-                pass # retry (retries times)
-            if failed:
-                log.error(f"\n\nGenai Failed (Retries: {retries})") 
-                exit(1) 
-            log.info(f"GENAI successful on try {try_number}")  
+    import genai as genai_svcs
+    defaulted_using = using
+    if defaulted_using == 'genai_demo': # default to genai_demo.prompt
+        defaulted_using = 'system/genai/examples/genai_demo/genai_demo.prompt'
+    genai_svcs.genai_cli_retry(using=defaulted_using, db_url=db_url, repaired_response=repaired_response, 
+                genai_version=genai_version, temperature=temperature,
+                retries=retries, opt_locking=opt_locking, 
+                prompt_inserts=prompt_inserts, quote=quote, use_relns=use_relns, 
+                project_name=project_name, tables=tables, test_data_rows=test_data_rows)
+    pass
 
 
 @main.command("genai-logic", cls=HideDunderCommand)

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/api_logic_server_cli/cli_args_base.py

@@ -47,6 +47,8 @@ class CliArgsBase():
         """ Fixed response; None => ChatGPT API, else defaults system/genai/reference/chatgpt_retry.txt """
         self.genai_version = None
         """ Version number for ChatGPT API, eg gpt-3.5-turbo, gpt-4o (expensive) """
+        self.genai_temperature : float = None
+        """ ChatGPT API, 0-1, default 0.7 """
         self.genai_use_relns = None
         """ Use relationships in create_db_models """
         self.bind_key = None # type: str

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/api_logic_server_cli/cli_args_project.py

@@ -2,7 +2,7 @@ import api_logic_server_cli.create_from_model.uri_info as uri_info
 from api_logic_server_cli.cli_args_base import CliArgsBase
 from os.path import abspath
 from pathlib import Path
-import os
+import os, logging
 
 class Project(CliArgsBase):  # extends user-visible args with internal values, extended by ProjectRun
     
@@ -64,6 +64,12 @@ class Project(CliArgsBase):  # extends user-visible args with internal values, e
         self.genai_logic = None  # type list[str]
         """ genai logic to be inserted into logic/declare_logic.py """
 
+        self.genai_tables = 0
+        """ number of tables (aks complexity) for genai """
+
+        self.genai_test_data_rows = 0
+        """ number of test data rows for genai """
+
         self.genai_prompt_inserts : str = None
         """ text to be inserted into prompt 
             - "" means infer from db_url (e.g. system/genai/prompt_inserts/sqlite_inserts.prompt)
@@ -77,8 +83,8 @@ class Project(CliArgsBase):  # extends user-visible args with internal values, e
             uri_info.print_uri_info()
             exit(0)
 
-        print_options = True
-        if print_options:
+        log = logging.getLogger('api_logic_server_cli.api_logic_server')
+        if log.getEffectiveLevel() >= logging.DEBUG:
             print(f'\n\nCreating ApiLogicServer with options:')
             print(f'  --db_url={self.db_url}')
             print(f'  --bind_key={self.bind_key}') 

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/api_logic_server_cli/create_from_model/meta_model.py

@@ -42,7 +42,7 @@ class ResourceAttribute():
             if lower_name.endswith(each_non_fav):
                 self.non_favorite = True
                 break
-        if each_attribute.server_default is not None:
+        if each_attribute.server_default is not None and hasattr(each_attribute.server_default.arg, 'text'):
             self.default = each_attribute.server_default.arg.text
         resource.attributes.append(self)
 

{apilogicserver-12.0.4 → apilogicserver-12.1.26}/api_logic_server_cli/create_from_model/model_creation_services.py

@@ -825,6 +825,8 @@ class ModelCreationServices(object):
                     "Ab" not in str(each_class_def_str)):
                 resource_name = each_cls_member[0]
                 resource_class = each_cls_member[1]
+                if not hasattr(resource_class, '__tablename__'):
+                    continue
                 table_name = resource_class.__tablename__  # FIXME _s_collection_name
                 if table_name in ["CategoryTableNameTest", "Employee"]:
                     debug_str = "Excellent breakpoint"
@@ -917,4 +919,4 @@ class ModelCreationServices(object):
             project_directory = self.project_directory)
         model_imported, models_name = self.dynamic_import_model(msg)
         return_resource_list = self.resource_list_from_safrs_metadata(models_name=models_name)  # whether created or used, build resource_list
-        return return_resource_list
+        return return_resource_list