Merge branch 'enricoros:main' into main

Author: joriskalz

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,29 +5,28 @@ labels: [ 'type: bug' ]
 body:
   - type: markdown
     attributes:
-      value: |
-        Thank you for reporting a bug. Please fill out the information below to help us resolve the issue more quickly.
+      value: Thank you for reporting a bug.
   - type: textarea
     attributes:
-      label: Device and Browser Information
-      description: '(required) Please specify your Mobile/Desktop device, OS version, browser.'
-      placeholder: 'Device: (e.g., iPhone 16, Pixel 9, PC, Macbook...), OS: (e.g., iOS 17, Windows 12), Browser: (e.g., Chrome 119, Safari 18, Firefox..)'
+      label: Description
+      description: (required) Please provide a clear description. Please also provide the steps to reproduce.
+      placeholder: 'Concise description + steps to reproduce.'
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Describe the bug
-      description: (required) Please provide a clear and concise description of what the bug is. Please also provide the steps to reproduce the behavior. If you can't provide steps, describe what you were doing when the issue occurred.
-      placeholder: 'Concise description + steps to reproduce.'
+      label: Device and browser
+      description: '(required) Please specify your Mobile/Desktop device, OS version, browser.'
+      placeholder: 'Device: (e.g., iPhone 16, Pixel 9, PC, Macbook...), OS: (e.g., iOS 17, Windows 12), Browser: (e.g., Chrome 119, Safari 18, Firefox..)'
     validations:
       required: true
   - type: textarea
     attributes:
-      label: Screenshots and Additional Context
+      label: Screenshots and more
       placeholder: 'Attach screenshots, or add any additional context here.'
   - type: checkboxes
     attributes:
       label: Willingness to Contribute
-      description: We appreciate contributions. Would you be willing to submit a pull request with a fix for this issue?
+      description: We appreciate contributions - would you be willing to submit a pull request?
       options:
         - label: '🙋‍♂️ Yes, I would like to contribute a fix.'

.github/ISSUE_TEMPLATE/maintainers-release.md

@@ -23,15 +23,15 @@ assignees: enricoros
   - [ ] Update the release version in package.json, and `npm i`
   - [ ] Update in-app News [src/apps/news/news.data.tsx](/src/apps/news/news.data.tsx)
   - [ ] Update the in-app News version number
-  - [ ] Update the readme with the new release
+  - [ ] Update the README.md with the new release
   - [ ] Copy the highlights to the [docs/changelog.md](/docs/changelog.md)
 - Release:
-  - [ ] merge onto main
+  - [ ] merge onto main `git checkout main && git merge --no-ff release-1.2.3`
+  - [ ] re-tag `git tag -f v1.2.3 && git push opensource --tags -f'
   - [ ] verify deployment on Vercel
   - [ ] verify container on GitHub Packages
-  - create a GitHub release
-    - [ ] name it 'vX.Y.Z'
-    - [ ] copy the release notes and link appropriate artifacts
+  - [ ] update the GitHub release
+  - [ ] push as stable `git push opensource main:main-stable`
 - Announce:
   - [ ] Discord announcement
   - [ ] Twitter announcement
@@ -71,7 +71,7 @@ The following are the new developments for 1.2.3:
 - paste the link to the milestone (closed) and each individual issue (content will be downloaded)
 - paste the git changelog  `git log v1.1.0..v1.2.3 | clip`
 
-### news.data.TSX
+### news.data.tsx
 
 ```markdown
 I need the following from you:
@@ -82,6 +82,13 @@ I need the following from you:
 4. I want you then to update the news.data.tsx for the new release
 ```
 
+### Readme (and Changelog)
+
+```markdown
+I need you to update the README.md and the with the new release.
+Attaching the in-app news, with my language for you to improve on, but keep the tone.
+```
+
 ### GitHub release
 
 ```markdown
@@ -96,5 +103,6 @@ some stats (# of commits, etc.), and roll it for the new release.
 ### Discord announcement
 
 ```markdown
-Can you generate my 1.2.3 big-AGI discord announcement from the GitHub Release announcement, and the in-app News?
+Can you generate my 1.2.3 big-AGI discord announcement from the GitHub Release announcement?
+Please keep the formatting and stye of the discord announcement for 1.1.0, but with the new messaging above.
 ```

README.md

@@ -21,6 +21,15 @@ shows the current developments and future ideas.
 - Got a suggestion? [_Add your roadmap ideas_](https://github.com/enricoros/big-agi/issues/new?&template=roadmap-request.md)
 - Want to contribute? [_Pick up a task!_](https://github.com/users/enricoros/projects/4/views/4) - _easy_ to _pro_
 
+### What's New in 1.10.0 · Jan 6, 2024 · The Year of AGI
+
+- **New UI**: for both desktop and mobile, sets the stage for future scale. [#201](https://github.com/enricoros/big-AGI/issues/201)
+- **Conversation Folders**: enhanced conversation organization. [#321](https://github.com/enricoros/big-AGI/issues/321)
+- **[LM Studio](https://lmstudio.ai/)** support and improved token management
+- Resizable panes in split-screen conversations.
+- Large performance optimizations
+- Developer enhancements: new UI framework, updated documentation for proxy settings on browserless/docker
+
 ### What's New in 1.9.0 · Dec 28, 2023 · Creative Horizons
 
 - **DALL·E 3 integration** for enhanced image generation. [#212](https://github.com/enricoros/big-AGI/issues/212)

docs/changelog.md

@@ -5,11 +5,20 @@ by release.
 
 - For the live roadmap, please see [the GitHub project](https://github.com/users/enricoros/projects/4/views/2)
 
-### 1.10.0 - Jan 2024
+### 1.11.0 - Jan 2024
 
-- milestone: [1.10.0](https://github.com/enricoros/big-agi/milestone/10)
+- milestone: [1.11.0](https://github.com/enricoros/big-agi/milestone/11)
 - work in progress: [big-AGI open roadmap](https://github.com/users/enricoros/projects/4/views/2), [help here](https://github.com/users/enricoros/projects/4/views/4)
 
+### What's New in 1.10.0 · Jan 6, 2024 · The Year of AGI
+
+- **New UI**: for both desktop and mobile, sets the stage for future scale. [#201](https://github.com/enricoros/big-AGI/issues/201)
+- **Conversation Folders**: enhanced conversation organization. [#321](https://github.com/enricoros/big-AGI/issues/321)
+- **[LM Studio](https://lmstudio.ai/)** support and improved token management
+- Resizable panes in split-screen conversations.
+- Large performance optimizations
+- Developer enhancements: new UI framework, updated documentation for proxy settings on browserless/docker
+
 ### What's New in 1.9.0 · Dec 28, 2023 · Creative Horizons
 
 - **DALL·E 3 integration** for enhanced image generation. [#212](https://github.com/enricoros/big-AGI/issues/212)

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "big-agi",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "private": true,
   "scripts": {
     "dev": "next dev",
@@ -30,6 +30,7 @@
     "@trpc/react-query": "10.44.1",
     "@trpc/server": "10.44.1",
     "@vercel/analytics": "^1.1.1",
+    "@vercel/speed-insights": "^1.0.2",
     "browser-fs-access": "^0.35.0",
     "eventsource-parser": "^1.1.1",
     "idb-keyval": "^6.2.1",

package.json

@@ -2,6 +2,8 @@ import * as React from 'react';
 import Head from 'next/head';
 import { MyAppProps } from 'next/app';
 import { Analytics as VercelAnalytics } from '@vercel/analytics/react';
+import { SpeedInsights as VercelSpeedInsights } from '@vercel/speed-insights/next';
+
 
 import { Brand } from '~/common/app.config';
 import { apiQuery } from '~/common/util/trpc.client';
@@ -43,6 +45,7 @@ const MyApp = ({ Component, emotionCache, pageProps }: MyAppProps) =>
     </ProviderTheming>
 
     <VercelAnalytics debug={false} />
+    <VercelSpeedInsights debug={false} />
 
   </>;
 

pages/_app.tsx

@@ -392,6 +392,7 @@ export function AppChat() {
         disableNewButton={isFocusedChatEmpty}
         onConversationActivate={setFocusedConversationId}
         onConversationDelete={handleConversationDelete}
+        onConversationExportDialog={handleConversationExport}
         onConversationImportDialog={handleConversationImportDialog}
         onConversationNew={handleConversationNew}
         onConversationsDeleteAll={handleConversationsDeleteAll}

src/apps/chat/AppChat.tsx

@@ -4,13 +4,13 @@ import { shallow } from 'zustand/shallow';
 import { Box, IconButton, ListDivider, ListItemDecorator, MenuItem, Tooltip, Input, InputProps } from '@mui/joy';
 import AddIcon from '@mui/icons-material/Add';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
+import FileDownloadIcon from '@mui/icons-material/FileDownload';
 import FileUploadIcon from '@mui/icons-material/FileUpload';
 import FolderOpenOutlinedIcon from '@mui/icons-material/FolderOpenOutlined';
 import FolderOutlinedIcon from '@mui/icons-material/FolderOutlined';
 import SearchIcon from '@mui/icons-material/Search';
 
 import { DFolder, useFoldersToggle, useFolderStore } from '~/common/state/store-folders';
-import { OpenAIIcon } from '~/common/components/icons/OpenAIIcon';
 import { PageDrawerHeader } from '~/common/layout/optima/components/PageDrawerHeader';
 import { PageDrawerList, PageDrawerTallItemSx } from '~/common/layout/optima/components/PageDrawerList';
 import { conversationTitle, DConversationId, useChatStore } from '~/common/state/store-chats';
@@ -54,6 +54,7 @@ export const useChatNavigationItems = (activeConversationId: DConversationId | n
     return selectConversations.map(_c => ({
       conversationId: _c.id,
       isActive: _c.id === activeConversationId,
+      isEmpty: !_c.messages.length && !_c.userTitle,
       title: conversationTitle(_c, 'New Title'),
       messageCount: _c.messages.length,
       assistantTyping: !!_c.abortController,
@@ -111,6 +112,7 @@ function ChatDrawerItems(props: {
   disableNewButton: boolean,
   onConversationActivate: (conversationId: DConversationId) => void,
   onConversationDelete: (conversationId: DConversationId, bypassConfirmation: boolean) => void,
+  onConversationExportDialog: (conversationId: DConversationId | null) => void,
   onConversationImportDialog: () => void,
   onConversationNew: () => void,
   onConversationsDeleteAll: () => void,
@@ -134,7 +136,7 @@ function ChatDrawerItems(props: {
   // derived state
   const maxChatMessages = chatNavItems.reduce((longest, _c) => Math.max(longest, _c.messageCount), 1);
   const selectConversationsCount = chatNavItems.length;
-  const hasChats = selectConversationsCount > 0;
+  const nonEmptyChats = selectConversationsCount > 1 || (selectConversationsCount === 1 && !chatNavItems[0].isEmpty);
   const singleChat = selectConversationsCount === 1;
   const softMaxReached = selectConversationsCount >= 50;
 
@@ -292,15 +294,23 @@ function ChatDrawerItems(props: {
 
       <ListDivider sx={{ mt: 0 }} />
 
-      <MenuItem onClick={props.onConversationImportDialog}>
-        <ListItemDecorator>
-          <FileUploadIcon />
-        </ListItemDecorator>
-        Import chats
-        <OpenAIIcon sx={{ fontSize: 'xl', ml: 'auto' }} />
-      </MenuItem>
+      <Box sx={{ display: 'flex', alignItems: 'center' }}>
+
+        <MenuItem onClick={props.onConversationImportDialog} sx={{ flex: 1 }}>
+          <ListItemDecorator>
+            <FileUploadIcon />
+          </ListItemDecorator>
+          Import
+          {/*<OpenAIIcon sx={{  ml: 'auto' }} />*/}
+        </MenuItem>
+
+        <MenuItem disabled={!nonEmptyChats} onClick={() => props.onConversationExportDialog(props.activeConversationId)} sx={{ flex: 1, display: 'flex', justifyContent: 'flex-end', gap: 2.5 }}>
+          Export
+          <FileDownloadIcon />
+        </MenuItem>
+      </Box>
 
-      <MenuItem disabled={!hasChats} onClick={props.onConversationsDeleteAll}>
+      <MenuItem disabled={!nonEmptyChats} onClick={props.onConversationsDeleteAll}>
         <ListItemDecorator>
           <DeleteOutlineIcon />
         </ListItemDecorator>

src/apps/chat/components/applayout/ChatDrawerItems.tsx

@@ -1,6 +1,6 @@
 import * as React from 'react';
 
-import { Avatar, Box, IconButton, ListItem, ListItemDecorator, Typography } from '@mui/joy';
+import { Avatar, Box, IconButton, ListItemButton, ListItemDecorator, Typography } from '@mui/joy';
 import { SxProps } from '@mui/joy/styles/types';
 import CloseIcon from '@mui/icons-material/Close';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
@@ -20,6 +20,7 @@ export const ChatDrawerItemMemo = React.memo(ChatNavigationItem);
 export interface ChatNavigationItemData {
   conversationId: DConversationId;
   isActive: boolean;
+  isEmpty: boolean;
   title: string;
   messageCount: number;
   assistantTyping: boolean;
@@ -90,8 +91,8 @@ function ChatNavigationItem(props: {
   const progress = props.maxChatMessages ? 100 * messageCount / props.maxChatMessages : 0;
 
   return (
-    <ListItem
-      variant={isActive ? 'solid' : 'plain'} color='neutral'
+    <ListItemButton
+      variant={isActive ? 'soft' : 'plain'} color='neutral'
       onClick={handleConversationActivate}
       sx={{
         // py: 0,
@@ -166,8 +167,10 @@ function ChatNavigationItem(props: {
       {!props.isLonely && !deleteArmed && (
         <IconButton
           variant={isActive ? 'solid' : 'outlined'}
-          size='sm' sx={{ opacity: { xs: 1, sm: 0 }, transition: 'opacity 0.3s', ...buttonSx }}
-          onClick={handleDeleteButtonShow}>
+          size='sm'
+          sx={{ opacity: { xs: 1, sm: 0 }, transition: 'opacity 0.2s', ...buttonSx }}
+          onClick={handleDeleteButtonShow}
+        >
           <DeleteOutlineIcon />
         </IconButton>
       )}
@@ -182,6 +185,6 @@ function ChatNavigationItem(props: {
         </IconButton>
       </>}
 
-    </ListItem>
+    </ListItemButton>
   );
 }