Edit webhook

app/main.py

@@ -18,7 +18,7 @@ from sentence_transformers import SentenceTransformer
 from app.search.rag_pipeline import RAGSystem
 from contextlib import asynccontextmanager
 # from app.db.database import create_indexes, init_db
-from app.services.webhook_handler import verify_webhook
+# from app.services.webhook_handler import verify_webhook
 from app.handlers.message_handler import MessageHandler
 from app.handlers.webhook_handler import WebhookHandler
 from app.handlers.media_handler import WhatsAppMediaHandler
@@ -39,7 +39,6 @@ logging.basicConfig(
 
 logger = logging.getLogger(__name__)
 
-
 # Initialize handlers at startup
 message_handler = None
 webhook_handler = None
@@ -183,9 +182,18 @@ async def webhook(request: Request, background_tasks: BackgroundTasks):
                 content={"status": "error", "detail": str(e)},
                 status_code=status.HTTP_500_INTERNAL_SERVER_ERROR
             )
-    
-app.get("/webhook")(verify_webhook)
 
+@app.get("/webhook")
+async def verify_webhook(request: Request):
+    mode = request.query_params.get('hub.mode')
+    token = request.query_params.get('hub.verify_token')
+    challenge = request.query_params.get('hub.challenge')
+
+    if mode == 'subscribe' and token == 'test':
+        return Response(content=challenge, media_type="text/plain")
+    else:
+        raise HTTPException(status_code=403, detail="Verification failed") 
+    
 @app.post("/load_file")
 async def load_file_with_markitdown(file_path:str, llm_client:str=None, model:str=None):
     
@@ -198,11 +206,13 @@ async def load_file_with_markitdown(file_path:str, llm_client:str=None, model:st
 
     print(f"documents: {documents}")
     return documents
+
 # Add a route for Prometheus metrics (optional, if not using a separate Prometheus server)
 @app.get("/metrics")
 async def metrics():
     from prometheus_client import generate_latest
     return Response(content=generate_latest(), media_type="text/plain")
+
 # In-memory cache with timestamp cleanup
 # class MessageCache:
 #     def __init__(self, max_age_hours: int = 24):
@@ -228,107 +238,5 @@ async def metrics():
 # message_cache = MessageCache()
 # user_chats = {}
 
-# @app.post("/webhook")
-# async def webhook(request: Request):
-#     request_id = f"req_{int(time.time()*1000)}"
-#     logger.info(f"Processing webhook request {request_id}")
-#     payload = await request.json()
-
-#     print("Webhook received:", payload)
-
-#     processed_count = 0
-#     error_count = 0
-#     results = []
-
-#     entries = payload.get("entry", [])
-
-#     for entry in entries:
-#         entry_id = entry.get("id")
-#         logger.info(f"Processing entry_id: {entry_id}")
-
-#         changes = entry.get("changes", [])
-#         for change in changes:
-#             messages = change.get("value", {}).get("messages", [])
-#             for message in messages:
-#                 message_id = message.get("id")
-#                 timestamp = message.get("timestamp")
-#                 content = message.get("text", {}).get("body")
-#                 sender_id = message.get("from")
-#                 msg_type = message.get('type')
-
-#                 # Deduplicate messages based on message_id
-#                 if message_cache.exists(message_id):
-#                     logger.info(f"Duplicate message detected and skipped: {message_id}")
-#                     continue
-                
-#                 if sender_id not in user_chats:
-#                     user_chats[sender_id] = []
-#                 user_chats[sender_id].append({
-                   
-#                     "role": "user",
-#                     "content": content
-#                 })
-
-#                 history = "".join([f"{item['role']}: {item['content']}\n" for item in user_chats[sender_id]])
-#                 print(f"history: {history}")
-
-#                 try:
-#                     # Process message with retry logic
-#                     result = await process_message_with_retry(
-#                         sender_id,content,
-#                         history,
-#                         timestamp, 
-#                     )
-#                     user_chats[sender_id].append({
-              
-#                     "role": "assistant",
-#                     "content": result
-#                     })
-
-#                     # Add the message ID to the cache
-#                     message_cache.add(message_id)
-#                     processed_count += 1
-#                     results.append(result)
-#                 except Exception as e:
-#                     error_count += 1
-#                     logger.error(
-#                         f"Failed to process message {message_id}: {str(e)}",
-#                         exc_info=True
-#                     )
-#                     results.append({
-#                         "status": "error",
-#                         "message_id": message_id,
-#                         "error": str(e)
-#                     })
-
-#     response_data = {
-#         "request_id": request_id,
-#         "processed": processed_count,
-#         "errors": error_count,
-#         "results": results
-#     }
-
-#     logger.info(
-#         f"Webhook processing completed - "
-#         f"Processed: {processed_count}, Errors: {error_count}"
-#     )
-
-#     return JSONResponse(
-#         content=response_data,
-#         status_code=status.HTTP_200_OK
-#     )
-
-
-
-# @app.get("/webhook")
-# async def verify_webhook(request: Request):
-#     mode = request.query_params.get('hub.mode')
-#     token = request.query_params.get('hub.verify_token')
-#     challenge = request.query_params.get('hub.challenge')
-
-#     # Replace 'your_verification_token' with the token you set in Facebook Business Manager
-#     if mode == 'subscribe' and token == 'test':
-#            # Return the challenge as plain text
-#         return Response(content=challenge, media_type="text/plain")
-#     else:
-#         raise HTTPException(status_code=403, detail="Verification failed")
+
+

app/services/message.py

@@ -142,8 +142,8 @@ async def generate_response_from_gemini(
         logger.info(f"Generating response for sender: {sender}")
 
         # Initialize the model
-        model = genai.GenerativeModel("gemini-1.5-pro-002", system_instruction= system_prompt)
-        # model = genai.GenerativeModel("gemini-1.5-flash", system_instruction= system_prompt)
+        # model = genai.GenerativeModel("gemini-1.5-pro-002", system_instruction= system_prompt)
+        model = genai.GenerativeModel("gemini-1.5-flash", system_instruction= system_prompt)
         # model = genai.GenerativeModel("gemini-exp-1206", system_instruction= system_prompt)
        
         # Start chat with history

indexed_links.txt

@@ -0,0 +1,15 @@
+2025-02-14 17:07:18,730 - INFO - 88247d7d-6925-4060-8be1-a268e112b0f6_https://sswalfa.surabaya.go.id/info/detail/izin-pengumpulan-sumbangan-bencana
+2025-02-14 17:07:19,044 - INFO - b70bd12c-66a5-4ee1-a52b-9263caf4801c_https://sswalfa.surabaya.go.id/info/detail/izin-pemakaian-ruang-terbuka-hijau
+2025-02-14 17:07:19,503 - INFO - a35b102d-269b-4532-8755-6206ba7c727a_https://sswalfa.surabaya.go.id/info/detail/pengganti-ipt
+2025-02-14 17:07:19,816 - INFO - 10dc5c2a-5817-48cb-a076-54292f0856f7_https://sswalfa.surabaya.go.id/info/detail/arahan-sistem-drainase
+2025-02-14 17:07:20,200 - INFO - 3e3cf77d-fba6-4edc-bd40-78e0276a44e4_https://sswalfa.surabaya.go.id/info/detail/rangkaian-pelayanan-surat-pernyataan-belum-menikah-lagi-bagi-jandaduda
+2025-02-14 17:12:33,533 - INFO - 639989ff-d5ca-4d6e-bbb1-380c638ae8b1_https://sswalfa.surabaya.go.id/info/detail/izin-pengumpulan-sumbangan-bencana
+2025-02-14 17:12:35,176 - INFO - 04ec2486-4fe0-40bb-b14f-5963a14df747_https://sswalfa.surabaya.go.id/info/detail/izin-pemakaian-ruang-terbuka-hijau
+2025-02-14 17:12:35,485 - INFO - e2663390-1328-4e97-9ee7-f3381600131c_https://sswalfa.surabaya.go.id/info/detail/pengganti-ipt
+2025-02-14 17:12:36,861 - INFO - b722b446-4b4e-4f94-9b1b-02b2591c359f_https://sswalfa.surabaya.go.id/info/detail/arahan-sistem-drainase
+2025-02-14 17:12:37,155 - INFO - d9877c2b-b74c-4f71-8492-e114d1f2510b_https://sswalfa.surabaya.go.id/info/detail/rangkaian-pelayanan-surat-pernyataan-belum-menikah-lagi-bagi-jandaduda
+2025-02-22 21:41:45,691 - INFO - a134264b-71fc-42d4-bbd2-fa7af5939a43_https://sswalfa.surabaya.go.id/info/detail/izin-pengumpulan-sumbangan-bencana
+2025-02-22 21:41:46,002 - INFO - 8581dd3e-86f7-41b1-9540-446cbd135e2a_https://sswalfa.surabaya.go.id/info/detail/izin-pemakaian-ruang-terbuka-hijau
+2025-02-22 21:41:46,472 - INFO - f45fc1f2-5ead-4a94-b3f2-eca2a7e6b851_https://sswalfa.surabaya.go.id/info/detail/pengganti-ipt
+2025-02-22 21:41:46,795 - INFO - 80b46ca9-480b-4651-8074-56861488c2e5_https://sswalfa.surabaya.go.id/info/detail/arahan-sistem-drainase
+2025-02-22 21:41:47,152 - INFO - 617438e3-472e-4896-8492-4f52d783a401_https://sswalfa.surabaya.go.id/info/detail/rangkaian-pelayanan-surat-pernyataan-belum-menikah-lagi-bagi-jandaduda