From 64fab61e955c5515230d16dbb3950f037b234481 Mon Sep 17 00:00:00 2001
From: liberty-rising <rwyszomi@gmail.com>
Date: Tue, 12 Dec 2023 19:10:36 +0100
Subject: [PATCH 1/4] fix table select

---
 frontend/src/pages/Charts/Configs/ChartConfig.jsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/Charts/Configs/ChartConfig.jsx b/frontend/src/pages/Charts/Configs/ChartConfig.jsx
index 0b188e9..df43b6f 100644
--- a/frontend/src/pages/Charts/Configs/ChartConfig.jsx
+++ b/frontend/src/pages/Charts/Configs/ChartConfig.jsx
@@ -51,10 +51,11 @@ function ChartConfig({ onConfigChange, onRequiredSelected, chartConfig, isLoadin
         return chartConfig.nivoConfig && Object.keys(chartConfig.nivoConfig).length > 0;
     };
 
-    const handleTableChange = (event) => {
-        const selectedTable = event.target.value;
-        setSelectedTable(selectedTable);
-    }
+    const handleTableSelect = async (table) => {
+        setSelectedTable(table);
+        const data = await fetchOrganizationTables(table); // fetchTableData is your API call function
+        setTables(data);
+    };
 
     const handleChartTypeChange = (event) => {
         const selectedType = event.target.value;
@@ -63,7 +64,7 @@ function ChartConfig({ onConfigChange, onRequiredSelected, chartConfig, isLoadin
 
     return(
         <Box sx={{ display: 'flex', flexDirection: 'column', alignItems: 'center', minWidth: 120, marginBottom: 2, width: '100%' }}>
-            <TableSelectDropdown tables={tables} selectedTable={selectedTable} onTableChange={handleTableChange} />
+            <TableSelectDropdown tables={tables} selectedTable={selectedTable} onTableSelect={handleTableSelect} />
             <ChartTypeSelector selectedChartType={selectedChartType} onChartTypeChange={handleChartTypeChange} chartTypes={chartTypes} />
             {isLoading ? (
                 <CircularProgress />

From 3f01e7ab0a46ee8948fa17b87f0a69aeb789be3f Mon Sep 17 00:00:00 2001
From: liberty-rising <rwyszomi@gmail.com>
Date: Tue, 12 Dec 2023 19:13:28 +0100
Subject: [PATCH 2/4] rename page component

---
 frontend/src/App.jsx                                            | 2 +-
 .../src/pages/Analytics/{Analytics.jsx => AnalyticsPage.jsx}    | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename frontend/src/pages/Analytics/{Analytics.jsx => AnalyticsPage.jsx} (100%)

diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index d560633..c58ecf1 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -13,7 +13,7 @@ import LandingLayout from './components/layouts/LandingLayout';
 import RequireAuth from './components/auth/RequireAuth';
 import AboutPage from './pages/About';
 import AdminPage from './pages/admin/Admin';
-import AnalyticsPage from './pages/analytics/Analytics';
+import AnalyticsPage from './pages/analytics/AnalyticsPage';
 import BlogPage from './pages/Blog';
 import CreateChartPage from './pages/charts/CreateChart';
 import CreateDashboardPage from './pages/dashboards/CreateDashboard';
diff --git a/frontend/src/pages/Analytics/Analytics.jsx b/frontend/src/pages/Analytics/AnalyticsPage.jsx
similarity index 100%
rename from frontend/src/pages/Analytics/Analytics.jsx
rename to frontend/src/pages/Analytics/AnalyticsPage.jsx

From 851a5afdb602357b22b600bce263976f1836c581 Mon Sep 17 00:00:00 2001
From: liberty-rising <rwyszomi@gmail.com>
Date: Tue, 12 Dec 2023 19:22:53 +0100
Subject: [PATCH 3/4] add label to select component

---
 frontend/src/components/tables/selects/TableSelectDropdown.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/tables/selects/TableSelectDropdown.jsx b/frontend/src/components/tables/selects/TableSelectDropdown.jsx
index b54f8ae..aeac70b 100644
--- a/frontend/src/components/tables/selects/TableSelectDropdown.jsx
+++ b/frontend/src/components/tables/selects/TableSelectDropdown.jsx
@@ -7,12 +7,13 @@ function TableSelectDropdown({ tables, selectedTable, onTableSelect }) {
   };
 
   return (
-    <FormControl fullWidth>
+    <FormControl fullWidth margin="normal">
       <InputLabel id="table-select-label">Select Table</InputLabel>
       <Select
         labelId="table-select-label"
         id="table-select"
         value={selectedTable}
+        label="Select Table"
         onChange={handleChange}
       >
         {tables.map((table) => (

From 5b815e1692eab1499ce4238253c8483ed7cf7e24 Mon Sep 17 00:00:00 2001
From: liberty-rising <rwyszomi@gmail.com>
Date: Tue, 19 Dec 2023 20:32:04 +0100
Subject: [PATCH 4/4] begin work on analytics page

---
 backend/llms/gpt.py                           | 133 ++++--------------
 backend/routes/chat_routes.py                 |  13 +-
 frontend/src/pages/Analytics/AIAssistant.jsx  |   5 +-
 .../src/pages/Analytics/AnalyticsPage.jsx     |   7 +-
 4 files changed, 40 insertions(+), 118 deletions(-)

diff --git a/backend/llms/gpt.py b/backend/llms/gpt.py
index 12da75e..9ec8a94 100644
--- a/backend/llms/gpt.py
+++ b/backend/llms/gpt.py
@@ -1,5 +1,5 @@
 from openai import ChatCompletion
-from typing import Optional
+from typing import List, Optional
 
 import json
 import openai
@@ -8,6 +8,8 @@
 from .base import BaseLLM
 from databases.chat_history_manager import ChatHistoryManager
 from databases.database_manager import DatabaseManager
+from llms.prompt_manager import PromptManager
+from llms.system_message_manager import SystemMessageManager
 from models.user import User
 from settings import OPENAI_API_KEY
 from utils.nivo_assistant import NivoAssistant
@@ -58,7 +60,9 @@ def __init__(
         self.chat_id = chat_id
         self.user_id = user.id
         self.organization_id = user.organization_id
+        self.prompt_manager = PromptManager()
         self.store_history = store_history
+        self.system_message_manager = SystemMessageManager()
         self.llm_type = llm_type
         self.database_type = database_type
         self.history = self._set_init_history()
@@ -115,49 +119,10 @@ def _truncate_history(self):
 
     def _get_system_message_content(self, assistant_type: str = "generic") -> str:
         """Generate a system message based on the assistant type."""
-        messages = {
-            "sql_code": f"You are a {self.database_type} SQL statement assistant. Generate {self.database_type} SQL statements based on the given prompt. Return only the pure code.",
-            "nivo_charts": """
-                You are a Nivo chart generator assistant, specializing in creating configurations for responsive chart components in Nivo, a visualization library for React.
-                Your role is to generate configurations, SQL queries, and titles for charts like ResponsiveBar, ResponsiveLine, etc.
-                Focus on ensuring that the charts are highly responsive, adapting seamlessly to different screen sizes without the need for fixed dimensions like width or height.
-                Style the charts in a clean and modern way.
-                Avoid introductory statements, filler words, or extra formatting in your outputs.
-                Remember, the key is to prioritize responsiveness and clarity in the visualization design.
-            """,
-            "nivo_config_for_charts": """
-                You are a JSON generator assistant.
-                You will be creating a JSON that will hold the configuration needed for a nivo chart (react library).
-                You will be given the user's request, the name and metadata of the table to be visualized, the type of chart, the query used on the table, and the current nivo configuration.
-                Generate the necessary nivo configuration in the form of a JSON. If the chart does not have any styling, add some, and make it look nice.
-                Implement any styling the user asks for.
-                Return only the pure JSON.
-            """,
-            "sql_code_for_charts": f"""
-                You are a {self.database_type} SQL statement assistant.
-                Your query will be used to create a chart using the NIVO library.
-                You will be given the table name, information about the table, type of chart that will be used, the existing query (if there is one), along with what data the user wishes to
-                visualise.
-                The user may not always use the correct names for the columns, it is your job to decide which column the user is referring to by using the information you have about the
-                table.
-                Generate {self.database_type} SQL statements based on the given prompt. Return only the pure code.
-            """,
-            "title_for_chart": """
-                You are a chart title generator assistant.
-                You will be naming a chart based on the given inputs.
-                Return only the chart name.
-            """,
-            "sql_desc": """
-                You are an SQL table description assistant. Generate concise, informative descriptions of SQL tables based on CREATE TABLE queries and sample data.
-                Your descriptions should help in categorizing new data and provide context for future queries, reports, and analytics.
-            """,
-            "table_categorization": """
-                You are a table categorization assistant. Your task is to analyze sample data and existing table metadata to identify the most suitable
-                table for appending the sample data. Return only the name of the table.
-            """,
-            "generic": "You are a generic assistant.",
-        }
-        return messages.get(assistant_type, "You are a generic assistant.")
+        system_message_content: str = (
+            self.system_message_manager.get_system_message_content(assistant_type)
+        )
+        return system_message_content
 
     def _create_message(self, role: str, prompt: str):
         """Create either a user, system, or assistant message."""
@@ -270,16 +235,9 @@ async def generate_create_statement(
         """
         self._add_system_message(assistant_type="sql_code")
 
-        prompt = "Generate SQL CREATE TABLE statement for the following sample data:"
-        if header:
-            prompt += f"\n\nHeader:\n{header}"
-        prompt += f"\n\nSample data:\n{sample_content}"
-        if existing_table_names:
-            prompt += f"\n\nDo not use the following table names as they are already in use: \n{existing_table_names}"
-        if extra_desc:
-            prompt += (
-                f"\n\nAdditional information about the sample data: \n{extra_desc}"
-            )
+        prompt = self.prompt_manager.create_table_create_prompt(
+            sample_content, header, existing_table_names, extra_desc
+        )
 
         gpt_response: str = await self._send_and_receive_message(prompt)
 
@@ -302,21 +260,9 @@ async def generate_table_desc(
 
         self._add_system_message(assistant_type="sql_desc")
 
-        prompt = f"""
-            Generate a brief description for the table that will be created using the SQL CREATE TABLE query below.
-            This description should help in determining whether to categorize new data into this table
-            and should also provide the context needed to generate suggested queries for reports and analytics in the future.
-
-            SQL CREATE TABLE Query:
-            {create_query}
-
-            Sample Data:
-            {sample_content}
-
-            Only generate the description, no formatting or title. Do not include any additional text, explanations, or filler words.
-            """
-        if extra_desc:
-            prompt += f"\n\nAdditional information about the sample data: {extra_desc}"
+        prompt = self.prompt_manager.create_table_desc_prompt(
+            create_query, sample_content, extra_desc
+        )
 
         gpt_response = await self._send_and_receive_message(prompt)
 
@@ -335,33 +281,9 @@ async def generate_chart_config(
         # TODO: minValue and maxValue should always be set to auto
         # TODO: keys, indexBy is not a valid key for all charts, should be dynamically added.
 
-        prompt = f"""
-            Generate a responsive chart configuration based on the following request.
-            Focus on optimizing the configuration for responsiveness, ensuring the chart is clearly visible and legible on a variety of screen sizes.
-
-            User request:
-            {msg}
-            Metadata about the table:
-            {table_metadata}
-            Chart type:
-            Responsive {chart_type}
-            Current nivo configuration:
-            {nivo_config_preview}
-
-            Provide output in JSON format as follows:
-            {{
-                "title":"",
-                "query":"",
-                "nivoConfig":{{}}
-            }}
-
-            The 'nivoConfig' should be complete or updated based on the user's requests.
-            The 'data' key in 'nivoConfig' shows a preview of the data; do not update it.
-            The 'keys' key in 'nivoConfig' should be updated based on the names of the query columns.
-            The 'indexBy' key in 'nivoConfig' should be set to the name of the column which should be used to index the data.
-            Prioritize responsive design to ensure the chart adapts well to different screen sizes.
-            Do not set the parameters 'width' and 'height' as the charts are all 'Responsive' versions of themselves.
-        """
+        prompt = self.prompt_manager.create_chart_config_prompt(
+            msg, table_metadata, chart_type, nivo_config_preview
+        )
 
         updated_config = await self._send_and_receive_message(
             prompt
@@ -391,19 +313,9 @@ def fetch_table_name_from_sample(
 
         self._add_system_message(assistant_type="table_categorization")
 
-        prompt = f"""
-            Based on the sample data and existing table metadata, determine to which table the sample data should be appended.
-
-            Sample Data:
-            {sample_content}
-
-            Existing Table Metadata:
-            {table_metadata}
-
-            Return only the name of the table.
-            """
-        if extra_desc:
-            prompt += f"\n\nAdditional information about the sample data: {extra_desc}"
+        prompt = self.prompt_manager.create_get_table_name_from_sample_prompt(
+            sample_content, extra_desc, table_metadata
+        )
 
         gpt_response = self._send_and_receive_message(prompt)
 
@@ -417,3 +329,6 @@ def generate_text(self, input_text):
         assistant_message_content = self._send_and_receive_message(prompt)
 
         return assistant_message_content
+
+    def generate_analytics_text(self, input_text: str, table_names: List[str]):
+        pass
diff --git a/backend/routes/chat_routes.py b/backend/routes/chat_routes.py
index 8e1f495..bf93cf8 100644
--- a/backend/routes/chat_routes.py
+++ b/backend/routes/chat_routes.py
@@ -3,7 +3,9 @@
 from databases.chat_history_manager import ChatHistoryManager
 from databases.database_manager import DatabaseManager
 from llms.base import BaseLLM
+from llms.gpt import GPTLLM
 from llms.utils import ChatRequest, ChatResponse, get_llm_chat_object
+from models.chat import AnalyticsRequest, AnalyticsResponse
 from models.user import User
 from security import get_current_user
 
@@ -17,11 +19,20 @@ async def chat_endpoint(
     current_user: User = Depends(get_current_user),
 ):
     user_input = request.user_input
-    # Assume llm_chat is a function that sends user_input to your LLM and gets a response
     llm_output = llm.generate_text(user_input)
     return ChatResponse(llm_output=llm_output)
 
 
+@chat_router.post("/chat/analytics/")
+async def chat_analytics_endpoint(
+    request: AnalyticsRequest,
+    current_user: User = Depends(get_current_user),
+):
+    gpt = GPTLLM(chat_id=request.chat_id, user=current_user, store_history=True)
+    response = gpt.generate_text(request.prompt)
+    return AnalyticsResponse(chat_id=gpt.chat_id, response=response)
+
+
 @chat_router.delete("/chat_history/")
 async def delete_chat_history(current_user: User = Depends(get_current_user)):
     user_id = current_user.id
diff --git a/frontend/src/pages/Analytics/AIAssistant.jsx b/frontend/src/pages/Analytics/AIAssistant.jsx
index d347a8b..e755ecd 100644
--- a/frontend/src/pages/Analytics/AIAssistant.jsx
+++ b/frontend/src/pages/Analytics/AIAssistant.jsx
@@ -3,7 +3,7 @@ import { Box, CircularProgress, TextField, Button, Typography, Paper } from '@mu
 import axios from 'axios';
 import { API_URL } from '../../utils/constants';
 
-const AIAssistant = () => {
+const AIAssistant = ({ table }) => {
   const [userInput, setUserInput] = useState('');
   const [chatHistory, setChatHistory] = useState([]);
   const chatEndRef = useRef(null);
@@ -50,8 +50,7 @@ const AIAssistant = () => {
 
   return (
     <Box>
-      <Typography variant="h4">💬 AI Assistant</Typography>
-      <Paper style={{ height: '200px', width: '100%', overflowY: 'auto', padding: '10px', marginTop: '10px', marginBottom: '10px' }}>
+      <Paper style={{ height: '100px', width: '100%', overflowY: 'auto', padding: '10px', marginTop: '10px', marginBottom: '10px' }}>
         {chatHistory.map((chat, index) => (
             <Typography key={index}>{`${chat.role}: ${chat.message}`}</Typography>
         ))}
diff --git a/frontend/src/pages/Analytics/AnalyticsPage.jsx b/frontend/src/pages/Analytics/AnalyticsPage.jsx
index 9eee353..ba9943f 100644
--- a/frontend/src/pages/Analytics/AnalyticsPage.jsx
+++ b/frontend/src/pages/Analytics/AnalyticsPage.jsx
@@ -8,7 +8,6 @@ import { fetchOrganizationTables } from '../../api/organizationTables';
 function AnalyticsPage() {
   const [tables, setTables] = useState([]);
   const [selectedTable, setSelectedTable] = useState('');
-  const [tableData, setTableData] = useState(null);
 
   useEffect(() => {
     const getOrganizationTables = async () => {
@@ -19,10 +18,8 @@ function AnalyticsPage() {
     getOrganizationTables();
   }, []);
 
-  const handleTableSelect = async (table) => {
+  const handleTableSelect = (table) => {
     setSelectedTable(table);
-    const data = await fetchOrganizationTables(table); // fetchTableData is your API call function
-    setTableData(data);
   };
 
   useEffect(() => {
@@ -39,7 +36,7 @@ function AnalyticsPage() {
           <TableSelectDropdown tables={tables} selectedTable={selectedTable} onTableSelect={handleTableSelect} />
         </Grid>
         <Grid item xs={12}>
-          <AIAssistant />
+          <AIAssistant table={selectedTable} />
         </Grid>
       </Grid>
     </Box>