From c5cd69eb58294941b493617b7fa10cd06f434e80 Mon Sep 17 00:00:00 2001
From: Pauline Pham <33726902+Yutcam@users.noreply.github.com>
Date: Wed, 20 Dec 2023 11:35:20 +0100
Subject: [PATCH 01/23] Update global_agent_helper_prompt.md (#2962)

* Update global_agent_helper_prompt.md

(Big) Update:
_Folders
_Personal Assistants

* formatting

---------

Co-authored-by: Henry Fontanier <henry@dust.tt>
---
 front/prompt/global_agent_helper_prompt.md | 96 ++++++++++++----------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/front/prompt/global_agent_helper_prompt.md b/front/prompt/global_agent_helper_prompt.md
index 55be6e93697c..c1d7e36b6629 100644
--- a/front/prompt/global_agent_helper_prompt.md
+++ b/front/prompt/global_agent_helper_prompt.md
@@ -8,18 +8,22 @@ Make sure your answers are clear and straightforward. Double-check your answers
 
 ## What is Dust?
 
-Dust is a platform powered by GPT4-Turbo, Claude 2.1, and Mistral. It's designed to help teams work better with AI. These AI assistants are there to enhance your understanding of any topic, increase productivity, and improve work processes. They can help with company questions, draft documents, or simplify complex tasks.
+Dust is a platform powered by GPT4-Turbo, Claude 2.1, and Mistral. It's designed to help teams work better with AI. These AI assistants are there to enhance your understanding of any topic, increase productivity, and improve work processes. They can help with company questions, draft documents, or simplify complex tasks. You can create personal assistants and shared assistants with your team.
 
 ## General concepts
 
-### Assistant
+### Assistants
 
 Dust assistants are AI-powered agents that employ frontier models like GPT-4 Turbo, Mistral and Claude 2.1. You can use two types of assistants inside Dust.
 
 - Frontier model assistants: Advanced large-scale models like @gpt4 and @claude surpass existing technologies from major AI developers (OpenAI, Google DeepMind, etc.), handling a variety of tasks such as text recognition, summarization, translation, and content generation.
-- Custom assistants: Tailored by Dust or in-house builders for niche needs, these can be enhanced or instructed specifically. They perform particular tasks, like @notion or @slack for interacting with synced documents, or aiding in SQL optimization, customer support, UX feedback, or specialized document creation.
+- Custom assistants: created by Dust, yourself— personal assistants or builders— workspace assistants. Custom assistants package specific use cases, are powered by the LLM of your choice, and are instructed to complete specific tasks. @notion or @slack created by Dust interact with synced documents from those platforms. You can create a custom Data assistant for SQL query generation, customer support, UX feedback, or specialized document creation like a memo.
 
-To illustrate, while @dust handles organizational questions, @help provides Dust support, @slack searches Slack, and @gpt4/@claude offers direct large language model access. Multiple assistants can be leveraged concurrently to tackle varied tasks.
+To illustrate, while @dust handles organizational questions, @help provides Dust support, @slack searches Slack, and @gpt4/@claude offers direct large language model access. Multiple assistants can be chained to complete complex tasks.
+
+### Assistants Gallery
+
+From there, you can create your personal list of assistants. Click on `+Add` to add an assistant to your list. Assistants can be created by yourself, your teammates, or Dust.
 
 ### Conversation
 
@@ -31,13 +35,13 @@ Create conversations for new topics to keep the assistants focused!
 
 ### Workspace
 
-In Dust, a Workspace is where users talk with assistants and customize it for their team's needs. Admins manage data access, invite members, and set roles for better teamwork.
+In Dust, a Workspace is where users work with assistants and customize them for themselves or their team's needs. Admins manage data access, invite members, and set roles for better teamwork.
 
-### Connections & Data Sources
+### Connections & Folders
 
 In Dust, "Connections" are integrated platforms like Notion or Slack where assistants pull data from, available only on paid plans. Admins decide which data assistants can access.
 
-Data Sources are custom data sources created by builders to provide assistants with specific information unavailable inside Connections. Data Sources are available to all plans.
+Folders are custom data sources created by builders to provide assistants with specific information unavailable inside Connections. Folders are available for all plans.
 
 ### Synchronizing
 
@@ -55,18 +59,18 @@ LLM embedding converts text into numerical vectors, positioning similar phrases
 
 ### How to invite members to the workspace
 
-As an Admin, invite members by going to `Admin` > `Workspace` > `Members`, then use Member list to invite by email or set a whitelisted domain in Invitation Link > Settings and share the link.
+As an Admin, invite members by going to `⚙️` > `Members` then use the `Member list` to invite by email or set a whitelisted domain in Invitation Link > Settings and share the link.
 
-After they join, assign roles: admin, builder, or user.
+After members join, assign roles: admin, builder, or user.
 
 ### What are the users’ different roles?
 
-**Users**: Use the assistants in the Workspace.
+**Users**: Use the assistants and create personal assistants in the Workspace.
 
 **Builders**: Users plus:
 
-- Build custom assistants with Dust tools and Data Sources.
-- Add Data Sources to the Workspace.
+- Build custom assistants with Dust tools and Folders.
+- Add Folders to the Workspace.
 
 **Admins**: Builders plus:
 
@@ -96,7 +100,7 @@ Advanced features to use the Dust Slackbot.
 
 - If you want to add Dust to a group direct message, [convert them to a private channel first](https://slack.com/intl/en-gb/help/articles/217555437-Convert-a-group-direct-message-to-a-private-channel).
 - Users can interact with any other assistants via Slack by summoning @dust and adding a tilde "~" right before the assistant's name- i.e., "@dust ~gpt4 Hello!" if you want to interact with @gpt4.
-- Builders can link a custom assistant to a **public** Slack channel when creating or editing a custom assistant, the assistant will automatically be used every time Dust is called in the public channel. To do this, go to `Admin` > `Assistants` > `Create` or `Edit` > `Slack Integration`. You can't link an assistant to a private channel.
+- Builders can link a custom assistant to a **public** Slack channel when creating or editing a custom assistant, the assistant will automatically be used every time Dust is called in the public channel. Go to `Assistants` > `Workspace assistants` > `New` or `Edit` > `Slack Integration` to do this. You can't link an assistant to a private channel; to use an assistant inside a private channel, use the syntax `@dust ~name of the assistant` .
 
 To export your @dust conversation history in Slack, remember that it's like exporting direct messages. You can only do this if you're an Owner or admin of a Slack Business+ or Enterprise Grid account.
 
@@ -108,7 +112,7 @@ To export your @dust conversation history in Slack, remember that it's like expo
 
 Connections are available only for paid plans.
 
-As an Admin, go to ️Admin > Connections > Select the desired Connection, click `Connect` > Authenticate your account, and select the data you wish to synchronize with Dust.
+As an Admin, go to ️`⚙️` > `Connections` > Select the desired Connection, click `Connect` > Authenticate your account, and select the data you wish to synchronize with Dust.
 
 ##Slack
 
@@ -120,7 +124,7 @@ To synchronize Notion pages, the admin can only select top-level pages. To add l
 
 **How to update Connections**
 
-As an admin, ️Admin > `Connections` > Select the desired Connection, click `Manage` > `Edit permissions` > Explore, and either select or deselect the data you want to synchronize with Dust.
+As an admin, ️ ️`⚙️` > `Connections` > Select the desired Connection, click `Manage` > `Add/Remove data` > Explore, and either select or deselect the data you want to synchronize with Dust.
 
 ### What are Connections' current limits?
 
@@ -131,9 +135,9 @@ Github: Dust only gathers data from issues, discussions, and top-level pull requ
 
 ### How long does synchronizing new messages or documents created in one of my Connections takes?
 
-Dust syncs quickly, usually in seconds or minutes. To check the last sync:
+Dust syncs quickly, usually in seconds or minutes. To check the last sync as an admin:
 
-- Go to `Admin` > `Connections`.
+- Go to `Assitants` > `Connections`.
 - Look for "last sync ~ x s ago."
 
 To see if a document has synced and view its contents:
@@ -142,18 +146,18 @@ To see if a document has synced and view its contents:
 
 ### How to add data that are not supported as a Connection by Dust
 
-As a user, you can add your data to a connected platform like Notion or Google Drive.
+As a user, you can add your data to a connected platform like Notion or Google Drive. Ask an admin to verify if the data you added are synchronized with Dust.
 
-Admins/builders add a data source by:
+Admins/builders can add a Folders by:
 
-- Going to `Admin` > `Data Sources`.
-- Clicking `Add a new Data Source`.
+- Going to `Assistants`> `Folders`.
+- Clicking `Add a new Folder`.
 - Naming it and adding a description (optional).
 - Clicking `create`.
 
-### What are Data Sources' current limits?
+### What are the documents and PDF current limits?
 
-Documents up to 2MB can be uploaded manually via Data Sources.
+Documents up to 10MB can be uploaded manually via Folders.
 
 ### **Does Dust use user and company data to train its models?**
 
@@ -165,7 +169,9 @@ A 750KB plain text document could contain around 125,000 words, assuming an aver
 
 ### How to configure which data sources @dust has access to
 
-To configure the @dust assistant, got to `Admin` > `Assistants` and click on the `Manage` button next to the @dust assistant. You'll be enable / disable @dust and select which data sources it has access to.
+To configure the @dust assistant, got to `Assistants` > `Dust Assistants` and click on the `Manage` button next to the @dust assistant. You'll be enable / disable @dust and select which data sources it has access to.
+
+Think about @dust as your general assistant to explore all the data synchronized with Dust. Don’t expect 100% accurate answers but use Dust as a router to navigate your knowledge.
 
 ## Dust’s plans
 
@@ -178,11 +184,11 @@ To configure the @dust assistant, got to `Admin` > `Assistants` and click on the
 
 ### **Dust Paid plans**
 
-To get features like unlimited GPT-4 and Claude, connecting to Notion, Google Drive, GitHub, Slack, and using the Dust Slackbot, you need to upgrade to a paid plan.
+You need to upgrade to a paid plan to get features like unlimited GPT-4 and Claude, connecting to Notion, Google Drive, GitHub, Slack, multiple members, and using the Dust Slackbot.
 
 Upgrade by:
 
-- Going to `Admin` > `Subscription`.
+- Going to `⚙️` > `Subscription`.
 - Choosing the Pro Plan.
 
 ### How to pay as a business?
@@ -207,14 +213,14 @@ To manage your subscription:
 
 ### What can I use an assistant for?
 
-A Dust assistant can answer questions and chat with you. Each one is different, so check their descriptions to see which one(s) to use.
+Assistants can answer questions and chat with you. Think about your assistants as an extension of yourself to create content in a specific format. Each assistant is different, so check their descriptions to see which one(s) to use. Try to chain assistants to complete complex tasks.
 
-- Use @dust for questions about your company; it uses GPT-4 and knows public data until September 2021.
+- Use @dust for questions about your company; it uses GPT-4 and knows public data until April 2023.
 - Use @help for help with Dust features.
 - Use @slack to find info in Slack.
 - Use @gpt4 or @claude for tasks with the latest AI models.
 
-You can combine assistants, like asking @dust for customer insights and then having @claude and @gpt4 help write a memo based on that info.
+You can combine assistants, like asking @dust for customer insights and then having @claude and @gpt4 help write a memo based on that info. But the most important thing to make the most of Dust is creating custom assistants: personal assistants or shared assistants with your team.
 
 ### Technically, how do assistants work?
 
@@ -237,20 +243,25 @@ Dust offers 3 types of assistants:
 
 ### How to search for assistants?
 
-Admin and builders can filter custom assistants via the search bar on top of the Custom Assistants List in `Admin` > `Assistants` .
+Users can search for assistants inside the `Assistant Gallery`. Admin and builders can filter custom assistants via the search bar on top of the Assistants List in `Assistants` .
 
 ## Custom assistants
 
 ### What are custom assistants?
 
-Custom assistants are AI agents created by builders in your workspace. They are made to achieve specific tasks defined by builders.
+Custom assistants are AI agents created by users and builders in your workspace. They are made to achieve specific tasks defined by builders. They can be personal or shared with the team.
 
 ### How to create a custom assistant?
 
-To create a custom assistant— verify your are a builder:
+To create a custom assistant:
+
+As a user, click on `>` next to `Assistants` and `+ Create an Assistant` .
+
+As a builder or admin:
 
-1. Navigate to `Admin` > `Assistants` > `Create a new Assistant`.
-2. Name your assistant (no spaces) and write a description to explain its purpose.
+1. To create a personal assistant: Navigate to `Assistants` > `My Assistants` > `+New`.
+2. To create a workspace assistant available to all members of the workspace: Navigate to `Assistants` > `Workspace Assistants` > `+New`. You can also duplicate existing assistants from the Assistants Gallery.
+3. Name your assistant (no spaces) and write a description to explain its purpose.
 
 Setup involves:
 
@@ -281,11 +292,10 @@ Tap 🤖 in the chat bar to manage and edit your custom assistants.
 
 or
 
-1. Go to `Admin`.
-2. Select `Assistants`.
-3. Choose your assistant.
-4. Click `Edit`.
-5. Make necessary changes and `save` them.
+1. Go to `Assistants`.
+2. Choose your assistant.
+3. Click `Edit`.
+4. Make necessary changes and `save` them.
 
 ### Why chose GPT-4 or Claude 2?
 
@@ -306,7 +316,7 @@ Table with results as of summer 2023, based on Ethan Mollick analysis - [oneusef
 
 ## Conversation
 
-You can create conversations that involve both colleagues and several AI agents, each AI agent having a unique purpose and capability.
+You can create conversations that involve both colleagues and several AI agents, each assistant having a unique purpose and capability.
 
 ### How do I access an assistant?
 
@@ -314,12 +324,12 @@ To use an assistant:
 
 - Type your message and mention the assistant with "@", or click the robot icon 🤖 in the message bar.
 - Always start with "@" when calling an assistant, or it won't respond.
-- In Slack, if enabled by your Admin, use the @dust assistant in the same way.
-- For the Dust Slackbot, type "@dust ~gpt4" and your question to engage with @gpt4 for example.
+- In Slack, if enabled by your admin, use the @dust assistant in the same way.
+- For the Dust Slackbot, use the syntax "@dust ~gpt4" and your question to engage with @gpt4 for example.
 
 ### How do I talk to an assistant?
 
-When engaging with assistants, you can involve multiple assistants within a single conversation to tackle complex tasks. Start with "@" followed by the assistant's name to initiate interaction with each one. For instance, you could use one assistant to gather information and another to help organize that information into a document. This multi-assistant approach allows for a more collaborative and comprehensive assistance strategy.
+When engaging with assistants, we recommend using multiple assistants within a single conversation to tackle complex tasks. Start with "@" followed by the assistant's name to initiate interaction with each one. For instance, you could use one assistant to gather information and another to help organize that information into a document. This multi-assistant approach allows for a more collaborative and comprehensive assistance strategy.
 
 ### Can I share a conversation?
 

From 2400e468cac65c76edf2675285ed8775b5334493 Mon Sep 17 00:00:00 2001
From: Stanislas Polu <spolu@dust.tt>
Date: Wed, 20 Dec 2023 12:32:25 +0100
Subject: [PATCH 02/23] x/evals: CoT-consensus better stats (#2971)

* Better consensus computations

* updated RESULTS
---
 x/spolu/research/evals/RESULTS.log            | 115 +++++++++---------
 x/spolu/research/evals/lib/algorithms.ts      |   6 +-
 .../evals/lib/algorithms/CoTConsensus.ts      |  92 +++++++++-----
 x/spolu/research/evals/stores/.gitignore      |   1 +
 4 files changed, 122 insertions(+), 92 deletions(-)

diff --git a/x/spolu/research/evals/RESULTS.log b/x/spolu/research/evals/RESULTS.log
index e08a6359bd56..063abcfa48d6 100644
--- a/x/spolu/research/evals/RESULTS.log
+++ b/x/spolu/research/evals/RESULTS.log
@@ -13,7 +13,6 @@ Finished run: algorithm=CoT dataset=Game24 provider=mistral model=mistral-medium
 Finished run: algorithm=CoT dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=51 total=128
 Finished run: algorithm=CoT dataset=MATH provider=openai model=gpt-4-1106-preview check=88 total=128
 
-
 Finished run: algorithm=CoT dataset=MATH provider=mistral model=mistral-small check=39 total=128
 Finished run: algorithm=CoT dataset=MATH provider=mistral model=mistral-medium check=49 total=128
 
@@ -22,75 +21,77 @@ Finished run: algorithm=CoT dataset=MATH provider=mistral model=mistral-medium c
 ## Game24
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=openai model=gpt-3.5-turbo-1106
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=5 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=5 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=5 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=7 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=7 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=10 total=128
-Final stats: rate=17.28/spromptTokensRate=12608.702/s completionTokensRate=891.42/s promptTokensTotal=2988275 completionTokensTotal=211267
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=4.19 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=4.69 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=5.75 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=7.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=7.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=10.00 total=128.00
+Final stats: rate=24.16/s promptTokensTotal=2988275 completionTokensTotal=211267
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=openai model=gpt-4-1106-preview
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-4-1106-preview check=6 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-4-1106-preview check=4 total=128
-Final stats: rate=1.21/spromptTokensRate=885.027/s completionTokensRate=100.03/s promptTokensTotal=2988275 completionTokensTotal=337743
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-4-1106-preview check=6.06 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5.38 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-4-1106-preview check=4.88 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-4-1106-preview check=4.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-4-1106-preview check=4.00 total=128.00
+Final stats: rate=24.38/s promptTokensTotal=2988275 completionTokensTotal=337743
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=mistral model=mistral-small
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-small check=2 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-small check=2 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-small check=2 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=mistral model=mistral-small check=1 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=mistral model=mistral-small check=0 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=mistral model=mistral-small check=0 total=128
-Final stats: rate=2.56/spromptTokensRate=2222.717/s completionTokensRate=221.41/s promptTokensTotal=3551411 completionTokensTotal=353772
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-small check=1.56 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-small check=1.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-small check=1.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=mistral model=mistral-small check=1.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=mistral model=mistral-small check=0.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=mistral model=mistral-small check=0.00 total=128.00
+Final stats: rate=24.62/s promptTokensTotal=3551411 completionTokensTotal=353772
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=mistral model=mistral-medium
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-medium check=0 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-medium check=0 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-medium check=0 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=mistral model=mistral-medium check=0 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=mistral model=mistral-medium check=0 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=mistral model=mistral-medium check=0 total=128
-Final stats: rate=1.84/spromptTokensRate=1594.544/s completionTokensRate=178.56/s promptTokensTotal=3555507 completionTokensTotal=398154
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-medium check=0.03 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
+Final stats: rate=24.27/s promptTokensTotal=3555507 completionTokensTotal=398154
 
 ## MATH
 
 Finished run: algorithm=CoT-consensus dataset=MATH provider=openai model=gpt-3.5-turbo-1106
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=55 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=55 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=63 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=66 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=70 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=68 total=128
-Final stats: rate=3.33/s promptTokensRate=7484.167/s completionTokensRate=606.85/s promptTokensTotal=9267718 completionTokensTotal=802822
+Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=52.69 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=52.38 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=61.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=66.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=68.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=68.00 total=128.00
+Final stats: promptTokensTotal=9267718 completionTokensTotal=802822
 
 Finished run: algorithm=CoT-consensus dataset=MATH provider=openai model=gpt-4-1106-preview
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=openai model=gpt-4-1106-preview check=80 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=openai model=gpt-4-1106-preview check=80 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=openai model=gpt-4-1106-preview check=83 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=openai model=gpt-4-1106-preview check=91 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=openai model=gpt-4-1106-preview check=92 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=openai model=gpt-4-1106-preview check=91 total=128
-Final stats: rate=0.44/spromptTokensRate=989.536/s completionTokensRate=119.40/s promptTokensTotal=9267718 completionTokensTotal=1118264
+Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=openai model=gpt-4-1106-preview check=80.78 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=openai model=gpt-4-1106-preview check=81.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=openai model=gpt-4-1106-preview check=85.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=openai model=gpt-4-1106-preview check=90.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=openai model=gpt-4-1106-preview check=92.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=openai model=gpt-4-1106-preview check=91.00 total=128.00
+Final stats: promptTokensTotal=9267718 completionTokensTotal=1118264
 
 Finished run: algorithm=CoT-consensus dataset=MATH provider=mistral model=mistral-small
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=mistral model=mistral-small check=36 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=mistral model=mistral-small check=36 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=mistral model=mistral-small check=42 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=mistral model=mistral-small check=51 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=mistral model=mistral-small check=59 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=mistral model=mistral-small check=60 total=128
-Final stats: rate=2.59/spromptTokensRate=6575.136/s completionTokensRate=617.24/s promptTokensTotal=10387169 completionTokensTotal=975095
+Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=mistral model=mistral-small check=37.59 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=mistral model=mistral-small check=38.69 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=mistral model=mistral-small check=46.38 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=mistral model=mistral-small check=53.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=mistral model=mistral-small check=58.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=mistral model=mistral-small check=60.00 total=128.00
+Final stats: promptTokensTotal=10387169 completionTokensTotal=975095
 
 Finished run: algorithm=CoT-consensus dataset=MATH provider=mistral model=mistral-medium
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=mistral model=mistral-medium check=41 total=128
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=mistral model=mistral-medium check=41 total=128
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=mistral model=mistral-medium check=50 total=128
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=mistral model=mistral-medium check=56 total=128
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=mistral model=mistral-medium check=64 total=128
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=mistral model=mistral-medium check=68 total=128
-Final stats: rate=0.96/spromptTokensRate=2407.524/s completionTokensRate=255.92/s promptTokensTotal=10323371 completionTokensTotal=1097376
+Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=mistral model=mistral-medium check=42.72 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=mistral model=mistral-medium check=41.69 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=mistral model=mistral-medium check=52.13 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=mistral model=mistral-medium check=59.75 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=mistral model=mistral-medium check=62.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=mistral model=mistral-medium check=68.00 total=128.00
+Final stats: promptTokensTotal=10323371 completionTokensTotal=1097376
+
+
diff --git a/x/spolu/research/evals/lib/algorithms.ts b/x/spolu/research/evals/lib/algorithms.ts
index eca39e6f1ab1..62fd90db36ee 100644
--- a/x/spolu/research/evals/lib/algorithms.ts
+++ b/x/spolu/research/evals/lib/algorithms.ts
@@ -168,14 +168,10 @@ export abstract class Algorithm {
         (acc, x) => acc + x.completion.usage.promptTokens,
         0
       );
-      const completionTokensRate = completionTokensTotal / (duration / 1000);
-      const promptTokensRate = promptTokensTotal / (duration / 1000);
 
       console.log(
         `Final stats: ` +
-          `rate=${rate.toFixed(2)}/s` +
-          `promptTokensRate=${promptTokensRate.toFixed(3)}/s ` +
-          `completionTokensRate=${completionTokensRate.toFixed(2)}/s ` +
+          `rate=${rate.toFixed(2)}/s ` +
           `promptTokensTotal=${promptTokensTotal} ` +
           `completionTokensTotal=${completionTokensTotal}`
       );
diff --git a/x/spolu/research/evals/lib/algorithms/CoTConsensus.ts b/x/spolu/research/evals/lib/algorithms/CoTConsensus.ts
index 996958a4cb47..e91fe8266bb9 100644
--- a/x/spolu/research/evals/lib/algorithms/CoTConsensus.ts
+++ b/x/spolu/research/evals/lib/algorithms/CoTConsensus.ts
@@ -17,33 +17,39 @@ export class CoTConsensus extends CoT {
     return "CoT-consensus";
   }
 
-  resultFromPool(poolSize: number, test: Test): TestResult {
-    const answers: { [key: string]: { check: boolean; count: number } } = {};
+  resultFromPool(poolSize: number, test: Test): TestResult[] {
+    const results: TestResult[] = [];
 
-    for (const result of this.poolResults[test.id].slice(0, poolSize)) {
-      if (!answers[result.answer]) {
-        answers[result.answer] = { check: result.check, count: 0 };
+    for (let i = 1; i * poolSize <= this.poolResults[test.id].length; i++) {
+      const answers: { [key: string]: { check: boolean; count: number } } = {};
+
+      const pool = this.poolResults[test.id].slice(
+        (i - 1) * poolSize,
+        i * poolSize
+      );
+
+      for (const result of pool) {
+        if (!answers[result.answer]) {
+          answers[result.answer] = { check: result.check, count: 0 };
+        }
+        answers[result.answer].count++;
       }
-      answers[result.answer].count++;
-    }
 
-    // find the max count
-    let maxCount = 0;
-    let maxAnswer = "";
-    let maxCheck = false;
-    for (const answer in answers) {
-      if (answers[answer].count > maxCount) {
-        maxCount = answers[answer].count;
-        maxAnswer = answer;
-        maxCheck = answers[answer].check;
+      // find the max count
+      let maxCount = 0;
+      let maxAnswer = "";
+      let maxCheck = false;
+      for (const answer in answers) {
+        if (answers[answer].count > maxCount) {
+          maxCount = answers[answer].count;
+          maxAnswer = answer;
+          maxCheck = answers[answer].check;
+        }
       }
+      results.push({ test, answer: maxAnswer, check: maxCheck });
     }
 
-    return {
-      test,
-      answer: maxAnswer,
-      check: maxCheck,
-    };
+    return results;
   }
 
   async runOne({
@@ -60,30 +66,56 @@ export class CoTConsensus extends CoT {
       }
       this.poolResults[test.id].push(result);
     }
-
-    return this.resultFromPool(this.VOTE_COUNT, test);
+    return this.resultFromPool(this.VOTE_COUNT, test)[0];
   }
 
   computeResults(): void {
     for (let p = 1; p <= this.VOTE_COUNT; p = p * 2) {
-      let check = 0;
-      let total = 0;
+      const pools: TestResult[][] = [];
+      for (let i = 0; i < this.VOTE_COUNT / p; i++) {
+        pools.push([]);
+      }
 
       for (const testId in this.poolResults) {
         const test = this.poolResults[testId][0].test;
-        const result = this.resultFromPool(p, test);
-        total++;
-        if (result.check) {
-          check++;
+        const results = this.resultFromPool(p, test);
+
+        if (results.length !== pools.length) {
+          throw new Error(
+            `Expected ${pools.length} pools, got ${results.length}`
+          );
+        }
+
+        for (let i = 0; i < results.length; i++) {
+          pools[i].push(results[i]);
+        }
+      }
+
+      const check = [];
+      const total = [];
+
+      for (const pool of pools) {
+        let checkCount = 0;
+        let totalCount = 0;
+        for (const result of pool) {
+          if (result.check) {
+            checkCount++;
+          }
+          totalCount++;
         }
+        check.push(checkCount);
+        total.push(totalCount);
       }
 
+      const checkAvg = check.reduce((a, b) => a + b, 0) / check.length;
+      const totalAvg = total.reduce((a, b) => a + b, 0) / total.length;
+
       console.log(
         `Result: algorithm=${this.algorithm()} poolSize=${p} dataset=${
           this.dataset.dataset
         } ` +
           `provider=${this.model.provider} model=${this.model.model()} ` +
-          `check=${check} total=${total}`
+          `check=${checkAvg.toFixed(2)} total=${totalAvg.toFixed(2)}`
       );
     }
   }
diff --git a/x/spolu/research/evals/stores/.gitignore b/x/spolu/research/evals/stores/.gitignore
index 9b1dffd90fdc..97fc976772ab 100644
--- a/x/spolu/research/evals/stores/.gitignore
+++ b/x/spolu/research/evals/stores/.gitignore
@@ -1 +1,2 @@
 *.sqlite
+*.sqlite-journal

From b720bd7493bfb5b18d7bb8925fb08a05b6c12b56 Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Wed, 20 Dec 2023 12:54:40 +0100
Subject: [PATCH 03/23] [Runner - Fix] Fix deploy broken by shared back/front
 libs (#2972)

* [Runner - Fix] Fix deploy broken by shared back/front libs

Related [discussion](https://dust4ai.slack.com/archives/C050SM8NSPK/p1703068650076399)

Backend code was moved to lib/api

* removed check for sendgrid api key
---
 front/lib/api/data_sources.ts                 | 106 ++++++++++++++++-
 front/lib/data_sources.ts                     | 111 +-----------------
 front/lib/email.ts                            |   5 +-
 .../[wId]/data_sources/[name]/index.ts        |   2 +-
 front/pages/api/stripe/webhook.ts             |   2 +-
 5 files changed, 109 insertions(+), 117 deletions(-)

diff --git a/front/lib/api/data_sources.ts b/front/lib/api/data_sources.ts
index ed319600b1e9..18952115e72e 100644
--- a/front/lib/api/data_sources.ts
+++ b/front/lib/api/data_sources.ts
@@ -1,8 +1,21 @@
-import { DataSourceType } from "@dust-tt/types";
+import {
+  APIError,
+  ConnectorProvider,
+  ConnectorsAPI,
+  CoreAPI,
+  DataSourceType,
+  Err,
+  Ok,
+  Result,
+} from "@dust-tt/types";
 import { Op } from "sequelize";
 
+import { getMembers } from "@app/lib/api/workspace";
 import { Authenticator } from "@app/lib/auth";
+import { sendGithubDeletionEmail } from "@app/lib/email";
 import { DataSource } from "@app/lib/models";
+import logger from "@app/logger/logger";
+import { launchScrubDataSourceWorkflow } from "@app/poke/temporal/client";
 
 export async function getDataSource(
   auth: Authenticator,
@@ -83,3 +96,94 @@ export async function getDataSources(
     };
   });
 }
+export async function deleteDataSource(
+  auth: Authenticator,
+  dataSourceName: string
+): Promise<Result<{ success: true }, APIError>> {
+  const workspace = auth.workspace();
+  if (!workspace) {
+    return new Err({
+      type: "workspace_not_found",
+      message: "Could not find the workspace.",
+    });
+  }
+  if (!auth.isAdmin()) {
+    return new Err({
+      type: "workspace_auth_error",
+      message:
+        "Only users that are `admins` for the current workspace can delete data sources.",
+    });
+  }
+  const dataSource = await DataSource.findOne({
+    where: {
+      workspaceId: workspace.id,
+      name: dataSourceName,
+    },
+  });
+  if (!dataSource) {
+    return new Err({
+      type: "data_source_not_found",
+      message: "Could not find the data source.",
+    });
+  }
+
+  const dustAPIProjectId = dataSource.dustAPIProjectId;
+
+  const connectorsAPI = new ConnectorsAPI(logger);
+  if (dataSource.connectorId) {
+    const connDeleteRes = await connectorsAPI.deleteConnector(
+      dataSource.connectorId.toString(),
+      true
+    );
+    if (connDeleteRes.isErr()) {
+      // If we get a not found we proceed with the deletion of the data source. This will enable
+      // us to retry deletion of the data source if it fails at the Core level.
+      if (connDeleteRes.error.error.type !== "connector_not_found") {
+        return new Err({
+          type: "internal_server_error",
+          message: `Error deleting connector: ${connDeleteRes.error.error.message}`,
+        });
+      }
+    }
+  }
+
+  const coreAPI = new CoreAPI(logger);
+  const coreDeleteRes = await coreAPI.deleteDataSource({
+    projectId: dustAPIProjectId,
+    dataSourceName: dataSource.name,
+  });
+  if (coreDeleteRes.isErr()) {
+    return new Err({
+      type: "internal_server_error",
+      message: `Error deleting core data source: ${coreDeleteRes.error.message}`,
+    });
+  }
+
+  await dataSource.destroy();
+
+  await launchScrubDataSourceWorkflow({
+    wId: workspace.sId,
+    dustAPIProjectId,
+  });
+  if (dataSource.connectorProvider)
+    await warnPostDeletion(auth, dataSource.connectorProvider);
+
+  return new Ok({ success: true });
+}
+
+async function warnPostDeletion(
+  auth: Authenticator,
+  dataSourceProvider: ConnectorProvider
+) {
+  // if the datasource is Github, send an email inviting to delete the Github app
+  switch (dataSourceProvider) {
+    case "github":
+      // get admin emails
+      const adminEmails = (await getMembers(auth, "admin")).map((u) => u.email);
+      // send email to admins
+      for (const email of adminEmails) await sendGithubDeletionEmail(email);
+      break;
+    default:
+      break;
+  }
+}
diff --git a/front/lib/data_sources.ts b/front/lib/data_sources.ts
index 285db818a6de..96876775282b 100644
--- a/front/lib/data_sources.ts
+++ b/front/lib/data_sources.ts
@@ -1,21 +1,4 @@
-import {
-  APIError,
-  ConnectorProvider,
-  ConnectorsAPI,
-  CoreAPI,
-  CoreAPIDocument,
-  DataSourceType,
-  Err,
-  Ok,
-  Result,
-} from "@dust-tt/types";
-
-import { getMembers } from "@app/lib/api/workspace";
-import { Authenticator } from "@app/lib/auth";
-import { sendGithubDeletionEmail } from "@app/lib/email";
-import { DataSource } from "@app/lib/models";
-import logger from "@app/logger/logger";
-import { launchScrubDataSourceWorkflow } from "@app/poke/temporal/client";
+import { CoreAPIDocument, DataSourceType } from "@dust-tt/types";
 
 export function getProviderLogoPathForDataSource(
   ds: DataSourceType
@@ -57,95 +40,3 @@ export function getDisplayNameForDocument(document: CoreAPIDocument): string {
   }
   return titleTag.substring(titleTagPrefix.length);
 }
-
-export async function deleteDataSource(
-  auth: Authenticator,
-  dataSourceName: string
-): Promise<Result<{ success: true }, APIError>> {
-  const workspace = auth.workspace();
-  if (!workspace) {
-    return new Err({
-      type: "workspace_not_found",
-      message: "Could not find the workspace.",
-    });
-  }
-  if (!auth.isAdmin()) {
-    return new Err({
-      type: "workspace_auth_error",
-      message:
-        "Only users that are `admins` for the current workspace can delete data sources.",
-    });
-  }
-  const dataSource = await DataSource.findOne({
-    where: {
-      workspaceId: workspace.id,
-      name: dataSourceName,
-    },
-  });
-  if (!dataSource) {
-    return new Err({
-      type: "data_source_not_found",
-      message: "Could not find the data source.",
-    });
-  }
-
-  const dustAPIProjectId = dataSource.dustAPIProjectId;
-
-  const connectorsAPI = new ConnectorsAPI(logger);
-  if (dataSource.connectorId) {
-    const connDeleteRes = await connectorsAPI.deleteConnector(
-      dataSource.connectorId.toString(),
-      true
-    );
-    if (connDeleteRes.isErr()) {
-      // If we get a not found we proceed with the deletion of the data source. This will enable
-      // us to retry deletion of the data source if it fails at the Core level.
-      if (connDeleteRes.error.error.type !== "connector_not_found") {
-        return new Err({
-          type: "internal_server_error",
-          message: `Error deleting connector: ${connDeleteRes.error.error.message}`,
-        });
-      }
-    }
-  }
-
-  const coreAPI = new CoreAPI(logger);
-  const coreDeleteRes = await coreAPI.deleteDataSource({
-    projectId: dustAPIProjectId,
-    dataSourceName: dataSource.name,
-  });
-  if (coreDeleteRes.isErr()) {
-    return new Err({
-      type: "internal_server_error",
-      message: `Error deleting core data source: ${coreDeleteRes.error.message}`,
-    });
-  }
-
-  await dataSource.destroy();
-
-  await launchScrubDataSourceWorkflow({
-    wId: workspace.sId,
-    dustAPIProjectId,
-  });
-  if (dataSource.connectorProvider)
-    await warnPostDeletion(auth, dataSource.connectorProvider);
-
-  return new Ok({ success: true });
-}
-
-async function warnPostDeletion(
-  auth: Authenticator,
-  dataSourceProvider: ConnectorProvider
-) {
-  // if the datasource is Github, send an email inviting to delete the Github app
-  switch (dataSourceProvider) {
-    case "github":
-      // get admin emails
-      const adminEmails = (await getMembers(auth, "admin")).map((u) => u.email);
-      // send email to admins
-      for (const email of adminEmails) await sendGithubDeletionEmail(email);
-      break;
-    default:
-      break;
-  }
-}
diff --git a/front/lib/email.ts b/front/lib/email.ts
index 37a6bbd0bfa8..ce21d1685290 100644
--- a/front/lib/email.ts
+++ b/front/lib/email.ts
@@ -7,11 +7,8 @@ import sgMail from "@sendgrid/mail";
 import { XP1User } from "@app/lib/models";
 import logger from "@app/logger/logger";
 
-const { SENDGRID_API_KEY, XP1_CHROME_WEB_STORE_URL } = process.env;
+const { SENDGRID_API_KEY = "", XP1_CHROME_WEB_STORE_URL } = process.env;
 
-if (!SENDGRID_API_KEY) {
-  throw new Error("Missing SENDGRID_API_KEY env variable");
-}
 sgMail.setApiKey(SENDGRID_API_KEY);
 
 export async function sendEmail(email: string, message: any) {
diff --git a/front/pages/api/poke/workspaces/[wId]/data_sources/[name]/index.ts b/front/pages/api/poke/workspaces/[wId]/data_sources/[name]/index.ts
index 8eb863ca3514..b3257005a374 100644
--- a/front/pages/api/poke/workspaces/[wId]/data_sources/[name]/index.ts
+++ b/front/pages/api/poke/workspaces/[wId]/data_sources/[name]/index.ts
@@ -1,8 +1,8 @@
 import { ReturnedAPIErrorType } from "@dust-tt/types";
 import { NextApiRequest, NextApiResponse } from "next";
 
+import { deleteDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getSession } from "@app/lib/auth";
-import { deleteDataSource } from "@app/lib/data_sources";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
 export type DeleteDataSourceResponseBody = {
diff --git a/front/pages/api/stripe/webhook.ts b/front/pages/api/stripe/webhook.ts
index e8794c461804..d3ab0f3a483a 100644
--- a/front/pages/api/stripe/webhook.ts
+++ b/front/pages/api/stripe/webhook.ts
@@ -13,9 +13,9 @@ import {
   getAgentConfigurations,
 } from "@app/lib/api/assistant/configuration";
 import { getDataSources } from "@app/lib/api/data_sources";
+import { deleteDataSource } from "@app/lib/api/data_sources";
 import { getMembers } from "@app/lib/api/workspace";
 import { Authenticator } from "@app/lib/auth";
-import { deleteDataSource } from "@app/lib/data_sources";
 import { front_sequelize } from "@app/lib/databases";
 import {
   sendAdminDowngradeTooMuchDataEmail,

From 3c3c27620d6a156739e49edbe73d69b3a8501fed Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Wed, 20 Dec 2023 13:16:12 +0100
Subject: [PATCH 04/23] [Runner] Avatars can be seen in membership list &
 member detail (#2944)

* [Runner] Avatars can be seen in membership list & member detail

Related [card](https://github.com/dust-tt/tasks/issues/289) and
[discussion](https://dust4ai.slack.com/archives/C050SM8NSPK/p1702990922381299?thread_ts=1702899295.554769&cid=C050SM8NSPK)

* switch back to message context
---
 front/lib/api/workspace.ts                    |  2 +-
 front/lib/auth.ts                             | 15 +++-
 front/lib/models/user.ts                      |  5 ++
 .../migrations/20231219_imageUrl_backfill.ts  | 84 +++++++++++++++++++
 4 files changed, 104 insertions(+), 2 deletions(-)
 create mode 100644 front/migrations/20231219_imageUrl_backfill.ts

diff --git a/front/lib/api/workspace.ts b/front/lib/api/workspace.ts
index 7ab471d11e0b..0cdcd8046a69 100644
--- a/front/lib/api/workspace.ts
+++ b/front/lib/api/workspace.ts
@@ -124,7 +124,7 @@ export async function getMembers(
       fullName: u.firstName + (u.lastName ? ` ${u.lastName}` : ""),
       firstName: u.firstName,
       lastName: u.lastName,
-      image: null,
+      image: u.imageUrl,
       workspaces: [{ ...owner, role }],
     };
   });
diff --git a/front/lib/auth.ts b/front/lib/auth.ts
index 16dc6d4b9823..6020c3c24a1a 100644
--- a/front/lib/auth.ts
+++ b/front/lib/auth.ts
@@ -404,6 +404,19 @@ export async function getUserFromSession(
     },
   });
 
+  if (session.user.image !== user.imageUrl) {
+    void User.update(
+      {
+        imageUrl: session.user.image,
+      },
+      {
+        where: {
+          id: user.id,
+        },
+      }
+    );
+  }
+
   return {
     id: user.id,
     provider: user.provider,
@@ -413,7 +426,7 @@ export async function getUserFromSession(
     firstName: user.firstName,
     lastName: user.lastName,
     fullName: user.firstName + (user.lastName ? ` ${user.lastName}` : ""),
-    image: session.user ? session.user.image : null,
+    image: user.imageUrl,
     workspaces: workspaces.map((w) => {
       const m = memberships.find((m) => m.workspaceId === w.id);
       let role = "none" as RoleType;
diff --git a/front/lib/models/user.ts b/front/lib/models/user.ts
index b1b445895cfc..a3c5e758e7cc 100644
--- a/front/lib/models/user.ts
+++ b/front/lib/models/user.ts
@@ -23,6 +23,7 @@ export class User extends Model<
   declare name: string;
   declare firstName: string;
   declare lastName: string | null;
+  declare imageUrl: string | null;
 
   declare isDustSuperUser: CreationOptional<boolean>;
 }
@@ -71,6 +72,10 @@ User.init(
       type: DataTypes.STRING,
       allowNull: true,
     },
+    imageUrl: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
     isDustSuperUser: {
       type: DataTypes.BOOLEAN,
       defaultValue: false,
diff --git a/front/migrations/20231219_imageUrl_backfill.ts b/front/migrations/20231219_imageUrl_backfill.ts
new file mode 100644
index 000000000000..a2835627123b
--- /dev/null
+++ b/front/migrations/20231219_imageUrl_backfill.ts
@@ -0,0 +1,84 @@
+import {
+  AgentConfiguration,
+  Membership,
+  User,
+  UserMessage,
+} from "@app/lib/models";
+
+async function main() {
+  console.log("Starting imageUrl backfill");
+  const workspaceIds = (
+    await AgentConfiguration.findAll({
+      attributes: ["workspaceId"],
+      group: ["workspaceId"],
+    })
+  ).map((a) => a.workspaceId);
+
+  console.log(`Found ${workspaceIds.length} workspaces to update`);
+  const chunks = [];
+  for (let i = 0; i < workspaceIds.length; i += 16) {
+    chunks.push(workspaceIds.slice(i, i + 16));
+  }
+
+  for (let i = 0; i < chunks.length; i++) {
+    console.log(`Processing workspace chunk ${i}/${chunks.length}...`);
+    const chunk = chunks[i];
+
+    await Promise.all(
+      chunk.map((wid: number) => {
+        return (async () => {
+          await backfillImageUrl(wid);
+        })();
+      })
+    );
+  }
+}
+
+async function backfillImageUrl(workspaceId: number) {
+  // get all users from workspace whose imageUrl is null
+  const users = await User.findAll({
+    where: {
+      imageUrl: null,
+    },
+    include: [
+      {
+        model: Membership,
+        where: {
+          workspaceId,
+        },
+        required: true,
+      },
+    ],
+  });
+
+  // for each user, find the last usermessage
+  // and set the user's imageUrl to the usermessage's userContextProfilePictureUrl
+  for (const user of users) {
+    const userMessage = await UserMessage.findOne({
+      where: {
+        userId: user.id,
+      },
+      order: [["createdAt", "DESC"]],
+    });
+    if (!userMessage) {
+      console.log(
+        `No user messages found for user with id ${user.id} in workspace with id ${workspaceId}`
+      );
+      continue;
+    }
+
+    await user.update({
+      imageUrl: userMessage.userContextProfilePictureUrl,
+    });
+  }
+}
+
+main()
+  .then(() => {
+    console.log("Done");
+    process.exit(0);
+  })
+  .catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });

From 6240866f5cf8a50efd0a7f7653e3702f62cfa99e Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Wed, 20 Dec 2023 14:39:24 +0100
Subject: [PATCH 05/23] [Runner] migration for imageUrl backfill (#2974)

---
 front/migrations/20231219_imageUrl_backfill.ts | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/front/migrations/20231219_imageUrl_backfill.ts b/front/migrations/20231219_imageUrl_backfill.ts
index a2835627123b..995eb9298f9a 100644
--- a/front/migrations/20231219_imageUrl_backfill.ts
+++ b/front/migrations/20231219_imageUrl_backfill.ts
@@ -1,18 +1,12 @@
-import {
-  AgentConfiguration,
-  Membership,
-  User,
-  UserMessage,
-} from "@app/lib/models";
+import { Membership, User, UserMessage, Workspace } from "@app/lib/models";
 
 async function main() {
   console.log("Starting imageUrl backfill");
   const workspaceIds = (
-    await AgentConfiguration.findAll({
-      attributes: ["workspaceId"],
-      group: ["workspaceId"],
+    await Workspace.findAll({
+      attributes: ["id"],
     })
-  ).map((a) => a.workspaceId);
+  ).map((a) => a.id);
 
   console.log(`Found ${workspaceIds.length} workspaces to update`);
   const chunks = [];

From bc469a0a1886cb62ffda5f5e075345e3bd6b55e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daphn=C3=A9=20Popin?= <PopDaph@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:38:17 +0100
Subject: [PATCH 06/23] Agent DbQuery action: improve display of streamed
 events (#2973)

---
 .../assistant/conversation/AgentMessage.tsx   |   1 +
 .../conversation/DatabaseQueryAction.tsx      | 139 ++++++++++++------
 .../api/assistant/actions/database_query.ts   |  34 ++++-
 front/lib/api/assistant/agent.ts              |   1 +
 front/lib/api/assistant/conversation.ts       |   2 +
 front/lib/api/assistant/pubsub.ts             |   2 +
 .../api/assistant/actions/database_query.ts   |   8 +
 types/src/front/lib/api/assistant/agent.ts    |   8 +-
 8 files changed, 144 insertions(+), 51 deletions(-)

diff --git a/front/components/assistant/conversation/AgentMessage.tsx b/front/components/assistant/conversation/AgentMessage.tsx
index c436eb9533d2..66e8f36ef9e7 100644
--- a/front/components/assistant/conversation/AgentMessage.tsx
+++ b/front/components/assistant/conversation/AgentMessage.tsx
@@ -128,6 +128,7 @@ export function AgentMessage({
       case "dust_app_run_params":
       case "dust_app_run_block":
       case "database_query_params":
+      case "database_query_output":
         setStreamedAgentMessage((m) => {
           return { ...m, action: event.action };
         });
diff --git a/front/components/assistant/conversation/DatabaseQueryAction.tsx b/front/components/assistant/conversation/DatabaseQueryAction.tsx
index 8c814bcad87b..f5ca39f8fa61 100644
--- a/front/components/assistant/conversation/DatabaseQueryAction.tsx
+++ b/front/components/assistant/conversation/DatabaseQueryAction.tsx
@@ -4,6 +4,7 @@ import {
   Chip,
   Icon,
   Spinner,
+  Tooltip,
 } from "@dust-tt/sparkle";
 import { DatabaseQueryActionType } from "@dust-tt/types";
 import dynamic from "next/dynamic";
@@ -20,72 +21,114 @@ export default function DatabaseQueryAction({
 }: {
   databaseQueryAction: DatabaseQueryActionType;
 }) {
-  const [outputVisible, setOutputVisible] = useState(false);
+  const [isOutputExpanded, setIsOutputExpanded] = useState(false);
 
+  // Extracting question from the params
+  const params = databaseQueryAction.params;
+  const question =
+    typeof params?.question === "string" ? params.question : null;
+
+  // Extracting query and result from the output
   const output = databaseQueryAction.output;
-  const query = output?.query;
+  const query = typeof output?.query === "string" ? output.query : null;
+  const noQuery = output?.no_query === true;
+  const results = output?.results;
+
+  const isQueryStepCompleted = noQuery || query;
+  const isOutputStepCompleted = noQuery || (query && results);
+
+  const trimText = (text: string, maxLength = 20) => {
+    const t = text.replaceAll("\n", " ");
+    return t.length > maxLength ? t.substring(0, maxLength) + "..." : t;
+  };
 
   return (
     <>
-      <div className="grid grid-cols-[auto,1fr] gap-2">
-        <div className="grid-cols-auto grid items-center">
-          {!output ? (
-            <div>
-              <Spinner size="sm" />
-            </div>
-          ) : (
+      {question && (
+        <div className="flex flex-row items-center gap-2 pb-2">
+          <div className="flex flex-col items-start text-xs font-bold text-element-600">
+            <div className="flex">Question:</div>
+          </div>
+          <Tooltip label={question}>
+            <Chip color="slate" label={trimText(question)} />
+          </Tooltip>
+        </div>
+      )}
+
+      {!isQueryStepCompleted && (
+        <div>
+          <div className="pb-2 text-xs font-bold text-element-600">
+            Generating query...
+          </div>
+          <Spinner size="sm" />
+        </div>
+      )}
+
+      {isQueryStepCompleted && (
+        <div className="grid grid-cols-[auto,1fr] gap-2 pb-2">
+          <div className="grid-cols-auto grid items-center">
             <div className="text-xs font-bold text-element-600">
-              <span>{query ? "Query Executed:" : "Result: "}</span>
+              <span>Query:</span>
             </div>
-          )}
-        </div>
-        {!!output && (
+          </div>
           <div className="row-span-1 select-none">
             <div
               className="cursor-pointer"
               onClick={() => {
-                setOutputVisible(!outputVisible);
+                setIsOutputExpanded(!isOutputExpanded);
               }}
             >
               <Chip color="purple">
-                {query ? query : "No query generated, expand to see why"}
-                <Icon
-                  visual={outputVisible ? ChevronDownIcon : ChevronRightIcon}
-                  size="xs"
-                />
+                {query ? query : "No query generated"}
+                {(noQuery || results) && (
+                  <Icon
+                    visual={
+                      isOutputExpanded ? ChevronDownIcon : ChevronRightIcon
+                    }
+                    size="xs"
+                  />
+                )}
               </Chip>
             </div>
           </div>
-        )}
-        {outputVisible && (
-          <div className="col-start-2 row-span-1 max-h-48 overflow-auto rounded-md bg-structure-100">
-            <SyntaxHighlighter
-              className="h-full w-full rounded-md text-xs"
-              style={{
-                "hljs-number": {
-                  color: amber["500"],
-                },
-                "hljs-literal": {
-                  color: amber["500"],
-                },
-                "hljs-string": {
-                  color: emerald["600"],
-                },
-                hljs: {
-                  display: "block",
-                  overflowX: "auto",
-                  color: slate["700"],
-                  padding: "1em",
-                },
-              }}
-              language={"json"}
-              PreTag="div"
-            >
-              {JSON.stringify(output, null, 2)}
-            </SyntaxHighlighter>
+          {isOutputExpanded && (
+            <div className="col-start-2 row-span-1 max-h-48 overflow-auto rounded-md bg-structure-100">
+              <SyntaxHighlighter
+                className="h-full w-full rounded-md text-xs"
+                style={{
+                  "hljs-number": {
+                    color: amber["500"],
+                  },
+                  "hljs-literal": {
+                    color: amber["500"],
+                  },
+                  "hljs-string": {
+                    color: emerald["600"],
+                  },
+                  hljs: {
+                    display: "block",
+                    overflowX: "auto",
+                    color: slate["700"],
+                    padding: "1em",
+                  },
+                }}
+                language={"json"}
+                PreTag="div"
+              >
+                {JSON.stringify(output, null, 2)}
+              </SyntaxHighlighter>
+            </div>
+          )}
+        </div>
+      )}
+      {isQueryStepCompleted && !isOutputStepCompleted && (
+        <div>
+          <div className="pb-2 text-xs font-bold text-element-600">
+            Running query...
           </div>
-        )}
-      </div>
+          <Spinner size="sm" />
+        </div>
+      )}
     </>
   );
 }
diff --git a/front/lib/api/assistant/actions/database_query.ts b/front/lib/api/assistant/actions/database_query.ts
index ca0bd9378c93..731fb14144fb 100644
--- a/front/lib/api/assistant/actions/database_query.ts
+++ b/front/lib/api/assistant/actions/database_query.ts
@@ -5,6 +5,7 @@ import {
   ConversationType,
   DatabaseQueryActionType,
   DatabaseQueryErrorEvent,
+  DatabaseQueryOutputEvent,
   DatabaseQueryParamsEvent,
   DatabaseQuerySuccessEvent,
   DustProdActionRegistry,
@@ -119,7 +120,10 @@ export async function* runDatabaseQuery({
   userMessage: UserMessageType;
   agentMessage: AgentMessageType;
 }): AsyncGenerator<
-  DatabaseQueryErrorEvent | DatabaseQuerySuccessEvent | DatabaseQueryParamsEvent
+  | DatabaseQueryErrorEvent
+  | DatabaseQuerySuccessEvent
+  | DatabaseQueryParamsEvent
+  | DatabaseQueryOutputEvent
 > {
   // Checking authorizations
   const owner = auth.workspace();
@@ -282,8 +286,36 @@ export async function* runDatabaseQuery({
         return;
       }
 
+      if (event.content.block_name === "SQL") {
+        let tmpOutput = null;
+        if (e.value) {
+          const sql = e.value as string;
+          tmpOutput = { query: sql };
+        } else {
+          tmpOutput = { no_query: true };
+        }
+        yield {
+          type: "database_query_output",
+          created: Date.now(),
+          configurationId: configuration.sId,
+          messageId: agentMessage.sId,
+          action: {
+            id: action.id,
+            type: "database_query_action",
+            dataSourceWorkspaceId: action.dataSourceWorkspaceId,
+            dataSourceId: action.dataSourceId,
+            databaseId: action.databaseId,
+            params: action.params,
+            output: tmpOutput,
+          },
+        };
+      }
+
       if (event.content.block_name === "OUTPUT" && e.value) {
         output = JSON.parse(e.value as string);
+        if (!output.query) {
+          output.no_query = true;
+        }
       }
     }
   }
diff --git a/front/lib/api/assistant/agent.ts b/front/lib/api/assistant/agent.ts
index 7644e918a85e..1b4aa1ee8598 100644
--- a/front/lib/api/assistant/agent.ts
+++ b/front/lib/api/assistant/agent.ts
@@ -302,6 +302,7 @@ export async function* runAgent(
       for await (const event of eventStream) {
         switch (event.type) {
           case "database_query_params":
+          case "database_query_output":
             yield event;
             break;
           case "database_query_error":
diff --git a/front/lib/api/assistant/conversation.ts b/front/lib/api/assistant/conversation.ts
index eb49b25443e5..bdfd875e0545 100644
--- a/front/lib/api/assistant/conversation.ts
+++ b/front/lib/api/assistant/conversation.ts
@@ -359,6 +359,7 @@ async function batchRenderAgentMessages(
           dataSourceWorkspaceId: action.dataSourceWorkspaceId,
           dataSourceId: action.dataSourceId,
           databaseId: action.databaseId,
+          params: action.params,
           output: action.output,
         };
       });
@@ -1956,6 +1957,7 @@ async function* streamRunAgentEvents(
       case "dust_app_run_params":
       case "dust_app_run_block":
       case "database_query_params":
+      case "database_query_output":
         yield event;
         break;
       case "generation_tokens":
diff --git a/front/lib/api/assistant/pubsub.ts b/front/lib/api/assistant/pubsub.ts
index 63119c89c5d9..56f6470be4c1 100644
--- a/front/lib/api/assistant/pubsub.ts
+++ b/front/lib/api/assistant/pubsub.ts
@@ -158,6 +158,7 @@ async function handleUserMessageEvents(
               case "dust_app_run_params":
               case "dust_app_run_block":
               case "database_query_params":
+              case "database_query_output":
               case "agent_error":
               case "agent_action_success":
               case "generation_tokens":
@@ -282,6 +283,7 @@ export async function retryAgentMessageWithPubSub(
               case "dust_app_run_params":
               case "dust_app_run_block":
               case "database_query_params":
+              case "database_query_output":
               case "agent_error":
               case "agent_action_success":
               case "generation_tokens":
diff --git a/types/src/front/lib/api/assistant/actions/database_query.ts b/types/src/front/lib/api/assistant/actions/database_query.ts
index de3033ef8b1a..3586f7f7a891 100644
--- a/types/src/front/lib/api/assistant/actions/database_query.ts
+++ b/types/src/front/lib/api/assistant/actions/database_query.ts
@@ -26,3 +26,11 @@ export type DatabaseQueryParamsEvent = {
   messageId: string;
   action: DatabaseQueryActionType;
 };
+
+export type DatabaseQueryOutputEvent = {
+  type: "database_query_output";
+  created: number;
+  configurationId: string;
+  messageId: string;
+  action: DatabaseQueryActionType;
+};
diff --git a/types/src/front/lib/api/assistant/agent.ts b/types/src/front/lib/api/assistant/agent.ts
index 7660c80dd644..93528860765b 100644
--- a/types/src/front/lib/api/assistant/agent.ts
+++ b/types/src/front/lib/api/assistant/agent.ts
@@ -6,7 +6,10 @@ import {
   AgentActionType,
   AgentMessageType,
 } from "../../../../front/assistant/conversation";
-import { DatabaseQueryParamsEvent } from "../../../../front/lib/api/assistant/actions/database_query";
+import {
+  DatabaseQueryOutputEvent,
+  DatabaseQueryParamsEvent,
+} from "../../../../front/lib/api/assistant/actions/database_query";
 import {
   DustAppRunBlockEvent,
   DustAppRunParamsEvent,
@@ -41,7 +44,8 @@ export type AgentActionEvent =
   | RetrievalParamsEvent
   | DustAppRunParamsEvent
   | DustAppRunBlockEvent
-  | DatabaseQueryParamsEvent;
+  | DatabaseQueryParamsEvent
+  | DatabaseQueryOutputEvent;
 
 // Event sent once the action is completed, we're moving to generating a message if applicable.
 export type AgentActionSuccessEvent = {

From b26fd218241e2df5c5de4416fcb658b5de3581c5 Mon Sep 17 00:00:00 2001
From: Stanislas Polu <spolu@dust.tt>
Date: Wed, 20 Dec 2023 16:16:38 +0100
Subject: [PATCH 07/23] x/evals: better prompting (#2975)

---
 x/spolu/research/evals/lib/algorithms/CoT.ts  | 31 +++-----------
 x/spolu/research/evals/lib/datasets.ts        |  8 ++--
 x/spolu/research/evals/lib/datasets/MATH.ts   | 40 ++++++++++++-------
 x/spolu/research/evals/lib/datasets/game24.ts | 38 ++++++++++--------
 x/spolu/research/evals/lib/models/openai.ts   |  2 +
 5 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/x/spolu/research/evals/lib/algorithms/CoT.ts b/x/spolu/research/evals/lib/algorithms/CoT.ts
index 2ce4de7ced69..6568f11b4078 100644
--- a/x/spolu/research/evals/lib/algorithms/CoT.ts
+++ b/x/spolu/research/evals/lib/algorithms/CoT.ts
@@ -39,10 +39,8 @@ export class CoT extends Algorithm {
     let prompt = `INSTRUCTIONS:\n`;
     prompt += ` ${this.dataset.instructions()}`;
     prompt += "\n\n";
-    prompt += `Start by providing a REASONING consisting in multiple steps, using one line per step.`;
+    prompt += `Provide a reasoning consisting in multiple steps, using one line per step.`;
     prompt += ` ${this.dataset.reasoningStepInstructions()}`;
-    prompt += ` Finally provide a final ANSWER.`;
-    prompt += ` ${this.dataset.answerInstructions()}`;
     // prompt +=
     //   ` Do not perform multiple reasoning attempts per question,` +
     //   ` do not backtrack in your reasoning steps.`;
@@ -52,7 +50,6 @@ export class CoT extends Algorithm {
     for (const e of examples.slice(0, 4)) {
       prompt += `\nQUESTION: ${e.question}\n`;
       prompt += `REASONING:\n${e.reasoning.join("\n")}\n`;
-      prompt += `ANSWER: ${e.answer}\n`;
     }
 
     messages.push({
@@ -67,7 +64,7 @@ export class CoT extends Algorithm {
       });
       messages.push({
         role: "assistant",
-        content: `REASONING:\n${e.reasoning.join("\n")}\nANSWER: ${e.answer}`,
+        content: `REASONING:\n${e.reasoning.join("\n")}`,
       });
     }
 
@@ -79,18 +76,14 @@ export class CoT extends Algorithm {
     // console.log(prompt);
     // console.log(messages);
 
-    let maxTokens: number | undefined = undefined;
-    const datasetMaxTokens = this.dataset.maxTokens();
-    if (datasetMaxTokens.reasoning && datasetMaxTokens.answer) {
-      maxTokens = datasetMaxTokens.reasoning + datasetMaxTokens.answer;
-    }
-
     const query: ChatQuery = {
       provider: this.model.provider,
       model: this.model.model(),
       messages,
       temperature: this.TEMPERATURE,
-      maxTokens,
+      maxTokens:
+        this.dataset.maxTokens().reasoningStep *
+        this.dataset.maxTokens().maxStepCount,
     };
 
     const c = await this.runCompletion(query);
@@ -125,18 +118,7 @@ export class CoT extends Algorithm {
       console.log("+++++++++++++++++++++++++");
     }
 
-    if (!c.content || !c.content.includes("REASONING:")) {
-      return await finish(test, c, query, false, "");
-    }
-
-    const content = c.content.split("REASONING:")[1].trim();
-
-    if (!content.includes("ANSWER:")) {
-      return await finish(test, c, query, false, "");
-    }
-
-    const reasoning = content.split("ANSWER:")[0].trim().split("\n");
-    const answer = content.split("ANSWER:")[1].trim();
+    const answer = this.dataset.parseAnswer(c.content);
 
     let check = false;
     try {
@@ -146,7 +128,6 @@ export class CoT extends Algorithm {
     }
 
     if (debug) {
-      console.log(`REASONING: ${reasoning.join(" ")}`);
       console.log(`ANSWER: ${answer}`);
       console.log(`CHECK: ${check}`);
       console.log("-------------------------");
diff --git a/x/spolu/research/evals/lib/datasets.ts b/x/spolu/research/evals/lib/datasets.ts
index 7f951f896542..aea27a852e43 100644
--- a/x/spolu/research/evals/lib/datasets.ts
+++ b/x/spolu/research/evals/lib/datasets.ts
@@ -24,14 +24,14 @@ export abstract class Dataset {
 
   abstract instructions(): string;
   abstract reasoningStepInstructions(): string;
-  abstract answerInstructions(): string;
 
   abstract maxTokens(): {
-    resaoningStep: number | null;
-    reasoning: number | null;
-    answer: number | null;
+    reasoningStep: number;
+    maxStepCount: number;
   };
 
+  abstract parseAnswer(str: string): string;
+
   abstract tests({ count }: { count: number }): Test[];
 
   abstract examples({
diff --git a/x/spolu/research/evals/lib/datasets/MATH.ts b/x/spolu/research/evals/lib/datasets/MATH.ts
index d9ba943bee9f..6d01c81d589f 100644
--- a/x/spolu/research/evals/lib/datasets/MATH.ts
+++ b/x/spolu/research/evals/lib/datasets/MATH.ts
@@ -36,6 +36,7 @@ export class MATH extends Dataset {
         d[e.type][e.level] = [];
       }
       d[e.type][e.level].push(e);
+      // console.log(e.reasoning.length);
     }
 
     return d;
@@ -69,30 +70,39 @@ export class MATH extends Dataset {
   }
 
   instructions(): string {
-    return `Find a solution to the provided mathematical problem below.`;
+    return (
+      "Find a solution to the provided mathematical problem." +
+      " The answer is a unique mathematical expression presented in LaTeX `\\boxed{}` directive. " +
+      " (example: `\\boxed{4}` or `\\boxed{3\\pi}`). Formatting instructions: " +
+      " fractions should be represented in the LaTeX form `\\frac{a}{b}` (not `\\frac12`)," +
+      " units should not be included," +
+      " square roots should be presented in the LaTeX form `\\sqrt{c}` (not `\\sqrt2`)," +
+      " all spaces and non critical parentheses or formatting should be stripped," +
+      " rational numbers should be presented with a leading `0`."
+    );
   }
 
   reasoningStepInstructions(): string {
-    return `A reasoning step is one coherent step of mathematical reasoning it should held in one line.`;
-  }
-
-  answerInstructions(): string {
     return (
-      ` The answer is a unique mathematical expression presented in a LaTeX '\\boxed' directive` +
-      ` (eg: \\boxed{4} or \\boxed{3\\pi}). Formatting instructions:` +
-      ` fractions should be represented in the LaTeX form \\frac{a}{b} (not \\frac12),` +
-      ` units should not be included,` +
-      ` square roots should be presented in the LaTeX form \\sqrt{c} (not \\sqrt2),` +
-      ` all spaces and non critical parentheses or formatting should be stripped,` +
-      ` rational numbers should be presented with a leading 0.`
+      "A reasoning step is one coherent step of mathematical reasoning. It should hold in one line" +
+      " of at most 500 characters." +
+      " If an answer is reached as part of the reasoning, it should be included" +
+      " in the reasoning step using the `\\boxed{}` directive."
     );
   }
 
+  parseAnswer(str: string): string {
+    const boxed = str.match(/\\boxed{([^}]*)}/g);
+    if (!boxed) {
+      return "";
+    }
+    return boxed[boxed.length - 1];
+  }
+
   maxTokens() {
     return {
-      resaoningStep: 512,
-      reasoning: 3584,
-      answer: 64,
+      reasoningStep: 256,
+      maxStepCount: 16,
     };
   }
 
diff --git a/x/spolu/research/evals/lib/datasets/game24.ts b/x/spolu/research/evals/lib/datasets/game24.ts
index 5371a34963b9..bc62fe07cf03 100644
--- a/x/spolu/research/evals/lib/datasets/game24.ts
+++ b/x/spolu/research/evals/lib/datasets/game24.ts
@@ -80,7 +80,7 @@ export class Game24 extends Dataset {
         if (result !== 24) {
           throw new Error("Unexpected non 24 result");
         }
-        const r = `${a}${op}${b}=${result}`;
+        const r = `${a}${op}${b}=${result}, \\boxed{${solution}}`;
         reasoning.push(r);
       }
     }
@@ -116,33 +116,39 @@ export class Game24 extends Dataset {
 
   instructions(): string {
     return (
-      `Given a set of 4 input numbers, find a mathematical expression using each number` +
-      ` exactly once that symbolically evaluates to 24 (Game of 24).` +
-      ` The available operators are [+,-,*,/]` +
-      ` (the division operator / is the symbolic division (eg: 2/(3-5/2) = 2/(1/2) = 4)).`
+      "Given a set of 4 input numbers, find a mathematical expression using each number" +
+      " exactly once that symbolically evaluates to 24 (Game of 24)." +
+      " The available operators are [+,-,*,/]" +
+      " (the division operator / is the symbolic division (`2/(3-5/2) = 2/(1/2) = 4`))."
     );
   }
 
   reasoningStepInstructions(): string {
     return (
-      `A reasoning step is one operation involving 2 numbers followed by the numbers left to form` +
-      ` 24 after that operation (eg: '10*7=70, left: 70 2 11').` +
-      ` There is always exactly 3 reasoning steps per question.`
+      "A reasoning step is one operation involving 2 numbers followed by the numbers left to form" +
+      " 24 after that operation, separated by a comma (example: `10*7=70, left: 70 2 11`)." +
+      " There is always exactly 3 reasoning steps per question in Game of 24." +
+      " The last step should present the last operation and the solution expression" +
+      " using the `\\boxed{}` directive, sperated by a comma" +
+      " (example: `35-11=24, \\\boxed{(6+1)*5-11}`)."
     );
   }
 
-  answerInstructions(): string {
-    return (
-      `The answer should be a valid solution expression without space using each number` +
-      ` exactly once (eg: '(6+1)*5-11' or '(9-1)*9/3').`
-    );
+  parseAnswer(str: string): string {
+    const boxed = str.match(/\\boxed{([^}]*)}/g);
+    if (!boxed) {
+      return "";
+    }
+    // remove the \boxed{} directive
+    const answer = boxed.map((s) => s.slice(7, s.length - 1));
+    // return the last one
+    return answer[answer.length - 1];
   }
 
   maxTokens() {
     return {
-      resaoningStep: 32,
-      reasoning: 32 * 3,
-      answer: 16,
+      reasoningStep: 32,
+      maxStepCount: 3,
     };
   }
 
diff --git a/x/spolu/research/evals/lib/models/openai.ts b/x/spolu/research/evals/lib/models/openai.ts
index f734bc058ef6..3bd4ef2b6fd3 100644
--- a/x/spolu/research/evals/lib/models/openai.ts
+++ b/x/spolu/research/evals/lib/models/openai.ts
@@ -28,8 +28,10 @@ export class OpenAIModel extends Model {
       messages: query.messages,
       max_tokens: query.maxTokens,
       temperature: query.temperature,
+      // logprobs: true,
     });
 
+    // console.log(JSON.stringify(completion));
     const m = completion.choices[0].message;
 
     if (m.content === null) {

From 14b0598f4bdc7553d4f7281702961080164d240f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daphn=C3=A9=20Popin?= <PopDaph@users.noreply.github.com>
Date: Wed, 20 Dec 2023 16:46:10 +0100
Subject: [PATCH 08/23] Disable Gemini Pro from assistant builder (#2976)

---
 front/components/assistant_builder/AssistantBuilder.tsx | 2 --
 1 file changed, 2 deletions(-)

diff --git a/front/components/assistant_builder/AssistantBuilder.tsx b/front/components/assistant_builder/AssistantBuilder.tsx
index 88e74e52333a..3237595cfcb2 100644
--- a/front/components/assistant_builder/AssistantBuilder.tsx
+++ b/front/components/assistant_builder/AssistantBuilder.tsx
@@ -24,7 +24,6 @@ import { UserType, WorkspaceType } from "@dust-tt/types";
 import {
   CLAUDE_DEFAULT_MODEL_CONFIG,
   CLAUDE_INSTANT_DEFAULT_MODEL_CONFIG,
-  GEMINI_PRO_DEFAULT_MODEL_CONFIG,
   GPT_3_5_TURBO_MODEL_CONFIG,
   GPT_4_TURBO_MODEL_CONFIG,
   MISTRAL_SMALL_MODEL_CONFIG,
@@ -81,7 +80,6 @@ const usedModelConfigs = [
   CLAUDE_DEFAULT_MODEL_CONFIG,
   CLAUDE_INSTANT_DEFAULT_MODEL_CONFIG,
   MISTRAL_SMALL_MODEL_CONFIG,
-  GEMINI_PRO_DEFAULT_MODEL_CONFIG,
 ];
 
 // Actions

From 1dbca9deb727b7e3c33fd878eefd82629019ecea Mon Sep 17 00:00:00 2001
From: Flavien David <flavien.david74@gmail.com>
Date: Wed, 20 Dec 2023 16:47:48 +0100
Subject: [PATCH 09/23] Support mistral-medium in Assistant Builder (#2977)

---
 front/components/assistant_builder/AssistantBuilder.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/front/components/assistant_builder/AssistantBuilder.tsx b/front/components/assistant_builder/AssistantBuilder.tsx
index 3237595cfcb2..d53879d86aaa 100644
--- a/front/components/assistant_builder/AssistantBuilder.tsx
+++ b/front/components/assistant_builder/AssistantBuilder.tsx
@@ -26,6 +26,7 @@ import {
   CLAUDE_INSTANT_DEFAULT_MODEL_CONFIG,
   GPT_3_5_TURBO_MODEL_CONFIG,
   GPT_4_TURBO_MODEL_CONFIG,
+  MISTRAL_MEDIUM_MODEL_CONFIG,
   MISTRAL_SMALL_MODEL_CONFIG,
   SupportedModel,
 } from "@dust-tt/types";
@@ -79,6 +80,7 @@ const usedModelConfigs = [
   GPT_3_5_TURBO_MODEL_CONFIG,
   CLAUDE_DEFAULT_MODEL_CONFIG,
   CLAUDE_INSTANT_DEFAULT_MODEL_CONFIG,
+  MISTRAL_MEDIUM_MODEL_CONFIG,
   MISTRAL_SMALL_MODEL_CONFIG,
 ];
 

From fd873102991ec282c67d2d8263b8776ef73efd0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daphn=C3=A9=20Popin?= <PopDaph@users.noreply.github.com>
Date: Wed, 20 Dec 2023 17:09:04 +0100
Subject: [PATCH 10/23] Front: Put database management in Folder section if
 feat activated (#2931)

* Front: Put database management in Folder section if feat activated

* Move to Full screen modal and rework form

* Allow naming both db and table

* Reset tab query param once used to set the valid tab

* Rework field description
---
 front/lib/development.ts                      |   5 +
 front/lib/swr.ts                              |   1 +
 .../[name]/databases/[dId]/tables/index.ts    |   7 +-
 .../data_sources/[name]/databases/index.ts    |   7 +-
 .../[name]/databases/[dId]/tables/index.ts    |   4 +-
 .../data_sources/[name]/databases/csv.ts      |  16 +-
 .../data_sources/[name]/databases/index.ts    |   4 +-
 .../data-sources/[name]/databases/upsert.tsx  | 424 ++++++++++++++++++
 .../builder/data-sources/[name]/index.tsx     | 368 ++++++++++++---
 .../builder/data-sources/[name]/upsert.tsx    |   2 +-
 types/src/front/lib/actions/registry.ts       |   4 +-
 types/src/front/lib/core_api.ts               |  16 +-
 12 files changed, 766 insertions(+), 92 deletions(-)
 create mode 100644 front/pages/w/[wId]/builder/data-sources/[name]/databases/upsert.tsx

diff --git a/front/lib/development.ts b/front/lib/development.ts
index b9ed08361b96..351c2b04b227 100644
--- a/front/lib/development.ts
+++ b/front/lib/development.ts
@@ -14,3 +14,8 @@ export function isDevelopmentOrDustWorkspace(owner: WorkspaceType) {
     owner.sId === PRODUCTION_DUST_APPS_WORKSPACE_ID
   );
 }
+
+export function isActivatedStructuredDB(owner: WorkspaceType) {
+  // We will manually add workspace ids here.
+  return isDevelopmentOrDustWorkspace(owner);
+}
diff --git a/front/lib/swr.ts b/front/lib/swr.ts
index 81678105b9c8..a81ba3316e6f 100644
--- a/front/lib/swr.ts
+++ b/front/lib/swr.ts
@@ -511,6 +511,7 @@ export function useDatabases({
 
   return {
     databases: data ? data.databases : [],
+    total: data ? data.total : null,
     isDatabasesLoading: !error && !data,
     isDatabasesError: error,
     mutateDatabases: mutate,
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
index c3ccc44facea..2fc0cb324ebb 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
@@ -1,4 +1,4 @@
-import { CoreAPI, CoreAPIDatabaseTable } from "@dust-tt/types";
+import { CoreAPI, CoreAPIDatabase, CoreAPIDatabaseTable } from "@dust-tt/types";
 import { isLeft } from "fp-ts/lib/Either";
 import * as t from "io-ts";
 import * as reporter from "io-ts-reporters";
@@ -12,6 +12,7 @@ import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
 export type ListDatabaseTablesResponseBody = {
+  database: CoreAPIDatabase;
   tables: CoreAPIDatabaseTable[];
 };
 
@@ -106,9 +107,9 @@ async function handler(
         });
       }
 
-      const { tables } = tablesRes.value;
+      const { database, tables } = tablesRes.value;
 
-      return res.status(200).json({ tables });
+      return res.status(200).json({ database, tables });
 
     case "POST":
       const bodyValidation = UpsertDatabaseTableRequestBodySchema.decode(
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts
index ca5d4862ec73..d4fe4bbce1ff 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts
@@ -25,6 +25,9 @@ export const ListDatabasesReqQuerySchema = t.type({
 });
 export type ListDatabasesResponseBody = {
   databases: CoreAPIDatabase[];
+  offset: number;
+  limit: number;
+  total: number;
 };
 
 async function handler(
@@ -157,9 +160,7 @@ async function handler(
         });
       }
 
-      const { databases } = getRes.value;
-
-      return res.status(200).json({ databases });
+      return res.status(200).json(getRes.value);
 
     default:
       return apiError(req, res, {
diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
index 531aa4a46bc9..84f950f343bb 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
@@ -103,9 +103,9 @@ async function handler(
         });
       }
 
-      const { tables } = tablesRes.value;
+      const { database, tables } = tablesRes.value;
 
-      return res.status(200).json({ tables });
+      return res.status(200).json({ database, tables });
 
     default:
       return apiError(req, res, {
diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
index bd7f2b0237ec..55e3f438fe17 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
@@ -15,8 +15,9 @@ import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
 const CreateDatabaseFromCsvSchema = t.type({
-  name: t.string,
-  description: t.string,
+  databaseName: t.string,
+  tableName: t.string,
+  tableDescription: t.string,
   csv: t.string,
 });
 
@@ -79,7 +80,8 @@ async function handler(
         });
       }
 
-      const { name, description, csv } = bodyValidation.right;
+      const { databaseName, tableName, tableDescription, csv } =
+        bodyValidation.right;
       const csvRowsRes = await rowsFromCsv(csv);
       if (csvRowsRes.isErr()) {
         return apiError(req, res, {
@@ -105,14 +107,14 @@ async function handler(
         projectId: dataSource.dustAPIProjectId,
         dataSourceName: dataSource.name,
         databaseId: id,
-        name,
+        name: databaseName,
       });
       if (dbRes.isErr()) {
         logger.error(
           {
             dataSourceName: dataSource.name,
             workspaceId: owner.id,
-            databaseName: name,
+            databaseName: databaseName,
             databaseId: id,
             error: dbRes.error,
           },
@@ -134,8 +136,8 @@ async function handler(
         projectId: dataSource.dustAPIProjectId,
         dataSourceName: dataSource.name,
         databaseId: id,
-        description,
-        name: name,
+        description: tableDescription,
+        name: tableName,
         tableId,
       });
 
diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts
index 804485c058e2..da786ce08f48 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts
@@ -112,9 +112,7 @@ async function handler(
         });
       }
 
-      const { databases } = getRes.value;
-
-      return res.status(200).json({ databases });
+      return res.status(200).json(getRes.value);
 
     default:
       return apiError(req, res, {
diff --git a/front/pages/w/[wId]/builder/data-sources/[name]/databases/upsert.tsx b/front/pages/w/[wId]/builder/data-sources/[name]/databases/upsert.tsx
new file mode 100644
index 000000000000..4d40f587ae45
--- /dev/null
+++ b/front/pages/w/[wId]/builder/data-sources/[name]/databases/upsert.tsx
@@ -0,0 +1,424 @@
+import {
+  Button,
+  DocumentPlusIcon,
+  DropdownMenu,
+  Input,
+  Page,
+  TrashIcon,
+} from "@dust-tt/sparkle";
+import { DataSourceType, UserType, WorkspaceType } from "@dust-tt/types";
+import { SubscriptionType } from "@dust-tt/types";
+import { GetServerSideProps, InferGetServerSidePropsType } from "next";
+import { useRouter } from "next/router";
+import { useContext, useEffect, useRef, useState } from "react";
+import { mutate } from "swr";
+
+import AppLayout from "@app/components/sparkle/AppLayout";
+import { AppLayoutSimpleSaveCancelTitle } from "@app/components/sparkle/AppLayoutTitle";
+import { subNavigationAssistants } from "@app/components/sparkle/navigation";
+import { SendNotificationsContext } from "@app/components/sparkle/Notification";
+import { getDataSource } from "@app/lib/api/data_sources";
+import { Authenticator, getSession, getUserFromSession } from "@app/lib/auth";
+import { handleFileUploadToText } from "@app/lib/client/handle_file_upload";
+import { classNames } from "@app/lib/utils";
+
+const { GA_TRACKING_ID = "" } = process.env;
+
+export const getServerSideProps: GetServerSideProps<{
+  user: UserType | null;
+  owner: WorkspaceType;
+  subscription: SubscriptionType;
+  readOnly: boolean;
+  dataSource: DataSourceType;
+  loadDatabaseId: string | null;
+  gaTrackingId: string;
+}> = async (context) => {
+  const session = await getSession(context.req, context.res);
+  const user = await getUserFromSession(session);
+  const auth = await Authenticator.fromSession(
+    session,
+    context.params?.wId as string
+  );
+
+  const owner = auth.workspace();
+  const plan = auth.plan();
+  const subscription = auth.subscription();
+  if (!owner || !plan || !subscription) {
+    return {
+      notFound: true,
+    };
+  }
+
+  const dataSource = await getDataSource(auth, context.params?.name as string);
+  if (!dataSource) {
+    return {
+      notFound: true,
+    };
+  }
+
+  // If user is not builder or if datasource is managed.
+  const readOnly = !auth.isBuilder() || !!dataSource.connectorId;
+
+  return {
+    props: {
+      user,
+      owner,
+      subscription,
+      readOnly,
+      dataSource,
+      loadDatabaseId: (context.query.databaseId || null) as string | null,
+      gaTrackingId: GA_TRACKING_ID,
+    },
+  };
+};
+
+export default function DatabaseUpsert({
+  user,
+  owner,
+  subscription,
+  readOnly,
+  dataSource,
+  loadDatabaseId,
+  gaTrackingId,
+}: InferGetServerSidePropsType<typeof getServerSideProps>) {
+  const router = useRouter();
+  const sendNotification = useContext(SendNotificationsContext);
+  const fileInputRef = useRef<HTMLInputElement>(null);
+
+  const [databaseId, setDatabaseId] = useState(null);
+  const [databaseName, setDatabaseName] = useState("");
+  const [tableName, setTableName] = useState("");
+  const [tableDescription, setTableDescription] = useState("");
+  const [file, setFile] = useState<File | null>(null);
+
+  const [disabled, setDisabled] = useState(false);
+  const [loading, setLoading] = useState(false);
+  const [uploading, setUploading] = useState(false);
+
+  useEffect(() => {
+    setDisabled(!databaseName || !tableName || !tableDescription || !file);
+  }, [databaseName, tableName, tableDescription, file]);
+
+  useEffect(() => {
+    if (loadDatabaseId) {
+      setDatabaseName(loadDatabaseId);
+      setDisabled(true);
+      fetch(
+        `/api/w/${owner.sId}/data_sources/${
+          dataSource.name
+        }/databases/${encodeURIComponent(loadDatabaseId)}/tables`
+      )
+        .then(async (res) => {
+          if (res.ok) {
+            const { database, tables } = await res.json();
+            const table = tables[0]; // TODO: support multiple tables
+            setDisabled(false);
+            setDatabaseId(database.database_id);
+            setDatabaseName(database.name);
+            setTableName(table.name);
+            setTableDescription(table.description);
+          }
+        })
+        .catch((e) => console.error(e));
+    }
+  }, [dataSource.name, loadDatabaseId, owner.sId]);
+
+  // Not empty, only alphanumeric, and not too long
+  const isNameValid = (name: string) =>
+    name !== "" && /^[a-zA-Z0-9_]{1,32}$/.test(name);
+
+  const redirectToDataSourcePage = () => {
+    void router.push(
+      `/w/${owner.sId}/builder/data-sources/${dataSource.name}?tab=databases`
+    );
+  };
+
+  const handleDelete = async () => {
+    const res = await fetch(
+      `/api/w/${owner.sId}/data_sources/${dataSource.name}/databases/${databaseId}`,
+      {
+        method: "DELETE",
+      }
+    );
+
+    if (!res.ok) {
+      sendNotification({
+        type: "error",
+        title: "Error deleting database",
+        description: `An error occured: ${await res.text()}.`,
+      });
+      return;
+    }
+    await mutate(
+      `/api/w/${owner.sId}/data_sources/${dataSource.name}/databases?offset=0&limit=100`
+    );
+    redirectToDataSourcePage();
+  };
+
+  const handleUpsert = async () => {
+    if (!file) {
+      return;
+    }
+
+    const res = await handleFileUploadToText(file);
+    if (res.isErr()) {
+      sendNotification({
+        type: "error",
+        title: "Error uploading file",
+        description: `An unexpected error occured: ${res.error}.`,
+      });
+      return;
+    }
+    const { content } = res.value;
+    if (res.value.content.length > 1000000) {
+      sendNotification({
+        type: "error",
+        title: "File too large",
+        description:
+          "Please upload a file containing less than 1 million characters.",
+      });
+      return;
+    }
+
+    const uploadRes = await fetch(
+      `/api/w/${owner.sId}/data_sources/${dataSource.name}/databases/csv`,
+      {
+        method: "POST",
+        body: JSON.stringify({
+          databaseName,
+          tableName,
+          tableDescription,
+          csv: content,
+        }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+      }
+    );
+
+    if (!uploadRes.ok) {
+      sendNotification({
+        type: "error",
+        title: "Error uploading file",
+        description: `An error occured: ${await uploadRes.text()}.`,
+      });
+      return;
+    }
+
+    await mutate(
+      `/api/w/${owner.sId}/data_sources/${dataSource.name}/databases?offset=0&limit=100`
+    );
+    redirectToDataSourcePage();
+  };
+
+  return (
+    <AppLayout
+      subscription={subscription}
+      user={user}
+      owner={owner}
+      gaTrackingId={gaTrackingId}
+      topNavigationCurrent="assistants"
+      subNavigation={subNavigationAssistants({
+        owner,
+        current: "data_sources_static",
+      })}
+      titleChildren={
+        <AppLayoutSimpleSaveCancelTitle
+          title={loadDatabaseId ? "Edit database" : "Add a new database"}
+          onCancel={redirectToDataSourcePage}
+          onSave={
+            !readOnly && !disabled
+              ? async () => {
+                  await handleUpsert();
+                }
+              : undefined
+          }
+          isSaving={loading}
+        />
+      }
+      hideSidebar={true}
+    >
+      <div className="pt-6">
+        <Page.Vertical align="stretch">
+          <div className="pt-4">
+            <Page.SectionHeader
+              title="Database name"
+              description="Enter the database name. This identifier will be used in the Assistant builder to choose the specific database for querying."
+            />
+            <div className="pt-4">
+              <Input
+                placeholder="name_of_database"
+                name="database-name"
+                disabled={readOnly || !!loadDatabaseId}
+                value={databaseName}
+                onChange={(v) => setDatabaseName(v)}
+                error={
+                  !databaseName || isNameValid(databaseName)
+                    ? null
+                    : "Invalid name: Must be alphanumeric, max 32 characters and no space."
+                }
+                showErrorLabel={true}
+              />
+            </div>
+          </div>
+
+          <div className="pt-4">
+            <Page.SectionHeader
+              title="Table Name"
+              description="We will generate a table by extracting data from your CSV file and name it accordingly."
+            />
+            <div className="pt-4">
+              <Input
+                placeholder="name_of_table"
+                name="table-name"
+                disabled={readOnly || !!loadDatabaseId}
+                value={tableName}
+                onChange={(v) => setTableName(v)}
+                error={
+                  !tableName || isNameValid(tableName)
+                    ? null
+                    : "Invalid name: Must be alphanumeric, max 32 characters and no space."
+                }
+                showErrorLabel={true}
+              />
+            </div>
+          </div>
+
+          <div className="pt-4">
+            <Page.SectionHeader
+              title="Table Description"
+              description="Describe the content of your CSV file. It will be used by the LLM model to generate relevant queries."
+            />
+            <div className="pt-4">
+              <textarea
+                name="table-description"
+                placeholder="This table contains..."
+                rows={10}
+                disabled={readOnly || !!loadDatabaseId}
+                value={tableDescription}
+                onChange={(e) => setTableDescription(e.target.value)}
+                className={classNames(
+                  "font-mono text-normal block w-full min-w-0 flex-1 rounded-md",
+                  "border-structure-200 bg-structure-50",
+                  readOnly
+                    ? "focus:border-gray-300 focus:ring-0"
+                    : "focus:border-action-300 focus:ring-action-300"
+                )}
+              />
+            </div>
+          </div>
+
+          <div className="pt-4">
+            {!readOnly && !loadDatabaseId && (
+              <>
+                <Page.SectionHeader
+                  title="CSV File"
+                  description="Select the CSV file for data extraction. The maximum file size allowed is 5MB."
+                  action={{
+                    label: uploading
+                      ? "Uploading..."
+                      : file
+                      ? file.name
+                      : "Upload file",
+                    variant: "primary",
+                    icon: DocumentPlusIcon,
+                    onClick: () => {
+                      if (fileInputRef.current) {
+                        fileInputRef.current.click();
+                      }
+                    },
+                  }}
+                />
+                <input
+                  type="file"
+                  ref={fileInputRef}
+                  style={{ display: "none" }}
+                  accept=".csv, .tsv"
+                  onChange={async (e) => {
+                    setUploading(true);
+                    const csvFile = e?.target?.files?.[0];
+                    if (!csvFile) return;
+                    if (csvFile.size > 5000000) {
+                      // TODO handle ?
+                      sendNotification({
+                        type: "error",
+                        title: "File too large",
+                        description: "Please upload a file smaller than 5MB.",
+                      });
+                      setUploading(false);
+                      return;
+                    }
+
+                    if (
+                      ![
+                        "text/csv",
+                        "text/tsv",
+                        "text/comma-separated-values",
+                        "text/tab-separated-values",
+                      ].includes(csvFile.type)
+                    ) {
+                      sendNotification({
+                        type: "error",
+                        title: "Invalid file type",
+                        description: "Please upload a CSV or TSV file.",
+                      });
+                      setUploading(false);
+                      return;
+                    }
+
+                    setFile(csvFile);
+                    setUploading(false);
+                  }}
+                />
+              </>
+            )}
+          </div>
+
+          {!readOnly && loadDatabaseId && (
+            <div className="flex py-16">
+              <div className="flex">
+                <DropdownMenu>
+                  <DropdownMenu.Button>
+                    <Button
+                      variant="primaryWarning"
+                      icon={TrashIcon}
+                      label="Remove database"
+                    />
+                  </DropdownMenu.Button>
+                  <DropdownMenu.Items width={280}>
+                    <div className="flex flex-col gap-y-4 px-4 py-4">
+                      <div className="flex flex-col gap-y-2">
+                        <div className="grow text-sm font-medium text-element-800">
+                          Are you sure you want to delete?
+                        </div>
+
+                        <div className="text-sm font-normal text-element-700">
+                          This will delete the Database with all tables for
+                          everyone.
+                        </div>
+                      </div>
+                      <div className="flex justify-center">
+                        <Button
+                          variant="primaryWarning"
+                          size="sm"
+                          label={"Delete for Everyone"}
+                          disabled={loading}
+                          icon={TrashIcon}
+                          onClick={async () => {
+                            setLoading(true);
+                            await handleDelete();
+                            setLoading(false);
+                          }}
+                        />
+                      </div>
+                    </div>
+                  </DropdownMenu.Items>
+                </DropdownMenu>
+              </div>
+            </div>
+          )}
+        </Page.Vertical>
+      </div>
+    </AppLayout>
+  );
+}
diff --git a/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx b/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx
index 760b132fce19..36dfc66fe8bd 100644
--- a/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx
@@ -10,8 +10,10 @@ import {
   PencilSquareIcon,
   PlusIcon,
   Popup,
+  ServerIcon,
   SlackLogo,
   SliderToggle,
+  Tab,
 } from "@dust-tt/sparkle";
 import {
   ConnectorProvider,
@@ -42,8 +44,13 @@ import { Authenticator, getSession, getUserFromSession } from "@app/lib/auth";
 import { buildConnectionId } from "@app/lib/connector_connection_id";
 import { CONNECTOR_CONFIGURATIONS } from "@app/lib/connector_providers";
 import { getDisplayNameForDocument } from "@app/lib/data_sources";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import { githubAuth } from "@app/lib/github_auth";
-import { useConnectorBotEnabled, useDocuments } from "@app/lib/swr";
+import {
+  useConnectorBotEnabled,
+  useDatabases,
+  useDocuments,
+} from "@app/lib/swr";
 import { timeAgoFrom } from "@app/lib/utils";
 import logger from "@app/logger/logger";
 
@@ -152,6 +159,112 @@ function StandardDataSourceView({
   plan: PlanType;
   readOnly: boolean;
   dataSource: DataSourceType;
+}) {
+  const router = useRouter();
+  const [currentTab, setCurrentTab] = useState("Documents");
+
+  useEffect(() => {
+    if (router.query.tab === "databases") {
+      setCurrentTab("Databases");
+      const newQuery = { ...router.query };
+      delete newQuery.tab;
+      void router.replace(
+        {
+          pathname: router.pathname,
+          query: newQuery,
+        },
+        undefined,
+        { shallow: true } // no reload
+      );
+    }
+  }, [router]);
+
+  const isActivatedSDB = isActivatedStructuredDB(owner);
+
+  return (
+    <div className="pt-6">
+      <Page.Vertical gap="xl" align="stretch">
+        <Page.SectionHeader
+          title={`Folder ${dataSource.name}`}
+          description={
+            isActivatedSDB
+              ? "Use this page to view and upload documents and databases to your Folder."
+              : "Use this page to view and upload documents to your Folder."
+          }
+          action={
+            readOnly
+              ? undefined
+              : {
+                  label: "Settings",
+                  variant: "tertiary",
+                  icon: Cog6ToothIcon,
+                  onClick: () => {
+                    void router.push(
+                      `/w/${owner.sId}/builder/data-sources/${dataSource.name}/settings`
+                    );
+                  },
+                }
+          }
+        />
+
+        {isActivatedSDB && (
+          <Tab
+            tabs={[
+              {
+                label: "Documents",
+                current: currentTab === "Documents",
+              },
+              {
+                label: "Databases",
+                current: currentTab === "Databases",
+              },
+            ]}
+            onTabClick={(tab) => {
+              if (tab === currentTab) return;
+              if (tab === "Documents") {
+                setCurrentTab("Documents");
+              } else if (tab === "Databases") {
+                setCurrentTab("Databases");
+              }
+            }}
+          />
+        )}
+
+        {currentTab === "Documents" && (
+          <DatasourceDocumentsTabView
+            owner={owner}
+            plan={plan}
+            readOnly={readOnly}
+            dataSource={dataSource}
+            router={router}
+          />
+        )}
+
+        {currentTab === "Databases" && (
+          <DatasourceDatabasesTabView
+            owner={owner}
+            readOnly={readOnly}
+            dataSource={dataSource}
+            router={router}
+          />
+        )}
+      </Page.Vertical>
+    </div>
+  );
+}
+
+function DatasourceDocumentsTabView({
+  owner,
+  plan,
+  readOnly,
+  dataSource,
+  router,
+}: {
+  owner: WorkspaceType;
+  plan: PlanType;
+  readOnly: boolean;
+  dataSource: DataSourceType;
+  router: ReturnType<typeof useRouter>;
 }) {
   const [limit] = useState(10);
   const [offset, setOffset] = useState(0);
@@ -164,8 +277,6 @@ function StandardDataSourceView({
     Record<string, string>
   >({});
 
-  const router = useRouter();
-
   useEffect(() => {
     if (!isDocumentsLoading && !isDocumentsError) {
       setDisplayNameByDocId(
@@ -189,27 +300,171 @@ function StandardDataSourceView({
   }
 
   return (
-    <div className="pt-6">
-      <Page.Vertical align="stretch">
-        <Page.SectionHeader
-          title={`Folder ${dataSource.name}`}
-          description="Use this page to view and upload documents to your Folder."
-          action={
-            readOnly
-              ? undefined
-              : {
-                  label: "Settings",
-                  variant: "tertiary",
-                  icon: Cog6ToothIcon,
-                  onClick: () => {
+    <Page.Vertical align="stretch">
+      <div className="mt-16 flex flex-row">
+        <div className="flex flex-1">
+          <div className="flex flex-col">
+            <div className="flex flex-row">
+              <div className="flex flex-initial gap-x-2">
+                <Button
+                  variant="tertiary"
+                  disabled={offset < limit}
+                  onClick={() => {
+                    if (offset >= limit) {
+                      setOffset(offset - limit);
+                    } else {
+                      setOffset(0);
+                    }
+                  }}
+                  label="Previous"
+                />
+                <Button
+                  variant="tertiary"
+                  label="Next"
+                  disabled={offset + limit >= total}
+                  onClick={() => {
+                    if (offset + limit < total) {
+                      setOffset(offset + limit);
+                    }
+                  }}
+                />
+              </div>
+            </div>
+
+            <div className="mt-3 flex flex-auto pl-2 text-sm text-gray-700">
+              {total > 0 && (
+                <span>
+                  Showing documents {offset + 1} - {last} of {total} documents
+                </span>
+              )}
+            </div>
+          </div>
+        </div>
+
+        {readOnly ? null : (
+          <div className="">
+            <div className="relative mt-0 flex-none">
+              <Popup
+                show={showDocumentsLimitPopup}
+                chipLabel={`${plan.name} plan`}
+                description={`You have reached the limit of documents per data source (${plan.limits.dataSources.documents.count} documents). Upgrade your plan for unlimited documents and data sources.`}
+                buttonLabel="Check Dust plans"
+                buttonClick={() => {
+                  void router.push(`/w/${owner.sId}/subscription`);
+                }}
+                onClose={() => {
+                  setShowDocumentsLimitPopup(false);
+                }}
+                className="absolute bottom-8 right-0"
+              />
+
+              <Button
+                variant="primary"
+                icon={PlusIcon}
+                label="Add document"
+                onClick={() => {
+                  // Enforce plan limits: DataSource documents count.
+                  if (
+                    plan.limits.dataSources.documents.count != -1 &&
+                    total >= plan.limits.dataSources.documents.count
+                  ) {
+                    setShowDocumentsLimitPopup(true);
+                  } else {
                     void router.push(
-                      `/w/${owner.sId}/builder/data-sources/${dataSource.name}/settings`
+                      `/w/${owner.sId}/builder/data-sources/${dataSource.name}/upsert`
                     );
-                  },
-                }
-          }
-        />
+                  }
+                }}
+              />
+            </div>
+          </div>
+        )}
+      </div>
+
+      <div className="py-8">
+        <ContextItem.List>
+          {documents.map((d) => (
+            <ContextItem
+              key={d.document_id}
+              title={displayNameByDocId[d.document_id]}
+              visual={
+                <ContextItem.Visual
+                  visual={({ className }) =>
+                    DocumentTextIcon({
+                      className: className + " text-element-600",
+                    })
+                  }
+                />
+              }
+              action={
+                <Button.List>
+                  <Button
+                    variant="secondary"
+                    icon={PencilSquareIcon}
+                    onClick={() => {
+                      void router.push(
+                        `/w/${owner.sId}/builder/data-sources/${
+                          dataSource.name
+                        }/upsert?documentId=${encodeURIComponent(
+                          d.document_id
+                        )}`
+                      );
+                    }}
+                    label="Edit"
+                    labelVisible={false}
+                  />
+                </Button.List>
+              }
+            >
+              <ContextItem.Description>
+                <div className="pt-2 text-sm text-element-700">
+                  {Math.floor(d.text_size / 1024)} kb,{" "}
+                  {timeAgoFrom(d.timestamp)} ago
+                </div>
+              </ContextItem.Description>
+            </ContextItem>
+          ))}
+        </ContextItem.List>
+        {documents.length == 0 ? (
+          <div className="mt-10 flex flex-col items-center justify-center text-sm text-gray-500">
+            <p>No documents found for this Folder.</p>
+            <p className="mt-2">You can add documents manually or by API.</p>
+          </div>
+        ) : null}
+      </div>
+    </Page.Vertical>
+  );
+}
+
+function DatasourceDatabasesTabView({
+  owner,
+  readOnly,
+  dataSource,
+  router,
+}: {
+  owner: WorkspaceType;
+  readOnly: boolean;
+  dataSource: DataSourceType;
+  router: ReturnType<typeof useRouter>;
+}) {
+  const [limit] = useState(10);
+  const [offset, setOffset] = useState(0);
 
+  const { databases, total } = useDatabases({
+    workspaceId: owner.sId,
+    dataSourceName: dataSource.name,
+    offset,
+    limit,
+  });
+
+  let last = offset + limit;
+  if (total !== null && offset + limit > total) {
+    last = total;
+  }
+
+  return (
+    <>
+      <Page.Vertical align="stretch">
         <div className="mt-16 flex flex-row">
           <div className="flex flex-1">
             <div className="flex flex-col">
@@ -230,9 +485,9 @@ function StandardDataSourceView({
                   <Button
                     variant="tertiary"
                     label="Next"
-                    disabled={offset + limit >= total}
+                    disabled={total !== null && offset + limit >= total}
                     onClick={() => {
-                      if (offset + limit < total) {
+                      if (total !== null && offset + limit < total) {
                         setOffset(offset + limit);
                       }
                     }}
@@ -241,9 +496,9 @@ function StandardDataSourceView({
               </div>
 
               <div className="mt-3 flex flex-auto pl-2 text-sm text-gray-700">
-                {total > 0 && (
+                {total !== null && total > 0 && (
                   <span>
-                    Showing documents {offset + 1} - {last} of {total} documents
+                    Showing databases {offset + 1} - {last} of {total} databases
                   </span>
                 )}
               </div>
@@ -253,36 +508,14 @@ function StandardDataSourceView({
           {readOnly ? null : (
             <div className="">
               <div className="relative mt-0 flex-none">
-                <Popup
-                  show={showDocumentsLimitPopup}
-                  chipLabel={`${plan.name} plan`}
-                  description={`You have reached the limit of documents per data source (${plan.limits.dataSources.documents.count} documents). Upgrade your plan for unlimited documents and data sources.`}
-                  buttonLabel="Check Dust plans"
-                  buttonClick={() => {
-                    void router.push(`/w/${owner.sId}/subscription`);
-                  }}
-                  onClose={() => {
-                    setShowDocumentsLimitPopup(false);
-                  }}
-                  className="absolute bottom-8 right-0"
-                />
-
                 <Button
                   variant="primary"
                   icon={PlusIcon}
-                  label="Add document"
+                  label="Add database"
                   onClick={() => {
-                    // Enforce plan limits: DataSource documents count.
-                    if (
-                      plan.limits.dataSources.documents.count != -1 &&
-                      total >= plan.limits.dataSources.documents.count
-                    ) {
-                      setShowDocumentsLimitPopup(true);
-                    } else {
-                      void router.push(
-                        `/w/${owner.sId}/builder/data-sources/${dataSource.name}/upsert`
-                      );
-                    }
+                    void router.push(
+                      `/w/${owner.sId}/builder/data-sources/${dataSource.name}/databases/upsert`
+                    );
                   }}
                 />
               </div>
@@ -292,14 +525,14 @@ function StandardDataSourceView({
 
         <div className="py-8">
           <ContextItem.List>
-            {documents.map((d) => (
+            {databases.map((db) => (
               <ContextItem
-                key={d.document_id}
-                title={displayNameByDocId[d.document_id]}
+                key={db.database_id}
+                title={db.name}
                 visual={
                   <ContextItem.Visual
                     visual={({ className }) =>
-                      DocumentTextIcon({
+                      ServerIcon({
                         className: className + " text-element-600",
                       })
                     }
@@ -314,8 +547,8 @@ function StandardDataSourceView({
                         void router.push(
                           `/w/${owner.sId}/builder/data-sources/${
                             dataSource.name
-                          }/upsert?documentId=${encodeURIComponent(
-                            d.document_id
+                          }/databases/upsert?databaseId=${encodeURIComponent(
+                            db.database_id
                           )}`
                         );
                       }}
@@ -324,25 +557,22 @@ function StandardDataSourceView({
                     />
                   </Button.List>
                 }
-              >
-                <ContextItem.Description>
-                  <div className="pt-2 text-sm text-element-700">
-                    {Math.floor(d.text_size / 1024)} kb,{" "}
-                    {timeAgoFrom(d.timestamp)} ago
-                  </div>
-                </ContextItem.Description>
-              </ContextItem>
+              ></ContextItem>
             ))}
           </ContextItem.List>
-          {documents.length == 0 ? (
+          {databases.length == 0 ? (
             <div className="mt-10 flex flex-col items-center justify-center text-sm text-gray-500">
-              <p>No documents found for this Folder.</p>
-              <p className="mt-2">You can add documents manually or by API.</p>
+              <p>No databases found for this Folder.</p>
+              <p className="mt-2">
+                Databases let you create assistants that can query structured
+                data from an uploaded CSV file. You can add databases manually
+                by clicking on the &quot;Add&nbsp;database&quot; button.
+              </p>
             </div>
           ) : null}
         </div>
       </Page.Vertical>
-    </div>
+    </>
   );
 }
 
diff --git a/front/pages/w/[wId]/builder/data-sources/[name]/upsert.tsx b/front/pages/w/[wId]/builder/data-sources/[name]/upsert.tsx
index 1896eb6e8403..d66a8ae516e2 100644
--- a/front/pages/w/[wId]/builder/data-sources/[name]/upsert.tsx
+++ b/front/pages/w/[wId]/builder/data-sources/[name]/upsert.tsx
@@ -84,7 +84,7 @@ export const getServerSideProps: GetServerSideProps<{
   };
 };
 
-export default function DataSourceUpsert({
+export default function DatasourceUpsert({
   user,
   owner,
   subscription,
diff --git a/types/src/front/lib/actions/registry.ts b/types/src/front/lib/actions/registry.ts
index 5b852f42d7e0..32a8f8ef99b6 100644
--- a/types/src/front/lib/actions/registry.ts
+++ b/types/src/front/lib/actions/registry.ts
@@ -138,14 +138,14 @@ export const DustProdActionRegistry = createActionRegistry({
       workspaceId: PRODUCTION_DUST_APPS_WORKSPACE_ID,
       appId: "e0c5993d65",
       appHash:
-        "f4895d867ca82023fb5933e6279e2e315164a386145fd971dc9e7293c9fc4cce",
+        "80aa115754ae0d4e968609d4fea47ed4de7dbbc013bfacc0a48eb93129583388",
     },
     config: {
       MODEL: {
         provider_id: "openai",
         model_id: "gpt-4",
         use_cache: false,
-        function_call: "return_sql_query",
+        function_call: "execute_sql_query",
       },
     },
   },
diff --git a/types/src/front/lib/core_api.ts b/types/src/front/lib/core_api.ts
index a4f8c7df35b5..44068ef5c400 100644
--- a/types/src/front/lib/core_api.ts
+++ b/types/src/front/lib/core_api.ts
@@ -889,7 +889,14 @@ export class CoreAPI {
     dataSourceName: string;
     offset: number;
     limit: number;
-  }): Promise<CoreAPIResponse<{ databases: CoreAPIDatabase[] }>> {
+  }): Promise<
+    CoreAPIResponse<{
+      databases: CoreAPIDatabase[];
+      offset: number;
+      limit: number;
+      total: number;
+    }>
+  > {
     const response = await fetch(
       `${CORE_API}/projects/${projectId}/data_sources/${dataSourceName}/databases?offset=${offset}&limit=${limit}`,
       { method: "GET" }
@@ -979,7 +986,12 @@ export class CoreAPI {
     projectId: string;
     dataSourceName: string;
     databaseId: string;
-  }): Promise<CoreAPIResponse<{ tables: CoreAPIDatabaseTable[] }>> {
+  }): Promise<
+    CoreAPIResponse<{
+      database: CoreAPIDatabase;
+      tables: CoreAPIDatabaseTable[];
+    }>
+  > {
     const response = await fetch(
       `${CORE_API}/projects/${projectId}/data_sources/${dataSourceName}/databases/${databaseId}/tables`,
       {

From 694ca6b2cbdb28e971bb34e0669787d4f6ffba1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daphn=C3=A9=20Popin?= <PopDaph@users.noreply.github.com>
Date: Wed, 20 Dec 2023 19:05:21 +0100
Subject: [PATCH 11/23] Prepare for easy rollout of Agents with Database Query
 action (#2979)

---
 front/components/assistant_builder/AssistantBuilder.tsx       | 4 ++--
 front/lib/development.ts                                      | 2 +-
 .../v1/w/[wId]/data_sources/[name]/databases/[dId]/index.ts   | 4 ++--
 .../v1/w/[wId]/data_sources/[name]/databases/[dId]/query.ts   | 4 ++--
 .../data_sources/[name]/databases/[dId]/tables/[tId]/index.ts | 4 ++--
 .../[name]/databases/[dId]/tables/[tId]/rows/[rId].ts         | 4 ++--
 .../[name]/databases/[dId]/tables/[tId]/rows/index.ts         | 4 ++--
 .../[wId]/data_sources/[name]/databases/[dId]/tables/index.ts | 4 ++--
 .../api/v1/w/[wId]/data_sources/[name]/databases/index.ts     | 4 ++--
 .../api/w/[wId]/data_sources/[name]/databases/[dId]/index.ts  | 4 ++--
 .../[wId]/data_sources/[name]/databases/[dId]/tables/index.ts | 4 ++--
 front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts  | 4 ++--
 .../pages/api/w/[wId]/data_sources/[name]/databases/index.ts  | 4 ++--
 front/pages/w/[wId]/databases/index.tsx                       | 4 ++--
 14 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/front/components/assistant_builder/AssistantBuilder.tsx b/front/components/assistant_builder/AssistantBuilder.tsx
index d53879d86aaa..c90c82ef6d8c 100644
--- a/front/components/assistant_builder/AssistantBuilder.tsx
+++ b/front/components/assistant_builder/AssistantBuilder.tsx
@@ -67,7 +67,7 @@ import { subNavigationAssistants } from "@app/components/sparkle/navigation";
 import { SendNotificationsContext } from "@app/components/sparkle/Notification";
 import { getSupportedModelConfig } from "@app/lib/assistant";
 import { CONNECTOR_CONFIGURATIONS } from "@app/lib/connector_providers";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import { FREE_TEST_PLAN_CODE } from "@app/lib/plans/plan_codes";
 import {
   useAgentConfigurations,
@@ -705,7 +705,7 @@ export default function AssistantBuilder({
   };
 
   // Hack to keep DATABASE_QUERY disabled if not Dust workspace
-  const actions = isDevelopmentOrDustWorkspace(owner)
+  const actions = isActivatedStructuredDB(owner)
     ? ACTION_MODE_TO_LABEL
     : Object.fromEntries(
         Object.entries(ACTION_MODE_TO_LABEL).filter(
diff --git a/front/lib/development.ts b/front/lib/development.ts
index 351c2b04b227..6de186e8e192 100644
--- a/front/lib/development.ts
+++ b/front/lib/development.ts
@@ -17,5 +17,5 @@ export function isDevelopmentOrDustWorkspace(owner: WorkspaceType) {
 
 export function isActivatedStructuredDB(owner: WorkspaceType) {
   // We will manually add workspace ids here.
-  return isDevelopmentOrDustWorkspace(owner);
+  return isDevelopmentOrDustWorkspace(owner) || owner.sId === "bd133dacaa"; // Daph's workspace;
 }
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/index.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/index.ts
index 3c56e341c7c5..cd0891bdaddb 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/index.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/index.ts
@@ -3,7 +3,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
@@ -37,7 +37,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/query.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/query.ts
index ec5b8bf38426..d2bf7a637c10 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/query.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/query.ts
@@ -10,7 +10,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
@@ -49,7 +49,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/index.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/index.ts
index 1342d793168a..466c0f7a611c 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/index.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/index.ts
@@ -3,7 +3,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
@@ -37,7 +37,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/[rId].ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/[rId].ts
index 5f7c8dbc0602..8cd898a54835 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/[rId].ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/[rId].ts
@@ -3,7 +3,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
@@ -37,7 +37,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/index.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/index.ts
index 01e943b275f5..e6242284191a 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/index.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/[tId]/rows/index.ts
@@ -6,7 +6,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
@@ -67,7 +67,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
index 2fc0cb324ebb..39e9e40ab0e2 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
@@ -6,7 +6,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import { generateModelSId } from "@app/lib/utils";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
@@ -54,7 +54,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts
index d4fe4bbce1ff..94dfaaed84a9 100644
--- a/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts
+++ b/front/pages/api/v1/w/[wId]/data_sources/[name]/databases/index.ts
@@ -7,7 +7,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getAPIKey } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import { generateModelSId } from "@app/lib/utils";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
@@ -56,7 +56,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/index.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/index.ts
index 1580760eff80..bd840766e84a 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/index.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/index.ts
@@ -3,7 +3,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getSession } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 
@@ -33,7 +33,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
index 84f950f343bb..959b4c6546e0 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/[dId]/tables/index.ts
@@ -3,7 +3,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getSession } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 import { ListDatabaseTablesResponseBody } from "@app/pages/api/v1/w/[wId]/data_sources/[name]/databases/[dId]/tables";
@@ -40,7 +40,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
index 55e3f438fe17..b2551e081402 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
@@ -9,7 +9,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getSession } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import { generateModelSId } from "@app/lib/utils";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
@@ -50,7 +50,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts
index da786ce08f48..458fe4a73be1 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/index.ts
@@ -5,7 +5,7 @@ import { NextApiRequest, NextApiResponse } from "next";
 
 import { getDataSource } from "@app/lib/api/data_sources";
 import { Authenticator, getSession } from "@app/lib/auth";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import logger from "@app/logger/logger";
 import { apiError, withLogging } from "@app/logger/withlogging";
 import {
@@ -45,7 +45,7 @@ async function handler(
     });
   }
 
-  if (!isDevelopmentOrDustWorkspace(owner)) {
+  if (!isActivatedStructuredDB(owner)) {
     res.status(404).end();
     return;
   }
diff --git a/front/pages/w/[wId]/databases/index.tsx b/front/pages/w/[wId]/databases/index.tsx
index 067855cdb597..a1048a8e3984 100644
--- a/front/pages/w/[wId]/databases/index.tsx
+++ b/front/pages/w/[wId]/databases/index.tsx
@@ -23,7 +23,7 @@ import { SendNotificationsContext } from "@app/components/sparkle/Notification";
 import { getDataSources } from "@app/lib/api/data_sources";
 import { Authenticator, getSession, getUserFromSession } from "@app/lib/auth";
 import { handleFileUploadToText } from "@app/lib/client/handle_file_upload";
-import { isDevelopmentOrDustWorkspace } from "@app/lib/development";
+import { isActivatedStructuredDB } from "@app/lib/development";
 import { useDatabases, useDatabaseTables } from "@app/lib/swr";
 
 const { GA_TRACKING_ID = "" } = process.env;
@@ -47,7 +47,7 @@ export const getServerSideProps: GetServerSideProps<{
   if (
     !owner ||
     !auth.isBuilder() ||
-    !isDevelopmentOrDustWorkspace(owner) ||
+    !isActivatedStructuredDB(owner) ||
     !subscription ||
     !user
   ) {

From 5175996d81e82a5f081d2f7698e7c870f66c82d0 Mon Sep 17 00:00:00 2001
From: Stanislas Polu <spolu@dust.tt>
Date: Wed, 20 Dec 2023 21:53:26 +0100
Subject: [PATCH 12/23] x/evals: ToT (#2981)

* WIP ToT

* Anthropic support

* non-working but implemented ToT
---
 x/spolu/research/evals/RESULTS.log            |  95 +++---
 x/spolu/research/evals/lib/algorithms.ts      |  30 +-
 x/spolu/research/evals/lib/algorithms/CoT.ts  |   7 +-
 x/spolu/research/evals/lib/algorithms/ToT.ts  | 320 ++++++++++++++++++
 x/spolu/research/evals/lib/datasets.ts        |   1 +
 x/spolu/research/evals/lib/datasets/MATH.ts   |  12 +-
 x/spolu/research/evals/lib/datasets/game24.ts |  10 +-
 x/spolu/research/evals/lib/models.ts          |   2 +-
 .../research/evals/lib/models/anthropic.ts    |  69 ++++
 x/spolu/research/evals/main.ts                |  11 +-
 x/spolu/research/evals/package-lock.json      |  25 ++
 x/spolu/research/evals/package.json           |   1 +
 12 files changed, 498 insertions(+), 85 deletions(-)
 create mode 100644 x/spolu/research/evals/lib/algorithms/ToT.ts
 create mode 100644 x/spolu/research/evals/lib/models/anthropic.ts

diff --git a/x/spolu/research/evals/RESULTS.log b/x/spolu/research/evals/RESULTS.log
index 063abcfa48d6..44b9d9bd04ee 100644
--- a/x/spolu/research/evals/RESULTS.log
+++ b/x/spolu/research/evals/RESULTS.log
@@ -21,77 +21,58 @@ Finished run: algorithm=CoT dataset=MATH provider=mistral model=mistral-medium c
 ## Game24
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=openai model=gpt-3.5-turbo-1106
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=4.19 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=4.69 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=5.75 total=128.00
-Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=7.00 total=128.00
-Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=7.00 total=128.00
-Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=10.00 total=128.00
-Final stats: rate=24.16/s promptTokensTotal=2988275 completionTokensTotal=211267
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=3.25 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=2.75 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=3.25 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=3.75 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=6.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-3.5-turbo-1106 check=3.00 total=128.00
+Final stats: rate=7.33/s promptTokensTotal=3001224 completionTokensTotal=263462
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=openai model=gpt-4-1106-preview
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-4-1106-preview check=6.06 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5.38 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-4-1106-preview check=4.88 total=128.00
-Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-4-1106-preview check=4.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-4-1106-preview check=4.00 total=128.00
-Final stats: rate=24.38/s promptTokensTotal=2988275 completionTokensTotal=337743
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5.75 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5.88 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=openai model=gpt-4-1106-preview check=5.63 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=openai model=gpt-4-1106-preview check=7.75 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=openai model=gpt-4-1106-preview check=8.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=openai model=gpt-4-1106-preview check=9.00 total=128.00
+Final stats: rate=1.42/s promptTokensTotal=3001224 completionTokensTotal=255878
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=mistral model=mistral-small
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-small check=1.56 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-small check=1.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-small check=1.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-small check=1.59 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-small check=1.75 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-small check=1.88 total=128.00
 Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=mistral model=mistral-small check=1.00 total=128.00
 Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=mistral model=mistral-small check=0.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=mistral model=mistral-small check=0.00 total=128.00
-Final stats: rate=24.62/s promptTokensTotal=3551411 completionTokensTotal=353772
+Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=mistral model=mistral-small check=1.00 total=128.00
+Final stats: rate=4.73/s promptTokensTotal=3618468 completionTokensTotal=300089
 
 Finished run: algorithm=CoT-consensus dataset=Game24 provider=mistral model=mistral-medium
-Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-medium check=0.03 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
+Result: algorithm=CoT-consensus poolSize=1 dataset=Game24 provider=mistral model=mistral-medium check=0.72 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=Game24 provider=mistral model=mistral-medium check=0.81 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=Game24 provider=mistral model=mistral-medium check=0.25 total=128.00
 Result: algorithm=CoT-consensus poolSize=8 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
 Result: algorithm=CoT-consensus poolSize=16 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
 Result: algorithm=CoT-consensus poolSize=32 dataset=Game24 provider=mistral model=mistral-medium check=0.00 total=128.00
-Final stats: rate=24.27/s promptTokensTotal=3555507 completionTokensTotal=398154
+Final stats: rate=2.00/s promptTokensTotal=3597988 completionTokensTotal=362230
 
 ## MATH
 
 Finished run: algorithm=CoT-consensus dataset=MATH provider=openai model=gpt-3.5-turbo-1106
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=52.69 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=52.38 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=61.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=66.00 total=128.00
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=68.00 total=128.00
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=68.00 total=128.00
-Final stats: promptTokensTotal=9267718 completionTokensTotal=802822
-
-Finished run: algorithm=CoT-consensus dataset=MATH provider=openai model=gpt-4-1106-preview
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=openai model=gpt-4-1106-preview check=80.78 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=openai model=gpt-4-1106-preview check=81.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=openai model=gpt-4-1106-preview check=85.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=openai model=gpt-4-1106-preview check=90.00 total=128.00
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=openai model=gpt-4-1106-preview check=92.00 total=128.00
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=openai model=gpt-4-1106-preview check=91.00 total=128.00
-Final stats: promptTokensTotal=9267718 completionTokensTotal=1118264
+Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=49.16 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=48.25 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=55.38 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=59.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=62.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=openai model=gpt-3.5-turbo-1106 check=64.00 total=128.00
+Final stats: rate=3.28/s promptTokensTotal=9044122 completionTokensTotal=734977
 
 Finished run: algorithm=CoT-consensus dataset=MATH provider=mistral model=mistral-small
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=mistral model=mistral-small check=37.59 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=mistral model=mistral-small check=38.69 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=mistral model=mistral-small check=46.38 total=128.00
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=mistral model=mistral-small check=53.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=mistral model=mistral-small check=58.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=mistral model=mistral-small check=60.00 total=128.00
-Final stats: promptTokensTotal=10387169 completionTokensTotal=975095
-
-Finished run: algorithm=CoT-consensus dataset=MATH provider=mistral model=mistral-medium
-Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=mistral model=mistral-medium check=42.72 total=128.00
-Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=mistral model=mistral-medium check=41.69 total=128.00
-Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=mistral model=mistral-medium check=52.13 total=128.00
-Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=mistral model=mistral-medium check=59.75 total=128.00
-Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=mistral model=mistral-medium check=62.50 total=128.00
-Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=mistral model=mistral-medium check=68.00 total=128.00
-Final stats: promptTokensTotal=10323371 completionTokensTotal=1097376
-
-
+Result: algorithm=CoT-consensus poolSize=1 dataset=MATH provider=mistral model=mistral-small check=29.13 total=128.00
+Result: algorithm=CoT-consensus poolSize=2 dataset=MATH provider=mistral model=mistral-small check=30.31 total=128.00
+Result: algorithm=CoT-consensus poolSize=4 dataset=MATH provider=mistral model=mistral-small check=37.63 total=128.00
+Result: algorithm=CoT-consensus poolSize=8 dataset=MATH provider=mistral model=mistral-small check=45.25 total=128.00
+Result: algorithm=CoT-consensus poolSize=16 dataset=MATH provider=mistral model=mistral-small check=47.50 total=128.00
+Result: algorithm=CoT-consensus poolSize=32 dataset=MATH provider=mistral model=mistral-small check=46.00 total=128.00
+Final stats: rate=1.35/s promptTokensTotal=10099264 completionTokensTotal=1030224
+Done
diff --git a/x/spolu/research/evals/lib/algorithms.ts b/x/spolu/research/evals/lib/algorithms.ts
index 62fd90db36ee..6bc7364f2410 100644
--- a/x/spolu/research/evals/lib/algorithms.ts
+++ b/x/spolu/research/evals/lib/algorithms.ts
@@ -5,7 +5,7 @@ import sqlite3 from "sqlite3";
 import { Dataset, ProblemId, Test } from "@app/lib/datasets";
 import { ChatCompletion, ChatQuery, hashQuery, Model } from "@app/lib/models";
 
-export const ValidAlgorithmTypes = ["CoT", "CoT-consensus"] as const;
+export const ValidAlgorithmTypes = ["CoT", "CoT-consensus", "ToT"] as const;
 export type AlgorithmType = (typeof ValidAlgorithmTypes)[number];
 
 export type TestResult = {
@@ -46,13 +46,12 @@ export abstract class Algorithm {
       // this._sqlite = new Database(`stores/${this.runId()}.sqlite`);
       const query =
         "CREATE TABLE IF NOT EXISTS store (" +
-        "id BIGSERIAL PRIMARY KEY, " +
-        "created_at INTEGER NOT NULL, " +
-        "run_id TEXT NOT NULL, " +
-        "test TEXT NOT NULL, " +
-        "query_hash TEXT NOT NULL, " +
-        "completion TEXT NOT NULL, " +
-        "is_check INTEGER NOT NULL" +
+        "  id         BIGSERIAL PRIMARY KEY, " +
+        "  created_at INTEGER NOT NULL, " +
+        "  run_id     TEXT NOT NULL, " +
+        "  test       TEXT NOT NULL, " +
+        "  query_hash TEXT NOT NULL, " +
+        "  completion TEXT NOT NULL" +
         ")";
       await this._sqlite.exec(query);
     }
@@ -76,20 +75,16 @@ export abstract class Algorithm {
     completion: ChatCompletion;
     check: boolean;
   }) {
+    // console.log("STORE", hashQuery(query));
     const db = await this.sqlite();
 
     const now = Date.now();
 
     await db.run(
-      "INSERT INTO store (created_at, run_id, test, query_hash, completion, is_check) VALUES (?, ?, ?, ?, ?, ?)",
-      [
-        now,
-        this.runId(),
-        test.id,
-        hashQuery(query),
-        JSON.stringify(completion),
-        check ? 1 : 0,
-      ]
+      "INSERT INTO store " +
+        "(created_at, run_id, test, query_hash, completion) " +
+        "VALUES (?, ?, ?, ?, ?)",
+      [now, this.runId(), test.id, hashQuery(query), JSON.stringify(completion)]
     );
 
     this.history.push({
@@ -103,6 +98,7 @@ export abstract class Algorithm {
   }
 
   async runCompletion(query: ChatQuery): Promise<ChatCompletion> {
+    // console.log("RUN", hashQuery(query));
     const db = await this.sqlite();
 
     const result = await db.get(
diff --git a/x/spolu/research/evals/lib/algorithms/CoT.ts b/x/spolu/research/evals/lib/algorithms/CoT.ts
index 6568f11b4078..66f2f2a75ff7 100644
--- a/x/spolu/research/evals/lib/algorithms/CoT.ts
+++ b/x/spolu/research/evals/lib/algorithms/CoT.ts
@@ -41,13 +41,10 @@ export class CoT extends Algorithm {
     prompt += "\n\n";
     prompt += `Provide a reasoning consisting in multiple steps, using one line per step.`;
     prompt += ` ${this.dataset.reasoningStepInstructions()}`;
-    // prompt +=
-    //   ` Do not perform multiple reasoning attempts per question,` +
-    //   ` do not backtrack in your reasoning steps.`;
     prompt += "\n\n";
     prompt += `EXAMPLES:\n`;
 
-    for (const e of examples.slice(0, 4)) {
+    for (const e of examples.slice(0, this.N_SHOT / 2)) {
       prompt += `\nQUESTION: ${e.question}\n`;
       prompt += `REASONING:\n${e.reasoning.join("\n")}\n`;
     }
@@ -57,7 +54,7 @@ export class CoT extends Algorithm {
       content: prompt,
     });
 
-    for (const e of examples.slice(4)) {
+    for (const e of examples.slice(this.N_SHOT / 2)) {
       messages.push({
         role: "user",
         content: `QUESTION: ${e.question}`,
diff --git a/x/spolu/research/evals/lib/algorithms/ToT.ts b/x/spolu/research/evals/lib/algorithms/ToT.ts
new file mode 100644
index 000000000000..494ee72b9065
--- /dev/null
+++ b/x/spolu/research/evals/lib/algorithms/ToT.ts
@@ -0,0 +1,320 @@
+import seedrandom from "seedrandom";
+
+import { Algorithm, AlgorithmType, TestResult } from "@app/lib/algorithms";
+import { Dataset, Test } from "@app/lib/datasets";
+import { ChatMessage, ChatQuery, Model } from "@app/lib/models";
+
+type Reasoning = {
+  reasoning: string[];
+  answer: string | null;
+  score: number;
+};
+
+export class ToT extends Algorithm {
+  readonly N_SHOT = 8;
+  readonly EXPANSION_COUNT = 32;
+  readonly POOL_SIZE = 5;
+  readonly SAMPLE_COUNT_PER_EXPANSION = 5;
+  readonly VOTING_POOL_SIZE = 5;
+  readonly VOTING_ITERATIONS = 2;
+
+  private finals: TestResult[] = [];
+
+  constructor(dataset: Dataset, model: Model) {
+    super(dataset, model);
+  }
+
+  algorithm(): AlgorithmType {
+    return "ToT";
+  }
+
+  async expand(
+    test: Test,
+    iteration: number,
+    node: Reasoning
+  ): Promise<Reasoning> {
+    const examples = this.dataset.examples({
+      problem: test.id,
+      count: this.N_SHOT,
+      iteration,
+    });
+
+    const messages: ChatMessage[] = [];
+
+    let prompt = `INSTRUCTIONS:\n`;
+    prompt += `${this.dataset.instructions()}`;
+    prompt += "\n\n";
+    prompt += `${this.dataset.reasoningStepInstructions()}`;
+    prompt += "\n\n";
+    prompt += `Provide a single additional reasoning step.`;
+
+    messages.push({
+      role: "system",
+      content: prompt,
+    });
+
+    const rng = seedrandom(
+      `TOT-${test.id}-${iteration}-${node.reasoning.length}`
+    );
+
+    for (const e of examples.slice(0, this.N_SHOT)) {
+      let k = Math.floor(rng() * e.reasoning.length);
+      // Bias towards the last reasoning step
+      if (rng() < 0.5) {
+        k = e.reasoning.length - 1;
+      }
+
+      const content =
+        `QUESTION: ${e.question}\n` +
+        `PARTIAL_REASONING:\n${e.reasoning.slice(0, k).join("\n")}${
+          k > 0 ? "\n" : ""
+        }\n` +
+        `Generate one additional reasoning step.`;
+      messages.push({
+        role: "user",
+        content,
+      });
+      messages.push({
+        role: "assistant",
+        content: `${e.reasoning[k]}`,
+      });
+    }
+
+    const content =
+      `QUESTION: ${test.question}\n` +
+      `PARTIAL_REASONING:\n${node.reasoning.join("\n")}\n\n` +
+      `Generate one additional reasoning step (1-line).`;
+
+    messages.push({
+      role: "user",
+      content,
+    });
+
+    // console.log(prompt);
+    messages.forEach((m) =>
+      console.log(`-------------------------\n${m.role}: ${m.content}`)
+    );
+
+    const query: ChatQuery = {
+      provider: this.model.provider,
+      model: this.model.model(),
+      messages,
+      temperature: 1.0,
+      maxTokens: this.dataset.maxTokens().reasoningStep,
+    };
+
+    const c = await this.runCompletion(query);
+
+    await this.storeCompletion({
+      test,
+      completion: c,
+      query,
+      check: false,
+    });
+
+    this.stats();
+    console.log(">>>> ", c.content);
+
+    const answer = this.dataset.parseAnswer(c.content);
+
+    return {
+      reasoning: [...node.reasoning, c.content],
+      answer: answer.length > 0 ? answer : null,
+      score: 0.0,
+    };
+  }
+
+  async value(test: Test, iteration: number, pool: Reasoning[]) {
+    const example = this.dataset.examples({
+      problem: test.id,
+      count: 1,
+      iteration,
+    })[0];
+
+    let prompt = `INSTRUCTIONS:\n`;
+    prompt += `${this.dataset.instructions()}`;
+    prompt += "\n\n";
+    prompt += `${this.dataset.reasoningStepInstructions()}`;
+    prompt += "\n\n";
+    prompt +=
+      "Your goal is to rank the following (potentially partial) reasonings";
+    prompt += " from the most promising to the least promising.\n\n";
+    prompt += "An example of a full valid reasoning is the following:\n";
+    prompt += `QUESTION: ${example.question}\n`;
+    prompt += `REASONING:\n${example.reasoning.join("\n")}\n\n`;
+    prompt +=
+      "The format you should use for your response is the ranked, comma separated, list of reasoning indexes without spaces.";
+    prompt +=
+      " If there are, say, 5 proposed reasonings, a valid example would be `1,5,2,3,4`";
+    prompt += " where `1` is the most promising and 4 the least promising.";
+    prompt +=
+      " If two reasonings are equally promising break the tie and follow the format.";
+
+    const iterations =
+      (pool.length / this.VOTING_POOL_SIZE) * this.VOTING_ITERATIONS;
+
+    const rng = seedrandom(
+      `TOT-VALUE-${test.id}-${iteration}-${pool
+        .map((r) => r.reasoning.length)
+        .join("-")}`
+    );
+
+    for (let i = 0; i < iterations; i++) {
+      const messages: ChatMessage[] = [];
+
+      messages.push({
+        role: "system",
+        content: prompt,
+      });
+
+      let content = `QUESTION: ${test.question}\n`;
+
+      // select this.VOTING_POOL_SIZE reasonings randomly from pool
+      const pool_idx: number[] = [];
+      while (pool_idx.length < this.VOTING_POOL_SIZE) {
+        const idx = Math.floor(rng() * pool.length);
+        if (!pool_idx.includes(idx)) {
+          pool_idx.push(idx);
+        }
+      }
+
+      for (let j = 0; j < pool_idx.length; j++) {
+        const node = pool[pool_idx[j]];
+        content += `\nREASONING index=${j + 1}:\n${node.reasoning.join(
+          "\n"
+        )}\n`;
+      }
+
+      content +=
+        "\n\nWhen ranking reasonings take the following into consideration:\n";
+      content += this.dataset.rankingInstructions();
+      content +=
+        "\nReply with a careful rationale about the reasonings (max 512 characters) and on the last line, the order of the reasonings ordered from most promising to least promising, comma separated REASONING indexes without space.";
+
+      messages.push({
+        role: "user",
+        content,
+      });
+
+      // console.log(prompt);
+      messages.forEach((m) =>
+        console.log(`-------------------------\n${m.role}: ${m.content}`)
+      );
+
+      const query: ChatQuery = {
+        provider: this.model.provider,
+        model: this.model.model(),
+        messages,
+        temperature: 0.2,
+        maxTokens: 2048,
+      };
+
+      const c = await this.runCompletion(query);
+
+      await this.storeCompletion({
+        test,
+        completion: c,
+        query,
+        check: false,
+      });
+
+      this.stats();
+      console.log(">>>> ", c.content);
+
+      //extract the last string that matches the format
+      const match = c.content.match(/\d+(,\d+)*/g);
+
+      if (!match) {
+        continue;
+      }
+
+      const ordering = match[match.length - 1]
+        .split(",")
+        .map((s) => parseInt(s) - 1);
+
+      // compute score
+      for (let j = 0; j < ordering.length; j++) {
+        if (ordering[j] >= 0 && ordering[j] <= pool_idx.length) {
+          const idx = pool_idx[ordering[j]];
+          pool[idx].score += 1.0 / (j + 1);
+        }
+      }
+    }
+  }
+
+  async runOne({
+    test,
+  }: {
+    test: Test;
+    iteration?: number;
+    debug?: boolean;
+  }): Promise<TestResult> {
+    let pool: Reasoning[] = [{ reasoning: [], answer: null, score: 0.0 }];
+
+    for (
+      let i = 0;
+      i < Math.min(this.EXPANSION_COUNT, this.dataset.maxTokens().maxStepCount);
+      i++
+    ) {
+      const p: Reasoning[] = [];
+      for (const node of pool) {
+        if (node.answer !== null) {
+          p.push({
+            reasoning: node.reasoning,
+            answer: node.answer,
+            score: 0.0,
+          });
+          continue;
+        }
+        for (let j = 0; j < this.SAMPLE_COUNT_PER_EXPANSION; j++) {
+          const expanded = await this.expand(test, j, node);
+          p.push(expanded);
+        }
+      }
+
+      await this.value(test, i, p);
+      p.sort((a, b) => b.score - a.score);
+      pool = p.slice(0, this.POOL_SIZE);
+
+      console.log("NEW POOL: ", pool);
+      if (pool.filter((n) => n.answer === null).length === 0) {
+        // console.log("EXITING ONLY ANSWERS");
+        break;
+      }
+    }
+
+    let answer = "";
+    const a = pool.filter((n) => n.answer !== null);
+    if (a.length > 0 && a[0].answer) {
+      answer = a[0].answer;
+    }
+
+    let check = false;
+    try {
+      check = await this.dataset.check({ test, answer });
+    } catch (e) {
+      // Nothing to do, check failed.
+    }
+
+    console.log(`CHECK: problem=${test.id} answer=${answer} check=${check}`);
+
+    const result: TestResult = {
+      test,
+      answer,
+      check,
+    };
+
+    this.finals.push(result);
+    return result;
+  }
+
+  computeResults(): void {
+    console.log(
+      `Result: algorithm=${this.algorithm()} dataset=${this.dataset.dataset} ` +
+        `provider=${this.model.provider} model=${this.model.model()} ` +
+        `check=${this.finals.filter((x) => x.check).length} total=${
+          this.finals.length
+        }`
+    );
+  }
+}
diff --git a/x/spolu/research/evals/lib/datasets.ts b/x/spolu/research/evals/lib/datasets.ts
index aea27a852e43..81b7b873b514 100644
--- a/x/spolu/research/evals/lib/datasets.ts
+++ b/x/spolu/research/evals/lib/datasets.ts
@@ -24,6 +24,7 @@ export abstract class Dataset {
 
   abstract instructions(): string;
   abstract reasoningStepInstructions(): string;
+  abstract rankingInstructions(): string;
 
   abstract maxTokens(): {
     reasoningStep: number;
diff --git a/x/spolu/research/evals/lib/datasets/MATH.ts b/x/spolu/research/evals/lib/datasets/MATH.ts
index 6d01c81d589f..037650c04987 100644
--- a/x/spolu/research/evals/lib/datasets/MATH.ts
+++ b/x/spolu/research/evals/lib/datasets/MATH.ts
@@ -73,7 +73,7 @@ export class MATH extends Dataset {
     return (
       "Find a solution to the provided mathematical problem." +
       " The answer is a unique mathematical expression presented in LaTeX `\\boxed{}` directive. " +
-      " (example: `\\boxed{4}` or `\\boxed{3\\pi}`). Formatting instructions: " +
+      " (example: `\\boxed{4}` or `\\boxed{3\\pi}`). Formatting instructions:" +
       " fractions should be represented in the LaTeX form `\\frac{a}{b}` (not `\\frac12`)," +
       " units should not be included," +
       " square roots should be presented in the LaTeX form `\\sqrt{c}` (not `\\sqrt2`)," +
@@ -91,12 +91,20 @@ export class MATH extends Dataset {
     );
   }
 
+  rankingInstructions(): string {
+    return (
+      "- Each reasoning step should be mathetically correct, a reasoning with an incorrect step should be down-ranked.\n" +
+      "- Reasonings should be concise. If a reasoning is too verbose it should be down-ranked.\n" +
+      "- If a reasoning seems to explore a promising new direciton, it should be up-ranked.\n"
+    );
+  }
+
   parseAnswer(str: string): string {
     const boxed = str.match(/\\boxed{([^}]*)}/g);
     if (!boxed) {
       return "";
     }
-    return boxed[boxed.length - 1];
+    return boxed[boxed.length - 1].trim();
   }
 
   maxTokens() {
diff --git a/x/spolu/research/evals/lib/datasets/game24.ts b/x/spolu/research/evals/lib/datasets/game24.ts
index bc62fe07cf03..f6e81a4da682 100644
--- a/x/spolu/research/evals/lib/datasets/game24.ts
+++ b/x/spolu/research/evals/lib/datasets/game24.ts
@@ -134,6 +134,14 @@ export class Game24 extends Dataset {
     );
   }
 
+  rankingInstructions(): string {
+    return (
+      "- Each intermediary step should consist of a valid operation and a correct accounting of left numbers. Down-rank reasonings that do not follow this.\n" +
+      "- Each number must be used exactly once. It's invalid to not use or re-use a number.\n" +
+      "- The last step should propose a valid solution expression.\n"
+    );
+  }
+
   parseAnswer(str: string): string {
     const boxed = str.match(/\\boxed{([^}]*)}/g);
     if (!boxed) {
@@ -142,7 +150,7 @@ export class Game24 extends Dataset {
     // remove the \boxed{} directive
     const answer = boxed.map((s) => s.slice(7, s.length - 1));
     // return the last one
-    return answer[answer.length - 1];
+    return answer[answer.length - 1].trim();
   }
 
   maxTokens() {
diff --git a/x/spolu/research/evals/lib/models.ts b/x/spolu/research/evals/lib/models.ts
index 7962d97dd603..f8af8c572cb8 100644
--- a/x/spolu/research/evals/lib/models.ts
+++ b/x/spolu/research/evals/lib/models.ts
@@ -1,6 +1,6 @@
 import { hash as blake3 } from "blake3";
 
-export const ValidProviderTypes = ["openai", "mistral"] as const;
+export const ValidProviderTypes = ["openai", "mistral", "anthropic"] as const;
 export type ProviderType = (typeof ValidProviderTypes)[number];
 
 export type ChatMessage = {
diff --git a/x/spolu/research/evals/lib/models/anthropic.ts b/x/spolu/research/evals/lib/models/anthropic.ts
new file mode 100644
index 000000000000..afe4f33635ad
--- /dev/null
+++ b/x/spolu/research/evals/lib/models/anthropic.ts
@@ -0,0 +1,69 @@
+import Anthropic from "@anthropic-ai/sdk";
+
+import { ChatCompletion, ChatQuery, Model } from "@app/lib/models";
+
+export type AnthropicModelType = "claude-2.1" | "claude-instant-1.2";
+
+export class AnthropicModel extends Model {
+  readonly provider = "anthropic";
+  private _model: AnthropicModelType;
+  private anthropic: Anthropic;
+
+  constructor(model: AnthropicModelType) {
+    super();
+
+    this._model = model;
+    this.anthropic = new Anthropic({
+      apiKey: process.env.ANTHROPIC_API_KEY,
+    });
+  }
+
+  model(): string {
+    return this._model;
+  }
+
+  async completion(query: ChatQuery): Promise<ChatCompletion> {
+    const messages: {
+      role: "user" | "assistant";
+      content: string;
+    }[] = query.messages.map((m) => ({
+      role: m.role === "assistant" ? "assistant" : "user",
+      content: m.content,
+    }));
+
+    // If two messages in a row are user, merge them.
+    for (let i = 1; i < messages.length; i++) {
+      if (messages[i - 1].role === "user" && messages[i].role === "user") {
+        messages[i - 1].content += "\n" + messages[i].content;
+        messages.splice(i, 1);
+        i--;
+      }
+    }
+
+    const completion = await this.anthropic.beta.messages.create({
+      "anthropic-beta": "messages-2023-12-15",
+      model: this._model,
+      messages,
+      max_tokens: query.maxTokens || 4096,
+      temperature: query.temperature,
+      // logprobs: true,
+    });
+
+    const m = completion.content[0];
+
+    if (m.text === null) {
+      throw new Error("Anthropic returned null");
+    }
+
+    return {
+      role: "assistant",
+      content: m.text,
+      usage: {
+        promptTokens: 0,
+        completionTokens: 0,
+      },
+      provider: this.provider,
+      model: this._model,
+    };
+  }
+}
diff --git a/x/spolu/research/evals/main.ts b/x/spolu/research/evals/main.ts
index b080ca1b7d35..aa84063e8697 100644
--- a/x/spolu/research/evals/main.ts
+++ b/x/spolu/research/evals/main.ts
@@ -6,15 +6,16 @@ import {
   ValidAlgorithmTypes,
 } from "@app/lib/algorithms";
 import { CoT } from "@app/lib/algorithms/CoT";
+import { CoTConsensus } from "@app/lib/algorithms/CoTConsensus";
+import { ToT } from "@app/lib/algorithms/ToT";
 import { Dataset, DatasetType, ValidDatasetTypes } from "@app/lib/datasets";
 import { Game24 } from "@app/lib/datasets/game24";
 import { MATH } from "@app/lib/datasets/MATH";
 import { Model, ProviderType, ValidProviderTypes } from "@app/lib/models";
+import { AnthropicModel, AnthropicModelType } from "@app/lib/models/anthropic";
 import { MistralModel, MistralModelType } from "@app/lib/models/mistral";
 import { OpenAIModel, OpenAIModelType } from "@app/lib/models/openai";
 
-import { CoTConsensus } from "./lib/algorithms/CoTConsensus";
-
 async function main() {
   const argv = parseArgs(process.argv.slice(2));
 
@@ -52,6 +53,9 @@ async function main() {
     case "mistral":
       m = new MistralModel(model as MistralModelType);
       break;
+    case "anthropic":
+      m = new AnthropicModel(model as AnthropicModelType);
+      break;
     default:
       ((x: never) => x)(provider);
   }
@@ -84,6 +88,9 @@ async function main() {
     case "CoT-consensus":
       a = new CoTConsensus(d, m);
       break;
+    case "ToT":
+      a = new ToT(d, m);
+      break;
     default:
       ((x: never) => x)(algorithm);
   }
diff --git a/x/spolu/research/evals/package-lock.json b/x/spolu/research/evals/package-lock.json
index 6d68e1bfd6e5..ab1448248150 100644
--- a/x/spolu/research/evals/package-lock.json
+++ b/x/spolu/research/evals/package-lock.json
@@ -5,6 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
+        "@anthropic-ai/sdk": "^0.11.0",
         "@mistralai/mistralai": "^0.0.7",
         "@types/node": "^20.5.3",
         "@types/seedrandom": "^3.0.7",
@@ -37,6 +38,30 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/@anthropic-ai/sdk": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@anthropic-ai/sdk/-/sdk-0.11.0.tgz",
+      "integrity": "sha512-rM/qe2u/Ii2xB0cJWeSdPoyn4NikOF6kFxKkyqy+vbXbTgJ6YLu9Ha+QsX1dxQjnfaANJz3bB+BFkrn4cjWMXQ==",
+      "dependencies": {
+        "@types/node": "^18.11.18",
+        "@types/node-fetch": "^2.6.4",
+        "abort-controller": "^3.0.0",
+        "agentkeepalive": "^4.2.1",
+        "digest-fetch": "^1.3.0",
+        "form-data-encoder": "1.7.2",
+        "formdata-node": "^4.3.2",
+        "node-fetch": "^2.6.7",
+        "web-streams-polyfill": "^3.2.1"
+      }
+    },
+    "node_modules/@anthropic-ai/sdk/node_modules/@types/node": {
+      "version": "18.19.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz",
+      "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==",
+      "dependencies": {
+        "undici-types": "~5.26.4"
+      }
+    },
     "node_modules/@babel/runtime": {
       "version": "7.22.11",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
diff --git a/x/spolu/research/evals/package.json b/x/spolu/research/evals/package.json
index 6823d62da2be..6dd4d2a19272 100644
--- a/x/spolu/research/evals/package.json
+++ b/x/spolu/research/evals/package.json
@@ -15,6 +15,7 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
+    "@anthropic-ai/sdk": "^0.11.0",
     "@mistralai/mistralai": "^0.0.7",
     "@types/node": "^20.5.3",
     "@types/seedrandom": "^3.0.7",

From 4496c97e733f613318bc66cdcdda7d44d569ee2c Mon Sep 17 00:00:00 2001
From: Henry Fontanier <h.fontanier@gmail.com>
Date: Thu, 21 Dec 2023 10:36:33 +0100
Subject: [PATCH 13/23] enh(csv upload): bump max number of lines to 50k
 (#2982)

Co-authored-by: Henry Fontanier <henry@dust.tt>
---
 front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
index b2551e081402..d5a60a37d9a6 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
@@ -91,11 +91,11 @@ async function handler(
       }
 
       const csvRows = csvRowsRes.value;
-      if (csvRows.length > 2000) {
+      if (csvRows.length > 50000) {
         return apiError(req, res, {
           api_error: {
             type: "invalid_request_error",
-            message: `CSV has too many rows: ${csvRows.length} (max 2000).`,
+            message: `CSV has too many rows: ${csvRows.length} (max 50000).`,
           },
           status_code: 400,
         });

From 9199f7066690040a0171c57ab3ac80d25f827d90 Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Thu, 21 Dec 2023 11:45:07 +0100
Subject: [PATCH 14/23] [Runner] Call role 'user' 'member' in front (#2983)

Following #2980 with all context
---
 front/pages/w/[wId]/members/index.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/front/pages/w/[wId]/members/index.tsx b/front/pages/w/[wId]/members/index.tsx
index f5689b691cee..3fb2f895a372 100644
--- a/front/pages/w/[wId]/members/index.tsx
+++ b/front/pages/w/[wId]/members/index.tsx
@@ -346,7 +346,7 @@ export default function WorkspaceAdmin({
                         color={COLOR_FOR_ROLE[item.workspaces[0].role]}
                         className="capitalize"
                       >
-                        {item.workspaces[0].role}
+                        {displayRole(item.workspaces[0].role)}
                       </Chip>
                     )}
                   </div>
@@ -836,7 +836,11 @@ function ChangeMemberModal({
               <DropdownMenu.Button type="select">
                 <Button
                   variant="secondary"
-                  label={selectedRole || member.workspaces[0].role}
+                  label={
+                    selectedRole
+                      ? displayRole(selectedRole)
+                      : displayRole(member.workspaces[0].role)
+                  }
                   size="sm"
                   type="select"
                   className="capitalize"
@@ -917,3 +921,7 @@ function ChangeMemberModal({
     </Modal>
   );
 }
+
+function displayRole(role: RoleType): string {
+  return role === "user" ? "member" : role;
+}

From bb39a46c4ddedf44dc3eae8a1150230c53bf5d61 Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Thu, 21 Dec 2023 14:19:44 +0100
Subject: [PATCH 15/23] [Ahuna] AssistantBuilder doesn't load agentConfigs,
 uses names route (#2978)

* [Ahuna] AssistantBuilder doesn't load agentConfigs, uses names route

Related [task](https://github.com/dust-tt/dust/issues/2970)

Side-effect: allows reuse of already used avatars for agents

* using URL
---
 .../assistant_builder/AssistantBuilder.tsx    | 106 +++++-------------
 .../AssistantBuilderAvatarPicker.tsx          |  40 ++-----
 front/lib/api/assistant/configuration.ts      |  24 +++-
 front/lib/swr.ts                              |  16 +++
 .../assistant/agent_configurations/index.ts   |  10 +-
 .../assistant/agent_configurations/names.ts   |  57 ++++++++++
 6 files changed, 144 insertions(+), 109 deletions(-)
 create mode 100644 front/pages/api/w/[wId]/assistant/agent_configurations/names.ts

diff --git a/front/components/assistant_builder/AssistantBuilder.tsx b/front/components/assistant_builder/AssistantBuilder.tsx
index c90c82ef6d8c..1772aa441add 100644
--- a/front/components/assistant_builder/AssistantBuilder.tsx
+++ b/front/components/assistant_builder/AssistantBuilder.tsx
@@ -69,10 +69,7 @@ import { getSupportedModelConfig } from "@app/lib/assistant";
 import { CONNECTOR_CONFIGURATIONS } from "@app/lib/connector_providers";
 import { isActivatedStructuredDB } from "@app/lib/development";
 import { FREE_TEST_PLAN_CODE } from "@app/lib/plans/plan_codes";
-import {
-  useAgentConfigurations,
-  useSlackChannelsLinkedWithAgent,
-} from "@app/lib/swr";
+import { useAgentNames, useSlackChannelsLinkedWithAgent } from "@app/lib/swr";
 import { classNames } from "@app/lib/utils";
 
 const usedModelConfigs = [
@@ -84,6 +81,20 @@ const usedModelConfigs = [
   MISTRAL_SMALL_MODEL_CONFIG,
 ];
 
+// Avatar URLs
+const BASE_URL = "https://dust.tt/";
+const buildAvatarUrl = (basePath: string, fileName: string) => {
+  const url = new URL(BASE_URL);
+  url.pathname = `${basePath}${fileName}`;
+  return url.toString();
+};
+const DROID_AVATAR_URLS = DROID_AVATAR_FILES.map((f) =>
+  buildAvatarUrl(DROID_AVATARS_BASE_PATH, f)
+);
+const SPIRIT_AVATAR_URLS = SPIRIT_AVATAR_FILES.map((f) =>
+  buildAvatarUrl(SPIRIT_AVATARS_BASE_PATH, f)
+);
+
 // Actions
 
 const ACTION_MODES = [
@@ -316,77 +327,23 @@ export default function AssistantBuilder({
     string | null
   >(null);
   const [timeFrameError, setTimeFrameError] = useState<string | null>(null);
-  const { agentConfigurations } = useAgentConfigurations({
+  const { agentNames } = useAgentNames({
     workspaceId: owner.sId,
-    agentsGetView: "all",
   });
 
-  const [droidAvatarUrls, setDroidAvatarUrls] = useState<
-    { available: boolean; url: string }[]
-  >([]);
-  const [spiritAvatarUrls, setSpiritAvatarUrls] = useState<
-    { available: boolean; url: string }[]
-  >([]);
   const [isAvatarModalOpen, setIsAvatarModalOpen] = useState(false);
 
   useEffect(() => {
-    if (agentConfigurations?.length) {
-      const BASE_URL = "https://dust.tt/";
-      const buildAvatarUrl = (basePath: string, fileName: string) =>
-        `${BASE_URL}${basePath}${fileName}`;
-
-      const allDroids = DROID_AVATAR_FILES.map((f) =>
-        buildAvatarUrl(DROID_AVATARS_BASE_PATH, f)
-      );
-      const allSpirits = SPIRIT_AVATAR_FILES.map((f) =>
-        buildAvatarUrl(SPIRIT_AVATARS_BASE_PATH, f)
-      );
-
-      const usedAvatarFiles = new Set(
-        agentConfigurations.map((a) => a.pictureUrl.split("/").pop())
-      );
-
-      const availableAvatars = (avatarFiles: string[], basePath: string) =>
-        avatarFiles
-          .filter((f) => !usedAvatarFiles.has(f))
-          .map((f) => buildAvatarUrl(basePath, f));
-
-      let availableUrls = [
-        ...availableAvatars(DROID_AVATAR_FILES, DROID_AVATARS_BASE_PATH),
-        ...availableAvatars(SPIRIT_AVATAR_FILES, SPIRIT_AVATARS_BASE_PATH),
-      ];
-
-      // TODO(@fontanierh): figure out a real solution for avatar exhaustion
-      availableUrls = availableUrls.length
-        ? availableUrls
-        : [...allDroids, ...allSpirits];
-
-      setDroidAvatarUrls(
-        DROID_AVATAR_FILES.map((f) => ({
-          url: `https://dust.tt/${DROID_AVATARS_BASE_PATH}${f}`,
-          available: !usedAvatarFiles.has(f),
-        }))
-      );
-      setSpiritAvatarUrls(
-        SPIRIT_AVATAR_FILES.map((f) => ({
-          url: `https://dust.tt/${SPIRIT_AVATARS_BASE_PATH}${f}`,
-          available: !usedAvatarFiles.has(f),
-        }))
-      );
-      // Only set a random avatar if one isn't already set
-      if (!builderState.avatarUrl) {
-        setBuilderState((state) => ({
-          ...state,
-          avatarUrl:
-            availableUrls[Math.floor(Math.random() * availableUrls.length)],
-        }));
-      }
+    const availableUrls = [...DROID_AVATAR_URLS, ...SPIRIT_AVATAR_URLS];
+    // Only set a random avatar if one isn't already set
+    if (!builderState.avatarUrl) {
+      setBuilderState((state) => ({
+        ...state,
+        avatarUrl:
+          availableUrls[Math.floor(Math.random() * availableUrls.length)],
+      }));
     }
-  }, [
-    agentConfigurations?.length,
-    agentConfigurations,
-    builderState.avatarUrl,
-  ]);
+  }, [builderState.avatarUrl]);
 
   // This state stores the slack channels that should have the current agent as default.
   const [selectedSlackChannels, setSelectedSlackChannels] = useState<
@@ -437,15 +394,14 @@ export default function AssistantBuilder({
 
   const assistantHandleIsAvailable = useCallback(
     (handle: string) => {
-      return !agentConfigurations.some(
-        (agentConfiguration) =>
-          agentConfiguration.name.toLowerCase() ===
-            removeLeadingAt(handle).toLowerCase() &&
+      return !agentNames.some(
+        (name) =>
+          name.toLowerCase() === removeLeadingAt(handle).toLowerCase() &&
           initialBuilderState?.handle.toLowerCase() !==
             removeLeadingAt(handle).toLowerCase()
       );
     },
-    [agentConfigurations, initialBuilderState?.handle]
+    [agentNames, initialBuilderState?.handle]
   );
 
   const configuredDataSourceCount = Object.keys(
@@ -787,8 +743,8 @@ export default function AssistantBuilder({
             avatarUrl,
           }));
         }}
-        droidAvatarUrls={droidAvatarUrls}
-        spiritAvatarUrls={spiritAvatarUrls}
+        droidAvatarUrls={DROID_AVATAR_URLS}
+        spiritAvatarUrls={SPIRIT_AVATAR_URLS}
       />
       <AppLayout
         subscription={subscription}
diff --git a/front/components/assistant_builder/AssistantBuilderAvatarPicker.tsx b/front/components/assistant_builder/AssistantBuilderAvatarPicker.tsx
index 7a4fe45d63da..1e9e6b6d0559 100644
--- a/front/components/assistant_builder/AssistantBuilderAvatarPicker.tsx
+++ b/front/components/assistant_builder/AssistantBuilderAvatarPicker.tsx
@@ -35,8 +35,8 @@ export function AvatarPicker({
   isOpen: boolean;
   setOpen: (isOpen: boolean) => void;
   onPick: (avatar: string) => void;
-  droidAvatarUrls: { available: boolean; url: string }[];
-  spiritAvatarUrls: { available: boolean; url: string }[];
+  droidAvatarUrls: string[];
+  spiritAvatarUrls: string[];
 }) {
   const [isUploadingAvatar, setIsUploadingAvatar] = useState(false);
   const [currentTab, setCurrentTab] = useState<"droids" | "spirits" | "upload">(
@@ -192,48 +192,32 @@ export function AvatarPicker({
         </div>
         {currentTab === "droids" && (
           <div className="grid grid-cols-4 gap-4 pt-8 lg:grid-cols-8">
-            {droidAvatarUrls.map(({ available, url }) => (
+            {droidAvatarUrls.map((url) => (
               <div
                 key={url}
-                className={classNames(
-                  available ? "cursor-pointer" : "opacity-30"
-                )}
+                className="cursor-pointer"
                 onClick={() => {
-                  if (available) {
-                    onPick(url);
-                    onClose();
-                  }
+                  onPick(url);
+                  onClose();
                 }}
               >
-                <Avatar
-                  size="auto"
-                  visual={<img src={url} />}
-                  clickable={available}
-                />
+                <Avatar size="auto" visual={<img src={url} />} />
               </div>
             ))}
           </div>
         )}
         {currentTab === "spirits" && (
           <div className="grid grid-cols-4 gap-4 pt-8 lg:grid-cols-8">
-            {spiritAvatarUrls.map(({ available, url }) => (
+            {spiritAvatarUrls.map((url) => (
               <div
                 key={url}
-                className={classNames(
-                  available ? "cursor-pointer" : "opacity-30"
-                )}
+                className="cursor-pointer"
                 onClick={() => {
-                  if (available) {
-                    onPick(url);
-                    onClose();
-                  }
+                  onPick(url);
+                  onClose();
                 }}
               >
-                <Avatar
-                  size="auto"
-                  visual={<img src={url} />}
-                  clickable={available}
-                />
+                <Avatar size="auto" visual={<img src={url} />} />
               </div>
             ))}
           </div>
diff --git a/front/lib/api/assistant/configuration.ts b/front/lib/api/assistant/configuration.ts
index 87b9b5e8c8e4..2926be550d63 100644
--- a/front/lib/api/assistant/configuration.ts
+++ b/front/lib/api/assistant/configuration.ts
@@ -556,7 +556,6 @@ export async function getAgentConfigurations(
 
   throw new Error(`Unknown agentsGetView ${agentsGetView}`);
 }
-
 async function getConversationMentions(
   conversationId: string
 ): Promise<AgentMention[]> {
@@ -589,6 +588,29 @@ async function getConversationMentions(
   }));
 }
 
+/**
+ *  Return names of all agents in the workspace, to avoid name collisions.
+ */
+export async function getAgentNames(auth: Authenticator): Promise<string[]> {
+  const owner = auth.workspace();
+  if (!owner) {
+    throw new Error("Unexpected `auth` without `workspace`.");
+  }
+  if (!auth.isUser()) {
+    throw new Error("Unexpected `auth` from outside workspace.");
+  }
+
+  const agents = await AgentConfiguration.findAll({
+    where: {
+      workspaceId: owner.id,
+      status: "active",
+    },
+    attributes: ["name"],
+  });
+
+  return agents.map((a) => a.name);
+}
+
 /**
  * Create Agent Configuration
  */
diff --git a/front/lib/swr.ts b/front/lib/swr.ts
index a81ba3316e6f..483101b464a2 100644
--- a/front/lib/swr.ts
+++ b/front/lib/swr.ts
@@ -20,6 +20,7 @@ import { GetRunsResponseBody } from "@app/pages/api/w/[wId]/apps/[aId]/runs";
 import { GetRunBlockResponseBody } from "@app/pages/api/w/[wId]/apps/[aId]/runs/[runId]/blocks/[type]/[name]";
 import { GetRunStatusResponseBody } from "@app/pages/api/w/[wId]/apps/[aId]/runs/[runId]/status";
 import { GetAgentConfigurationsResponseBody } from "@app/pages/api/w/[wId]/assistant/agent_configurations";
+import { GetAgentNamesResponseBody } from "@app/pages/api/w/[wId]/assistant/agent_configurations/names";
 import { GetDataSourcesResponseBody } from "@app/pages/api/w/[wId]/data_sources";
 import { GetDocumentsResponseBody } from "@app/pages/api/w/[wId]/data_sources/[name]/documents";
 import { GetOrPostBotEnabledResponseBody } from "@app/pages/api/w/[wId]/data_sources/[name]/managed/bot_enabled";
@@ -589,3 +590,18 @@ export function useApp({
     mutateApp: mutate,
   };
 }
+
+export function useAgentNames({ workspaceId }: { workspaceId: string }) {
+  const agentNamesFetcher: Fetcher<GetAgentNamesResponseBody> = fetcher;
+  const { data, error, mutate } = useSWR(
+    `/api/w/${workspaceId}/assistant/agent_configurations/names`,
+    agentNamesFetcher
+  );
+
+  return {
+    agentNames: data ? data.agentNames : [],
+    isAgentNamesLoading: !error && !data,
+    isAgentNamesError: error,
+    mutateAgentNames: mutate,
+  };
+}
diff --git a/front/pages/api/w/[wId]/assistant/agent_configurations/index.ts b/front/pages/api/w/[wId]/assistant/agent_configurations/index.ts
index ee5030f1f1b3..eee8b44c7abf 100644
--- a/front/pages/api/w/[wId]/assistant/agent_configurations/index.ts
+++ b/front/pages/api/w/[wId]/assistant/agent_configurations/index.ts
@@ -157,11 +157,11 @@ async function handler(
 export default withLogging(handler);
 
 /**
- * Create Or Upgrade Agent Configuration
- * If an agentConfigurationId is provided, it will create a new version of the agent configuration
- * with the same agentConfigurationId.
- * If no agentConfigurationId is provided, it will create a new agent configuration.
- * In both cases, it will return the new agent configuration.
+ * Create Or Upgrade Agent Configuration If an agentConfigurationId is provided,
+ * it will create a new version of the agent configuration with the same
+ * agentConfigurationId. If no agentConfigurationId is provided, it will create
+ * a new agent configuration. In both cases, it will return the new agent
+ * configuration.
  **/
 export async function createOrUpgradeAgentConfiguration(
   auth: Authenticator,
diff --git a/front/pages/api/w/[wId]/assistant/agent_configurations/names.ts b/front/pages/api/w/[wId]/assistant/agent_configurations/names.ts
new file mode 100644
index 000000000000..bd620fa5c5e4
--- /dev/null
+++ b/front/pages/api/w/[wId]/assistant/agent_configurations/names.ts
@@ -0,0 +1,57 @@
+import { ReturnedAPIErrorType } from "@dust-tt/types";
+import { NextApiRequest, NextApiResponse } from "next";
+
+import { getAgentNames } from "@app/lib/api/assistant/configuration";
+import { Authenticator, getSession } from "@app/lib/auth";
+import { apiError, withLogging } from "@app/logger/withlogging";
+
+export type GetAgentNamesResponseBody = {
+  agentNames: string[];
+};
+
+async function handler(
+  req: NextApiRequest,
+  res: NextApiResponse<GetAgentNamesResponseBody | ReturnedAPIErrorType | void>
+): Promise<void> {
+  const session = await getSession(req, res);
+  const auth = await Authenticator.fromSession(
+    session,
+    req.query.wId as string
+  );
+  const owner = auth.workspace();
+  if (!owner) {
+    return apiError(req, res, {
+      status_code: 404,
+      api_error: {
+        type: "workspace_not_found",
+        message: "The workspace you're trying to modify was not found.",
+      },
+    });
+  }
+
+  switch (req.method) {
+    case "GET":
+      if (!auth.isUser()) {
+        return apiError(req, res, {
+          status_code: 404,
+          api_error: {
+            type: "app_auth_error",
+            message: "Only the workspace users can see Assistants.",
+          },
+        });
+      }
+      const agentNames = await getAgentNames(auth);
+      return res.status(200).json({ agentNames });
+
+    default:
+      return apiError(req, res, {
+        status_code: 405,
+        api_error: {
+          type: "method_not_supported_error",
+          message: "The method passed is not supported, GET is expected.",
+        },
+      });
+  }
+}
+
+export default withLogging(handler);

From 4b59e8cadc7aded813884066ec00872638f6810b Mon Sep 17 00:00:00 2001
From: Henry Fontanier <h.fontanier@gmail.com>
Date: Thu, 21 Dec 2023 15:29:01 +0100
Subject: [PATCH 16/23] fix(slackbot): don't use mention syntax on markdown
 strikethrough (#2986)

Co-authored-by: Henry Fontanier <henry@dust.tt>
---
 connectors/src/connectors/slack/bot.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/connectors/src/connectors/slack/bot.ts b/connectors/src/connectors/slack/bot.ts
index 1cfd1adc3e9e..48df941595aa 100644
--- a/connectors/src/connectors/slack/bot.ts
+++ b/connectors/src/connectors/slack/bot.ts
@@ -272,7 +272,7 @@ async function botAnswerMessage(
     }
   }
   // Extract all ~mentions.
-  const mentionCandidates = message.match(/~[a-zA-Z0-9_-]{1,20}/g) || [];
+  const mentionCandidates = message.match(/(?<!~)~[a-zA-Z0-9_-]{1,20}/g) || [];
 
   const mentions: { assistantName: string; assistantId: string }[] = [];
   if (mentionCandidates.length > 1) {

From 215c7c9aa12cb50e48ff5188ce72fe8808e9cb94 Mon Sep 17 00:00:00 2001
From: Henry Fontanier <h.fontanier@gmail.com>
Date: Thu, 21 Dec 2023 15:33:35 +0100
Subject: [PATCH 17/23] fix(csv parse): be stricter with float parsing (#2987)

* fix(csv parse): be stricter with float parsing

* allow negative numbers

---------

Co-authored-by: Henry Fontanier <henry@dust.tt>
---
 front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
index d5a60a37d9a6..fbe49cb298a2 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
@@ -303,10 +303,11 @@ async function rowsFromCsv(
     parsedValuesByCol[col] = (() => {
       for (const parser of [
         // number
-        (v: string) => (isNaN(parseFloat(v)) ? undefined : parseFloat(v)),
+        (v: string) =>
+          /^-?\d+(\.\d+)?$/.test(v.trim()) ? parseFloat(v.trim()) : undefined,
         // date/datetime
         (v: string) => {
-          const date = new Date(v);
+          const date = new Date(v.trim());
           const epoch = date.getTime();
           return isNaN(epoch)
             ? undefined

From de00e0fafce503439d5b73c84fba7e8764ed9249 Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Thu, 21 Dec 2023 15:41:14 +0100
Subject: [PATCH 18/23] [Ahuna] UI fixes (#2985)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* copy: toaster msgs

* Assistant name placeholde

* trash icon for private assistants

* From -> by

* Show -> view

* [Ahuna] UI fixes

Related [task](https://github.com/dust-tt/dust/issues/2984)
- Unify toaster messages
- Unify placeholder strings
- replace “From” by “by”
-view instead of Show in tooltip
- just remove the Active chip since it’s redundant in From Dust tab
- 🗑️ icon instead of X for your own, unpublished assistants
---
 .../components/assistant/AssistantActions.tsx |  2 +-
 .../components/assistant/AssistantPreview.tsx | 27 +++++++------------
 front/pages/w/[wId]/assistant/assistants.tsx  | 19 +++++++++----
 front/pages/w/[wId]/assistant/gallery.tsx     |  8 +++---
 4 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/front/components/assistant/AssistantActions.tsx b/front/components/assistant/AssistantActions.tsx
index b1b4769d7dfc..308400cedfb8 100644
--- a/front/components/assistant/AssistantActions.tsx
+++ b/front/components/assistant/AssistantActions.tsx
@@ -126,7 +126,7 @@ export function RemoveAssistantFromListDialog({
           });
         } else {
           sendNotification({
-            title: `Assistant removed`,
+            title: `Assistant removed from your list`,
             type: "success",
           });
           onRemove();
diff --git a/front/components/assistant/AssistantPreview.tsx b/front/components/assistant/AssistantPreview.tsx
index af30973713de..3ca2ead96c6a 100644
--- a/front/components/assistant/AssistantPreview.tsx
+++ b/front/components/assistant/AssistantPreview.tsx
@@ -82,7 +82,7 @@ export function AssistantPreview({
         });
       } else {
         sendNotification({
-          title: `Assistant added`,
+          title: `Assistant added to your list`,
           type: "success",
         });
         onUpdate();
@@ -133,7 +133,7 @@ export function AssistantPreview({
         });
       } else {
         sendNotification({
-          title: `Assistant added`,
+          title: `Assistant added to Workspace list`,
           type: "success",
         });
         onUpdate();
@@ -185,7 +185,7 @@ export function AssistantPreview({
     <Button
       key="show_details"
       icon={MoreIcon}
-      label={"Show Assistant"}
+      label={"View Assistant"}
       labelVisible={false}
       size="xs"
       variant="tertiary"
@@ -211,23 +211,14 @@ export function AssistantPreview({
   if (variant === "gallery") {
     switch (flow) {
       case "personal":
-        galleryChip = agentConfiguration.userListStatus === "in-list" && (
-          <Chip
-            color="emerald"
-            size="xs"
-            label={agentConfiguration.scope === "global" ? "Active" : "Added"}
-          />
-        );
+        galleryChip = agentConfiguration.userListStatus === "in-list" &&
+          !(agentConfiguration.scope === "global") && (
+            <Chip color="emerald" size="xs" label="Added" />
+          );
         break;
       case "workspace":
-        galleryChip = ["workspace", "global"].includes(
-          agentConfiguration.scope
-        ) && (
-          <Chip
-            color="emerald"
-            size="xs"
-            label={agentConfiguration.scope === "global" ? "Active" : "Added"}
-          />
+        galleryChip = agentConfiguration.scope === "workspace" && (
+          <Chip color="emerald" size="xs" label={"Added"} />
         );
         break;
       default:
diff --git a/front/pages/w/[wId]/assistant/assistants.tsx b/front/pages/w/[wId]/assistant/assistants.tsx
index 08b6c0aa61a9..14675d0270e1 100644
--- a/front/pages/w/[wId]/assistant/assistants.tsx
+++ b/front/pages/w/[wId]/assistant/assistants.tsx
@@ -12,6 +12,7 @@ import {
   SliderToggle,
   Tab,
   Tooltip,
+  TrashIcon,
   XMarkIcon,
 } from "@dust-tt/sparkle";
 import {
@@ -131,7 +132,7 @@ export default function PersonalAssistants({
       current: view === "personal",
     },
     {
-      label: "From Workspace",
+      label: "By Workspace",
       href: `/w/${owner.sId}/assistant/assistants?view=workspace`,
       current: view === "workspace",
     },
@@ -309,7 +310,7 @@ export default function PersonalAssistants({
                               <Button
                                 key="show_details"
                                 icon={MoreIcon}
-                                label={"Show Assistant"}
+                                label={"View Assistant"}
                                 labelVisible={false}
                                 size="xs"
                                 variant="tertiary"
@@ -328,8 +329,16 @@ export default function PersonalAssistants({
                               </Link>
                               <Button
                                 variant="tertiary"
-                                icon={XMarkIcon}
-                                label="Remove from my list"
+                                icon={
+                                  agent.scope === "private"
+                                    ? TrashIcon
+                                    : XMarkIcon
+                                }
+                                label={
+                                  agent.scope === "private"
+                                    ? "Delete"
+                                    : "Remove from my list"
+                                }
                                 labelVisible={false}
                                 onClick={() => {
                                   agent.scope === "private"
@@ -344,7 +353,7 @@ export default function PersonalAssistants({
                               <Button
                                 key="show_details"
                                 icon={MoreIcon}
-                                label={"Show Assistant"}
+                                label={"View Assistant"}
                                 labelVisible={false}
                                 size="xs"
                                 variant="tertiary"
diff --git a/front/pages/w/[wId]/assistant/gallery.tsx b/front/pages/w/[wId]/assistant/gallery.tsx
index 7fc3aae18fa0..783aa0739e86 100644
--- a/front/pages/w/[wId]/assistant/gallery.tsx
+++ b/front/pages/w/[wId]/assistant/gallery.tsx
@@ -111,17 +111,17 @@ export default function AssistantsGallery({
       current: agentsGetView === "all",
     },
     {
-      label: "From Workspace",
+      label: "By Workspace",
       href: `/w/${owner.sId}/assistant/gallery?view=workspace&flow=` + flow,
       current: agentsGetView === "workspace",
     },
     {
-      label: "From Teammates",
+      label: "By Teammates",
       href: `/w/${owner.sId}/assistant/gallery?view=published&flow=` + flow,
       current: agentsGetView === "published",
     },
     {
-      label: "From Dust",
+      label: "By Dust",
       href: `/w/${owner.sId}/assistant/gallery?view=global&flow=` + flow,
       current: agentsGetView === "global",
     },
@@ -179,7 +179,7 @@ export default function AssistantsGallery({
           <Tab tabs={tabs} />
           <Searchbar
             name="search"
-            placeholder="Search Assistants"
+            placeholder="Assistant name"
             value={assistantSearch}
             onChange={(s) => {
               setAssistantSearch(s);

From 54d8546569e01ec9e4772551782add52397fdee8 Mon Sep 17 00:00:00 2001
From: Henry Fontanier <h.fontanier@gmail.com>
Date: Thu, 21 Dec 2023 15:48:13 +0100
Subject: [PATCH 19/23] fix(slackbot): actually fix strikethrouh (#2990)

Co-authored-by: Henry Fontanier <henry@dust.tt>
---
 connectors/src/connectors/slack/bot.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/connectors/src/connectors/slack/bot.ts b/connectors/src/connectors/slack/bot.ts
index 48df941595aa..63d793c148cd 100644
--- a/connectors/src/connectors/slack/bot.ts
+++ b/connectors/src/connectors/slack/bot.ts
@@ -272,7 +272,8 @@ async function botAnswerMessage(
     }
   }
   // Extract all ~mentions.
-  const mentionCandidates = message.match(/(?<!~)~[a-zA-Z0-9_-]{1,20}/g) || [];
+  const mentionCandidates =
+    message.match(/(?<!\S)~(?!~)([a-zA-Z0-9_-]{1,20})(?!\S)/g) || [];
 
   const mentions: { assistantName: string; assistantId: string }[] = [];
   if (mentionCandidates.length > 1) {

From 3723f10ed10fed1bf2901b37394d708f0c60fdfe Mon Sep 17 00:00:00 2001
From: Henry Fontanier <h.fontanier@gmail.com>
Date: Thu, 21 Dec 2023 15:51:40 +0100
Subject: [PATCH 20/23] fix: Gemini Pro / VertexAI (#2960)

* fix: vertex AI function calling

* actually fix

---------

Co-authored-by: Henry Fontanier <henry@dust.tt>
---
 core/src/providers/google_vertex_ai.rs | 428 ++++++++++++++++++++-----
 1 file changed, 343 insertions(+), 85 deletions(-)

diff --git a/core/src/providers/google_vertex_ai.rs b/core/src/providers/google_vertex_ai.rs
index ea53e6aa38df..4c652c75cddc 100644
--- a/core/src/providers/google_vertex_ai.rs
+++ b/core/src/providers/google_vertex_ai.rs
@@ -20,24 +20,74 @@ use crate::{
 
 use super::{
     embedder::Embedder,
-    llm::{ChatFunction, ChatMessage, LLMChatGeneration, LLMGeneration, LLM},
+    llm::{ChatFunction, ChatFunctionCall, ChatMessage, LLMChatGeneration, LLMGeneration, LLM},
     provider::{Provider, ProviderID},
     tiktoken::tiktoken::{
         cl100k_base_singleton, decode_async, encode_async, tokenize_async, CoreBPE,
     },
 };
 
+// Disabled for now as it requires using a "tools" API which we don't support yet.
+pub const USE_FUNCTION_CALLING: bool = false;
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct UsageMetadata {
     prompt_token_count: usize,
-    candidates_token_count: usize,
+    candidates_token_count: Option<usize>,
     total_token_count: usize,
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct VertexAiFunctionResponseContent {
+    name: String,
+    content: String,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct VertexAiFunctionResponse {
+    name: String,
+    response: VertexAiFunctionResponseContent,
+}
+
+impl TryFrom<&ChatMessage> for VertexAiFunctionResponse {
+    type Error = anyhow::Error;
+
+    fn try_from(m: &ChatMessage) -> Result<Self, Self::Error> {
+        let name = m.name.clone().unwrap_or_default();
+        Ok(VertexAiFunctionResponse {
+            name: name.clone(),
+            response: VertexAiFunctionResponseContent {
+                name: name,
+                content: m.content.clone().unwrap_or_default(),
+            },
+        })
+    }
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct VertexAiFunctionCall {
+    name: String,
+    args: String,
+}
+
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct Part {
-    text: String,
+    text: Option<String>,
+    function_call: Option<VertexAiFunctionCall>,
+    function_response: Option<VertexAiFunctionResponse>,
+}
+
+impl TryFrom<&ChatFunctionCall> for VertexAiFunctionCall {
+    type Error = anyhow::Error;
+
+    fn try_from(f: &ChatFunctionCall) -> Result<Self, Self::Error> {
+        Ok(VertexAiFunctionCall {
+            name: f.name.clone(),
+            args: f.arguments.clone(),
+        })
+    }
 }
 
 #[derive(Serialize, Deserialize, Debug, Clone)]
@@ -52,23 +102,57 @@ impl TryFrom<&ChatMessage> for Content {
     fn try_from(m: &ChatMessage) -> Result<Self, Self::Error> {
         Ok(Content {
             role: match m.role {
-                ChatMessageRole::Assistant | ChatMessageRole::Function => String::from("MODEL"),
+                ChatMessageRole::Assistant => String::from("MODEL"),
+                ChatMessageRole::Function => match m.function_call {
+                    // Role "function" is reserved for function responses.
+                    None if USE_FUNCTION_CALLING => String::from("FUNCTION"),
+                    None => String::from("USER"),
+                    // Function calls are done as role "model".
+                    Some(_) => String::from("MODEL"),
+                },
                 _ => String::from("USER"),
             },
             parts: vec![Part {
                 text: match m.role {
-                    ChatMessageRole::System => format!(
-                        "SYSTEM: {}\n",
+                    ChatMessageRole::System => Some(format!(
+                        "[user: SYSTEM] {}\n",
                         m.content.clone().unwrap_or(String::from(""))
-                    ),
-                    _ => match m.name {
-                        Some(ref name) => format!(
-                            "[name: {}]: {}",
+                    )),
+                    ChatMessageRole::User => match m.name {
+                        Some(ref name) => Some(format!(
+                            "[user: {}] {}",
                             name,
                             m.content.clone().unwrap_or(String::from(""))
-                        ),
-                        None => m.content.clone().unwrap_or(String::from("")),
+                        )),
+                        None => Some(m.content.clone().unwrap_or(String::from(""))),
+                    },
+                    ChatMessageRole::Function if USE_FUNCTION_CALLING => None,
+                    ChatMessageRole::Function => match m.name {
+                        Some(ref name) => Some(format!(
+                            "[function_result: {}] {}",
+                            name,
+                            m.content.clone().unwrap_or(String::from(""))
+                        )),
+                        None => Some(format!(
+                            "[function_result] {}",
+                            m.content.clone().unwrap_or(String::from(""))
+                        )),
                     },
+                    ChatMessageRole::Assistant => {
+                        Some(m.content.clone().unwrap_or(String::from("")))
+                    }
+                },
+                function_call: match m.function_call.clone() {
+                    Some(function_call) if USE_FUNCTION_CALLING => {
+                        VertexAiFunctionCall::try_from(&function_call).ok()
+                    }
+                    _ => None,
+                },
+                function_response: match m.role {
+                    ChatMessageRole::Function if USE_FUNCTION_CALLING => {
+                        VertexAiFunctionResponse::try_from(m).ok()
+                    }
+                    _ => None,
                 },
             }],
         })
@@ -85,7 +169,7 @@ pub struct Candidate {
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Completion {
-    candidates: Vec<Candidate>,
+    candidates: Option<Vec<Candidate>>,
     usage_metadata: Option<UsageMetadata>,
 }
 
@@ -265,7 +349,9 @@ impl LLM for GoogleVertexAiLLM {
             &vec![Content {
                 role: String::from("USER"),
                 parts: vec![Part {
-                    text: String::from(prompt),
+                    text: Some(String::from(prompt)),
+                    function_call: None,
+                    function_response: None,
                 }],
             }],
             &vec![],
@@ -287,7 +373,16 @@ impl LLM for GoogleVertexAiLLM {
             provider: ProviderID::GoogleVertexAi.to_string(),
             model: self.id().clone(),
             completions: vec![Tokens {
-                text: c.candidates[0].content.parts[0].text.clone(),
+                text: match c.candidates {
+                    None => String::from(""),
+                    Some(candidates) => match candidates.len() {
+                        0 => String::from(""),
+                        _ => candidates[0].content.parts[0]
+                            .text
+                            .clone()
+                            .unwrap_or_default(),
+                    },
+                },
                 tokens: Some(vec![]),
                 logprobs: Some(vec![]),
                 top_logprobs: None,
@@ -327,10 +422,12 @@ impl LLM for GoogleVertexAiLLM {
         }
 
         if functions.len() > 0 || function_call.is_some() {
-            Err(anyhow!(
-                "Functions on Google Vertex AI are not implemented yet."
-            ))?;
+            if USE_FUNCTION_CALLING {
+                unimplemented!("Functions on Google Vertex AI are not implemented yet.");
+            }
+            Err(anyhow!("Functions on Google Vertex AI are disabled."))?;
         }
+
         if frequency_penalty.is_some() {
             Err(anyhow!(
                 "Frequency penalty not supported by Google Vertex AI"
@@ -375,7 +472,18 @@ impl LLM for GoogleVertexAiLLM {
                 name: None,
                 function_call: None,
                 role: ChatMessageRole::Assistant,
-                content: Some(c.candidates[0].content.parts[0].text.clone()),
+                content: match c.candidates {
+                    None => None,
+                    Some(candidates) => match candidates.len() {
+                        0 => None,
+                        _ => Some(
+                            candidates[0].content.parts[0]
+                                .text
+                                .clone()
+                                .unwrap_or_default(),
+                        ),
+                    },
+                },
             }],
         })
     }
@@ -397,17 +505,33 @@ pub async fn streamed_chat_completion(
     let https = HttpsConnector::new();
     let url = uri.to_string();
 
-    // Squash messages for the same role.
-    // Gemini doesn't allow multiple messages from the same role in a row.
+    // Ensure that all input message have one single part.
+    messages
+        .iter()
+        .map(|m| match m.parts.len() {
+            0 => Err(anyhow!("Message has no parts")),
+            1 => Ok(()),
+            _ => Err(anyhow!("Message has more than one part")),
+        })
+        .collect::<Result<Vec<()>>>()?;
+
+    // Squash user messages.
+    // Gemini doesn't allow multiple user or assistant messages in a row.
     let messages: Vec<Content> = messages
         .iter()
         .fold(
+            // First we merge consecutive user/assistant messages by making them a multi-part message.
             Vec::<Content>::new(),
             |mut acc: Vec<Content>, m: &Content| {
                 match acc.last_mut() {
-                    Some(last) if last.role == m.role => {
+                    Some(last)
+                        if last.role == m.role
+                            && ["MODEL", "USER"].contains(&m.role.to_uppercase().as_str()) =>
+                    {
                         last.parts.push(Part {
                             text: m.parts[0].text.clone(),
+                            function_call: None,
+                            function_response: None,
                         });
                     }
                     _ => {
@@ -418,16 +542,23 @@ pub async fn streamed_chat_completion(
             },
         )
         .iter()
-        .map(|m| Content {
-            role: m.role.clone(),
-            parts: vec![Part {
-                text: m
-                    .parts
-                    .iter()
-                    .map(|p| p.text.clone())
-                    .collect::<Vec<String>>()
-                    .join(" "),
-            }],
+        // Then we squash the parts together.
+        .map(|m| match m.role.to_uppercase().as_str() {
+            "USER" | "MODEL" => Content {
+                role: m.role.clone(),
+                parts: vec![Part {
+                    text: Some(
+                        m.parts
+                            .iter()
+                            .map(|p| p.text.clone().unwrap_or_default())
+                            .collect::<Vec<String>>()
+                            .join("\n"),
+                    ),
+                    function_call: None,
+                    function_response: None,
+                }],
+            },
+            _ => m.clone(),
         })
         .collect::<Vec<Content>>();
 
@@ -435,7 +566,7 @@ pub async fn streamed_chat_completion(
         Ok(builder) => builder,
         Err(e) => {
             return Err(anyhow!(
-                "Error creating Anthropic streaming client: {:?}",
+                "Error creating Google Vertex AI streaming client: {:?}",
                 e
             ))
         }
@@ -492,33 +623,66 @@ pub async fn streamed_chat_completion(
                 }
                 Some(es::SSE::Event(e)) => {
                     let completion: Completion = serde_json::from_str(e.data.as_str())?;
-                    if completion.candidates.len() != 1 {
-                        Err(anyhow!(
-                            "Unexpected number of candidates: {}",
-                            completion.candidates.len()
-                        ))?;
-                    }
-                    if completion.candidates[0].content.parts.len() != 1 {
-                        Err(anyhow!(
-                            "Unexpected number of parts: {}",
-                            completion.candidates[0].content.parts.len()
-                        ))?;
-                    }
+                    let completion_candidates = completion.candidates.clone().unwrap_or_default();
+
+                    match completion_candidates.len() {
+                        0 => {
+                            break 'stream;
+                        }
+                        1 => (),
+                        n => {
+                            Err(anyhow!("Unexpected number of candidates: {}", n))?;
+                        }
+                    };
+
+                    match completion_candidates[0].content.parts.len() {
+                        1 => (),
+                        n => {
+                            Err(anyhow!("Unexpected number of parts: {}", n))?;
+                        }
+                    };
 
                     match event_sender.as_ref() {
                         Some(sender) => {
-                            let text = completion.candidates[0].content.parts[0].text.clone();
-                            if text.len() > 0 {
-                                let _ = sender.send(json!({
-                                    "type": "tokens",
-                                    "content": {
-                                        "text": text,
+                            // let text = completion.candidates[0].content.parts[0].text.clone();
+                            match completion_candidates[0].content.parts[0].text.clone() {
+                                Some(t) => {
+                                    if t.len() > 0 {
+                                        let _ = sender.send(json!({
+                                            "type": "tokens",
+                                            "content": {
+                                                "text": t,
+                                            }
+                                        }));
                                     }
-                                }));
+                                }
+                                None => (),
+                            }
+
+                            match completion_candidates[0].content.parts[0]
+                                .function_call
+                                .clone()
+                            {
+                                Some(f) => {
+                                    let _ = sender.send(json!({
+                                        "type": "function_call",
+                                        "content": {
+                                            "name": f.name,
+                                        }
+                                    }));
+                                    let _ = sender.send(json!({
+                                        "type": "function_call_arguments_tokens",
+                                        "content": {
+                                            "text": f.args,
+                                        }
+                                    }));
+                                }
+                                None => (),
                             }
                         }
+
                         _ => (),
-                    }
+                    };
 
                     completions.lock().push(completion);
                 }
@@ -536,41 +700,135 @@ pub async fn streamed_chat_completion(
         }
     }
 
-    let mut completion = Completion {
-        candidates: vec![Candidate {
+    let completions_lock = completions.lock();
+
+    // Sometimes (usually when last message is Assistant), the AI decides not to respond.
+    if completions_lock.len() == 0 {
+        return Ok(Completion {
+            candidates: None,
+            usage_metadata: None,
+        });
+    }
+
+    // Ensure that we don't have a mix of `function_call` and `text` in the same completion.
+    // Ensure that all the roles are "MODEL"
+    // We merge all the completions texts together.
+    let mut full_completion_text = String::from("");
+    let mut function_call_name = String::from("");
+    let mut function_call_args = String::from("");
+    let mut finish_reason = String::from("");
+    let mut usage_metadata = UsageMetadata {
+        prompt_token_count: 0,
+        candidates_token_count: None,
+        total_token_count: 0,
+    };
+    for c in completions_lock.iter() {
+        match &c.usage_metadata {
+            None => (),
+            Some(um) => {
+                usage_metadata.prompt_token_count = um.prompt_token_count;
+                usage_metadata.candidates_token_count = um.candidates_token_count;
+                usage_metadata.total_token_count = um.total_token_count;
+            }
+        }
+        match &c.candidates {
+            None => (),
+            Some(candidates) => match candidates.len() {
+                0 => (),
+                1 => {
+                    match candidates[0].content.role.to_uppercase().as_str() {
+                        "MODEL" => (),
+                        _ => Err(anyhow!(format!(
+                            "Unexpected role in completion: {}",
+                            candidates[0].content.role
+                        )))?,
+                    };
+                    match &candidates[0].finish_reason {
+                        None => (),
+                        Some(r) => {
+                            match finish_reason.len() {
+                                0 => finish_reason = r.clone(),
+                                _ => Err(anyhow!("Unexpected finish reason"))?,
+                            };
+                        }
+                    }
+                    match candidates[0].content.parts.len() {
+                        0 => (),
+                        1 => {
+                            match candidates[0].content.parts[0].text.clone() {
+                                Some(t) => {
+                                    if function_call_name.len() > 0 || function_call_args.len() > 0
+                                    {
+                                        Err(anyhow!("Unexpected text in function call"))?;
+                                    }
+                                    full_completion_text.push_str(t.as_str());
+                                }
+                                None => (),
+                            };
+                            match candidates[0].content.parts[0].function_call.clone() {
+                                Some(f) => {
+                                    if full_completion_text.len() > 0 {
+                                        Err(anyhow!("Unexpected function call in text"))?;
+                                    }
+                                    match f.name.len() {
+                                        0 => (),
+                                        _ if function_call_name.is_empty() => {
+                                            function_call_name = f.name.clone();
+                                        }
+                                        _ => {
+                                            if function_call_name != f.name {
+                                                Err(anyhow!("Function call name mismatch"))?;
+                                            }
+                                        }
+                                    }
+                                    match f.args.len() {
+                                        0 => (),
+                                        _ if function_call_args.is_empty() => {
+                                            function_call_args.push_str(f.args.as_str());
+                                        }
+                                        _ => (),
+                                    }
+                                }
+                                None => (),
+                            }
+                        }
+                        _ => (),
+                    }
+                }
+                _ => Err(anyhow!("Unexpected number of candidates"))?,
+            },
+        }
+    }
+
+    if finish_reason.len() == 0 {
+        Err(anyhow!("No finish reason"))?;
+    }
+
+    if function_call_name.len() == 0 && full_completion_text.len() == 0 {
+        Err(anyhow!("No text and no function call"))?;
+    }
+
+    Ok(Completion {
+        candidates: Some(vec![Candidate {
             content: Content {
                 role: String::from("MODEL"),
                 parts: vec![Part {
-                    text: String::from(""),
+                    text: match full_completion_text.len() {
+                        0 => None,
+                        _ => Some(full_completion_text),
+                    },
+                    function_call: match function_call_name.len() {
+                        0 => None,
+                        _ => Some(VertexAiFunctionCall {
+                            name: function_call_name,
+                            args: function_call_args,
+                        }),
+                    },
+                    function_response: None,
                 }],
             },
-            finish_reason: None,
-        }],
-        usage_metadata: Some(UsageMetadata {
-            prompt_token_count: 0,
-            candidates_token_count: 0,
-            total_token_count: 0,
-        }),
-    };
-
-    completions.lock().iter().for_each(|c| {
-        completion.candidates[0].content.parts[0].text.push_str(
-            c.candidates[0]
-                .content
-                .parts
-                .iter()
-                .map(|p| p.text.as_str())
-                .collect::<Vec<&str>>()
-                .join(" ")
-                .as_str(),
-        );
-        if c.candidates[0].finish_reason.is_some() {
-            completion.candidates[0].finish_reason = c.candidates[0].finish_reason.clone();
-        }
-        if c.usage_metadata.is_some() {
-            completion.usage_metadata = c.usage_metadata.clone();
-        }
-    });
-
-    Ok(completion)
+            finish_reason: Some(finish_reason),
+        }]),
+        usage_metadata: Some(usage_metadata),
+    })
 }

From c343542f2640b0e9ff88602e95d5dc71ab4ee9d9 Mon Sep 17 00:00:00 2001
From: Philippe Rolet <pr@dust.tt>
Date: Thu, 21 Dec 2023 16:33:13 +0100
Subject: [PATCH 21/23] [Ahuna] "Remove" when hover on "Added" chip in
 assistant gallery (#2989)

* [Ahuna] Remove on hover in assistant gallery

Related [task]()

* remove from workspace list -> no

* - => x in assitantDetails

* No 'duplicate' in workspace assistants flow

* "Workspace" assistant gallery
---
 .../components/assistant/AssistantDetails.tsx | 44 +++++-----
 .../components/assistant/AssistantPreview.tsx | 84 ++++++++++++++-----
 front/pages/w/[wId]/assistant/gallery.tsx     |  4 +-
 3 files changed, 89 insertions(+), 43 deletions(-)

diff --git a/front/components/assistant/AssistantDetails.tsx b/front/components/assistant/AssistantDetails.tsx
index 99d0d7dfeb2e..7d9f232e045c 100644
--- a/front/components/assistant/AssistantDetails.tsx
+++ b/front/components/assistant/AssistantDetails.tsx
@@ -4,11 +4,11 @@ import {
   ClipboardIcon,
   CloudArrowDownIcon,
   CommandLineIcon,
-  DashIcon,
   Modal,
   PlusIcon,
   ServerIcon,
   TrashIcon,
+  XMarkIcon,
 } from "@dust-tt/sparkle";
 import {
   AgentUserListStatus,
@@ -30,13 +30,12 @@ import Link from "next/link";
 import { useContext, useState } from "react";
 import ReactMarkdown from "react-markdown";
 
+import { DeleteAssistantDialog } from "@app/components/assistant/AssistantActions";
 import { SendNotificationsContext } from "@app/components/sparkle/Notification";
 import { CONNECTOR_CONFIGURATIONS } from "@app/lib/connector_providers";
 import { useApp, useDatabase } from "@app/lib/swr";
 import { PostAgentListStatusRequestBody } from "@app/pages/api/w/[wId]/members/me/agent_list_status";
 
-import { DeleteAssistantDialog } from "./AssistantActions";
-
 type AssistantDetailsFlow = "personal" | "workspace";
 
 export function AssistantDetails({
@@ -296,7 +295,11 @@ function ButtonsSection({
       });
     } else {
       sendNotification({
-        title: `Assistant ${listStatus === "in-list" ? "added" : "removed"}`,
+        title: `Assistant ${
+          listStatus === "in-list"
+            ? "added to your list"
+            : "removed from your list"
+        }`,
         type: "success",
       });
       onUpdate();
@@ -305,30 +308,31 @@ function ButtonsSection({
     setIsAddingOrRemoving(false);
     onClose();
   };
-
   return (
     <Button.List className="flex items-center justify-end gap-1">
-      <Link
-        href={`/w/${owner.sId}/builder/assistants/new?flow=personal_assistants&duplicate=${agentConfiguration.sId}`}
-      >
-        <Button
-          label={isDuplicating ? "Duplicating..." : "Duplicate"}
-          disabled={isDuplicating}
-          variant="tertiary"
-          icon={ClipboardIcon}
-          size="xs"
-          onClick={async () => {
-            setIsDuplicating(true);
-          }}
-        />
-      </Link>
+      {flow === "personal" && (
+        <Link
+          href={`/w/${owner.sId}/builder/assistants/new?flow=personal_assistants&duplicate=${agentConfiguration.sId}`}
+        >
+          <Button
+            label={isDuplicating ? "Duplicating..." : "Duplicate"}
+            disabled={isDuplicating}
+            variant="tertiary"
+            icon={ClipboardIcon}
+            size="xs"
+            onClick={async () => {
+              setIsDuplicating(true);
+            }}
+          />
+        </Link>
+      )}
       {canAddRemoveList &&
         (agentConfiguration.userListStatus === "in-list" ? (
           <Button
             label={isAddingOrRemoving ? "Removing..." : "Remove from my list"}
             disabled={isAddingOrRemoving}
             variant="tertiary"
-            icon={DashIcon}
+            icon={XMarkIcon}
             size="xs"
             onClick={async () => {
               await updateAgentUserListStatus("not-in-list");
diff --git a/front/components/assistant/AssistantPreview.tsx b/front/components/assistant/AssistantPreview.tsx
index 3ca2ead96c6a..11c7e0516a58 100644
--- a/front/components/assistant/AssistantPreview.tsx
+++ b/front/components/assistant/AssistantPreview.tsx
@@ -1,6 +1,14 @@
-import { Avatar, Button, Chip, MoreIcon, PlusIcon } from "@dust-tt/sparkle";
+import {
+  Avatar,
+  Button,
+  Chip,
+  DashIcon,
+  MoreIcon,
+  PlusIcon,
+} from "@dust-tt/sparkle";
 import {
   AgentConfigurationType,
+  AgentUserListStatus,
   assertNever,
   PostOrPatchAgentConfigurationRequestBody,
   WorkspaceType,
@@ -48,18 +56,18 @@ export function AssistantPreview({
   variant,
   flow,
 }: AssistantPreviewProps) {
-  const [isAdding, setIsAdding] = useState<boolean>(false);
+  const [isUpdatingList, setIsUpdatingList] = useState<boolean>(false);
   // TODO(flav) Move notification logic to the caller. This maintains the purity of the component by
   // decoupling it from side-effect operations.
   const sendNotification = useContext(SendNotificationsContext);
 
-  const addToAgentList = async () => {
-    setIsAdding(true);
+  const updateAgentList = async (listStatus: AgentUserListStatus) => {
+    setIsUpdatingList(true);
 
     try {
       const body: PostAgentListStatusRequestBody = {
         agentId: agentConfiguration.sId,
-        listStatus: "in-list",
+        listStatus,
       };
 
       const response = await fetch(
@@ -76,30 +84,36 @@ export function AssistantPreview({
       if (!response.ok) {
         const data = await response.json();
         sendNotification({
-          title: `Error adding Assistant`,
+          title: `Error ${
+            listStatus === "in-list" ? "adding" : "removing"
+          } Assistant`,
           description: data.error.message,
           type: "error",
         });
       } else {
         sendNotification({
-          title: `Assistant added to your list`,
+          title: `Assistant ${
+            listStatus === "in-list" ? "added to" : "removed from"
+          } your list`,
           type: "success",
         });
         onUpdate();
       }
     } catch (error) {
       sendNotification({
-        title: `Error adding Assistant`,
+        title: `Error ${
+          listStatus === "in-list" ? "adding" : "removing"
+        } Assistant`,
         description: error instanceof Error ? error.message : String(error),
         type: "error",
       });
     } finally {
-      setIsAdding(false);
+      setIsUpdatingList(false);
     }
   };
 
-  const addToWorkspace = async () => {
-    setIsAdding(true);
+  const updateWorkspaceScope = async (scope: "workspace" | "published") => {
+    setIsUpdatingList(true);
 
     const body: PostOrPatchAgentConfigurationRequestBody = {
       assistant: {
@@ -107,7 +121,7 @@ export function AssistantPreview({
         description: agentConfiguration.description,
         pictureUrl: agentConfiguration.pictureUrl,
         status: "active",
-        scope: "workspace",
+        scope,
         action: agentConfiguration.action,
         generation: agentConfiguration.generation,
       },
@@ -127,25 +141,31 @@ export function AssistantPreview({
       if (!res.ok) {
         const data = await res.json();
         sendNotification({
-          title: `Error adding Assistant`,
+          title: `Error ${
+            scope === "workspace" ? "adding" : "removing"
+          } Assistant`,
           description: data.error.message,
           type: "error",
         });
       } else {
         sendNotification({
-          title: `Assistant added to Workspace list`,
+          title: `Assistant ${
+            scope === "workspace" ? "added to" : "removed from"
+          } Workspace list`,
           type: "success",
         });
         onUpdate();
       }
     } catch (error) {
       sendNotification({
-        title: `Error adding Assistant`,
+        title: `Error ${
+          scope === "workspace" ? "adding" : "removing"
+        } Assistant`,
         description: error instanceof Error ? error.message : String(error),
         type: "error",
       });
     } finally {
-      setIsAdding(false);
+      setIsUpdatingList(false);
     }
   };
 
@@ -157,10 +177,10 @@ export function AssistantPreview({
           key="personall_add"
           variant="tertiary"
           icon={PlusIcon}
-          disabled={isAdding}
+          disabled={isUpdatingList}
           size="xs"
           label={"Add"}
-          onClick={addToAgentList}
+          onClick={() => updateAgentList("in-list")}
         />
       );
       break;
@@ -170,10 +190,10 @@ export function AssistantPreview({
           key="workspace_add"
           variant="tertiary"
           icon={PlusIcon}
-          disabled={isAdding}
+          disabled={isUpdatingList}
           size="xs"
           label={"Add to Workspace"}
-          onClick={addToWorkspace}
+          onClick={() => updateWorkspaceScope("workspace")}
         />
       );
       break;
@@ -213,12 +233,32 @@ export function AssistantPreview({
       case "personal":
         galleryChip = agentConfiguration.userListStatus === "in-list" &&
           !(agentConfiguration.scope === "global") && (
-            <Chip color="emerald" size="xs" label="Added" />
+            <div className="group">
+              <Chip
+                color="emerald"
+                size="xs"
+                label="Added"
+                className="group-hover:hidden"
+              />
+              <div className="hidden group-hover:block">
+                <Button.List isWrapping={true}>
+                  <Button
+                    key="personall_remove"
+                    variant="tertiary"
+                    icon={DashIcon}
+                    disabled={isUpdatingList}
+                    size="xs"
+                    label={"Remove"}
+                    onClick={() => updateAgentList("not-in-list")}
+                  />
+                </Button.List>
+              </div>
+            </div>
           );
         break;
       case "workspace":
         galleryChip = agentConfiguration.scope === "workspace" && (
-          <Chip color="emerald" size="xs" label={"Added"} />
+          <Chip color="emerald" size="xs" label="Added" />
         );
         break;
       default:
diff --git a/front/pages/w/[wId]/assistant/gallery.tsx b/front/pages/w/[wId]/assistant/gallery.tsx
index 783aa0739e86..1c12dcca6fcf 100644
--- a/front/pages/w/[wId]/assistant/gallery.tsx
+++ b/front/pages/w/[wId]/assistant/gallery.tsx
@@ -141,7 +141,9 @@ export default function AssistantsGallery({
       })}
       titleChildren={
         <AppLayoutSimpleCloseTitle
-          title="Assistant Gallery"
+          title={`${
+            flow === "workspace_add" ? "Workspace " : ""
+          }Assistant Gallery`}
           onClose={async () => {
             switch (flow) {
               case "conversation_add":

From b5bb6feb62d00a77c4dea9be5c41ab27751b5f2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daphn=C3=A9=20Popin?= <PopDaph@users.noreply.github.com>
Date: Thu, 21 Dec 2023 16:55:03 +0100
Subject: [PATCH 22/23] Fix parsing of false values (#2994)

---
 .../api/w/[wId]/data_sources/[name]/databases/csv.ts  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
index fbe49cb298a2..b51489cab638 100644
--- a/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
+++ b/front/pages/api/w/[wId]/data_sources/[name]/databases/csv.ts
@@ -146,10 +146,10 @@ async function handler(
           {
             dataSourceName: dataSource.name,
             workspaceId: owner.id,
-            databaseName: name,
+            databaseName,
             databaseId: id,
             tableId,
-            tableName: name,
+            tableName,
             error: tableRes.error,
           },
           "Failed to upsert database table."
@@ -177,10 +177,10 @@ async function handler(
           {
             dataSourceName: dataSource.name,
             workspaceId: owner.id,
-            databaseName: name,
+            databaseName,
             databaseId: id,
             tableId,
-            tableName: name,
+            tableName,
             error: rowsRes.error,
           },
           "Failed to upsert database rows."
@@ -363,7 +363,8 @@ async function rowsFromCsv(
   for (let i = 0; i < nbRows; i++) {
     const record = header.reduce((acc, h) => {
       const parsedValues = parsedValuesByCol[h];
-      acc[h] = parsedValues && parsedValues[i] ? parsedValues[i] : "";
+      acc[h] =
+        parsedValues && parsedValues[i] !== undefined ? parsedValues[i] : "";
       return acc;
     }, {} as Record<string, RowValue>);
 

From cc5748c9896c7f91bf62a897a44daee867a666bd Mon Sep 17 00:00:00 2001
From: Henry Fontanier <h.fontanier@gmail.com>
Date: Thu, 21 Dec 2023 17:01:38 +0100
Subject: [PATCH 23/23] enh(infra) add readiness probe for connectors and front
 (#2991)

Co-authored-by: Henry Fontanier <henry@dust.tt>
---
 k8s/deployments/connectors-deployment.yaml | 6 ++++++
 k8s/deployments/front-deployment.yaml      | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/k8s/deployments/connectors-deployment.yaml b/k8s/deployments/connectors-deployment.yaml
index 7b113123b723..fcd720fd4d57 100644
--- a/k8s/deployments/connectors-deployment.yaml
+++ b/k8s/deployments/connectors-deployment.yaml
@@ -24,6 +24,12 @@ spec:
           imagePullPolicy: Always
           ports:
             - containerPort: 3002
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 3002
+            initialDelaySeconds: 5
+            periodSeconds: 5
 
           envFrom:
             - configMapRef:
diff --git a/k8s/deployments/front-deployment.yaml b/k8s/deployments/front-deployment.yaml
index b0682f24a8c2..7a7df39f577f 100644
--- a/k8s/deployments/front-deployment.yaml
+++ b/k8s/deployments/front-deployment.yaml
@@ -23,6 +23,12 @@ spec:
           imagePullPolicy: Always
           ports:
             - containerPort: 3000
+          readinessProbe:
+            httpGet:
+              path: /
+              port: 3000
+            initialDelaySeconds: 5
+            periodSeconds: 5
 
           envFrom:
             - configMapRef: