Spaces:
Sleeping
Sleeping
Update src/controllers/_data_extractor.py
Browse files
src/controllers/_data_extractor.py
CHANGED
|
@@ -3,7 +3,7 @@ from fastapi import APIRouter, HTTPException
|
|
| 3 |
|
| 4 |
from src.services import DataExtractorService
|
| 5 |
from pydantic import BaseModel
|
| 6 |
-
from src.schemas import Message
|
| 7 |
|
| 8 |
from loguru import logger
|
| 9 |
|
|
@@ -14,9 +14,9 @@ class UserQuery(BaseModel):
|
|
| 14 |
|
| 15 |
class Response(BaseModel):
|
| 16 |
status: str
|
| 17 |
-
data: Optional[list] = []
|
| 18 |
sql_query: str
|
| 19 |
-
|
| 20 |
|
| 21 |
class DataExtractorController:
|
| 22 |
def __init__(self):
|
|
@@ -33,10 +33,10 @@ class DataExtractorController:
|
|
| 33 |
logger.info("Extracting data...")
|
| 34 |
try:
|
| 35 |
async with DataExtractorService() as service:
|
| 36 |
-
response, sql_query = await service.extract(
|
| 37 |
user_query=user_query.user_query, message_history=message_history
|
| 38 |
)
|
| 39 |
-
return Response(status="success", data=response, sql_query=sql_query)
|
| 40 |
except HTTPException as e:
|
| 41 |
logger.error(e)
|
| 42 |
raise e
|
|
|
|
| 3 |
|
| 4 |
from src.services import DataExtractorService
|
| 5 |
from pydantic import BaseModel
|
| 6 |
+
from src.schemas import Message, SQLQueryExtractor
|
| 7 |
|
| 8 |
from loguru import logger
|
| 9 |
|
|
|
|
| 14 |
|
| 15 |
class Response(BaseModel):
|
| 16 |
status: str
|
| 17 |
+
data: Optional[list[dict]] = []
|
| 18 |
sql_query: str
|
| 19 |
+
output: SQLQueryExtractor
|
| 20 |
|
| 21 |
class DataExtractorController:
|
| 22 |
def __init__(self):
|
|
|
|
| 33 |
logger.info("Extracting data...")
|
| 34 |
try:
|
| 35 |
async with DataExtractorService() as service:
|
| 36 |
+
response, sql_query, output = await service.extract(
|
| 37 |
user_query=user_query.user_query, message_history=message_history
|
| 38 |
)
|
| 39 |
+
return Response(status="success", data=response, sql_query=sql_query, output=output)
|
| 40 |
except HTTPException as e:
|
| 41 |
logger.error(e)
|
| 42 |
raise e
|