ApiLogicServer 12.1.0__tar.gz → 12.1.26__tar.gz

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

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

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

@@ -16,7 +16,6 @@ api_logic_server_cli/cli_args_base.py
 api_logic_server_cli/cli_args_project.py
 api_logic_server_cli/extended_builder.py
 api_logic_server_cli/genai.py
-api_logic_server_cli/genaiZ.py
 api_logic_server_cli/genai_logic_builder.py
 api_logic_server_cli/logging.yml
 api_logic_server_cli/manager.py
@@ -657,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
@@ -1100,6 +1099,7 @@ 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
@@ -1120,7 +1120,6 @@ api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/logic_no
 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.response_example_z
 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
@@ -1140,13 +1139,13 @@ api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_d
 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/sqlite_inserts_iterations.prompt
-api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/web_genai copy.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
@@ -1161,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.1.0 → apilogicserver-12.1.26}/PKG-INFO

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

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

@@ -12,9 +12,11 @@ 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.01.00"
+__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"\
@@ -860,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", 
@@ -903,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
@@ -1000,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_"):
@@ -1863,9 +1873,11 @@ from database import <project.bind_key>_models
                     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
     
@@ -1995,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()
 

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.1.0 → 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,12 +582,22 @@ 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).
     """
@@ -596,10 +606,11 @@ def genai(ctx, using, db_url, repaired_response: str, genai_version: str,
     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)
+    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
 
 

{apilogicserver-12.1.0 → 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.1.0 → 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.1.0 → apilogicserver-12.1.26}/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
 

{apilogicserver-12.1.0 → apilogicserver-12.1.26}/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