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

{ApiLogicServer-12.0.4.dist-info → ApiLogicServer-12.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ApiLogicServer
-Version: 12.0.4
+Version: 12.1.0
 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.dist-info → ApiLogicServer-12.1.0.dist-info}/RECORD

@@ -1,11 +1,12 @@
 api_logic_server_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-api_logic_server_cli/api_logic_server.py,sha256=IoIZmOnWmk8fWIDtDuDEWe7Gl3GIG_LUulYsD8vbYME,123341
-api_logic_server_cli/api_logic_server_info.yaml,sha256=Y15ORoUXWDJDQnC83EEZtZQgiN6pBNd6rOmccdUlN7M,114
-api_logic_server_cli/cli.py,sha256=3_lhrilQ4OSfCxBNvzf4ar1jNxWqY35v1owmYhy8MR0,80181
+api_logic_server_cli/api_logic_server.py,sha256=m_OIs-Wl9nkykvQrBeZyq609ZO98_k6QObC0VlgrzCI,112059
+api_logic_server_cli/api_logic_server_info.yaml,sha256=Wdu6WhrAzb8VX0Am7_EFw2Oi9LAQ60Mrcq3PBI8SnHs,112
+api_logic_server_cli/cli.py,sha256=vdVV-L6PFIv7ph3RpBeRLcfhbWE4ItLV2LJlTH_6muM,75997
 api_logic_server_cli/cli_args_base.py,sha256=uRlYQWlI5JMkaH9RqZo_X7ow0u-WDm14H2ntYMKycSk,3082
 api_logic_server_cli/cli_args_project.py,sha256=TxOdz0n5g_3aWiVwkVofnfYj0XhG35rfIdU6wRmCdys,4384
 api_logic_server_cli/extended_builder.py,sha256=EhtXGAt_RrDR2tCtgvc2U82we7fr-F6pP-e6HS6dQWQ,13867
-api_logic_server_cli/genai.py,sha256=REKWGhhXx5wtSalZPQ5NgjVMtcidmyPyo5FSyyELvB0,39013
+api_logic_server_cli/genai.py,sha256=IuWk785LF_6_GQErn3cHcWtfKsNNS3_P6pfchyjSutA,44556
+api_logic_server_cli/genaiZ.py,sha256=gITl0yYiXZvZEcEh1koXWx3ocRJX5HSWusHttzUWMkE,41143
 api_logic_server_cli/genai_logic_builder.py,sha256=JQXLKIdLOpiyYFUAWowBS-NEKs_4lgP_8OLn5OXl2rU,12170
 api_logic_server_cli/logging.yml,sha256=69lnsJCgp0p8GQfLldEO-0gQOU9OusXbyg8iSdR3lTM,1418
 api_logic_server_cli/manager.py,sha256=ZJ4lz_i8XUDfLks4aorYQRw7AWt70Eg75TZuLkYBbh4,9645
@@ -15,8 +16,8 @@ api_logic_server_cli/create_from_model/api_expose_api_models_creator.py,sha256=x
 api_logic_server_cli/create_from_model/api_logic_server_utils.py,sha256=aivxL8rj2DNWvCZRRu5MS1cAIUpvMF4dplFg7Bv8EU8,24153
 api_logic_server_cli/create_from_model/create_db_from_model.py,sha256=CvXVH-DEl8AgwkTLS1OzrNLb0LPrkK5TQB35eDVb0pY,4328
 api_logic_server_cli/create_from_model/dbml.py,sha256=IV9eG1bib10zTPFYyJNeFPveE0gNrt-NoPZCQHF74BM,8695
-api_logic_server_cli/create_from_model/meta_model.py,sha256=FPkkyyuTvl3DI3s1pR-upB8nG6aIYu14V5p5Nz50W4o,5782
-api_logic_server_cli/create_from_model/model_creation_services.py,sha256=Z9V4--eJBtSC9NEgd02zXCagcbefwwVDwrIaQhFCVC0,41341
+api_logic_server_cli/create_from_model/meta_model.py,sha256=ERf7tSgnSJSeRMVyggkdg-lvORQZSbfK0KMpL63qSEY,5837
+api_logic_server_cli/create_from_model/model_creation_services.py,sha256=QE7UcVDn0J1k6HL2iqe0_UW4d3wL_HVPJVpSLOmuh30,41436
 api_logic_server_cli/create_from_model/ont_build.py,sha256=8Ki426F2OWT7xaFNBahHrmYMYVYnm25xOAwPirjyo3E,57050
 api_logic_server_cli/create_from_model/ont_create.py,sha256=WJTG-dwL_Gmea0fnPOb9TloEu5Ia68xGa42p34dRQSs,13043
 api_logic_server_cli/create_from_model/ui_admin_creator.py,sha256=cMUXbgOSGgIT-PFnANI1e4ki7F-WppKD0xRGqTNHjMM,37907
@@ -25,9 +26,9 @@ api_logic_server_cli/create_from_model/__pycache__/__init__.cpython-312.pyc,sha2
 api_logic_server_cli/create_from_model/__pycache__/api_expose_api_models_creator.cpython-312.pyc,sha256=XOsCJ_UNn7i3nuwemrIm6saX29RpB09xtmlctdG1Vf0,5254
 api_logic_server_cli/create_from_model/__pycache__/api_logic_server_utils.cpython-312.pyc,sha256=ykMoitCeQ8oZ16qFy6by8wDXdp3hXEgh8mLvtOdoEXk,24332
 api_logic_server_cli/create_from_model/__pycache__/create_db_from_model.cpython-312.pyc,sha256=QHIoTeGYwjqhaG3AI_EhfvbgoitlLm2ySoDJ42YhQbM,4752
-api_logic_server_cli/create_from_model/__pycache__/dbml.cpython-312.pyc,sha256=D7kFovjPy-xudPwD-jBTYHO6qOux_gRNrTtueZLJxek,8952
-api_logic_server_cli/create_from_model/__pycache__/meta_model.cpython-312.pyc,sha256=Z2OtDIWNNGN9uQmDC2gKr9Gq-xRGf9bDvp8JsoXiRb8,7033
-api_logic_server_cli/create_from_model/__pycache__/model_creation_services.cpython-312.pyc,sha256=lKruntZridpk5f6SIGr5CU0H3aHKqNWZ7EAwxRvpmxA,36544
+api_logic_server_cli/create_from_model/__pycache__/dbml.cpython-312.pyc,sha256=E4oR4UFDjW7Z7SCfo-USc7vUVfwQFma1O_qldAT7L7c,8952
+api_logic_server_cli/create_from_model/__pycache__/meta_model.cpython-312.pyc,sha256=Ylu_fwSC4BHfTr4xzXCfyY6ChXu9seDx_LphGw_Tl6Y,7133
+api_logic_server_cli/create_from_model/__pycache__/model_creation_services.cpython-312.pyc,sha256=tsTMN6FZzN1hk3af3f4qDmuh9ZvQnoFlLYRu0xl7SYM,36599
 api_logic_server_cli/create_from_model/__pycache__/ont_build.cpython-312.pyc,sha256=KQ_3RTEzR2NqxvnztS4DK2i1VFxSgxlN8t69JPzzcTo,65910
 api_logic_server_cli/create_from_model/__pycache__/ont_create.cpython-312.pyc,sha256=odljk1f0Bt_8hPQ6SkzQv_Vprgx-iwZv7KqmIFhaEbI,13319
 api_logic_server_cli/create_from_model/__pycache__/ui_admin_creator.cpython-312.pyc,sha256=xdod-4Qgnv0xlCPORNF1Ox4EAPnlnafPS2iUgMvsP88,38462
@@ -638,16 +639,16 @@ api_logic_server_cli/prototypes/genai_demo/database/chatgpt/__pycache__/sample_a
 api_logic_server_cli/prototypes/genai_demo/integration/row_dict_maps/OrderB2B.py,sha256=TXhhw54Iyp2mf629rDT8elawOc2q-VNfUaumYBaRAto,1236
 api_logic_server_cli/prototypes/genai_demo/integration/row_dict_maps/OrderShipping.py,sha256=4wM45eRNkDNl7vcX689VSR7BgdKvae5hD26L8XZYGfc,1197
 api_logic_server_cli/prototypes/genai_demo/logic/cocktail-napkin.jpg,sha256=5rNSy6wvcWSHPJQZqkf2DHs19QLWiyqMBNwxGqjstZU,133075
-api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py,sha256=LfyswZLiKLulo3CzI7aQAcC90ytYxakbmaSWRb1kLdg,4814
+api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py,sha256=gmlvp9D8RRo40FA3zdKvMjKGm6lvJTqltr9BPs9DQHc,4895
 api_logic_server_cli/prototypes/genai_demo/security/declare_security.py,sha256=L3AL1bgdqIWQxdkJZcFVDOQ0XRpmeLAKqwlAYChFWKo,2108
 api_logic_server_cli/prototypes/genai_demo/ui/admin/admin.yaml,sha256=9rSLJXDr5n3ILHQAU2XDjdGzql9ZyHXmwCYAmaGcH-g,2288
 api_logic_server_cli/prototypes/manager/.DS_Store,sha256=S3TCvGESaKKyncVM3C2DvN5CYMZKSgW4Q80kmrxWyqI,6148
 api_logic_server_cli/prototypes/manager/.gitignore,sha256=xfAjNQHokbo6GuN1ghx-eml8tQIzwUczLC_YVzElndI,195
-api_logic_server_cli/prototypes/manager/README.md,sha256=ycsXB38bmD8EIpkL2txdpILT85LR6QvwGwcNEJ6iQAQ,12044
+api_logic_server_cli/prototypes/manager/README.md,sha256=dOsCdfw3CKi_vS3RFQn1LX5eo_5pz4lxld2KN8_0wnw,12468
 api_logic_server_cli/prototypes/manager/sample_ai.py,sha256=08OhtojM6m79UgbBKx_E5N7Cnpvs9142cWIl9M245PA,1915
 api_logic_server_cli/prototypes/manager/settings.txt,sha256=_jjL30jomIMxG21edDfrXYRT9Zfgr_0EdUWvcEUOnFQ,368
 api_logic_server_cli/prototypes/manager/.vscode/ApiLogicServer.code-workspace,sha256=HFycZhs0k5fXLxEZF-FBSA2S_JRDIYtVOhqb9743hH4,296
-api_logic_server_cli/prototypes/manager/.vscode/launch.json,sha256=F6oU7Rblst912Oh9RP8XDeb3PYtreSAymOe1Cwo7yYU,10782
+api_logic_server_cli/prototypes/manager/.vscode/launch.json,sha256=oz5Sm-75u_h5QIn58w38C8fXp7Wnof8FJuearbQbPKw,14200
 api_logic_server_cli/prototypes/manager/.vscode/settings.json,sha256=wQgpFvviPbZCmsf02UgrJSGAz7g3i4chDZ_AdSIOr5Y,625
 api_logic_server_cli/prototypes/manager/system/.DS_Store,sha256=lUKIi9eGUtsUbl4MoSzYvKeLhDoBOBP1pi_2aYiQtuw,6148
 api_logic_server_cli/prototypes/manager/system/secrets.txt,sha256=ghGnN1YfCRQvZc43bolQKDgQ1UXg0V-3T1AQTNk5Tg8,386
@@ -1089,8 +1090,11 @@ 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,sha256=FDIxVyZ50CgLVLrAW942Kxnkv1n4WLR2UerzUnuhPwM,900
 api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.ps1,sha256=_-LfKkLw5HOkZsF59BGCqM9Zsk3n1oDIyDb4emy0O08,698
 api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.sh,sha256=aWX9fa8fe6aO9ifBIZEgGY5UGh4I0arOoCwBzDsxgU8,893
+api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_create_db.py,sha256=vzLX6nzVXYWDz9yWm0xCss99dky5Se7GVqrYplC2BRk,247
+api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_imports.py,sha256=cB7Vrvbd_qOVKHCYm0jQT0xlPWIyInHzWUlQeajvWZk,786
 api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_prefix.py,sha256=_rQsqDG2ieNxSsv28t7f9Z5Bs6IMASl8rVunVZIHyUk,301
 api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_prefix_iteration.py,sha256=_rQsqDG2ieNxSsv28t7f9Z5Bs6IMASl8rVunVZIHyUk,301
+api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_test_data.py,sha256=x0kTXGI-e5z4No_eHTKKtZAnLM98tc9GjEIO35TO8nw,197
 api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/logic_discovery_prefix.py,sha256=JgJWr2Y2CT3romLvDSQnALshxmpUOeODu15I6K_HNf4,682
 api_logic_server_cli/prototypes/manager/system/genai/examples/.DS_Store,sha256=BBH5eQ5mD7G0GbbUlbnuILAJHJbTER-7e7EFd1FwV7Y,6148
 api_logic_server_cli/prototypes/manager/system/genai/examples/airport/airport.prompt,sha256=2tl5BQr7EZgEVP5b6qR5CN-RqRJ-hcitq_l5BAkz7yA,53
@@ -1101,12 +1105,13 @@ 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,sha256=30-2VRw5mivAd2JacbjgudpUB8VvMpqJHYkg9WS8DF8,879
 api_logic_server_cli/prototypes/manager/system/genai/examples/elections/elections.prompt,sha256=fXWryP54T6nuS5qKaSMHT7J3r8OM1BpPeNU9WLI-J4s,79
 api_logic_server_cli/prototypes/manager/system/genai/examples/elections/elections.response_example,sha256=h5hGWsMRSWSMGkY_UBCcLlcaXHQJ7Jzmeh4CWnPv9VU,6605
-api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept_explicit.prompt,sha256=alSAwGSjJ93mQyi0g2XhP5XejvVOH0huicOilNFTUB4,277
-api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept_implicit_fails.prompt,sha256=9701E1EZ9fhPE5qI0xcJ28q7eL43-KL2fcSfx8Kymvg,224
+api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept.prompt,sha256=xbyhCyY7TUk7hoBKAkzRsZVBj1lP4hfXdSR4TQagXqM,109
 api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/logic_notes.md,sha256=mrEBKE1OQxEqFoRLD1zYL-SeC5ITPcWEZKaumRDw7U4,100
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/create_db_models.py,sha256=QyGtjgsuYkVF5UYOn35V8ZnAdI76s-1KyM7nnGM4lPI,3588
-api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.prompt,sha256=Xgj60-oIDlIRjBmy1aHXiHwMAGF12ph2BJchB5_GETk,464
-api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example,sha256=mBD0yl3TdsbC0ikVohv66Z4n2VmzK5zenR_8QRgp0Kw,4950
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.prompt,sha256=pGApWAPavw19PAp1rOl_5-FGCPRWF5rtSXmKJyFVw6U,402
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example,sha256=5MSpqktUvopc_d6L2XUIbSTbkx9ORlLa48pBlBZKpaw,6031
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example_z,sha256=mBD0yl3TdsbC0ikVohv66Z4n2VmzK5zenR_8QRgp0Kw,4950
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_informal.prompt,sha256=yifzgnHUBVmWx8upiUYyUS7F30A8PBk6TlHCDUAIJQc,484
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/.DS_Store,sha256=uoPLXmpWk0VLRzME-ay-ZAwoZoHWTjwTfi9imfb4308,6148
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/create_db_models.py,sha256=H6tjGV33v3xUugEQ-tueqQqn4x6zt2yhFHNEaCJYE2g,4751
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/db.dbml,sha256=01TlM5HqFo5CJWBGgebiMI3KI3olYS8EtCF6cieR0ZI,743
@@ -1116,11 +1121,21 @@ 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,sha256=ylKcK7nI5acPF9Sw1YQcM-5sIcMjhvYFDs1VXS0Mjdg,5036
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/genai_demo_004.prompt,sha256=birH8LoOMqSkJ5JokXTBbsijvrvMvRsNu4KxwTBsrrU,138
 api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/genai_demo_conversation_005.response-example,sha256=J30tOn0YWaCJ6OmjK1AbRrh-6yYR07hAE7OK6PwVIFA,6883
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_000.response,sha256=6-KKCzEx9DpbFcuizHiPKaXf_YuIMDAqbsu-rFQQJRQ,140
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_001.prompt,sha256=gwRZd3ubxoCrZRtff6a8e5Dt2h4e8tC-7ycTW5_drdU,6824
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_002.prompt,sha256=o8O6yv11H7QQQnlHsO3J1a5LlPyRo3m_U_KP8g8G5u0,1075
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_003.response,sha256=JL2ErVpuJWjPzVo1XcgvqMTdtvZPjpSCAjkYE6DlWIE,3688
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_004.prompt,sha256=UdZj7ozby3tEeRI7FYgViH5z09TRCQ6cNBFuEvsu9EA,307
+api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_005.response_example,sha256=fhWRRBp9_AR2RXtXJm4o3pMWr6fehiiRA1FcsdlTDnE,5079
 api_logic_server_cli/prototypes/manager/system/genai/examples/postgres/genai_demo_pg.prompt,sha256=w5wZs8zxGjqPUU0DVegdSZcH2YjObvZmBWhaN3olc2w,643
-api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt,sha256=gwRZd3ubxoCrZRtff6a8e5Dt2h4e8tC-7ycTW5_drdU,6824
+api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt,sha256=tGPeUVUj_8TLReElixiZIeh6m9sKPI4h9SHoVc3Ok1Y,8638
 api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.promptZ,sha256=03M7XrLIgqYxGnRc1Od86Ef3rOcFkZFJNyG7bvlxiWY,14158
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/logic_inserts.prompt,sha256=wtlrBQI2CNmA1wevrkUnKAQvaJ0b7g_PH2jjUm48v5k,198
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/pre_post.prompt,sha256=GPQukgxKBE30IVByFFghhRQ8eRQFriFi8INoVc27S18,121
-api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt,sha256=SJ4CVp9nxgGrMqwc8YkziwV34OLyRXR1QiJO3OHpcMg,803
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/response_format.prompt,sha256=dubLCPnmuobjQi5Y3WSIDpohXi01dJ0lVTEx-i86d6A,267
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt,sha256=UVAwhLnvQg8SGSnUnQPmSXrp3kXjG5hj1oU7_W4mlwk,1164
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts_iterations.prompt,sha256=ctOhsc4P_-Ko8UAzLMoJMwOnIxyGwV5QzebL1J6jsZ8,1156
+api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/web_genai copy.prompt,sha256=ySC-Zag7TO4FTJzOVTLhaVKWBqga0j4k0djFZYKFCHI,680
 api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/web_genai.prompt,sha256=ySC-Zag7TO4FTJzOVTLhaVKWBqga0j4k0djFZYKFCHI,680
 api_logic_server_cli/prototypes/manager/system/genai/reference/chatgpt_original.txt,sha256=JPj3OjvugQNfJpe8V8qsbDh-bcvGIN9tAK8C-PJngGM,2845
 api_logic_server_cli/prototypes/manager/system/genai/reference/declare_logic.py,sha256=O4Knjr56gGPF9cX3MaprfzTBLnrMb7F9BUDcrLI2__I,3348
@@ -1497,9 +1512,9 @@ api_logic_server_cli/templates/index.html,sha256=HYocUaiHm0haVHGM5PqHBNyCdyYWCAU
 api_logic_server_cli/templates/login_endpoint.txt,sha256=dB9dMnWiFB4Sd_XchZkj3sS6rhNS1Cs1bqDS-PXCeEo,900
 api_logic_server_cli/templates/login_endpoint_imports.txt,sha256=0Bx5LUaLtQmNk97silIg2EPO3HeEZYP6laVmtyHlbdE,205
 api_logic_server_cli/templates/opt_locking.txt,sha256=_R4kLKndn9v4IxZ3ygTj0NwrCCaXfWpoNDy3aZf3bfs,479
-ApiLogicServer-12.0.4.dist-info/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
-ApiLogicServer-12.0.4.dist-info/METADATA,sha256=FhoSP-TUFnybv4l9CjGNgi4EL0f9ZyFqztSMyGicB7I,6378
-ApiLogicServer-12.0.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ApiLogicServer-12.0.4.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
-ApiLogicServer-12.0.4.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
-ApiLogicServer-12.0.4.dist-info/RECORD,,
+ApiLogicServer-12.1.0.dist-info/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
+ApiLogicServer-12.1.0.dist-info/METADATA,sha256=TeY9URQx2uAAz7mruI8C23WKP3fZ23UvTsQE8zBDCco,6409
+ApiLogicServer-12.1.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+ApiLogicServer-12.1.0.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
+ApiLogicServer-12.1.0.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
+ApiLogicServer-12.1.0.dist-info/RECORD,,

{ApiLogicServer-12.0.4.dist-info → ApiLogicServer-12.1.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

api_logic_server_cli/api_logic_server.py

@@ -12,9 +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__ = "12.00.04"
+__version__ = "12.01.00"
 recent_changes = \
     f'\n\nRecent Changes:\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"\
@@ -1839,203 +1840,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,6 +1859,8 @@ 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'):
                     log.error(f"Error creating database from model: {e}")
@@ -2149,8 +1955,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')
@@ -2288,4 +2095,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

api_logic_server_cli/api_logic_server_info.yaml

@@ -1,3 +1,3 @@
-last_created_date: October 21, 2024 17:52:20
-last_created_project_name: genai_demo
-last_created_version: 12.00.03
+last_created_date: October 31, 2024 16:48:50
+last_created_project_name: emp_dept
+last_created_version: 12.00.16

api_logic_server_cli/cli.py

@@ -592,85 +592,15 @@ def genai(ctx, using, db_url, repaired_response: str, genai_version: str,
         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(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
 
 
 @main.command("genai-logic", cls=HideDunderCommand)

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