Merge pull request #3 from tarxemo/dev

intellilgence ranking for users

Author: tarxemo

github_management/models.py

@@ -8,6 +8,7 @@
 from django.urls import reverse
 from .managers import GitHubUserManager
 from users.abstract_models import BaseUser
+import math
 
 class Country(models.Model):
     """Model to store available countries from committers.top"""
@@ -34,6 +35,7 @@ class GitHubUser(BaseUser):
     """Model to store GitHub user information and their statistics."""
     country = models.ForeignKey('Country', on_delete=models.CASCADE, related_name='users')
     rank = models.PositiveIntegerField(default=0)
+    intelligence_score = models.FloatField(default=0)
 
     objects = GitHubUserManager()
 
@@ -62,6 +64,42 @@ def is_followed_by(self, user):
             to_user__github_username__iexact=self.github_username
         ).exists()
 
+    def compute_intelligence_score(self):
+        followers = self.followers or 0
+        following = self.following or 0
+        contributions = self.contributions_last_year or 0
+        public_repos = self.public_repos or 0
+        public_gists = self.public_gists or 0
+
+        followers_score = math.log10(followers + 1)
+        following_score = math.log10(following + 1) * 0.2
+        contributions_score = math.log10(contributions + 1) * 2.0
+        repos_score = math.log10(public_repos + 1) * 1.5
+        gists_score = math.log10(public_gists + 1) * 0.5
+
+        account_age_years = 0.0
+        if self.github_created_at:
+            delta = timezone.now() - self.github_created_at
+            account_age_years = max(delta.days / 365.0, 0.0)
+        account_age_score = min(account_age_years, 10.0) * 0.1
+
+        activity_balance_score = 0.0
+        if following > 0:
+            ratio = followers / float(following)
+            activity_balance_score = min(math.log10(ratio + 1), 2.0) * 0.5
+
+        score = (
+            followers_score
+            + following_score
+            + contributions_score
+            + repos_score
+            + gists_score
+            + account_age_score
+            + activity_balance_score
+        )
+
+        return round(score, 4)
+
 
 class GitHubFollowAction(models.Model):
     """Tracks follow actions to GitHub users and their status."""

github_management/tasks.py

@@ -95,6 +95,47 @@ def fetch_users_for_country(self, country_id):
         # Make sure to mark as not fetching even if there was an error
         Country.objects.filter(id=country_id).update(is_fetching=False)
 
+
+@shared_task(bind=True)
+def recompute_country_intelligence_ranking(self, country_id):
+    """Recompute intelligence_score and rank for all users in a country."""
+    try:
+        country = Country.objects.get(id=country_id)
+    except Country.DoesNotExist:
+        logger.warning(f"Country with id={country_id} does not exist")
+        return
+
+    users = list(GitHubUser.objects.filter(country=country))
+    if not users:
+        logger.info(f"No users found for country {country.name} to rank")
+        return
+
+    for user in users:
+        user.intelligence_score = user.compute_intelligence_score()
+
+    # Sort by intelligence score descending, then by contributions and followers as tie-breakers
+    users.sort(
+        key=lambda u: (
+            -(u.intelligence_score or 0),
+            -(u.contributions_last_year or 0),
+            -(u.followers or 0),
+        )
+    )
+
+    # Assign rank per country based on sorted order (1-based)
+    for idx, user in enumerate(users, start=1):
+        user.rank = idx
+
+    GitHubUser.objects.bulk_update(users, ["intelligence_score", "rank"])
+    logger.info(f"Recomputed intelligence ranking for {len(users)} users in {country.name}")
+
+
+@shared_task(bind=True)
+def recompute_all_countries_intelligence_ranking(self):
+    """Recompute intelligence-based rankings for all countries."""
+    for country in Country.objects.all().only("id"):
+        recompute_country_intelligence_ranking.delay(country.id)
+
 @shared_task
 def update_users_stats_batch(user_ids, model_name):
     """

github_management/urls.py

@@ -13,6 +13,7 @@
     path('countries/', views.CountryListView.as_view(), name='country_list'),
     path('countries/<slug:slug>/', views.CountryDetailView.as_view(), name='country_detail'),
     path('countries/<slug:slug>/update-stats/', views.UpdateCountryUsersStatsView.as_view(), name='country_update_stats'),
+    path('countries/<slug:slug>/recompute-ranking/', views.RecomputeCountryRankingView.as_view(), name='country_recompute_ranking'),
     path('countries/<slug:slug>/fetch/', views.FetchUsersView.as_view(), name='fetch_users'),
     path('api/countries/<slug:slug>/status/', views.FetchStatusView.as_view(), name='country_status'),
 
@@ -38,4 +39,7 @@
     path('fetch-all-countries/', 
          login_required(views.FetchAllCountriesView.as_view()), 
          name='fetch_all_countries'),
+    path('recompute-all-countries-ranking/',
+         login_required(views.RecomputeAllCountriesRankingView.as_view()),
+         name='recompute_all_countries_ranking'),
 ]

github_management/views.py

@@ -62,6 +62,27 @@ def get(self, request, *args, **kwargs):
             messages.error(request, "You do not have permission to perform this action.")
         return redirect('github_management:country_list')
 
+
+class RecomputeAllCountriesRankingView(View):
+    """View to trigger recomputing intelligence-based ranking for all countries (superuser only)."""
+    def get(self, request, *args, **kwargs):
+        if not request.user.is_superuser:
+            messages.error(request, "You do not have permission to perform this action.")
+            return redirect('github_management:country_list')
+
+        try:
+            from .tasks import recompute_all_countries_intelligence_ranking
+            task = recompute_all_countries_intelligence_ranking.delay()
+            messages.success(
+                request,
+                f"Started recomputing intelligence ranking for all countries. Task ID: {task.id}"
+            )
+        except Exception as e:
+            logger.error(f"Error enqueuing global ranking recomputation: {e}")
+            messages.error(request, f"Failed to start global ranking recomputation: {str(e)}")
+
+        return redirect('github_management:country_list')
+
 class UpdateCountryUsersStatsView(LoginRequiredMixin, UserPassesTestMixin, View):
     """Trigger batch update of all GitHub users' stats for a given country (superuser only)."""
     def test_func(self):
@@ -82,6 +103,35 @@ def post(self, request, slug):
             messages.info(request, f"No users found for {country.name} to update.")
             return redirect('github_management:country_detail', slug=slug)
 
+
+class RecomputeCountryRankingView(LoginRequiredMixin, UserPassesTestMixin, View):
+    """Trigger recomputation of intelligence-based ranking for a given country (superuser only)."""
+    def test_func(self):
+        return self.request.user.is_superuser
+
+    def post(self, request, slug):
+        country = get_object_or_404(Country, slug=slug)
+        try:
+            from .tasks import recompute_country_intelligence_ranking
+            task = recompute_country_intelligence_ranking.delay(country.id)
+            if request.headers.get('x-requested-with') == 'XMLHttpRequest':
+                return JsonResponse({
+                    'success': True,
+                    'message': f"Started recomputing intelligence ranking for users in {country.name}.",
+                    'task_id': str(task.id),
+                })
+            messages.success(request, f"Started recomputing intelligence ranking for users in {country.name}. Task ID: {task.id}")
+        except Exception as e:
+            logger.error(f"Error enqueuing ranking recomputation for {country.name}: {e}")
+            if request.headers.get('x-requested-with') == 'XMLHttpRequest':
+                return JsonResponse({
+                    'success': False,
+                    'message': f"Failed to start ranking recomputation: {str(e)}",
+                }, status=400)
+            messages.error(request, f"Failed to start ranking recomputation: {str(e)}")
+
+        return redirect('github_management:country_detail', slug=slug)
+
         try:
             from .tasks import update_users_stats_batch
             task = update_users_stats_batch.delay(user_ids, "GitHubUser")
@@ -110,7 +160,7 @@ def get(self, request, slug):
         country = get_object_or_404(Country, slug=slug)
 
         # Get users for this country
-        users = GitHubUser.objects.filter(country=country).order_by('-contributions_last_year')
+        users = GitHubUser.objects.filter(country=country).order_by('rank', '-intelligence_score', '-contributions_last_year')
 
         # Pagination
         paginator = Paginator(users, 25)  # Show 25 users per page

templates/github_management/country_detail.html

@@ -82,19 +82,30 @@ <h1 class="text-3xl font-bold text-gray-900 dark:text-white">{{ country.name }}<
             });
         });
         </script>
-            <div class="mt-4 flex md:mt-0 md:ml-4">
+            <div class="mt-4 flex md:mt-0 md:ml-4 space-x-3">
                 {% if request.user.is_superuser %}
                 <form method="post" action="{% url 'github_management:fetch_users' slug=country.slug %}" class="inline-flex">
                     {% csrf_token %}
                     <button type="submit" 
                             class="inline-flex items-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-indigo-600 hover:bg-indigo-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500 disabled:opacity-50 disabled:cursor-not-allowed"
                             {% if country.is_fetching %}disabled{% endif %}>
                         <svg class="-ml-1 mr-2 h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                            <path fill-rule="evenodd" d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 110 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z" clip-rule="evenodd" />
+                            <path fill-rule="evenodd" d="M4 2a1 1 0 011 1v2.101a7.002 7.002 0 011.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 110 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z" clip-rule="evenodd" />
                         </svg>
                         {% if country.is_fetching %}Fetching...{% else %}Refresh Users{% endif %}
                     </button>
                 </form>
+
+                <form method="post" action="{% url 'github_management:country_recompute_ranking' slug=country.slug %}" class="inline-flex">
+                    {% csrf_token %}
+                    <button type="submit"
+                            class="inline-flex items-center px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-indigo-700 bg-indigo-100 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+                        <svg class="-ml-1 mr-2 h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
+                            <path fill-rule="evenodd" d="M10 2a8 8 0 100 16 8 8 0 000-16zM9 5a1 1 0 012 0v4a1 1 0 01-.293.707l-2 2a1 1 0 11-1.414-1.414L9 8.586V5z" clip-rule="evenodd" />
+                        </svg>
+                        Recompute Intelligence Ranking
+                    </button>
+                </form>
                 {% endif %}
             </div>
         </div>

templates/github_management/country_list.html

@@ -45,6 +45,15 @@ <h1 class="text-3xl font-bold text-gray-900 dark:text-white">Countries</h1>
                         </svg>
                         Fetch All Countries
                     </a>
+
+                    <a href="{% url 'github_management:recompute_all_countries_ranking' %}"
+                       onclick="return confirm('This will recompute intelligence ranking for all countries. Continue?')"
+                       class="inline-flex items-center px-4 py-2 border border-transparent text-sm font-medium rounded-md shadow-sm text-indigo-700 bg-indigo-100 hover:bg-indigo-200 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500">
+                        <svg class="-ml-1 mr-2 h-4 w-4" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 8v4l3 3m6-3a9 9 0 11-18 0 9 9 0 0118 0z" />
+                        </svg>
+                        Recompute All Rankings
+                    </a>
                     {% endif %}
                 </div>
             </div>