From 33cc710d10d25b2ca0322ccede7749d52f4b0cc6 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Mon, 15 Jun 2026 12:04:10 +0200
Subject: [PATCH] refac

---
 cptr/routers/bridge.py | 5 ++++-
 cptr/utils/bridge.py   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cptr/routers/bridge.py b/cptr/routers/bridge.py
index 676f1a7..b995bbf 100644
--- a/cptr/routers/bridge.py
+++ b/cptr/routers/bridge.py
@@ -281,9 +281,12 @@ async def whatsapp_webhook_verify(bot_id: str, request: Request):
 @webhook_router.post("/whatsapp/{bot_id}")
 async def whatsapp_webhook_inbound(bot_id: str, request: Request):
     """Receive inbound WhatsApp messages via webhook."""
-    from cptr.utils.bridge import bot_manager
     payload = await request.json()
 
+    bot_manager = getattr(request.app.state, "bot_manager", None)
+    if not bot_manager:
+        raise HTTPException(503, "Bot manager not initialized")
+
     adapter = bot_manager._adapters.get(bot_id)
     if adapter:
         from cptr.utils.adapters.whatsapp import WhatsAppAdapter
diff --git a/cptr/utils/bridge.py b/cptr/utils/bridge.py
index 287535d..a8834cc 100644
--- a/cptr/utils/bridge.py
+++ b/cptr/utils/bridge.py
@@ -524,7 +524,7 @@ class BotManager:
                 return
 
             # Update bot config with new workspace
-            from cptr.utils.config import Config
+            from cptr.models import Config
             bots_raw = await Config.get("bots") or []
             for b in bots_raw:
                 if b.get("id") == bot["id"]: