Merge remote-tracking branch 'origin/master' into store-onprem-price

Author: haraldschilly

src/packages/frontend/chat/actions.ts

@@ -39,7 +39,7 @@ import {
   toOllamaModel,
   type LanguageModel,
 } from "@cocalc/util/db-schema/llm-utils";
-import { cmp, isValidUUID, parse_hashtags, uuid } from "@cocalc/util/misc";
+import { cmp, isValidUUID, uuid } from "@cocalc/util/misc";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { getSortedDates, getUserName } from "./chat-log";
 import { message_to_markdown } from "./message";
@@ -51,7 +51,6 @@ import {
   Feedback,
   MessageHistory,
 } from "./types";
-import { getSelectedHashtagsSearch } from "./utils";
 import { history_path } from "@cocalc/util/misc";
 
 const MAX_CHATSTREAM = 10;
@@ -193,7 +192,7 @@ export class ChatActions extends Actions<ChatState> {
     });
   }
 
-  public foldThread(reply_to: Date, msgIndex: number) {
+  public foldThread(reply_to: Date, messageIndex?: number) {
     if (this.syncdb == null) return;
     const account_id = this.redux.getStore("account").get_account_id();
     const cur = this.syncdb.get_one({ event: "chat", date: reply_to });
@@ -210,8 +209,8 @@ export class ChatActions extends Actions<ChatState> {
 
     this.syncdb.commit();
 
-    if (folded && msgIndex != null) {
-      this.scrollToBottom(msgIndex);
+    if (folded && messageIndex != null) {
+      this.scrollToBottom(messageIndex);
     }
   }
 
@@ -294,40 +293,44 @@ export class ChatActions extends Actions<ChatState> {
       // For replies search find full threads not individual messages.
       this.setState({
         input: "",
-        search: "",
       });
+      this.clearAllFilters();
     } else {
-      // TODO: but until we improve search to be by thread (instead of by message), do this:
-      this.setState({
-        search: "",
-      });
-    }
-    this.ensureDraftStartsWithHashtags(false);
-
-    if (this.store != null) {
-      const project_id = this.store?.get("project_id");
-      const path = this.store?.get("path");
-      // set notification saying that we sent an actual chat
-      let action;
+      // when replying we make sure that the thread is expanded, since otherwise
+      // our reply won't be visible
+      const messages = this.store.get("messages");
       if (
-        noNotification ||
-        mentionsLanguageModel(input) ||
-        this.isLanguageModelThread(reply_to)
+        messages
+          ?.getIn([`${reply_to.valueOf()}`, "folding"])
+          ?.includes(sender_id)
       ) {
-        // Note: don't mark it is a chat if it is with chatgpt,
-        // since no point in notifying all collabs of this.
-        action = "edit";
-      } else {
-        action = "chat";
+        this.foldThread(reply_to);
       }
-      webapp_client.mark_file({
-        project_id,
-        path,
-        action,
-        ttl: 10000,
-      });
-      track("send_chat", { project_id, path });
     }
+
+    const project_id = this.store?.get("project_id");
+    const path = this.store?.get("path");
+    // set notification saying that we sent an actual chat
+    let action;
+    if (
+      noNotification ||
+      mentionsLanguageModel(input) ||
+      this.isLanguageModelThread(reply_to)
+    ) {
+      // Note: don't mark it is a chat if it is with chatgpt,
+      // since no point in notifying all collabs of this.
+      action = "edit";
+    } else {
+      action = "chat";
+    }
+    webapp_client.mark_file({
+      project_id,
+      path,
+      action,
+      ttl: 10000,
+    });
+    track("send_chat", { project_id, path });
+
     this.save_to_disk();
     (async () => {
       await this.processLLM({
@@ -621,38 +624,6 @@ export class ChatActions extends Actions<ChatState> {
         ? selectedHashtags.delete(tag)
         : selectedHashtags.set(tag, state);
     this.setState({ selectedHashtags });
-    this.ensureDraftStartsWithHashtags(true);
-  }
-
-  private ensureDraftStartsWithHashtags(commit: boolean = false): void {
-    if (this.syncdb == null || this.store == null) return;
-    // set draft input to match selected hashtags, if any.
-    const hashtags = this.store.get("selectedHashtags");
-    if (hashtags == null) return;
-    const { selectedHashtagsSearch } = getSelectedHashtagsSearch(hashtags);
-    let input = this.store.get("input");
-    const prefix = selectedHashtagsSearch.trim() + " ";
-    if (input.startsWith(prefix)) {
-      return;
-    }
-    const v = parse_hashtags(input);
-    if (v.length > 0) {
-      input = input.slice(v[v.length - 1][1]);
-    }
-
-    input = prefix + input;
-    this.setState({ input });
-    const sender_id = this.redux.getStore("account").get_account_id();
-    this.syncdb.set({
-      event: "draft",
-      active: Date.now(),
-      sender_id,
-      input,
-      date: 0,
-    });
-    if (commit) {
-      this.syncdb.commit();
-    }
   }
 
   public help() {
@@ -1131,6 +1102,14 @@ export class ChatActions extends Actions<ChatState> {
       foreground_project: true,
     });
   };
+
+  clearAllFilters = () => {
+    this.setState({
+      search: "",
+      selectedHashtags: immutableMap(),
+      filterRecentH: 0,
+    });
+  };
 }
 
 export function getRootMessage(

src/packages/frontend/chat/chat-log.tsx

@@ -8,34 +8,31 @@ Render all the messages in the chat.
 */
 
 import { Alert } from "antd";
-import { List, Set as immutableSet } from "immutable";
+import { Set as immutableSet } from "immutable";
 import { MutableRefObject, useEffect, useMemo, useRef } from "react";
 import { Virtuoso, VirtuosoHandle } from "react-virtuoso";
 import { chatBotName, isChatBot } from "@cocalc/frontend/account/chatbot";
 import {
-  TypedMap,
   useActions,
   useRedux,
   useTypedRedux,
 } from "@cocalc/frontend/app-framework";
 import { VisibleMDLG } from "@cocalc/frontend/components";
 import useVirtuosoScrollHook from "@cocalc/frontend/components/virtuoso-scroll-hook";
 import { HashtagBar } from "@cocalc/frontend/editors/task-editor/hashtag-bar";
-import { webapp_client } from "@cocalc/frontend/webapp-client";
 import {
   cmp,
   hoursToTimeIntervalHuman,
   parse_hashtags,
   plural,
-  search_match,
-  search_split,
 } from "@cocalc/util/misc";
 import { ChatActions, getRootMessage } from "./actions";
 import Composing from "./composing";
 import Message from "./message";
-import { ChatMessageTyped, ChatMessages, MessageHistory, Mode } from "./types";
+import type { ChatMessageTyped, ChatMessages, Mode } from "./types";
 import { getSelectedHashtagsSearch, newest_content } from "./utils";
 import { DivTempHeight } from "@cocalc/frontend/jupyter/cell-list";
+import { filterMessages } from "./filter-messages";
 
 interface Props {
   project_id: string; // used to render links more effectively
@@ -231,20 +228,11 @@ function isPrevMessageSender(
   );
 }
 
-// NOTE: I removed search including send name, since that would
-// be slower and of questionable value.
-function searchMatches(message: ChatMessageTyped, searchTerms): boolean {
-  const first = message.get("history", List()).first() as
-    | TypedMap<MessageHistory>
-    | undefined;
-  if (first == null) return false;
-  return search_match(first.get("content", ""), searchTerms);
-}
-
 function isThread(messages: ChatMessages, message: ChatMessageTyped) {
   if (message.get("reply_to") != null) {
     return true;
   }
+
   // TODO/WARNING!!! This is a linear search
   // through all messages to decide if a message is the root of a thread.
   // This is VERY BAD and must to be redone at some point, since we call isThread
@@ -253,9 +241,8 @@ function isThread(messages: ChatMessages, message: ChatMessageTyped) {
   // use a proper data structure (or even a cache) to track this once
   // and for all.  It's more complicated but everything needs to be at
   // most O(n).
-  return messages.some(
-    (m) => m.get("reply_to") === message.get("date").toISOString(),
-  );
+  const s = message.get("date").toISOString();
+  return messages.some((m) => m.get("reply_to") === s);
 }
 
 function isFolded(
@@ -282,21 +269,11 @@ export function getSortedDates(
 ): { dates: string[]; numFolded: number } {
   let numFolded = 0;
   let m = messages;
-  if (m == null) return { dates: [], numFolded: 0 };
-
-  if (search) {
-    const searchTerms = search_split(search);
-    m = m.filter((message) => searchMatches(message, searchTerms));
+  if (m == null) {
+    return { dates: [], numFolded: 0 };
   }
 
-  if (typeof filterRecentH === "number" && filterRecentH > 0) {
-    const now = webapp_client.server_time().getTime();
-    const cutoff = now - filterRecentH * 1000 * 60 * 60;
-    m = m.filter((msg) => {
-      const date = msg.get("date").getTime();
-      return date >= cutoff;
-    });
-  }
+  m = filterMessages({ messages: m, filter: search, filterRecentH });
 
   const v: [date: number, reply_to: number | undefined][] = [];
   for (const [date, message] of m) {
@@ -383,7 +360,7 @@ function NotShowing({ num, search, filterRecentH }: NotShowingProps) {
       key="not_showing"
       message={
         <b>
-          WARNING: Hiding {num} {plural(num, "message")}
+          WARNING: Hiding {num} {plural(num, "messages")}
           {search.trim()
             ? ` that ${
                 num != 1 ? "do" : "does"
@@ -406,7 +383,6 @@ export function MessageList({
   account_id,
   virtuosoRef,
   sortedDates,
-  search,
   user_map,
   project_id,
   path,
@@ -461,10 +437,7 @@ export function MessageList({
         }
 
         const is_thread = isThread(messages, message);
-        // if we search for a message, we treat all threads as unfolded
-        const force_unfold = !!search;
-        const is_folded =
-          !force_unfold && isFolded(messages, message, account_id);
+        const is_folded = isFolded(messages, message, account_id);
         const is_thread_body = message.get("reply_to") != null;
         const h = virtuosoHeightsRef.current[index];
 
@@ -484,7 +457,6 @@ export function MessageList({
                 actions={actions}
                 is_thread={is_thread}
                 is_folded={is_folded}
-                force_unfold={force_unfold}
                 is_thread_body={is_thread_body}
                 is_prev_sender={isPrevMessageSender(
                   index,