modelswrkpi 8.1.2__py3-none-any.whl → 8.1.3__py3-none-any.whl

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

@@ -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.dist-info → modelswrkpi-8.1.3.dist-info}/RECORD

@@ -77,8 +77,8 @@ models/bro_clicks/load_balancer/v4.cpython-310-x86_64-linux-gnu.so,sha256=kbQws2
 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=VkmSqG11rgZTOv5AzhhVga52Ay6rrRKqmrrFVj8gUl0,127568
 models/bro_clicks/load_balancer/v5.py,sha256=GLRcbOUAI4n2m8wv7yGNhRZoPHQ8WO_Ra4FeAr3Yxsg,7755
-models/bro_clicks/load_balancer/v6.cpython-310-x86_64-linux-gnu.so,sha256=aOxX26fPb0UvTrRrilI2a35ojbbaq4BoDrfPiNLsAk4,165360
-models/bro_clicks/load_balancer/v6.py,sha256=G7kA18-PA5NA2WZMIRChPkFS-JbyZcqLzgFtu4mZxEs,9334
+models/bro_clicks/load_balancer/v6.cpython-310-x86_64-linux-gnu.so,sha256=FHmp___9eteGe8pX_kHA5PDSIM7mLGkXhxWHg47imPc,165360
+models/bro_clicks/load_balancer/v6.py,sha256=Ekt-wML3bGadz1dOhDBC-L2WKrgzmRJc8ASTcY1rOgI,9608
 models/bro_clicks/load_balancer/v7.py,sha256=tkk6FpLgQvKCaFf2kmKsHhW_Pj4gJq4PcSe-DKcIUC4,264
 models/bro_clicks/load_balancer/v8.py,sha256=tkk6FpLgQvKCaFf2kmKsHhW_Pj4gJq4PcSe-DKcIUC4,264
 models/cb911/__init__.py,sha256=Y3tX5WQYFUswdMMUpWqa9U_fNObUAhXcVrix3eXYP4k,64
@@ -135,7 +135,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-8.1.2.dist-info/METADATA,sha256=jvVvwvhYcnC9fPlAmeUFtJ3iayCKfsm7cb36sUPoQq8,346
-modelswrkpi-8.1.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-modelswrkpi-8.1.2.dist-info/top_level.txt,sha256=fOgLNy4xnMfp0ihe_kFhY_yH71kNkdEQG68z8FoLR4g,19
-modelswrkpi-8.1.2.dist-info/RECORD,,
+modelswrkpi-8.1.3.dist-info/METADATA,sha256=XCityP9r2Cx1HypVjO8vH3ZgKaxvq4AuHUoorH_6AqM,346
+modelswrkpi-8.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+modelswrkpi-8.1.3.dist-info/top_level.txt,sha256=fOgLNy4xnMfp0ihe_kFhY_yH71kNkdEQG68z8FoLR4g,19
+modelswrkpi-8.1.3.dist-info/RECORD,,