From a8a077e59f02155a9cba85f04d1968762408e8a6 Mon Sep 17 00:00:00 2001 From: Cizz22 Date: Thu, 9 Oct 2025 10:59:22 +0700 Subject: [PATCH] fix base url reliabilitu --- src/aeros_equipment/service.py | 8 ++++---- src/config.py | 3 ++- src/utils.py | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/aeros_equipment/service.py b/src/aeros_equipment/service.py index 00cdefa..17adc3f 100644 --- a/src/aeros_equipment/service.py +++ b/src/aeros_equipment/service.py @@ -7,7 +7,7 @@ from sqlalchemy import Delete, Select, func, desc, and_, text from sqlalchemy.orm import selectinload from src.auth.service import CurrentUser -from src.config import AEROS_BASE_URL, DEFAULT_PROJECT_NAME +from src.config import AEROS_BASE_URL, DEFAULT_PROJECT_NAME, RELIABILITY_SERVICE_API from src.database.core import CollectorDbSession, DbSession from src.database.service import search_filter_sort_paginate from .model import AerosEquipment, AerosEquipmentDetail, MasterEquipment, AerosEquipmentGroup, ReliabilityPredictNonRepairable @@ -220,7 +220,7 @@ async def save_default_equipment(*, db_session: DbSession, project_name: str): def get_asset_batch(location_tags: List[str], nr_location_tags: List[str], - base_url: str = "http://192.168.1.82:8000", + base_url: str = RELIABILITY_SERVICE_API, timeout: int = 30)-> dict: """ Get asset batch data using GET request with JSON body. @@ -465,7 +465,7 @@ async def get_equipment_mttr(*, location_tag: str, client: httpx.AsyncClient) -> """ Get MTTR for a single equipment using provided client """ - mttr_url = f"http://192.168.1.82:8000/reliability/asset/mttr/{location_tag}" + mttr_url = f"{RELIABILITY_SERVICE_API}/asset/mttr/{location_tag}" try: response = await client.get(mttr_url) if response.status_code == 200: @@ -482,7 +482,7 @@ async def get_equipment_reliability_parameter(*, location_tag: str, client: http """ Get reliability parameters for a single equipment using provided client """ - reliability_url = f"http://192.168.1.82:8000/reliability/reliability/{location_tag}/current" + reliability_url = f"{RELIABILITY_SERVICE_API}/reliability/{location_tag}/current" try: response = await client.get(reliability_url) if response.status_code == 200: diff --git a/src/config.py b/src/config.py index 640d01d..ae0dd8c 100644 --- a/src/config.py +++ b/src/config.py @@ -92,4 +92,5 @@ AEROS_BASE_URL_OLD = config("AEROS_BASE_URL_OLD", default="http://192.168.1.87") WINDOWS_AEROS_BASE_URL = config("WINDOWS_AEROS_BASE_URL", default="http://192.168.1.102:8800") DEFAULT_PROJECT_NAME = config("DEFAULT_PROJECT_NAME", default="RBD TJB") -TEMPORAL_URL = config("TEMPORAL_URL", default="http://192.168.1.86:7233") \ No newline at end of file +TEMPORAL_URL = config("TEMPORAL_URL", default="http://192.168.1.86:7233") +RELIABILITY_SERVICE_API = config("RELIABILITY_SERVICE_API", default="http://192.168.1.82:8000/reliability") \ No newline at end of file diff --git a/src/utils.py b/src/utils.py index b016d0b..acf7696 100644 --- a/src/utils.py +++ b/src/utils.py @@ -5,7 +5,7 @@ from typing import Optional import pytz from dateutil.relativedelta import relativedelta -from src.config import TIMEZONE +from src.config import RELIABILITY_SERVICE_API, TIMEZONE def parse_relative_expression(date_str: str) -> Optional[datetime]: @@ -95,7 +95,7 @@ import requests def get_latest_numOfFail(location_tag, token) -> float: today = datetime.today().strftime("%Y-%m-%d") - url_today = f"http://192.168.1.82:8000/reliability/main/number-of-failures/{location_tag}/2016-01-01/{today}" + url_today = f"{RELIABILITY_SERVICE_API}/main/number-of-failures/{location_tag}/2016-01-01/{today}" try: response = requests.get(