Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organizations DB models, CRUD and tests #238

Merged
merged 9 commits into from
Jun 19, 2024

Conversation

EugeneLightsOn
Copy link
Collaborator

@EugeneLightsOn EugeneLightsOn commented Jun 18, 2024

  • Organizations DB models, CRUD and tests

AI Description

This PR introduces organizations to the backend. It adds the ability to create, retrieve, update, and delete organizations, as well as manage the association between users and organizations.

  • New Files:

    • src/backend/alembic/versions/19127a0eeefb_.py
    • src/backend/database_models/organization.py
    • src/backend/schemas/organization.py
    • src/backend/tests/factories/organization.py
  • Updated Files:

    • src/backend/database_models/__init__.py
    • src/backend/database_models/agent.py
    • src/backend/database_models/conversation.py
    • src/backend/schemas/__init__.py
    • src/backend/schemas/agent.py
    • src/backend/schemas/conversation.py
    • src/backend/tests/crud/test_organization.py
    • src/backend/tests/factories/__init__.py
    • src/backend/tools/python_interpreter.py

src/backend/alembic/versions/19127a0eeefb_.py

This file contains Alembic migration scripts to update the database schema. It adds tables for organizations and user_organization, as well as foreign key constraints to the agents and conversations tables.

src/backend/database_models/organization.py

This file defines the Organization database model, which represents an organization with attributes like name, users, conversations, and agents`.

src/backend/schemas/organization.py

This file defines the Organization Pydantic model, which includes fields like id, name, created_at, and updated_at. It also includes related classes like CreateOrganization, UpdateOrganization, and DeleteOrganization.

src/backend/tests/factories/organization.py

This file contains a factory class, OrganizationFactory, used for generating test data for organizations.

src/backend/database_models/agent.py, src/backend/database_models/conversation.py, src/backend/schemas/agent.py, src/backend/schemas/conversation.py

These files have been updated to include references to the new Organization model and its attributes.

src/backend/tests/crud/test_organization.py

This file contains tests for the CRUD operations on organizations. It includes tests for creating, retrieving, updating, and deleting organizations, as well as listing organizations by user ID and adding/removing users from organizations.

src/backend/tools/python_interpreter.py

This file has been updated to import the load_dotenv function from dotenv.

Copy link
Collaborator

@tianjing-li tianjing-li left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great!

src/backend/database_models/user.py Outdated Show resolved Hide resolved
@EugeneLightsOn EugeneLightsOn merged commit 457df1d into main Jun 19, 2024
4 checks passed
@EugeneLightsOn EugeneLightsOn deleted the eugene/TLK-568_organizations branch June 19, 2024 19:49
sanal-cohere pushed a commit that referenced this pull request Jun 21, 2024
* Organizations initial commit

* Organizations initial commit

* Organizations initial commit - sync main

* Organizations initial commit - sync main - blacked

* Organizations initial commit - sync main - lint

* Organizations initial commit - sync main - tests

* Organizations initial commit - sync main - tests

* Organizations initial commit - review fixes

* Organizations initial commit - review fixes
sanal-cohere added a commit that referenced this pull request Jun 21, 2024
* Initial commit for Compass Tool

* coral-web: update first turn suggestions (#225)

* Addressed comments on the previous commit

* Added custom_context to parse and filters to search

* Formatting changes

* feat(assistant): Update conversation header (#229)

* feat(assistant): Update conversation header

* feat(assistant): Update conversation header

* update tooltip

* fix IconButton import

* Setup: fix dependencies (#243)

* feat(toolkit): show conversation list on with agents list (#231)

* Setup: remove redundant dependency (#244)

* Improve Auth guide (#235)

improve auth guide

* coral-web: create agent + agent base form (#212)

* create new agent form

* render agents list

* link back to base agent page

* perform post submission actions

* move input labels outside of input borders

* move submit button

* gen client

* factor out agent base form

* use default content type

* list custom agents

* check if agent name is unique

* and deployment + env variables to agent form

* add deployments

* clean up

* add submit modal

* push to new agent page on create success

* only show available deployments

* remove deployments dropdown

* feat: List Assistants returned from API (#242)

* feat: list agents from BE

* Update src/interfaces/coral_web/src/components/Conversation/MessagingContainer.tsx

Co-authored-by: misspia-cohere <140425731+misspia-cohere@users.noreply.github.com>

---------

Co-authored-by: misspia-cohere <140425731+misspia-cohere@users.noreply.github.com>

* nits

---------

Co-authored-by: Khalil Najjar <knajjars@gmail.com>

* Propagate should_store logic to the File upload logic (#247)

should_store logic to the attach_files_to_messages

* [backend] passing in agent when calling streaming chat (#237)

* initial chat changes

* need to test

* done

* Remove old test

* default model for agents right now

* Organizations DB models, CRUD and tests   (#238)

* Organizations initial commit

* Organizations initial commit

* Organizations initial commit - sync main

* Organizations initial commit - sync main - blacked

* Organizations initial commit - sync main - lint

* Organizations initial commit - sync main - tests

* Organizations initial commit - sync main - tests

* Organizations initial commit - review fixes

* Organizations initial commit - review fixes

* Split up display name and name for Tools  (#241)

* CHange

* change

* coral-web: update assistant (#248)

* create new agent form

* render agents list

* link back to base agent page

* perform post submission actions

* move input labels outside of input borders

* move submit button

* gen client

* factor out agent base form

* check if agent name is unique

* and deployment + env variables to agent form

* add deployments

* clean up

* remove deployments dropdown

* init agent page

* create agent drawer

* use agent form

* add update agent request

* add get agent request

* fix rebase errors

* remove model from agent form

* add agent drawer to conversation

* remove unused componenets

* use new agent name for update success message

* fix(toolkit): Address code feedback + improvements (#249)

address code feedback improvements

---------

Co-authored-by: Khalil Najjar <knajjars@gmail.com>

* feat(toolkit): add/remove recently used agents (#250)

* feat(toolkit): add/remove recently used agents

* merge main

* Add a walkthrough guide of the toolkit  (#251)

* GUide

* Chang

* Change

* Change

* Update docs/walkthrough/walkthrough.md

Co-authored-by: Luísa Moura <luisa@cohere.com>

* Update walkthrough.md

---------

Co-authored-by: Luísa Moura <luisa@cohere.com>

* coral-web: fix agent info panel opening by default (#253)

cast isEditAgentPanelOpen to boolean

* [backend] enforce agent update with user-id (#246)

* updates

* remove client changes

* remove logs

* use better header user id check

* fix validators

* typo

* Metrics: add middleware (#185)

* Metrics: add middleware

* add chat calls

* merge

* lint

* make it async

* add user id

* add more fields

* add retry and duration

* add meta

* comments

* fix tests

* improve error handling

* rename fields

* match spec

* comments

* clean code

* only create loop when theres endpoint

* add assistant id to chat

* feat(toolkit): show assistant welcome message (#255)

* feat(toolkit): show assistant welcome message

* feat(toolkit): show assistant welcome message

* frontend: Login, logout, and account creation (#179)

* add login page components

* Add Register page and hooks for auth

* Add the register page and connect all the frontend elements

* Redirect to /login if the token expires and clean up some console errors

* Add error messages for failed logins

* frontend: Add Single Sign-on to Toolkit (#227)

* Add Google SSO login plus OpenID components

* Dynamically set SSO login buttons and show or hide username and password based on auth_strategies

---------

Co-authored-by: Tianjing Li <tianjinglimail@gmail.com>

* fix startup event

* Fix build errors and update the API client

* Fix tests by adding missing env vars

Add test OIDC_WELL_KNOWN_ENDPOINT var to fixtures

* Add a walkthrough guide of the toolkit  (#251)

* GUide

* Chang

* Change

* Change

* Update docs/walkthrough/walkthrough.md

Co-authored-by: Luísa Moura <luisa@cohere.com>

* Update walkthrough.md

---------

Co-authored-by: Luísa Moura <luisa@cohere.com>

* coral-web: fix agent info panel opening by default (#253)

cast isEditAgentPanelOpen to boolean

* [backend] enforce agent update with user-id (#246)

* updates

* remove client changes

* remove logs

* use better header user id check

* fix validators

* typo

* Metrics: add middleware (#185)

* Metrics: add middleware

* add chat calls

* merge

* lint

* make it async

* add user id

* add more fields

* add retry and duration

* add meta

* comments

* fix tests

* improve error handling

* rename fields

* match spec

* comments

* clean code

* only create loop when theres endpoint

* add assistant id to chat

* feat(toolkit): show assistant welcome message (#255)

* feat(toolkit): show assistant welcome message

* feat(toolkit): show assistant welcome message

---------

Co-authored-by: misspia-cohere <pia@cohere.com>
Co-authored-by: Tianjing Li <tianjinglimail@gmail.com>
Co-authored-by: Beatrix De Wilde <128378696+BeatrixCohere@users.noreply.github.com>
Co-authored-by: Luísa Moura <luisa@cohere.com>
Co-authored-by: misspia-cohere <140425731+misspia-cohere@users.noreply.github.com>
Co-authored-by: Scott <146760070+scott-cohere@users.noreply.github.com>
Co-authored-by: Khalil Najjar <knajjars@gmail.com>

* fix(toolkit): UX/UI improvements (#257)

* Add error troubleshooting (#262)

* Update chat.py

---------

Co-authored-by: Jessica Wu <jessica@cohere.ai>
Co-authored-by: Khalil Najjar <knajjars@gmail.com>
Co-authored-by: Luísa Moura <luisa@cohere.com>
Co-authored-by: Tomeu <tomeu@cohere.com>
Co-authored-by: Tianjing Li <tianjinglimail@gmail.com>
Co-authored-by: misspia-cohere <140425731+misspia-cohere@users.noreply.github.com>
Co-authored-by: Eugene P <144219719+EugeneLightsOn@users.noreply.github.com>
Co-authored-by: Scott <146760070+scott-cohere@users.noreply.github.com>
Co-authored-by: Beatrix De Wilde <128378696+BeatrixCohere@users.noreply.github.com>
Co-authored-by: Alex W <alex@blinkenlights.ca>
Co-authored-by: misspia-cohere <pia@cohere.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants