modelswrkpi 8.1.2__tar.gz → 8.1.3__tar.gz

{modelswrkpi-8.1.2/modelswrkpi.egg-info → modelswrkpi-8.1.3}/PKG-INFO

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

{modelswrkpi-8.1.2 → modelswrkpi-8.1.3}/models/bro_clicks/load_balancer/v6.py

@@ -5,7 +5,7 @@ from threading import Thread
 import pandas as pd
 from concurrent.futures import ThreadPoolExecutor, TimeoutError
 import time
-
+from numpy import nan as np_nan
 class LoadBalancerV6(LoadBalancerV5):
     #LoadBalancerV3._route_schema = 'foreign_initial_route_v2'
     def __init__(self, *args, **kw):
@@ -83,18 +83,23 @@ class LoadBalancerV6(LoadBalancerV5):
                 mod = self.routes if self.is_iin_data else self.routes.loc[
                     self.routes.mod_type.isin(['cc_type_conversion', 'cc_type_mcc_conversion'])]
                 self._lock_model_replace.release()
-                mod = mod.loc[(mod.approved + mod.declined >= self._min_sample_count)
-                              # & (mod.conversion_rate != 1)  # take out dummy gateways
-                              & ((mod.cc_first_8 == cc_first_8) | (mod.cc_first_8.isna()))
-                              & (mod.campaign_class == pp_campaign_class)
-                              & (((mod.cc_type == cc_type) | mod.cc_type.isna()) if 'cc_type' in mod.columns else (
-                    True))
-                              & (((mod.cc_level == str(self.iin_info['level'])) | (
-                    mod.cc_level.isna())) if self.is_iin_data and 'level' in self.iin_info else (True))
-                              & (((mod.bank == str(self.iin_info['bank'])) | (
-                    mod.bank.isna())) if self.is_iin_data and 'bank' in self.iin_info else (True))
-                              ]
-                if len(mod): #and 'conversion_rate' in mod.columns:
+                if len(mod):  # and 'conversion_rate' in mod.columns:
+                    if 'cc_level' not in mod.columns:
+                        mod['cc_level'] = np_nan
+                    if 'mcc' not in mod.columns:
+                        mod['mcc'] = np_nan
+                    mod = mod.loc[(mod.approved + mod.declined >= self._min_sample_count)
+                                  # & (mod.conversion_rate != 1)  # take out dummy gateways
+                                  & ((mod.cc_first_8 == cc_first_8) | (mod.cc_first_8.isna()))
+                                  & (mod.campaign_class == pp_campaign_class)
+                                  & (((mod.cc_type == cc_type) | mod.cc_type.isna()) if 'cc_type' in mod.columns else (
+                        True))
+                                  & (((mod.cc_level == str(self.iin_info['level'])) | (
+                        mod.cc_level.isna())) if self.is_iin_data and 'level' in self.iin_info else (True))
+                                  & (((mod.bank == str(self.iin_info['bank'])) | (
+                        mod.bank.isna())) if self.is_iin_data and 'bank' in self.iin_info else (True))
+                                  ]
+
                     df_opt = mod.copy().sort_values('conversion_rate', ascending=False).reset_index(drop=True)
                     df_opt['r_rank'] = df_opt.index + 1
 

{modelswrkpi-8.1.2 → modelswrkpi-8.1.3/modelswrkpi.egg-info}/PKG-INFO

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

{modelswrkpi-8.1.2 → modelswrkpi-8.1.3}/setup.cfg

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