Update app.py

app.py

@@ -13,37 +13,52 @@ class XylariaChat:
         self.hf_token = os.environ.get("HF_TOKEN")
         firebase_cred_json = os.environ.get("FIREBASE_SERVICE_ACCOUNT")
         
-        if not self.hf_token or not firebase_cred_json:
-            raise ValueError("Required secrets (HF_TOKEN or FIREBASE_SERVICE_ACCOUNT) not found")
+        # Optional: Add more robust error handling for missing environment variables
+        if not self.hf_token:
+            print("Warning: HuggingFace token not found. Some functionality may be limited.")
         
-        # Initialize Firebase
-        try:
-            # Convert the JSON string to a temporary credentials file
-            with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.json') as temp_cred_file:
-                json.dump(json.loads(firebase_cred_json), temp_cred_file)
-                temp_cred_file.close()
-            
-            firebase_cred = credentials.Certificate(temp_cred_file.name)
-            firebase_admin.initialize_app(firebase_cred)
-            self.db = firestore.client()
-            
-            # Remove the temporary credentials file
-            os.unlink(temp_cred_file.name)
-        except Exception as e:
-            print(f"Firebase initialization error: {e}")
-            self.db = None
+        # Firebase initialization
+        self.db = None
+        if firebase_cred_json:
+            try:
+                # Convert the JSON string to a temporary credentials file
+                with tempfile.NamedTemporaryFile(mode='w', delete=False, suffix='.json') as temp_cred_file:
+                    # Add error handling for JSON parsing
+                    try:
+                        firebase_creds = json.loads(firebase_cred_json)
+                        json.dump(firebase_creds, temp_cred_file)
+                        temp_cred_file.close()
+                        
+                        firebase_cred = credentials.Certificate(temp_cred_file.name)
+                        firebase_admin.initialize_app(firebase_cred)
+                        self.db = firestore.client()
+                    except json.JSONDecodeError:
+                        print("Error: Invalid Firebase credentials JSON")
+                    
+                # Remove the temporary credentials file
+                os.unlink(temp_cred_file.name)
+            except Exception as e:
+                print(f"Firebase initialization error: {e}")
         
-        # Initialize the inference client
-        self.client = InferenceClient(
-            model="Qwen/QwQ-32B-Preview", 
-            api_key=self.hf_token
-        )
+        # Initialize the inference client (only if token is available)
+        self.client = None
+        if self.hf_token:
+            try:
+                self.client = InferenceClient(
+                    model="Qwen/QwQ-32B-Preview", 
+                    api_key=self.hf_token
+                )
+            except Exception as e:
+                print(f"Inference client initialization error: {e}")
         
         # Initialize conversation history
         self.conversation_history = []
 
     def signup(self, username, email, password):
         """User signup method"""
+        if not self.db:
+            return "Firebase is not initialized. Signup unavailable."
+        
         try:
             # Create user in Firebase Authentication
             user = auth.create_user(
@@ -53,13 +68,12 @@ class XylariaChat:
             )
             
             # Store additional user info in Firestore
-            if self.db:
-                user_ref = self.db.collection('users').document(user.uid)
-                user_ref.set({
-                    'username': username,
-                    'email': email,
-                    'created_at': firestore.SERVER_TIMESTAMP
-                })
+            user_ref = self.db.collection('users').document(user.uid)
+            user_ref.set({
+                'username': username,
+                'email': email,
+                'created_at': firestore.SERVER_TIMESTAMP
+            })
             
             return f"Successfully created account for {username}"
         except Exception as e:
@@ -67,6 +81,9 @@ class XylariaChat:
 
     def login(self, email, password):
         """User login method"""
+        if not self.db:
+            return "Firebase is not initialized. Login unavailable."
+        
         try:
             # Authenticate user with Firebase
             user = auth.get_user_by_email(email)
@@ -93,6 +110,10 @@ class XylariaChat:
             print(f"Error saving message: {e}")
 
     def get_response(self, user_input, chat_history):
+        # Check if client is initialized
+        if not self.client:
+            return "AI response is currently unavailable."
+        
         # Prepare messages with conversation context
         messages = [
             {"role": "system", "content": """You are Xylaria 1.4 Senoa, an AI assistant developed by SK MD Saad Amin. 
@@ -128,23 +149,6 @@ class XylariaChat:
                 background-color: #121212;
                 color: #ffffff;
             }
-            .chatbot .user-message {
-                background-color: #2563eb;
-                color: white;
-            }
-            .chatbot .bot-message {
-                background-color: #1f2937;
-                color: #f3f4f6;
-                box-shadow: 0 1px 3px 0 rgba(255, 255, 255, 0.1);
-            }
-            .chatbot-input-row {
-                background-color: #1f2937;
-                color: #f3f4f6;
-            }
-            .send-button {
-                background-color: #2563eb;
-                color: white;
-            }
         }
         
         @media (prefers-color-scheme: light) {
@@ -153,34 +157,6 @@ class XylariaChat:
                 background-color: #f3f4f6;
                 color: #1f2937;
             }
-            .chatbot .message {
-                max-width: 80%;
-                border-radius: 1rem;
-                padding: 0.75rem;
-                margin-bottom: 0.5rem;
-            }
-            .chatbot .user-message {
-                background-color: #3b82f6;
-                color: white;
-                align-self: flex-end;
-            }
-            .chatbot .bot-message {
-                background-color: white;
-                color: #1f2937;
-                align-self: flex-start;
-                box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1);
-            }
-            .chatbot-input-row {
-                background-color: white;
-                border-radius: 9999px;
-                padding: 0.5rem 1rem;
-            }
-            .send-button {
-                background-color: #3b82f6;
-                color: white;
-                border-radius: 9999px;
-                padding: 0.5rem;
-            }
         }
         """
 
@@ -194,7 +170,7 @@ class XylariaChat:
             # Get AI response stream
             response_stream = self.get_response(message, chat_history)
             
-            # If it's an error, return immediately
+            # If it's an error or string, return immediately
             if isinstance(response_stream, str):
                 return "", chat_history + [[message, response_stream]]
             
@@ -203,14 +179,17 @@ class XylariaChat:
             updated_history = chat_history + [[message, ""]]
             
             # Streaming output
-            for chunk in response_stream:
-                if chunk.choices[0].delta.content:
-                    chunk_content = chunk.choices[0].delta.content
-                    full_response += chunk_content
-                    
-                    # Update the last message in chat history with partial response
-                    updated_history[-1][1] = full_response
-                    yield "", updated_history
+            try:
+                for chunk in response_stream:
+                    if chunk.choices[0].delta.content:
+                        chunk_content = chunk.choices[0].delta.content
+                        full_response += chunk_content
+                        
+                        # Update the last message in chat history with partial response
+                        updated_history[-1][1] = full_response
+                        yield "", updated_history
+            except Exception as e:
+                return "", updated_history + [["", f"Error in response: {str(e)}"]]
             
             # Save bot message to Firestore
             self.save_message(user_id, full_response, 'bot')
@@ -240,7 +219,8 @@ class XylariaChat:
                 chatbot = gr.Chatbot(
                     label="Xylaria 1.4 Senoa",
                     height=500,
-                    show_copy_button=True
+                    show_copy_button=True,
+                    type="messages"  # Added to resolve deprecation warning
                 )
                 
                 # Input row with minimalist design
@@ -248,11 +228,9 @@ class XylariaChat:
                     txt = gr.Textbox(
                         show_label=False, 
                         placeholder="Type your message...", 
-                        container=False,
-                        scale=4,
-                        container_css_class="chatbot-input-row"
+                        scale=4
                     )
-                    btn = gr.Button("Send", css_class="send-button", scale=1)
+                    btn = gr.Button("Send", scale=1)
                 
                 # Clear conversation button
                 clear = gr.Button("Clear Conversation")
@@ -285,6 +263,6 @@ class XylariaChat:
 
         return demo
 
-# Initialize the chat system and launch interface
+# Note: Actual launch should be done with proper environment variable setup
 xylaria_chat = XylariaChat()
-xylaria_chat.create_interface().launch(share=True)
+xylaria_chat.create_interface().launch(share=True)