diff --git a/src/calculation_budget_constrains/service.py b/src/calculation_budget_constrains/service.py index 921b301..02c2238 100644 --- a/src/calculation_budget_constrains/service.py +++ b/src/calculation_budget_constrains/service.py @@ -104,7 +104,7 @@ def calculate_asset_eaf_contributions(plant_result, eq_results): for asset in eq_results: node_name = asset.get("aeros_node", {}).get("node_name") if node_name: - results[node_name] = asset.get("contribution", 0.0) + results[node_name] = asset.get("contribution_factor", 0.0) return results diff --git a/src/calculation_target_reliability/service.py b/src/calculation_target_reliability/service.py index 4b061e7..e360cfe 100644 --- a/src/calculation_target_reliability/service.py +++ b/src/calculation_target_reliability/service.py @@ -3,6 +3,7 @@ from dataclasses import dataclass from sqlalchemy import Delete, Select import httpx from src.auth.service import CurrentUser +from src.config import RBD_SERVICE_API from src.contribution_util import calculate_contribution, calculate_contribution_accurate from src.database.core import DbSession, CollectorDbSession from datetime import datetime, timedelta @@ -16,8 +17,6 @@ from .schema import AssetWeight,MaintenanceScenario,OptimizationResult from src.overhaul_activity.service import get_standard_scope_by_session_id -RBD_SERVICE_API = "http://192.168.1.82:8000/rbd" - client = httpx.AsyncClient(timeout=300.0) diff --git a/src/calculation_time_constrains/service.py b/src/calculation_time_constrains/service.py index 1d4a4a2..b50c389 100644 --- a/src/calculation_time_constrains/service.py +++ b/src/calculation_time_constrains/service.py @@ -4,8 +4,7 @@ from uuid import UUID import calendar import httpx -from src.calculation_target_reliability.service import RBD_SERVICE_API -from src.config import REALIBILITY_SERVICE_API +from src.config import REALIBILITY_SERVICE_API, RBD_SERVICE_API import numpy as np import requests from fastapi import HTTPException, status diff --git a/src/config.py b/src/config.py index e26634d..4642e05 100644 --- a/src/config.py +++ b/src/config.py @@ -83,3 +83,4 @@ MAXIMO_API_KEY = config("MAXIMO_API_KEY", default="keys") AUTH_SERVICE_API = config("AUTH_SERVICE_API", default="http://192.168.1.82:8000/auth") REALIBILITY_SERVICE_API = config("REALIBILITY_SERVICE_API", default="http://192.168.1.82:8000/reliability") +RBD_SERVICE_API = config("RBD_SERVICE_API", default="http://192.168.1.82:8000/rbd")