ApiLogicServer 12.0.4__py3-none-any.whl → 12.1.26__py3-none-any.whl

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)

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

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}') 

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)
 

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

api_logic_server_cli/create_from_model/ont_create.py

@@ -78,7 +78,7 @@ class OntCreator(object):
         self.project.use_model = "."
         model_creation_services = ModelCreationServices(project = self.project,   # load models (user db, not auth)
             project_directory=self.project.project_directory)
-        resources : Dict[str, Resource] = model_creation_services.resource_list
+        resources: Dict[str, Resource] = {name: resource for name, resource in model_creation_services.resource_list.items() if not getattr(resource, 'hidden', False)}
 
         admin_app = Path(self.project.project_directory_path).joinpath(f'ui/admin/{self.admin_app}.yaml')
         if not os.path.exists(admin_app):
@@ -113,6 +113,8 @@ class OntCreator(object):
         app_model_out.entities = DotMap()
         app_model_out.settings.style_guide = self.style_guide()  # TODO - stub code, remove later
         for each_resource_name, each_resource in admin_model_in.resources.items():
+            if each_resource["hidden"] == True:
+                continue
             each_entity = self.create_model_entity(each_resource, resources=resources)
             app_model_out.entities[each_resource_name] = each_entity
 

api_logic_server_cli/create_from_model/ui_admin_creator.py

@@ -1,3 +1,5 @@
+# this builds the Admin App by creating ui/admin/admin.yaml
+
 import logging
 from re import X
 import shutil
@@ -6,7 +8,6 @@ import os
 import pathlib
 from pathlib import Path
 from typing import NewType, List, Tuple, Dict
-
 import sqlalchemy
 import yaml
 from sqlalchemy import MetaData, false
@@ -14,7 +15,6 @@ import datetime
 import api_logic_server_cli.create_from_model.model_creation_services as create_from_model
 import api_logic_server_cli.create_from_model.api_logic_server_utils as create_utils
 from dotmap import DotMap
-
 from api_logic_server_cli.create_from_model.meta_model import Resource
 
 log = logging.getLogger('api_logic_server_cli.create_from_model.ui_admin_creator')
@@ -264,12 +264,14 @@ class AdminCreator(object):
         admin_attribute.name = str(attribute_name)
         if required:
             admin_attribute.required = True
-        if attribute_name == "UnitPrice":
+        if attribute_name == "Ready":
             debug_str = "Good breakpoint location"
         if isinstance(resource_attribute, str) == True:
             raise Exception(f'System Error - expected resource_attribute, got string: {resource_attribute}')
         if not isinstance(resource_attribute, str):
-            if str(resource_attribute.type).upper() in ["DECIMAL", "DATE", "DATETIME"]:
+            if resource_attribute.db_type in ["BOOLEAN"]:
+                admin_attribute.type = "Boolean"
+            elif str(resource_attribute.type).upper() in ["DECIMAL", "DATE", "DATETIME"]:
                 admin_attribute.type = resource_attribute.type
             if resource_attribute.type in ["NTEXT", "IMAGE"]:
                 admin_attribute = None