Skip to content

Feat/friction less onboarding and usage reporting - #256

Merged
nehabagdia merged 45 commits into
mainfrom
feat/friction_less_onboarding
Apr 29, 2024
Merged

nehabagdia merged 45 commits into
mainfrom
feat/friction_less_onboarding

Conversation

@johnyrahul

@johnyrahul johnyrahul commented Apr 12, 2024 •

Copy link
Copy Markdown
Contributor

What

  • Adding usage data to individual tenant-specific schema
  • Introduce org level adapters
  • Moved socket message subscription to the global level.
  • Validating adapter to check to see if it is usable.

TODO items:

  • Add the SDK-published version. This change is required to pass the adapter instance id while pushing usage data @Deepak-Kesavan
  • Add updated pdm.lock file

Database Migrations

  • Adapter instance 4 new columns added with default values. No data migration is required
  • Added a field in the organization table for max token count set defaulted with -1. No data migration is required

Env Config

Relevant Docs

Related Issues or PRs

Dependencies Versions

Notes on Testing

Screenshots

Checklist

I have read and understood the Contribution Guidelines.

@johnyrahul johnyrahul changed the title Feat/friction less onboarding WIP: Feat/friction less onboarding Apr 12, 2024
@johnyrahul johnyrahul changed the title WIP: Feat/friction less onboarding WIP: Feat/friction less onboarding and usage reporting Apr 23, 2024
@johnyrahul
johnyrahul marked this pull request as ready for review April 26, 2024 07:52
@johnyrahul johnyrahul changed the title WIP: Feat/friction less onboarding and usage reporting Feat/friction less onboarding and usage reporting Apr 26, 2024

@tahierhussain tahierhussain left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

FE changes looks good, except one minor change.

Comment thread frontend/src/components/widgets/list-view/ListView.jsx
Comment thread backend/account/authentication_controller.py Outdated
Comment thread backend/account/authentication_helper.py
Comment thread backend/account/user.py
Comment thread backend/adapter_processor/models.py Outdated
Comment thread backend/adapter_processor/models.py
Comment thread backend/prompt_studio/prompt_studio_core/views.py
Comment thread backend/pyproject.toml

@hari-kuriakose hari-kuriakose left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@johnyrahul Migrations look good overall.

However left one suggestion regarding naming of a particular db column.

Comment thread backend/usage/migrations/0001_initial.py
johnyrahul and others added 2 commits April 29, 2024 10:29
Co-authored-by: Chandrasekharan M <117059509+chandrasekharan-zipstack@users.noreply.github.com>
Signed-off-by: Rahul Johny <116638720+johnyrahul@users.noreply.github.com>
@sonarqubecloud

Copy link
Copy Markdown

Quality Gate Passed Quality Gate passed

Issues
4 New issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@nehabagdia
nehabagdia merged commit 9d49cdb into main Apr 29, 2024
@nehabagdia
nehabagdia deleted the feat/friction_less_onboarding branch April 29, 2024 06:43
praveen-formido pushed a commit that referenced this pull request Aug 20, 2025
* Intial commit

* Updated the admin page

* Fritcionless onbaodring changes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Updated the authenication helper

* Historical model fix in migration

* added adapter identfiers

* Made token_usage table tenant specific

* Updated the migrations

* Validating adapter state in  prompt and workflow run

* Validating adapter state in  prompt and workflow run

* Added method for usage in pusbsub helper

* Removed organization_id field from token_usage table

* Made admin page as plugin

* usage table changes

* Pass adapter_instance_id to run_completion function

* Updated field model_type -> model_name

* added description for adapters

* Added the error messages

* Updated serilizer to display description

* Updated organziation with  token limit

* Support description for adapters

* Save total token usage

* resolved conflict

* Implemented the SocketMessages component globally

* Minor fix

* Rverted the git ignore

* Reverted the git ignore

* Correct the error message

* Make token usage 0 if negative

* SDk version bump

* Review comment fixes

* Update backend/adapter_processor/models.py

Co-authored-by: Chandrasekharan M <117059509+chandrasekharan-zipstack@users.noreply.github.com>
Signed-off-by: Rahul Johny <116638720+johnyrahul@users.noreply.github.com>

* Addressed the review comments

---------

Signed-off-by: Rahul Johny <116638720+johnyrahul@users.noreply.github.com>
Signed-off-by: Deepak K <89829542+Deepak-Kesavan@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Deepak K <89829542+Deepak-Kesavan@users.noreply.github.com>
Co-authored-by: Deepak <deepak@zipstack.com>
Co-authored-by: Tahier Hussain <tahier@zipstack.com>
Co-authored-by: Neha <115609453+nehabagdia@users.noreply.github.com>
Co-authored-by: Chandrasekharan M <117059509+chandrasekharan-zipstack@users.noreply.github.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.

6 participants