Update app2.py

app2.py

@@ -16,13 +16,15 @@ from urllib.parse import urljoin
 import logging
 from sqlalchemy.orm import Session
 from sqlalchemy.future import select
+from bs4 import BeautifulSoup
+import validators
 
 Base = declarative_base()
 
 class Article(Base):
     __tablename__ = 'articles'
     id = Column(Integer, primary_key=True)
-    url = Column('url', String(2048), nullable=False, unique=True)  # Increased URL length limit
+    url = Column('url', String(2048), nullable=False, unique=True) 
     title = Column('title', String(255))
     content = Column('content', Text())
     hash_value = Column('hash', String(32))
@@ -43,6 +45,7 @@ monitoring_tasks = {}
 url_monitoring_intervals = {}
 change_counts = {}
 history = []
+db_session = None  # Initialize db_session globally
 
 async def create_db_engine(db_url):
     try:
@@ -212,15 +215,15 @@ async def chatbot_response(message: str, history: List[Tuple[str, str]]):
         return history, history
 
 
-async def update_db_status(db_status):
+async def update_db_status(db_status_textbox):
     while True:
         try:
             await db_session.execute("SELECT 1")
             db_status = "Connected"
         except SQLAlchemyError:
             db_status = "Disconnected"
+               yield db_status  # Use a generator to update the textbox
         await asyncio.sleep(60)  # Check every minute
-        return db_status
 
 
 async def update_feed_content():  # Remove db_session parameter
@@ -243,11 +246,11 @@ async def update_feed_content():  # Remove db_session parameter
         logger.error(f"Database error: {e}")
         return None
 
-async def periodic_update_with_error_handling(db_session):
+async def periodic_update_with_error_handling():
     while True:
         try:
             await asyncio.sleep(300)  # Wait for 5 minutes
-            await update_feed_content(db_session)
+            await update_feed_content()
         except Exception as e:
             logger.error(f"Error in periodic update: {e}")
 
@@ -260,86 +263,79 @@ async def main():
 
         demo = gr.Blocks()
 
-    with demo:
-        gr.Markdown("# Website Monitor and Chatbot")
-
-        with gr.Row():
-            with gr.Column():
-                db_url = gr.Textbox(
-                    label="Database URL", value="sqlite:///monitoring.db")
-                db_status = gr.Textbox(label="Database Status",
-                                      interactive=False,
-                                      value="Connected")
-
-            with gr.Column():
-                with gr.Tab("Configuration"):
-                    target_urls = gr.Textbox(
-                        label="Target URLs (comma-separated)",
-                        placeholder=
-                        "https://example.com, https://another-site.com")
-                    storage_location = gr.Textbox(
-                        label="Storage Location (CSV file path)",
-                        placeholder="/path/to/your/file.csv")
-                    feed_rss_checkbox = gr.Checkbox(label="Enable RSS Feed")
-                    start_button = gr.Button("Start Monitoring")
-                    stop_button = gr.Button("Stop Monitoring")
-                    status_text = gr.Textbox(label="Status",
-                                              interactive=False)
-                    history_text = gr.Textbox(label="History",
-                                              lines=10,
-                                              interactive=False)
-
-                with gr.Tab("User-End View"):
-                    feed_content = gr.JSON(label="RSS Feed Content")
-
-                with gr.Tab("Chatbot"):
-                    chatbot_interface = gr.Chatbot(type='messages')
-                    message_input = gr.Textbox(
-                        placeholder="Type your message here...")
-                    send_button = gr.Button("Send")
-
-        async def on_start_click(target_urls_str: str, storage_loc: str,
-                                  feed_enabled: bool):
-            urls = [url.strip() for url in target_urls_str.split(",")]
-            await start_monitoring(urls,
-                                      storage_loc if storage_loc else None,
-                                      feed_enabled)
-            return "Monitoring started for valid URLs."
-
-        async def on_stop_click():
-            for url in list(monitoring_tasks.keys()):
-                stop_monitoring(url)
-            return "Monitoring stopped for all URLs."
-
-        start_button.click(
-            on_start_click,
-            inputs=[target_urls, storage_location, feed_rss_checkbox],
-            outputs=[status_text])
-        stop_button.click(on_stop_click, outputs=[status_text])
-        send_button.click(
-            chatbot_response,
-            inputs=[message_input, chatbot_interface],
-            outputs=[chatbot_interface, message_input])        
-
-        # Set up the timer
-        feed_updater = gr.Timer(interval=300)
-        feed_updater.tick(fn=update_feed_content,
-                         outputs=feed_content)
-
-        # Create background tasks
-        update_tasks = [
-            asyncio.create_task(periodic_update_with_error_handling(db_session)),
-            asyncio.create_task(update_db_status(db_status))
-        ]
+        with demo:
+            gr.Markdown("# Website Monitor and Chatbot")
+
+            with gr.Row():
+                with gr.Column():
+                    db_url = gr.Textbox(
+                        label="Database URL", value="sqlite:///monitoring.db")
+                    db_status_textbox = gr.Textbox(label="Database Status",
+                                            interactive=False,
+                                            value="Connected")
+
+                with gr.Column():
+                    with gr.Tab("Configuration"):
+                        target_urls = gr.Textbox(
+                            label="Target URLs (comma-separated)",
+                            placeholder=
+                            "https://example.com, https://another-site.com")
+                        storage_location = gr.Textbox(
+                            label="Storage Location (CSV file path)",
+                            placeholder="/path/to/your/file.csv")
+                        feed_rss_checkbox = gr.Checkbox(label="Enable RSS Feed")
+                        start_button = gr.Button("Start Monitoring")
+                        stop_button = gr.Button("Stop Monitoring")
+                        status_text = gr.Textbox(label="Status",
+                                                interactive=False)
+                        history_text = gr.Textbox(label="History",
+                                                lines=10,
+                                                interactive=False)
+
+                    with gr.Tab("User-End View"):
+                        feed_content = gr.JSON(label="RSS Feed Content")
+
+                    with gr.Tab("Chatbot"):
+                        chatbot_interface = gr.Chatbot(type='messages')
+                        message_input = gr.Textbox(
+                            placeholder="Type your message here...")
+                        send_button = gr.Button("Send")
+
+            async def on_start_click(target_urls_str: str, storage_loc: str,
+                                    feed_enabled: bool):
+                urls = [url.strip() for url in target_urls_str.split(",")]
+                await start_monitoring(urls,
+                                        storage_loc if storage_loc else None,
+                                        feed_enabled)
+                return "Monitoring started for valid URLs."
+
+            async def on_stop_click():
+                for url in list(monitoring_tasks.keys()):
+                    stop_monitoring(url)
+                return "Monitoring stopped for all URLs."
+
+            start_button.click(
+                on_start_click,
+                inputs=[target_urls, storage_location, feed_rss_checkbox],
+                outputs=[status_text])
+            stop_button.click(on_stop_click, outputs=[status_text])
+            send_button.click(
+                chatbot_response,
+                inputs=[message_input, chatbot_interface],
+                outputs=[chatbot_interface, message_input])        
+
+            # Set up the timer
+            feed_updater = gr.Timer(interval=300)
+            feed_updater.tick(fn=update_feed_content,
+                            outputs=feed_content)
+
+            # Create background tasks
+            demo.load(update_db_status, outputs=db_status_textbox)
+            asyncio.create_task(periodic_update_with_error_handling())
 
         # Launch the demo
         await demo.launch()
 
-        # Wait for background tasks to complete
-        for task in update_tasks:
-            task.cancel()
-        await asyncio.gather(*update_tasks, return_exceptions=True)
-
     except Exception as e:
         logger.error(f"Error in main: {e}")
     finally: