|
@@ -8,12 +8,10 @@ import numpy as np
|
|
|
import pandas as pd
|
|
|
from httpx import AsyncClient, URL
|
|
|
|
|
|
-from app.core.config import TransferSettings
|
|
|
+from app.core.config import settings
|
|
|
from app.services.service import Service
|
|
|
from app.utils.date import get_time_str, TIME_FMT
|
|
|
|
|
|
-transfer_settings = TransferSettings()
|
|
|
-
|
|
|
|
|
|
class Season(str, Enum):
|
|
|
cooling = 'Cooling'
|
|
@@ -28,12 +26,12 @@ class SpaceInfoService(Service):
|
|
|
client: AsyncClient,
|
|
|
project_id: str,
|
|
|
space_id: str,
|
|
|
- settings: TransferSettings = transfer_settings
|
|
|
+ server_settings=settings
|
|
|
) -> None:
|
|
|
super(SpaceInfoService, self).__init__(client)
|
|
|
self._project_id = project_id
|
|
|
self._space_id = space_id
|
|
|
- self._base_url = URL(settings.transfer_host)
|
|
|
+ self._base_url = URL(server_settings.TRANSFER_HOST)
|
|
|
self._now_time = get_time_str()
|
|
|
|
|
|
def _common_parameters(self) -> Dict:
|
|
@@ -108,8 +106,11 @@ class SpaceInfoService(Service):
|
|
|
params.update({'date': arrow.get(self._now_time, TIME_FMT).date().strftime('%Y%m%d')})
|
|
|
raw_info = await self._get(url, params)
|
|
|
|
|
|
- custom_target_df = pd.DataFrame(raw_info.get('data'))
|
|
|
- custom_target_df.set_index('time', inplace=True)
|
|
|
+ try:
|
|
|
+ custom_target_df = pd.DataFrame(raw_info.get('data'))
|
|
|
+ custom_target_df.set_index('time', inplace=True)
|
|
|
+ except KeyError:
|
|
|
+ custom_target_df = pd.DataFrame()
|
|
|
|
|
|
return custom_target_df
|
|
|
|
|
@@ -184,10 +185,10 @@ class SpaceInfoService(Service):
|
|
|
|
|
|
class EquipmentInfoService(Service):
|
|
|
|
|
|
- def __init__(self, client: AsyncClient, project_id: str, settings: TransferSettings = transfer_settings):
|
|
|
+ def __init__(self, client: AsyncClient, project_id: str, server_settings=settings):
|
|
|
super(EquipmentInfoService, self).__init__(client)
|
|
|
self._project_id = project_id
|
|
|
- self._base_url = URL(settings.transfer_host)
|
|
|
+ self._base_url = URL(server_settings.TRANSFER_HOST)
|
|
|
self._now_time = get_time_str()
|
|
|
|
|
|
async def get_space_by_equipment(self, equipment_id: str) -> List[dict]:
|