Added cloudinary api for file storage

.gitignore

@@ -1,3 +1,10 @@
 **/__pycache__/
 *.env
-app.log
+app.log
+*.jpg
+*.jpeg
+*.png
+*.mp4
+*.mp3
+*.json
+debug.log

app.py

@@ -30,7 +30,7 @@ if 'model' not in st.session_state:
 
 
 
-def save_chat_history(user_name, chat_history):
+def save_chat_history(user_name, chat_history, user_manager):
     """
     Save chat history to a file in a user-specific directory with a timestamp.
     """
@@ -45,10 +45,18 @@ def save_chat_history(user_name, chat_history):
     serializable_history = []
     for entry in chat_history:
         if entry['role'] == 'user':
-            user_entry = {
-                'role': 'user',
-                'parts': entry['parts'][1] if len(entry['parts']) > 1 else entry['parts'][0]
-            }
+            if len(entry['parts']) > 1:
+                uploaded_file = entry['parts'][0]
+                uploaded_file_url = user_manager.upload_to_cloudinary(uploaded_file.display_name)
+                user_entry = {
+                    'role': 'user',
+                    'parts': f"file_api: {uploaded_file.uri}, file_temp: {uploaded_file_url}, {entry['parts'][1]}"
+                }
+            else:
+                user_entry = {
+                    'role': 'user',
+                    'parts': entry['parts'][0]
+                }
             serializable_history.append(user_entry)
         elif entry['role'] == 'model':
             model_entry = {
@@ -60,8 +68,11 @@ def save_chat_history(user_name, chat_history):
     with open(file_path, "w") as f:
         json.dump(serializable_history, f, indent=4)
     
-    logger.info(f"Chat history saved to {file_path}")
+    history_json = json.dumps(serializable_history)
 
+    user_manager.save_history(user_name, history_json)
+    
+    logger.info(f"Chat history saved to {file_path}")
 
 def authenticate_user(email, password):
     """
@@ -72,7 +83,7 @@ def authenticate_user(email, password):
     authenticated = auth_manager.authenticate_user(email, password)
     return authenticated
 
-def conversation_chat(file_path, text_prompt):
+def conversation_chat(file_path, text_prompt, user_manager):
     """
     Handle the conversation with the chat session using the provided file path and text prompt.
     """
@@ -89,7 +100,7 @@ def conversation_chat(file_path, text_prompt):
 
             logger.info(f"Successfully saved uploaded file: {file_path.name}")
             
-            file = genai.upload_file(path=temp_file_path, display_name=file_path.name)
+            file = genai.upload_file(path=temp_file_path, display_name=temp_file_path)
             user_entry = {
                 "role": "user",
                 "parts": [file, user_input]
@@ -117,7 +128,7 @@ def conversation_chat(file_path, text_prompt):
         logger.error(f"Error processing file: {e}")
         st.session_state.history.append("Error")
 
-def display_chat():
+def display_chat(user_manager):
     """
     Display chat input and responses.
     """
@@ -131,7 +142,7 @@ def display_chat():
     if st.button('Logout'):
 
         # Save chat history before logging out
-        save_chat_history(st.session_state.email, st.session_state.history)
+        save_chat_history(st.session_state.email, st.session_state.history, user_manager)
 
         st.session_state.authenticated = False
         st.session_state.email = ""
@@ -149,7 +160,7 @@ def display_chat():
             submit_button = st.form_submit_button(label='Send ⬆️')
 
     if submit_button:
-        conversation_chat(file_path, text_prompt)
+        conversation_chat(file_path, text_prompt, user_manager)
     
     if clear_chat_button:
         st.session_state.history = []
@@ -162,9 +173,10 @@ def display_chat():
             if entry['role'] == 'user': 
                 if len(entry['parts']) > 1:
                     uploaded_file = entry['parts'][0]
+                    base_file_name = os.path.basename(uploaded_file.display_name)
                     if uploaded_file.mime_type.startswith("image/"):
                         file_name= uploaded_file.display_name
-                        with open(os.path.join("temp", file_name), "rb") as file:
+                        with open(file_name, "rb") as file:
                             encoded_img = base64.b64encode(file.read()).decode('utf-8')
                         img_html = f'<img src="data:image/png;base64,{encoded_img}" width="200" style="margin-top: 5px;"/>'
                         st.markdown(f"""
@@ -177,7 +189,7 @@ def display_chat():
                             </div>
                             """, unsafe_allow_html=True)
                     else:
-                        message(uploaded_file.display_name, is_user=True, key=f"{i}_user", avatar_style="adventurer")
+                        message(base_file_name, is_user=True, key=f"{i}_user", avatar_style="adventurer")
 
                     if entry['parts'][1] != "":
                         message(entry['parts'][1], is_user=True, key=f"{i}_user", avatar_style="adventurer")
@@ -199,7 +211,7 @@ def main():
             st.session_state.profile = user_manager.get_user(st.session_state.email).profile
             st.session_state.model = create_model(GOOGLE_API_KEY, st.session_state.profile)
 
-        display_chat()
+        display_chat(user_manager)
     else:
         st.title("Wellness Bot 🦾🤖 \n\nLogin/SignUp")
 

requirements.txt

@@ -8,6 +8,7 @@ cachetools==5.3.3
 certifi==2024.6.2
 charset-normalizer==3.3.2
 click==8.1.7
+cloudinary==1.40.0
 Flask==3.0.3
 Flask-Session==0.8.0
 gitdb==4.0.11
@@ -38,6 +39,7 @@ pillow==10.3.0
 proto-plus==1.24.0
 protobuf==4.25.3
 psycopg2-binary==2.9.9
+psycopg2-binary==2.9.9
 pyarrow==16.1.0
 pyasn1==0.6.0
 pyasn1_modules==0.4.0

services/cloudinary_api.py

@@ -0,0 +1,5 @@
+import cloudinary
+
+def upload_image(file_path):
+    response = cloudinary.uploader.upload(file_path)
+    return response['url']

settings/base.py

@@ -1,5 +1,6 @@
 import os
 import logging
+import cloudinary
 
 GOOGLE_API_KEY = os.environ.get("GOOGLE_API_KEY")
 
@@ -9,6 +10,12 @@ DB_PASSWORD = os.environ.get("DB_PASSWORD")
 DB_HOST = os.environ.get("DB_HOST")
 DB_PORT = os.environ.get("DB_PORT")
 
+# Configuration
+cloudinary.config(
+  cloud_name = os.environ.get("CLOUDINARY_CLOUD_NAME"),
+  api_key = os.environ.get("CLOUDINARY_API_KEY"),
+  api_secret = os.environ.get("CLOUDINARY_API_SECRET")
+)
 def setup_logger():
     logger = logging.getLogger('app_logger')
     logger.setLevel(logging.DEBUG)

user_auth/user_manager.py

@@ -1,6 +1,8 @@
 import psycopg2
+from psycopg2 import sql
+import cloudinary.uploader
 from user_auth.user import User
-from settings.base import setup_logger, DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_USER
+from settings.base import setup_logger, DB_HOST, DB_NAME, DB_PASSWORD, DB_PORT, DB_USER, cloudinary
 
 
 logger = setup_logger()
@@ -51,8 +53,33 @@ class UserManager:
                 "daily_calorie_intake": result[14]
             }
             logger.info(f'User retrieved from database: {result[1]}')
-            return User(email=result[1], password=result[1], profile=profile)
+            return User(email=result[1], password=result[2], profile=profile)
         return None
+    
+    def save_history(self, email, history_json):
+        try:
+            with self.conn.cursor() as cur:
+                query = sql.SQL("""
+                     INSERT INTO chat_history (username, data)
+                        VALUES (%s, %s)
+                    """)
+                cur.execute(query, (email,  history_json))
+                self.conn.commit()
+                logger.info(f"Chat history saved to database for user: {email}")
+        except Exception as e:
+            self.conn.rollback()
+            logger.error(f"Error saving chat history to database: {e}")
+    
+    def upload_to_cloudinary(self, file_path):
+        try:
+            # Upload file to Cloudinary
+            upload_result = cloudinary.uploader.upload(file_path)
+            uploaded_file_url = upload_result['url']
+            logger.info(f"Uploaded file to Cloudinary: {uploaded_file_url}")
+            return uploaded_file_url
+        except Exception as e:
+            logger.exception(f"Error uploading file to Cloudinary: {repr(e)}")
+            return None
 
     def close(self):
         self.cursor.close()