Update src/api/loan_model.py

src/api/loan_model.py

@@ -41,29 +41,52 @@ class LoanApprovalModel:
         if load_model:
             self.load_components()
         
-    # Add this to your load_components method
     def load_components(self):
+        """Load the trained model and preprocessing components."""
         try:
-            # Original loading code
-            self.model = joblib.load(self.model_path)
-            self.scaler = joblib.load(self.scaler_path)
-            
-            # Try to load the explainer with error handling
+            logger.info("Loading model components...")
+            
+            # Load model
+            model_path = os.path.join(self.model_dir, 'loan_model.joblib')
+            if not os.path.exists(model_path):
+                raise FileNotFoundError(f"Model file not found at {model_path}")
+            self.model = joblib.load(model_path)
+            
+            # Load scaler
+            scaler_path = os.path.join(self.model_dir, 'loan_scaler.joblib')
+            if not os.path.exists(scaler_path):
+                raise FileNotFoundError(f"Scaler file not found at {scaler_path}")
+            self.scaler = joblib.load(scaler_path)
+            
+            # Load label encoders
+            encoders_path = os.path.join(self.model_dir, 'loan_label_encoders.joblib')
+            if not os.path.exists(encoders_path):
+                raise FileNotFoundError(f"Label encoders file not found at {encoders_path}")
+            self.label_encoders = joblib.load(encoders_path)
+            
+            # Load feature names
+            features_path = os.path.join(self.model_dir, 'loan_feature_names.joblib')
+            if not os.path.exists(features_path):
+                raise FileNotFoundError(f"Feature names file not found at {features_path}")
+            self.feature_names = joblib.load(features_path)
+            
+            # Try to load explainer if available
+            explainer_path = os.path.join(self.model_dir, 'loan_explainer.joblib')
             try:
-                explainer_path = os.path.join(self.model_dir, 'loan_explainer.pkl')
                 if os.path.exists(explainer_path):
                     self.explainer = joblib.load(explainer_path)
-                else:
-                    self.explainer = None
-                    logger.warning("Explainer file not found. Explanations will be limited.")
             except Exception as explainer_error:
-                logger.error(f"Error loading explainer: {str(explainer_error)}")
+                logger.warning(f"Error loading explainer: {str(explainer_error)}")
                 self.explainer = None
-                logger.warning("Continuing without explainer. Explanations will be limited.")
+                logger.info("Continuing without explainer. Explanations will be limited.")
             
             logger.info("Model components loaded successfully")
+            
         except Exception as e:
             logger.error(f"Error loading model components: {str(e)}")
+            # Add fallback mechanism for model loading errors
+            if "'LoanApprovalModel' object has no attribute 'model_path'" in str(e):
+                logger.error("Incorrect attribute reference in load_components method")
             raise ValueError(f"Failed to load model components: {str(e)}")
             
     def save(self, output_dir: str = "models") -> None: