ApiLogicServer 12.1.0__py3-none-any.whl → 12.1.26__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {ApiLogicServer-12.1.0.dist-info → ApiLogicServer-12.1.26.dist-info}/METADATA +1 -1
- {ApiLogicServer-12.1.0.dist-info → ApiLogicServer-12.1.26.dist-info}/RECORD +47 -39
- {ApiLogicServer-12.1.0.dist-info → ApiLogicServer-12.1.26.dist-info}/WHEEL +1 -1
- api_logic_server_cli/api_logic_server.py +16 -4
- api_logic_server_cli/api_logic_server_info.yaml +3 -3
- api_logic_server_cli/cli.py +20 -9
- api_logic_server_cli/cli_args_base.py +2 -0
- api_logic_server_cli/cli_args_project.py +9 -3
- api_logic_server_cli/create_from_model/__pycache__/ont_create.cpython-312.pyc +0 -0
- api_logic_server_cli/create_from_model/__pycache__/ui_admin_creator.cpython-312.pyc +0 -0
- api_logic_server_cli/create_from_model/ont_create.py +3 -1
- api_logic_server_cli/create_from_model/ui_admin_creator.py +6 -4
- api_logic_server_cli/genai.py +386 -286
- api_logic_server_cli/logging.yml +5 -0
- api_logic_server_cli/prototypes/.DS_Store +0 -0
- api_logic_server_cli/prototypes/base/api_logic_server_run.py +0 -2
- api_logic_server_cli/prototypes/base/config/server_setup.py +15 -1
- api_logic_server_cli/prototypes/base/integration/kafka/kafka_consumer.py +1 -1
- api_logic_server_cli/prototypes/base/integration/kafka/kafka_producer.py +1 -1
- api_logic_server_cli/prototypes/base/readme.md +21 -8
- api_logic_server_cli/prototypes/manager/.DS_Store +0 -0
- api_logic_server_cli/prototypes/manager/.vscode/.DS_Store +0 -0
- api_logic_server_cli/prototypes/manager/.vscode/launch.json +20 -0
- api_logic_server_cli/prototypes/manager/README.md +25 -1
- api_logic_server_cli/prototypes/manager/system/.DS_Store +0 -0
- api_logic_server_cli/prototypes/manager/system/genai/.DS_Store +0 -0
- api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_create_db.py +1 -0
- api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_imports.py +10 -7
- api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_test_data.py +1 -1
- api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example +99 -22
- api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt +120 -7
- api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/.DS_Store +0 -0
- api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/response_format.prompt +26 -2
- api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt +10 -4
- api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/{sqlite_inserts_iterations.prompt → zsqlite_inserts_iterations.prompt} +5 -2
- api_logic_server_cli/prototypes/manager/system/genai/retry/conv/create_db_models.py +96 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_000.response +1 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_001.prompt +208 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_002.prompt +89 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_003.prompt +40 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_004.response +57 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_005.response +57 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/readme.md +1 -0
- api_logic_server_cli/prototypes/manager/system/genai/retry/retry.response +57 -0
- api_logic_server_cli/genaiZ.py +0 -752
- api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example_z +0 -130
- api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/web_genai copy.prompt +0 -15
- api_logic_server_cli/prototypes/manager/system/secrets.txt +0 -6
- {ApiLogicServer-12.1.0.dist-info → ApiLogicServer-12.1.26.dist-info}/LICENSE +0 -0
- {ApiLogicServer-12.1.0.dist-info → ApiLogicServer-12.1.26.dist-info}/entry_points.txt +0 -0
- {ApiLogicServer-12.1.0.dist-info → ApiLogicServer-12.1.26.dist-info}/top_level.txt +0 -0
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
api_logic_server_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
|
-
api_logic_server_cli/api_logic_server.py,sha256=
|
|
3
|
-
api_logic_server_cli/api_logic_server_info.yaml,sha256=
|
|
4
|
-
api_logic_server_cli/cli.py,sha256=
|
|
5
|
-
api_logic_server_cli/cli_args_base.py,sha256=
|
|
6
|
-
api_logic_server_cli/cli_args_project.py,sha256=
|
|
2
|
+
api_logic_server_cli/api_logic_server.py,sha256=kSW13KddesSS-hYWyI4U01qFo64_-tQJVnvY20o28Cg,112793
|
|
3
|
+
api_logic_server_cli/api_logic_server_info.yaml,sha256=wrV_2fJNJlaPWtIcdxAwbx6bqvjzlwmyrbFLs0RgKMk,115
|
|
4
|
+
api_logic_server_cli/cli.py,sha256=l7xNt-sWU0Q97RxgSNQGA-hoOx0XWSdkY7zgr2eIFEc,76494
|
|
5
|
+
api_logic_server_cli/cli_args_base.py,sha256=QHSOkRcdJ7uVmouMDr-2mGPTglYOzsZWcKZwzFR-fsQ,3174
|
|
6
|
+
api_logic_server_cli/cli_args_project.py,sha256=I5no_fGRV_ZsK3SuttVDAaQYI4Q5zCjx6LojGkM024w,4645
|
|
7
7
|
api_logic_server_cli/extended_builder.py,sha256=EhtXGAt_RrDR2tCtgvc2U82we7fr-F6pP-e6HS6dQWQ,13867
|
|
8
|
-
api_logic_server_cli/genai.py,sha256=
|
|
9
|
-
api_logic_server_cli/genaiZ.py,sha256=gITl0yYiXZvZEcEh1koXWx3ocRJX5HSWusHttzUWMkE,41143
|
|
8
|
+
api_logic_server_cli/genai.py,sha256=Th4xnx2pNQd5j_N2KdC8sqb29i-7kJ6T6zu3YvFQA9U,51754
|
|
10
9
|
api_logic_server_cli/genai_logic_builder.py,sha256=JQXLKIdLOpiyYFUAWowBS-NEKs_4lgP_8OLn5OXl2rU,12170
|
|
11
|
-
api_logic_server_cli/logging.yml,sha256=
|
|
10
|
+
api_logic_server_cli/logging.yml,sha256=os7gsZ6cGnc9t55Asm6uHakLD7V2N4Gf1CJEkwKix28,1535
|
|
12
11
|
api_logic_server_cli/manager.py,sha256=ZJ4lz_i8XUDfLks4aorYQRw7AWt70Eg75TZuLkYBbh4,9645
|
|
13
12
|
api_logic_server_cli/create_from_model/.DS_Store,sha256=X6n-GE2MxklBV1m32v_B1MGhGKqCyaOHusPOnSlQ_Vw,6148
|
|
14
13
|
api_logic_server_cli/create_from_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -19,8 +18,8 @@ api_logic_server_cli/create_from_model/dbml.py,sha256=IV9eG1bib10zTPFYyJNeFPveE0
|
|
|
19
18
|
api_logic_server_cli/create_from_model/meta_model.py,sha256=ERf7tSgnSJSeRMVyggkdg-lvORQZSbfK0KMpL63qSEY,5837
|
|
20
19
|
api_logic_server_cli/create_from_model/model_creation_services.py,sha256=QE7UcVDn0J1k6HL2iqe0_UW4d3wL_HVPJVpSLOmuh30,41436
|
|
21
20
|
api_logic_server_cli/create_from_model/ont_build.py,sha256=8Ki426F2OWT7xaFNBahHrmYMYVYnm25xOAwPirjyo3E,57050
|
|
22
|
-
api_logic_server_cli/create_from_model/ont_create.py,sha256=
|
|
23
|
-
api_logic_server_cli/create_from_model/ui_admin_creator.py,sha256=
|
|
21
|
+
api_logic_server_cli/create_from_model/ont_create.py,sha256=vCCgWcIMNEjzJRLxw6Fn9CsMPpN6WphBdi-Ue7Ha4SE,13204
|
|
22
|
+
api_logic_server_cli/create_from_model/ui_admin_creator.py,sha256=j1hZuHn70c4NA7l0zXH_PbcwH79FQPgkZh1qF_6sLyU,38071
|
|
24
23
|
api_logic_server_cli/create_from_model/uri_info.py,sha256=WiDw7hRcidz9hasodQ6O2ZJnUMfhHeydueQ8HXzPXlc,2395
|
|
25
24
|
api_logic_server_cli/create_from_model/__pycache__/__init__.cpython-312.pyc,sha256=dpp12qEw4ffbTqJToJ-9shjjqknCNTBxg2wj-cnQXnI,223
|
|
26
25
|
api_logic_server_cli/create_from_model/__pycache__/api_expose_api_models_creator.cpython-312.pyc,sha256=XOsCJ_UNn7i3nuwemrIm6saX29RpB09xtmlctdG1Vf0,5254
|
|
@@ -30,8 +29,8 @@ api_logic_server_cli/create_from_model/__pycache__/dbml.cpython-312.pyc,sha256=E
|
|
|
30
29
|
api_logic_server_cli/create_from_model/__pycache__/meta_model.cpython-312.pyc,sha256=Ylu_fwSC4BHfTr4xzXCfyY6ChXu9seDx_LphGw_Tl6Y,7133
|
|
31
30
|
api_logic_server_cli/create_from_model/__pycache__/model_creation_services.cpython-312.pyc,sha256=tsTMN6FZzN1hk3af3f4qDmuh9ZvQnoFlLYRu0xl7SYM,36599
|
|
32
31
|
api_logic_server_cli/create_from_model/__pycache__/ont_build.cpython-312.pyc,sha256=KQ_3RTEzR2NqxvnztS4DK2i1VFxSgxlN8t69JPzzcTo,65910
|
|
33
|
-
api_logic_server_cli/create_from_model/__pycache__/ont_create.cpython-312.pyc,sha256=
|
|
34
|
-
api_logic_server_cli/create_from_model/__pycache__/ui_admin_creator.cpython-312.pyc,sha256=
|
|
32
|
+
api_logic_server_cli/create_from_model/__pycache__/ont_create.cpython-312.pyc,sha256=nc-_3eFMDlT98jPoKs8hrViHfzCrdDrU7OjUqDoeDgM,13576
|
|
33
|
+
api_logic_server_cli/create_from_model/__pycache__/ui_admin_creator.cpython-312.pyc,sha256=dW3OP8i2imShiMvCVxfTu5w5t4renKVrIuATDSvDs9k,38555
|
|
35
34
|
api_logic_server_cli/create_from_model/__pycache__/uri_info.cpython-312.pyc,sha256=_xZHwvPJzehSzH-ueuTKwNqNLTJfUMDwYl5ddYNTxRM,2728
|
|
36
35
|
api_logic_server_cli/create_from_model/safrs-react-admin-npm-build/asset-manifest.json,sha256=ucBTkgHTm1PRQLLIQMNDhoS6jeRoNBAqD6CtJYPBV90,19314
|
|
37
36
|
api_logic_server_cli/create_from_model/safrs-react-admin-npm-build/build-1022.txt,sha256=VhCjW5LdAANuiigYvnI8_N02yuHtxD4x57IttMQKtqM,30
|
|
@@ -398,7 +397,7 @@ api_logic_server_cli/model_migrator/system/custom_endpoint.py,sha256=WTWa_1S9OTw
|
|
|
398
397
|
api_logic_server_cli/model_migrator/system/free_sql.py,sha256=WaUeoSpcGezUJG5QYAZ8I0WLw92dnD89Op7nW9NeQBE,4436
|
|
399
398
|
api_logic_server_cli/model_migrator/system/javascript.py,sha256=Bxbqha-3g-lDZ2oI0tynRfe3Str-1zkR-IigHNeEqPw,1500
|
|
400
399
|
api_logic_server_cli/model_migrator/system/lac_endpoint.py,sha256=3rzyIZo8zPmXMvTYJ5ogiWFnNScY_TwobVjlULxP1Is,32168
|
|
401
|
-
api_logic_server_cli/prototypes/.DS_Store,sha256=
|
|
400
|
+
api_logic_server_cli/prototypes/.DS_Store,sha256=P4l-iSjZa07OhTuhIKA1B06YZpBW1DCmu9v_VaFCWjk,6148
|
|
402
401
|
api_logic_server_cli/prototypes/BudgetApp/README.md,sha256=NCDzJZmr7lZuwiw4pye-69S9Lz6NaFSPkwTm0-tGvhs,6602
|
|
403
402
|
api_logic_server_cli/prototypes/BudgetApp/api/customize_api.py,sha256=_FA98vD6kAVhaPdG7A8w9Q6boSHp8YvxK5NmDU0HeHY,3879
|
|
404
403
|
api_logic_server_cli/prototypes/BudgetApp/database/BudgetAppMySQL.sql,sha256=nPuw7duqzbbZ80wULrsZgEitkiXD8Hf19r1gOfz500A,5157
|
|
@@ -417,8 +416,8 @@ api_logic_server_cli/prototypes/allocation/logic/declare_logic.py,sha256=yeu9vC4
|
|
|
417
416
|
api_logic_server_cli/prototypes/allocation/test/test.sh,sha256=ndw_D7IOFTEUZxbcOL5Y-spvF8pJCe8OOSroqBfjXPM,645
|
|
418
417
|
api_logic_server_cli/prototypes/base/.DS_Store,sha256=uoPLXmpWk0VLRzME-ay-ZAwoZoHWTjwTfi9imfb4308,6148
|
|
419
418
|
api_logic_server_cli/prototypes/base/.gitignore,sha256=PAO98cVvjgAL_mvXCMS_Vfk7bT2Vd1-j9a8_nB2qxqs,190
|
|
420
|
-
api_logic_server_cli/prototypes/base/api_logic_server_run.py,sha256=
|
|
421
|
-
api_logic_server_cli/prototypes/base/readme.md,sha256=
|
|
419
|
+
api_logic_server_cli/prototypes/base/api_logic_server_run.py,sha256=GcqoiNDS3GVJ3VLQIifwCem7X4LSDgkESIc9C-X9TNA,6569
|
|
420
|
+
api_logic_server_cli/prototypes/base/readme.md,sha256=CtWAiMpRfJiA83y90RYVLQ_E1Mntya7Xd8SWcsaHWBc,11710
|
|
422
421
|
api_logic_server_cli/prototypes/base/requirements.txt,sha256=we6X5fRBJVqN8SacwV7oPDtGk5IAiNbUDbUwCGHkCrc,107
|
|
423
422
|
api_logic_server_cli/prototypes/base/run.ps1,sha256=lrZgw8SEntPam3ZYKVzsRo7rOKSGWqgO7qUNJ3CbP44,801
|
|
424
423
|
api_logic_server_cli/prototypes/base/run.sh,sha256=7kJc-FpK9iqtt9BDXR1XogWXfVDnmPS8kS5fXk2Q5Dk,1442
|
|
@@ -458,7 +457,7 @@ api_logic_server_cli/prototypes/base/config/default.env,sha256=xMh_q1rBLLPNfzy8x
|
|
|
458
457
|
api_logic_server_cli/prototypes/base/config/logging-reduced.yml,sha256=N-BDIk0t5uAmw3Of_d_ueK4jx7pxNwlYbkiDd1wjRDs,2179
|
|
459
458
|
api_logic_server_cli/prototypes/base/config/logging.yml,sha256=juVBYHaZnEaKroIkMEJkYcrpp3vXBmd3z7-bw0WXPB0,2169
|
|
460
459
|
api_logic_server_cli/prototypes/base/config/mypy.ini,sha256=2jL3ZtXg9SmJZu6zVQS_hmvO8wyVF1a1JWcVZplXLEk,568
|
|
461
|
-
api_logic_server_cli/prototypes/base/config/server_setup.py,sha256=
|
|
460
|
+
api_logic_server_cli/prototypes/base/config/server_setup.py,sha256=192xfizxl4Tml4ghayXeRivZ-Ri9LE6VdaENKet6cZU,15636
|
|
462
461
|
api_logic_server_cli/prototypes/base/database/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
463
462
|
api_logic_server_cli/prototypes/base/database/alembic.ini,sha256=N-xPrNv1gfMB8ylxm8pprtQxjwlv_9vTUSYGXnaWMnA,3027
|
|
464
463
|
api_logic_server_cli/prototypes/base/database/authentication_db.sqlite,sha256=hA71uBnrh2PVQw9YLc-YbsXjpxr2VyvfE-OhF_ssE6w,45056
|
|
@@ -522,8 +521,8 @@ api_logic_server_cli/prototypes/base/devops/keycloak/unused/auth_provider.py,sha
|
|
|
522
521
|
api_logic_server_cli/prototypes/base/devops/keycloak/unused/unused-docker-compose-keycloak.sh,sha256=YvYRD4ID8v7znslXKOlzu3hpN17h0O_zwGPkFYy1G20,353
|
|
523
522
|
api_logic_server_cli/prototypes/base/devops/python-anywhere/python_anywhere_wsgi.py,sha256=xs3ZT1gg8C4tMzUW6OfOzV8dXHtUW5KVJdyyEbooPFs,3820
|
|
524
523
|
api_logic_server_cli/prototypes/base/docs/logic/readme.md,sha256=s0s5FIF0TVPfinEPdNNSUy9f2HJwGQQdJ1h3xrJm3lA,590
|
|
525
|
-
api_logic_server_cli/prototypes/base/integration/kafka/kafka_consumer.py,sha256=
|
|
526
|
-
api_logic_server_cli/prototypes/base/integration/kafka/kafka_producer.py,sha256
|
|
524
|
+
api_logic_server_cli/prototypes/base/integration/kafka/kafka_consumer.py,sha256=2DOsFpYnsJ71gZzzfJweEmL-i99uCtEFU0hVwIKFGMw,1516
|
|
525
|
+
api_logic_server_cli/prototypes/base/integration/kafka/kafka_producer.py,sha256=WIltkgdPts-KHPjlB-x0uyVlxqr3oVuuzBfpYXpsUBY,2674
|
|
527
526
|
api_logic_server_cli/prototypes/base/integration/kafka/kafka_readme.md,sha256=MlwykHWM2w41KzWh4vPuTnIodR8f-BQzrWpV4P1hrsI,161
|
|
528
527
|
api_logic_server_cli/prototypes/base/integration/row_dict_maps/row_dict_maps_readme.md,sha256=5tOPwErjkcCQONrNcaGsttEwybxCIq-5j45dkOcDh1Q,206
|
|
529
528
|
api_logic_server_cli/prototypes/base/integration/system/FlaskKafka.py,sha256=_UsIUrQ022B7IzEPGRw6GgkUeWtvKHPBe2OSpFF8pEw,3203
|
|
@@ -642,16 +641,16 @@ api_logic_server_cli/prototypes/genai_demo/logic/cocktail-napkin.jpg,sha256=5rNS
|
|
|
642
641
|
api_logic_server_cli/prototypes/genai_demo/logic/declare_logic.py,sha256=gmlvp9D8RRo40FA3zdKvMjKGm6lvJTqltr9BPs9DQHc,4895
|
|
643
642
|
api_logic_server_cli/prototypes/genai_demo/security/declare_security.py,sha256=L3AL1bgdqIWQxdkJZcFVDOQ0XRpmeLAKqwlAYChFWKo,2108
|
|
644
643
|
api_logic_server_cli/prototypes/genai_demo/ui/admin/admin.yaml,sha256=9rSLJXDr5n3ILHQAU2XDjdGzql9ZyHXmwCYAmaGcH-g,2288
|
|
645
|
-
api_logic_server_cli/prototypes/manager/.DS_Store,sha256=
|
|
644
|
+
api_logic_server_cli/prototypes/manager/.DS_Store,sha256=jpXu0JYHiOOT8zOaM19wbKfr1MYEAKpU2UaKKrJB1ts,6148
|
|
646
645
|
api_logic_server_cli/prototypes/manager/.gitignore,sha256=xfAjNQHokbo6GuN1ghx-eml8tQIzwUczLC_YVzElndI,195
|
|
647
|
-
api_logic_server_cli/prototypes/manager/README.md,sha256=
|
|
646
|
+
api_logic_server_cli/prototypes/manager/README.md,sha256=jfTaoHY4viFqRW2uIY_X5XQ_Z87HxBwJGy48e9gE2wQ,13010
|
|
648
647
|
api_logic_server_cli/prototypes/manager/sample_ai.py,sha256=08OhtojM6m79UgbBKx_E5N7Cnpvs9142cWIl9M245PA,1915
|
|
649
648
|
api_logic_server_cli/prototypes/manager/settings.txt,sha256=_jjL30jomIMxG21edDfrXYRT9Zfgr_0EdUWvcEUOnFQ,368
|
|
649
|
+
api_logic_server_cli/prototypes/manager/.vscode/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
|
|
650
650
|
api_logic_server_cli/prototypes/manager/.vscode/ApiLogicServer.code-workspace,sha256=HFycZhs0k5fXLxEZF-FBSA2S_JRDIYtVOhqb9743hH4,296
|
|
651
|
-
api_logic_server_cli/prototypes/manager/.vscode/launch.json,sha256=
|
|
651
|
+
api_logic_server_cli/prototypes/manager/.vscode/launch.json,sha256=69OpzZIR8SIWkzKgZghCOhNuAeDU7s3fTskd0f2CkGs,15024
|
|
652
652
|
api_logic_server_cli/prototypes/manager/.vscode/settings.json,sha256=wQgpFvviPbZCmsf02UgrJSGAz7g3i4chDZ_AdSIOr5Y,625
|
|
653
|
-
api_logic_server_cli/prototypes/manager/system/.DS_Store,sha256=
|
|
654
|
-
api_logic_server_cli/prototypes/manager/system/secrets.txt,sha256=ghGnN1YfCRQvZc43bolQKDgQ1UXg0V-3T1AQTNk5Tg8,386
|
|
653
|
+
api_logic_server_cli/prototypes/manager/system/.DS_Store,sha256=6bSH1nLeTvMkRDFeW-zpidVljzQX83Dct3sscpKUmb8,6148
|
|
655
654
|
api_logic_server_cli/prototypes/manager/system/style-guide.yaml,sha256=tgMp7e2IbOys7nymIM9onv65P0G2SIBJSe1qa-rRBtA,676
|
|
656
655
|
api_logic_server_cli/prototypes/manager/system/app_model_editor/.gitignore,sha256=07msA6EiXJT_unwoat2B8vI6ANcIn9E-ntgIpQZj7g0,477
|
|
657
656
|
api_logic_server_cli/prototypes/manager/system/app_model_editor/api_logic_server_run.py,sha256=vf9Jc2vAz5npI6pD4kLNNdFTkqK8rO4erA03-k_mkcY,6363
|
|
@@ -1090,11 +1089,12 @@ api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/requi
|
|
|
1090
1089
|
api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv-linux.sh,sha256=FDIxVyZ50CgLVLrAW942Kxnkv1n4WLR2UerzUnuhPwM,900
|
|
1091
1090
|
api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.ps1,sha256=_-LfKkLw5HOkZsF59BGCqM9Zsk3n1oDIyDb4emy0O08,698
|
|
1092
1091
|
api_logic_server_cli/prototypes/manager/system/app_model_editor/venv_setup/venv.sh,sha256=aWX9fa8fe6aO9ifBIZEgGY5UGh4I0arOoCwBzDsxgU8,893
|
|
1093
|
-
api_logic_server_cli/prototypes/manager/system/genai
|
|
1094
|
-
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/
|
|
1092
|
+
api_logic_server_cli/prototypes/manager/system/genai/.DS_Store,sha256=0IEW77oNfx7gDDD5Y3Jd0rln_0bgM5KTeP88WOE4APQ,6148
|
|
1093
|
+
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_create_db.py,sha256=KABMhduRQNddt7ScWDMjfq8w2lfiRPu6VJFmAJEJNpk,248
|
|
1094
|
+
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_imports.py,sha256=cy5b4bgylWWQI_zogB-PcQcM4cCjj6W_nPaKgVZsuyM,872
|
|
1095
1095
|
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_prefix.py,sha256=_rQsqDG2ieNxSsv28t7f9Z5Bs6IMASl8rVunVZIHyUk,301
|
|
1096
1096
|
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_prefix_iteration.py,sha256=_rQsqDG2ieNxSsv28t7f9Z5Bs6IMASl8rVunVZIHyUk,301
|
|
1097
|
-
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_test_data.py,sha256=
|
|
1097
|
+
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/create_db_models_test_data.py,sha256=DjLhbtFD_qYIQhCuWFg89i0tO4N4yBQFsu-f1AHLv6Q,235
|
|
1098
1098
|
api_logic_server_cli/prototypes/manager/system/genai/create_db_models_inserts/logic_discovery_prefix.py,sha256=JgJWr2Y2CT3romLvDSQnALshxmpUOeODu15I6K_HNf4,682
|
|
1099
1099
|
api_logic_server_cli/prototypes/manager/system/genai/examples/.DS_Store,sha256=BBH5eQ5mD7G0GbbUlbnuILAJHJbTER-7e7EFd1FwV7Y,6148
|
|
1100
1100
|
api_logic_server_cli/prototypes/manager/system/genai/examples/airport/airport.prompt,sha256=2tl5BQr7EZgEVP5b6qR5CN-RqRJ-hcitq_l5BAkz7yA,53
|
|
@@ -1109,8 +1109,7 @@ api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/emp_dept
|
|
|
1109
1109
|
api_logic_server_cli/prototypes/manager/system/genai/examples/emp_depts/logic_notes.md,sha256=mrEBKE1OQxEqFoRLD1zYL-SeC5ITPcWEZKaumRDw7U4,100
|
|
1110
1110
|
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/create_db_models.py,sha256=QyGtjgsuYkVF5UYOn35V8ZnAdI76s-1KyM7nnGM4lPI,3588
|
|
1111
1111
|
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.prompt,sha256=pGApWAPavw19PAp1rOl_5-FGCPRWF5rtSXmKJyFVw6U,402
|
|
1112
|
-
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example,sha256=
|
|
1113
|
-
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example_z,sha256=mBD0yl3TdsbC0ikVohv66Z4n2VmzK5zenR_8QRgp0Kw,4950
|
|
1112
|
+
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo.response_example,sha256=oSdjatRACfv1g1LHc2e75P51xtQAcoJFL5XwDnvCpzc,9708
|
|
1114
1113
|
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_informal.prompt,sha256=yifzgnHUBVmWx8upiUYyUS7F30A8PBk6TlHCDUAIJQc,484
|
|
1115
1114
|
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/.DS_Store,sha256=uoPLXmpWk0VLRzME-ay-ZAwoZoHWTjwTfi9imfb4308,6148
|
|
1116
1115
|
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_conversation/create_db_models.py,sha256=H6tjGV33v3xUugEQ-tueqQqn4x6zt2yhFHNEaCJYE2g,4751
|
|
@@ -1128,15 +1127,15 @@ api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_d
|
|
|
1128
1127
|
api_logic_server_cli/prototypes/manager/system/genai/examples/genai_demo/genai_demo_iterative_logic/genai_demo_iterative_logic_004.prompt,sha256=UdZj7ozby3tEeRI7FYgViH5z09TRCQ6cNBFuEvsu9EA,307
|
|
1129
1128
|
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
|
|
1130
1129
|
api_logic_server_cli/prototypes/manager/system/genai/examples/postgres/genai_demo_pg.prompt,sha256=w5wZs8zxGjqPUU0DVegdSZcH2YjObvZmBWhaN3olc2w,643
|
|
1131
|
-
api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt,sha256=
|
|
1130
|
+
api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.prompt,sha256=MurXvlAthNzYUPmEn8gDJQiFyPIhkAkgpyeT4EG65Iw,14272
|
|
1132
1131
|
api_logic_server_cli/prototypes/manager/system/genai/learning_requests/logic_bank_api.promptZ,sha256=03M7XrLIgqYxGnRc1Od86Ef3rOcFkZFJNyG7bvlxiWY,14158
|
|
1132
|
+
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
|
|
1133
1133
|
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/logic_inserts.prompt,sha256=wtlrBQI2CNmA1wevrkUnKAQvaJ0b7g_PH2jjUm48v5k,198
|
|
1134
1134
|
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/pre_post.prompt,sha256=GPQukgxKBE30IVByFFghhRQ8eRQFriFi8INoVc27S18,121
|
|
1135
|
-
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/response_format.prompt,sha256=
|
|
1136
|
-
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt,sha256=
|
|
1137
|
-
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts_iterations.prompt,sha256=ctOhsc4P_-Ko8UAzLMoJMwOnIxyGwV5QzebL1J6jsZ8,1156
|
|
1138
|
-
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/web_genai copy.prompt,sha256=ySC-Zag7TO4FTJzOVTLhaVKWBqga0j4k0djFZYKFCHI,680
|
|
1135
|
+
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/response_format.prompt,sha256=OAUilpXRNUgw3FCxByEqmMHtD8oDftyEXo0ErcBncNY,967
|
|
1136
|
+
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/sqlite_inserts.prompt,sha256=TsrmG7yJFB7A2Yh6zCBfiBwiqvz7T3aXiDuFkYu3auQ,1523
|
|
1139
1137
|
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/web_genai.prompt,sha256=ySC-Zag7TO4FTJzOVTLhaVKWBqga0j4k0djFZYKFCHI,680
|
|
1138
|
+
api_logic_server_cli/prototypes/manager/system/genai/prompt_inserts/zsqlite_inserts_iterations.prompt,sha256=Hn71hdwB0k4fpxUPXTTWwYQKPlaYemj9l7vMh1Ko7Kc,1331
|
|
1140
1139
|
api_logic_server_cli/prototypes/manager/system/genai/reference/chatgpt_original.txt,sha256=JPj3OjvugQNfJpe8V8qsbDh-bcvGIN9tAK8C-PJngGM,2845
|
|
1141
1140
|
api_logic_server_cli/prototypes/manager/system/genai/reference/declare_logic.py,sha256=O4Knjr56gGPF9cX3MaprfzTBLnrMb7F9BUDcrLI2__I,3348
|
|
1142
1141
|
api_logic_server_cli/prototypes/manager/system/genai/reference/genai_demo_logic.txt,sha256=FSba4oWlRIxcANw3ol-HcPjKVkDLX1K4qAKSvRMOJWU,1118
|
|
@@ -1151,6 +1150,15 @@ api_logic_server_cli/prototypes/manager/system/genai/reference/errors/model_bad_
|
|
|
1151
1150
|
api_logic_server_cli/prototypes/manager/system/genai/reference/errors/model_float.py,sha256=WIIKp610aLwnAPNyp2P4jXdZNpwRHePeme_Enlluttg,2052
|
|
1152
1151
|
api_logic_server_cli/prototypes/manager/system/genai/reference/errors/model_unclosed_paren.py,sha256=SZo-17dfNI7Lp930G4lRlIG-j5zTgtPQArMM4V6uBN4,2108
|
|
1153
1152
|
api_logic_server_cli/prototypes/manager/system/genai/reference/errors/modelz-bad-decimal.py,sha256=H21rhYXG5ywWPc8GxaKqkFeQmCEAfMbtBx4-sY7dlCA,2079
|
|
1153
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/readme.md,sha256=8wIpVm9WfBDtUZUMs1YQTHvSAQB_hZgZFoScbf07MaU,56
|
|
1154
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/retry.response,sha256=UXlU10IfRKw3ivjj3_fX9j8d8v50X9ROsSKnuMOVVW0,4779
|
|
1155
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/conv/create_db_models.py,sha256=NaP5zU5hhlXl1rkmwsaymi1goiQF3OPzgqANW8tUjaQ,3686
|
|
1156
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_000.response,sha256=6-KKCzEx9DpbFcuizHiPKaXf_YuIMDAqbsu-rFQQJRQ,140
|
|
1157
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_001.prompt,sha256=tGPeUVUj_8TLReElixiZIeh6m9sKPI4h9SHoVc3Ok1Y,8638
|
|
1158
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_002.prompt,sha256=FCmGkpzmBl772aoHPajprPpm5wmuwKjIrOG9_htPOf4,3692
|
|
1159
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_003.prompt,sha256=heXMuL1z3qoPF6B5VP_T2HF9jFZ90msfNX_XYYoCmgc,1662
|
|
1160
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_004.response,sha256=M3sf8nEFUcePERUcfVpA2yeHEjJtdeEhD2TeVvLWSrY,4767
|
|
1161
|
+
api_logic_server_cli/prototypes/manager/system/genai/retry/conv/inf-1_iter_1_1_005.response,sha256=UXlU10IfRKw3ivjj3_fX9j8d8v50X9ROsSKnuMOVVW0,4779
|
|
1154
1162
|
api_logic_server_cli/prototypes/manager/system/genai/temp/$notes.txt,sha256=FMmb6kr5mdFsgIcWF-uxFsEuOL6lxY9oqC-qrbQfCyA,158
|
|
1155
1163
|
api_logic_server_cli/prototypes/manager/system/genai/temp/chatgpt_original.response,sha256=pXPPj8lg0nJ82YGDu4Yrj9yVMUiSDptvjiudkNoB2ac,4628
|
|
1156
1164
|
api_logic_server_cli/prototypes/manager/system/genai/temp/chatgpt_retry.response,sha256=pXPPj8lg0nJ82YGDu4Yrj9yVMUiSDptvjiudkNoB2ac,4628
|
|
@@ -1512,9 +1520,9 @@ api_logic_server_cli/templates/index.html,sha256=HYocUaiHm0haVHGM5PqHBNyCdyYWCAU
|
|
|
1512
1520
|
api_logic_server_cli/templates/login_endpoint.txt,sha256=dB9dMnWiFB4Sd_XchZkj3sS6rhNS1Cs1bqDS-PXCeEo,900
|
|
1513
1521
|
api_logic_server_cli/templates/login_endpoint_imports.txt,sha256=0Bx5LUaLtQmNk97silIg2EPO3HeEZYP6laVmtyHlbdE,205
|
|
1514
1522
|
api_logic_server_cli/templates/opt_locking.txt,sha256=_R4kLKndn9v4IxZ3ygTj0NwrCCaXfWpoNDy3aZf3bfs,479
|
|
1515
|
-
ApiLogicServer-12.1.
|
|
1516
|
-
ApiLogicServer-12.1.
|
|
1517
|
-
ApiLogicServer-12.1.
|
|
1518
|
-
ApiLogicServer-12.1.
|
|
1519
|
-
ApiLogicServer-12.1.
|
|
1520
|
-
ApiLogicServer-12.1.
|
|
1523
|
+
ApiLogicServer-12.1.26.dist-info/LICENSE,sha256=67BS7VC-Z8GpaR3wijngQJkHWV04qJrwQArVgn9ldoI,1485
|
|
1524
|
+
ApiLogicServer-12.1.26.dist-info/METADATA,sha256=Mbzk3k4b4cf1onC3Sa4sMKbeF8wdw59oOx0OzAyTsaw,6410
|
|
1525
|
+
ApiLogicServer-12.1.26.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
|
|
1526
|
+
ApiLogicServer-12.1.26.dist-info/entry_points.txt,sha256=KiLloZJ3c_RW-nIDqBtoE0WEsQTnZ3dELwHLWi23LMA,103
|
|
1527
|
+
ApiLogicServer-12.1.26.dist-info/top_level.txt,sha256=-r0AT_GEApleihg-jIh0OMvzzc0BO1RuhhOpE91H5qI,21
|
|
1528
|
+
ApiLogicServer-12.1.26.dist-info/RECORD,,
|
|
@@ -12,9 +12,11 @@ ApiLogicServer CLI: given a database url, create [and run] customizable ApiLogic
|
|
|
12
12
|
Called from api_logic_server_cli.py, by instantiating the ProjectRun object.
|
|
13
13
|
'''
|
|
14
14
|
|
|
15
|
-
__version__ = "12.01.
|
|
15
|
+
__version__ = "12.01.26"
|
|
16
16
|
recent_changes = \
|
|
17
17
|
f'\n\nRecent Changes:\n' +\
|
|
18
|
+
"\t11/18/2024 - 12.01.26: genai: sqlite inserts, dataRows[], LogicBankOff (LBX), Readme Cleanup \n"\
|
|
19
|
+
"\t11/10/2024 - 12.01.22: genai: rule training, bug fix admin app Boolean fields, model via env \n"\
|
|
18
20
|
"\t10/31/2024 - 12.01.00: genai: informal rules (eg, Sum of employee salaries cannot exceed department budget) \n"\
|
|
19
21
|
"\t10/21/2024 - 12.00.04: sra 10-22, Prelim support genai --using=dir/project \n"\
|
|
20
22
|
"\t10/12/2024 - 12.00.02: Natural Language Logic \n"\
|
|
@@ -860,6 +862,9 @@ class ProjectRun(Project):
|
|
|
860
862
|
genai_version: str="",
|
|
861
863
|
genai_prompt_inserts: str="",
|
|
862
864
|
genai_use_relns: bool=True,
|
|
865
|
+
genai_tables: int=0,
|
|
866
|
+
genai_temperature: float=0.7,
|
|
867
|
+
genai_test_data_rows: int=0,
|
|
863
868
|
host: str='localhost',
|
|
864
869
|
port: str='5656',
|
|
865
870
|
swagger_host: str="localhost",
|
|
@@ -903,6 +908,9 @@ class ProjectRun(Project):
|
|
|
903
908
|
self.genai_prompt_inserts = genai_prompt_inserts
|
|
904
909
|
self.genai_use_relns = genai_use_relns
|
|
905
910
|
""" Use relationships in create_db_models (internal) """
|
|
911
|
+
self.genai_tables = genai_tables
|
|
912
|
+
self.genai_test_data_rows = genai_test_data_rows
|
|
913
|
+
self.genai_temperature = genai_temperature
|
|
906
914
|
self.user_db_url = db_url # retained for debug
|
|
907
915
|
self.bind_key = bind_key
|
|
908
916
|
self.api_name = api_name
|
|
@@ -1000,7 +1008,9 @@ class ProjectRun(Project):
|
|
|
1000
1008
|
uri_info.print_uri_info()
|
|
1001
1009
|
exit(0)
|
|
1002
1010
|
|
|
1003
|
-
print_options =
|
|
1011
|
+
print_options = False
|
|
1012
|
+
if log.getEffectiveLevel() >= logging.DEBUG:
|
|
1013
|
+
print_options = True
|
|
1004
1014
|
if print_options:
|
|
1005
1015
|
creating_or_updating = "Creating"
|
|
1006
1016
|
if self.command.startswith("add_"):
|
|
@@ -1863,9 +1873,11 @@ from database import <project.bind_key>_models
|
|
|
1863
1873
|
raise Exception(gen_ai.post_error)
|
|
1864
1874
|
except Exception as e:
|
|
1865
1875
|
if hasattr(self, 'gen_ai_save_dir'):
|
|
1876
|
+
failed_msg = str(datetime.datetime.now().strftime("%B %d, %Y %H:%M:%S"))
|
|
1877
|
+
failed_msg += f"\n{e}"
|
|
1866
1878
|
log.error(f"Error creating database from model: {e}")
|
|
1867
1879
|
with open(f"{self.gen_ai_save_dir.joinpath('create_db_models_failed.txt')}", "w") as log_file:
|
|
1868
|
-
log_file.write(f"Error creating database from model: {
|
|
1880
|
+
log_file.write(f"Error creating database from model: {failed_msg}")
|
|
1869
1881
|
raise(e)
|
|
1870
1882
|
return gen_ai
|
|
1871
1883
|
|
|
@@ -1995,8 +2007,8 @@ from database import <project.bind_key>_models
|
|
|
1995
2007
|
"""
|
|
1996
2008
|
|
|
1997
2009
|
self.print_options()
|
|
1998
|
-
self.directory_setup()
|
|
1999
2010
|
gen_ai = self.create_database_from_genai_or_model() # sometimes we create db before creating project
|
|
2011
|
+
self.directory_setup()
|
|
2000
2012
|
self.abs_db_url, self.nw_db_status, self.model_file_name = self.call_abs_db_url() # nw set here, dbname, db abbrevs
|
|
2001
2013
|
self.set_standard_external_builder()
|
|
2002
2014
|
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
last_created_date:
|
|
2
|
-
last_created_project_name:
|
|
3
|
-
last_created_version: 12.
|
|
1
|
+
last_created_date: November 18, 2024 05:49:03
|
|
2
|
+
last_created_project_name: genai_demo
|
|
3
|
+
last_created_version: 12.01.26
|
api_logic_server_cli/cli.py
CHANGED
|
@@ -561,8 +561,8 @@ def tutorial(ctx, create):
|
|
|
561
561
|
default=f'sqlite',
|
|
562
562
|
help="SQLAlchemy Database URL\n")
|
|
563
563
|
@click.option('--genai-version', 'genai_version',
|
|
564
|
-
default='
|
|
565
|
-
help="Eg, gpt-3.5-turbo, gpt-4o")
|
|
564
|
+
default='',
|
|
565
|
+
help="Eg, '', gpt-3.5-turbo, gpt-4o")
|
|
566
566
|
@click.option('--repaired-response', 'repaired_response',
|
|
567
567
|
default='',
|
|
568
568
|
help="Retry from [repaired] response file")
|
|
@@ -582,12 +582,22 @@ def tutorial(ctx, create):
|
|
|
582
582
|
default=True,
|
|
583
583
|
help="Internal (create_db w/relns)")
|
|
584
584
|
@click.option('--project-name', 'project_name',
|
|
585
|
-
default=f'',
|
|
585
|
+
default=f'_genai_default',
|
|
586
586
|
help="Project location")
|
|
587
|
+
@click.option('--tables',
|
|
588
|
+
default=4,
|
|
589
|
+
help="Number of tables")
|
|
590
|
+
@click.option('--test-data-rows', 'test_data_rows',
|
|
591
|
+
default=4,
|
|
592
|
+
help="Number of test data rows")
|
|
593
|
+
@click.option('--temperature',
|
|
594
|
+
default=0.7,
|
|
595
|
+
help="Number of test data rows")
|
|
587
596
|
@click.pass_context
|
|
588
|
-
def genai(ctx, using, db_url, repaired_response: str,
|
|
597
|
+
def genai(ctx, using, db_url, repaired_response: str,
|
|
598
|
+
genai_version: str, temperature: float,
|
|
589
599
|
retries: int, opt_locking: str, prompt_inserts: str, quote: click.BOOL,
|
|
590
|
-
use_relns: click.BOOL, project_name: str):
|
|
600
|
+
use_relns: click.BOOL, project_name: str, tables: int, test_data_rows: int):
|
|
591
601
|
"""
|
|
592
602
|
Creates new customizable project (overwrites).
|
|
593
603
|
"""
|
|
@@ -596,10 +606,11 @@ def genai(ctx, using, db_url, repaired_response: str, genai_version: str,
|
|
|
596
606
|
defaulted_using = using
|
|
597
607
|
if defaulted_using == 'genai_demo': # default to genai_demo.prompt
|
|
598
608
|
defaulted_using = 'system/genai/examples/genai_demo/genai_demo.prompt'
|
|
599
|
-
genai_svcs.
|
|
600
|
-
genai_version=genai_version,
|
|
601
|
-
|
|
602
|
-
|
|
609
|
+
genai_svcs.genai_cli_retry(using=defaulted_using, db_url=db_url, repaired_response=repaired_response,
|
|
610
|
+
genai_version=genai_version, temperature=temperature,
|
|
611
|
+
retries=retries, opt_locking=opt_locking,
|
|
612
|
+
prompt_inserts=prompt_inserts, quote=quote, use_relns=use_relns,
|
|
613
|
+
project_name=project_name, tables=tables, test_data_rows=test_data_rows)
|
|
603
614
|
pass
|
|
604
615
|
|
|
605
616
|
|
|
@@ -47,6 +47,8 @@ class CliArgsBase():
|
|
|
47
47
|
""" Fixed response; None => ChatGPT API, else defaults system/genai/reference/chatgpt_retry.txt """
|
|
48
48
|
self.genai_version = None
|
|
49
49
|
""" Version number for ChatGPT API, eg gpt-3.5-turbo, gpt-4o (expensive) """
|
|
50
|
+
self.genai_temperature : float = None
|
|
51
|
+
""" ChatGPT API, 0-1, default 0.7 """
|
|
50
52
|
self.genai_use_relns = None
|
|
51
53
|
""" Use relationships in create_db_models """
|
|
52
54
|
self.bind_key = None # type: str
|
|
@@ -2,7 +2,7 @@ import api_logic_server_cli.create_from_model.uri_info as uri_info
|
|
|
2
2
|
from api_logic_server_cli.cli_args_base import CliArgsBase
|
|
3
3
|
from os.path import abspath
|
|
4
4
|
from pathlib import Path
|
|
5
|
-
import os
|
|
5
|
+
import os, logging
|
|
6
6
|
|
|
7
7
|
class Project(CliArgsBase): # extends user-visible args with internal values, extended by ProjectRun
|
|
8
8
|
|
|
@@ -64,6 +64,12 @@ class Project(CliArgsBase): # extends user-visible args with internal values, e
|
|
|
64
64
|
self.genai_logic = None # type list[str]
|
|
65
65
|
""" genai logic to be inserted into logic/declare_logic.py """
|
|
66
66
|
|
|
67
|
+
self.genai_tables = 0
|
|
68
|
+
""" number of tables (aks complexity) for genai """
|
|
69
|
+
|
|
70
|
+
self.genai_test_data_rows = 0
|
|
71
|
+
""" number of test data rows for genai """
|
|
72
|
+
|
|
67
73
|
self.genai_prompt_inserts : str = None
|
|
68
74
|
""" text to be inserted into prompt
|
|
69
75
|
- "" 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
|
|
|
77
83
|
uri_info.print_uri_info()
|
|
78
84
|
exit(0)
|
|
79
85
|
|
|
80
|
-
|
|
81
|
-
if
|
|
86
|
+
log = logging.getLogger('api_logic_server_cli.api_logic_server')
|
|
87
|
+
if log.getEffectiveLevel() >= logging.DEBUG:
|
|
82
88
|
print(f'\n\nCreating ApiLogicServer with options:')
|
|
83
89
|
print(f' --db_url={self.db_url}')
|
|
84
90
|
print(f' --bind_key={self.bind_key}')
|
|
Binary file
|
|
Binary file
|
|
@@ -78,7 +78,7 @@ class OntCreator(object):
|
|
|
78
78
|
self.project.use_model = "."
|
|
79
79
|
model_creation_services = ModelCreationServices(project = self.project, # load models (user db, not auth)
|
|
80
80
|
project_directory=self.project.project_directory)
|
|
81
|
-
resources
|
|
81
|
+
resources: Dict[str, Resource] = {name: resource for name, resource in model_creation_services.resource_list.items() if not getattr(resource, 'hidden', False)}
|
|
82
82
|
|
|
83
83
|
admin_app = Path(self.project.project_directory_path).joinpath(f'ui/admin/{self.admin_app}.yaml')
|
|
84
84
|
if not os.path.exists(admin_app):
|
|
@@ -113,6 +113,8 @@ class OntCreator(object):
|
|
|
113
113
|
app_model_out.entities = DotMap()
|
|
114
114
|
app_model_out.settings.style_guide = self.style_guide() # TODO - stub code, remove later
|
|
115
115
|
for each_resource_name, each_resource in admin_model_in.resources.items():
|
|
116
|
+
if each_resource["hidden"] == True:
|
|
117
|
+
continue
|
|
116
118
|
each_entity = self.create_model_entity(each_resource, resources=resources)
|
|
117
119
|
app_model_out.entities[each_resource_name] = each_entity
|
|
118
120
|
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
# this builds the Admin App by creating ui/admin/admin.yaml
|
|
2
|
+
|
|
1
3
|
import logging
|
|
2
4
|
from re import X
|
|
3
5
|
import shutil
|
|
@@ -6,7 +8,6 @@ import os
|
|
|
6
8
|
import pathlib
|
|
7
9
|
from pathlib import Path
|
|
8
10
|
from typing import NewType, List, Tuple, Dict
|
|
9
|
-
|
|
10
11
|
import sqlalchemy
|
|
11
12
|
import yaml
|
|
12
13
|
from sqlalchemy import MetaData, false
|
|
@@ -14,7 +15,6 @@ import datetime
|
|
|
14
15
|
import api_logic_server_cli.create_from_model.model_creation_services as create_from_model
|
|
15
16
|
import api_logic_server_cli.create_from_model.api_logic_server_utils as create_utils
|
|
16
17
|
from dotmap import DotMap
|
|
17
|
-
|
|
18
18
|
from api_logic_server_cli.create_from_model.meta_model import Resource
|
|
19
19
|
|
|
20
20
|
log = logging.getLogger('api_logic_server_cli.create_from_model.ui_admin_creator')
|
|
@@ -264,12 +264,14 @@ class AdminCreator(object):
|
|
|
264
264
|
admin_attribute.name = str(attribute_name)
|
|
265
265
|
if required:
|
|
266
266
|
admin_attribute.required = True
|
|
267
|
-
if attribute_name == "
|
|
267
|
+
if attribute_name == "Ready":
|
|
268
268
|
debug_str = "Good breakpoint location"
|
|
269
269
|
if isinstance(resource_attribute, str) == True:
|
|
270
270
|
raise Exception(f'System Error - expected resource_attribute, got string: {resource_attribute}')
|
|
271
271
|
if not isinstance(resource_attribute, str):
|
|
272
|
-
if
|
|
272
|
+
if resource_attribute.db_type in ["BOOLEAN"]:
|
|
273
|
+
admin_attribute.type = "Boolean"
|
|
274
|
+
elif str(resource_attribute.type).upper() in ["DECIMAL", "DATE", "DATETIME"]:
|
|
273
275
|
admin_attribute.type = resource_attribute.type
|
|
274
276
|
if resource_attribute.type in ["NTEXT", "IMAGE"]:
|
|
275
277
|
admin_attribute = None
|