From 1cab85ac879d37a442a231a6d02fbc061bd6cfbb Mon Sep 17 00:00:00 2001 From: Nicole Rappe Date: Tue, 25 Feb 2025 21:00:51 -0700 Subject: [PATCH] asdf --- .../flyff_EXP_current.cpython-312.pyc | Bin 4472 -> 2984 bytes Nodes/Flyff/flyff_EXP_current.py | 57 +++--------------- 2 files changed, 8 insertions(+), 49 deletions(-) diff --git a/Nodes/Flyff/__pycache__/flyff_EXP_current.cpython-312.pyc b/Nodes/Flyff/__pycache__/flyff_EXP_current.cpython-312.pyc index 9a01ad2a337906c4e3bb03fec1ac69de5a109912..a8eac9513d0edf2471d599c7ea455692df9eb0cc 100644 GIT binary patch delta 1103 zcmZuu&rcLr9Di?q56mn(=)zRG>$oo9ps3a0!88O&vGE`nT1**YCYzlRA+xf5GYH%4 zR?={wr%K*IQqqJ&4{f-Z^g=us?a9;&8#GI&^w9r+P=BCad~cSG9DJF4zP~=-&wSte z?xlZgjXhP>20)Iz^l;*)xD?ZeE|KUSaDW9I=rA6%U}PDKA(r*nJZEu`);N#P3zh%@ z1HJ?fzW^M;<85m4oSAO}2*2e(?V}`~Y@0EP^>`NnZg|z^~y&_!ggI z((q?I$`m_FV5;$8XU%uSHCXc?C<0T$r`QW|B$AXVguFjfa1j#lD%*u)oCTZlB-a5i z;k#UKqon+#{;1x~KbJE24cDd_MCTrmL9nj}@J=j&=S7K`;_-dH#aP>)wG0EQADt4c z|Gv!N;ilGMw#3wV5PW=O!Z=!}sqm)Y;x;=Y}QvtW)L1GCT+hCR^08RR7trLbz~oU2VPRiRH}b?W=s`OERqnZSl*Il5fqAgQ zi1IbKt!JuwcSY~s)X!A)^A-L4{lWE~O}&5d^7f}kSLKzV#VcD%ys9KCN^*H(wfs!! ziQ-g6NiCP3E8TnBP5LfisFrr5sGxiO_0_<`C1P5htwgfV6OMZE7$GtHY(kwB>0 zcFxQCe$Mqg+cqI;C0U8hmwF z=EouWq~2gkp=jIAbk4RzE||=_C{6aFX@^dR;+1J<#&i8>p^^IUpw>vo4yDiYQN0)S a;eIW7B>pcj$oGOv!*RHL;w7Lq;=czHeEtOh delta 2524 zcmZ`*U2GFq7QT0W{GWIX`SnjS{z-_V#z|nIX$om54g?ydh=vNBg5`Q9;NaNlok@dT zXM?mnxK$;R&Q?ium+I`u#(w3@``eFxHcBfRzLtpw9L0TdDviFWN4v2Pa zopaAU-#K&7z4v_fTJs}c{kL^>7J#4q-~8v&N!xOL%c+;KwE_eX0Rj}LB#b~!QxQtj zbcDv5PBJrWgoS_tCxF0Q2Ldayw`r0IfQTVO1r4#bWx20AolHu+d|Bj=o<7OPWd5=& z&kpwX_V0f_)Q3O)g9rQi`g(f$6>acvlOS+puaukO4uf zVxkWXO!}1Q6$PJ6HTOK5xpHts(Y G*teSw!XqWuBgd z4&@%*38$3D^w7ChPo8NPY&h-34Qb2sC zGOZZ0E9BrFuHy|~0dmbZ4U}%yMZuhsW*W~SPY&XpVzij2L>6Bl?5XYbuJa1ch+qbg z$f$mtzzk%wj+wS7cc{jL)MxbV9sdHAqo!@Te^)QiIa*+@bm5HG%m8ETcy-PTSD{2f zkN^veTsy=ZBRA-QdRjygjKJcB)C$ClZq{+TS}@cOUh$fm7X_nW(z7hEa;uKau{v(S zfHS%D`CToTa|S&Uk}dM=`t%V-JaNr1rd{{!XmZg6OOCz?1nbB2E?BTVSxN@@fz0Wl z0f2C8l7i2J_dlEmSLyR$9%2Ol1mf_5QTFThbby@oBJPW47Jwl_UCxN#U!ODG1Rpbh zw1)GTG!~41HfDD8Jk;MDw2x<!aXjmKrn8RK+DfIx ztFwsQBSbE6mK~j#IL&8U`6-m1;k7{AkH_W^5>xVcS`a6)KILz0|KwhkA#XwChM-0w zny^q!NPKHflw?VzFNv~hmE@Q_Cq?5pQe~#4bV{|n9!t)NBcu^kOF~MdFeDYn-ef|O zQ43C@{KWeAIHH$hDIqCpZLPJfVleo+gJwi-j%tfnmlP$7Aa9js(`*19(mv$9r`R+;4WRWR^3^J9%5hYQHh`-q31pO(=)LMf`0K-;v8F zCW|K~H`*sFwmqBP9*q~a7?0U^zqx%Sx11{khS$BN=CS-}#px?MLq%sO|H`J_xf6+X>YLN@+^fny`4+UU+XJe!%E$9 zU7_v85_fph&3`ib(dezSYa{pE`^ocHUaxpNmY5IgA8q>=L5uGJfMjK!55ikC z9{sl63Aok=fW~z>oMlHx(a~|wu`mB}#m1FwzM{=n=s2+s??~&R!uiR_3nkmd zipQG|-xz;){I@M54t*>g!#n$hp)2eLU-UMFt>8=gXg4;#3c0boYqf@3>AOu{iWn`B z7_BrJyUinB`fkVm5jXv{n;r4~_oy)rp;7s#DFOo@m;>%XoEL?#P+5(-g9hyqpaXbH zdC44VI)n!jAIW?|c++pP3 z;p!`IkXtX4meC#o<{<8AYPY9xj;ATI#?^WZ=7T5j__vWB&zdGj&YXGm%mp6V0aye< z7Wpt75qj173k{PIX_6paZ3KEox`g`ighWch^;e7U!A7>@cltNyW#`%I4 zMYarc4m?ByL_9}CkMg;tamtB@65*@i>Uzol4MYSXUy1PPqwAp3ICyQm!g;Qp+-B<8 zfd_nm^*tDaW_A+(+GJn{w6|zcL8EGn;(r72XtcUxBm?SI`mK!~4e&2e1(TbhnhwvT ig}J0SgkDwNvU;5M9{~3w;J2AqARJij`UMcJ;r|a(tvUk$ diff --git a/Nodes/Flyff/flyff_EXP_current.py b/Nodes/Flyff/flyff_EXP_current.py index 22ec090..3ca7595 100644 --- a/Nodes/Flyff/flyff_EXP_current.py +++ b/Nodes/Flyff/flyff_EXP_current.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ Flyff EXP Node (Final Combined Version) - - Polls the API at http://127.0.0.1:5000/data + - Pulls the EXP value directly from data_manager.py - Outputs only the "exp" value as a string - Uses color (48, 116, 143) for its output port - Displays "exp" in a text field labeled "Value" @@ -9,9 +9,9 @@ Flyff EXP Node (Final Combined Version) """ import time -import requests import traceback from OdenGraphQt import BaseNode +from Modules import data_manager # Importing data_manager from Modules class FlyffEXPCurrentNode(BaseNode): __identifier__ = 'bunny-lab.io.flyff_exp_current_node' @@ -26,50 +26,17 @@ class FlyffEXPCurrentNode(BaseNode): # 2) Output port also named "value" self.add_output('value', color=(48, 116, 143)) - self._api_down = True - self._last_api_attempt = 0.0 - self._retry_interval = 5.0 - self._last_error_printed = 0.0 - - self.set_name("Flyff - EXP (API Disconnected)") + self.set_name("Flyff - EXP") def process_input(self): - current_time = time.time() - if self._api_down and (current_time - self._last_api_attempt < self._retry_interval): - return - - self._last_api_attempt = current_time - try: - response = requests.get("http://127.0.0.1:5000/data", timeout=1) - status_code = response.status_code - - if status_code == 200: - try: - data = response.json() or {} - except ValueError: - data = {} - - if isinstance(data, list): - data = {} - - self._api_down = False - self.set_name("Flyff - EXP (API Connected)") - - new_value = data.get("exp", "N/A") - - new_value_str = str(new_value) - self.set_property('value', new_value_str) - self.transmit_data(new_value_str) - - else: - self._handle_api_error(f"HTTP {status_code} from FlyffEXPCurrentNode") - self._api_down = True - + new_value = data_manager.get_data().get("exp", "N/A") + new_value_str = str(new_value) + self.set_property('value', new_value_str) + self.transmit_data(new_value_str) except Exception as e: tb = traceback.format_exc() - self._handle_api_error(f"Exception in FlyffEXPCurrentNode: {e}\nTraceback:\n{tb}") - self._api_down = True + print(f"[ERROR] Exception in FlyffEXPCurrentNode: {e}\nTraceback:\n{tb}") def transmit_data(self, data): output_port = self.outputs().get('value') @@ -81,11 +48,3 @@ class FlyffEXPCurrentNode(BaseNode): connected_node.receive_data(data, source_port_name='value') except Exception as e: print(f"[ERROR] Error transmitting data to {connected_node}: {e}") - - def _handle_api_error(self, msg): - current_time = time.time() - if (current_time - self._last_error_printed) >= self._retry_interval: - print(f"[ERROR] {msg}") - self._last_error_printed = current_time - - self.set_name("Flyff - EXP (API Disconnected)")