Add: Response and Request Types

main.py

@@ -4,13 +4,18 @@
 from contextlib import asynccontextmanager
 from typing import Dict
 from model import MongoDB
+from model.ResponseType import ChartResponse, SexInfo, PartyInfo, AgeInfo
+
 
 @asynccontextmanager
 async def initMongo(app: FastAPI):
     MongoDB.MongoDB().connect()
     yield
     MongoDB.MongoDB().close()
 
+new = ChartResponse[SexInfo]
+
 app = FastAPI(lifespan=initMongo, responses={404: {"description": "Not found"}})
 
+
 app.include_router(scrapResult.router)

model/ResponseType.py

@@ -0,0 +1,37 @@
+from pydantic import BaseModel
+from typing import TypeVar, Generic
+
+class LocalInfo(BaseModel):
+    name : str
+    id : int
+
+class RegionInfo(BaseModel):
+    name : str
+    id : int
+    local: list[LocalInfo]
+
+class PartyInfo(BaseModel):
+    name : str
+    color : int
+
+class Diversity(BaseModel):
+    action_type : str
+    value : float
+
+class AgeInfo(BaseModel):
+    minAge: int
+    maxAge: int
+    count: int
+
+class PartyInfo(BaseModel):
+    party : str
+    count : int
+
+class SexInfo(BaseModel):
+    sex: str
+    count: int
+
+T = TypeVar("T", SexInfo, PartyInfo, AgeInfo)
+
+class ChartResponse(BaseModel, Generic[T]):
+    data : list[T]

model/ScrapResult.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel, Field
-from enum import Enum, StrEnum
+from enum import StrEnum
 
 class CouncilType(StrEnum):
     local_council = "local_council"

utils/diversity.py

@@ -2,7 +2,13 @@
 import math
 
 def count(data, stair = 0):
-    return Counter(data)
+    """
+    Count the number of occurrences of each value in a dataset
+    """
+    counts = Counter()
+    for row in data:
+        counts[row[stair]] += 1
+    return counts
 
 def gini_simpson(data, stair, opts):
     """