Add files via upload

Author: pycaret

classification.py

@@ -6699,26 +6699,30 @@ def predict_model(estimator,
     #no active tests
 
     #general dependencies
+    import sys
     import numpy as np
     import pandas as pd
     import re
     from sklearn import metrics
     from copy import deepcopy
     from IPython.display import clear_output, update_display
 
+    estimator = deepcopy(estimator)
+    clear_output()
+    
     if type(estimator) is str:
         if platform == 'aws':
-            estimator = load_model(str(estimator), platform='aws', 
+            estimator_ = load_model(str(estimator), platform='aws', 
                                    authentication={'bucket': authentication.get('bucket')},
                                    verbose=False)
 
         else:
-            estimator = load_model(str(estimator), verbose=False)
+            estimator_ = load_model(str(estimator), verbose=False)
 
-    estimator = deepcopy(estimator)
-    estimator_ = estimator
-    clear_output()
-    
+    else:
+        
+        estimator_ = estimator
+
     if type(estimator_) is list:
 
         if 'sklearn.pipeline.Pipeline' in str(type(estimator_[0])):
@@ -6728,17 +6732,28 @@ def predict_model(estimator,
             estimator = estimator_[0]
 
         else:
+            
+            try:
+
+                prep_pipe_transformer = prep_pipe
+                model = estimator
+                estimator = estimator
+                
+            except:
+                
+                sys.exit("(Type Error): Transformation Pipe Missing. ")
+            
+    else:
+        
+        try:
 
             prep_pipe_transformer = prep_pipe
             model = estimator
             estimator = estimator
 
-    else:
-
-        prep_pipe_transformer = prep_pipe
-        model = estimator
-        estimator = estimator
-        
+        except:
+            
+            sys.exit("(Type Error): Transformation Pipe Missing. ")
 
     #dataset
     if data is None:
@@ -6753,6 +6768,7 @@ def predict_model(estimator,
         X_test_.reset_index(drop=True, inplace=True)
         y_test_.reset_index(drop=True, inplace=True)
 
+        model = estimator
         estimator_ = estimator
 
     else:
@@ -6765,13 +6781,10 @@ def predict_model(estimator,
 
         estimator_ = estimator
 
-        
     #try:
     #    model = finalize_model(estimator)
     #except:
     #    model = estimator
-            
-
 
     if type(estimator) is list:
 
@@ -7198,3 +7211,4 @@ def putSpace(input):
 
     return X_test_
 
+

regression.py

@@ -5300,6 +5300,7 @@ def finalize_model(estimator):
     return model_final
 
 
+
 def save_model(model, model_name, verbose=True):
 
     """
@@ -5343,14 +5344,19 @@ def save_model(model, model_name, verbose=True):
             
     """
 
+    model_ = []
+    model_.append(prep_pipe)
+    model_.append(model)
+    
     import joblib
     model_name = model_name + '.pkl'
-    joblib.dump(model, model_name)
+    joblib.dump(model_, model_name)
     if verbose:
         print('Transformation Pipeline and Model Succesfully Saved')
 
 
 
+
 def load_model(model_name, 
                platform = None,
                authentication = None,
@@ -5706,26 +5712,30 @@ def predict_model(estimator,
     #no active tests
 
     #general dependencies
+    import sys
     import numpy as np
     import pandas as pd
     import re
     from sklearn import metrics
     from copy import deepcopy
     from IPython.display import clear_output, update_display
 
+    estimator = deepcopy(estimator)
+    clear_output()
+    
     if type(estimator) is str:
         if platform == 'aws':
-            estimator = load_model(str(estimator), platform='aws', 
+            estimator_ = load_model(str(estimator), platform='aws', 
                                    authentication={'bucket': authentication.get('bucket')},
                                    verbose=False)
 
         else:
-            estimator = load_model(str(estimator), verbose=False)
-            
-    estimator = deepcopy(estimator)
-    estimator_ = estimator
-    clear_output()
-
+            estimator_ = load_model(str(estimator), verbose=False)
+    
+    else:
+        
+        estimator_ = estimator
+        
     if type(estimator_) is list:
 
         if 'sklearn.pipeline.Pipeline' in str(type(estimator_[0])):
@@ -5735,16 +5745,28 @@ def predict_model(estimator,
             estimator = estimator_[0]
 
         else:
+            
+            try:
+
+                prep_pipe_transformer = prep_pipe
+                model = estimator
+                estimator = estimator
+                
+            except:
+                
+                sys.exit("(Type Error): Transformation Pipe Missing. ")
+            
+    else:
+        
+        try:
 
             prep_pipe_transformer = prep_pipe
             model = estimator
             estimator = estimator
-
-    else:
-
-        prep_pipe_transformer = prep_pipe
-        model = estimator
-        estimator = estimator
+            
+        except:
+            
+            sys.exit("(Type Error): Transformation Pipe Missing. ")
 
     #dataset
     if data is None:
@@ -5771,7 +5793,6 @@ def predict_model(estimator,
         X_test_.reset_index(drop=True, inplace=True)
 
         estimator_ = estimator
-        
 
     #try:
     #    model = finalize_model(estimator)