diff --git a/src/modules/equipment/Eac.py b/src/modules/equipment/Eac.py index c26b432..867a82c 100644 --- a/src/modules/equipment/Eac.py +++ b/src/modules/equipment/Eac.py @@ -5,8 +5,7 @@ import json import sys import os -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) -from config import get_connection +from src.modules.config import get_connection import argparse diff --git a/src/modules/equipment/Prediksi.py b/src/modules/equipment/Prediksi.py index 7330433..14161ec 100644 --- a/src/modules/equipment/Prediksi.py +++ b/src/modules/equipment/Prediksi.py @@ -15,10 +15,8 @@ from dotenv import load_dotenv import sys import os -from equipment.formula import rc_labor_cost, rc_lost_cost, rc_total_cost - -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) -from config import get_connection, get_production_connection +from .formula import rc_labor_cost, rc_lost_cost, rc_total_cost +from src.modules.config import get_connection, get_production_connection import json load_dotenv() diff --git a/src/modules/equipment/__pycache__/Eac.cpython-311.pyc b/src/modules/equipment/__pycache__/Eac.cpython-311.pyc index 12655c9..880816f 100644 Binary files a/src/modules/equipment/__pycache__/Eac.cpython-311.pyc and b/src/modules/equipment/__pycache__/Eac.cpython-311.pyc differ diff --git a/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc b/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc index a45bf9b..2188689 100644 Binary files a/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc and b/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc differ diff --git a/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc b/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc index 77f8316..0c990ab 100644 Binary files a/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc and b/src/modules/equipment/__pycache__/insert_actual_data.cpython-311.pyc differ diff --git a/src/modules/equipment/__pycache__/run.cpython-311.pyc b/src/modules/equipment/__pycache__/run.cpython-311.pyc index 4d146c9..3628adf 100644 Binary files a/src/modules/equipment/__pycache__/run.cpython-311.pyc and b/src/modules/equipment/__pycache__/run.cpython-311.pyc differ diff --git a/src/modules/equipment/insert_actual_data.py b/src/modules/equipment/insert_actual_data.py index 226dd8a..66cecac 100644 --- a/src/modules/equipment/insert_actual_data.py +++ b/src/modules/equipment/insert_actual_data.py @@ -8,10 +8,8 @@ from datetime import datetime import sys import os import httpx -from where_query_sql import get_where_query_sql -sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))) -from config import get_connection, get_production_connection - +from src.modules.config import get_connection, get_production_connection +from .where_query_sql import get_where_query_sql async def fetch_api_data( assetnum: str, year: int, RELIABILITY_APP_URL: str, token: str diff --git a/src/modules/equipment/run.py b/src/modules/equipment/run.py index aa1a9c1..400a047 100644 --- a/src/modules/equipment/run.py +++ b/src/modules/equipment/run.py @@ -1,27 +1,20 @@ import asyncio import time -# prefer package-relative imports, but allow running this file directly as a script -try: - from .insert_actual_data import query_data, insert_lcca_maximo_corrective_data, insert_ms_equipment_data, insert_acquisition_cost_data - from .Prediksi import Prediksi, main as predict_run - from .Eac import Eac, main as eac_run -except ImportError: - # fallback when there's no parent package (e.g., python run.py) - from insert_actual_data import query_data - from Prediksi import main as predict_run - from Eac import main as eac_run - +# clean absolute imports +from src.modules.equipment.insert_actual_data import query_data +from src.modules.equipment.Prediksi import Prediksi, main as predict_run +from src.modules.equipment.Eac import Eac, main as eac_run # Panggil fungsi async def main(): start_time = time.time() - # try: - # await query_data() - # except Exception as e: - # print(f"Error in query_data: {str(e)}") - # return + try: + await query_data() + except Exception as e: + print(f"Error in query_data: {str(e)}") + return try: prediction_result = await predict_run(assetnum="A22277")