Wire up transactions with user api to get supplied data

app/api/routers/transaction.py

@@ -46,3 +46,24 @@ async def get_transactions(user_id: int, db: AsyncSession = Depends(get_db_sessi
                 }
                 results.append(result)
             return results
+
+
+@r.get(
+    "/transaction_answer/{user_id}/{query}",
+    responses={
+        200: {"description": "Query answered"},
+        500: {"description": "Internal server error"},
+    },
+)
+async def answer_transactions_query(user_id: int, query: str, db: AsyncSession = Depends(get_db_session)):
+    """
+    Retrieve all transactions.
+    """
+    result = await TransactionModel.get_by_user(db, user_id)
+    all_rows = result.all()
+    print(f"answer_transactions_query: \n type: {type(all_rows)}\nall_rows: {all_rows}")
+    # TODO: Pass all rows to answer_query method in transaction_query_rag and get result that will be the
+    # string param in TransactionRagResponse
+    if len(all_rows) == 0:
+        raise HTTPException(status_code=500, detail="No transactions found for this user")
+    return all_rows

app/api/routers/user.py

@@ -6,6 +6,10 @@ from app.engine.postgresdb import get_db_session
 from app.schema.index import UserCreate, User as UserSchema, UserResponse, UserUpdate
 from app.model.user import User as UserModel
 
+from app.model.transaction import Transaction as TransactionModel
+
+from tests.utils import get_fake_transactions
+
 
 user_router = r = APIRouter(prefix="/api/v1/users", tags=["users"])
 logger = logging.getLogger(__name__)
@@ -29,7 +33,12 @@ async def create_user(user: UserCreate, db: AsyncSession = Depends(get_db_sessio
 
         await UserModel.create(db, **user.model_dump())
         user = await UserModel.get(db, email=user.email)
+
+        fake_transactions = get_fake_transactions(user.id)
+        await TransactionModel.bulk_create(db, fake_transactions)
+
         return user
+    
     except Exception as e:
         raise HTTPException(status_code=500, detail=str(e))
 

app/schema/index.py

@@ -53,6 +53,8 @@ class TransactionCreate(TransactionResponse):
 class Transaction(TransactionResponse):
     user: User
 
+class TransactionRagResponse(PydanticBaseModel):
+    answer: str
 
 class FileUploadCreate(PydanticBaseModel):
     source: str

app/service/transactions_query_rag.py

@@ -12,7 +12,7 @@ import os
 import pandas as pd
 from uuid import uuid4
 
-async def answer_query(df: pd.DataFrame, query: str) -> None:
+async def answer_query(df: pd.DataFrame, query: str) -> str:
     """Creates an embedding of the transactions table and then returns the answer for the given query.
     Args:
         df (pd.DataFrame): DataFrame containing the transactions that a user has entered
@@ -23,7 +23,6 @@ async def answer_query(df: pd.DataFrame, query: str) -> None:
     """
     try:
         batch_limit = 100
-
         pinecone_api_key = os.environ['PINECONE_API_KEY']
         openai_api_key = os.environ['OPENAI_API_KEY']
         namespace = "transactionsvector"

tests/test_transactions.py

@@ -1,25 +1,109 @@
+from datetime import datetime
+from typing import List
+from fastapi import Depends
 from fastapi.testclient import TestClient
 import pytest
 
 from app.model.transaction import Transaction
-from app.model.user import User
+from app.schema.index import TransactionType, TransactionCreate
+
 from sqlalchemy.ext.asyncio import AsyncSession
-from tests.utils import get_fake_transactions
+from app.engine.postgresdb import get_db_session
+from app.model.user import User
 
+def get_fake_transactions(user_id: int) -> List[TransactionCreate]:
+    return [
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 1),
+            category="category",
+            name_description="name_description",
+            amount=1.0,
+            type=TransactionType.EXPENSE,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 2),
+            category="category",
+            name_description="name_description",
+            amount=2.0,
+            type=TransactionType.EXPENSE,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 3),
+            category="category",
+            name_description="name_description",
+            amount=3.0,
+            type=TransactionType.INCOME,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 4),
+            category="category",
+            name_description="name_description",
+            amount=4.0,
+            type=TransactionType.INCOME,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 5),
+            category="category",
+            name_description="name_description",
+            amount=5.0,
+            type=TransactionType.EXPENSE,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 6),
+            category="category",
+            name_description="name_description",
+            amount=6.0,
+            type=TransactionType.EXPENSE,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 7),
+            category="category",
+            name_description="name_description",
+            amount=7.0,
+            type=TransactionType.INCOME,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 8),
+            category="category",
+            name_description="name_description",
+            amount=8.0,
+            type=TransactionType.INCOME,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 9),
+            category="category",
+            name_description="name_description",
+            amount=9.0,
+            type=TransactionType.EXPENSE,
+        ),
+        TransactionCreate(
+            user_id=user_id,
+            transaction_date=datetime(2022, 1, 10),
+            category="category",
+            name_description="name_description",
+            amount=10.0,
+            type=TransactionType.EXPENSE,
+        ),
+    ]
 
 @pytest.mark.asyncio
 async def test_transactions(client: TestClient, get_db_session_fixture: AsyncSession) -> None:
 
     session_override = get_db_session_fixture
-
-    # 1. Create a user
     user = await User.create(session_override, name="user", email="email", hashed_password="password")
 
-    # 2. Create a bunch of transactions
     fake_transactions = get_fake_transactions(user.id)
     await Transaction.bulk_create(session_override, fake_transactions)
 
-    # 3. Verify that the transactions are returned
     response = client.get("/api/v1/transactions/1")
     assert response.status_code == 200
     assert len(response.json()) == 10