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

feat: new shopping-assistant-service based on recommendation service,… #2407

Merged
merged 3 commits into from
Mar 6, 2024

Conversation

Mukamik
Copy link
Collaborator

@Mukamik Mukamik commented Mar 6, 2024

… langchain and genai packages

New service as discussed, looking to discuss imports, some env vars, and requirements conventions for the project

@Mukamik Mukamik requested review from bourgeoisor and NimJay March 6, 2024 03:08
@bourgeoisor bourgeoisor changed the base branch from main to next-24 March 6, 2024 18:34
@Mukamik Mukamik marked this pull request as ready for review March 6, 2024 21:26
@Mukamik Mukamik requested review from yoshi-approver and a team as code owners March 6, 2024 21:26
@bourgeoisor bourgeoisor merged commit dcff035 into next-24 Mar 6, 2024
3 of 4 checks passed
@bourgeoisor bourgeoisor deleted the bootstrap-shop-assist branch March 6, 2024 21:27
bourgeoisor added a commit that referenced this pull request Apr 8, 2024
* feat: new shopping-assistant-service based on recommendation service,… (#2407)

* feat: new shopping-assistant-service based on recommendation service, langchain and genai packages

* feat: Significantly paired down shop assist

* refactor: last remnants of GRPC

* Add AI Assistant service (#2408)

* Add bot UI

* Fix

* Fix

* Fix: requirements.txt

* Unquote query

* Default ns

* Change port

* Change port

* feat: Phase 1 complete

* fix: cleanup

* fix: env and rename

---------

Co-authored-by: aaronmwanjala <aaronmwanjala@google.com>

* Add scripts to deploy, init, and ingest into AlloyDB (#2423)

* Add AlloyDB set-up

* Add AlloyDB set-up

* Add AlloyDB set-up

* Add AlloyDB set-up

* Add AlloyDB set-up

* Add AlloyDB table population scripts

* Generate embeddings when you import data

* Fix scripts comments

---------

Co-authored-by: Aja Hammerly <ajahammerly@google.com>

* Multi modal chat (#2417)

* refactor: prompt call changed to POST, to accommodate multi-modal requests.

* feat: Added file upload to chat, plumbed the new post through to the end.

* feat: text and image multi modal calls are supported.

* Bones of retrieval are in place, still need to debug

* feat: RAG very nearly implemented end to end

* Revert "feat: RAG very nearly implemented end to end"

This reverts commit a72e96c.

* feat: last few fixes for RAG flow

- Disable `readOnlyRootFilesystem` on the shoppingassistantservice
 - Enable a public IP for the alloydb instance
 - Define the id_column (wasn't documented)
 - Set the model name to models/embedding-001 in order to use textembedding-gecko@003, which I couldn't find anywhere but on MoMA
 - Use .invoke instead of .run here because .run has been deprecated since Jan 5th.
 - Configuring a few columns in the vector store (embedding_column, content_column, etc)

* merge: apikey

* fix: merge conflict

* fix: merge conflict in requirements

* Revert "Revert "feat: RAG very nearly implemented end to end""

This reverts commit 196e428

* feat: two step retrieval query

* fix: key

* chore: requirements

* Update scripts/1_deploy_alloydb_infra.sh

* Update kustomize/components/alloydb/kustomization.yaml

* Update kustomize/components/alloydb/kustomization.yaml

* Update kustomize/components/alloydb/kustomization.yaml

* Update kustomize/components/alloydb/kustomization.yaml

* Update kustomize/components/alloydb/kustomization.yaml

* Update kustomize/components/alloydb/kustomization.yaml

---------

Co-authored-by: Olivier Bourgeois <3271352+bourgeoisor@users.noreply.github.com>

* Revamp bot assistant UI (#2437)

* Revamp frontend bot into own page

* Revert temp changes

* Tuning the responses to the rag implementation (#2441)

* Revamp frontend bot into own page

* FEAT: Making it clearer what's happening

* FEAT: Tweaking the prompts

* REFACTOR: moving towards manual vector search

* feat: Interior design flow working for demo

---------

Co-authored-by: Olivier Bourgeois <bourgeoisor@gmail.com>

* refactor: cleaning up logging

* Add image and product rendering to frontend (#2442)

* Revamp frontend bot into own page

* Revert temp changes

* Fix file permissions

* Remove placeholder variables

* Fix scripts

* Display user image in the chat log

* Extract the product IDs from prompt response

* Add product images to prompt response

* Fix handler hostname

* De-hardcode the assistant service host from the frontend

* Turn on cymbal branding

* Add Dockerfile.pip to gitignore

* Add product cards to response

* Add shimmer to bot text loading

* Fix broken script

* Add missing API to script

* Add demo instructions

* Add disclaimer to README notes

* Polish the assistant UI

* Fix file selector alignment

* refactor: better comments!

* fix: logs and comments for the demo

* Refactor envs out of demo (#2457)

* First pass at extracting envs

* Update requirements

* Fix scripts envs

* Fix wrong region env

* WIP secret manager

* WIP secret manager

* WIP secret manager

* WIP secret manager

* WIP secret manager

* Add disable-shopping-assistant component

* Add disable-shopping-assistant component

* Add disable-shopping-assistant component

* Remove hero image temporarily

* WIP secret manager

* WIP secret manager

* WIP secret manager

* WIP secret manager

* AlloyDB support for the products catalog (#2425)

* Add SA bindings for products catalog

* Add initial trial of postgre connection

* Fix connection envs

* Fix posgres connection

* Add more columns

* Add missing roles

* Add missing columns

* Add missing columns

* Remove embedding columns

* Remove embedding columns

* Extract envs out

* Extract envs out

* Refactor catalog loading

* Refactor catalog loading

* Refactor catalog loading

* Refactor catalog loading

* Refactor catalog loading

* Refactor catalog loading

* Add Secret Manager query

* Update README

* Update README

* Clean up copyright headers, comments, manifests

* Consolidate .gitignore files into one

* Tweak README script

* Move shopping assistant scripts to kustomize component

---------

Co-authored-by: Aaron Wanjala <aaronmwanjala@google.com>
Co-authored-by: Aja Hammerly <ajahammerly@google.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.

2 participants