(20241203) Mails sync'ing, listing, and fetching done.
This commit is contained in:
+17
-14
@@ -90,7 +90,7 @@ import datetime
|
||||
|
||||
|
||||
# Related to Quart:
|
||||
mail_retrieve_bp = Blueprint("mail_retrieve", __name__)
|
||||
mail_list_bp = Blueprint("mail_list", __name__)
|
||||
|
||||
|
||||
# *****************************************************************************************************************
|
||||
@@ -110,7 +110,7 @@ mail_retrieve_bp = Blueprint("mail_retrieve", __name__)
|
||||
# *****************************************************************************************************************
|
||||
|
||||
|
||||
@mail_retrieve_bp.record_once
|
||||
@mail_list_bp.record_once
|
||||
def init(blueprint_setup_state):
|
||||
|
||||
# This gets called when the blueprint is registered.
|
||||
@@ -121,7 +121,7 @@ def init(blueprint_setup_state):
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@mail_retrieve_bp.route("/list/account/id", methods = ["GET"])
|
||||
@mail_list_bp.route("/list/account/id", methods = ["GET"])
|
||||
@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")
|
||||
@@ -137,19 +137,19 @@ def init(blueprint_setup_state):
|
||||
@log_chain_to_mongo(attr_name = "logs_mongo")
|
||||
@should_not_be_under_maintenance(attr_name = "is_under_maintenance")
|
||||
@validate_input(
|
||||
header_validator = lambda x: MailGetRequestHeaders(**x).model_dump(),
|
||||
data_validator = lambda x: MailGetRequestData(**x)
|
||||
header_validator = lambda x: MailListRequestHeaders(**x).model_dump(),
|
||||
data_validator = lambda x: MailListByAccountIdRequestData(**x)
|
||||
)
|
||||
@handle_cancelled_request()
|
||||
async def get_one_mail(
|
||||
inbound_headers: dict | MailGetRequestHeaders = None,
|
||||
inbound_data: dict | MailGetRequestData = None,
|
||||
async def list_mails_for_account_id(
|
||||
inbound_headers: dict | MailListRequestHeaders = None,
|
||||
inbound_data: dict | MailListByAccountIdRequestData = None,
|
||||
inbound_files: dict = None,
|
||||
**kwargs
|
||||
):
|
||||
|
||||
"""
|
||||
Use this endpoint when the user wants to fetch one mail.
|
||||
Use this endpoint when the user wants to fetch the list of mails.
|
||||
:param inbound_headers: auto-extracted by the decorators.
|
||||
:param inbound_data: auto-extracted by the decorators.
|
||||
:param inbound_files: auto-extracted by the decorators.
|
||||
@@ -165,16 +165,19 @@ async def get_one_mail(
|
||||
)
|
||||
|
||||
# Get the mail:
|
||||
mail_data = await current_app.mail_retrieve_model.get_mail(
|
||||
mails_list = await current_app.mail_retrieve_model.list_for_account_identifier(
|
||||
mongo_conn = current_app.data_mongo,
|
||||
mail_identifier = inbound_data.mailId
|
||||
account_identifier = inbound_data.accountId,
|
||||
limit = inbound_data.count,
|
||||
skip = inbound_data.fromCount
|
||||
)
|
||||
|
||||
# Done here:
|
||||
return ResponseModel(
|
||||
status_code = StatusCodes.OK if mail_data else StatusCodes.FAILED,
|
||||
http_code = HttpCodes.SUCCESS if mail_data else HttpCodes.NOT_FOUND,
|
||||
data = mail_data
|
||||
status_code = StatusCodes.OK if mails_list else StatusCodes.FAILED,
|
||||
http_code = HttpCodes.SUCCESS if mails_list else HttpCodes.NOT_FOUND,
|
||||
data = mails_list,
|
||||
message = f"{len(mails_list) if mails_list else 0} mail(s) found"
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -62,9 +62,6 @@ from utils_v2.api.async_quart import (
|
||||
# Common:
|
||||
from shared import constants
|
||||
|
||||
# Behaviour Models:
|
||||
from models.behaviour.mail.oauth import MailOAuthModel
|
||||
|
||||
# For asynchronous activities:
|
||||
import asyncio
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
OBJECTIVE:
|
||||
|
||||
To enlist multiple e-mails for a given user at a time.
|
||||
To get one full mail for any given user for any given account.
|
||||
|
||||
REFERENCES:
|
||||
|
||||
@@ -48,6 +48,7 @@ from utils_v2.database.async_mongo_v2 import AsyncMongo
|
||||
from utils_v2.api.codes import StatusCodes, HttpCodes
|
||||
from utils_v2.api.response import ResponseModel
|
||||
from utils_v2.api.async_quart import (
|
||||
make_ordered_json,
|
||||
set_api_version,
|
||||
read_input,
|
||||
get_session_info,
|
||||
@@ -68,8 +69,7 @@ from utils_v2.goog.models.data.auth_tokens import GoogleAuthTokens
|
||||
from shared import constants
|
||||
|
||||
# Data Models:
|
||||
from models.data.mail.sync import MailSyncRequestHeaders, MailSyncRequestData
|
||||
from models.data.mail.sync import MailSyncOneResult, MailSyncManyResults
|
||||
from models.data.mail.retrieve import MailGetRequestHeaders, MailGetRequestData
|
||||
|
||||
# To work with datatypes:
|
||||
from typing import Literal
|
||||
@@ -77,9 +77,6 @@ from typing import Literal
|
||||
# For asynchronous activities:
|
||||
import asyncio
|
||||
|
||||
# To work with LLMs:
|
||||
from langchain_openai import ChatOpenAI
|
||||
|
||||
# To work with date and time:
|
||||
import datetime
|
||||
|
||||
@@ -92,7 +89,7 @@ import datetime
|
||||
|
||||
|
||||
# Related to Quart:
|
||||
mail_sync_bp = Blueprint("mail_sync", __name__)
|
||||
mail_retrieve_bp = Blueprint("mail_retrieve", __name__)
|
||||
|
||||
|
||||
# *****************************************************************************************************************
|
||||
@@ -112,7 +109,7 @@ mail_sync_bp = Blueprint("mail_sync", __name__)
|
||||
# *****************************************************************************************************************
|
||||
|
||||
|
||||
@mail_sync_bp.record_once
|
||||
@mail_retrieve_bp.record_once
|
||||
def init(blueprint_setup_state):
|
||||
|
||||
# This gets called when the blueprint is registered.
|
||||
@@ -123,41 +120,7 @@ def init(blueprint_setup_state):
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
async def sync_mails(
|
||||
mongo_conn: AsyncMongo,
|
||||
llm: ChatOpenAI,
|
||||
inbound_headers: dict,
|
||||
inbound_data: MailSyncRequestData
|
||||
) -> MailSyncManyResults:
|
||||
|
||||
"""
|
||||
A very simple function, but kept separate so that we get the option to switch between running it in the foreground
|
||||
and running it in the background.
|
||||
:param mongo_conn: The instance of the database connector to use to sync the mails.
|
||||
:param llm: The instance of the LLM to use to summarize the mails.
|
||||
:param inbound_headers: The headers that came in with the request.
|
||||
:param inbound_data: The data that came in with the request.
|
||||
:return: The results of the mail-sync'ing attempt.
|
||||
"""
|
||||
|
||||
# Try to sync the mails:
|
||||
return await current_app.mail_sync_model.sync(
|
||||
session_token = inbound_headers["X-Session-Token"],
|
||||
mongo_conn = mongo_conn,
|
||||
account_identifier = inbound_data.accountId,
|
||||
llm = llm,
|
||||
force_sync = inbound_data.forceSync,
|
||||
start_date = inbound_data.startDate,
|
||||
end_date = inbound_data.endDate,
|
||||
max_count = inbound_data.maxCount
|
||||
)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@mail_sync_bp.route("/sync", methods = ["POST"])
|
||||
@mail_sync_bp.route("/sync/<mode>", methods = ["POST"])
|
||||
@mail_retrieve_bp.route("/get", methods = ["GET"])
|
||||
@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")
|
||||
@@ -165,7 +128,7 @@ async def sync_mails(
|
||||
attr_name = "logs_mongo",
|
||||
project = constants.PROJECT_NAME,
|
||||
log_type = constants.MODULE_NAME,
|
||||
operation = "mailOAuthUrlReqApi",
|
||||
operation = "mailGetApi",
|
||||
log_input = True,
|
||||
log_output = True,
|
||||
sensitive_keys = ["sessionToken", "X-Session-Token"]
|
||||
@@ -173,22 +136,19 @@ async def sync_mails(
|
||||
@log_chain_to_mongo(attr_name = "logs_mongo")
|
||||
@should_not_be_under_maintenance(attr_name = "is_under_maintenance")
|
||||
@validate_input(
|
||||
header_validator = lambda x: MailSyncRequestHeaders(**x).model_dump(),
|
||||
data_validator = lambda x: MailSyncRequestData(**x)
|
||||
header_validator = lambda x: MailGetRequestHeaders(**x).model_dump(),
|
||||
data_validator = lambda x: MailGetRequestData(**x)
|
||||
)
|
||||
@handle_cancelled_request()
|
||||
async def sync_mail(
|
||||
mode: Literal["background", "bg"] = None,
|
||||
inbound_headers: dict | MailSyncRequestHeaders = None,
|
||||
inbound_data: dict | MailSyncRequestData = None,
|
||||
async def get_one_mail(
|
||||
inbound_headers: dict | MailGetRequestHeaders = None,
|
||||
inbound_data: dict | MailGetRequestData = None,
|
||||
inbound_files: dict = None,
|
||||
**kwargs
|
||||
):
|
||||
|
||||
"""
|
||||
Use this when the user wants to pull old mails from some mail client (like GMail) and save it to the database for
|
||||
ready access on the UI.
|
||||
:param mode: Set it to one of the specified options to make the sync'ing process go to the background.
|
||||
Use this endpoint when the user wants to fetch one mail.
|
||||
:param inbound_headers: auto-extracted by the decorators.
|
||||
:param inbound_data: auto-extracted by the decorators.
|
||||
:param inbound_files: auto-extracted by the decorators.
|
||||
@@ -203,43 +163,17 @@ async def sync_mail(
|
||||
http_code = HttpCodes.UNAUTHORIZED
|
||||
)
|
||||
|
||||
# Make the variables available in the scope of the current request:
|
||||
g.inbound_headers = inbound_headers
|
||||
g.inbound_data = inbound_data
|
||||
|
||||
# If we've been asked to sync the mails in the background:
|
||||
if mode in ["background", "bg"]:
|
||||
current_app.add_background_task(
|
||||
sync_mails,
|
||||
mongo_conn = current_app.data_mongo,
|
||||
llm = current_app.llm,
|
||||
inbound_headers = inbound_headers,
|
||||
inbound_data = inbound_data
|
||||
)
|
||||
return ResponseModel(
|
||||
status_code = StatusCodes.OK,
|
||||
http_code = HttpCodes.ACCEPTED,
|
||||
message = "your mails are being sync'd in the background"
|
||||
)
|
||||
|
||||
# Otherwise we process it right here:
|
||||
sync_results = await sync_mails(
|
||||
# Get the mail:
|
||||
mail_data = await current_app.mail_retrieve_model.get_mail(
|
||||
mongo_conn = current_app.data_mongo,
|
||||
llm = current_app.llm,
|
||||
inbound_headers = inbound_headers,
|
||||
inbound_data = inbound_data
|
||||
mail_identifier = inbound_data.mailId
|
||||
)
|
||||
|
||||
# Response:
|
||||
# Done here:
|
||||
return ResponseModel(
|
||||
status_code = StatusCodes.FAILED if sync_results.failureCount > 0 else StatusCodes.OK,
|
||||
http_code = HttpCodes.INTERNAL_SERVER_ERROR if sync_results.failureCount > 0 else HttpCodes.SUCCESS,
|
||||
message = sync_results.message,
|
||||
data = {
|
||||
"totalCount": sync_results.totalCount,
|
||||
"successCount": sync_results.successCount,
|
||||
"failureCount": sync_results.failureCount
|
||||
}
|
||||
status_code = StatusCodes.OK if mail_data else StatusCodes.FAILED,
|
||||
http_code = HttpCodes.SUCCESS if mail_data else HttpCodes.NOT_FOUND,
|
||||
data = mail_data
|
||||
)
|
||||
|
||||
|
||||
|
||||
@@ -167,7 +167,7 @@ async def sync_mails(
|
||||
attr_name = "logs_mongo",
|
||||
project = constants.PROJECT_NAME,
|
||||
log_type = constants.MODULE_NAME,
|
||||
operation = "mailOAuthUrlReqApi",
|
||||
operation = "mailSyncApi",
|
||||
log_input = True,
|
||||
log_output = True,
|
||||
sensitive_keys = ["sessionToken", "X-Session-Token"]
|
||||
|
||||
Reference in New Issue
Block a user