From 16b502ac3cfe59dbeb1b59bcd0cd3c3471f1f7e7 Mon Sep 17 00:00:00 2001 From: MrWaradana Date: Mon, 24 Nov 2025 09:52:51 +0700 Subject: [PATCH] fix import modules --- src/modules/equipment/Prediksi.py | 9 ++++----- .../__pycache__/Prediksi.cpython-311.pyc | Bin 50105 -> 50037 bytes .../equipment/__pycache__/run.cpython-311.pyc | Bin 2474 -> 3113 bytes src/modules/equipment/run.py | 16 ++++++++-------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/modules/equipment/Prediksi.py b/src/modules/equipment/Prediksi.py index 9d5df56..886b16b 100644 --- a/src/modules/equipment/Prediksi.py +++ b/src/modules/equipment/Prediksi.py @@ -15,10 +15,10 @@ 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 -from modules.equipment.formula import rc_labor_cost, rc_lost_cost, rc_total_cost import json load_dotenv() @@ -359,8 +359,7 @@ class Prediksi: asset_crit_efdh_equivalent_force_derated_hours, asset_crit_foh_force_outage_hours, asset_crit_extra_fuel_cost - FROM lcc_ms_equipment_data - WHERE assetnum = %s + FROM lcc_ms_year_data ) t """ cursor.execute(query, (equipment_id,)) @@ -431,7 +430,7 @@ class Prediksi: raw_oh_interval, raw_oh_material_cost, raw_oh_labor_time, raw_oh_labor_human, raw_predictive_interval, raw_predictive_material_cost, raw_predictive_labor_time, raw_predictive_labor_human, "raw_loss_output_MW" as raw_loss_output_mw, raw_loss_output_price, - raw_operational_cost, raw_maintenance_cost, rc_material_cost + raw_operational_cost, raw_maintenance_cost FROM lcc_equipment_tr_data WHERE assetnum = %s; ''' @@ -655,7 +654,7 @@ class Prediksi: # Authentication: sign-in and refresh helpers - async def sign_in(self, username: str = "user14", password: str = "password") -> dict: + async def sign_in(self, username: str = "Admin", password: str = "password") -> dict: """Sign in to AUTH_APP_URL/sign-in using provided username/password. Stores access_token and refresh_token on the instance when successful and returns the parsed response dict. diff --git a/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc b/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc index 3c53d9e73961d0b0b0dd0bb55a091649ce4c0b70..71bf9573aa4c1c6f569bf179f3e4614070b4472f 100644 GIT binary patch delta 630 zcmdnl&iu8FnQu8SFBbz4?DkN|e7=1m-#(=jh7`^m>0Fs8nOxZ@*<86OIYx$5sVsSr zDiBzpFuBo3gfEo=Nk|b>NC{I&86+f-s^wg60Mf@Fh@-sOyO)lUQ+pG}4&cs}qnmD;IQ+RV)kQgIl<>uPp4o093ei60J zI-$~xtnQ4Q%6BKf6LDdxW1Jk|q|I18IYCsColjJt!}WvQ`NJynB154lO;w%NVy=uK6k>8>?eVZf4%*UoF}!j1xDjb^5b2uH0NUVKG1B&COB^ zw3rzmZ+2aLg^BUgW~pUwm>ExOW?%J;UC4uxRrv!05*ar6|3+i39mO9Q#8@RRghXt% z*~H8NbeY4hvy8_#^X-1eswkLRSejXoo0?ammzH0YTbh$t1afZ?H;CW?5|e))Fxwn` r(1cO$27|{1+-P$Dp^(XpheZrB_!#v*FkmM?g2lfe%Z5#MJzN3+o*lWE delta 682 zcmey`#=NtgnQu8SFBbz4^w}w7YVVlHw~sGXDoYw90s;$UCO7(s@TD>!3CUs#$zck~ zgM@@q6_znFFsue*2uR_a{6Ilw@|=Zy(u@o#3@KbWin&TrN?|mzs=6dP#Do|#Q!yJC5ET+i?d}5mw0@#^^QwvKo3vyHQO5#%zOA@&hfMD_lA)U>( zL1K)IRhvVCI~c)Q)i<+*N-;8eOqLJxU~*uZ9N?tQSUWjERFa)vRG`E4gTmwnQL)XZ z!|M5&^q9fMC#7v>;?+?oN{-J>EJ-cOOw8FVkjci(xNEa`PA1T?Kv!Bba!=k{B+ke) z`D&3aBkyMBVlgJhxtpa*Pw+CvZ+_f#m64sTv^cfM&}8$z7Ht;BNt<7F__H&v+H5sp zF+bz2&G+VOF*82d%(?gq6XWO2_m;k4W<0t1^vY-KLY|DQ${!ez$cV{@HyU#tVE(`$ z#wu|kG;-4>W)5ypJQpc}2<6EiLxd+Q?%Ke3V)Lb4?^q{4I$){^lD;LGo1apelUl3? z4=KI0{G!~_oWvq-kWL;Tv03b(DdXhKLm^247Z`A&8w}hHVE6#UXyk3-ZQ%XDmdVGc U_kjUB`4KGs1z9#?GUMSA0F&p<9{>OV diff --git a/src/modules/equipment/__pycache__/run.cpython-311.pyc b/src/modules/equipment/__pycache__/run.cpython-311.pyc index 3d6de871f7c67ff459659bd3fd62dfe8609699cf..acfb176efd6a0f065d440c0a26049cee2c0a46b3 100644 GIT binary patch delta 1123 zcmb7^O-vI(6vt0%|Yqndb8K=JdZEg>uKbogEdxW}(|D zQ0Jx>xQW?k!F@C#qy@`Cue zHh9~d6)lpstpB^MmhvK%iXvG(I(=TgB^BLBfO^+$`7JG~a!LT8(k~-z$+7SkhglZw zJ&RLZXJplymZpGeOI!HWo|e_BDN$9jat0fIPQ~kPO@EPA8J#6Yn5qpCGDv*7;TuY7=uZ=lw4mpAI}5;F8BO_OD=n4*S^$i|0xKuYx^evGG_Ad$*09z=3zoZz6N8 zZ(DPY0FPxHT*1K{4i>>e0naOz8F($kTQuo92xe_PKJ>n!$BP!c5|;}tuAXkN&}}={ zi55}Axi+-eCKdIOo|6|kz*2`Tv>z=UYY2JJCy&IniNoPoL^s0Wb_dzbzR1U`$Sw{i T{09I?HEYKQVAK31+z0;vm@@>E delta 607 zcmZXS&r2IY6vyBE+TE;KllX&;no_idq9B4GYN3Q$dht+@LZQ7Z;w-XN*Dx7DbXSBz z5pOa=C?VIjwkPpe=pm;b?ZL}H?>+R;KcTZpCDp!RhR6GU--nsUoRvQfdLKN`1rzgE zqtWHLcZBd)tQu&!m?FtCp&PG>I>+VNI!;h*C+H1u*e5TbLEchh%w5|65+pmkZbjzR zHn~$M^mLA7NtI~j6~`^|9sztdyBi4Ng8bL|zdnBt*b!kWOH#4=|t zvANr%ysu@aPCR2c)?fa_EmDUu-DBMBW~MtM(+(})BB>(_YJ-hq@0t3>-r0FgWwaHl z6Kipi)kG9aO*X?==brAag*6#%$C}io(8MT{IqlZvs*pj}qAd~DcQ&O)q55SV`(Mno zf0}g&KT5-=BPV00V~5MXD;Mj|8Ja4anKT|REES<$be~Yt9=*F%CG9FRxpsnJYc-04 lV6tEIt95s7NcYu5$fGqGh@Dtue?WNZqx%4jUtGE`(I24jg`xle diff --git a/src/modules/equipment/run.py b/src/modules/equipment/run.py index daea2e1..461feb9 100644 --- a/src/modules/equipment/run.py +++ b/src/modules/equipment/run.py @@ -3,9 +3,9 @@ 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 - from .Prediksi import Prediksi, main as predict_run - from .Eac import Eac, main as eac_run + from src.modules.equipment.insert_actual_data import query_data, insert_lcca_maximo_corrective_data, insert_ms_equipment_data + from src.modules.equipment.Prediksi import Prediksi, main as predict_run + from src.modules.equipment.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, insert_lcca_maximo_corrective_data, insert_ms_equipment_data @@ -23,11 +23,11 @@ async def main(): # print(f"Error in query_data: {str(e)}") # return - # try: - # await predict_run() - # except Exception as e: - # print(f"Error in predict_equipment_data: {str(e)}") - # return + try: + await predict_run() + except Exception as e: + print(f"Error in predict_equipment_data: {str(e)}") + return try: # eac = Eac()