Add user pytests #206

amiraliemami · 2024-05-14T07:51:56Z

Reviewer: @suzinyou
Estimate: 30mins

Ticket

Fixes: 518

Description

Goal

Add pytests for

the api key rotation endpoint
user table functions
content CRUD user overlaps
UD CRUD
user2 token denial for retrieval and UD detect

How has this been tested?

Activate the aaq environment and run make tests in core_backend
Added where to find login credentials to dev docs

Checklist

Fill with x for completed. Delete any lines that are not relevant

My code follows the style guidelines of this project
I have reviewed my own code to ensure good quality
I have tested the functionality of my code to ensure it works as intended
I have resolved merge conflicts
I have updated the automated tests (if applicable)
I have updated the requirements (if applicable)

amiraliemami · 2024-05-14T09:06:04Z

Hey @sidravi1 @suzinyou I’ve done my best on adding pytests for the multi-user feature.

All my tests work now but the way async is being handled is making some UD tests fail and I can’t figure it out. Could you guys have a look and let me know if you can find out why it’s failing?
Also, I don’t have much experience with fixtures and pytests so it’s likely there’s a better way to handle the manual user additions that are done right now.

core_backend/tests/api/test_key_management.py

suzinyou · 2024-05-16T07:28:17Z

core_backend/tests/api/test_manage_content.py

+    @pytest.mark.parametrize(
+        "content_title, content_text, content_metadata",
+        [("title 3", "test content 3", {})],
+    )


parametrize makes sense if we want to test multiple different combos of parameters, but
seems like we're just using one! Fine to keep it though I think

suzinyou

Thanks Amir!! Left some suggestions/questions.

This is not part of this PR but I'm seeing this deprecation warning:

The method "utcnow" in class "datetime" is deprecated
Use timezone-aware objects to represent datetimes in UTC; e.g. by calling .now(datetime.UTC)

suzinyou · 2024-05-16T07:44:21Z

core_backend/tests/api/test_manage_content.py

+        # make content as user1
+        response = client.post(
+            "/content",
+            headers={"Authorization": f"Bearer {fullaccess_token}"},
+            json={
+                "content_title": content_title,
+                "content_text": content_text,
+                "content_language": "ENGLISH",
+                "content_metadata": content_metadata,
+            },
+        )
+        assert response.status_code == 200
+        json_response = response.json()
+        assert json_response["content_metadata"] == content_metadata
+        assert "content_id" in json_response
+


Thanks for this!! May I suggest breaking down this tests however?
Each comment defines what the next block of code is testing... ideally each test would
be that block of code! Because if we fail "try and fail to fetch content as user2" we
have no idea whether the rest of the logic works or not.

I think you can use something like the existing_content_id fixture to achieve this.
Create a fixture like that using user 1, and reuse it for each unit test:

User 1 can delete it (*although I think this is tested by the TestManageContent class?)

User 2 can't get it

User 2 can't edit it

User 2 can't delete it

core_backend/tests/api/test_manage_ud_rules.py

core_backend/tests/api/test_users.py

amiraliemami · 2024-05-16T08:36:44Z

This is not part of this PR but I'm seeing this deprecation warning:

The method "utcnow" in class "datetime" is deprecated
Use timezone-aware objects to represent datetimes in UTC; e.g. by calling .now(datetime.UTC)

Yup, been ignoring it lol added a backlog ticket to fix this

…dpoint

* add postgres vars to template.env for clarity of use * remove deprecated "version" tag from local docker-compose scripts * change fullaccess and readonly users to user1 and user2 with fullaccess permissions * clarify `NEXT_PUBLIC_BACKEND_URL` variable in api.ts * Add user_id column to ContentDB and update content endpoints. NOTE: user_id hardcoded into QA and WhatsApp endpoints - to be inferred from bearer token later. * Admin app: Show username in profile dropdown * Disable "readonly" tests. Will add back in next PR. * Fix mismatch between get_llm_answer() and its decorators' expectation of a "question" parameter * Undo dropping of the `content_idx` index. Fix source issue later. * Remove duplicated unused AccessLevel declaration in contents schema * Add user table to db * Update backend to use new users table * Change content table user_id column to foreign key * Update env var names * Fix "question" parameter in get_semantic_matches() to match its decorators' expectation * Hardcode QA endpoints to use "user1"s data. Will make dynamic in next PR. * Disable WhatsApp pytests - WhatsApp endpoint is broken due to no access to auth information * Make initial user-loading script standalone and use it in dev setup and update Dockerfile deployment * Make usernames environment variables too * Add user addition in DB to pytests * update default usernames to user1 and user2 * create_content() description fix * Use `.one()` instead of `.scalar_one()` and add MultipleResultsFound exception * Change "user-queries" table to "query". Prevents confusion with AAQ users. * Table "user-query-responses" -> "query-response" * Table "user-query-response-errors" -> "query-response-error" * Table "response_feedback" -> "query-response-feedback" * Table "content_feedback" -> "content-feedback" * Standardise migration file messages * Stardise migration file names (no functionality change) * Fix feedback tables index col names * Remove "User" prefix from Query, QueryResponse, QueryResponseError table models * Remove "User" prefix from content schemas * Add "retrieval_key" column to user table and update QA endpoints to be user-aware * Update typebot flow with "RETRIEVAL_KEY" wording * Update pytest * Add user_id column to query table and store which user's account each query is associated with * Update feedback endpoints to be user-aware * Catch rogue outdated "UserQueryBase" * Implementing hashing of keys and update DB and tests * update migration filename * add key updation endpoint * Make keys 32 bytes and remove unnecessary character count check * Remove unnecessary spaces in Edit page * BUGFIX: Background on playground is always white even after scroll * Add tags to WhatsApp and Auth endpoint routers * Add temporary password column and move auth env vars to main config.py * [temp] disable new key route to avoid circular import * Temp: Add non-generator async session maker * MAJOR: Auth now checks DB for user info and returns user_db if found. Fullaccess and readonly removed. * Remove mentions of access levels from docs * correctly close db sessions in auth * Remove "readonly" tests and test constructions * organise imports * Make "/key" rotator endpoint functional again (avoiding circular imports 😭) * change KeyResponse parameter * Give tests their own user id/name/password/retrieval key * Remove readonly as an accepted option for access_level * Move number of bytes to top of file * Remove leftover comments * Move username-password-key env vars to loading script instead of configs.py * Don't use catch-all "except Exception" * Use `get_sqlalchemy_async_engine()` with `with` directly in auth code to ensure sessions are closed correctly * Make username and key columns unique and remove MultipleResults errors * Remove leftover .aclose() statements * Make UD multi-user and update tests * add user_id to contentdb pretty print * Cleanup UD parameters and add keywords to function calls * fix migration version after rebase * add line length for ruff * Rename authentication functions * Combine migrations (#197) * Combine pre-multiuser migrations that could be combined * Combine multiuser migrations * standardise wording of migration * add date template for migration filenames * Add dates to migration filenames * Fix "NEXT_PUBLIC_BACKEND_URL" in api.ts (UD merge issue) * Fix merge issues * add names to foreign key migrations * fix auth on page * Google login (#205) * first go at google auth * fixed env vars * updated tests * removed print statement * updated script to add users * added stubs to requirements * deployment updates * Update admin_app/src/app/login/page.tsx Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * fixes from PR * fixes from PR * skipping type checking for google auth --------- Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * HOTFIX: Bring unsalted hashing back for retrieval keys * HOTFIX: Mention Google login client ID env var in dev docs * HOTFIX: env var name in api.ts * Key generation UI (#211) * Correct usage of "startIcon" in New buttons * Add API key generation to front-end * Move modals to components file and other improvements * Add link to integrations page in Playground API key popup * Remove mentions of "current key" for now * Make copy button visually responsive too * Improve spacing on new key modal * Clean up modal button margins * fix format * Add user pytests (#206) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> * Make dashboard multi-user + some admin app cleanup (#213) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture * Playground: Add type of search to user message display * Make dashboard functions filter on user_id * Playground: change "JSON" to "<json>" in error message response. * UD page: Make background white for now * move key_management tests to run last :) * Remove incorrect retrieval tests * improve query type formatting and use save button for ud rule --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * Add pytests to check user1-user2 overlap in retrieval and urgency detect * Update AWS terraform and secret loading (#217) * Change all instances of "retrieval key" to "api key" * Add new user and google client ID env vars to terraform and bootstrap * fix spacing error * [AAQ-482] Add custom embeddings as optional components (#201) * add embeddings * Update docker-compose * update embeddings app * Add make command * Add default embedding * Add docstring * add as an optional component * Fix UD migration issue * add embeddings endpoint to llm proxy * Update optional_components/embeddings/requirements.txt Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * update docker-compose * Remove completion endpoint * fix linting * Fix PR comments * change size of vector --------- Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * add workflow dispatch force redeployment to admin app cicd * fix command * add manual force creation of task def to all other cicd scripts --------- Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> Co-authored-by: lickem22 <44327443+lickem22@users.noreply.github.com> --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> Co-authored-by: lickem22 <44327443+lickem22@users.noreply.github.com>

* add postgres vars to template.env for clarity of use * remove deprecated "version" tag from local docker-compose scripts * change fullaccess and readonly users to user1 and user2 with fullaccess permissions * clarify `NEXT_PUBLIC_BACKEND_URL` variable in api.ts * Add user_id column to ContentDB and update content endpoints. NOTE: user_id hardcoded into QA and WhatsApp endpoints - to be inferred from bearer token later. * Admin app: Show username in profile dropdown * Disable "readonly" tests. Will add back in next PR. * Fix mismatch between get_llm_answer() and its decorators' expectation of a "question" parameter * Undo dropping of the `content_idx` index. Fix source issue later. * Remove duplicated unused AccessLevel declaration in contents schema * Add user table to db * Update backend to use new users table * Change content table user_id column to foreign key * Update env var names * Fix "question" parameter in get_semantic_matches() to match its decorators' expectation * Hardcode QA endpoints to use "user1"s data. Will make dynamic in next PR. * Disable WhatsApp pytests - WhatsApp endpoint is broken due to no access to auth information * Make initial user-loading script standalone and use it in dev setup and update Dockerfile deployment * Make usernames environment variables too * Add user addition in DB to pytests * update default usernames to user1 and user2 * create_content() description fix * Use `.one()` instead of `.scalar_one()` and add MultipleResultsFound exception * Change "user-queries" table to "query". Prevents confusion with AAQ users. * Table "user-query-responses" -> "query-response" * Table "user-query-response-errors" -> "query-response-error" * Table "response_feedback" -> "query-response-feedback" * Table "content_feedback" -> "content-feedback" * Standardise migration file messages * Stardise migration file names (no functionality change) * Fix feedback tables index col names * Remove "User" prefix from Query, QueryResponse, QueryResponseError table models * Remove "User" prefix from content schemas * Add "retrieval_key" column to user table and update QA endpoints to be user-aware * Update typebot flow with "RETRIEVAL_KEY" wording * Update pytest * Add user_id column to query table and store which user's account each query is associated with * Update feedback endpoints to be user-aware * Catch rogue outdated "UserQueryBase" * Implementing hashing of keys and update DB and tests * update migration filename * add key updation endpoint * Make keys 32 bytes and remove unnecessary character count check * Remove unnecessary spaces in Edit page * BUGFIX: Background on playground is always white even after scroll * Add tags to WhatsApp and Auth endpoint routers * Add temporary password column and move auth env vars to main config.py * [temp] disable new key route to avoid circular import * Temp: Add non-generator async session maker * MAJOR: Auth now checks DB for user info and returns user_db if found. Fullaccess and readonly removed. * Remove mentions of access levels from docs * correctly close db sessions in auth * Remove "readonly" tests and test constructions * organise imports * Make "/key" rotator endpoint functional again (avoiding circular imports 😭) * change KeyResponse parameter * Give tests their own user id/name/password/retrieval key * Remove readonly as an accepted option for access_level * Move number of bytes to top of file * Remove leftover comments * Move username-password-key env vars to loading script instead of configs.py * Don't use catch-all "except Exception" * Use `get_sqlalchemy_async_engine()` with `with` directly in auth code to ensure sessions are closed correctly * Make username and key columns unique and remove MultipleResults errors * Remove leftover .aclose() statements * Make UD multi-user and update tests * add user_id to contentdb pretty print * Cleanup UD parameters and add keywords to function calls * fix migration version after rebase * add line length for ruff * Rename authentication functions * Combine migrations (#197) * Combine pre-multiuser migrations that could be combined * Combine multiuser migrations * standardise wording of migration * add date template for migration filenames * Add dates to migration filenames * Fix "NEXT_PUBLIC_BACKEND_URL" in api.ts (UD merge issue) * Add content tag models * Fix merge issues * add names to foreign key migrations * fix auth on page * Google login (#205) * first go at google auth * fixed env vars * updated tests * removed print statement * updated script to add users * added stubs to requirements * deployment updates * Update admin_app/src/app/login/page.tsx Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * fixes from PR * fixes from PR * skipping type checking for google auth --------- Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * HOTFIX: Bring unsalted hashing back for retrieval keys * HOTFIX: Mention Google login client ID env var in dev docs * HOTFIX: env var name in api.ts * Key generation UI (#211) * Correct usage of "startIcon" in New buttons * Add API key generation to front-end * Move modals to components file and other improvements * Add link to integrations page in Playground API key popup * Remove mentions of "current key" for now * Make copy button visually responsive too * Improve spacing on new key modal * Clean up modal button margins * fix format * Add user pytests (#206) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> * Add tags bar * Make dashboard multi-user + some admin app cleanup (#213) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture * Playground: Add type of search to user message display * Make dashboard functions filter on user_id * Playground: change "JSON" to "<json>" in error message response. * UD page: Make background white for now * move key_management tests to run last :) * Remove incorrect retrieval tests * improve query type formatting and use save button for ud rule --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * Fix rebase issues * Fix linting * Fix PR comments * Update setup.md * Add additional tests * Fix linting --------- Co-authored-by: amir_emami <amirali1376@gmail.com> Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com>

* add postgres vars to template.env for clarity of use * remove deprecated "version" tag from local docker-compose scripts * change fullaccess and readonly users to user1 and user2 with fullaccess permissions * clarify `NEXT_PUBLIC_BACKEND_URL` variable in api.ts * Add user_id column to ContentDB and update content endpoints. NOTE: user_id hardcoded into QA and WhatsApp endpoints - to be inferred from bearer token later. * Admin app: Show username in profile dropdown * Disable "readonly" tests. Will add back in next PR. * Fix mismatch between get_llm_answer() and its decorators' expectation of a "question" parameter * Undo dropping of the `content_idx` index. Fix source issue later. * Remove duplicated unused AccessLevel declaration in contents schema * Add user table to db * Update backend to use new users table * Change content table user_id column to foreign key * Update env var names * Fix "question" parameter in get_semantic_matches() to match its decorators' expectation * Hardcode QA endpoints to use "user1"s data. Will make dynamic in next PR. * Disable WhatsApp pytests - WhatsApp endpoint is broken due to no access to auth information * Make initial user-loading script standalone and use it in dev setup and update Dockerfile deployment * Make usernames environment variables too * Add user addition in DB to pytests * update default usernames to user1 and user2 * create_content() description fix * Use `.one()` instead of `.scalar_one()` and add MultipleResultsFound exception * Change "user-queries" table to "query". Prevents confusion with AAQ users. * Table "user-query-responses" -> "query-response" * Table "user-query-response-errors" -> "query-response-error" * Table "response_feedback" -> "query-response-feedback" * Table "content_feedback" -> "content-feedback" * Standardise migration file messages * Stardise migration file names (no functionality change) * Fix feedback tables index col names * Remove "User" prefix from Query, QueryResponse, QueryResponseError table models * Remove "User" prefix from content schemas * Add "retrieval_key" column to user table and update QA endpoints to be user-aware * Update typebot flow with "RETRIEVAL_KEY" wording * Update pytest * Add user_id column to query table and store which user's account each query is associated with * Update feedback endpoints to be user-aware * Catch rogue outdated "UserQueryBase" * Implementing hashing of keys and update DB and tests * update migration filename * add key updation endpoint * Make keys 32 bytes and remove unnecessary character count check * Remove unnecessary spaces in Edit page * BUGFIX: Background on playground is always white even after scroll * Add tags to WhatsApp and Auth endpoint routers * Add temporary password column and move auth env vars to main config.py * [temp] disable new key route to avoid circular import * Temp: Add non-generator async session maker * MAJOR: Auth now checks DB for user info and returns user_db if found. Fullaccess and readonly removed. * Remove mentions of access levels from docs * correctly close db sessions in auth * Remove "readonly" tests and test constructions * organise imports * Make "/key" rotator endpoint functional again (avoiding circular imports 😭) * change KeyResponse parameter * Give tests their own user id/name/password/retrieval key * Remove readonly as an accepted option for access_level * Move number of bytes to top of file * Remove leftover comments * Move username-password-key env vars to loading script instead of configs.py * Don't use catch-all "except Exception" * Use `get_sqlalchemy_async_engine()` with `with` directly in auth code to ensure sessions are closed correctly * Make username and key columns unique and remove MultipleResults errors * Remove leftover .aclose() statements * Make UD multi-user and update tests * add user_id to contentdb pretty print * Cleanup UD parameters and add keywords to function calls * fix migration version after rebase * add line length for ruff * Rename authentication functions * Combine migrations (#197) * Combine pre-multiuser migrations that could be combined * Combine multiuser migrations * standardise wording of migration * add date template for migration filenames * Add dates to migration filenames * Fix "NEXT_PUBLIC_BACKEND_URL" in api.ts (UD merge issue) * Fix merge issues * add names to foreign key migrations * fix auth on page * Google login (#205) * first go at google auth * fixed env vars * updated tests * removed print statement * updated script to add users * added stubs to requirements * deployment updates * Update admin_app/src/app/login/page.tsx Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * fixes from PR * fixes from PR * skipping type checking for google auth --------- Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * HOTFIX: Bring unsalted hashing back for retrieval keys * HOTFIX: Mention Google login client ID env var in dev docs * HOTFIX: env var name in api.ts * Key generation UI (#211) * Correct usage of "startIcon" in New buttons * Add API key generation to front-end * Move modals to components file and other improvements * Add link to integrations page in Playground API key popup * Remove mentions of "current key" for now * Make copy button visually responsive too * Improve spacing on new key modal * Clean up modal button margins * fix format * Add user pytests (#206) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> * Make dashboard multi-user + some admin app cleanup (#213) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture * Playground: Add type of search to user message display * Make dashboard functions filter on user_id * Playground: change "JSON" to "<json>" in error message response. * UD page: Make background white for now * move key_management tests to run last :) * Remove incorrect retrieval tests * improve query type formatting and use save button for ud rule --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * Add pytests to check user1-user2 overlap in retrieval and urgency detect * Update AWS terraform and secret loading (#217) * Change all instances of "retrieval key" to "api key" * Add new user and google client ID env vars to terraform and bootstrap * fix spacing error * [AAQ-482] Add custom embeddings as optional components (#201) * add embeddings * Update docker-compose * update embeddings app * Add make command * Add default embedding * Add docstring * add as an optional component * Fix UD migration issue * add embeddings endpoint to llm proxy * Update optional_components/embeddings/requirements.txt Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * update docker-compose * Remove completion endpoint * fix linting * Fix PR comments * change size of vector --------- Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * add workflow dispatch force redeployment to admin app cicd * fix command * add manual force creation of task def to all other cicd scripts --------- Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> Co-authored-by: lickem22 <44327443+lickem22@users.noreply.github.com> --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> Co-authored-by: lickem22 <44327443+lickem22@users.noreply.github.com>

* add postgres vars to template.env for clarity of use * remove deprecated "version" tag from local docker-compose scripts * change fullaccess and readonly users to user1 and user2 with fullaccess permissions * clarify `NEXT_PUBLIC_BACKEND_URL` variable in api.ts * Add user_id column to ContentDB and update content endpoints. NOTE: user_id hardcoded into QA and WhatsApp endpoints - to be inferred from bearer token later. * Admin app: Show username in profile dropdown * Disable "readonly" tests. Will add back in next PR. * Fix mismatch between get_llm_answer() and its decorators' expectation of a "question" parameter * Undo dropping of the `content_idx` index. Fix source issue later. * Remove duplicated unused AccessLevel declaration in contents schema * Add user table to db * Update backend to use new users table * Change content table user_id column to foreign key * Update env var names * Fix "question" parameter in get_semantic_matches() to match its decorators' expectation * Hardcode QA endpoints to use "user1"s data. Will make dynamic in next PR. * Disable WhatsApp pytests - WhatsApp endpoint is broken due to no access to auth information * Make initial user-loading script standalone and use it in dev setup and update Dockerfile deployment * Make usernames environment variables too * Add user addition in DB to pytests * update default usernames to user1 and user2 * create_content() description fix * Use `.one()` instead of `.scalar_one()` and add MultipleResultsFound exception * Change "user-queries" table to "query". Prevents confusion with AAQ users. * Table "user-query-responses" -> "query-response" * Table "user-query-response-errors" -> "query-response-error" * Table "response_feedback" -> "query-response-feedback" * Table "content_feedback" -> "content-feedback" * Standardise migration file messages * Stardise migration file names (no functionality change) * Fix feedback tables index col names * Remove "User" prefix from Query, QueryResponse, QueryResponseError table models * Remove "User" prefix from content schemas * Add "retrieval_key" column to user table and update QA endpoints to be user-aware * Update typebot flow with "RETRIEVAL_KEY" wording * Update pytest * Add user_id column to query table and store which user's account each query is associated with * Update feedback endpoints to be user-aware * Catch rogue outdated "UserQueryBase" * Implementing hashing of keys and update DB and tests * update migration filename * add key updation endpoint * Make keys 32 bytes and remove unnecessary character count check * Remove unnecessary spaces in Edit page * BUGFIX: Background on playground is always white even after scroll * Add tags to WhatsApp and Auth endpoint routers * Add temporary password column and move auth env vars to main config.py * [temp] disable new key route to avoid circular import * Temp: Add non-generator async session maker * MAJOR: Auth now checks DB for user info and returns user_db if found. Fullaccess and readonly removed. * Remove mentions of access levels from docs * correctly close db sessions in auth * Remove "readonly" tests and test constructions * organise imports * Make "/key" rotator endpoint functional again (avoiding circular imports 😭) * change KeyResponse parameter * Give tests their own user id/name/password/retrieval key * Remove readonly as an accepted option for access_level * Move number of bytes to top of file * Remove leftover comments * Move username-password-key env vars to loading script instead of configs.py * Don't use catch-all "except Exception" * Use `get_sqlalchemy_async_engine()` with `with` directly in auth code to ensure sessions are closed correctly * Make username and key columns unique and remove MultipleResults errors * Remove leftover .aclose() statements * Make UD multi-user and update tests * add user_id to contentdb pretty print * Cleanup UD parameters and add keywords to function calls * fix migration version after rebase * add line length for ruff * Rename authentication functions * Combine migrations (#197) * Combine pre-multiuser migrations that could be combined * Combine multiuser migrations * standardise wording of migration * add date template for migration filenames * Add dates to migration filenames * Fix "NEXT_PUBLIC_BACKEND_URL" in api.ts (UD merge issue) * Add content tag models * Fix merge issues * add names to foreign key migrations * fix auth on page * Google login (#205) * first go at google auth * fixed env vars * updated tests * removed print statement * updated script to add users * added stubs to requirements * deployment updates * Update admin_app/src/app/login/page.tsx Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * fixes from PR * fixes from PR * skipping type checking for google auth --------- Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * HOTFIX: Bring unsalted hashing back for retrieval keys * HOTFIX: Mention Google login client ID env var in dev docs * HOTFIX: env var name in api.ts * Key generation UI (#211) * Correct usage of "startIcon" in New buttons * Add API key generation to front-end * Move modals to components file and other improvements * Add link to integrations page in Playground API key popup * Remove mentions of "current key" for now * Make copy button visually responsive too * Improve spacing on new key modal * Clean up modal button margins * fix format * Add user pytests (#206) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> * Add tags bar * Make dashboard multi-user + some admin app cleanup (#213) * Add key management endpoint pytest * TEMP: Add test for user functions (not working due to async issue) * fix scope of asession in test_urgency_detect (future-proofing) * Fix user tests with async session * Add where to set/find login credentials to docs * Temporary fix for rotation endpoint test * Fix scope mismatch (some UD tests break) * Add multi-user tests for content CRUD * Add multi-user tests for UD CRUD + add fetch check first in delete endpoint * Add user2 token denial test to retrieval and UD detect * Put multi-user tests under a different class * fixed async tests in session scope issue * Make test user_ids integers to match new schema * Fix handling of user_ids in pytest * Separate content CRUD multi-user tests and use fixture * Separate UD CRUD multi-user tests and use fixture * Playground: Add type of search to user message display * Make dashboard functions filter on user_id * Playground: change "JSON" to "<json>" in error message response. * UD page: Make background white for now * move key_management tests to run last :) * Remove incorrect retrieval tests * improve query type formatting and use save button for ud rule --------- Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com> * Fix rebase issues * Add tags filter to landing * Fix position of tags in landing * merge main * Fix tags models * Update setup.md * Update setup.md * Add doc * Update admin_app/src/app/content/edit/page.tsx Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> * Fix tag add warning * Fix tags bar issues * Update add_content_to_db script * Update page.tsx * Add tags * remove changes from script --------- Co-authored-by: amir_emami <amirali1376@gmail.com> Co-authored-by: Amir Emami <41763233+amiraliemami@users.noreply.github.com> Co-authored-by: Sid Ravinutala <sid.ravi1@gmail.com> Co-authored-by: Suzin You <7042047+suzinyou@users.noreply.github.com>

amiraliemami requested review from suzinyou, sidravi1 and lickem22 and removed request for suzinyou, sidravi1 and lickem22 May 14, 2024 07:51

amiraliemami marked this pull request as draft May 14, 2024 08:49

amiraliemami changed the title ~~Add user pytests~~ [DRAFT] Add user pytests May 14, 2024

amiraliemami requested review from sidravi1 and suzinyou May 14, 2024 09:06

amiraliemami force-pushed the multitenancy/tests branch from 844011f to 1b072ee Compare May 15, 2024 14:26

amiraliemami marked this pull request as ready for review May 15, 2024 14:49

amiraliemami changed the title ~~[DRAFT] Add user pytests~~ Add user pytests May 15, 2024

amiraliemami force-pushed the multitenancy/tests branch 3 times, most recently from 90abda2 to 17e704c Compare May 16, 2024 06:40

suzinyou reviewed May 16, 2024

View reviewed changes

suzinyou requested changes May 16, 2024

View reviewed changes

amiraliemami force-pushed the multitenancy/tests branch 2 times, most recently from 0181383 to b9e9a51 Compare May 16, 2024 17:08

amiraliemami requested a review from suzinyou May 16, 2024 17:08

amiraliemami added 7 commits May 16, 2024 23:55

Add key management endpoint pytest

c7786f8

TEMP: Add test for user functions (not working due to async issue)

076c50e

fix scope of asession in test_urgency_detect (future-proofing)

31ad181

Fix user tests with async session

a917b65

Add where to set/find login credentials to docs

3da512f

Temporary fix for rotation endpoint test

1337025

Fix scope mismatch (some UD tests break)

2c7d574

amiraliemami and others added 9 commits May 16, 2024 23:55

Add multi-user tests for content CRUD

0bdd459

Add multi-user tests for UD CRUD + add fetch check first in delete en…

36f3f7d

…dpoint

Add user2 token denial test to retrieval and UD detect

d81786e

Put multi-user tests under a different class

6d653d6

fixed async tests in session scope issue

548821f

Make test user_ids integers to match new schema

a7203c1

Fix handling of user_ids in pytest

6e21978

Separate content CRUD multi-user tests and use fixture

dbcf423

Separate UD CRUD multi-user tests and use fixture

b41dae0

amiraliemami force-pushed the multitenancy/tests branch from b9e9a51 to b41dae0 Compare May 16, 2024 18:25

amiraliemami requested review from lickem22 and Tanmay-97 as code owners May 16, 2024 18:25

amiraliemami mentioned this pull request May 16, 2024

Make dashboard multi-user + some admin app cleanup #213

Merged

5 tasks

suzinyou approved these changes May 17, 2024

View reviewed changes

suzinyou merged commit e4e030a into multitenancy/feature May 17, 2024
3 checks passed

suzinyou deleted the multitenancy/tests branch May 17, 2024 05:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add user pytests #206

Add user pytests #206

amiraliemami commented May 14, 2024 •

edited

Loading

amiraliemami commented May 14, 2024

suzinyou May 16, 2024

suzinyou left a comment

suzinyou May 16, 2024

amiraliemami commented May 16, 2024

Add user pytests #206

Add user pytests #206

Conversation

amiraliemami commented May 14, 2024 • edited Loading

Ticket

Description

Goal

How has this been tested?

Checklist

amiraliemami commented May 14, 2024

suzinyou May 16, 2024

Choose a reason for hiding this comment

suzinyou left a comment

Choose a reason for hiding this comment

suzinyou May 16, 2024

Choose a reason for hiding this comment

amiraliemami commented May 16, 2024

amiraliemami commented May 14, 2024 •

edited

Loading