cleanup, CNN fixes

core/orchestrator.py

@@ -1364,7 +1364,23 @@ class TradingOrchestrator:
             )
             
             if feature_matrix is not None:
-                action_probs, confidence = model.predict(feature_matrix)
+                prediction_result = model.predict(feature_matrix)
+                
+                # Handle different return formats from model.predict()
+                if prediction_result is None:
+                    return None
+                
+                # Check if it's a tuple (action_probs, confidence)
+                if isinstance(prediction_result, tuple) and len(prediction_result) == 2:
+                    action_probs, confidence = prediction_result
+                elif isinstance(prediction_result, dict):
+                    # Handle dictionary return format
+                    action_probs = prediction_result.get('probabilities', None)
+                    confidence = prediction_result.get('confidence', 0.7)
+                else:
+                    # Assume it's just action probabilities
+                    action_probs = prediction_result
+                    confidence = 0.7  # Default confidence
                 
                 if action_probs is not None:
                     action_names = ['SELL', 'HOLD', 'BUY']