working

app.py

@@ -506,14 +506,16 @@ def create_html_output(job_result: Dict, resume_results: List[Dict], filenames:
     if multiple_resumes:
         html += "<h3>Match Summary</h3>"
         html += "<table style='width: 100%; border-collapse: collapse; margin-bottom: 20px;'>"
-        html += "<tr style='background-color: #eee;'><th style='padding: 8px; text-align: left; border: 1px solid #ddd;'>Resume</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Skills Matched</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Match Percentage</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Leadership</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Collaboration</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Years of Experience</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Category</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Actions</th></tr>"
+        html += "<tr style='background-color: #eee;'>"
+        html += "<th style='padding: 8px; text-align: left; border: 1px solid #ddd;'>JOB ID</th>"
+        html += "<th style='padding: 8px; text-align: left; border: 1px solid #ddd;'>CANDIDATE</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>% MATCHED SKILLS</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>SKILL</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>YEARS OF EXPERIENCE</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>MATCH CATEGORY</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>LEADERSHIP QUALITY</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>COLLABORATION QUALITY</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>ACTIONS</th></tr>"
         
         # Create a list of resume data for sorting
         resume_data = []
@@ -530,100 +532,135 @@ def create_html_output(job_result: Dict, resume_results: List[Dict], filenames:
             
             # Get total experience and determine category
             total_experience = total_experiences[i-1]
-            if total_experience < 3:
-                category = "Entry"
-            elif total_experience < 5:
-                category = "Intermediate"
+            
+            # Determine leadership quality (YES/NO)
+            leadership_quality = "YES" if leadership_count > avg_leadership * 1.2 else "NO"
+            
+            # Determine thoroughness quality (YES/NO)
+            collaboration_quality = "YES" if collaboration_count > avg_collaboration * 1.2 else "NO"
+          
+            # Determine match category (Strong, Close, Weak)
+            if match_percentage >= 80:
+                match_category = "Strong Match"
+                if leadership_quality == "YES" and collaboration_quality == "YES":
+                    match_category = "Strong Quality Match (Leadership and Collaboration)"
+                elif leadership_quality == "YES":
+                    match_category = "Strong Quality Match (Leadership)"
+                elif collaboration_quality == "YES":
+                    match_category = "Strong Quality Match (Collaboration)"
+            elif match_percentage >= 50:
+                match_category = "Close Match"
+                if leadership_quality == "YES" and collaboration_quality == "YES":
+                    match_category = "Close Quality Match (Leadership and Collaboration)"
+                elif leadership_quality == "YES":
+                    match_category = "Close Quality Match (Leadership)"
+                elif collaboration_quality == "YES":
+                    match_category = "Close Match (Collaboration)"
             else:
-                category = "Advanced"
+                match_category = "Weak Match"
+                if leadership_quality == "YES" and collaboration_quality == "YES":
+                    match_category = "Weak Quality Match (Leadership and Collaboration)"
+                elif leadership_quality == "YES":
+                    match_category = "Weak Quality Match (Leadership)"
+                elif collaboration_quality == "YES":
+                    match_category = "Weak Quality Match (Collaboration)"
             
-            # Add quality modifier if 50% above average
-            is_quality_leadership = leadership_count > avg_leadership * 1.5
-            is_quality_collaboration = collaboration_count > avg_collaboration * 1.5
+  
+            # Get primary skills (Java and React in this case, as per image)
+            primary_skills = {}
+            skill_exp = {}  # Create a new dict to aggregate experience
             
-            quality_score = 0
-            if is_quality_leadership:
-                category = f"Quality {category} (Leadership)"
-                quality_score = 2
-            elif is_quality_collaboration:
-                category = f"Quality {category} (Collaboration)"
-                quality_score = 1
+            # First, aggregate all experience for each skill
+            for skill_name, years in skill_experience_maps[i-1].items():
+                skill_name_lower = skill_name.lower()
+                if skill_name_lower in skill_exp:
+                    skill_exp[skill_name_lower] = max(skill_exp[skill_name_lower], years)  # Take the max experience
+                else:
+                    skill_exp[skill_name_lower] = years
+            
+            # Get unique resume skills
+            resume_skills = set(skill['text'].lower() for skill in resume_result['skills'])
+            
+            # Only include skills that are in both the resume and job requirements
+            matched_skills = []
+            for skill in job_skills:
+                if skill.lower() in resume_skills:
+                    matched_skills.append(skill)
+                    if skill.lower() in skill_exp:
+                        primary_skills[skill] = skill_exp[skill.lower()]
             
             # Add to resume data list for sorting
             resume_data.append({
+                'job_id': "JD-1",
                 'index': i,
-                'match_count': match_count,
                 'match_percentage': match_percentage,
-                'leadership_count': leadership_count,
-                'collaboration_count': collaboration_count,
-                'total_experience': total_experience,
-                'category': category,
-                'quality_score': quality_score,
-                'resume_result': resume_result,
-                'filename': filenames[i-1]  # Store the filename
+                'matched_skills': matched_skills,
+                'primary_skills': primary_skills,
+                'match_category': match_category,
+                'leadership_quality': leadership_quality,
+                'collaboration_quality': collaboration_quality,
+                'filename': filenames[i-1]
             })
         
-        # Sort resume data:
-        # 1. By matched skills (highest first)
-        # 2. By years of experience (highest first)
-        # 3. By quality category for resumes with experience within 1 year
-        def sort_key(resume):
-            return (-resume['match_count'], -resume['total_experience'], -resume['quality_score'])
+        # Sort resumes by match percentage (highest first)
+        sorted_resumes = sorted(resume_data, key=lambda x: -x['match_percentage'])
         
-        sorted_resumes = sorted(resume_data, key=sort_key)
-        
-        # Group resumes with experience within 1 year and sort by quality
-        final_sorted = []
-        i = 0
-        while i < len(sorted_resumes):
-            current = sorted_resumes[i]
-            similar_exp = [current]
-            indices_to_remove = []
-            j = i + 1
-            
-            # Find all resumes with similar experience to the current one
-            while j < len(sorted_resumes) and sorted_resumes[j]['match_count'] == current['match_count']:
-                if abs(sorted_resumes[j]['total_experience'] - current['total_experience']) <= 1:
-                    similar_exp.append(sorted_resumes[j])
-                    indices_to_remove.append(j)
-                j += 1
-            
-            # Sort by quality score if there are resumes with similar experience
-            if len(similar_exp) > 1:
-                similar_exp.sort(key=lambda x: -x['quality_score'])
+        # Add rows to summary table
+        for resume_data in sorted_resumes:
+            # Generate table row for each candidate
+            candidate_letter = chr(65 + resume_data['index'] - 1)  # Convert 1,2,3 to A,B,C
             
-            final_sorted.extend(similar_exp)
+            # Create a single row per candidate
+            html += "<tr>"
+            # Job ID
+            html += f"<td style='padding: 8px; border: 1px solid #ddd;'>{resume_data['job_id']}</td>"
+            # Candidate
+            html += f"<td style='padding: 8px; border: 1px solid #ddd;'>Candidate {candidate_letter}</td>"
+            # Match Percentage
+            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{resume_data['match_percentage']}%</td>"
             
-            # Create a new list without the removed indices
-            sorted_resumes = [r for idx, r in enumerate(sorted_resumes) if idx != i and idx not in indices_to_remove]
-            
-            # We don't need to increment i since we've created a new list without the processed items
-            # but if the list is empty, we need to break out of the loop
-            if not sorted_resumes:
-                break
-        
-        # Add sorted rows to summary table
-        for resume_data in final_sorted:
-            i = resume_data['index']
-            match_count = resume_data['match_count']
-            match_percentage = resume_data['match_percentage']
-            leadership_count = resume_data['leadership_count']
-            collaboration_count = resume_data['collaboration_count']
-            total_experience = resume_data['total_experience']
-            category = resume_data['category']
-            filename = resume_data['filename']  # Get the filename
+            # Skills and Experience
+            if resume_data['matched_skills']:
+                # Show the first matched skill and its experience
+                skill = resume_data['matched_skills'][0]
+                html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{skill}</td>"
+                html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{resume_data['primary_skills'].get(skill, 0)}</td>"
+            else:
+                # Show dashes for no matches
+                html += "<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>-</td>"
+                html += "<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>-</td>"
             
-            # Add row to summary table - using filename instead of "Resume {i}"
-            html += f"<tr><td style='padding: 8px; border: 1px solid #ddd;'>{filename}</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{match_count}/{job_result['total_skills']}</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{match_percentage}%</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{leadership_count}</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{collaboration_count}</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{total_experience}</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{category}</td>"
+            # Match Category
+            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{resume_data['match_category']}</td>"
+            # Leadership Quality
+            leadership_color = "#e6ffe6" if resume_data['leadership_quality'] == "YES" else "#f5f5f5"
+            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd; background-color: {leadership_color};'>{resume_data['leadership_quality']}</td>"
+            # Collaboration Quality
+            collaboration_color = "#e6ffe6" if resume_data['collaboration_quality'] == "YES" else "#f5f5f5"
+            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd; background-color: {collaboration_color};'>{resume_data['collaboration_quality']}</td>"
+            # Actions
             html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>"
-            html += f"<button onclick=\"const allDetails = document.querySelectorAll('.resume-detail'); allDetails.forEach(detail => {{ if(detail.id !== 'resume-detail-{i}') detail.style.display = 'none'; }}); document.getElementById('resume-detail-{i}').style.display = document.getElementById('resume-detail-{i}').style.display === 'none' ? 'block' : 'none';\" style='background-color: #4CAF50; color: white; padding: 6px 12px; border: none; border-radius: 4px; cursor: pointer; font-size: 14px;'>Toggle Details</button>"
-            html += "</td></tr>"
+            html += f"<button onclick=\"const allDetails = document.querySelectorAll('.resume-detail'); allDetails.forEach(detail => {{ if(detail.id !== 'resume-detail-{resume_data['index']}') detail.style.display = 'none'; }}); document.getElementById('resume-detail-{resume_data['index']}').style.display = document.getElementById('resume-detail-{resume_data['index']}').style.display === 'none' ? 'block' : 'none';\" style='background-color: #4CAF50; color: white; padding: 6px 12px; border: none; border-radius: 4px; cursor: pointer; font-size: 14px;'>Toggle Details</button>"
+            html += "</td>"
+            html += "</tr>"
+            
+            # If there are additional matched skills, add them in subsequent rows
+            if len(resume_data['matched_skills']) > 1:
+                for skill in resume_data['matched_skills'][1:]:
+                    html += "<tr>"
+                    # Empty cells for the first three columns
+                    html += "<td style='padding: 8px; border: 1px solid #ddd;'></td>"
+                    html += "<td style='padding: 8px; border: 1px solid #ddd;'></td>"
+                    html += "<td style='padding: 8px; border: 1px solid #ddd;'></td>"
+                    # Skill and Experience
+                    html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{skill}</td>"
+                    html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{resume_data['primary_skills'].get(skill, 0)}</td>"
+                    # Empty cells for the remaining columns
+                    html += "<td style='padding: 8px; border: 1px solid #ddd;'></td>"
+                    html += "<td style='padding: 8px; border: 1px solid #ddd;'></td>"
+                    html += "<td style='padding: 8px; border: 1px solid #ddd;'></td>"
+                    html += "<td style='padding: 8px; border: 1px solid #ddd;'></td>"
+                    html += "</tr>"
         
         html += "</table>"
     
@@ -695,8 +732,8 @@ def create_html_output(job_result: Dict, resume_results: List[Dict], filenames:
         html += f"<table style='width: 100%; border-collapse: collapse; margin-bottom: 20px;' id='skillsTable{i}'>"
         html += "<tr style='background-color: #eee;'><th style='padding: 8px; text-align: left; border: 1px solid #ddd;'>Skill</th>"
         html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Years of Experience</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Leadership</th>"
-        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Collaboration</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Leadership Quality Count</th>"
+        html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Collaboration Quality Count</th>"
         html += "<th style='padding: 8px; text-align: center; border: 1px solid #ddd;'>Match</th></tr>"
         
         # Get all unique skills for this specific resume
@@ -711,24 +748,45 @@ def create_html_output(job_result: Dict, resume_results: List[Dict], filenames:
         
         # Create a list of skill data for sorting
         skill_data = []
+        added_skills = set()  # Track which skills we've already added
+        
+        # Count quality statements per skill
+        skill_leadership_counts = {}
+        skill_collaboration_counts = {}
+        
+        if 'roles' in resume_result:
+            for role in resume_result['roles']:
+                if 'quality_scores' in role:
+                    role_skills = {skill['name'].lower() for skill in role.get('skills', [])}
+                    for score in role['quality_scores']:
+                        for skill in role_skills:
+                            if score['is_leadership']:
+                                skill_leadership_counts[skill] = skill_leadership_counts.get(skill, 0) + 1
+                            elif score['is_collaboration']:
+                                skill_collaboration_counts[skill] = skill_collaboration_counts.get(skill, 0) + 1
+        
         for skill in resume_skills:
-            # Get years of experience for this skill
-            years = skill_experience.get(skill, 0)
-            
-            # Check if skill has leadership or collaboration
-            has_leadership = skill in skill_leadership
-            has_collaboration = skill in skill_collaboration
-            
-            # Check if skill matches job requirements
-            is_match = skill in job_skills
-            
-            skill_data.append({
-                'skill': skill,
-                'years': years,
-                'has_leadership': has_leadership,
-                'has_collaboration': has_collaboration,
-                'is_match': is_match
-            })
+            # Only add if we haven't seen this skill before
+            if skill not in added_skills:
+                # Get years of experience for this skill
+                years = skill_experience.get(skill, 0)
+                
+                # Get quality counts for this skill
+                leadership_count = skill_leadership_counts.get(skill, 0)
+                collaboration_count = skill_collaboration_counts.get(skill, 0)
+                
+                # Check if skill matches job requirements
+                is_match = skill in job_skills
+                
+                skill_data.append({
+                    'skill': skill,
+                    'years': years,
+                    'leadership_count': leadership_count,
+                    'collaboration_count': collaboration_count,
+                    'is_match': is_match
+                })
+                
+                added_skills.add(skill)
         
         # Sort skills by years of experience (descending)
         skill_data.sort(key=lambda x: (-x['years'], x['skill']))
@@ -742,8 +800,8 @@ def create_html_output(job_result: Dict, resume_results: List[Dict], filenames:
             html += f"<tr class='skill-row{i}' data-match='{str(data['is_match']).lower()}' style='display: {display};'>"
             html += f"<td style='padding: 8px; border: 1px solid #ddd;'>{data['skill']}</td>"
             html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{data['years']:.1f}</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd; color: {'green' if data['has_leadership'] else 'red'};'>{'Yes' if data['has_leadership'] else 'No'}</td>"
-            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd; color: {'green' if data['has_collaboration'] else 'red'};'>{'Yes' if data['has_collaboration'] else 'No'}</td>"
+            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{data['leadership_count']}</td>"
+            html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd;'>{data['collaboration_count']}</td>"
             html += f"<td style='padding: 8px; text-align: center; border: 1px solid #ddd; color: {'green' if data['is_match'] else 'red'};'>{'Yes' if data['is_match'] else 'No'}</td></tr>"
         
         html += "</table>"
@@ -752,16 +810,24 @@ def create_html_output(job_result: Dict, resume_results: List[Dict], filenames:
         html += "<p><strong>Skills Found:</strong></p>"
         html += "<div style='background-color: #f0f0f0; padding: 10px; border-radius: 5px;'>"
         
+        # Keep track of skills we've already added
+        added_skills = set()
+        
         for skill in resume_result['skills']:
-            # Highlight matched skills
-            is_match = skill['text'].lower() in job_skills
-            bg_color = "#c8e6c9" if is_match else "#e0e0e0"  # Green tint for matches
-            
-            # Add years of experience for this skill if available
-            skill_years = skill_experience.get(skill['text'].lower(), 0)
-            experience_text = f" ({skill_years} years)" if skill_years > 0 else ""
-            
-            html += f"<span style='background-color: {bg_color}; padding: 2px 5px; margin: 2px; border-radius: 3px; display: inline-block;'>{skill['text']}{experience_text}</span>"
+            skill_text = skill['text'].lower()
+            # Only add if we haven't seen this skill before
+            if skill_text not in added_skills:
+                # Highlight matched skills
+                is_match = skill_text in job_skills
+                bg_color = "#c8e6c9" if is_match else "#e0e0e0"  # Green tint for matches
+                
+                # Add years of experience for this skill if available
+                skill_years = skill_experience.get(skill_text, 0)
+                experience_text = f" ({skill_years} years)" if skill_years > 0 else ""
+                
+                html += f"<span style='background-color: {bg_color}; padding: 2px 5px; margin: 2px; border-radius: 3px; display: inline-block;'>{skill['text']}{experience_text}</span>"
+                added_skills.add(skill_text)
+        
         html += "</div>"
         
         # Job roles section