(20250121) With APIs to send, list, and update tags on WhatsApp messages (through Nimbus).
This commit is contained in:
@@ -6,11 +6,11 @@
|
||||
|
||||
DATE:
|
||||
|
||||
Thursday, 19th Dec., 2024
|
||||
Tuesday, 21st Jan., 2025.
|
||||
|
||||
OBJECTIVE:
|
||||
|
||||
To send SMS messages through various third-party clients.
|
||||
To send chat-app messages through various third-party clients.
|
||||
|
||||
REFERENCES:
|
||||
|
||||
@@ -62,12 +62,8 @@ from utils_v2.api.async_quart import (
|
||||
|
||||
# Models:
|
||||
from models.core.auth_token import CoreAuthTokenModel
|
||||
from models.api.message.sms.send import SMSSendRequestHeaders, SMSSendRequestData
|
||||
from models.message.sms.send import (
|
||||
NimbusSMSIndiaMessage,
|
||||
SavvyBulkSMSKenyaMessage,
|
||||
SMSSendManyResults
|
||||
)
|
||||
from models.api.message.chat.send import ChatSendRequestHeaders, ChatSendRequestData
|
||||
from models.message.chat.send import ChatSendOneResult, ChatSendManyResults, NimbusWhatsAppMessage
|
||||
|
||||
# Common:
|
||||
from shared import constants
|
||||
@@ -89,7 +85,7 @@ import asyncio
|
||||
|
||||
|
||||
# Related to Quart:
|
||||
sms_send_bp = Blueprint("sms_send", __name__)
|
||||
chat_send_bp = Blueprint("chat_send", __name__)
|
||||
|
||||
|
||||
# *****************************************************************************************************************
|
||||
@@ -109,7 +105,7 @@ sms_send_bp = Blueprint("sms_send", __name__)
|
||||
# *****************************************************************************************************************
|
||||
|
||||
|
||||
@sms_send_bp.record_once
|
||||
@chat_send_bp.record_once
|
||||
def init(blueprint_setup_state):
|
||||
|
||||
# This gets called when the blueprint is registered.
|
||||
@@ -120,44 +116,43 @@ def init(blueprint_setup_state):
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
async def send_sms_messages(
|
||||
mongo_data_conn: AsyncMongo,
|
||||
async def send_chat_messages(
|
||||
auth_token: CoreAuthTokenModel,
|
||||
messages: List[NimbusSMSIndiaMessage | SavvyBulkSMSKenyaMessage],
|
||||
messages: List[NimbusWhatsAppMessage],
|
||||
tags: List[Any]
|
||||
) -> SMSSendManyResults:
|
||||
) -> ChatSendManyResults:
|
||||
|
||||
"""
|
||||
This function purely tackles message sending. It is not concerned with authorization and security checks. Please
|
||||
ensure that you perform those checks before coming here.
|
||||
:param mongo_data_conn: The database connection to use to perform this task.
|
||||
:param auth_token: The auth token that will be used to send this message.
|
||||
:param messages: The list of messages to send out.
|
||||
:param tags: Any tags to attach with these SMS for filtering when querying in the listing service.
|
||||
:return: The structured result of sending many SMS messages.
|
||||
:param tags: Any tags to attach with these messages for filtering when querying in the listing service.
|
||||
:return: The structured result of sending many chat messages.
|
||||
"""
|
||||
|
||||
# Start by assuming failure:
|
||||
results = SMSSendManyResults()
|
||||
client_controller = None
|
||||
results = ChatSendManyResults()
|
||||
|
||||
# Select the right client:
|
||||
match auth_token.client:
|
||||
case "nimbusSmsIndia":
|
||||
results = await current_app.nimbus_sms_india_controller.send_many_sms(
|
||||
mongo_data_conn = mongo_data_conn,
|
||||
auth_token = auth_token,
|
||||
messages = messages,
|
||||
tags = tags
|
||||
)
|
||||
case "savvyBulkSmsKenya":
|
||||
results = await current_app.savvy_bulk_sms_kenya_controller.send_many_sms(
|
||||
mongo_data_conn = mongo_data_conn,
|
||||
auth_token = auth_token,
|
||||
messages = messages,
|
||||
tags = tags
|
||||
)
|
||||
case "whatsappNimbus": client_controller = current_app.whatsapp_nimbus_controller
|
||||
case _:
|
||||
results.message = "Invalid/unimplemented SMS client."
|
||||
client_controller = None
|
||||
results.message = f"Invalid/unimplemented client '{auth_token.client}'."
|
||||
|
||||
# If we have a match:
|
||||
if client_controller is not None:
|
||||
results = await client_controller.send_many_messages(
|
||||
sql_conn = current_app.sql_writer,
|
||||
mongo_data_conn = current_app.data_mongo,
|
||||
http_client = current_app.http_client,
|
||||
auth_token = auth_token,
|
||||
client = None,
|
||||
messages = messages,
|
||||
tags = tags
|
||||
)
|
||||
|
||||
# Done here:
|
||||
return results
|
||||
@@ -166,8 +161,8 @@ async def send_sms_messages(
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@sms_send_bp.route("", methods = ["POST"])
|
||||
@sms_send_bp.route("/send", methods = ["POST"])
|
||||
@chat_send_bp.route("", methods = ["POST"])
|
||||
@chat_send_bp.route("/send", methods = ["POST"])
|
||||
@set_api_version(api_version = "1.0.0")
|
||||
@read_input(sanitize_headers = False, sanitize_data = False)
|
||||
@get_session_info(key = "X-Session-Token", session_coro = "get_session")
|
||||
@@ -175,27 +170,27 @@ async def send_sms_messages(
|
||||
attr_name = "logs_mongo",
|
||||
project = constants.PROJECT_NAME,
|
||||
log_type = constants.MODULE_NAME,
|
||||
operation = "smsSendApi",
|
||||
log_input = True,
|
||||
operation = "chatSendApi",
|
||||
log_input = 1,
|
||||
log_output = True,
|
||||
sensitive_keys = ["sessionToken", "X-Session-Token", "tokenKey"]
|
||||
)
|
||||
@log_chain_to_mongo(attr_name = "logs_mongo")
|
||||
@should_not_be_under_maintenance(attr_name = "is_under_maintenance")
|
||||
@validate_input(
|
||||
header_validator = lambda x: SMSSendRequestHeaders(**x).model_dump(),
|
||||
data_validator = lambda x: SMSSendRequestData(**x)
|
||||
header_validator = lambda x: ChatSendRequestHeaders(**x).model_dump(),
|
||||
data_validator = lambda x: ChatSendRequestData(**x)
|
||||
)
|
||||
@handle_cancelled_request()
|
||||
async def send_sms_messages_api(
|
||||
inbound_headers: dict | SMSSendRequestHeaders = None,
|
||||
inbound_data: dict | SMSSendRequestData = None,
|
||||
async def send_chat_messages_api(
|
||||
inbound_headers: dict | ChatSendRequestHeaders = None,
|
||||
inbound_data: dict | ChatSendRequestData = None,
|
||||
inbound_files: dict = None,
|
||||
**kwargs
|
||||
):
|
||||
|
||||
"""
|
||||
Use this API when someone wants to send one or more SMS messages.
|
||||
Use this API when someone wants to send one or more chat messages.
|
||||
:param inbound_headers: auto-extracted by the decorators.
|
||||
:param inbound_data: auto-extracted by the decorators.
|
||||
:param inbound_files: auto-extracted by the decorators.
|
||||
@@ -220,7 +215,7 @@ async def send_sms_messages_api(
|
||||
)
|
||||
|
||||
# Get the token from the token key:
|
||||
auth_token = await current_app.sms_controller.get_token_from_key(
|
||||
auth_token = await current_app.chat_controller.get_token_from_key(
|
||||
mongo_data_conn = current_app.data_mongo,
|
||||
token_key = inbound_data.tokenKey
|
||||
)
|
||||
@@ -230,12 +225,12 @@ async def send_sms_messages_api(
|
||||
message = f"No such token key."
|
||||
)
|
||||
|
||||
# ┏┓ ┓ ┏┳┓┓ ┏┓┳┳┓┏┓
|
||||
# ┗┓┏┓┏┓┏┫ ┃ ┣┓┏┓ ┗┓┃┃┃┗┓
|
||||
# ┗┛┗ ┛┗┗┻ ┻ ┛┗┗ ┗┛┛ ┗┗┛
|
||||
# ┏┓ ┓ ┓ ┳┳┓
|
||||
# ┗┓┏┓┏┓┏┫ ╋┣┓┏┓ ┃┃┃┏┓┏┏┏┓┏┓┏┓
|
||||
# ┗┛┗ ┛┗┗┻ ┗┛┗┗ ┛ ┗┗ ┛┛┗┻┗┫┗
|
||||
# ┛
|
||||
|
||||
sending_results = await send_sms_messages(
|
||||
mongo_data_conn = current_app.data_mongo,
|
||||
sending_results = await send_chat_messages(
|
||||
auth_token = auth_token,
|
||||
messages = inbound_data.message,
|
||||
tags = inbound_data.tags
|
||||
|
||||
Reference in New Issue
Block a user