From 6712f0cd48eba26c53894f72baf06944818fc640 Mon Sep 17 00:00:00 2001
From: MrWaradana <muhammadridhowaradana@gmail.com>
Date: Thu, 6 Nov 2025 17:10:14 +0700
Subject: [PATCH] fix prediksi script

---
 .../__pycache__/config.cpython-311.pyc        | Bin 1361 -> 1365 bytes
 src/modules/equipment/Prediksi.py             |  66 ++++++++++--------
 .../equipment/__pycache__/Eac.cpython-311.pyc | Bin 9246 -> 9250 bytes
 .../__pycache__/Prediksi.cpython-311.pyc      | Bin 28009 -> 31325 bytes
 .../insert_actual_data.cpython-311.pyc        | Bin 36615 -> 36818 bytes
 src/modules/equipment/run.py                  |  17 +++--
 6 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/modules/__pycache__/config.cpython-311.pyc b/src/modules/__pycache__/config.cpython-311.pyc
index 91764e1f8b171319b03a565b0f2901b1572f5909..23843b8fab6926f4b54a07d8a33074193aeafc14 100644
GIT binary patch
delta 60
zcmcb}b(M>EIWI340}vd{<;hgp$h(bEK|?<yKQ~oBF*7$`KPgo=CpkG$zqlw_KQ}+6
OG$*xKfAf9DB4z*^?-Nh}

delta 56
zcmcc0b&-pAIWI340}xobv1A5q<lV+7qvC88lag8%la#8PlboCwQ(TlBlbfGXnv+@_
Kv-vS&5i<b5qY>i(

diff --git a/src/modules/equipment/Prediksi.py b/src/modules/equipment/Prediksi.py
index 1acc5eb..4621b8c 100644
--- a/src/modules/equipment/Prediksi.py
+++ b/src/modules/equipment/Prediksi.py
@@ -195,7 +195,7 @@ class Prediksi:
                 "raw_loss_output_MW", raw_loss_output_price
                 , created_by, created_at
             ) VALUES (
-                %s, %s, 0, 1, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, 'Sys', NOW()
+                %s, %s, 0, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, 'Sys', NOW()
             )
             """
 
@@ -226,40 +226,44 @@ class Prediksi:
                 max_seq = max_seq + 1
                 # Update values from API
                 api_data = await fetch_api_data(equipment_id, row["year"])
-                if api_data:
-                    # # Get current num_fail
-                    cm_interval_prediction = api_data["data"][0]["num_fail"]
+                if api_data and "data" in api_data and isinstance(api_data["data"], list) and len(api_data["data"]) > 0:
+                    # Get current num_fail (ensure numeric)
+                    try:
+                        cm_interval_prediction = float(api_data["data"][0].get("num_fail", row.get("cm_interval", 1)))
+                    except Exception:
+                        cm_interval_prediction = float(row.get("cm_interval", 1)) if not pd.isna(row.get("cm_interval", None)) else 1
                 else:
-                    cm_interval_prediction = (
-                        (
-                            float(row["cm_interval"])
-                            if float(row["cm_interval"]) >= 1
-                            else 1
-                        ),
-                    )
+                    # Fallback: ensure numeric scalar, not a tuple
+                    try:
+                        val = float(row.get("cm_interval", 1))
+                        cm_interval_prediction = val if val >= 1 else 1.0
+                    except Exception:
+                        cm_interval_prediction = 1.0
+
                 records_to_insert.append(
                     (
                         str(uuid4()),
                         int(max_seq),
-                        float(row["year"]),
+                        float(row["pm_interval"]) if not pd.isna(row.get("pm_interval", None)) else 0.0,
+                        float(row["year"]) if not pd.isna(row.get("year", None)) else 0.0,
                         equipment_id,
                         cm_interval_prediction,
-                        float(row["cm_cost"]),
-                        float(row["cm_labor_time"]),
-                        float(row["cm_labor_human"]),
-                        float(row["pm_cost"]),
-                        float(row["pm_labor_time"]),
-                        float(row["pm_labor_human"]),
-                        float(row["oh_interval"]),
-                        float(row["oh_cost"]),
-                        float(row["oh_labor_time"]),
-                        float(row["oh_labor_human"]),
-                        float(row["predictive_interval"]),
-                        float(row["predictive_material_cost"]),
-                        float(row["predictive_labor_time"]),
-                        float(row["predictive_labor_human"]),
-                        float(row["loss_output_mw"]),
-                        float(row["loss_price"]),
+                        float(row["cm_cost"]) if not pd.isna(row.get("cm_cost", None)) else 0.0,
+                        float(row["cm_labor_time"]) if not pd.isna(row.get("cm_labor_time", None)) else 0.0,
+                        float(row["cm_labor_human"]) if not pd.isna(row.get("cm_labor_human", None)) else 0.0,
+                        float(row["pm_cost"]) if not pd.isna(row.get("pm_cost", None)) else 0.0,
+                        float(row["pm_labor_time"]) if not pd.isna(row.get("pm_labor_time", None)) else 0.0,
+                        float(row["pm_labor_human"]) if not pd.isna(row.get("pm_labor_human", None)) else 0.0,
+                        float(row["oh_interval"]) if not pd.isna(row.get("oh_interval", None)) else 0.0,
+                        float(row["oh_cost"]) if not pd.isna(row.get("oh_cost", None)) else 0.0,
+                        float(row["oh_labor_time"]) if not pd.isna(row.get("oh_labor_time", None)) else 0.0,
+                        float(row["oh_labor_human"]) if not pd.isna(row.get("oh_labor_human", None)) else 0.0,
+                        float(row["predictive_interval"]) if not pd.isna(row.get("predictive_interval", None)) else 0.0,
+                        float(row["predictive_material_cost"]) if not pd.isna(row.get("predictive_material_cost", None)) else 0.0,
+                        float(row["predictive_labor_time"]) if not pd.isna(row.get("predictive_labor_time", None)) else 0.0,
+                        float(row["predictive_labor_human"]) if not pd.isna(row.get("predictive_labor_human", None)) else 0.0,
+                        float(row["loss_output_mw"]) if not pd.isna(row.get("loss_output_mw", None)) else 0.0,
+                        float(row["loss_price"]) if not pd.isna(row.get("loss_price", None)) else 0.0,
                     )
                 )
 
@@ -522,4 +526,8 @@ async def main(RELIABILITY_APP_URL=RELIABILITY_APP_URL):
         return
         
 
-asyncio.run(main())
+if __name__ == "__main__":
+    asyncio.run(
+        main()
+    )
+
diff --git a/src/modules/equipment/__pycache__/Eac.cpython-311.pyc b/src/modules/equipment/__pycache__/Eac.cpython-311.pyc
index ea1448427253eada1f1f8c3436035d6f7efa3641..a1bee379415141c35fbb4c02f68201ac3ed0d4e8 100644
GIT binary patch
delta 71
zcmbQ|vB-mOIWI340}vd{<;jdy*~n+lq@}N)k)NBYpO~4Oub-5vo0FWJs9#)^te=~o
ZQks)mte;v~npu#WnpdK~xtM9SA^`l`7gGQL

delta 67
zcmZ4FG0%f<IWI340}$BnT9@Icx{=SGNln|?DkdehEG8*cHzzqcF{ZdEIVLwhr8FnC
VI3~5QG_xQ#HLoOQb2-y$MF7Jn7Wn`G

diff --git a/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc b/src/modules/equipment/__pycache__/Prediksi.cpython-311.pyc
index 2d3140fdf7116b2cd98c18712635cdbcdc2275c3..916f420a10bb81896c76ba317a5915cd51f8126d 100644
GIT binary patch
delta 4121
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

delta 1575
zcmbu9e@I(b6vyv<uZcC9#9zr?YJU0D*l43xjT$x9uC}#RR>vsqX!;|Xq-4fu-+S#U
zM6}zS-R7$8Sy|Z}*njG_ZcurYIT&t({WDZB<55H?bg-3nV-P!q!Wit{#8N3840d_%
zbI$pmbMJZFce!`h@WU0Xo7QSIh>XQ>W_ZqbS;t{!rX-Hl3<~1cN<hPuGtMlznfV4g
zD)%(_0>N{>uAnQ@-R<{@LbtECFK{*z6n()nXT$xy!Kmbui?)QgJQG>+P4fPEUX9Qw
z8fDuNhD4`bo-<#<EIxh*4q5kl4KZCnLrYU5fH(OWPyIoCbf@$*L@{k3(}bYFZZrqd
zdsK9?V0do9wyhyNsE=h#Y2mUePbXz>bRtHwz^Z)@HUZ`xh8PpmKeK?=bfthJ>5&3Q
z_A@E{M(P6ZU?da#oiYQ3$!I-g&J-o1KT;-KoQ!@=8NVYL-A$QSOB`G%_XbAjCV5i>
zqX|5=98&|f8^Kcg0?vZfiXunUS%@V5NfAOtNH7m(Noh}&Kz=L>cK4g$#xW!CmTLI9
z)Pv2CUnXLMJYF`4p;NDgp&e?dbR7e4mIh?kZM+kr<@@B>a=jYv*Srj^ZZ9@~|DXY8
z+$V4jWYz9bt3r`JzXSud<}{&@^mAszhqdE6!AX3PZtE$#{S-9R9o5gU2t9uM06jp%
zD8cl?^}06ZAPbcm3$&!`nEfpH^K+rBepFqo%~?goFkA0EqRBSibGdJY6qk3_uee&i
z+orfWmhwu;v#vq*;;C0YwJ61Paa+A&tDoKdlg+zi^RBbV!cP@W^(uT#-0W7&?j^JP
zUICv-SC<>f%!Cg1HrR(a%eC$)$7D~OD^<ACWv*zME5Dl*os-cx=TbOVDy&efRdKFb
z;i{AI5?`fQtK(da!qxnb`l0{cV2Q6&to3ouqi~*$Pw*(#hB()#aE%*6gJNxrb4?1@
z^e-Q|L$OxGxk`nrOqApqjH?FLn4PnR2oe;lNv{faHUH?TCI9X1=5`DE-gdxC%)A+Q
z*wMU2)4{UyB{}WQ?7T-sm1Y%D7Fd?}3wBe7M;_ZXttTg{=FoOE9)aVBkKj)E_Ti><
zd_{hA;w8p+iL5M)QA`l5u>R<PK+Xjc#%Z`U)F%YH{h}l^Q4I*3X~I?Nx6*t@z%Thv
zia{Y96oqS4NhcRgFmf^!mV}RB(m#wRWlL8z<9?S;O;2@tpUzJ<rdL9;Q?k2onTA&=
zXeZ$V7zsr1O?VXe9KQ#j1c%itTOwgmlKD^>wtY-XrYSz7XrUOPc#+~NL{7)>1^MCW
zZ`q<RsqzJdOz{=PEXCIpw<zXdq34a9C{`6F&?a`try><;IU*@pQITy3_osGZ4z7!B
zco2RQOI3>`d0#e3cNoUG9sW93h$m#*>paGbu>U--`GutEeIfoJi|5;L<$*L@o<Ps%
qYEoa@oIMJ^4^;6ub2#m-jEk)oTi@9?wl9uy6_mU5<Pi*H`F{ZEfxnUf

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 651c30ae79b68907a86cc598f89833d030fccfc9..dbaed9aae518c40bcec96e993bfbd6d2fceb17dd 100644
GIT binary patch
delta 411
zcmZpl$8>2v6W?-PUM>b8IGD?m+0e9+?>CE<oqk4sZmND_W^TTIQmSrFa&n@6aZ$2<
zZhlH>PHM4!YGG++L2hbZiT-AN*05L>IW`7{$%SdMo0laWWS;C`z#^fekX)3SSdy9&
zpHzupCzgO!rKcTY<kL}553Vd$*HQ5E57*EHiBHzdkY>?F7`26Ivt+h3BQfTQGEUCR
z&7M3VjdgN<uHxh=xw1T1Oqbd$koSO%F>Lb35?7`=&dDn~?@tylGhnQq>```~BZ!4F
zoarM&&}9AczwB|$ymB8I;x-#s6f+u?G70KDkXHM^P|PH%v!WV8AFzhd7s9h3j1MeQ
z8Zt9@KA15`%1_?YqBQwe<uo3MkOe~^V+`YD#@dOSb*py@D@L(0ihf|gP8Mkc;{pIv
CLxqk2

delta 298
zcmcaKpQ(Kw6W?-PUM>b8sLbHWtZLcF_nSq{%GoL=CABOjDOEQoIXN+=xF|U$H$SB`
zC$%^xwXig^AU8FyBxbWQYgjDPF4oD02I7-9m~d=9o3Vvyb6hGf<76E}uFdyzxEUw!
zOkX>BVum!+31n60nV|}1GfrmCkllPR?-v_m(BwU(u1sZ|lS{hpPkvNpz*sz4xcokc
z9}8zV(?<rs$-m0~vPUuV%6(*r+WfDgm{GrwNl@p3wAu%Td?rzy71a>>fHj1^5S|5L
yd|;8#keR{r!D#Y=s@*&gwh2QZV+`ZuGqn>p|ES(6tQf}1DEff`J6WU+3>p9<?PwJM

diff --git a/src/modules/equipment/run.py b/src/modules/equipment/run.py
index 244b631..5e1d7f7 100644
--- a/src/modules/equipment/run.py
+++ b/src/modules/equipment/run.py
@@ -4,12 +4,12 @@ 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
+    from .Prediksi import Prediksi, main as predict_run
     from .Eac import Eac
 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
-    from Prediksi import Prediksi
+    from Prediksi import Prediksi, main as predict_run
     from Eac import Eac
 
 
@@ -17,15 +17,14 @@ except ImportError:
 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:
-        prediksi = Prediksi()
-        await prediksi.main()
+        await predict_run()
     except Exception as e:
         print(f"Error in predict_equipment_data: {str(e)}")
         return