aiverify-moonshot 0.4.11__py3-none-any.whl → 0.5.0__py3-none-any.whl

{aiverify_moonshot-0.4.11.dist-info → aiverify_moonshot-0.5.0.dist-info}/METADATA

@@ -1,15 +1,12 @@
 Metadata-Version: 2.3
 Name: aiverify-moonshot
-Version: 0.4.11
+Version: 0.5.0
 Summary: AI Verify advances Gen AI testing with Project Moonshot.
 Project-URL: Repository, https://github.com/aiverify-foundation/moonshot
 Project-URL: Documentation, https://aiverify-foundation.github.io/moonshot/
 Project-URL: Issues, https://github.com/aiverify-foundation/moonshot/issues
 Author-email: AI Verify Foundation <info@aiverify.sg>
 License: Apache-2.0
-License-File: AUTHORS.md
-License-File: LICENSE.md
-License-File: NOTICES.md
 Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
@@ -24,6 +21,7 @@ Requires-Dist: pydantic==2.8.2
 Requires-Dist: pyparsing>=3.1.4
 Requires-Dist: python-dotenv>=1.0.1
 Requires-Dist: python-slugify>=8.0.4
+Requires-Dist: tenacity>=8.5.0
 Requires-Dist: xxhash>=3.5.0
 Provides-Extra: all
 Requires-Dist: cmd2>=2.4.3; extra == 'all'
@@ -46,7 +44,7 @@ Description-Content-Type: text/markdown
 
 ![Moonshot Logo](https://github.com/aiverify-foundation/moonshot/raw/main/misc/aiverify-moonshot-logo.png)
 
-**Version 0.4.11**
+**Version 0.5.0**
 
 A simple and modular tool to evaluate any LLM application.
 

{aiverify_moonshot-0.4.11.dist-info → aiverify_moonshot-0.5.0.dist-info}/RECORD

@@ -6,19 +6,19 @@ moonshot/integrations/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 moonshot/integrations/cli/__main__.py,sha256=0VnYSj2AayvDCZ3uXpldPcjMHt2Yd7BWojWzFOGSSl4,679
 moonshot/integrations/cli/active_session_cfg.py,sha256=n8hOFxFjvz26qbEFY4q7iPUZYrGLoeCmXJxmOb_xWUE,20
 moonshot/integrations/cli/cli.py,sha256=9tnzcxcSOjblxCUpyh3pK0ke0bLs3s-63OxXtYoZI2g,2769
-moonshot/integrations/cli/cli_errors.py,sha256=wDwBtxZcHPWIJa6ZVW0MoWm81aeqmhYhi7SLI7TQ4_4,23565
+moonshot/integrations/cli/cli_errors.py,sha256=jJ15ngnVJjSByamtOE2Cx79k1mOJnAl36NbCjpPppeM,23672
 moonshot/integrations/cli/benchmark/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/cli/benchmark/benchmark.py,sha256=QUxr6DU11-XeH6Y3j1uPsZsotshgy64G_cWNf0Rn2_U,6303
-moonshot/integrations/cli/benchmark/cookbook.py,sha256=pgXTKqYAeDj0tLsCN71SCrKM4DDgswwqxJhXaPQmAeU,29518
+moonshot/integrations/cli/benchmark/cookbook.py,sha256=rT4gK88LhATFxsAxWWYExtPVT09oWPHJtJ1HQkLT3yU,29444
 moonshot/integrations/cli/benchmark/datasets.py,sha256=Uq5XMNWUp775sz9jCZUZHHmkumPFI7cHVRueHgWm70Q,8965
 moonshot/integrations/cli/benchmark/metrics.py,sha256=SHs-hIa4CIPyOJtxK2U4D6IRHy3ZNsRtZlAMGvF9Qxw,8310
-moonshot/integrations/cli/benchmark/recipe.py,sha256=yVFX3pwNzDL0a95rjlQd4cek06M9blv5jIeYB26jOKk,32481
+moonshot/integrations/cli/benchmark/recipe.py,sha256=uAYTBu1EwcCBdf9Iut6eboZ6nBt5_hDwBhru50mZer0,32407
 moonshot/integrations/cli/benchmark/result.py,sha256=TGlIuDkPB1Cfu1u2uyDsWtgQxTOoNdGDzc0vCnGC1zk,11152
 moonshot/integrations/cli/benchmark/run.py,sha256=HBztvG_Zkg1ZAWsFv0QDE43FaEmx92vTWc4h1U3VesU,7438
 moonshot/integrations/cli/benchmark/runner.py,sha256=Y4Vt6Qqn9QzsM6eLUM9m2_XKkW3ctu-2jMTSei_TDPU,7098
 moonshot/integrations/cli/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/cli/common/common.py,sha256=RjlIqV82DHVi5CeUjOkC1xYlVAq4mxelDD9MN4Tj4jU,3302
-moonshot/integrations/cli/common/connectors.py,sha256=7fcmzNU8iPodc8SPhO8kEn0fMrS8voCvy12QBm8PP00,19477
+moonshot/integrations/cli/common/connectors.py,sha256=bmdZfDHKhii3ejZb5tkT0WnoSYtAGKPk8CpBgIvI5PY,20017
 moonshot/integrations/cli/common/dataset.py,sha256=zkVGtIJIozJPPs_Qc__Hnw1tAh_pcvYV5gqf_eOaGXQ,12749
 moonshot/integrations/cli/common/display_helper.py,sha256=8rVowW33XK0j0C_X_H1jUbFlFk1Y2WpzxmIUE3Ca5Co,1459
 moonshot/integrations/cli/common/prompt_template.py,sha256=2cXWeHh16EUvzYFre7juMxT2R0x3kqDJVucH0bKLmCU,6351
@@ -34,7 +34,7 @@ moonshot/integrations/cli/utils/process_data.py,sha256=QVL5vp2_8ZgGicmCAdeYEHkeb
 moonshot/integrations/web_api/.env.dev,sha256=0z5_Ut8rF-UqFZtgjkH2qoqORhD5_nSs2w_OeX2SteI,182
 moonshot/integrations/web_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/web_api/__main__.py,sha256=MdnLi_ZF-olAAEJwTPU1iGYFYwo-fNWNT2qfchkH3y4,2050
-moonshot/integrations/web_api/app.py,sha256=x9yYCUE78d8uNE6ws87236mHCYTSHqy2KWQdWZey0ns,3652
+moonshot/integrations/web_api/app.py,sha256=Dxq5Tt8_W3Xn8UHzcbU1pDx7QJJvByIVjg1KbgMxRT4,3651
 moonshot/integrations/web_api/container.py,sha256=DVkJG_qm7ItcG6tgMYOqIj07wpKhPWOOfy6-bEv72y4,5915
 moonshot/integrations/web_api/logging_conf.py,sha256=t3EGRV6tZhV732KXe8_Tiy0fiwVAWxZX5Tt8VTgrrfg,3388
 moonshot/integrations/web_api/log/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -59,7 +59,7 @@ moonshot/integrations/web_api/schemas/cookbook_create_dto.py,sha256=00SPVw7lEpfY
 moonshot/integrations/web_api/schemas/cookbook_response_model.py,sha256=J_DkyuWwNNy6_G1QT6JY-qIr0zhMkQd208wXhTA-Tao,342
 moonshot/integrations/web_api/schemas/dataset_create_dto.py,sha256=Jr_EbIgqR7K__LQXpXSocfYLE6oN7pGRFzWcDVcFaus,963
 moonshot/integrations/web_api/schemas/dataset_response_dto.py,sha256=s5x4-UXEWccWhK42E0FPXiHG6VqjuFuph-2t5atEkg4,171
-moonshot/integrations/web_api/schemas/endpoint_create_dto.py,sha256=oyw5xNsWg4GxQ5VNbSe_YqvWxE7OI3egPZINqIi3glw,646
+moonshot/integrations/web_api/schemas/endpoint_create_dto.py,sha256=WS8AfRybrweoOgZx6K6jiNy1Z6J3IZS1PUNnrRxGKyM,678
 moonshot/integrations/web_api/schemas/endpoint_response_model.py,sha256=OmmM2uaPSgB2aqPFfkhseKkI5OKCKilXR19gDmwFlLc,321
 moonshot/integrations/web_api/schemas/prompt_response_model.py,sha256=S9PwxJERY1ppDaUKLlL9_skHcYcURIIvFnRZj24hLnE,303
 moonshot/integrations/web_api/schemas/prompt_template_response_model.py,sha256=V7znK-QjQVUXUbsmEy5hZHzjnHYCN1kDtvOxgyxF83k,195
@@ -81,7 +81,7 @@ moonshot/integrations/web_api/services/bookmark_service.py,sha256=jI9nXs1hjzO0CL
 moonshot/integrations/web_api/services/context_strategy_service.py,sha256=6YKnnG8JlE_1nlnr4Hq7rgz-sxI6oQglK0STaWPFQxQ,710
 moonshot/integrations/web_api/services/cookbook_service.py,sha256=Hi6xKmChS6-fOKXoHqjOkM0cUvNCV3XaNJNVoXMbK0U,7942
 moonshot/integrations/web_api/services/dataset_service.py,sha256=ZWb3FqyDkA0C9qhlQ3X_zR0ohAlwlLsJi-mgKLvXpnI,2407
-moonshot/integrations/web_api/services/endpoint_service.py,sha256=YhcVYMOCVq7BBWPqf0Doji6YdrtnT6ykJkCjZWj-9xs,2356
+moonshot/integrations/web_api/services/endpoint_service.py,sha256=N5SXNAh44UNeBpMhA9baL0VZoTx4sHzpy4y7-Ch8O4E,2395
 moonshot/integrations/web_api/services/metric_service.py,sha256=xWC5Dk8aiU7tuHsxYedTTrEkbA3Ug1pV2nbaBas6cAg,456
 moonshot/integrations/web_api/services/prompt_template_service.py,sha256=5ds7pKDB2R0_0slVDwsCRIpIVdsgpqhI-3wQqSYcpuE,1226
 moonshot/integrations/web_api/services/recipe_service.py,sha256=Z6cZqwFOVFaksoXK_K05rp5wdZX4qrgMFbw_6fSpjYo,6551
@@ -96,34 +96,34 @@ moonshot/integrations/web_api/status_updater/interface/redteam_progress_callback
 moonshot/integrations/web_api/temp/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/integrations/web_api/types/types.py,sha256=AN0Xf61lx2c5AFAYoXA8mVL5iufVBpwYlIPdo8gv-ls,2395
 moonshot/src/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/messages_constants.py,sha256=Kig-U3bh2UiDBZxTkRaMKtuwVdSEGxoO6m4ph-54yRk,2442
+moonshot/src/messages_constants.py,sha256=usbvwitgRdOVY0ARdBbh9uiLNUb6WCdCuSoa64tVMhM,6936
 moonshot/src/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/api/api_bookmark.py,sha256=FhtSojdw8wfzJXQnH9VnkwsuqRf_c_y6LH0oOQA48Dc,2926
-moonshot/src/api/api_connector.py,sha256=JpwLFd7Vh1LRz6oB8fhO2iufMbSTt5RmrMe7nt56bPM,2257
-moonshot/src/api/api_connector_endpoint.py,sha256=UUuHzrgoj0bWcbOXPUJh7FEg-pzBOSo6DLgwqCZnLmw,5503
-moonshot/src/api/api_context_strategy.py,sha256=WqzUEw3f7gROJlc_G7bsGkuP3nO1HycFzn3dfcxzaoc,2153
-moonshot/src/api/api_cookbook.py,sha256=qFItf8KLaDgbDIrv8usbbzSFnoXOYLORQ7IaDvQ5haw,5744
-moonshot/src/api/api_dataset.py,sha256=z2H-B5yMOdqf-zGoKY7i83cfENfYtUll5tivAE7oAow,4049
-moonshot/src/api/api_environment_variables.py,sha256=ubUHvK7LyN1HhAE40ZTls6fDrbl6IYbxoPob68i4c_k,551
-moonshot/src/api/api_metrics.py,sha256=W32Jobh5wUYTsN8Jus0xGvEY1NVkvJrxZ8_a8tVuouI,1586
-moonshot/src/api/api_prompt_template.py,sha256=NsgEz9sOLLlb93CBDBPektfCDB8kviEGaG21m2onVjo,1332
-moonshot/src/api/api_recipe.py,sha256=1mU6c7OpyCUzCVqrmGoB1J2M-GhgIvvlKrjptplp5Z0,6122
-moonshot/src/api/api_red_teaming.py,sha256=Ar2KeGXOTkeVNvDpegGfIPpIvdEijZBcqb-4dDwOIRc,2019
-moonshot/src/api/api_result.py,sha256=M5zKF7ytKp237UZusLSYJ7QVfui85Ys0WEaYySGcAKw,2532
-moonshot/src/api/api_run.py,sha256=3PrETAVcFnJ09R0-xhWiFkEfqL6eYj4B2voEGJDPznU,2936
-moonshot/src/api/api_runner.py,sha256=cH0rxWREjc2qKmt4Tuwr-fEMrYDBE_TKRw0jOohNEgU,4179
-moonshot/src/api/api_session.py,sha256=OGH05ZxAwo_hKI-RNaJ-jCp_v-zcTm-9bHUclpq2z4Q,10978
+moonshot/src/api/api_bookmark.py,sha256=gg7uJU7ixZtmJ99S3xdgQgcznkY8SjoJaTBkSsnoWrM,3442
+moonshot/src/api/api_connector.py,sha256=Q_of-aHPuWkbefMJq4uXctJl89G2Tt6J_HfSuf1hE6g,2234
+moonshot/src/api/api_connector_endpoint.py,sha256=lwfhlWNBJ6QotqffmURtjRmxfzbBlSIAZupeSpMt9VU,5584
+moonshot/src/api/api_context_strategy.py,sha256=uRIfNjKJ_Wk9nSrvbPRfrdQLpG0K6kH9rl5tmmHui40,2151
+moonshot/src/api/api_cookbook.py,sha256=KzGCcJjpAs92FZBloojLbmi5nqK3hd_zX8m5jYWKMMM,5715
+moonshot/src/api/api_dataset.py,sha256=i2KwnZ-6fTm_tyn8cRw8iesrGi7_Nh0-1bFuN7m0TVo,4066
+moonshot/src/api/api_environment_variables.py,sha256=wRx6rm95ItyL_uKUAYfSjcPZNbRxKl1GGS4PpWcTE1s,712
+moonshot/src/api/api_metrics.py,sha256=x5DiysTYQsMmcAS2y2XpgvrPobZk7GT2rhO-MaIRun4,1603
+moonshot/src/api/api_prompt_template.py,sha256=HQUl7-HGcxA620cY0vDqqo7CoY9uONkXIOlolduIgbE,1959
+moonshot/src/api/api_recipe.py,sha256=_TJUc8vJqxu5Uti3q2GSQ2uJdj8hqNBFSvBi2NaDnyQ,6135
+moonshot/src/api/api_red_teaming.py,sha256=GBBy4yDAbDuUyeANkGorZJENWceNIzfg30TuiF-Av3Q,2004
+moonshot/src/api/api_result.py,sha256=xZHex_K_PbSr-65LPLr5up4lvu313-VJroR4BBR5JQk,2849
+moonshot/src/api/api_run.py,sha256=ToPYIeTPd2OaOqd20UQ_ie2BQPqLw5aZ_RwRwv9oGpU,2983
+moonshot/src/api/api_runner.py,sha256=spN7ogBGQN7I-c1u_UeKZ7vg02AtCuAl3dFG8CSayQU,4257
+moonshot/src/api/api_session.py,sha256=w-mc_sj3ElQa6FPQqWbK2bFgGTu1ECwYm3tN41xFkes,11130
 moonshot/src/bookmark/bookmark.py,sha256=Gf9wZ5wmJUmatHChr0_3tVyUbPMfpCVeEfujQQjIv18,11867
 moonshot/src/bookmark/bookmark_arguments.py,sha256=cB5m2zB8255WVdacmC2-ZYNyaoK4-gOM_Qwb_JDR-34,1449
 moonshot/src/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/src/configs/env_variables.py,sha256=eF__UJN37LCzIB4pv_T7G-kQHlOa657QA7IpL1d_0MM,7150
 moonshot/src/connectors/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/connectors/connector.py,sha256=MkOtC2pr5SwHp8xe5oRhC77BEfNmo883LsBhl4VpKnQ,13555
-moonshot/src/connectors/connector_prompt_arguments.py,sha256=gZ5jKwyZOPhMYQOfRE-Uyo4H4KoP1ngvXIXDcwEkkG0,630
-moonshot/src/connectors/connector_response.py,sha256=UHrX5tTDGrfPUXoIvPeMUOEXqJxlAo8vgGMHBPzDc0k,712
+moonshot/src/connectors/connector.py,sha256=-2-vp6hPWigdEOwkHAz1SSTGwGsaraZHzHnb_9aD5HI,16272
+moonshot/src/connectors/connector_prompt_arguments.py,sha256=aJX5Jwd9bxWWLhIntXBu5Iu3NKsOcud-dfdBJVgKK58,751
+moonshot/src/connectors/connector_response.py,sha256=kIByU-H7A0NXRxk1Y2XPGZHSJNKzJj6BNkzXqdyZyb0,403
 moonshot/src/connectors_endpoints/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-moonshot/src/connectors_endpoints/connector_endpoint.py,sha256=hrSvq7iw1IigZssKTcdotkcN8stG8Ov7AlJ8xxZcAJo,9526
-moonshot/src/connectors_endpoints/connector_endpoint_arguments.py,sha256=8WyD0EfrlhGM9rqrzoAcF-YWmSWiWdfpO91E7w6HPY0,2318
+moonshot/src/connectors_endpoints/connector_endpoint.py,sha256=3U4030gKhvDt4e7VD3lac2FG0kxGJ0DSLPTAUKYOPEk,10018
+moonshot/src/connectors_endpoints/connector_endpoint_arguments.py,sha256=0v9mUHki4l22CK8o8UjATAsFDza9Lutbh4QplLiDXs8,2434
 moonshot/src/cookbooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 moonshot/src/cookbooks/cookbook.py,sha256=LjmbJtFwIPhupQlx6LjjIQLMfpwcWZKurduS8MBgqHI,9661
 moonshot/src/cookbooks/cookbook_arguments.py,sha256=iVp3x1-wi_RL7peTSr5TWbXnjuB_w7Uj29kJrQg48Y0,1210
@@ -172,9 +172,9 @@ moonshot/src/utils/import_modules.py,sha256=T9zTN59PFnvY2rjyWhSV9KSIAHxWV1pyBemF
 moonshot/src/utils/log.py,sha256=YNgD7Eh2OT36XlmVBKCGUTAh9TRp4Akfe4kDdvHASgs,2502
 moonshot/src/utils/pagination.py,sha256=5seymyRoqyENIhKllAatr1T91kMCGFslcvRnJHyMSvc,814
 moonshot/src/utils/timeit.py,sha256=TvuF0w8KWhp0oZFY0cUU3UY0xlGKjchb0OkfYfgVTlc,866
-aiverify_moonshot-0.4.11.dist-info/METADATA,sha256=Yf_5kXixSCJzVEeC5vRW3uId1RKe1XLDLnLabE0S_AQ,12390
-aiverify_moonshot-0.4.11.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-aiverify_moonshot-0.4.11.dist-info/licenses/AUTHORS.md,sha256=mmAbe3i3sT8JZHJMBhxp3i1xRehV0g7WB4T_eyIBuBs,59
-aiverify_moonshot-0.4.11.dist-info/licenses/LICENSE.md,sha256=53izDRmJZZCjpYGfyLqlxnGQN-aNWBxasuzuMXC5Ias,11347
-aiverify_moonshot-0.4.11.dist-info/licenses/NOTICES.md,sha256=vS1zZYAnGjCJdwQ13xv3b2zc30wOS98ZnCKluT-AhHs,123266
-aiverify_moonshot-0.4.11.dist-info/RECORD,,
+aiverify_moonshot-0.5.0.dist-info/METADATA,sha256=yYa9FI2r9gbSgj9FkaSHIAe12Q2navSqPBXn25Lj9RY,12344
+aiverify_moonshot-0.5.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+aiverify_moonshot-0.5.0.dist-info/licenses/AUTHORS.md,sha256=mmAbe3i3sT8JZHJMBhxp3i1xRehV0g7WB4T_eyIBuBs,59
+aiverify_moonshot-0.5.0.dist-info/licenses/LICENSE.md,sha256=53izDRmJZZCjpYGfyLqlxnGQN-aNWBxasuzuMXC5Ias,11347
+aiverify_moonshot-0.5.0.dist-info/licenses/NOTICES.md,sha256=vS1zZYAnGjCJdwQ13xv3b2zc30wOS98ZnCKluT-AhHs,123266
+aiverify_moonshot-0.5.0.dist-info/RECORD,,

{aiverify_moonshot-0.4.11.dist-info → aiverify_moonshot-0.5.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.25.0
+Generator: hatchling 1.26.3
 Root-Is-Purelib: true
 Tag: py3-none-any

moonshot/integrations/cli/benchmark/cookbook.py

@@ -256,11 +256,7 @@ def run_cookbook(args) -> None:
         if isinstance(args.random_seed, bool) or not isinstance(args.random_seed, int):
             raise TypeError(ERROR_BENCHMARK_RUN_COOKBOOK_RANDOM_SEED_VALIDATION)
 
-        if (
-            not isinstance(args.system_prompt, str)
-            or not args.system_prompt
-            or args.system_prompt is None
-        ):
+        if not isinstance(args.system_prompt, str) or args.system_prompt is None:
             raise TypeError(ERROR_BENCHMARK_RUN_COOKBOOK_SYS_PROMPT_VALIDATION)
 
         if (

moonshot/integrations/cli/benchmark/recipe.py

@@ -337,11 +337,7 @@ def run_recipe(args) -> None:
         if isinstance(args.random_seed, bool) or not isinstance(args.random_seed, int):
             raise TypeError(ERROR_BENCHMARK_RUN_RECIPE_RANDOM_SEED_VALIDATION)
 
-        if (
-            not isinstance(args.system_prompt, str)
-            or not args.system_prompt
-            or args.system_prompt is None
-        ):
+        if not isinstance(args.system_prompt, str) or args.system_prompt is None:
             raise TypeError(ERROR_BENCHMARK_RUN_RECIPE_SYS_PROMPT_VALIDATION)
 
         if (

moonshot/integrations/cli/cli_errors.py

@@ -348,6 +348,9 @@ ERROR_COMMON_ADD_ENDPOINT_MAX_CALLS_PER_SECOND_VALIDATION = "The 'max_calls_per_
 ERROR_COMMON_ADD_ENDPOINT_MAX_CONCURRENCY_VALIDATION = (
     "The 'max_concurrency' argument must be a non-empty positive integer and not None."
 )
+ERROR_COMMON_ADD_ENDPOINT_MODEL_VALIDATION = (
+    "The 'model' argument must be a string and not None."
+)
 ERROR_COMMON_ADD_ENDPOINT_PARAMS_VALIDATION = (
     "The 'params' argument must be a string representation of a dictionary."
 )

moonshot/integrations/cli/common/connectors.py

@@ -17,6 +17,7 @@ from moonshot.integrations.cli.cli_errors import (
     ERROR_COMMON_ADD_ENDPOINT_CONNECTOR_TYPE_VALIDATION,
     ERROR_COMMON_ADD_ENDPOINT_MAX_CALLS_PER_SECOND_VALIDATION,
     ERROR_COMMON_ADD_ENDPOINT_MAX_CONCURRENCY_VALIDATION,
+    ERROR_COMMON_ADD_ENDPOINT_MODEL_VALIDATION,
     ERROR_COMMON_ADD_ENDPOINT_NAME_VALIDATION,
     ERROR_COMMON_ADD_ENDPOINT_PARAMS_VALIDATION,
     ERROR_COMMON_ADD_ENDPOINT_TOKEN_VALIDATION,
@@ -56,6 +57,7 @@ def add_endpoint(args) -> None:
             token (str): The access token for the API.
             max_calls_per_second (int): The maximum number of API calls allowed per second.
             max_concurrency (int): The maximum number of concurrent API calls.
+            model (str): The model used by the endpoint.
             params (str): A string representation of a dictionary containing additional parameters for the connector.
 
     Returns:
@@ -94,6 +96,9 @@ def add_endpoint(args) -> None:
         ):
             raise TypeError(ERROR_COMMON_ADD_ENDPOINT_MAX_CONCURRENCY_VALIDATION)
 
+        if not isinstance(args.model, str) or args.model is None:
+            raise TypeError(ERROR_COMMON_ADD_ENDPOINT_MODEL_VALIDATION)
+
         try:
             params_dict = literal_eval(args.params)
         except Exception:
@@ -108,6 +113,7 @@ def add_endpoint(args) -> None:
             args.token,
             args.max_calls_per_second,
             args.max_concurrency,
+            args.model,
             params_dict,
         )
         print(f"[add_endpoint]: Endpoint ({new_endpoint_id}) created.")
@@ -123,9 +129,9 @@ def list_endpoints(args) -> list | None:
     moonshot.api module. It then displays the endpoints using the _display_endpoints function.
 
     Args:
-        args: A namespace object from argparse. It should have an optional attribute:
-        find (str): Optional field to find endpoint(s) with a keyword.
-        pagination (str): Optional field to paginate endpoints.
+        args: A namespace object from argparse. It should have the following optional attributes:
+            find (str): Optional field to find endpoint(s) with a keyword.
+            pagination (str): Optional field to paginate endpoints.
 
     Returns:
         list | None: A list of ConnectorEndpoint or None if there is no result.
@@ -176,9 +182,9 @@ def list_connector_types(args) -> list | None:
     moonshot.api module. It then displays the connector types using the _display_connector_types function.
 
     Args:
-        args: A namespace object from argparse. It should have an optional attribute:
-        find (str): Optional field to find connector type(s) with a keyword.
-        pagination (str): Optional field to paginate connector types.
+        args: A namespace object from argparse. It should have the following optional attributes:
+            find (str): Optional field to find connector type(s) with a keyword.
+            pagination (str): Optional field to paginate connector types.
 
     Returns:
         list | None: A list of Connector or None if there is no result.
@@ -373,7 +379,8 @@ def _display_endpoints(endpoints_list):
 
     Args:
         endpoints_list (list): A list of endpoints. Each endpoint is a dictionary with keys 'id', 'name',
-        'connector_type', 'uri', 'token', 'max_calls_per_second', 'max_concurrency', 'params', and 'created_date'.
+        'connector_type', 'uri', 'token', 'max_calls_per_second', 'max_concurrency', 'model', 'params',
+        and 'created_date'.
 
     Returns:
         None
@@ -391,7 +398,8 @@ def _display_endpoints(endpoints_list):
     table.add_column("Uri", justify="left", width=10)
     table.add_column("Token", justify="left", width=10)
     table.add_column("Max Calls Per Second", justify="left", width=5)
-    table.add_column("Max concurrency", justify="left", width=5)
+    table.add_column("Max Concurrency", justify="left", width=5)
+    table.add_column("Model", justify="left", width=5)
     table.add_column("Params", justify="left", width=30)
     table.add_column("Created Date", justify="left", width=8)
 
@@ -404,6 +412,7 @@ def _display_endpoints(endpoints_list):
             token,
             max_calls_per_second,
             max_concurrency,
+            model,
             params,
             created_date,
             *other_args,
@@ -419,6 +428,7 @@ def _display_endpoints(endpoints_list):
             token,
             str(max_calls_per_second),
             str(max_concurrency),
+            str(model),
             escape(str(params)),
             created_date,
         )
@@ -432,7 +442,7 @@ def _display_endpoints(endpoints_list):
 add_endpoint_args = cmd2.Cmd2ArgumentParser(
     description="Add a new endpoint. The 'name' argument will be slugified to create a unique identifier.",
     epilog="Example:\n add_endpoint openai-connector 'OpenAI GPT3.5 Turbo 1106' "
-    "MY_URI ADD_YOUR_TOKEN_HERE 1 1 \"{'temperature': 0.5, 'model': 'gpt-3.5-turbo-1106'}\"",
+    "MY_URI ADD_YOUR_TOKEN_HERE 1 1 'gpt-3.5-turbo-1106' \"{'temperature': 0.5}\"",
 )
 add_endpoint_args.add_argument(
     "connector_type",
@@ -450,6 +460,7 @@ add_endpoint_args.add_argument(
 add_endpoint_args.add_argument(
     "max_concurrency", type=int, help="Max concurrency of the new endpoint"
 )
+add_endpoint_args.add_argument("model", type=str, help="Model of the new endpoint")
 add_endpoint_args.add_argument("params", type=str, help="Params of the new endpoint")
 
 # Update endpoint arguments
@@ -457,11 +468,12 @@ update_endpoint_args = cmd2.Cmd2ArgumentParser(
     description="Update an endpoint.",
     epilog=(
         "Available keys:\n"
-        "  name: name of the endpoint\n"
+        "  name: Name of the endpoint\n"
         "  uri: URI of the endpoint\n"
         "  token: Token of the endpoint\n"
         "  max_calls_per_second: Rate limit for max calls per second\n"
         "  max_concurrency: Rate limit for max concurrency\n"
+        "  model: Model of the endpoint\n"
         "  params: Extra arguments for the endpoint\n\n"
         "Example:\n"
         "  update_endpoint openai-gpt4 \"[('name', 'my-special-openai-endpoint'), "

moonshot/integrations/web_api/app.py

@@ -71,7 +71,7 @@ def create_app(cfg: providers.Configuration) -> CustomFastAPI:
     }
 
     app: CustomFastAPI = CustomFastAPI(
-        title="Project Moonshot", version="0.4.11", **app_kwargs
+        title="Project Moonshot", version="0.5.0", **app_kwargs
     )
 
     if cfg.cors.enabled():

moonshot/integrations/web_api/schemas/endpoint_create_dto.py

@@ -17,5 +17,6 @@ class EndpointUpdateDTO(ConnectorEndpointPydanticModel):
     token: Optional[str] = None
     max_calls_per_second: Optional[int] = None
     max_concurrency: Optional[int] = None
+    model: Optional[str] = None
     params: Optional[dict] = None
     created_date: Optional[str] = None

moonshot/integrations/web_api/services/endpoint_service.py

@@ -13,6 +13,7 @@ class EndpointService(BaseService):
             connector_type=endpoint_data.connector_type,
             uri=endpoint_data.uri,
             token=endpoint_data.token,
+            model=endpoint_data.model,
             max_calls_per_second=endpoint_data.max_calls_per_second,
             max_concurrency=endpoint_data.max_concurrency,
             params=endpoint_data.params,

moonshot/src/api/api_bookmark.py

@@ -21,10 +21,15 @@ def api_insert_bookmark(
     Args:
         name (str): The unique name of the bookmark.
         prompt (str): The associated prompt text for the bookmark.
+        prepared_prompt (str): The prepared prompt text for the bookmark.
         response (str): The corresponding response text for the bookmark.
-        context_strategy (str): The strategy used for context management in the bookmark.
-        prompt_template (str): The template used for generating the prompt.
-        attack_module (str): The attack module linked with the bookmark.
+        context_strategy (str, optional): The strategy used for context management in the bookmark. Defaults to "".
+        prompt_template (str, optional): The template used for generating the prompt. Defaults to "".
+        attack_module (str, optional): The attack module linked with the bookmark. Defaults to "".
+        metric (str, optional): The metric associated with the bookmark. Defaults to "".
+
+    Returns:
+        dict: A dictionary containing the details of the newly inserted bookmark.
     """
     # Create a new BookmarkArguments object
     bookmark_args = BookmarkArguments(
@@ -57,10 +62,10 @@ def api_get_bookmark(bookmark_name: str) -> dict:
     Retrieves the details of a specific bookmark by its name.
 
     Args:
-        bookmark_name (int): The name of the bookmark to retrieve.
+        bookmark_name (str): The name of the bookmark to retrieve.
 
     Returns:
-        dict: The bookmark details corresponding to the provided ID.
+        dict: The bookmark details corresponding to the provided name.
     """
     return Bookmark().get_bookmark(bookmark_name)
 
@@ -71,6 +76,9 @@ def api_delete_bookmark(bookmark_name: str) -> dict:
 
     Args:
         bookmark_name (str): The name of the bookmark to be removed.
+
+    Returns:
+        dict: A dictionary containing the details of the deleted bookmark.
     """
     return Bookmark().delete_bookmark(bookmark_name)
 
@@ -78,6 +86,9 @@ def api_delete_bookmark(bookmark_name: str) -> dict:
 def api_delete_all_bookmark() -> dict:
     """
     Removes all bookmarks from the database.
+
+    Returns:
+        dict: A dictionary indicating the result of the delete operation.
     """
     return Bookmark().delete_all_bookmark()
 

moonshot/src/api/api_connector.py

@@ -13,8 +13,8 @@ def api_create_connector_from_endpoint(ep_id: str) -> Connector:
     Creates a connector based on the provided endpoint ID.
 
     This function retrieves the endpoint arguments using the provided endpoint ID and then creates a connector
-    based on those arguments. It utilizes the ConnectorManager's read_endpoint method to fetch the endpoint
-    arguments and then calls the create_connector method to initialize and return the connector.
+    based on those arguments. It utilizes the ConnectorEndpoint's read method to fetch the endpoint
+    arguments and then calls the Connector's create method to initialize and return the connector.
 
     Args:
         ep_id (str): The ID of the endpoint for which to create a connector.
@@ -49,7 +49,7 @@ def api_get_all_connector_type() -> list[str]:
     """
     Retrieves a list of all available connector types.
 
-    This function calls the ConnectorManager's get_available_connector_types method to retrieve a list of all available
+    This function calls the Connector's get_available_items method to retrieve a list of all available
     connector types. It returns the list of connector types.
 
     Returns:

moonshot/src/api/api_connector_endpoint.py

@@ -17,6 +17,7 @@ def api_create_endpoint(
     token: str,
     max_calls_per_second: int,
     max_concurrency: int,
+    model: str,
     params: dict,
 ) -> str:
     """
@@ -33,6 +34,7 @@ def api_create_endpoint(
         token (str): The token for authentication with the connector.
         max_calls_per_second (int): The maximum number of calls allowed per second.
         max_concurrency (int): The maximum number of concurrent calls allowed.
+        model (str): The model used by the connector.
         params (dict): Additional parameters for the connector.
 
     Returns:
@@ -51,6 +53,7 @@ def api_create_endpoint(
         token=token,
         max_calls_per_second=max_calls_per_second,
         max_concurrency=max_concurrency,
+        model=model,
         params=params,
         created_date="",
     )
@@ -136,7 +139,7 @@ def api_get_all_endpoint() -> list[dict]:
     """
     Retrieves a list of all available endpoints.
 
-    This function calls the ConnectorManager's get_available_endpoints method to retrieve a list of all available
+    This function calls the ConnectorEndpoint's get_available_items method to retrieve a list of all available
     endpoints and their details. It then converts each ConnectorEndpointArguments object into a dictionary for easier
     consumption by the caller.
 
@@ -151,8 +154,8 @@ def api_get_all_endpoint_name() -> list[str]:
     """
     Retrieves a list of all endpoint names.
 
-    This function calls the ConnectorManager's get_available_endpoints method to retrieve a list of all available
-    endpoint names. It extracts the names from the tuple returned by get_available_endpoints, which contains a list
+    This function calls the ConnectorEndpoint's get_available_items method to retrieve a list of all available
+    endpoint names. It extracts the names from the tuple returned by get_available_items, which contains a list
     of endpoint names and a list of ConnectorEndpointArguments objects.
 
     Returns:

moonshot/src/api/api_context_strategy.py

@@ -10,7 +10,7 @@ def api_get_all_context_strategies() -> list[str]:
     """
     Retrieves and returns the names of all context strategies currently available.
 
-    This API endpoint interfaces with the `ContextStrategy.get_all_context_strategy_names` method to fetch a list
+    This API endpoint interfaces with the `ContextStrategy.get_all_context_strategies` method to fetch a list
     of all context strategy names. It's designed for clients that need to know what context strategies are available for
     use in sessions or other components of the system.
 
@@ -48,7 +48,7 @@ def api_get_all_context_strategy_metadata() -> list[dict]:
     returns a list of metadata dictionaries.
 
     Returns:
-        list[dict]: A list of dictionaries, each representing the details of a context strategy metadata.
+        list[dict]: A list of dictionaries, each representing the details of a context strategy's metadata.
     """
 
     return [

moonshot/src/api/api_cookbook.py

@@ -14,7 +14,7 @@ def api_create_cookbook(name: str, description: str, recipes: list[str]) -> str:
 
     This function takes the name, description, and recipes for a new cookbook as input. It then creates a new
     CookbookArguments object with these details and an empty id. The id is left empty because it will be generated
-    from the name during the creation process. The function then calls the Cookbook's create_cookbook method to
+    from the name during the creation process. The function then calls the Cookbook's create method to
     create the new cookbook.
 
     Args:
@@ -43,7 +43,7 @@ def api_read_cookbook(cb_id: str) -> dict:
     """
     Retrieves a cookbook based on the provided cookbook ID.
 
-    This function reads a cookbook using the `read_cookbook` method
+    This function reads a cookbook using the `read` method
     of the `Cookbook` class, and converts the returned `Cookbook` object to a dictionary using its `to_dict` method.
 
     Args:
@@ -60,7 +60,7 @@ def api_read_cookbooks(cb_ids: conlist(str, min_length=1)) -> list[dict]:
     """
     Retrieves a list of cookbooks based on the provided list of cookbook IDs.
 
-    This function iterates over the list of provided cookbook IDs, reads each cookbook using the `read_cookbook` method
+    This function iterates over the list of provided cookbook IDs, reads each cookbook using the `read` method
     of the `Cookbook` class, and converts the returned `Cookbook` objects to dictionaries using their `to_dict` method.
     It then returns a list of these dictionary representations.
 
@@ -90,7 +90,7 @@ def api_update_cookbook(cb_id: str, **kwargs) -> bool:
         bool: True if the cookbook was successfully updated.
 
     Raises:
-        Exception: If there's an error during the update process.
+        RuntimeError: If the cookbook with the given ID does not exist.
     """
     # Check if the cookbook exists
     try:
@@ -134,7 +134,7 @@ def api_get_all_cookbook() -> list[dict]:
     """
     Retrieves all available cookbooks.
 
-    This function calls the `get_available_cookbooks` method of the `Cookbook` class, which returns a tuple
+    This function calls the `get_available_items` method of the `Cookbook` class, which returns a tuple
     containing a list of cookbook IDs and a list of `CookbookArguments` objects. The function then returns a list
     of dictionaries, each representing a cookbook.
 
@@ -149,7 +149,7 @@ def api_get_all_cookbook_name() -> list[str]:
     """
     Retrieves the names of all available cookbooks.
 
-    This function calls the `get_available_cookbooks` method of the `Cookbook` class, which returns a tuple
+    This function calls the `get_available_items` method of the `Cookbook` class, which returns a tuple
     containing a list of cookbook IDs and a list of `CookbookArguments` objects. The function then returns the
     list of cookbook IDs, which are the names of the cookbooks.
 

moonshot/src/api/api_dataset.py

@@ -16,7 +16,7 @@ def api_delete_dataset(ds_id: str) -> bool:
         ds_id (str): The unique identifier for the dataset to be deleted.
 
     Returns:
-        bool: True if the dataset was successfully deleted.
+        bool: True if the dataset was successfully deleted, False otherwise.
 
     Raises:
         Exception: If the deletion process encounters an error.
@@ -27,10 +27,10 @@ def api_delete_dataset(ds_id: str) -> bool:
 def api_get_all_datasets() -> list[dict]:
     """
     This function retrieves all available datasets and returns them as a list of dictionaries. Each dictionary
-    represents a result and contains its information.
+    represents a dataset and contains its information.
 
     Returns:
-        list[dict]: A list of dictionaries, each representing a result.
+        list[dict]: A list of dictionaries, each representing a dataset.
     """
     _, datasets = Dataset.get_available_items()
     return [dataset.to_dict() for dataset in datasets]
@@ -38,10 +38,10 @@ def api_get_all_datasets() -> list[dict]:
 
 def api_get_all_datasets_name() -> list[str]:
     """
-    This function retrieves all available datasets names and returns them as a list.
+    This function retrieves all available dataset names and returns them as a list.
 
     Returns:
-        list[str]: A list of datasets names.
+        list[str]: A list of dataset names.
     """
     datasets_name, _ = Dataset.get_available_items()
     return datasets_name

moonshot/src/api/api_environment_variables.py

@@ -8,6 +8,9 @@ def api_set_environment_variables(env_vars: dict) -> None:
     """
     Sets the environment variables for the current session.
 
+    This function takes a dictionary of environment variables and sets them for the current session
+    by loading them into the EnvironmentVars configuration.
+
     Args:
         env_vars (dict): A dictionary containing the environment variables to set.
 

moonshot/src/api/api_metrics.py

@@ -15,7 +15,7 @@ def api_delete_metric(met_id: str) -> bool:
         met_id (str): The unique identifier for the metric to be deleted.
 
     Returns:
-        bool: True if the metric was successfully deleted.
+        bool: True if the metric was successfully deleted, False otherwise.
 
     Raises:
         Exception: If the deletion process encounters an error.

moonshot/src/api/api_prompt_template.py

@@ -10,6 +10,9 @@ def api_get_all_prompt_template_detail() -> list[dict]:
     """
     Retrieves all available prompt template details and returns them as a list of dictionaries.
 
+    This function calls the `get_all_prompt_template_details` method from the `PromptTemplate` class
+    to fetch the details of all prompt templates. It then returns these details as a list of dictionaries.
+
     Returns:
         list[dict]: A list of dictionaries, each representing the details of a prompt template.
     """
@@ -20,6 +23,9 @@ def api_get_all_prompt_template_name() -> list[str]:
     """
     Retrieves all available prompt template names and returns them as a list.
 
+    This function calls the `get_all_prompt_template_names` method from the `PromptTemplate` class
+    to fetch the names of all prompt templates. It then returns these names as a list of strings.
+
     Returns:
         list[str]: A list of prompt template names.
     """
@@ -31,6 +37,9 @@ def api_delete_prompt_template(pt_id: str) -> bool:
     """
     Deletes a prompt template by its identifier.
 
+    This function calls the `delete` method from the `PromptTemplate` class to delete a prompt template
+    identified by its unique ID. It returns True if the deletion was successful, otherwise it raises an exception.
+
     Args:
         pt_id (str): The unique identifier of the prompt template to be deleted.