From 9f9dd9f5eafa0d4b3a9f503ade70ddacfc5dee55 Mon Sep 17 00:00:00 2001 From: rchan Date: Wed, 12 Jun 2024 22:17:29 +0100 Subject: [PATCH 1/6] regenerate lock --- poetry.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/poetry.lock b/poetry.lock index 92a9f6f..ed82bf3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1284,18 +1284,18 @@ files = [ [[package]] name = "filelock" -version = "3.15.0" +version = "3.14.0" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.15.0-py3-none-any.whl", hash = "sha256:a44ed538e517cc4c9534da2a0bf8a4911cac9a78e30adfafc344c0df56a9f1ed"}, - {file = "filelock-3.15.0.tar.gz", hash = "sha256:261e8674273052f1bb97e4e381fdef93163610e56607f6953a5087b418a88886"}, + {file = "filelock-3.14.0-py3-none-any.whl", hash = "sha256:43339835842f110ca7ae60f1e1c160714c5a6afd15a2873419ab185334975c0f"}, + {file = "filelock-3.14.0.tar.gz", hash = "sha256:6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a"}, ] [package.extras] docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-asyncio (>=0.21)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] typing = ["typing-extensions (>=4.8)"] [[package]] @@ -3682,13 +3682,13 @@ files = [ [[package]] name = "openai" -version = "1.33.0" +version = "1.34.0" description = "The official Python library for the openai API" optional = false python-versions = ">=3.7.1" files = [ - {file = "openai-1.33.0-py3-none-any.whl", hash = "sha256:621163b56570897ab8389d187f686a53d4771fd6ce95d481c0a9611fe8bc4229"}, - {file = "openai-1.33.0.tar.gz", hash = "sha256:1169211a7b326ecbc821cafb427c29bfd0871f9a3e0947dd9e51acb3b0f1df78"}, + {file = "openai-1.34.0-py3-none-any.whl", hash = "sha256:018623c2f795424044675c6230fa3bfbf98d9e0aab45d8fd116f2efb2cfb6b7e"}, + {file = "openai-1.34.0.tar.gz", hash = "sha256:95c8e2da4acd6958e626186957d656597613587195abd0fb2527566a93e76770"}, ] [package.dependencies] From fb9c87eb7e0bfcf0dc798ec18f3cd893b22139fa Mon Sep 17 00:00:00 2001 From: rchan Date: Thu, 13 Jun 2024 10:20:23 +0100 Subject: [PATCH 2/6] regenrate again lock --- poetry.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index ed82bf3..b72b585 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1284,18 +1284,18 @@ files = [ [[package]] name = "filelock" -version = "3.14.0" +version = "3.15.1" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.14.0-py3-none-any.whl", hash = "sha256:43339835842f110ca7ae60f1e1c160714c5a6afd15a2873419ab185334975c0f"}, - {file = "filelock-3.14.0.tar.gz", hash = "sha256:6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a"}, + {file = "filelock-3.15.1-py3-none-any.whl", hash = "sha256:71b3102950e91dfc1bb4209b64be4dc8854f40e5f534428d8684f953ac847fac"}, + {file = "filelock-3.15.1.tar.gz", hash = "sha256:58a2549afdf9e02e10720eaa4d4470f56386d7a6f72edd7d0596337af8ed7ad8"}, ] [package.extras] docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-asyncio (>=0.21)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] typing = ["typing-extensions (>=4.8)"] [[package]] @@ -4214,12 +4214,12 @@ files = [ [[package]] name = "pulumi" -version = "3.119.0" +version = "3.120.0" description = "Pulumi's Python SDK" optional = true python-versions = ">=3.8" files = [ - {file = "pulumi-3.119.0-py3-none-any.whl", hash = "sha256:a8c278f58c747846a83b31c38a0a0e0313bf0459c9b2282f98b9f73a2e99e7c7"}, + {file = "pulumi-3.120.0-py3-none-any.whl", hash = "sha256:786f0bd54c64e15afba92a4a5c22480d2c322315d867c1532525c069a7615b09"}, ] [package.dependencies] From 2a86c3e4a17fa298024685990a52a72ca18b1614 Mon Sep 17 00:00:00 2001 From: Dr Griffith Rees Date: Thu, 13 Jun 2024 10:36:29 +0100 Subject: [PATCH 3/6] chore: run `pre-commit run --all-files` to fix `poetry.lock` --- poetry.lock | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/poetry.lock b/poetry.lock index ed82bf3..694e213 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1284,18 +1284,18 @@ files = [ [[package]] name = "filelock" -version = "3.14.0" +version = "3.15.1" description = "A platform independent file lock." optional = false python-versions = ">=3.8" files = [ - {file = "filelock-3.14.0-py3-none-any.whl", hash = "sha256:43339835842f110ca7ae60f1e1c160714c5a6afd15a2873419ab185334975c0f"}, - {file = "filelock-3.14.0.tar.gz", hash = "sha256:6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a"}, + {file = "filelock-3.15.1-py3-none-any.whl", hash = "sha256:71b3102950e91dfc1bb4209b64be4dc8854f40e5f534428d8684f953ac847fac"}, + {file = "filelock-3.15.1.tar.gz", hash = "sha256:58a2549afdf9e02e10720eaa4d4470f56386d7a6f72edd7d0596337af8ed7ad8"}, ] [package.extras] docs = ["furo (>=2023.9.10)", "sphinx (>=7.2.6)", "sphinx-autodoc-typehints (>=1.25.2)"] -testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] +testing = ["covdefaults (>=2.3)", "coverage (>=7.3.2)", "diff-cover (>=8.0.1)", "pytest (>=7.4.3)", "pytest-asyncio (>=0.21)", "pytest-cov (>=4.1)", "pytest-mock (>=3.12)", "pytest-timeout (>=2.2)"] typing = ["typing-extensions (>=4.8)"] [[package]] @@ -4214,12 +4214,12 @@ files = [ [[package]] name = "pulumi" -version = "3.119.0" +version = "3.120.0" description = "Pulumi's Python SDK" optional = true python-versions = ">=3.8" files = [ - {file = "pulumi-3.119.0-py3-none-any.whl", hash = "sha256:a8c278f58c747846a83b31c38a0a0e0313bf0459c9b2282f98b9f73a2e99e7c7"}, + {file = "pulumi-3.120.0-py3-none-any.whl", hash = "sha256:786f0bd54c64e15afba92a4a5c22480d2c322315d867c1532525c069a7615b09"}, ] [package.dependencies] @@ -4664,6 +4664,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, From 3ca1c2ba283522c739cca68d5b3e5f6fba84c4e1 Mon Sep 17 00:00:00 2001 From: KatrionaGoldmann Date: Thu, 13 Jun 2024 10:59:11 +0100 Subject: [PATCH 4/6] chore: fix --- poetry.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/poetry.lock b/poetry.lock index 2598565..b68a58e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -3517,6 +3517,7 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, From c32ca65d2ca1ea8906be85ed446ffad2e24de28c Mon Sep 17 00:00:00 2001 From: Dr Griffith Rees Date: Thu, 13 Jun 2024 11:19:13 +0100 Subject: [PATCH 5/6] chore: update `pyproject.toml` `authors` --- pyproject.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 11e98a9..ff73adc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,7 +13,9 @@ authors = ["Evelina Gabasova ", "David Beavan ", "Levan Bokeria ", "Martin O'Reilly ", - "Oliver Strickson "] + "Oliver Strickson ", + "Katriona Goldmann ", + "Griffith Rees "] readme = "README.md" [tool.poetry.dependencies] From 5118d1bc01fadd830e9041ad745a863003ea3d89 Mon Sep 17 00:00:00 2001 From: rchan Date: Thu, 13 Jun 2024 12:08:49 +0100 Subject: [PATCH 6/6] fix passing of data-dir and which-index --- azure/README.md | 4 ++-- reginald/run.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/azure/README.md b/azure/README.md index bda2439..af80a64 100644 --- a/azure/README.md +++ b/azure/README.md @@ -48,6 +48,6 @@ You will need to source this file before deploying in the next step. 4. Deploy with Pulumi ```bash -> source .secrets (if this exists) -> AZURE_KEYVAULT_AUTH_VIA_CLI=true pulumi up +source .secrets +AZURE_KEYVAULT_AUTH_VIA_CLI=true pulumi up ``` diff --git a/reginald/run.py b/reginald/run.py index 26bb099..ef1c6fb 100644 --- a/reginald/run.py +++ b/reginald/run.py @@ -19,6 +19,8 @@ def main( asyncio.run( run_full_pipeline( + data_dir=data_dir, + which_index=which_index, slack_app_token=slack_app_token, slack_bot_token=slack_bot_token, **kwargs, @@ -38,7 +40,9 @@ def main( elif cli == "app": from reginald.models.app import run_reginald_app - asyncio.run(run_reginald_app(**kwargs)) + asyncio.run( + run_reginald_app(data_dir=data_dir, which_index=which_index, **kwargs) + ) elif cli == "chat": import warnings @@ -46,7 +50,9 @@ def main( from reginald.models.chat_interact import run_chat_interact - run_chat_interact(streaming=streaming, **kwargs) + run_chat_interact( + streaming=streaming, data_dir=data_dir, which_index=which_index, **kwargs + ) elif cli == "create_index": from reginald.models.create_index import create_index