Update app2.py

app2.py

@@ -24,6 +24,11 @@ class Settings(BaseSettings):
     db_user: str
     db_password: str
     db_name: str
+    database_type: str
+    database_port: int
+    chatbot_api_key: str
+    rss_feed_url: str
+    storage_location: str
     
     class Config:
         # Optional: if you want to allow extra fields
@@ -33,10 +38,10 @@ settings = Settings()
 
 # --- Database Connection ---
 def get_db_url(settings: Settings) -> str:
-    if settings.DATABASE_TYPE == "mysql":
-        return f"mysql+aiomysql://{settings.DATABASE_USER}:{settings.DATABASE_PASSWORD}@{settings.DATABASE_HOST}:{settings.DATABASE_PORT}/{settings.DATABASE_NAME}"
-    elif settings.DATABASE_TYPE == "postgresql":
-        return f"postgresql+asyncpg://{settings.DATABASE_USER}:{settings.DATABASE_PASSWORD}@{settings.DATABASE_HOST}:{settings.DATABASE_PORT}/{settings.DATABASE_NAME}"
+    if settings.database_type == "mysql":
+        return f"mysql+aiomysql://{settings.db_user}:{settings.db_password}@{settings.db_host}:{settings.database_port}/{settings.db_name}"
+    elif settings.database_type == "postgresql":
+        return f"postgresql+asyncpg://{settings.db_user}:{settings.db_password}@{settings.db_host}:{settings.database_port}/{settings.db_name}"
     else:
         return "sqlite+aiosqlite:///default.db"
 
@@ -52,17 +57,17 @@ async def set_db_connection(
     try:
         # Update settings if new values provided
         if db_type:
-            settings.DATABASE_TYPE = db_type
+            settings.database_type = db_type
         if db_host:
-            settings.DATABASE_HOST = db_host
+            settings.db_host = db_host
         if db_port:
-            settings.DATABASE_PORT = db_port
+            settings.database_port = db_port
         if db_user:
-            settings.DATABASE_USER = db_user
+            settings.db_user = db_user
         if db_password:
-            settings.DATABASE_PASSWORD = db_password
+            settings.db_password = db_password
         if db_name:
-            settings.DATABASE_NAME = db_name
+            settings.db_name = db_name
 
         # Close existing connection if any
         if db_session:
@@ -101,7 +106,7 @@ async def set_db_connection():
     global db_session, engine
     try:
         engine = create_async_engine(
-            f"mysql+aiomysql://{settings.DATABASE_USER}:{settings.DATABASE_PASSWORD}@{settings.DATABASE_HOST}:{settings.DATABASE_PORT}/{settings.DATABASE_NAME}",
+            f"mysql+aiomysql://{settings.db_user}:{settings.db_password}@{settings.db_host}:{settings.database_port}/{settings.db_name}",
             echo=False,
         )
         async_session_maker = sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
@@ -142,10 +147,21 @@ async def store_data(url: str, content: str, analysis: Dict[str, Any]):
 
 async def update_feed_content():
     try:
-        # ... (Your RSS feed generation logic) ...
-        pass
+        # Fetch RSS feed content from database
+        async with db_session as session:
+            articles = await session.execute(select(Article))
+            feed_content = []
+            for article in articles.scalars():
+                feed_content.append({
+                    "title": article.title,
+                    "url": article.url,
+                    "content": article.content,
+                    "timestamp": article.timestamp,
+                })
+            return feed_content
     except Exception as e:
         logger.error(f"Error updating feed content: {e}")
+        return []
 
 # --- Website Scraping and Analysis ---
 async def scrape_website(url: str) -> str:
@@ -179,13 +195,13 @@ async def predict_website_traffic(url: str) -> Dict[str, Any]:
 # --- Chatbot Integration ---
 async def chatbot_response(message: str, chat_history: List[Dict[str, str]]) -> List[Dict[str, str]]:
     try:
-        if not settings.CHATBOT_API_KEY:
+        if not settings.chatbot_api_key:
             raise ValueError("Chatbot API key is not set.")
         # ... (Your code to call the chatbot API) ...
         # Example using a hypothetical API:
         response = requests.post(
             "https://your-chatbot-api.com/chat",
-            json={"message": message, "api_key": settings.CHATBOT_API_KEY},
+            json={"message": message, "api_key": settings.chatbot_api_key},
         )
         response.raise_for_status()
         bot_response = response.json()["response"]
@@ -219,15 +235,12 @@ async def main():
         with gr.Row():
             with gr.Column():
                 gr.Markdown("## Database Settings")
-                # ... (Database settings are now configured in .env file) ...
                 db_status_textbox = gr.Textbox(label="Database Status", interactive=False)
                 status_text = gr.Textbox(label="Status", interactive=False)
 
                 gr.Markdown("## RSS Feed Reader Settings")
-                # ... (RSS feed settings are now configured in .env file) ...
                 view_button = gr.Button("View Feed")
                 target_urls = gr.Textbox(label="Target URLs (comma-separated)", placeholder="https://example.com, https://another-site.com")
-                # ... (Storage location is now configured in .env file) ...
                 feed_rss_checkbox = gr.Checkbox(label="Enable RSS Feed")
                 start_button = gr.Button("Start Monitoring")
                 stop_button = gr.Button("Stop Monitoring")
@@ -247,7 +260,7 @@ async def main():
         # --- Button Actions ---
         start_button.click(
             fn=on_start_click,
-            inputs=[target_urls, feed_rss_checkbox],  # Removed database settings
+            inputs=[target_urls, feed_rss_checkbox],
             outputs=[status_text],
         )
 
@@ -255,7 +268,7 @@ async def main():
 
         view_button.click(
             fn=on_view_feed_click,
-            inputs=[],  # Removed feed_url input (now from settings)
+            inputs=[],
             outputs=[feed_content],
         )
 
@@ -284,8 +297,12 @@ async def main():
         )
 
         # --- Periodic Updates ---
-        feed_updater = gr.Timer(every=300)  # Update every 5 minutes
-        feed_updater.tick(fn=update_feed_content, outputs=[feed_content])
+        async def update_feed_periodically(feed_content):
+            while True:
+                await update_feed_content()
+                await asyncio.sleep(300)  # Check every 5 minutes
+
+        feed_updater = asyncio.create_task(update_feed_periodically(feed_content))
 
         # --- Load Database Status ---
         demo.load(fn=update_db_status, outputs=[db_status_textbox])
@@ -299,7 +316,7 @@ async def on_start_click(target_urls_str: str, feed_enabled: bool):
     global monitoring_task
     urls = [url.strip() for url in target_urls_str.split(",")]
     await set_db_connection()
-    monitoring_task = asyncio.create_task(start_monitoring(urls, settings.STORAGE_LOCATION, feed_enabled))
+    monitoring_task = asyncio.create_task(start_monitoring(urls, settings.storage_location, feed_enabled))
     return "Monitoring started."
 
 async def on_stop_click():
@@ -310,7 +327,7 @@ async def on_stop_click():
     return "Monitoring stopped."
 
 async def on_view_feed_click():
-    return await fetch_feed_content(settings.RSS_FEED_URL)
+    return await update_feed_content()
 
 async def on_scrape_click(url: str):
     return await scrape_website(url)