-
+
Add'
- if not i
- else {
- i.id: f'.get_favicon()})
{Platform(i.platform).label}'
+ if integrations.count() > 1:
+ with st.center(direction="row"):
+ bid = st.horizontal_radio(
+ "",
+ [i.id for i in integrations],
+ lambda i: {
+ i.id: f' {i.name}'
for i in integrations
- }[i]
- ),
- key="bi_id",
- button_props={"style": {"width": "140px"}},
- )
- if bid is None:
- raise RedirectException(add_integration)
- bi = integrations.get(id=bid)
- icon = f'.get_favicon()})
'
+ }[i],
+ key="bi_id",
+ button_props={"style": {"width": "156px", "overflow": "hidden"}},
+ )
+ bi = integrations.get(id=bid)
+ icon = f''
+ st.change_url(
+ self.get_tab_url(
+ MenuTabs.integrations, query_params={"bi_id": bi.id}
+ ),
+ self.request,
+ )
+ else:
+ bi = integrations[0]
+ icon = f''
st.newline()
with st.center():
with st.div(style={"width": "100%", "text-align": "left"}):
+ test_link = get_bot_test_link(bi)
col1, col2 = st.columns(2, style={"align-items": "center"})
with col1:
+ st.write("###### Connected To")
st.write(f"{icon} {bi}", unsafe_allow_html=True)
with col2:
- copy_to_clipboard_button(
- "Copy Link",
- value=self.get_tab_url(
- MenuTabs.integrations, query_params={"bi_id": bi.id}
- ),
- type="link",
- )
+ if test_link:
+ copy_to_clipboard_button(
+ f"Copy {Platform(bi.platform).label} Link",
+ value=test_link,
+ type="secondary",
+ )
+ else:
+ st.write("Message quicklink not available.")
- st.newline()
col1, col2 = st.columns(2, style={"align-items": "center"})
with col1:
- st.write("#### Test 📱")
+ st.write("###### Test")
st.caption(f"Send a test {Platform(bi.platform).label} message.")
with col2:
- test_link = get_bot_test_link(bi)
if test_link:
st.anchor(
f"{icon} Message {bi.get_display_name()}",
test_link,
unsafe_allow_html=True,
- style={"width": "100%"},
)
else:
st.write("Message quicklink not available.")
col1, col2 = st.columns(2, style={"align-items": "center"})
with col1:
- st.write("#### Understand your Users 📊")
- st.caption(
- f"Configure your {Platform(bi.platform).label} integration."
- )
+ st.write("###### Understand your Users")
+ st.caption(f"See real-time analytics.")
with col2:
stats_url = furl(
VideoBotsStatsPage.app_url(), args={"bi_id": bi.id}
).tostr()
st.anchor(
- "View Analytics",
+ "📊 View Analytics",
stats_url,
- style={"width": "100%"},
)
- col1, col2 = st.columns(2, style={"align-items": "center"})
- with col1:
- st.write("#### Evaluate ⚖️")
- st.caption(f"Run automated tests against sample user messages.")
- with col2:
- st.anchor(
- "Run Bulk Tests",
- BulkRunnerPage.app_url(),
- style={"width": "100%"},
- )
+ # ==== future changes ====
+ # col1, col2 = st.columns(2, style={"align-items": "center"})
+ # with col1:
+ # st.write("###### Evaluate ⚖️")
+ # st.caption(f"Run automated tests against sample user messages.")
+ # with col2:
+ # st.anchor(
+ # "Run Bulk Tests",
+ # BulkRunnerPage.app_url(),
+ # )
# st.write("#### Automated Analysis 🧠")
# st.caption(
# "Add a Gooey.AI LLM prompt to automatically analyse and categorize user messages. [Example](https://gooey.ai/compare-large-language-models/how-farmerchat-turns-conversations-to-structured-data/?example_id=lbjnoem7) and [Guide](https://gooey.ai/docs/guides/copilot/conversation-analysis)."
# )
- st.newline()
- st.write("#### Configure Settings 🛠️")
- if bi.platform == Platform.SLACK:
- slack_specific_settings(bi, run_title)
- general_integration_settings(bi)
+ with st.expander("Configure Settings 🛠️"):
+ if bi.platform == Platform.SLACK:
+ slack_specific_settings(bi, run_title)
+ general_integration_settings(bi)
- if bi.platform in [Platform.SLACK, Platform.WHATSAPP]:
- st.newline()
- st.newline()
- broadcast_input(bi)
+ if bi.platform in [Platform.SLACK, Platform.WHATSAPP]:
+ st.newline()
+ st.newline()
+ broadcast_input(bi)
- st.newline()
- st.newline()
- st.write("#### Danger Zone 🚨")
col1, col2 = st.columns(2, style={"align-items": "center"})
with col1:
+ st.write("###### Disconnect")
+ st.caption(
+ f"Disconnect {run_title} from {Platform(bi.platform).label} {bi.get_display_name()}."
+ )
+ with col2:
if st.button(
- "🔌💔️ Disconnect", key="btn_disconnect", style={"width": "100%"}
+ "💔️ Disconnect",
+ key="btn_disconnect",
):
bi.saved_run = None
bi.published_run = None
+ bi.save()
+ st.experimental_rerun()
+
+ col1, col2 = st.columns(2, style={"align-items": "center"})
+ with col1:
+ st.write("###### Add Integration")
+ st.caption(f"Add another connection for {run_title}.")
with col2:
- st.caption(
- f"Disconnect {run_title} from {Platform(bi.platform).label} {bi.get_display_name()}"
- )
+ if st.button(
+ f' Add Integration',
+ key="btn_connect",
+ ):
+ raise RedirectException(add_integration)
def show_landbot_widget():
diff --git a/routers/facebook_api.py b/routers/facebook_api.py
index 134415405..41679b72b 100644
--- a/routers/facebook_api.py
+++ b/routers/facebook_api.py
@@ -23,7 +23,8 @@ def fb_connect_whatsapp_redirect(request: Request):
redirect_url = furl("/login", query_params={"next": request.url})
return RedirectResponse(str(redirect_url))
- retry_button = f'Retry'
+ on_completion = request.query_params.get("state")
+ retry_button = f'Retry'
code = request.query_params.get("code")
if not code:
@@ -63,6 +64,7 @@ def fb_connect_whatsapp_redirect(request: Request):
# {'data': [{'verified_name': 'XXXX', 'code_verification_status': 'VERIFIED', 'display_phone_number': 'XXXX', 'quality_rating': 'UNKNOWN', 'platform_type': 'NOT_APPLICABLE', 'throughput': {'level': 'NOT_APPLICABLE'}, 'last_onboarded_time': '2024-02-22T20:42:16+0000', 'id': 'XXXX'}], 'paging': {'cursors': {'before': 'XXXX', 'after': 'XXXX'}}}
phone_numbers = r.json()["data"]
+ integrations = []
for phone_number in phone_numbers:
business_name = phone_number["verified_name"]
display_phone_number = phone_number["display_phone_number"]
@@ -109,7 +111,9 @@ def fb_connect_whatsapp_redirect(request: Request):
)
r.raise_for_status()
- return HTMLResponse(
+ integrations.append(bi)
+
+ return return_to_app_url(integrations, on_completion) or HTMLResponse(
f"Sucessfully Connected to whatsapp! You may now close this page."
)
@@ -120,7 +124,8 @@ def fb_connect_redirect(request: Request):
redirect_url = furl("/login", query_params={"next": request.url})
return RedirectResponse(str(redirect_url))
- retry_button = f'Retry'
+ on_completion = request.query_params.get("state")
+ retry_button = f'Retry'
code = request.query_params.get("code")
if not code:
@@ -129,7 +134,7 @@ def fb_connect_redirect(request: Request):
+ retry_button,
status_code=400,
)
- user_access_token = _get_access_token_from_code(code)
+ user_access_token = _get_access_token_from_code(code, fb_connect_redirect_url)
db.get_user_doc_ref(request.user.uid).update({"fb_access_token": user_access_token})
@@ -146,7 +151,7 @@ def fb_connect_redirect(request: Request):
)
page_names = ", ".join(map(str, integrations))
- return HTMLResponse(
+ return return_to_app_url(integrations, on_completion) or HTMLResponse(
f"Sucessfully Connected to {page_names}! You may now close this page."
)
@@ -213,13 +218,29 @@ def fb_webhook(
return Response("OK")
-wa_connect_redirect_url = str(
- furl(settings.APP_BASE_URL)
- / router.url_path_for(fb_connect_whatsapp_redirect.__name__)
-)
+def return_to_app_url(
+ integrations: list,
+ on_completion: str | None = None,
+) -> bool | RedirectResponse:
+ if not on_completion or not integrations:
+ return False
+ return RedirectResponse(
+ furl(on_completion)
+ .add(query_params={"connect_ids": ",".join([str(i.id) for i in integrations])})
+ .tostr()
+ )
+
-wa_connect_url = str(
+wa_connect_redirect_url = (
furl(
+ settings.APP_BASE_URL,
+ )
+ / router.url_path_for(fb_connect_whatsapp_redirect.__name__)
+).tostr()
+
+
+def wa_connect_url(on_completion: str | None = None) -> str:
+ return furl(
"https://www.facebook.com/v18.0/dialog/oauth",
query_params={
"client_id": settings.FB_APP_ID,
@@ -227,16 +248,21 @@ def fb_webhook(
"redirect_uri": wa_connect_redirect_url,
"response_type": "code",
"config_id": settings.FB_WHATSAPP_CONFIG_ID,
+ "state": on_completion,
},
- )
-)
+ ).tostr()
-fb_connect_redirect_url = str(
- furl(settings.APP_BASE_URL) / router.url_path_for(fb_connect_redirect.__name__)
-)
-fb_connect_url = str(
+fb_connect_redirect_url = (
furl(
+ settings.APP_BASE_URL,
+ )
+ / router.url_path_for(fb_connect_redirect.__name__)
+).tostr()
+
+
+def fb_connect_url(on_completion: str | None = None) -> str:
+ return furl(
"https://www.facebook.com/dialog/oauth",
query_params={
"client_id": settings.FB_APP_ID,
@@ -250,12 +276,13 @@ def fb_webhook(
"pages_show_list",
]
),
+ "state": on_completion,
},
- )
-)
+ ).tostr()
-ig_connect_url = str(
- furl(
+
+def ig_connect_url(on_completion: str | None = None) -> str:
+ return furl(
"https://www.facebook.com/dialog/oauth",
query_params={
"client_id": settings.FB_APP_ID,
@@ -272,17 +299,17 @@ def fb_webhook(
"pages_show_list",
]
),
+ "state": on_completion,
},
- )
-)
+ ).tostr()
-def _get_access_token_from_code(code: str, redirect_uri: str | None = None) -> str:
+def _get_access_token_from_code(code: str, redirect_uri: str) -> str:
r = requests.get(
"https://graph.facebook.com/v15.0/oauth/access_token",
params={
"client_id": settings.FB_APP_ID,
- "redirect_uri": redirect_uri or fb_connect_redirect_url,
+ "redirect_uri": redirect_uri,
"client_secret": settings.FB_APP_SECRET,
"code": code,
},
diff --git a/routers/slack_api.py b/routers/slack_api.py
index 4186a474e..d300b70d7 100644
--- a/routers/slack_api.py
+++ b/routers/slack_api.py
@@ -23,43 +23,47 @@
fetch_user_info,
parse_slack_response,
)
+from routers.facebook_api import return_to_app_url
router = APIRouter()
-slack_connect_url = furl(
- "https://slack.com/oauth/v2/authorize",
- query_params=dict(
- client_id=settings.SLACK_CLIENT_ID,
- scope=",".join(
- [
- "channels:history",
- "channels:read",
- "chat:write",
- "chat:write.customize",
- "files:read",
- "files:write",
- "groups:history",
- "groups:read",
- "groups:write",
- "groups:write.invites",
- "groups:write.topic",
- "incoming-webhook",
- "remote_files:read",
- "remote_files:share",
- "remote_files:write",
- "users:read",
- ]
- ),
- user_scope=",".join(
- [
- "channels:write",
- "channels:write.invites",
- "groups:write",
- "groups:write.invites",
- ]
+
+def slack_connect_url(on_completion: str | None = None):
+ return furl(
+ "https://slack.com/oauth/v2/authorize",
+ query_params=dict(
+ client_id=settings.SLACK_CLIENT_ID,
+ scope=",".join(
+ [
+ "channels:history",
+ "channels:read",
+ "chat:write",
+ "chat:write.customize",
+ "files:read",
+ "files:write",
+ "groups:history",
+ "groups:read",
+ "groups:write",
+ "groups:write.invites",
+ "groups:write.topic",
+ "incoming-webhook",
+ "remote_files:read",
+ "remote_files:share",
+ "remote_files:write",
+ "users:read",
+ ]
+ ),
+ user_scope=",".join(
+ [
+ "channels:write",
+ "channels:write.invites",
+ "groups:write",
+ "groups:write.invites",
+ ]
+ ),
+ state=on_completion,
),
- ),
-)
+ )
@router.get("/__/slack/redirect/")
@@ -68,7 +72,8 @@ def slack_connect_redirect(request: Request):
redirect_url = furl("/login", query_params={"next": request.url})
return RedirectResponse(str(redirect_url))
- retry_button = f'Retry'
+ on_completion = request.query_params.get("state")
+ retry_button = f'Retry'
code = request.query_params.get("code")
if not code:
@@ -134,7 +139,7 @@ def slack_connect_redirect(request: Request):
if bi.slack_create_personal_channels:
create_personal_channels_for_all_members.delay(bi.id)
- return HTMLResponse(
+ return return_to_app_url([bi], on_completion) or HTMLResponse(
f"Sucessfully Connected to {slack_team_name} workspace on #{slack_channel_name}! You may now close this page."
)
Connect to an Instagram account you own.
@@ -1129,121 +1166,133 @@ def integration_test_config_screen(
with st.center():
st.markdown(
f"""
- ## Configure your Copilot
+ #### Configure your Copilot
Run Saved ✅ ~ Connected ✅ ~ Test & Configure ✅
""",
unsafe_allow_html=True,
)
- with st.center(direction="row"):
- bid = st.horizontal_radio(
- "",
- [i.id for i in integrations] + [None],
- lambda i: (
- f'