diff --git a/frontend/src/Navigation.tsx b/frontend/src/Navigation.tsx
index 052a9643..ca12df54 100644
--- a/frontend/src/Navigation.tsx
+++ b/frontend/src/Navigation.tsx
@@ -2,15 +2,15 @@ import { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
import { NavLink, useNavigate } from 'react-router-dom';
-
import conversationService from './api/services/conversationService';
import userService from './api/services/userService';
import Add from './assets/add.svg';
+import openNewChat from './assets/openNewChat.svg';
+import Hamburger from './assets/hamburger.svg';
import DocsGPT3 from './assets/cute_docsgpt3.svg';
import Discord from './assets/discord.svg';
import Expand from './assets/expand.svg';
import Github from './assets/github.svg';
-import Hamburger from './assets/hamburger.svg';
import Info from './assets/info.svg';
import SettingGear from './assets/settingGear.svg';
import Twitter from './assets/TwitterX.svg';
@@ -40,7 +40,11 @@ import {
setSelectedDocs,
setSourceDocs,
} from './preferences/preferenceSlice';
+import { selectQueries } from './conversation/conversationSlice';
import Upload from './upload/Upload';
+import ShareButton from './components/ShareButton';
+import Help from './components/Help';
+
interface NavigationProps {
navOpen: boolean;
@@ -63,6 +67,7 @@ NavImage.propTypes = {
}; */
export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
const dispatch = useDispatch();
+ const queries = useSelector(selectQueries);
const docs = useSelector(selectSourceDocs);
const selectedDocs = useSelector(selectSelectedDocs);
const conversations = useSelector(selectConversations);
@@ -73,7 +78,6 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
const [isDarkTheme] = useDarkTheme();
const [isDocsListOpen, setIsDocsListOpen] = useState(false);
const { t } = useTranslation();
-
const isApiKeySet = useSelector(selectApiKeyStatus);
const [apiKeyModalState, setApiKeyModalState] =
useState('INACTIVE');
@@ -93,6 +97,9 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
if (!conversations) {
fetchConversations();
}
+ if (queries.length === 0) {
+ resetConversation();
+ }
}, [conversations, dispatch]);
async function fetchConversations() {
@@ -164,7 +171,11 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
}),
);
};
-
+ const newChat = () => {
+ if (queries && queries?.length > 0) {
+ resetConversation();
+ }
+ };
async function updateConversationName(updatedConversation: {
name: string;
id: string;
@@ -200,26 +211,45 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
return (
<>
{!navOpen && (
-
+
+
)}
+
+ {queries?.length > 0 && (
+
+ )}
+
+
+ DocsGPT
+
+
-
+
{conversations && conversations.length > 0 ? (
-
diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index fb819922..a8326da7 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -1,22 +1,24 @@
import { Fragment, useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';
-
+import newChatIcon from '../assets/openNewChat.svg';
import ArrowDown from '../assets/arrow-down.svg';
import Send from '../assets/send.svg';
import SendDark from '../assets/send_dark.svg';
-import ShareIcon from '../assets/share.svg';
import SpinnerDark from '../assets/spinner-dark.svg';
import Spinner from '../assets/spinner.svg';
import RetryIcon from '../components/RetryIcon';
+import { useNavigate } from 'react-router-dom';
import Hero from '../Hero';
import { useDarkTheme, useMediaQuery } from '../hooks';
import { ShareConversationModal } from '../modals/ShareConversationModal';
+import { setConversation, updateConversationId } from './conversationSlice';
import { selectConversationId } from '../preferences/preferenceSlice';
import { AppDispatch } from '../store';
import ConversationBubble from './ConversationBubble';
import { handleSendFeedback } from './conversationHandlers';
import { FEEDBACK, Query } from './conversationModels';
+import ShareIcon from '../assets/share.svg';
import {
addQuery,
fetchAnswer,
@@ -27,6 +29,7 @@ import {
export default function Conversation() {
const queries = useSelector(selectQueries);
+ const navigate = useNavigate();
const status = useSelector(selectStatus);
const conversationId = useSelector(selectConversationId);
const dispatch = useDispatch();
@@ -46,6 +49,9 @@ export default function Conversation() {
};
useEffect(() => {
!eventInterrupt && scrollIntoView();
+ if (queries.length == 0) {
+ resetConversation();
+ }
}, [queries.length, queries[queries.length - 1]]);
useEffect(() => {
@@ -120,6 +126,17 @@ export default function Conversation() {
handleInput();
}
};
+ const resetConversation = () => {
+ dispatch(setConversation([]));
+ dispatch(
+ updateConversationId({
+ query: { conversationId: null },
+ }),
+ );
+ };
+ const newChat = () => {
+ if (queries && queries.length > 0) resetConversation();
+ };
const prepResponseView = (query: Query, index: number) => {
let responseView;
@@ -197,23 +214,41 @@ export default function Conversation() {
};
}, []);
return (
-
@@ -304,7 +337,6 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
<>
)}
-
@@ -359,83 +391,69 @@ export default function Navigation({ navOpen, setNavOpen }: NavigationProps) {
-
- {
- if (isMobile) {
- setNavOpen(!navOpen);
- }
- resetConversation();
- }}
- to="/about"
- className={({ isActive }) =>
- `my-auto mx-4 flex h-9 cursor-pointer gap-4 rounded-3xl hover:bg-gray-100 dark:hover:bg-[#28292E] ${
- isActive ? 'bg-gray-3000 dark:bg-[#28292E]' : ''
- }`
- }
- >
- 
-
-
{t('about')}
-
-
- 
-
-
- 
-
-
- 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
DocsGPT
+
- {conversationId && (
- <>
+
+ {conversationId && queries.length > 0 && (
+ | null>(null);
- const [tokenUsageData, setTokenUsageData] = React.useState | null>(null);
- const [feedbackData, setFeedbackData] = React.useState | null>(null);
- const [chatbots, setChatbots] = React.useState([]);
- const [selectedChatbot, setSelectedChatbot] =
- React.useState();
- const [messagesFilter, setMessagesFilter] = React.useState<{
+ const [chatbots, setChatbots] = useState([]);
+ const [selectedChatbot, setSelectedChatbot] = useState();
+ const [messagesFilter, setMessagesFilter] = useState<{
label: string;
value: string;
}>({ label: '30 Days', value: 'last_30_days' });
- const [tokenUsageFilter, setTokenUsageFilter] = React.useState<{
+ const [tokenUsageFilter, setTokenUsageFilter] = useState<{
label: string;
value: string;
}>({ label: '30 Days', value: 'last_30_days' });
- const [feedbackFilter, setFeedbackFilter] = React.useState<{
+ const [feedbackFilter, setFeedbackFilter] = useState<{
label: string;
value: string;
}>({ label: '30 Days', value: 'last_30_days' });
+ const [loadingMessages, setLoadingMessages] = useState(true);
+ const [loadingTokens, setLoadingTokens] = useState(true);
+ const [loadingFeedback, setLoadingFeedback] = useState(true);
+
const fetchChatbots = async () => {
try {
const response = await userService.getAPIKeys();
@@ -80,6 +82,7 @@ export default function Analytics() {
};
const fetchMessagesData = async (chatbot_id?: string, filter?: string) => {
+ setLoadingMessages(true);
try {
const response = await userService.getMessageAnalytics({
api_key_id: chatbot_id,
@@ -92,10 +95,13 @@ export default function Analytics() {
setMessagesData(data.messages);
} catch (error) {
console.error(error);
+ } finally {
+ setLoadingMessages(false);
}
};
const fetchTokenData = async (chatbot_id?: string, filter?: string) => {
+ setLoadingTokens(true);
try {
const response = await userService.getTokenAnalytics({
api_key_id: chatbot_id,
@@ -108,10 +114,13 @@ export default function Analytics() {
setTokenUsageData(data.token_usage);
} catch (error) {
console.error(error);
+ } finally {
+ setLoadingTokens(false);
}
};
const fetchFeedbackData = async (chatbot_id?: string, filter?: string) => {
+ setLoadingFeedback(true);
try {
const response = await userService.getFeedbackAnalytics({
api_key_id: chatbot_id,
@@ -124,30 +133,33 @@ export default function Analytics() {
setFeedbackData(data.feedback);
} catch (error) {
console.error(error);
+ } finally {
+ setLoadingFeedback(false);
}
};
- React.useEffect(() => {
+ useEffect(() => {
fetchChatbots();
}, []);
- React.useEffect(() => {
+ useEffect(() => {
const id = selectedChatbot?.id;
const filter = messagesFilter;
fetchMessagesData(id, filter?.value);
}, [selectedChatbot, messagesFilter]);
- React.useEffect(() => {
+ useEffect(() => {
const id = selectedChatbot?.id;
const filter = tokenUsageFilter;
fetchTokenData(id, filter?.value);
}, [selectedChatbot, tokenUsageFilter]);
- React.useEffect(() => {
+ useEffect(() => {
const id = selectedChatbot?.id;
const filter = feedbackFilter;
fetchFeedbackData(id, filter?.value);
}, [selectedChatbot, feedbackFilter]);
+
return (
{' '}
-
+ {
@@ -222,7 +257,7 @@ export default function Conversation() {
conversationId={conversationId}
/>
)}
-
+
)}
+ {isMobile && queries.length > 0 && (
+
+ )}
+
+
+
{isShareModalOpen && (
{
+ event.preventDefault();
+ }, []);
+
+ useEffect(() => {
+ const conversationsMainDiv = document.getElementById(
+ 'conversationsMainDiv',
+ );
+
+ if (conversationsMainDiv) {
+ if (isOpen) {
+ conversationsMainDiv.addEventListener('wheel', preventScroll, {
+ passive: false,
+ });
+ conversationsMainDiv.addEventListener('touchmove', preventScroll, {
+ passive: false,
+ });
+ } else {
+ conversationsMainDiv.removeEventListener('wheel', preventScroll);
+ conversationsMainDiv.removeEventListener('touchmove', preventScroll);
+ }
+
+ return () => {
+ conversationsMainDiv.removeEventListener('wheel', preventScroll);
+ conversationsMainDiv.removeEventListener('touchmove', preventScroll);
+ };
+ }
+ }, [isOpen]);
+
function onClear() {
setConversationsName(conversation.name);
setIsEdit(false);
@@ -147,7 +183,7 @@ export default function ConversationTile({
diff --git a/frontend/src/settings/Analytics.tsx b/frontend/src/settings/Analytics.tsx
index 5ddab2cb..8baad361 100644
--- a/frontend/src/settings/Analytics.tsx
+++ b/frontend/src/settings/Analytics.tsx
@@ -1,3 +1,4 @@
+import React, { useState, useEffect } from 'react';
import {
BarElement,
CategoryScale,
@@ -7,7 +8,6 @@ import {
Title,
Tooltip,
} from 'chart.js';
-import React from 'react';
import { Bar } from 'react-chartjs-2';
import userService from '../api/services/userService';
@@ -17,6 +17,8 @@ import { formatDate } from '../utils/dateTimeUtils';
import { APIKeyData } from './types';
import type { ChartData } from 'chart.js';
+import SkeletonLoader from '../components/SkeletonLoader';
+
ChartJS.register(
CategoryScale,
LinearScale,
@@ -35,37 +37,37 @@ const filterOptions = [
];
export default function Analytics() {
- const [messagesData, setMessagesData] = React.useState
@@ -181,8 +193,10 @@ export default function Analytics() {
border="border"
/>
+
+ {/* Messages Analytics */}
-
-
+
-
- formatDate(item),
- ),
- datasets: [
- {
- label: 'Messages',
- data: Object.values(messagesData || {}),
- backgroundColor: '#7D54D1',
- },
- ],
- }}
- legendID="legend-container-1"
- maxTicksLimitInX={8}
- isStacked={false}
- />
+ {loadingMessages ? (
+
+ formatDate(item),
+ ),
+ datasets: [
+ {
+ label: 'Messages',
+ data: Object.values(messagesData || {}),
+ backgroundColor: '#7D54D1',
+ },
+ ],
+ }}
+ legendID="legend-container-1"
+ maxTicksLimitInX={8}
+ isStacked={false}
+ />
+ )}
- Messages @@ -208,26 +222,32 @@ export default function Analytics() { id="legend-container-1" className="flex flex-row items-center justify-end" >
+
+ {/* Token Usage Analytics */}
+
-
- formatDate(item),
- ),
- datasets: [
- {
- label: 'Tokens',
- data: Object.values(tokenUsageData || {}),
- backgroundColor: '#7D54D1',
- },
- ],
- }}
- legendID="legend-container-2"
- maxTicksLimitInX={8}
- isStacked={false}
- />
+ {loadingTokens ? (
+
+ formatDate(item),
+ ),
+ datasets: [
+ {
+ label: 'Tokens',
+ data: Object.values(tokenUsageData || {}),
+ backgroundColor: '#7D54D1',
+ },
+ ],
+ }}
+ legendID="legend-container-2"
+ maxTicksLimitInX={8}
+ isStacked={false}
+ />
+ )}
Token Usage @@ -253,31 +273,37 @@ export default function Analytics() { id="legend-container-2" className="flex flex-row items-center justify-end" >
- = ({
// State for modal: active/inactive
const [modalState, setModalState] = useState('INACTIVE'); // Initialize with inactive state
const [isOnboarding, setIsOnboarding] = useState(false); // State for onboarding flag
+ const [loading, setLoading] = useState(false);
const syncOptions = [
{ label: 'Never', value: 'never' },
@@ -52,6 +54,7 @@ const Documents: React.FC = ({
];
const handleManageSync = (doc: Doc, sync_frequency: string) => {
+ setLoading(true);
userService
.manageSync({ source_id: doc.id, sync_frequency })
.then(() => {
@@ -60,7 +63,10 @@ const Documents: React.FC = ({
.then((data) => {
dispatch(setSourceDocs(data));
})
- .catch((error) => console.error(error));
+ .catch((error) => console.error(error))
+ .finally(() => {
+ setLoading(false);
+ });
};
// Filter documents based on the search term
@@ -72,7 +78,7 @@ const Documents: React.FC = ({
+
+ {/* Feedback Analytics */}
+
diff --git a/frontend/src/settings/Documents.tsx b/frontend/src/settings/Documents.tsx
index 67cdb6d0..004b6f48 100644
--- a/frontend/src/settings/Documents.tsx
+++ b/frontend/src/settings/Documents.tsx
@@ -9,6 +9,7 @@ import Trash from '../assets/trash.svg';
import caretSort from '../assets/caret-sort.svg';
import DropdownMenu from '../components/DropdownMenu';
import { Doc, DocumentsProps, ActiveState } from '../models/misc'; // Ensure ActiveState type is imported
+import SkeletonLoader from '../components/SkeletonLoader';
import { getDocs } from '../preferences/preferenceApi';
import { setSourceDocs } from '../preferences/preferenceSlice';
import Input from '../components/Input';
@@ -43,6 +44,7 @@ const Documents: React.FC
+
- formatDate(item),
- ),
- datasets: [
- {
- label: 'Positive',
- data: Object.values(feedbackData || {}).map(
- (item) => item.positive,
- ),
- backgroundColor: '#8BD154',
- },
- {
- label: 'Negative',
- data: Object.values(feedbackData || {}).map(
- (item) => item.negative,
- ),
- backgroundColor: '#D15454',
- },
- ],
- }}
- legendID="legend-container-3"
- maxTicksLimitInX={10}
- isStacked={true}
- />
+ {loadingFeedback ? (
+
+ formatDate(item),
+ ),
+ datasets: [
+ {
+ label: 'Positive Feedback',
+ data: Object.values(feedbackData || {}).map(
+ (item) => item.positive,
+ ),
+ backgroundColor: '#7D54D1',
+ },
+ {
+ label: 'Negative Feedback',
+ data: Object.values(feedbackData || {}).map(
+ (item) => item.negative,
+ ),
+ backgroundColor: '#FF6384',
+ },
+ ],
+ }}
+ legendID="legend-container-3"
+ maxTicksLimitInX={8}
+ isStacked={false}
+ />
+ )}
- User Feedback + Feedback
- ();
- const firstObserver = React.useCallback((node: HTMLDivElement) => {
+ const observerRef = useRef();
+ const firstObserver = useCallback((node: HTMLDivElement) => {
if (observerRef.current) {
- observerRef.current = new IntersectionObserver((enteries) => {
- if (enteries[0].isIntersecting) setPage((prev) => prev + 1);
+ observerRef.current = new IntersectionObserver((entries) => {
+ if (entries[0].isIntersecting) setPage((prev) => prev + 1);
});
}
if (node && observerRef.current) observerRef.current.observe(node);
}, []);
+
return (
+
-
-
+
+ )}
+ {filteredDocuments &&
+ filteredDocuments.map((document, index) => (
+
+ {document.name}
+ {document.date}
+
+ {document.tokens ? formatTokens(+document.tokens) : ''}
+
+
+ {document.type === 'remote' ? 'Pre-loaded' : 'Private'}
+
+
+
+
+ ))}
+
+
+ )}
{/* Conditionally render the Upload modal based on modalState */}
{modalState === 'ACTIVE' && (
diff --git a/frontend/src/settings/Logs.tsx b/frontend/src/settings/Logs.tsx
index 58ab930d..1e248d46 100644
--- a/frontend/src/settings/Logs.tsx
+++ b/frontend/src/settings/Logs.tsx
@@ -1,20 +1,23 @@
-import React from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
import userService from '../api/services/userService';
import ChevronRight from '../assets/chevron-right.svg';
import Dropdown from '../components/Dropdown';
+import SkeletonLoader from '../components/SkeletonLoader';
import { APIKeyData, LogData } from './types';
import CoppyButton from '../components/CopyButton';
export default function Logs() {
- const [chatbots, setChatbots] = React.useState([]);
- const [selectedChatbot, setSelectedChatbot] =
- React.useState();
- const [logs, setLogs] = React.useState([]);
- const [page, setPage] = React.useState(1);
- const [hasMore, setHasMore] = React.useState(true);
+ const [chatbots, setChatbots] = useState([]);
+ const [selectedChatbot, setSelectedChatbot] = useState();
+ const [logs, setLogs] = useState([]);
+ const [page, setPage] = useState(1);
+ const [hasMore, setHasMore] = useState(true);
+ const [loadingChatbots, setLoadingChatbots] = useState(true);
+ const [loadingLogs, setLoadingLogs] = useState(true);
const fetchChatbots = async () => {
+ setLoadingChatbots(true);
try {
const response = await userService.getAPIKeys();
if (!response.ok) {
@@ -24,10 +27,13 @@ export default function Logs() {
setChatbots(chatbots);
} catch (error) {
console.error(error);
+ } finally {
+ setLoadingChatbots(false);
}
};
const fetchLogs = async () => {
+ setLoadingLogs(true);
try {
const response = await userService.getLogs({
page: page,
@@ -38,20 +44,23 @@ export default function Logs() {
throw new Error('Failed to fetch logs');
}
const olderLogs = await response.json();
- setLogs([...logs, ...olderLogs.logs]);
+ setLogs((prevLogs) => [...prevLogs, ...olderLogs.logs]);
setHasMore(olderLogs.has_more);
} catch (error) {
console.error(error);
+ } finally {
+ setLoadingLogs(false);
}
};
- React.useEffect(() => {
+ useEffect(() => {
fetchChatbots();
}, []);
- React.useEffect(() => {
+ useEffect(() => {
if (hasMore) fetchLogs();
}, [page, selectedChatbot]);
+
return (
+
);
@@ -102,15 +120,16 @@ type LogsTableProps = {
};
function LogsTable({ logs, setPage }: LogsTableProps) {
- const observerRef = React.useRef
= ({
Add New
- | {t('settings.documents.name')} | -
-
- {t('settings.documents.date')}{' '}
-
- |
-
-
- {t('settings.documents.tokenUsage')}{' '}
-
- |
-
-
- {t('settings.documents.type')}{' '}
-
- |
- - |
|---|
| - {t('settings.documents.noData')} - | +{t('settings.documents.name')} | +
+
+ {t('settings.documents.date')}
+
+ |
+
+
+ {t('settings.documents.tokenUsage')}
+
+ |
+
+
+ {t('settings.documents.type')}
+
+ |
+ |
|---|---|---|---|---|---|
| {document.name} | -{document.date} | -- {document.tokens ? formatTokens(+document.tokens) : ''} - | -- {document.type === 'remote' ? 'Pre-loaded' : 'Private'} - | -
-
- {document.type !== 'remote' && (
-
+
-
- )}
- | |
| + {t('settings.documents.noData')} |
+ {document.type !== 'remote' && (
+ 
{
+ event.stopPropagation();
+ handleDeleteDocument(index, document);
+ }}
+ />
+ )}
+ {document.syncFrequency && (
+
+
+ {
+ handleManageSync(document, value);
+ }}
+ defaultValue={document.syncFrequency}
+ icon={SyncIcon}
+ />
+
+ )}
+
@@ -59,38 +68,47 @@ export default function Logs() {
({
- label: chatbot.name,
- value: chatbot.id,
- })),
- { label: 'None', value: '' },
- ]}
- placeholder="Select chatbot"
- onSelect={(chatbot: { label: string; value: string }) => {
- setSelectedChatbot(
- chatbots.find((item) => item.id === chatbot.value),
- );
- setLogs([]);
- setPage(1);
- setHasMore(true);
- }}
- selectedValue={
- (selectedChatbot && {
- label: selectedChatbot.name,
- value: selectedChatbot.id,
- }) ||
- null
- }
- rounded="3xl"
- border="border"
- />
+ {loadingChatbots ? (
+ ({
+ label: chatbot.name,
+ value: chatbot.id,
+ })),
+ { label: 'None', value: '' },
+ ]}
+ placeholder="Select chatbot"
+ onSelect={(chatbot: { label: string; value: string }) => {
+ setSelectedChatbot(
+ chatbots.find((item) => item.id === chatbot.value),
+ );
+ setLogs([]);
+ setPage(1);
+ setHasMore(true);
+ }}
+ selectedValue={
+ (selectedChatbot && {
+ label: selectedChatbot.name,
+ value: selectedChatbot.id,
+ }) ||
+ null
+ }
+ rounded="3xl"
+ border="border"
+ />
+ )}
Filter by chatbot
-
-
diff --git a/setup.sh b/setup.sh
index 988841da..7980461b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -9,6 +9,39 @@ prompt_user() {
read -p "Enter your choice (1, 2 or 3): " choice
}
+check_and_start_docker() {
+ # Check if Docker is running
+ if ! docker info > /dev/null 2>&1; then
+ echo "Docker is not running. Starting Docker..."
+
+ # Check the operating system
+ case "$(uname -s)" in
+ Darwin)
+ open -a Docker
+ ;;
+ Linux)
+ sudo systemctl start docker
+ ;;
+ *)
+ echo "Unsupported platform. Please start Docker manually."
+ exit 1
+ ;;
+ esac
+
+ # Wait for Docker to be fully operational with animated dots
+ echo -n "Waiting for Docker to start"
+ while ! docker system info > /dev/null 2>&1; do
+ for i in {1..3}; do
+ echo -n "."
+ sleep 1
+ done
+ echo -ne "\rWaiting for Docker to start " # Reset to overwrite previous dots
+ done
+
+ echo -e "\nDocker has started!"
+ fi
+}
+
# Function to handle the choice to download the model locally
download_locally() {
echo "LLM_NAME=llama.cpp" > .env
@@ -30,6 +63,9 @@ download_locally() {
echo "Model already exists."
fi
+ # Call the function to check and start Docker if needed
+ check_and_start_docker
+
docker-compose -f docker-compose-local.yaml build && docker-compose -f docker-compose-local.yaml up -d
#python -m venv venv
#source venv/bin/activate
@@ -59,10 +95,11 @@ use_openai() {
echo "VITE_API_STREAMING=true" >> .env
echo "The .env file has been created with API_KEY set to your provided key."
+ # Call the function to check and start Docker if needed
+ check_and_start_docker
+
docker-compose build && docker-compose up -d
-
-
echo "The application will run on http://localhost:5173"
echo "You can stop the application by running the following command:"
echo "docker-compose down"
@@ -73,6 +110,9 @@ use_docsgpt() {
echo "VITE_API_STREAMING=true" >> .env
echo "The .env file has been created with API_KEY set to your provided key."
+ # Call the function to check and start Docker if needed
+ check_and_start_docker
+
docker-compose build && docker-compose up -d
echo "The application will run on http://localhost:5173"
diff --git a/tests/llm/test_anthropic.py b/tests/llm/test_anthropic.py
index ee4ba15f..689013c0 100644
--- a/tests/llm/test_anthropic.py
+++ b/tests/llm/test_anthropic.py
@@ -22,17 +22,23 @@ class TestAnthropicLLM(unittest.TestCase):
mock_response = Mock()
mock_response.completion = "test completion"
- with patch.object(self.llm.anthropic.completions, "create", return_value=mock_response) as mock_create:
- response = self.llm.gen("test_model", messages)
- self.assertEqual(response, "test completion")
+ with patch("application.cache.get_redis_instance") as mock_make_redis:
+ mock_redis_instance = mock_make_redis.return_value
+ mock_redis_instance.get.return_value = None
+ mock_redis_instance.set = Mock()
- prompt_expected = "### Context \n context \n ### Question \n question"
- mock_create.assert_called_with(
- model="test_model",
- max_tokens_to_sample=300,
- stream=False,
- prompt=f"{self.llm.HUMAN_PROMPT} {prompt_expected}{self.llm.AI_PROMPT}"
- )
+ with patch.object(self.llm.anthropic.completions, "create", return_value=mock_response) as mock_create:
+ response = self.llm.gen("test_model", messages)
+ self.assertEqual(response, "test completion")
+
+ prompt_expected = "### Context \n context \n ### Question \n question"
+ mock_create.assert_called_with(
+ model="test_model",
+ max_tokens_to_sample=300,
+ stream=False,
+ prompt=f"{self.llm.HUMAN_PROMPT} {prompt_expected}{self.llm.AI_PROMPT}"
+ )
+ mock_redis_instance.set.assert_called_once()
def test_gen_stream(self):
messages = [
@@ -41,17 +47,23 @@ class TestAnthropicLLM(unittest.TestCase):
]
mock_responses = [Mock(completion="response_1"), Mock(completion="response_2")]
- with patch.object(self.llm.anthropic.completions, "create", return_value=iter(mock_responses)) as mock_create:
- responses = list(self.llm.gen_stream("test_model", messages))
- self.assertListEqual(responses, ["response_1", "response_2"])
+ with patch("application.cache.get_redis_instance") as mock_make_redis:
+ mock_redis_instance = mock_make_redis.return_value
+ mock_redis_instance.get.return_value = None
+ mock_redis_instance.set = Mock()
- prompt_expected = "### Context \n context \n ### Question \n question"
- mock_create.assert_called_with(
- model="test_model",
- prompt=f"{self.llm.HUMAN_PROMPT} {prompt_expected}{self.llm.AI_PROMPT}",
- max_tokens_to_sample=300,
- stream=True
- )
+ with patch.object(self.llm.anthropic.completions, "create", return_value=iter(mock_responses)) as mock_create:
+ responses = list(self.llm.gen_stream("test_model", messages))
+ self.assertListEqual(responses, ["response_1", "response_2"])
+
+ prompt_expected = "### Context \n context \n ### Question \n question"
+ mock_create.assert_called_with(
+ model="test_model",
+ prompt=f"{self.llm.HUMAN_PROMPT} {prompt_expected}{self.llm.AI_PROMPT}",
+ max_tokens_to_sample=300,
+ stream=True
+ )
+ mock_redis_instance.set.assert_called_once()
if __name__ == "__main__":
unittest.main()
diff --git a/tests/llm/test_sagemaker.py b/tests/llm/test_sagemaker.py
index 0602f597..d659d498 100644
--- a/tests/llm/test_sagemaker.py
+++ b/tests/llm/test_sagemaker.py
@@ -52,28 +52,38 @@ class TestSagemakerAPILLM(unittest.TestCase):
self.response['Body'].read.return_value.decode.return_value = json.dumps(self.result)
def test_gen(self):
- with patch.object(self.sagemaker.runtime, 'invoke_endpoint',
- return_value=self.response) as mock_invoke_endpoint:
- output = self.sagemaker.gen(None, self.messages)
- mock_invoke_endpoint.assert_called_once_with(
- EndpointName=self.sagemaker.endpoint,
- ContentType='application/json',
- Body=self.body_bytes
- )
- self.assertEqual(output,
- self.result[0]['generated_text'][len(self.prompt):])
+ with patch('application.cache.get_redis_instance') as mock_make_redis:
+ mock_redis_instance = mock_make_redis.return_value
+ mock_redis_instance.get.return_value = None
+
+ with patch.object(self.sagemaker.runtime, 'invoke_endpoint',
+ return_value=self.response) as mock_invoke_endpoint:
+ output = self.sagemaker.gen(None, self.messages)
+ mock_invoke_endpoint.assert_called_once_with(
+ EndpointName=self.sagemaker.endpoint,
+ ContentType='application/json',
+ Body=self.body_bytes
+ )
+ self.assertEqual(output,
+ self.result[0]['generated_text'][len(self.prompt):])
+ mock_make_redis.assert_called_once()
+ mock_redis_instance.set.assert_called_once()
def test_gen_stream(self):
- with patch.object(self.sagemaker.runtime, 'invoke_endpoint_with_response_stream',
- return_value=self.response) as mock_invoke_endpoint:
- output = list(self.sagemaker.gen_stream(None, self.messages))
- mock_invoke_endpoint.assert_called_once_with(
- EndpointName=self.sagemaker.endpoint,
- ContentType='application/json',
- Body=self.body_bytes_stream
- )
- self.assertEqual(output, [])
-
+ with patch('application.cache.get_redis_instance') as mock_make_redis:
+ mock_redis_instance = mock_make_redis.return_value
+ mock_redis_instance.get.return_value = None
+
+ with patch.object(self.sagemaker.runtime, 'invoke_endpoint_with_response_stream',
+ return_value=self.response) as mock_invoke_endpoint:
+ output = list(self.sagemaker.gen_stream(None, self.messages))
+ mock_invoke_endpoint.assert_called_once_with(
+ EndpointName=self.sagemaker.endpoint,
+ ContentType='application/json',
+ Body=self.body_bytes_stream
+ )
+ self.assertEqual(output, [])
+ mock_redis_instance.set.assert_called_once()
class TestLineIterator(unittest.TestCase):
def setUp(self):
diff --git a/tests/test_cache.py b/tests/test_cache.py
new file mode 100644
index 00000000..4270a181
--- /dev/null
+++ b/tests/test_cache.py
@@ -0,0 +1,131 @@
+import unittest
+import json
+from unittest.mock import patch, MagicMock
+from application.cache import gen_cache_key, stream_cache, gen_cache
+from application.utils import get_hash
+
+
+# Test for gen_cache_key function
+def test_make_gen_cache_key():
+ messages = [
+ {'role': 'user', 'content': 'test_user_message'},
+ {'role': 'system', 'content': 'test_system_message'},
+ ]
+ model = "test_docgpt"
+
+ # Manually calculate the expected hash
+ expected_combined = f"{model}_{json.dumps(messages, sort_keys=True)}"
+ expected_hash = get_hash(expected_combined)
+ cache_key = gen_cache_key(*messages, model=model)
+
+ assert cache_key == expected_hash
+
+def test_gen_cache_key_invalid_message_format():
+ # Test when messages is not a list
+ with unittest.TestCase.assertRaises(unittest.TestCase, ValueError) as context:
+ gen_cache_key("This is not a list", model="docgpt")
+ assert str(context.exception) == "All messages must be dictionaries."
+
+# Test for gen_cache decorator
+@patch('application.cache.get_redis_instance') # Mock the Redis client
+def test_gen_cache_hit(mock_make_redis):
+ # Arrange
+ mock_redis_instance = MagicMock()
+ mock_make_redis.return_value = mock_redis_instance
+ mock_redis_instance.get.return_value = b"cached_result" # Simulate a cache hit
+
+ @gen_cache
+ def mock_function(self, model, messages):
+ return "new_result"
+
+ messages = [{'role': 'user', 'content': 'test_user_message'}]
+ model = "test_docgpt"
+
+ # Act
+ result = mock_function(None, model, messages)
+
+ # Assert
+ assert result == "cached_result" # Should return cached result
+ mock_redis_instance.get.assert_called_once() # Ensure Redis get was called
+ mock_redis_instance.set.assert_not_called() # Ensure the function result is not cached again
+
+
+@patch('application.cache.get_redis_instance') # Mock the Redis client
+def test_gen_cache_miss(mock_make_redis):
+ # Arrange
+ mock_redis_instance = MagicMock()
+ mock_make_redis.return_value = mock_redis_instance
+ mock_redis_instance.get.return_value = None # Simulate a cache miss
+
+ @gen_cache
+ def mock_function(self, model, messages):
+ return "new_result"
+
+ messages = [
+ {'role': 'user', 'content': 'test_user_message'},
+ {'role': 'system', 'content': 'test_system_message'},
+ ]
+ model = "test_docgpt"
+ # Act
+ result = mock_function(None, model, messages)
+
+ # Assert
+ assert result == "new_result"
+ mock_redis_instance.get.assert_called_once()
+
+@patch('application.cache.get_redis_instance')
+def test_stream_cache_hit(mock_make_redis):
+ # Arrange
+ mock_redis_instance = MagicMock()
+ mock_make_redis.return_value = mock_redis_instance
+
+ cached_chunk = json.dumps(["chunk1", "chunk2"]).encode('utf-8')
+ mock_redis_instance.get.return_value = cached_chunk
+
+ @stream_cache
+ def mock_function(self, model, messages, stream):
+ yield "new_chunk"
+
+ messages = [{'role': 'user', 'content': 'test_user_message'}]
+ model = "test_docgpt"
+
+ # Act
+ result = list(mock_function(None, model, messages, stream=True))
+
+ # Assert
+ assert result == ["chunk1", "chunk2"] # Should return cached chunks
+ mock_redis_instance.get.assert_called_once()
+ mock_redis_instance.set.assert_not_called()
+
+
+@patch('application.cache.get_redis_instance')
+def test_stream_cache_miss(mock_make_redis):
+ # Arrange
+ mock_redis_instance = MagicMock()
+ mock_make_redis.return_value = mock_redis_instance
+ mock_redis_instance.get.return_value = None # Simulate a cache miss
+
+ @stream_cache
+ def mock_function(self, model, messages, stream):
+ yield "new_chunk"
+
+ messages = [
+ {'role': 'user', 'content': 'This is the context'},
+ {'role': 'system', 'content': 'Some other message'},
+ {'role': 'user', 'content': 'What is the answer?'}
+ ]
+ model = "test_docgpt"
+
+ # Act
+ result = list(mock_function(None, model, messages, stream=True))
+
+ # Assert
+ assert result == ["new_chunk"]
+ mock_redis_instance.get.assert_called_once()
+ mock_redis_instance.set.assert_called_once()
+
+
+
+
+
+