modelswrkpi 10.0.2__tar.gz → 10.6.0__tar.gz

{modelswrkpi-10.0.2/modelswrkpi.egg-info → modelswrkpi-10.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelswrkpi
-Version: 10.0.2
+Version: 10.6.0
 Author: Kelly Kapowski
 Requires-Python: >=3.10
 Requires-Dist: psycopg2

{modelswrkpi-10.0.2 → modelswrkpi-10.6.0}/models/bro_clicks/load_balancer/v3.py

@@ -61,7 +61,7 @@ class LoadBalancerV3(LoadBalancerV2):
         self.version = 3
         self._to_engine = self.db_p.engine.execution_options(postgresql_statement_timeout=2000)
         self.init_static(db_p.engine.execution_options(postgresql_statement_timeout=160*60), route_methods=route_methods, is_rewrite=is_new_route)
-
+        self._bin_engine =  self.db_p.engine.execution_options(postgresql_statement_timeout=3900)
     def __del__(self):
         self._joiner(self._t_get_bin)
         # self._join_lb()
@@ -96,17 +96,20 @@ class LoadBalancerV3(LoadBalancerV2):
     def set_bin_info(self, cc_first_6):
         def _exec():
             nonlocal cc_first_6
-            self.iin_info = pd.read_sql(f"select * from {self._iin_schema}.iin_data where bin='{cc_first_6}'",
-                                        self.db_p.engine).astype(str).applymap(str.lower).replace({'none': None})
-            if len(self.iin_info):
-                self.is_iin_data = True
-                self.iin_info = self.iin_info.to_dict(orient='records')[0]
-                if self.iin_info['bank_map'] is not None:
-                    self.iin_info['bank'] = self.iin_info['bank_map']
-                if 'level' not in self.iin_info:
-                    self.iin_info['level'] = None
-            else:
-                self.iin_info = {}
+            try:
+                self.iin_info = pd.read_sql(f"select * from {self._iin_schema}.iin_data where bin='{cc_first_6}'",
+                                            self._bin_engine.engine).astype(str).applymap(str.lower).replace({'none': None})
+                if len(self.iin_info):
+                    self.is_iin_data = True
+                    self.iin_info = self.iin_info.to_dict(orient='records')[0]
+                    if self.iin_info['bank_map'] is not None:
+                        self.iin_info['bank'] = self.iin_info['bank_map']
+                    if 'level' not in self.iin_info:
+                        self.iin_info['level'] = None
+                else:
+                    self.iin_info = {}
+            except Exception as e:
+                print(f'LB V3 set bin error: str(e)', flush=True)
             self.iin_info['cc_first_6'] = cc_first_6
 
         self._t_get_bin = Thread(target=_exec)
@@ -128,8 +131,25 @@ class LoadBalancerV3(LoadBalancerV2):
 
             def _getter(table, where=''):
                 nonlocal _lock_rt, rts
-                _rt = pd.read_sql(f"""select * from {LoadBalancerV3._route_schema}.{table} {where}""", db.engine)
-                _rt['mod_type'] = table
+                try:
+                    raw_conn = db.engine.raw_connection()
+                    try:
+                        cursor = raw_conn.cursor()
+                        cursor.execute("SET statement_timeout = 60000")
+                        # Pandas can take the raw connection, but results vary by driver
+                        _rt = pd.read_sql(f"""select * from {LoadBalancerV3._route_schema}.{table} {where}""", con=raw_conn)
+                        raw_conn.commit()
+                    except Exception as e:
+                        print(f'Load Balancer route get query execution exception: {str(e)}')
+                        raw_conn.rollback()
+                        raw_conn.close()
+                        return
+
+                    raw_conn.close()
+                    _rt['mod_type'] = table
+                except Exception as e:
+                    print(f'Load Balancer route get exception: {str(e)}')
+                    return
                 _lock_rt.acquire()
                 rts = rts.append(_rt)
                 _lock_rt.release()

{modelswrkpi-10.0.2 → modelswrkpi-10.6.0}/models/bro_clicks/load_balancer/v6.py

@@ -15,13 +15,14 @@ class LoadBalancerV6(LoadBalancerV5):
         self.version=6
 
 
+
     def set_bin_info(self, cc_first_8):
         def _exec():
             nonlocal cc_first_8
             self.iin_info = {'cc_first_8': cc_first_8}
             try:
                 iini = pd.read_sql(f"select * from {self._iin_schema}.iin8_data where iin='{cc_first_8}'",
-                                            self.db_p.engine).astype(str).applymap(str.lower).replace({'none': None})
+                                            self._bin_engine.engine).astype(str).applymap(str.lower).replace({'none': None})
                 if len(iini):
                     self.iin_info = iini
                     self.is_iin_data = True
@@ -33,7 +34,7 @@ class LoadBalancerV6(LoadBalancerV5):
                 else:
                     self.iin_info = {}
             except Exception as e:
-                print(f'SET BIN INFO ERROR: str(e)')
+                print(f'SET BIN INFO ERROR: {str(e)}', flush=True)
 
             self.iin_info['cc_first_8'] = cc_first_8
 

{modelswrkpi-10.0.2 → modelswrkpi-10.6.0/modelswrkpi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modelswrkpi
-Version: 10.0.2
+Version: 10.6.0
 Author: Kelly Kapowski
 Requires-Python: >=3.10
 Requires-Dist: psycopg2

{modelswrkpi-10.0.2 → modelswrkpi-10.6.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = modelswrkpi
-version = 10.0.2
+version = 10.6.0
 author = Kelly Kapowski
 
 [options]