modelswrkpi 9.4.0__tar.gz → 9.5.0__tar.gz

{modelswrkpi-9.4.0/modelswrkpi.egg-info → modelswrkpi-9.5.0}/PKG-INFO

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

{modelswrkpi-9.4.0 → modelswrkpi-9.5.0}/models/bro_clicks/load_balancer/v2.py

@@ -40,9 +40,16 @@ class LoadBalancerV2(LoadBalancer):
 
                  """
 
-    def exclude_list(self, crm_id, step, click_id, alias=''):
+    def exclude_list(self, crm_id, step, click_id, alias='', c_token=''):
+        if not c_token:
+            c = 'absce'
+        else:
+            c = c_token
         decs = pd.read_sql(f"""SELECT  gateway_id, processor, approved  from {self.schema}.conversions 
-                                where crm_id = '{crm_id}'  and click_id  = '{click_id}' and decline_reason not ilike 'prepaid%%' """,
+                                where crm_id = '{crm_id}'
+                                and time_stamp > (now() - INTERVAL '48 hours')::timestamp
+                                and {f" c_token='{c}' " if c_token else f" click_id = '{click_id}' " } and coalesce(decline_reason, '') not ilike 'prepaid%%' """,
+
                            self.engine)
 
         whd = ""
@@ -50,7 +57,7 @@ class LoadBalancerV2(LoadBalancer):
             decs.gateway_id = decs.gateway_id.fillna(-1)
             decs.processor = decs.processor.fillna('')
             processors = decs.loc[decs.approved == 0].processor.astype(str).tolist()
-            if len(processors) > self._max_decline_attempts:
+            if len(decs) > self._max_decline_attempts:
                 raise Exception('declined due to too many attempts')
             p_break = []
             for p in processors:

{modelswrkpi-9.4.0 → modelswrkpi-9.5.0}/models/bro_clicks/load_balancer/v3.py

@@ -25,12 +25,10 @@ class LoadBalancerV3(LoadBalancerV2):
                                 'cc_type_mcc_conversion',
                                 'cc_type_cc_level_conversion',
                                 ],
-                 rewrite_route='initial_route' ,
+                 rewrite_route='initial_route',
                  iin_schema='bro_clicks',
-
                  **kwargs):
 
-
         is_new_route = False
         if rewrite_route:
             is_new_route = LoadBalancerV3._route_schema != rewrite_route

{modelswrkpi-9.4.0 → modelswrkpi-9.5.0}/models/bro_clicks/load_balancer/v7.py

@@ -165,7 +165,7 @@ class LoadBalancerV7(LoadBalancerV6):
 
     def next_gateway(self, crm_id, date, step, click_id='', processor=False, cc_type=None, cc_first_8=False, recurse=0,
                      decs=False, ignore_user_exclusions=None,
-                     proc_excl=[], is_tds=None, is_prepaid=True, **kwargs):
+                     proc_excl=[], is_tds=None, is_prepaid=True, c_token=None, **kwargs):
         # opt vals 1 = random gateway constrained only by cap,  2 = optimised gateway constrained only by cap, 3 = Hybrid approach not ignoring settings, 4 = over cap (over-rides to that if needed)
         if is_prepaid is None:
             raise TypeError('is_prepaid value must be pass as a boolean got NoneType')
@@ -179,7 +179,7 @@ class LoadBalancerV7(LoadBalancerV6):
         if cc_first_8:
             self.set_bin_info(cc_first_8)
         try:
-            decs = self.exclude_list(crm_id, step, click_id, 'a.') if not decs else decs
+            decs = self.exclude_list(crm_id, step, click_id, 'a.', c_token=c_token) if not decs else decs
         except Exception as e:
             return str(e)
 

{modelswrkpi-9.4.0 → modelswrkpi-9.5.0/modelswrkpi.egg-info}/PKG-INFO

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

{modelswrkpi-9.4.0 → modelswrkpi-9.5.0}/setup.cfg

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