removed pool erros

App/routers/stocks/routes.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, BackgroundTasks
+from fastapi import APIRouter, BackgroundTasks, Query
 from .schemas import DividendResponse, StockResponse, PriceDataResponse
 from .crud import (
     create_or_get_stock,
@@ -12,9 +12,9 @@ from .metrics import calculate_metrics
 from .models import Stock, StockPriceData
 from App.routers.tasks.models import ImportTask
 from App.schemas import ResponseModel
-from typing import Dict, List
+from typing import Dict, List, Optional
 import datetime
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, date
 from .models import Dividend
 from .utils import AsyncCurlCffiDividendScraper, run_stock_import_task
 from App.schemas import AppException
@@ -96,18 +96,66 @@ async def list_stocks_orm():
 
 
 @router.get("/{symbol}/prices", response_model=ResponseModel)
-async def get_stock_prices(symbol: str):
+async def get_stock_prices(
+    symbol: str,
+    time_range: Optional[str] = Query(
+        "max", enum=["1w", "1m", "1y", "ytd", "max"]
+    ),
+    page: int = Query(1, ge=1),
+    page_size: int = Query(100, ge=1, le=1000),
+):
     stock = await Stock.get_or_none(symbol=symbol.upper())
     if not stock:
         raise AppException(status_code=404, detail="Stock not found")
 
-    prices = await get_stock_price_history(stock.id)
-    _prices=await StockPriceData.get_list(prices)
-  
+    prices_queryset = StockPriceData.filter(stock_id=stock.id).order_by("-date")
+
+    # Time range filtering
+    if time_range != "max":
+        today = date.today()
+        if time_range == "1w":
+            start_date = today - timedelta(weeks=1)
+        elif time_range == "1m":
+            start_date = today - timedelta(days=30)
+        elif time_range == "1y":
+            start_date = today - timedelta(days=365)
+        elif time_range == "ytd":
+            start_date = date(today.year, 1, 1)
+        prices_queryset = prices_queryset.filter(date__gte=start_date)
+
+    # Pagination
+    total_count = await prices_queryset.count()
+    paginated_queryset = prices_queryset.offset((page - 1) * page_size).limit(
+        page_size
+    )
+
+    # Select only the required fields
+    prices = await paginated_queryset.values(
+        "id",
+        "date",
+        "opening_price",
+        "closing_price",
+        "high",
+        "low",
+        "volume",
+        "turnover",
+        "shares_in_issue",
+        "market_cap",
+        "created_at",
+    )
+
     return ResponseModel(
         success=True,
         message="Stock prices retrieved",
-        data={"prices": _prices.model_dump()},
+        data={
+            "prices": prices,
+            "pagination": {
+                "total_count": total_count,
+                "total_pages": (total_count + page_size - 1) // page_size,
+                "current_page": page,
+                "page_size": page_size,
+            },
+        },
     )
 
 

App/routers/users/models.py

@@ -39,4 +39,4 @@ class Watchlist(models.Model):
     async def to_dict(self):
         if type(self) == models.Model:
             parser=pydantic_model_creator(Watchlist)
-            return await parser.from_tortoise_orm(self)
+            return await parser.from_tortoise_orm(self)

App/routers/users/routes.py

@@ -22,9 +22,14 @@ async def login(user: UserLogin):
     
     if not bcrypt.verify(user.password, user_obj.hashed_password):
         raise AppException(status_code=400, detail=ResponseModel(success=False, message="Invalid email or password"))
+    
+    # Use the modified to_dict method
     _user = await user_obj.to_dict()
-    _user = UserResponse.model_validate(_user.model_dump())
-    return ResponseModel(success=True, message="Login successful", data=_user)
+    
+    # The _user object is now a Pydantic model, so we can pass it to UserResponse
+    _user_response = UserResponse.model_validate(_user.model_dump())
+    
+    return ResponseModel(success=True, message="Login successful", data=_user_response)
 
 @router.post("/register", response_model=ResponseModel)
 async def register(user: UserCreate):

db.py

@@ -4,13 +4,6 @@ import ssl
 import uuid
 from asyncpg import Connection
 
-# 1. Create a custom connection class to generate unique IDs for every statement
-class UniquePreparedStatementConnection(Connection):
-    def _get_unique_id(self, prefix: str) -> str:
-        # This forces every prepared statement to have a new, unique name,
-        # preventing any possible collisions when using a connection pooler.
-        return f"__asyncpg_{prefix}_{uuid.uuid4()}__"
-
 # It's a good practice to create the SSL context outside the dict
 ssl_context = ssl.create_default_context()
 
@@ -21,15 +14,22 @@ TORTOISE_ORM = {
             "engine": "tortoise.backends.asyncpg",
             "credentials": {
                 "host": "aws-0-us-east-2.pooler.supabase.com",
-                "port": "6543",
+                "port": "5432",
                 "user": os.getenv("DB_USER"),
                 "password": os.getenv("DB_PASSWORD"),
                 "database": "postgres",
+                "min_size": 1, # Start with a small pool, e.g., 1-5 connections
+                "max_size": 10, # Adjust based on expected load and Supabase limits. Common values: 10-50
+                "timeout": 30, # Connection timeout in seconds [16]
+                # "ssl": True, # Enable SSL if required by Supabase for production
+                # "statement_cache_size": 0, # Optional: Keep for completeness if other issues arise, but primary fix is connection mode
+                "max_queries": 50000, # Max queries before a connection is closed and replaced [15]
+                "max_inactive_connection_lifetime": 300.0, # Max idle time before a connection is closed [15]
             },
+
             # Pass the custom connection class and disable the cache
             "connect_args": {
                 "statement_cache_size": 0,
-                "connection_class": UniquePreparedStatementConnection,
                 "ssl": ssl_context
             }
         }

main.py

@@ -36,13 +36,13 @@ async def validation_exception_handler(request: Request, exc: RequestValidationE
 
 
 # # Configure CORS
-# app.add_middleware(
-#     CORSMiddleware,
-#     allow_origins=["*"],
-#     allow_credentials=False,
-#     allow_methods=["*"],
-#     allow_headers=["*"],
-# )
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=["*"],
+    allow_credentials=False,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 
 # Include routers
 app.include_router(stocks_router)