Add fields to list studios (projects) (#1205)

* return token counter, doc_context and full context in list studios route

Author: anastasiya1155

server/bleep/sqlx-data.json

@@ -1492,7 +1492,7 @@
     },
     "query": "UPDATE project_repos\n        SET branch = ?\n        WHERE project_id = ? AND repo_ref = ?\n        RETURNING id"
   },
-  "ebdb202965998c4e29727dca19a60c82b2a4574530858e29bf6584c8b6e1f32b": {
+  "e72d027c61c96b02889751f6817129ea73d23383be3dae5fc1bffdc6e7b2c46d": {
     "describe": {
       "columns": [
         {
@@ -1514,19 +1514,31 @@
           "name": "context",
           "ordinal": 3,
           "type_info": "Text"
+        },
+        {
+          "name": "doc_context",
+          "ordinal": 4,
+          "type_info": "Text"
+        },
+        {
+          "name": "messages",
+          "ordinal": 5,
+          "type_info": "Text"
         }
       ],
       "nullable": [
         false,
         true,
         false,
+        false,
+        false,
         false
       ],
       "parameters": {
         "Right": 2
       }
     },
-    "query": "SELECT\n            s.id,\n            s.name,\n            ss.modified_at as \"modified_at!\",\n            ss.context\n        FROM studios s\n        INNER JOIN studio_snapshots ss ON s.id = ss.studio_id\n        INNER JOIN projects p ON p.id = s.project_id\n        WHERE s.project_id = ? AND p.user_id = ? AND (ss.studio_id, ss.modified_at) IN (\n            SELECT studio_id, MAX(modified_at)\n            FROM studio_snapshots\n            GROUP BY studio_id\n        )"
+    "query": "SELECT\n            s.id,\n            s.name,\n            ss.modified_at as \"modified_at!\",\n            ss.context,\n            ss.doc_context,\n            ss.messages\n        FROM studios s\n        INNER JOIN studio_snapshots ss ON s.id = ss.studio_id\n        INNER JOIN projects p ON p.id = s.project_id\n        WHERE s.project_id = ? AND p.user_id = ? AND (ss.studio_id, ss.modified_at) IN (\n            SELECT studio_id, MAX(modified_at)\n            FROM studio_snapshots\n            GROUP BY studio_id\n        )"
   },
   "ec193a038eb7fc3aaca3c3adebcc4dbde01b47ae34ac2df2227c5e5459617182": {
     "describe": {

server/bleep/src/webserver/autocomplete.rs

@@ -125,9 +125,7 @@ pub(super) async fn handle(
         .restrict_repo_queries(queries.clone(), &app)
         .await?;
 
-    let restricted_queries = api_params
-        .restrict_queries(queries.clone(), &app)
-        .await?;
+    let restricted_queries = api_params.restrict_queries(queries.clone(), &app).await?;
 
     let mut engines = vec![];
     if ac_params.content {

server/bleep/src/webserver/studio.rs

@@ -357,14 +357,9 @@ pub struct ListItem {
     modified_at: NaiveDateTime,
     repos: Vec<String>,
     most_common_ext: String,
-    context: Vec<ListItemContextFile>,
-}
-
-#[derive(serde::Serialize)]
-struct ListItemContextFile {
-    path: String,
-    hidden: bool,
-    ranges: Vec<Range<usize>>,
+    context: Vec<ContextFile>,
+    doc_context: Vec<DocContextFile>,
+    token_counts: TokenCounts,
 }
 
 pub async fn list(
@@ -379,7 +374,9 @@ pub async fn list(
             s.id,
             s.name,
             ss.modified_at as \"modified_at!\",
-            ss.context
+            ss.context,
+            ss.doc_context,
+            ss.messages
         FROM studios s
         INNER JOIN studio_snapshots ss ON s.id = ss.studio_id
         INNER JOIN projects p ON p.id = s.project_id
@@ -399,6 +396,10 @@ pub async fn list(
     for studio in studios {
         let context: Vec<ContextFile> =
             serde_json::from_str(&studio.context).map_err(Error::internal)?;
+        let doc_context: Vec<DocContextFile> =
+            serde_json::from_str(&studio.doc_context).map_err(Error::internal)?;
+        let messages: Vec<Message> =
+            serde_json::from_str(&studio.messages).map_err(Error::internal)?;
 
         let repos: HashSet<String> = context.iter().map(|file| file.repo.name.clone()).collect();
 
@@ -423,20 +424,17 @@ pub async fn list(
             .unwrap_or_default()
             .to_owned();
 
+        let token_counts = token_counts((*app).clone(), &messages, &context, &doc_context).await?;
+
         let list_item = ListItem {
             id: studio.id,
             name: studio.name.unwrap_or_else(default_studio_name),
             modified_at: studio.modified_at,
             repos: repos.into_iter().collect::<Vec<_>>(),
             most_common_ext,
-            context: context
-                .iter()
-                .map(|c| ListItemContextFile {
-                    path: c.path.clone(),
-                    hidden: c.hidden,
-                    ranges: c.ranges.clone(),
-                })
-                .collect(),
+            context,
+            doc_context,
+            token_counts,
         };
 
         list_items.push(list_item);