Merge pull request #8 from FireBird-Technologies/feature/report

refactor: improve chat sorting logic in NotebookView component for be…

backend/app/support/corpus.py

@@ -73,16 +73,20 @@ def _plans_doc() -> Doc:
         if p.price_monthly_usd:
             monthly, yearly = annual_prices(p)
             price += f", or ${monthly:g} a month billed yearly (${yearly:g} a year)"
-        kits = "unlimited" if p.launch_kits < 0 else str(p.launch_kits)
-        reports = "unlimited" if p.reports < 0 else str(p.reports)
-        infographics = "unlimited" if p.infographics < 0 else str(p.infographics)
+        per = "in total, never renewing," if p.lifetime else "a month"
+
+        def count(n: int) -> str:
+            return "unlimited" if n < 0 else str(n)
+
+        audio = f"{count(p.audio_overviews)} audio overviews in total, any length" if p.audio_overviews >= 0 \
+            else f"{p.audio_minutes} minutes of audio a month"
         lines += [
             f"## {p.name}",
             f"{p.tagline}. Price: {price}.",
-            f"Limits: {p.sources} sources, {p.indexed_posts} indexed posts, "
-            f"{p.audio_minutes} minutes of audio a month, "
-            f"{p.videos} videos {'a month' if p.videos_monthly else 'in total'}, {kits} Launch Kits a month, "
-            f"{reports} reports a month, {infographics} infographics a month. "
+            f"Limits: {p.sources} sources, {p.indexed_posts} indexed posts across every source, {audio}, "
+            f"{p.videos} videos {'a month' if p.videos_monthly else 'in total, never renewing'}, "
+            f"{count(p.launch_kits)} Launch Kits {per}, {count(p.infographics)} infographics {per}, "
+            f"{count(p.reports)} reports a month. "
             f"Voice cloning: {'yes' if p.voice_cloning else 'no'}.",
             "Includes: " + "; ".join(p.features) + ".",
         ]

backend/app/support/scope.py

@@ -46,6 +46,10 @@ _ABOUT_MY_DATA = re.compile(
     | \b(?:recap|remind\s+me|repeat)\b[^.?!]{{0,40}}\b(?:chat|conversation|discussion|said|discussed)\b
     """
 )
+# A question about what the plans include ("How many Launch Kits do I get on each plan?") is product help, not about the
+# writer's own content, unless it also asks what they have made or hold.
+_PLAN_WORDS = re.compile(r"(?i)\b(?:plans?|tiers?|pricing|prices?|free|writer|studio|allowance|limits?|upgrade|subscription)\b")
+_OWN_STATE = re.compile(r"(?i)\b(?:i\s+have|have\s+i|did\s+i|i\s+(?:wrote|made|created|used|posted|published))\b")
 # Words that mean something went wrong with their work; the reply also offers the human form.
 _BROKEN = re.compile(
     r"(?i)\b(?:fail\w*|slow|forever|too\s+long|taking\s+(?:so\s+|way\s+)?long|hang\w*"
@@ -65,6 +69,8 @@ def about_user_data(message: str) -> bool:
     text = message.strip()
     if _HOWTO.match(text) and not re.search(r"(?i)\b(?:i|we)\s+(?:wrote|said|posted|published)\b", text):
         return False
+    if _PLAN_WORDS.search(text) and not _OWN_STATE.search(text) and not re.search(rf"(?i)\bmy\s+(?:[\w'-]+\s+){{0,3}}{_MINE}\b", text):
+        return False
     return bool(_ABOUT_MY_DATA.search(text))
 
 

frontend/src/pages/NotebookView.tsx

@@ -42,8 +42,9 @@ function groupChats(chats: ChatSummary[]): { label: string; items: ChatSummary[]
   const startOfDay = (d: Date) => new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
   const today = startOfDay(new Date());
   const groups: { label: string; items: ChatSummary[] }[] = [];
-  [...chats].sort((a, b) => +new Date(b.updated_at) - +new Date(a.updated_at)).forEach((c) => {
-    const when = new Date(c.updated_at);
+  const stamp = (c: ChatSummary) => (c.updated_at ? new Date(c.updated_at) : new Date()); // a chat with no time yet is brand new
+  [...chats].sort((a, b) => +stamp(b) - +stamp(a)).forEach((c) => {
+    const when = stamp(c);
     const days = Math.round((today - startOfDay(when)) / 86400000);
     const label = days <= 0 ? "Today" : days === 1 ? "Yesterday" : days <= 7 ? "Previous 7 days" : days <= 30 ? "Previous 30 days"
       : when.toLocaleDateString(undefined, { month: "long", year: "numeric" });