Update App/routers/stocks/models.py

App/routers/stocks/models.py

@@ -28,13 +28,28 @@ class Stock(Model):
 
 
 
-# Create a lean Pydantic model for Stock that excludes deep relationships
+# ----------------- STEP 1: Create the SLIM Pydantic model for Stock -----------------
+# This model represents a Stock but without its own nested lists.
 StockPydantic_Slim = pydantic_model_creator(
-    Stock, 
-    name="StockPydantic_Slim", 
-    exclude=("dividends", "portfolio_holdings", "price_data")
+    Stock,
+    name="StockSlim",
+    exclude=("dividends", "portfolio_holdings", "price_data", "watching") # Exclude all reverse relations
 )
 
+# ----------------- STEP 2: Create the FINAL Pydantic model for StockPriceData -----------------
+# First, generate a base model from the ORM, excluding the default 'stock' relation
+StockPriceData_Pydantic_Base = pydantic_model_creator(
+    StockPriceData,
+    name="StockPriceDataBase",
+    exclude=("stock",)
+)
+
+# Then, create a new class that inherits from the base and adds the 'stock' field back,
+# but this time, its type is our new 'StockPydantic_Slim'.
+class StockPriceData_Pydantic_Final(StockPriceData_Pydantic_Base):
+    stock: StockPydantic_Slim
+
+# ----------------- STEP 3: Update the StockPriceData ORM model -----------------
 class StockPriceData(Model):
     id = fields.IntField(primary_key=True)
     stock = fields.ForeignKeyField("models.Stock", related_name="price_data")
@@ -51,32 +66,26 @@ class StockPriceData(Model):
 
     @staticmethod
     async def get_list(data: QuerySet):
-        # Create a Pydantic model for StockPriceData that uses our slim Stock model
-        PriceDataPydantic = pydantic_model_creator(
-            StockPriceData,
-            name="PriceDataWithSlimStock",
-            # This is the key part: we explicitly define the nested model to use
-            computed=("stock", StockPydantic_Slim) 
-        )
-        
-        # Create a Pydantic model for a list of the above
+        """
+        Creates a Pydantic model for a list of StockPriceData objects.
+        This method now correctly uses our custom final Pydantic model to serialize each item.
+        """
+        # Create a list/queryset serializer using our final, correctly nested Pydantic model
         PriceDataListPydantic = pydantic_queryset_creator(
-            StockPriceData,
-            pydantic_model=PriceDataPydantic
+            tortoise_model=StockPriceData,
+            pydantic_model=StockPriceData_Pydantic_Final, # This is the key change
+            name="PriceDataList"
         )
-        
         return await PriceDataListPydantic.from_queryset(data)
 
     async def to_dict(self):
-        # This can remain as is, or you can create a specific Pydantic model for it too
+        # This method is for single instances, not lists. It can stay as is.
         parser = pydantic_model_creator(StockPriceData)
         return await parser.from_tortoise_orm(self)
 
     class Meta:
         table = "stock_price_data"
         unique_together = (("stock", "date"),)
-
-
 class Dividend(Model):
     id = fields.IntField(primary_key=True)
     stock = fields.ForeignKeyField("models.Stock", related_name="dividends")