modelswrkpi 9.4.1__py3-none-any.whl → 9.5.0__py3-none-any.whl

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:

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

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.1.dist-info → modelswrkpi-9.5.0.dist-info}/METADATA

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

{modelswrkpi-9.4.1.dist-info → modelswrkpi-9.5.0.dist-info}/RECORD

@@ -69,18 +69,18 @@ models/bro_clicks/load_balancer/__init__.py,sha256=TMIh-RpmoCaEMTLU7geYtcDpygX5K
 models/bro_clicks/load_balancer/compile.py,sha256=0mD0LCkkR2aasWk8AdxVA6ylHN28l4bV6vwkA2TUQF4,661
 models/bro_clicks/load_balancer/v1.cpython-310-x86_64-linux-gnu.so,sha256=0hyLWBENHXo1JlATlCCgT3TPYYsuKMbLPnNLNlZkyMg,177072
 models/bro_clicks/load_balancer/v1.py,sha256=lLxqVcsH99_XS1tv_r-5jUP6C1gq462cuitg3trW1VE,11123
-models/bro_clicks/load_balancer/v2.cpython-310-x86_64-linux-gnu.so,sha256=VCGHr8KSipO2E0IfJ0zSpdte-xw_xsSK5vRWujtumnU,140368
-models/bro_clicks/load_balancer/v2.py,sha256=WSM6lKtyLrzx1xdhL3ncuH4QH-FBnS5Gm0uDFAtNHXo,7303
-models/bro_clicks/load_balancer/v3.cpython-310-x86_64-linux-gnu.so,sha256=K8ZoW1pAI2jUbpvUTOmzcQSzTt8SlO0HuHiRbbeVvdI,256496
-models/bro_clicks/load_balancer/v3.py,sha256=8MRWGDNTrA9FeXOP3oufFQcVbWdY76ptsdnD61Uy52E,16803
+models/bro_clicks/load_balancer/v2.cpython-310-x86_64-linux-gnu.so,sha256=wjpz0YOMFvaTa4ddjfSdhAF-pC5y5cs4bvxSXjIx7f8,144464
+models/bro_clicks/load_balancer/v2.py,sha256=M-ES1VK3RCmUuD96H2crsT3L5SBYME9960aF259Y5HA,7573
+models/bro_clicks/load_balancer/v3.cpython-310-x86_64-linux-gnu.so,sha256=WnE_FWaIbEcy1g4Jpl12ldimZvdHa_I4W9qg6Z3UwCk,256496
+models/bro_clicks/load_balancer/v3.py,sha256=7xfKo2j5YvPFPDd_KBl1s4hip9UPiWWsGHfcDm0D7yw,16800
 models/bro_clicks/load_balancer/v4.cpython-310-x86_64-linux-gnu.so,sha256=kbQws2ObO2BxOOxjCaB7_H8IA1allHZ-zsX2kYMvrJo,136208
 models/bro_clicks/load_balancer/v4.py,sha256=wGe66SzYIa4qiPnA4ZZQ5tisvXv_j7XZZCVrsCG23Eg,7732
 models/bro_clicks/load_balancer/v5.cpython-310-x86_64-linux-gnu.so,sha256=gHA2J0wZsH9XdQSa13aQQELgOET9qCieiTB5RaJgztQ,127568
 models/bro_clicks/load_balancer/v5.py,sha256=jA1KPoJLcm8szMGhaGuMSH-dZ6d0dwNv1PgGm0UHsJ0,8036
 models/bro_clicks/load_balancer/v6.cpython-310-x86_64-linux-gnu.so,sha256=1X_3SFmkafbH3Ejj8q7aHUHHxNzpP6zlJXNTKehks2s,165360
 models/bro_clicks/load_balancer/v6.py,sha256=oD_VYJ_Yvm5YJAGBx4IYxQHvIbKTeRq-Y00O38adOyQ,9587
-models/bro_clicks/load_balancer/v7.cpython-310-x86_64-linux-gnu.so,sha256=82CbiqQvJZjYBYSGwc45fEX8Pfpnkb6Br8ipRet0-5I,214160
-models/bro_clicks/load_balancer/v7.py,sha256=cEQQmLPBlKoSau9V-PAXhq0cHsfU661MiyNHNbE49dk,18457
+models/bro_clicks/load_balancer/v7.cpython-310-x86_64-linux-gnu.so,sha256=QlSuCmiR08Skhet_DhRfCUsO7q_CjDoI2qNZuwseKWk,210064
+models/bro_clicks/load_balancer/v7.py,sha256=8R51tU5o26SZduM4y-UkqheCwKDs_33H3yAzPQO6ueQ,18488
 models/bro_clicks/load_balancer/v8.py,sha256=tkk6FpLgQvKCaFf2kmKsHhW_Pj4gJq4PcSe-DKcIUC4,264
 models/cb911/__init__.py,sha256=Y3tX5WQYFUswdMMUpWqa9U_fNObUAhXcVrix3eXYP4k,64
 models/cb911/alerts.cpython-310-x86_64-linux-gnu.so,sha256=LCsUfaTzdQKS6ZaKQbfLCNTZbpZqaJmEsWDTUOdHUrI,61808
@@ -136,7 +136,7 @@ models/reports/table_reports/inactive_report.cpython-310-x86_64-linux-gnu.so,sha
 models/reports/table_reports/mtd_report.cpython-310-x86_64-linux-gnu.so,sha256=dHko7wWia9y9d-gIPC8uxycUnobII6hQgairSPRU168,74096
 models/vaultx/__init__.py,sha256=PwYMmWXQMojeyFnQuQW3wNlv9dLUmX_uiDfCOHJN7XI,46
 models/vaultx/ssc_cont.cpython-310-x86_64-linux-gnu.so,sha256=69kGuEko6oJEqxopS_4BxoX5S-Twq94eFwYJFEu_4B8,94992
-modelswrkpi-9.4.1.dist-info/METADATA,sha256=o7ygDTVATRTEtGqPG9k3JDGBerNsZPCMUwvwzy_UUxM,346
-modelswrkpi-9.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-modelswrkpi-9.4.1.dist-info/top_level.txt,sha256=fOgLNy4xnMfp0ihe_kFhY_yH71kNkdEQG68z8FoLR4g,19
-modelswrkpi-9.4.1.dist-info/RECORD,,
+modelswrkpi-9.5.0.dist-info/METADATA,sha256=kW1UVkzHaui7vRrL7ufv6n0Ihl_5S4Bej9cYMrT5L9g,346
+modelswrkpi-9.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+modelswrkpi-9.5.0.dist-info/top_level.txt,sha256=fOgLNy4xnMfp0ihe_kFhY_yH71kNkdEQG68z8FoLR4g,19
+modelswrkpi-9.5.0.dist-info/RECORD,,