Merge branch 'Develop'

Author: lilhuss26

Axiora.py

@@ -6,7 +6,7 @@
 # Import Qt modules first
 from PySide6.QtWidgets import (
     QApplication, QMainWindow, QHeaderView, QLabel, 
-    QVBoxLayout, QSizePolicy, QPushButton
+    QVBoxLayout, QSizePolicy, QPushButton, QGridLayout, QWidget, QFrame
 )
 from PySide6.QtGui import QIcon, QFont, QPixmap, QCursor
 from PySide6.QtCore import Qt, QSize
@@ -19,6 +19,7 @@
 from langchain_core.messages import HumanMessage, AIMessage
 from OprFuncs import read_file
 from modules.ui_main import Ui_MainWindow
+from uiEXT.ColDialog import ColDialog
 
 
 def resizeEvent(self, event):
@@ -47,7 +48,7 @@ def __init__(self, user_id):
 
         # Initialize app functions after UI setup
         self.app_functions = GuiFunctions(self, self.user_id)
-        self.load_reports()
+        self.load_oldreports()
 
         # Fix path separators for Windows - use forward slashes
         self.report_logo = "images/icons/cil-report-colored-1.png"
@@ -156,30 +157,107 @@ def openCloseRightBox():
         widgets.home_2.layout().addWidget(welcome_label)
         widgets.btn_home.setStyleSheet(UIFunctions.selectMenu(widgets.btn_home.styleSheet()))
 
-    def load_reports(self):
-        #self.report_list.clear()
-        reports = self.app_functions.db.get_user_reports(self.user_id)
-        for report in reports:
-            report_btn = QPushButton(self.ui.topMenus)
-            report_btn.setObjectName(report['name'])
-            sizePolicy1 = QSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
-            sizePolicy1.setHeightForWidth(report_btn.sizePolicy().hasHeightForWidth())
-            report_btn.setSizePolicy(sizePolicy1)
-            report_btn.setMinimumSize(QSize(0, 45))
-           # report_btn.setFont(Qfont)
-            report_btn.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
-            report_btn.setLayoutDirection(Qt.LayoutDirection.LeftToRight)
-            report_btn.setText(report['name'])
-            report_btn.setProperty("report_id", report['id'])
-            report_btn.setProperty("report_name", report['name'])
-
-            report_logo = "images/icons/cil-report-colored-1.png"
-            pixmap_report_logo = QPixmap(report_logo)
-            logo_icon = QIcon(pixmap_report_logo)
-            report_btn.setIcon(logo_icon)
-
-            report_btn.clicked.connect(self.report_button_clicked)
-            self.ui.verticalLayout_14.addWidget(report_btn)
+        # Connect column header click event
+        widgets.tableData.horizontalHeader().sectionClicked.connect(self.show_column_dialog)
+
+    def load_oldreports(self):
+
+        # Create a grid layout for the home page
+        if hasattr(self.ui, 'home_2'):
+            # Clear existing layout if any
+            if self.ui.home_2.layout():
+                QWidget().setLayout(self.ui.home_2.layout())
+            
+            # Create new grid layout
+            grid_layout = QGridLayout(self.ui.home_2)
+            grid_layout.setSpacing(10)
+            grid_layout.setContentsMargins(20, 20, 20, 20)
+
+            # Create welcome message widget for top left
+            welcome_widget = QWidget()
+            welcome_layout = QVBoxLayout(welcome_widget)
+            welcome_layout.addStretch()
+
+            # Add welcome widget to top left
+            grid_layout.addWidget(welcome_widget, 0, 0)
+
+            # Create reports container for top right
+            reports_container = QWidget()
+            reports_layout = QVBoxLayout(reports_container)
+            reports_layout.setSpacing(5)
+            reports_layout.setContentsMargins(0, 0, 0, 0)
+
+            # Add title
+            title_label = QLabel("Your Reports")
+            title_label.setStyleSheet("""
+                QLabel {
+                    font-size: 16px;
+                    font-weight: bold;
+                    color: white;
+                    padding: 10px;
+                    background-color: rgb(196, 7, 105);
+                    border-radius: 4px;
+                }
+            """)
+            title_label.setAlignment(Qt.AlignCenter)
+            reports_layout.addWidget(title_label)
+            reports_layout.addSpacing(10)
+
+            reports = self.app_functions.db.get_user_reports(self.user_id)
+            for report in reports:
+                report_btn = QPushButton()
+                report_btn.setObjectName(report['name'])
+                report_btn.setMinimumHeight(40)
+                report_btn.setCursor(QCursor(Qt.CursorShape.PointingHandCursor))
+                report_btn.setText(report['name'])
+                report_btn.setProperty("report_id", report['id'])
+                report_btn.setProperty("report_name", report['name'])
+                
+                # Set button style
+                report_btn.setStyleSheet("""
+                    QPushButton {
+                        background-color: rgb(24, 196, 199);
+                        border: 1px solid #ddd;
+                        border-radius: 4px;
+                        padding: 5px 10px;
+                        text-align: left;
+                    }
+                    QPushButton:hover {
+                        background-color: rgb(7, 60, 196);
+                    }
+                """)
+                
+                # Add icon
+                report_logo = "images/icons/cil-report-colored-1.png"
+                pixmap_report_logo = QPixmap(report_logo)
+                if not pixmap_report_logo.isNull():
+                    scaled_pixmap = pixmap_report_logo.scaled(24, 24, Qt.KeepAspectRatio, Qt.SmoothTransformation)
+                    report_btn.setIcon(QIcon(scaled_pixmap))
+                    report_btn.setIconSize(QSize(24, 24))
+                
+                report_btn.clicked.connect(self.report_button_clicked)
+                reports_layout.addWidget(report_btn)
+
+            # Add reports container to top right
+            grid_layout.addWidget(reports_container, 0, 1)
+
+            # Add empty widgets for bottom left and right
+            bottom_left = QWidget()
+            bottom_right = QWidget()
+            grid_layout.addWidget(bottom_left, 1, 0)
+            grid_layout.addWidget(bottom_right, 1, 1)
+
+            # Add horizontal line
+            horizontal_line = QFrame()
+            horizontal_line.setFrameShape(QFrame.Shape.HLine)
+            horizontal_line.setStyleSheet("background-color: #ddd;")
+            grid_layout.addWidget(horizontal_line, 1, 0, 1, 2)
+
+            # Add vertical line
+            vertical_line = QFrame()
+            vertical_line.setFrameShape(QFrame.Shape.VLine)
+            vertical_line.setStyleSheet("background-color: #ddd;")
+            grid_layout.addWidget(vertical_line, 0, 1, 2, 1)
 
     def report_button_clicked(self):
         btn = self.sender()
@@ -313,6 +391,12 @@ def mousePressEvent(self, event):
         if event.buttons() == Qt.RightButton:
             print('Mouse click: RIGHT CLICK')
 
+    def show_column_dialog(self, column_index):
+        """Show the column dialog when a column header is clicked"""
+        column_name = widgets.tableData.horizontalHeaderItem(column_index).text()
+        dialog = ColDialog(self, self.app_functions.df, column_name)
+        dialog.setWindowTitle(f"Column Options - {column_name}")
+        dialog.exec_()
 
 if __name__ == "__main__":
     # Create QApplication instance

Axioradb.py

@@ -1,9 +1,7 @@
-from passlib.hash import bcrypt
-from sqlalchemy.orm import sessionmaker
-import sqlalchemy as sa
+import bcrypt
 from sqlalchemy import (
-    PrimaryKeyConstraint, create_engine, ForeignKey,
-    Column, String, Integer, CHAR, SmallInteger,
+ create_engine, ForeignKey,
+    Column, String, Integer, SmallInteger,
     Text, DateTime, Boolean
 )
 from sqlalchemy import func
@@ -19,20 +17,22 @@ class User(Base):
     password_hash = Column(String, nullable=False)
     email = Column(String)
     preferred_llm = Column(Integer, ForeignKey('llm.llm_id'), nullable=True)
+    user_context = Column(Text)
 
     reports = relationship("Report", back_populates="user")
     llm = relationship("LLM", back_populates="users")
 
-    def __init__(self, username, email, password):
+    def __init__(self, username, email, password, user_context=None):
         self.username = username
         self.email = email
+        self.user_context = user_context
         self.set_password(password) 
 
     def set_password(self, password):
-        self.password_hash = bcrypt.hash(password)
+        self.password_hash = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()).decode('utf-8')
 
     def check_password(self, password):
-        return bcrypt.verify(password, self.password_hash)
+        return bcrypt.checkpw(password.encode('utf-8'), self.password_hash.encode('utf-8'))
 
     def __repr__(self):
         return f"<User(user_id={self.user_id}, username='{self.username}', email='{self.email}')>"
@@ -313,4 +313,4 @@ def __repr__(self):
     session.add(cheif)
 
 session.commit()
-session.close()"""
+session.close()"""

DataAnalyzer.py

@@ -15,7 +15,7 @@
 from langchain_experimental.agents import create_pandas_dataframe_agent
 
 class DataAnalyzer:
-    def __init__(self,dataframe,llm):
+    def __init__(self,dataframe,llm,user_id=None):
         self.dataframe = dataframe
         self.llm = llm
         self.data_info = data_infer(dataframe)
@@ -25,6 +25,14 @@ def __init__(self,dataframe,llm):
         self.db = DatabaseManager()
         self.report_id = None
         self.memory = []
+        
+        if user_id:
+            self.user_id = user_id
+            self.user_context = self.db.get_user_context(user_id)
+            if self.user_context:
+                self.memory.append(HumanMessage(content=f"User Context: {self.user_context}"))
+        else:
+            self.user_context = None
 
     def analysis_data(self):
         data_info = self.data_info
@@ -35,34 +43,39 @@ def analysis_data(self):
         You are a data analyst. You are provided with:
         1. Dataset metadata: {data_info}
         2. Dataset sample: {data_sample}
-        3. Dataset summary: {data_description} 
+        3. Dataset summary: {data_description}
+        4. User_context: {user_context}
 
         Please analyze the data and provide insights about:
         1. Key trends and patterns.
         3. Recommendations or actionable insights based on the analyzed data.
         '''
         analysis_prompt = PromptTemplate(
-            input_variables=["data_info", "data_sample", "data_description"],
+            input_variables=["data_info", "data_sample", "data_description", "user_context"],
             template=analysis_template
         )
 
         analysis_chain = analysis_prompt | self.llm
 
-        analysis = analysis_chain.invoke({
+        self.analysis = analysis_chain.invoke({
             "data_info": data_info,
             "data_sample": data_sample,
-            "data_description": data_description
+            "data_description": data_description,
+            "user_context":self.user_context or "No prior context available"
         })
 
-        formatted_analysis_prompt = analysis_template.format(data_info=data_info,data_sample=data_sample,data_description=data_description)
+        formatted_analysis_prompt = analysis_template.format(data_info=data_info,data_sample=data_sample,
+                                                             data_description=data_description,
+                                                             user_context=self.user_context)
         self.memory.append(HumanMessage(content=formatted_analysis_prompt))
-        self.memory.append(AIMessage(content=analysis))
+        self.memory.append(AIMessage(content=self.analysis))
         self.db.saveMemory(reportID=self.report_id,
                            llm=self.db.llm_id_by_name(self.llm.model),
                            prompet=formatted_analysis_prompt,
-                           response=analysis,
+                           response=self.analysis,
                            chat=False)
-        return analysis        
+        self.generate_user_context()
+        return self.analysis        
 
     # Drop Nulls
     def drop_nulls(self):
@@ -130,22 +143,26 @@ def questions_gen(self, num):
                 "data_description": data_description
             })
 
-            print("🔹 Raw LLM Output:", repr(generated_questions))
+            # Ensure the response is properly encoded
+            if isinstance(generated_questions, str):
+                generated_questions = generated_questions.encode('utf-8', 'replace').decode('utf-8')
+
+            print("Raw LLM Output:", repr(generated_questions))
 
             if not generated_questions.strip():
-                print("⚠️ LLM did not generate any questions.")
+                print("Warning: LLM did not generate any questions.")
                 return []
 
             # Use the improved extraction function
             questions_list = extract_questions(generated_questions)
 
-            print("🟢 Extracted Questions List:", questions_list)
+            print("Extracted Questions List:", questions_list)
 
             # Trim or handle missing questions
             if len(questions_list) > num:
                 questions_list = questions_list[:num]
             elif len(questions_list) < num:
-                print(f"⚠️ Warning: Expected {num} questions, but got {len(questions_list)}")
+                print(f"Warning: Expected {num} questions, but got {len(questions_list)}")
 
             # Store in memory
             formatted_question_prompt = question_template.format(
@@ -165,7 +182,7 @@ def questions_gen(self, num):
             return questions_list
 
         except Exception as e:
-            print(f"❌ Error generating questions: {e}")
+            print(f"Error generating questions: {str(e)}")
             return []
 
 
@@ -289,3 +306,37 @@ def get_chart_recommendation(self, question: str) -> Tuple[str, List[str]]:
         chart_type = self.select_chart_type(question)
         columns = self.select_columns(question)
         return chart_type, columns
+    
+    def generate_user_context(self):
+        if not self.user_id:
+            return "No user ID provided"
+            
+        context_template = """
+        Generate a concise user profile context based on:
+
+        User's existing context: {existing_context}
+        Current analysis: {current_analysis}
+        Conversation history: {conversation_summary}
+        Focus on:
+        - Key analysis interests
+        - Frequently asked about metrics
+        - Data domains of interest
+        
+        Format as bullet points, max 5 items.
+        """
+        
+        conversation = "\n".join([msg.content for msg in self.memory[-4:]])
+        
+        context_prompt = PromptTemplate(
+            template=context_template,
+            input_variables=["existing_context", "current_analysis", "conversation_summary"]
+        )
+        
+        new_context = (context_prompt | self.llm).invoke({
+            "existing_context": self.user_context or "No prior context available",
+            "current_analysis": self.analysis,
+            "conversation_summary": conversation
+        })
+        
+        self.db.update_user_context(userID=self.user_id, new_context=new_context)
+        return new_context

DatabaseManager.py

@@ -156,6 +156,18 @@ def get_user_name(self,userID):
         user_name = self.session.query(User.username).filter(User.user_id == userID).first()
         return user_name if user_name else None
 
+    def get_user_context(self, userID):
+        user = self.session.query(User).filter(User.user_id == userID).first()
+        return user.user_context if user else None
+
+    def update_user_context(self, userID, new_context):
+        user = self.session.query(User).filter(User.user_id == userID).first()
+        if user:
+            user.user_context = new_context
+            self.session.commit()
+            return True
+        return False
+
     def get_report_charts(self, reportID):
         charts = self.session.query(Charts.chart_path)\
             .join(Dashboards, Charts.dashboard_id == Dashboards.dashboard_id)\