PyPI - territories-dashboard-lib - Versions diffs - 0.1.13__tar.gz → 0.1.14__tar.gz - Mend

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: territories-dashboard-lib
-Version: 0.1.13
+Version: 0.1.14
 Summary: Librairie pour la visualisation d'indicateurs territoriaux.
 Author-email: Bastien <bastien@prune.sh>
 Classifier: Programming Language :: Python :: 3

@@ -1,6 +1,6 @@
 [project]
 name = "territories-dashboard-lib"
-version = "0.1.13"
+version = "0.1.14"
 description = "Librairie pour la visualisation d'indicateurs territoriaux."
 authors = [
     { name = "Bastien", email = "bastien@prune.sh" }

@@ -4,7 +4,7 @@ from functools import lru_cache
 import geoip2.database
-def _get_client_ip(request):
+def get_client_ip(request):
     x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
     if x_forwarded_for:
         ip = x_forwarded_for.split(",")[0]
@@ -14,7 +14,7 @@ def _get_client_ip(request):
 @lru_cache(maxsize=100_000)
-def _get_country_from_geolite(ip_address):
+def get_country_from_geolite(ip_address):
     database_name = "GeoLite2-Country.mmdb"
     database_path = os.path.join(os.path.dirname(__file__), database_name)
     reader = geoip2.database.Reader(database_path)
@@ -25,11 +25,3 @@ def _get_country_from_geolite(ip_address):
         country = "UNKNOWN"
     reader.close()
     return country
-def get_country_of_ip(request):
-    """
-    Guess the country of an ip thanks to the geoip2 library and the Geolite mmdb database file.
-    """
-    ip_address = _get_client_ip(request)
-    return _get_country_from_geolite(ip_address)

@@ -7,7 +7,8 @@ from django.urls import resolve
 from territories_dashboard_lib.tracking_lib.enums import TRACKING_COOKIE_NAME, EventType
 from territories_dashboard_lib.tracking_lib.geolocalisation.logic import (
-    get_country_of_ip,
+    get_client_ip,
+    get_country_from_geolite,
 )
 from territories_dashboard_lib.tracking_lib.models import CookieInfo, Event, Page
@@ -27,8 +28,11 @@ def get_or_set_tracking_cookie(request: HttpRequest, response: HttpResponse) ->
     try:
         CookieInfo.objects.get(id=tracking_cookie)
     except CookieInfo.DoesNotExist:
-        country = get_country_of_ip(request)
-        CookieInfo.objects.create(id=tracking_cookie, country=country)
+        ip_address = get_client_ip(request)
+        country = get_country_from_geolite(ip_address)
+        CookieInfo.objects.create(
+            id=tracking_cookie, country=country, ip_address=ip_address
+        )
     return tracking_cookie

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.3 on 2025-06-30 16:55
+from django.db import migrations, models
+class Migration(migrations.Migration):
+    dependencies = [
+        ('tracking_lib', '0003_cookieinfo'),
+    ]
+    operations = [
+        migrations.AddField(
+            model_name='cookieinfo',
+            name='ip_address',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

territories-dashboard-lib 0.1.13tar.gz → 0.1.14tar.gz

@@ -83,3 +83,4 @@ class Event(models.Model):
 class CookieInfo(models.Model):
     id = models.TextField(primary_key=True)
     country = models.TextField(null=True, blank=True)
+    ip_address = models.TextField(null=True, blank=True)

@@ -64,6 +64,7 @@ territories_dashboard_lib/tracking_lib/geolocalisation/logic.py
 territories_dashboard_lib/tracking_lib/migrations/0001_initial.py
 territories_dashboard_lib/tracking_lib/migrations/0002_alter_event_created_at_alter_page_created_at.py
 territories_dashboard_lib/tracking_lib/migrations/0003_cookieinfo.py
+territories_dashboard_lib/tracking_lib/migrations/0004_cookieinfo_ip_address.py
 territories_dashboard_lib/tracking_lib/migrations/__init__.py
 territories_dashboard_lib/website_lib/__init__.py
 territories_dashboard_lib/website_lib/admin.py