File size: 51,525 Bytes
d5eabda
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
7cf76bc
 
d5eabda
7cf76bc
 
 
 
 
d5eabda
7cf76bc
 
 
 
 
 
 
d5eabda
7cf76bc
d5eabda
7cf76bc
 
 
 
 
 
d5eabda
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
7cf76bc
 
 
 
 
 
 
 
 
d5eabda
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
"""
Context Handler for Enhanced Recommendation Service

Manages context analysis, conversation history processing, and intent resolution.
Extracted from EnhancedRecommendationService to improve modularity and maintainability.
"""

import asyncio
import re
from typing import Dict, List, Any, Optional
from dataclasses import dataclass
import structlog

# Handle imports gracefully
try:
    from ...models.agent_models import MusicRecommenderState
    from ...agents.components.llm_utils import LLMUtils
    # SmartContextManager functionality moved to SessionManagerService
    from ..session_manager_service import SessionManagerService
    from ..intent_orchestration_service import IntentOrchestrationService
except ImportError:
    # Fallback imports for testing
    import sys
    sys.path.append('src')
    from models.agent_models import MusicRecommenderState
    from agents.components.llm_utils import LLMUtils
    # SmartContextManager functionality moved to SessionManagerService
    from services.session_manager_service import SessionManagerService
    from services.intent_orchestration_service import IntentOrchestrationService

logger = structlog.get_logger(__name__)


@dataclass
class ContextOverride:
    """Context override information for recommendation constraints."""
    is_followup: bool
    intent_override: Optional[str] = None
    target_entity: Optional[str] = None
    confidence: float = 0.0
    constraint_overrides: Optional[Dict[str, Any]] = None


class ContextAwareIntentAnalyzer:
    """
    Analyzes conversation context to detect follow-up queries and override intents.
    
    Supports:
    - Simple artist followups: "More Mk.gee tracks"
    - Style continuation: "More like this"
    - Artist-style refinement: "Mk.gee tracks that are more electronic"
    """
    
    def __init__(self, llm_client, rate_limiter=None):
        self.llm_client = llm_client
        self.rate_limiter = rate_limiter
        self.logger = structlog.get_logger(__name__)
        
        # LLM utils for context analysis
        self.llm_utils = LLMUtils(llm_client, rate_limiter)
    
    async def analyze_context(self, query: str, conversation_history: List[Dict]) -> Dict:
        """
        Analyze query context to detect follow-up intents.
        
        Returns:
        {
            'is_followup': bool,
            'intent_override': str,  # artist_similarity, artist_style_refinement, style_continuation
            'target_entity': str,    # artist name
            'style_modifier': str,   # style/genre constraint (if applicable)
            'confidence': float,     # 0.0-1.0
            'constraint_overrides': Dict
        }
        """
        # Default return structure
        default_result = {
            'is_followup': False,
            'intent_override': None,
            'target_entity': None,
            'style_modifier': None,
            'confidence': 0.0,
            'constraint_overrides': None,
            'entities': {}  # 🔧 FIX: Add empty entities for non-follow-up queries
        }
        
        if not conversation_history:
            return default_result
        
        try:
            # 🎯 PRIMARY: LLM analysis for complex patterns
            llm_result = await self._analyze_followup_with_llm(query, conversation_history)
            
            # 🔧 FIXED: Accept confidence >= 0.7 (was > 0.7) to prioritize LLM analysis
            if llm_result.get('is_followup') and llm_result.get('confidence', 0) >= 0.7:
                return self._create_context_override_from_llm(llm_result, conversation_history)
            
        except Exception as e:
            self.logger.warning(f"LLM context analysis failed: {e}")
        
        # 🔧 FALLBACK: Regex pattern matching
        fallback_result = self._analyze_with_regex_fallback(query, conversation_history)
        
        # 🔧 ADDITIONAL FIX: If LLM detected follow-up but confidence was < 0.7,
        # still use LLM if it provides better target entity than regex
        try:
            if llm_result.get('is_followup') and llm_result.get('target_entity'):
                # LLM provided specific artist, prefer over generic regex result
                if fallback_result.get('target_entity') == 'previous recommendations':
                    self.logger.info("🎯 Using LLM target entity over generic regex fallback")
                    return self._create_context_override_from_llm(llm_result, conversation_history)
        except:
            pass  # llm_result might not exist
        
        # Ensure fallback result has all required keys
        if fallback_result.get('is_followup', False):
            return fallback_result
        else:
            return default_result
    
    async def _analyze_followup_with_llm(self, query: str, conversation_history: List[Dict]) -> Dict:
        """Use LLM to detect followup patterns including artist-style refinement."""
        
        # Extract previous context for analysis
        previous_artists = self._extract_artists_from_history(conversation_history)
        original_intent = self._extract_original_intent_from_history(conversation_history)
        recent_query = conversation_history[-1].get('query', '') if conversation_history else ''
        was_artist_focused = original_intent == 'by_artist' or len(previous_artists) > 0
        
        prompt = f"""
        Analyze this query to determine if it's a follow-up request and what type:

        Previous query: "{recent_query}"
        Previous artists mentioned: {previous_artists}
        Current query: "{query}"
        Original intent: {original_intent}
        Was artist-focused: {was_artist_focused}

        CRITICAL RULES:
        1. If query mentions "like [Artist Name]" or "similar to [Artist]", this is NEVER a follow-up - it's a new primary query for that specific artist's style.
        2. Follow-ups modify existing context (e.g., "more upbeat", "different genre", "more tracks") without introducing NEW primary entities.
        3. When you detect a similarity query like "Songs like Mk.gee", set target_entity to the mentioned artist ("Mk.gee"), NOT None.
        4. Only set is_followup=true if the query modifies the CURRENT/RECENT context without naming a different primary artist.

        EXAMPLES:
        ✅ FOLLOW-UP: "Make them more upbeat" (after any query) → is_followup: true, intent should remain same
        ✅ FOLLOW-UP: "More tracks like this" (after any query) → is_followup: true, target_entity: null
        ✅ FOLLOW-UP: "Different genre please" (after any query) → is_followup: true, target_entity: null
        ❌ NOT FOLLOW-UP: "Songs like Mk.gee" (after discussing The Beatles) → is_followup: false, target_entity: "Mk.gee", intent should be artist_similarity
        ❌ NOT FOLLOW-UP: "Music by Radiohead" (after any query) → is_followup: false, target_entity: "Radiohead", intent should be by_artist
        ❌ NOT FOLLOW-UP: "Jazz music" (after any query) → is_followup: false, target_entity: null, intent should be genre_mood

        Return JSON with:
        {{
            "is_followup": boolean,
            "followup_type": "style_continuation" | "artist_deep_dive" | "genre_shift" | "mood_shift" | "preference_refinement" | "none",
            "target_entity": string or null (IMPORTANT: For "Songs like X" queries, set this to X, not null),
            "style_modifier": string or null,
            "confidence": float,
            "reasoning": string
        }}
        """

        response = await self.llm_utils.call_llm_with_json_response(
            user_prompt=prompt, 
            system_prompt="You are an expert at analyzing conversational context for music recommendations. Be conservative - only detect follow-ups when there are clear references to previous context."
        )
        
        self.logger.debug(f"🎯 LLM context analysis: {response}")
        return response

    def _create_context_override_from_llm(self, llm_result: Dict, history: List) -> Dict:
        """Create context override based on LLM analysis."""
        
        # Extract values with defaults to prevent KeyError
        target_entity = llm_result.get('target_entity', None)
        style_modifier = llm_result.get('style_modifier', None)
        followup_type = llm_result.get('followup_type', 'artist_deep_dive')
        confidence = llm_result.get('confidence', 0.8)
        
        # 🎯 CONTEXT-AWARE: Check original intent for style_continuation
        original_intent = self._extract_original_intent_from_history(history)
        
        # Map followup types to intent overrides with context awareness
        if followup_type == 'artist_deep_dive' and original_intent == 'discovering_serendipity':
            # 🔧 FIX: Preserve discovering_serendipity intent for follow-ups
            intent_override = 'discovering_serendipity'
            target_entity = 'serendipitous discovery'
            followup_type = 'more_content'
        elif followup_type == 'style_continuation' and original_intent == 'discovering_serendipity':
            # 🔧 FIX: Preserve discovering_serendipity intent for style continuation follow-ups
            intent_override = 'discovering_serendipity'
            target_entity = 'serendipitous discovery'
            followup_type = 'more_content'
        elif followup_type == 'style_continuation' and original_intent == 'artist_similarity':
            # Preserve artist similarity intent for style continuation follow-ups
            intent_override = 'artist_similarity'
            target_entity = 'similar artists'
            followup_type = 'artist_similarity_continuation'
        elif followup_type == 'artist_deep_dive' and original_intent == 'artist_similarity':
            # 🔧 FIX: Preserve artist similarity intent for "more tracks" after "music like X"
            intent_override = 'artist_similarity'
            target_entity = 'similar artists'
            followup_type = 'artist_similarity_continuation'
        elif followup_type == 'artist_deep_dive' and original_intent == 'by_artist_underground':
            # 🔧 FIX: Preserve by_artist_underground intent for follow-ups after underground discovery
            intent_override = 'by_artist_underground'
            target_entity = target_entity  # Keep the target artist
            followup_type = 'artist_deep_dive'
        elif followup_type == 'artist_deep_dive' and original_intent == 'by_artist':
            # 🔧 FIX: Preserve by_artist intent for "more songs" after "music by X"
            intent_override = 'by_artist'
            target_entity = target_entity  # Keep the target artist
            followup_type = 'artist_deep_dive'
        elif followup_type == 'artist_deep_dive' and original_intent == 'genre_mood':
            # 🔧 FIX: Preserve genre_mood intent for "more tracks" after genre/mood queries
            intent_override = 'genre_mood'
            target_entity = 'genre/mood exploration'
            followup_type = 'more_content'
        elif followup_type == 'style_continuation' and original_intent == 'genre_mood':
            # 🔧 FIX: Preserve genre_mood intent for style continuation follow-ups
            intent_override = 'genre_mood'
            target_entity = 'genre/mood exploration'
            followup_type = 'more_content'
        elif followup_type == 'artist_deep_dive' and original_intent == 'artist_genre':
            # 🔧 FIX: Preserve artist_genre intent for "more tracks" after artist+genre queries
            intent_override = 'artist_genre'
            target_entity = 'artist genre filtering'
            followup_type = 'more_content'
        elif followup_type == 'style_continuation' and original_intent == 'artist_genre':
            # 🔧 FIX: Preserve artist_genre intent for style continuation follow-ups
            intent_override = 'artist_genre'
            target_entity = 'artist genre filtering'
            followup_type = 'more_content'
        elif followup_type == 'artist_deep_dive' and original_intent == 'hybrid_similarity_genre':
            # 🔧 FIX: Preserve hybrid_similarity_genre intent for "more tracks" after hybrid queries
            intent_override = 'hybrid_similarity_genre'
            target_entity = 'similar artists with genre filtering'
            followup_type = 'more_content'
        elif followup_type == 'style_continuation' and original_intent == 'hybrid_similarity_genre':
            # 🔧 FIX: Preserve hybrid_similarity_genre intent for style continuation follow-ups
            intent_override = 'hybrid_similarity_genre'
            target_entity = 'similar artists with genre filtering'
            followup_type = 'more_content'
        else:
            # Standard mapping for other cases
            intent_mapping = {
                'artist_deep_dive': 'by_artist',
                'style_continuation': 'style_continuation', 
                'artist_style_refinement': 'artist_style_refinement'
            }
            intent_override = intent_mapping.get(followup_type, 'artist_similarity')
        
        # Create constraint overrides for style refinement
        constraint_overrides = None
        if style_modifier and followup_type == 'artist_style_refinement':
            constraint_overrides = {
                'style_filter': style_modifier,
                'preserve_artist': target_entity
            }
        
        # Create entities based on context type
        if target_entity and followup_type == 'artist_deep_dive':
            # For artist deep dive, focus only on the target entity
            entities = {
                'artists': [target_entity],
                'tracks': [],
                'genres': [],
                'moods': []
            }
        elif target_entity and followup_type in ['style_continuation', 'artist_similarity']:
            # 🔧 CRITICAL FIX: For similarity queries with explicit target entity (like "Songs like Mk.gee")
            # Use the target entity as the primary artist, don't fall back to history
            entities = {
                'artists': [target_entity],
                'tracks': [],
                'genres': [],
                'moods': []
            }
        elif followup_type == 'artist_similarity_continuation':
            # For artist similarity continuation, extract entities from history
            entities = self._extract_complete_entities_from_history(history)
        else:
            # For other follow-up types, extract complete entities from history
            entities = self._extract_complete_entities_from_history(history)
        
        result = {
            'is_followup': True,
            'intent_override': intent_override,
            'target_entity': target_entity,
            'style_modifier': style_modifier,
            'confidence': confidence,
            'constraint_overrides': constraint_overrides,
            'entities': entities  # Include for context
        }
        
        self.logger.info(f"🎯 LLM Context Override Created: {result}")
        return result
    
    def _analyze_with_regex_fallback(self, query: str, conversation_history: List[Dict]) -> Dict:
        """
        Fallback regex-based analysis for followup detection.
        
        Returns dict with same structure as LLM analysis.
        """
        query_lower = query.lower().strip()
        
        # Extract artists from recent history for context
        previous_artists = self._extract_artists_from_history(conversation_history)
        
        # 🎯 CONTEXT-AWARE: Determine if previous session was artist-focused
        original_intent = self._extract_original_intent_from_history(conversation_history)
        was_artist_focused = original_intent == 'by_artist' or len(previous_artists) > 0
        
        # 🔧 REFINED PATTERNS: More precise regex patterns
        patterns = {
            'simple_more': r'^more\s*$|^more\s+tracks?\s*$|^more\s+songs?\s*$|^more\s+music\s*$',
            'artist_more': r'^more\s+(.+?)\s+(?:tracks?|songs?|music)?\s*$',
            'like_this': r'^more\s+like\s+this|^similar\s+(?:to\s+)?this|^tracks?\s+like\s+this',
            'artist_style': r'^(.+?)\s+(?:tracks?|songs?)\s+(?:that\s+are\s+)?(?:more\s+)?(.+)$',
            'show_more': r'^show\s+more|^give\s+me\s+more|^i\s+want\s+more'
        }
        
        # Check each pattern
        for pattern_name, pattern in patterns.items():
            match = re.search(pattern, query_lower)
            if match:
                self.logger.debug(f"🔧 REGEX: Matched pattern '{pattern_name}' for query: {query}")
                
                if pattern_name == 'simple_more':
                    # 🎯 CONTEXT-AWARE: "more" - preserve original intent context
                    original_intent = self._extract_original_intent_from_history(conversation_history)
                    
                    if original_intent == 'discovering_serendipity':
                        # Preserve discovering_serendipity intent for "more tracks" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'discovering_serendipity',
                            'target_entity': 'serendipitous discovery',
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif original_intent == 'artist_similarity':
                        # Preserve artist similarity intent for "more tracks" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'artist_similarity',
                            'target_entity': 'similar artists',
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'artist_similarity_continuation'
                        }
                    elif original_intent == 'genre_mood':
                        # Preserve genre_mood intent for "more tracks" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'genre_mood',
                            'target_entity': 'genre/mood exploration',
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif original_intent == 'contextual' or original_intent == 'activity_context':
                        # Preserve contextual intent for "more tracks" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'contextual',
                            'target_entity': 'contextual activity',
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif original_intent == 'artist_genre':
                        # Preserve artist_genre intent for "more tracks" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'artist_genre',
                            'target_entity': 'artist genre filtering',
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif original_intent == 'hybrid_similarity_genre':
                        # Preserve hybrid_similarity_genre intent for "more tracks" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'hybrid_similarity_genre',
                            'target_entity': 'similar artists with genre filtering',
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif was_artist_focused:
                        # If previous was artist-focused, preserve the original intent
                        target_entity = previous_artists[0] if previous_artists else 'previous artist'
                        intent_to_preserve = original_intent if original_intent in ['by_artist', 'by_artist_underground'] else 'by_artist'
                        return {
                            'is_followup': True,
                            'intent_override': intent_to_preserve,
                            'target_entity': target_entity,
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'artist_deep_dive'
                        }
                    else:
                        # Default to style continuation for non-artist sessions
                        return {
                            'is_followup': True,
                            'intent_override': 'style_continuation',
                            'target_entity': 'previous recommendations',
                            'style_modifier': None,
                            'confidence': 0.9,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'style_continuation'
                        }
                
                elif pattern_name == 'artist_more':
                    # "more X tracks" - check if X matches previous artists
                    candidate_artist = match.group(1).strip()
                    if any(candidate_artist.lower() in prev_artist.lower() or 
                           prev_artist.lower() in candidate_artist.lower() 
                           for prev_artist in previous_artists):
                        return {
                            'is_followup': True,
                            'intent_override': 'artist_similarity',
                            'target_entity': candidate_artist,
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history)
                        }
                
                elif pattern_name == 'like_this':
                    # "more like this", "similar to this"
                    return {
                        'is_followup': True,
                        'intent_override': 'style_continuation',
                        'target_entity': 'previous recommendations',
                        'style_modifier': None,
                        'confidence': 0.9,
                        'constraint_overrides': None,
                        'entities': self._extract_complete_entities_from_history(conversation_history)
                    }
                
                elif pattern_name == 'artist_style':
                    # "X tracks that are more Y" - artist style refinement
                    artist_part = match.group(1).strip()
                    style_part = match.group(2).strip()
                    
                    if any(artist_part.lower() in prev_artist.lower() or 
                           prev_artist.lower() in artist_part.lower() 
                           for prev_artist in previous_artists):
                        return {
                            'is_followup': True,
                            'intent_override': 'artist_style_refinement',
                            'target_entity': artist_part,
                            'style_modifier': style_part,
                            'confidence': 0.8,
                            'constraint_overrides': {
                                'style_filter': style_part,
                                'preserve_artist': artist_part
                            },
                            'entities': self._extract_complete_entities_from_history(conversation_history)
                        }
                
                elif pattern_name == 'show_more':
                    # 🎯 CONTEXT-AWARE: "show more", "give me more"
                    original_intent = self._extract_original_intent_from_history(conversation_history)
                    
                    if original_intent == 'discovering_serendipity':
                        # Preserve discovering_serendipity intent for "show more" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'discovering_serendipity',
                            'target_entity': 'serendipitous discovery',
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif original_intent == 'artist_similarity':
                        # Preserve artist similarity intent for "show more" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'artist_similarity',
                            'target_entity': 'similar artists',
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'artist_similarity_continuation'
                        }
                    elif original_intent == 'genre_mood':
                        # Preserve genre_mood intent for "show more" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'genre_mood',
                            'target_entity': 'genre/mood exploration',
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif original_intent == 'contextual' or original_intent == 'activity_context':
                        # Preserve contextual intent for "show more" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'contextual',
                            'target_entity': 'contextual activity',
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif original_intent == 'artist_genre':
                        # Preserve artist_genre intent for "show more" follow-ups
                        return {
                            'is_followup': True,
                            'intent_override': 'artist_genre',
                            'target_entity': 'artist genre filtering',
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'more_content'
                        }
                    elif was_artist_focused:
                        # If previous was artist-focused (by_artist intent), continue as artist deep dive
                        target_entity = previous_artists[0] if previous_artists else 'previous artist'
                        return {
                            'is_followup': True,
                            'intent_override': 'by_artist',
                            'target_entity': target_entity,
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'artist_deep_dive'
                        }
                    else:
                        # Default to style continuation for non-artist sessions
                        return {
                            'is_followup': True,
                            'intent_override': 'style_continuation',
                            'target_entity': 'previous recommendations',
                            'style_modifier': None,
                            'confidence': 0.85,
                            'constraint_overrides': None,
                            'entities': self._extract_complete_entities_from_history(conversation_history),
                            'followup_type': 'style_continuation'
                        }
        
        # No patterns matched
        return {
            'is_followup': False,
            'intent_override': None,
            'target_entity': None,
            'style_modifier': None,
            'confidence': 0.0,
            'constraint_overrides': None
        }
    
    def _extract_complete_entities_from_history(self, conversation_history: List[Dict]) -> Dict[str, Any]:
        """Extract entities from current session context only (not entire conversation history)."""
        
        entities = {
            'artists': [],
            'tracks': [],
            'genres': [],
            'moods': []
        }
        
        # 🔧 FIX: Only extract from the MOST RECENT non-follow-up query in the session
        # This prevents contamination from previous sessions
        most_recent_primary_query = None
        
        # Find the most recent non-follow-up query (working backwards)
        for conversation in reversed(conversation_history):
            query = conversation.get('query', '').lower()
            
            # Skip follow-up queries
            if any(followup_word in query for followup_word in ['more tracks', 'more songs', 'more music', 'show more', 'give me more']):
                continue
                
            # This is a primary query - use its recommendations
            most_recent_primary_query = conversation
            break
        
        # Extract entities only from the most recent primary query
        if most_recent_primary_query:
            recommendations = most_recent_primary_query.get('recommendations', [])
            
            for rec in recommendations:
                if isinstance(rec, dict):
                    artist_name = rec.get('artist', rec.get('artist_name', ''))
                    if artist_name and artist_name not in entities['artists']:
                        entities['artists'].append(artist_name)
                    
                    track_name = rec.get('track', rec.get('track_name', ''))
                    if track_name and track_name not in entities['tracks']:
                        entities['tracks'].append(track_name)
        
        return entities
    
    def _extract_artists_from_history(self, conversation_history: List[Dict]) -> List[str]:
        """Extract artist names from conversation history."""
        artists = []
        
        for conversation in conversation_history:
            recommendations = conversation.get('recommendations', [])
            for rec in recommendations:
                if isinstance(rec, dict):
                    artist_name = rec.get('artist', rec.get('artist_name', ''))
                    if artist_name and artist_name not in artists:
                        artists.append(artist_name)
        
        return artists
    
    def _extract_original_intent_from_history(self, conversation_history: List[Dict]) -> str:
        """Extract the original intent from conversation history."""
        if not conversation_history:
            return 'discovery'
        
        # 🔧 FIX: Look for the MOST RECENT non-follow-up query, not the first
        # This ensures context resets work correctly when a new primary query is made
        for conversation in reversed(conversation_history):
            intent = conversation.get('intent')
            query = conversation.get('query', '').lower()
            
            # Skip follow-up queries (like "more tracks", "more songs", etc.)
            if any(followup_word in query for followup_word in ['more tracks', 'more songs', 'more music', 'show more', 'give me more']):
                continue
                
            if intent:
                return intent
            
            # If no explicit intent found, infer from query pattern
            if any(serendipity_word in query for serendipity_word in ['completely new', 'completely different', 'surprise', 'random', 'unexpected', 'anything', 'shock', 'blow my mind', 'serendipity']):
                return 'discovering_serendipity'
            elif any(similarity_word in query for similarity_word in ['like ', 'similar to', 'similar ', 'music like', 'sounds like']):
                # Check if it's hybrid similarity + genre (e.g., "music like X but Y")
                if any(genre_connector in query for genre_connector in [' but ', ' that are ', ' that is ', ' which are ', ' which is ']):
                    return 'hybrid_similarity_genre'
                else:
                    return 'artist_similarity'
            elif any(underground_word in query for underground_word in ['underground', 'hidden', 'lesser known', 'deep cuts', 'rare']):
                # Check if it's artist-specific underground or general underground
                if any(artist_word in query for artist_word in ['by ', 'from ', 'artist', 'band']):
                    return 'by_artist_underground'
                else:
                    return 'underground'
            elif any(artist_word in query for artist_word in ['by ', 'from ', 'artist', 'band']):
                # Check if it's artist + genre filtering (e.g., "songs by X that are Y")
                if any(genre_filter_word in query for genre_filter_word in ['that are', 'that is', 'which are', 'which is']):
                    return 'artist_genre'
                else:
                    return 'by_artist'
            elif any(contextual_word in query for contextual_word in ['for ', 'while ', 'during ', 'coding', 'study', 'workout', 'work', 'relax', 'sleep', 'drive', 'party']):
                return 'contextual'
            elif any(genre_word in query for genre_word in ['genre', 'style', 'mood', 'vibe']):
                return 'genre_mood'
        
        # Fallback to discovery if no clear intent found
        return 'discovery'


class ContextHandler:
    """
    Handles all context-related operations for the Enhanced Recommendation Service.
    
    Responsibilities:
    - Processing conversation history from different formats
    - Context analysis and follow-up detection
    - Recently shown tracks extraction
    - Session context management
    """
    
    def __init__(
        self,
        session_manager: SessionManagerService,
        intent_orchestrator: IntentOrchestrationService
    ):
        self.session_manager = session_manager
        self.intent_orchestrator = intent_orchestrator
        self.logger = structlog.get_logger(__name__)
        
        # Context analyzer will be initialized when LLM client is available
        self.context_analyzer: Optional[ContextAwareIntentAnalyzer] = None
    
    def initialize_context_analyzer(self, llm_client, rate_limiter):
        """Initialize the context analyzer with LLM client."""
        self.context_analyzer = ContextAwareIntentAnalyzer(llm_client, rate_limiter)
        self.logger.info("Context analyzer initialized")
    
    async def process_conversation_history(self, request) -> List[Dict]:
        """
        Process conversation history from various request formats.
        
        Args:
            request: Request object with potential context/chat_context
            
        Returns:
            List of conversation history dictionaries
        """
        conversation_history = []
        
        # Method 1: Check request.context
        if hasattr(request, 'context') and request.context:
            chat_context = request.context
            if 'previous_queries' in chat_context:
                conversation_history = self._convert_chat_context_to_history(chat_context)
                self.logger.info(f"Loaded {len(conversation_history)} conversations from request.context")
        
        # Method 2: Check request.chat_context
        elif hasattr(request, 'chat_context') and request.chat_context:
            chat_context = request.chat_context
            if 'previous_queries' in chat_context:
                conversation_history = self._convert_chat_context_to_history(chat_context)
                self.logger.info(f"Loaded {len(conversation_history)} conversations from request.chat_context")
        
        # Method 3: Check nested context in request dict
        elif hasattr(request, '__dict__') and 'chat_context' in request.__dict__:
            chat_context = request.__dict__['chat_context']
            if isinstance(chat_context, dict) and 'previous_queries' in chat_context:
                conversation_history = self._convert_chat_context_to_history(chat_context)
                self.logger.info(f"Loaded {len(conversation_history)} conversations from request dict")
        
        # 🔧 Method 4: Retrieve from session store using session_id
        # This is crucial for follow-up detection when history isn't passed in request
        elif hasattr(request, 'session_id') and request.session_id:
            try:
                session_context = await self.session_manager.get_session_context(request.session_id)
                if session_context and 'interaction_history' in session_context:
                    interaction_history = session_context['interaction_history']
                    conversation_history = self._convert_session_history_to_conversation(interaction_history)
                    self.logger.info(f"Loaded {len(conversation_history)} conversations from session {request.session_id}")
                else:
                    self.logger.debug(f"No session context found for session_id: {request.session_id}")
            except Exception as e:
                self.logger.warning(f"Failed to retrieve session history: {e}")
        
        # Log detailed conversation data for debugging
        if conversation_history:
            self.logger.debug(
                "Conversation history processed",
                history_data=conversation_history,
                first_query=conversation_history[0].get('query') if conversation_history else None
            )
        else:
            self.logger.debug("No conversation history found in request")
        
        return conversation_history
    
    def _convert_chat_context_to_history(self, chat_context: Dict) -> List[Dict]:
        """Convert chat interface format to conversation history format."""
        previous_queries = chat_context.get('previous_queries', [])
        previous_recommendations = chat_context.get('previous_recommendations', [])
        
        conversation_history = []
        for i, query in enumerate(previous_queries):
            conversation_history.append({
                'query': query,
                'recommendations': previous_recommendations[i] if i < len(previous_recommendations) else []
            })
        
        return conversation_history
    
    async def analyze_context(
        self, 
        query: str, 
        conversation_history: List[Dict],
        session_id: Optional[str] = None
    ) -> Dict:
        """
        Analyze context for follow-up detection and intent resolution.
        
        Args:
            query: Current user query
            conversation_history: Processed conversation history
            session_id: Session identifier
            
        Returns:
            Context override dictionary
        """
        if not self.context_analyzer:
            self.logger.warning("Context analyzer not initialized, returning default context")
            return {
                'is_followup': False,
                'intent_override': None,
                'target_entity': None,
                'confidence': 0.0,
                'constraint_overrides': None,
                'entities': {}  # 🔧 FIX: Add empty entities for non-follow-up queries
            }
        
        # Analyze followup intent
        context_override = await self.context_analyzer.analyze_context(query, conversation_history)
        
        self.logger.info(
            "Context analysis complete",
            followup_detected=context_override['is_followup'],
            target_entity=context_override['target_entity'],
            confidence=context_override['confidence']
        )
        
        return context_override
    
    def extract_recently_shown_tracks(
        self,
        conversation_history: Optional[List[Dict[str, Any]]],
        context_override: Dict[str, Any],
        workflow_state: Optional[MusicRecommenderState] = None
    ) -> List[str]:
        """
        Extract recently shown track IDs to avoid duplicates in follow-up queries.
        
        Args:
            conversation_history: Conversation history data
            context_override: Context analysis results
            workflow_state: Current workflow state (optional)
            
        Returns:
            List of track IDs to avoid recommending again
        """
        track_ids = []
        
        if not self._is_followup_query(context_override):
            return track_ids
        
        self.logger.debug("Processing follow-up query for track extraction")
        
        try:
            # Primary extraction from conversation history
            if conversation_history:
                track_ids.extend(self._extract_from_conversation_history(conversation_history))
            
            # Secondary extraction from session context if available
            if workflow_state:
                track_ids.extend(self._extract_from_session_context(context_override, workflow_state))
            
            # Remove duplicates while preserving order
            unique_track_ids = []
            for track_id in track_ids:
                if track_id not in unique_track_ids:
                    unique_track_ids.append(track_id)
            
            self.logger.info(f"Extracted {len(unique_track_ids)} unique track IDs to avoid")
            return unique_track_ids
            
        except Exception as e:
            self.logger.error(f"Error extracting recently shown tracks: {e}")
            return []
    
    def _is_followup_query(self, context_override: Dict[str, Any]) -> bool:
        """Check if the current query is a follow-up based on context analysis."""
        return (
            context_override and 
            isinstance(context_override, dict) and 
            context_override.get('is_followup', False)
        )
    
    def _extract_from_conversation_history(self, conversation_history: List[Dict[str, Any]]) -> List[str]:
        """Extract track IDs from conversation history."""
        track_ids = []
        
        for conversation in conversation_history:
            recommendations = conversation.get('recommendations', [])
            
            if not recommendations:
                continue
            
            for rec in recommendations:
                if isinstance(rec, dict):
                    # Extract artist and track name with proper field names
                    artist = rec.get('artist', '').strip()
                    # FIXED: Use 'title' field which is the correct field name in the data structure
                    title = rec.get('title', rec.get('track', '')).strip()
                    
                    if artist and title:
                        # FIXED: Use the same format as the filtering logic expects: "artist||title"
                        track_id = f"{artist.lower()}||{title.lower()}"
                        track_ids.append(track_id)
                    else:
                        # Fallback to other ID fields if available
                        fallback_id = rec.get('id') or rec.get('track_id') or rec.get('lastfm_url')
                        if fallback_id:
                            track_ids.append(str(fallback_id))
        
        self.logger.debug(f"Extracted {len(track_ids)} track IDs from conversation history")
        return track_ids
    
    def _extract_from_session_context(
        self, 
        context_override: Dict[str, Any], 
        workflow_state: MusicRecommenderState
    ) -> List[str]:
        """Extract track IDs from session context stored in workflow state."""
        track_ids = []
        
        # Check if there are recently shown tracks already in state
        if hasattr(workflow_state, 'recently_shown_track_ids') and workflow_state.recently_shown_track_ids:
            track_ids.extend(workflow_state.recently_shown_track_ids)
        
        # Check conversation context in state
        if hasattr(workflow_state, 'conversation_context') and workflow_state.conversation_context:
            context = workflow_state.conversation_context
            
            # Extract from previous queries and recommendations
            if isinstance(context, dict):
                previous_recs = context.get('previous_recommendations', [])
                if previous_recs and isinstance(previous_recs, list):
                    for rec_list in previous_recs:
                        if isinstance(rec_list, list):
                            for rec in rec_list:
                                if isinstance(rec, dict):
                                    # Extract artist and track name with proper field names
                                    artist = rec.get('artist', '').strip()
                                    # FIXED: Use 'title' field and same format as conversation history extraction
                                    title = rec.get('title', rec.get('track', '')).strip()
                                    
                                    if artist and title:
                                        # FIXED: Use the same format as the filtering logic expects: "artist||title"
                                        track_id = f"{artist.lower()}||{title.lower()}"
                                        track_ids.append(track_id)
                                    else:
                                        # Fallback to other ID fields if available
                                        fallback_id = (
                                            rec.get('id') or 
                                            rec.get('track_id') or 
                                            rec.get('lastfm_url')
                                        )
                                        if fallback_id:
                                            track_ids.append(str(fallback_id))
        
        self.logger.debug(f"Extracted {len(track_ids)} track IDs from session context")
        return track_ids

    async def get_session_context(self, session_id: str) -> Dict:
        """Get session context from session manager."""
        return await self.session_manager.get_session_context(session_id)

    def _convert_session_history_to_conversation(self, interaction_history: List[Dict]) -> List[Dict]:
        """Convert session interaction history to conversation history format."""
        conversation_history = []
        
        for interaction in interaction_history:
            if isinstance(interaction, dict):
                query = interaction.get('query', '')
                recommendations = interaction.get('recommendations', [])
                
                # Convert UnifiedTrackMetadata to dict format if needed
                formatted_recommendations = []
                for rec in recommendations:
                    if isinstance(rec, dict):
                        # Already in dict format
                        formatted_recommendations.append(rec)
                    else:
                        # Convert from object to dict
                        formatted_rec = {
                            'title': getattr(rec, 'name', getattr(rec, 'title', '')),
                            'artist': getattr(rec, 'artist', ''),
                            'album': getattr(rec, 'album', ''),
                            'confidence': getattr(rec, 'recommendation_score', 0.0),
                            'explanation': getattr(rec, 'recommendation_reason', ''),
                            'source': getattr(rec, 'agent_source', 'discovery_agent')
                        }
                        formatted_recommendations.append(formatted_rec)
                
                if query:  # Only add if we have a query
                    conversation_history.append({
                        'query': query,
                        'recommendations': formatted_recommendations
                    })
        
        self.logger.debug(f"Converted {len(interaction_history)} interactions to {len(conversation_history)} conversation entries")
        return conversation_history