fix base url reliabilitu

main
Cizz22 3 months ago
parent 300d5f04d3
commit a8a077e59f

@ -7,7 +7,7 @@ from sqlalchemy import Delete, Select, func, desc, and_, text
from sqlalchemy.orm import selectinload from sqlalchemy.orm import selectinload
from src.auth.service import CurrentUser 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.core import CollectorDbSession, DbSession
from src.database.service import search_filter_sort_paginate from src.database.service import search_filter_sort_paginate
from .model import AerosEquipment, AerosEquipmentDetail, MasterEquipment, AerosEquipmentGroup, ReliabilityPredictNonRepairable 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], 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: timeout: int = 30)-> dict:
""" """
Get asset batch data using GET request with JSON body. 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 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: try:
response = await client.get(mttr_url) response = await client.get(mttr_url)
if response.status_code == 200: 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 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: try:
response = await client.get(reliability_url) response = await client.get(reliability_url)
if response.status_code == 200: if response.status_code == 200:

@ -93,3 +93,4 @@ WINDOWS_AEROS_BASE_URL = config("WINDOWS_AEROS_BASE_URL", default="http://192.16
DEFAULT_PROJECT_NAME = config("DEFAULT_PROJECT_NAME", default="RBD TJB") DEFAULT_PROJECT_NAME = config("DEFAULT_PROJECT_NAME", default="RBD TJB")
TEMPORAL_URL = config("TEMPORAL_URL", default="http://192.168.1.86:7233") 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")

@ -5,7 +5,7 @@ from typing import Optional
import pytz import pytz
from dateutil.relativedelta import relativedelta 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]: def parse_relative_expression(date_str: str) -> Optional[datetime]:
@ -95,7 +95,7 @@ import requests
def get_latest_numOfFail(location_tag, token) -> float: def get_latest_numOfFail(location_tag, token) -> float:
today = datetime.today().strftime("%Y-%m-%d") 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: try:
response = requests.get( response = requests.get(

Loading…
Cancel
Save