Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fix: Artifacts Type Error, Tool Token Counts, and Agent Chat Import #5142

Merged
merged 3 commits into from
Dec 30, 2024
Merged

🐛 fix: Artifacts Type Error, Tool Token Counts, and Agent Chat Import #5142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cb5645
fix: message import functionality to support content field
danny-avila Dec 30, 2024
a629059
fix: handle tool calls token counts in context window management
danny-avila Dec 30, 2024
4552711
fix: handle potential undefined size in FilePreview component
danny-avila Dec 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions api/app/clients/BaseClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -931,6 +931,24 @@ class BaseClient {
continue;
}

if (item.type === 'tool_call' && item.tool_call != null) {
const toolName = item.tool_call?.name || '';
if (toolName != null && toolName && typeof toolName === 'string') {
numTokens += this.getTokenCount(toolName);
}

const args = item.tool_call?.args || '';
if (args != null && args && typeof args === 'string') {
numTokens += this.getTokenCount(args);
}

const output = item.tool_call?.output || '';
if (output != null && output && typeof output === 'string') {
numTokens += this.getTokenCount(output);
}
continue;
}

const nestedValue = item[item.type];

if (!nestedValue) {
Expand Down
4 changes: 3 additions & 1 deletion api/server/utils/import/importers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,21 +113,23 @@ async function importLibreChatConvo(
*/
const traverseMessages = async (messages, parentMessageId = null) => {
for (const message of messages) {
if (!message.text) {
if (!message.text && !message.content) {
continue;
}

let savedMessage;
if (message.sender?.toLowerCase() === 'user' || message.isCreatedByUser) {
savedMessage = await importBatchBuilder.saveMessage({
text: message.text,
content: message.content,
sender: 'user',
isCreatedByUser: true,
parentMessageId: parentMessageId,
});
} else {
savedMessage = await importBatchBuilder.saveMessage({
text: message.text,
content: message.content,
sender: message.sender,
isCreatedByUser: false,
model: options.model,
Expand Down
6 changes: 5 additions & 1 deletion client/src/components/Chat/Input/Files/FilePreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ const FilePreview = ({
}) => {
const radius = 55; // Radius of the SVG circle
const circumference = 2 * Math.PI * radius;
const progress = useProgress(file?.['progress'] ?? 1, 0.001, (file as ExtendedFile).size ?? 1);
const progress = useProgress(
file?.['progress'] ?? 1,
0.001,
(file as ExtendedFile | undefined)?.size ?? 1,
);

// Calculate the offset based on the loading progress
const offset = circumference - progress * circumference;
Expand Down
Loading