create model for Market

Signed-off-by: Lu Ken <[email protected]>

src/gentrade_server/model.py

@@ -1,8 +1,11 @@
-from pydantic import BaseModel, Field
-from pydantic_settings import BaseSettings, SettingsConfigDict
-from pydantic import Field, field_validator
+'''
+Model
+'''
 from typing import List
 
+from pydantic import BaseModel, Field, field_validator
+from pydantic_settings import BaseSettings, SettingsConfigDict
+
 class HealthCheck(BaseModel):
     """
     Response model to validate and return when performing a health check.
@@ -30,3 +33,11 @@ def decode_ntp_servers(cls, v: str) -> List[str]:
         return v.split(',')
 
 settings = Settings()
+
+class Market(BaseModel):
+    """
+    Response model to validate and return when performing a health check.
+    """
+
+    name: str = Field(...)
+    type: str = Field(...)

src/gentrade_server/routers/admin.py

@@ -1,7 +1,9 @@
+'''
+Admin portal
+'''
 import logging
 
 from fastapi import APIRouter, Depends
-from pydantic import BaseModel, Field
 from ..model import settings, Settings
 from ..auth import get_user
 

src/gentrade_server/routers/public.py

@@ -9,10 +9,9 @@
 from dateutil.tz import tzlocal
 
 from fastapi import APIRouter
-from pydantic import BaseModel, Field
 
 from ..datahub import DataHub
-from ..model import HealthCheck, settings
+from ..model import HealthCheck, Market
 
 LOG = logging.getLogger(__name__)
 
@@ -42,20 +41,7 @@ async def get_server_time():
     }
 
 @router.get("/markets/")
-async def get_markets():
-    """
-    Get markets
-    """
-    retval = {}
-    for _, market in DataHub.inst().markets.items():
-        retval[market.market_id] = {
-            "name": market.name,
-            "type": market.market_type,
-        }
-    return retval
-
-@router.get("/markets/")
-async def get_markets2():
+async def get_markets() -> Market:
     """
     Get markets
     """