territories-dashboard-lib 0.1.13__py3-none-any.whl → 0.1.14__py3-none-any.whl

territories_dashboard_lib/tracking_lib/geolocalisation/logic.py

@@ -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)

territories_dashboard_lib/tracking_lib/logic.py

@@ -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
 
 

territories_dashboard_lib/tracking_lib/migrations/0004_cookieinfo_ip_address.py

@@ -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/tracking_lib/models.py

@@ -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)

{territories_dashboard_lib-0.1.13.dist-info → territories_dashboard_lib-0.1.14.dist-info}/METADATA

@@ -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

{territories_dashboard_lib-0.1.13.dist-info → territories_dashboard_lib-0.1.14.dist-info}/RECORD

@@ -44,17 +44,18 @@ territories_dashboard_lib/superset_lib/migrations/0001_initial.py,sha256=Y6iY33E
 territories_dashboard_lib/superset_lib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 territories_dashboard_lib/tracking_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 territories_dashboard_lib/tracking_lib/enums.py,sha256=-w2ndwXfY8PqElJvO7i_MVMAP_95QYoQ8NZGjoGgHAM,443
-territories_dashboard_lib/tracking_lib/logic.py,sha256=GXqQoE1e3P-QtMEwQIgL16F3fhDZ-5I0nwDFhW2fOjg,2831
-territories_dashboard_lib/tracking_lib/models.py,sha256=pFW45xqhraQ49B9EX-ADHXKkk5HEZygYRwDnEmX1CCg,3282
+territories_dashboard_lib/tracking_lib/logic.py,sha256=mJtIPz65Q_V0-YtNhQlPu-EV-lGQNdB5TMN_2hI-bgQ,2956
+territories_dashboard_lib/tracking_lib/models.py,sha256=vD10Cj5G-WdA7wTmHDSQulMRBsqLciZtv7kh_TUPp1s,3339
 territories_dashboard_lib/tracking_lib/payloads.py,sha256=iX0uUxAKEOmYe8nKJATu52zqFTdCzzxxgE5FuTOBpj8,201
 territories_dashboard_lib/tracking_lib/urls.py,sha256=-Wd2EYQRLimUQHswTu8x_23movgzYH2ZPG5dbOAaCNI,202
 territories_dashboard_lib/tracking_lib/views.py,sha256=8K1q9LfpU1ygO3CFQSPN5_gLIMWkVe9kN0kuIdiKEjQ,1298
 territories_dashboard_lib/tracking_lib/geolocalisation/GeoLite2-Country.mmdb,sha256=_1qrIUv_a4F9XGXxL1J867_dw5ELPtH-IxsWipyiEWQ,9718941
 territories_dashboard_lib/tracking_lib/geolocalisation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-territories_dashboard_lib/tracking_lib/geolocalisation/logic.py,sha256=BbwGMXtnJAPzAJ9RrsfTuMqc3jHR072uD70b1si0e0M,987
+territories_dashboard_lib/tracking_lib/geolocalisation/logic.py,sha256=HTyKh1m7oDUdPY2RmD23Txti31AQWQoGPL3-nLak-50,749
 territories_dashboard_lib/tracking_lib/migrations/0001_initial.py,sha256=eH6eegaxN6LuSerZ80_N8iXixF6-YKw79nqmIPimXPY,3494
 territories_dashboard_lib/tracking_lib/migrations/0002_alter_event_created_at_alter_page_created_at.py,sha256=rC0_09acozzUXkujPG0fs3wcenjAmqy4rS5SK17Anjo,615
 territories_dashboard_lib/tracking_lib/migrations/0003_cookieinfo.py,sha256=To1I_see_Aw66P6I67a0PQQntZ2Iw7a3G0P9O236L0A,521
+territories_dashboard_lib/tracking_lib/migrations/0004_cookieinfo_ip_address.py,sha256=IPCO8I0xFPWYRb8n1iHNrPNzX7hFUM5SV7qSuEZtXnY,397
 territories_dashboard_lib/tracking_lib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 territories_dashboard_lib/website_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 territories_dashboard_lib/website_lib/admin.py,sha256=jq0KgN8CPVqJQ1IMq8kaoWqqxzpPDyW0z7cTatmrmi0,952
@@ -153,8 +154,8 @@ territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/websit
 territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/svg/delete-back.svg,sha256=fJPjkZT2jdTcW2nmwr7YtBayOmQKOxiGNyO8bM8jP2U,618
 territories_dashboard_lib/website_lib/templatetags/htmlparams.py,sha256=jWXlmT-nFh7YefVP_zJSXEA1YgT37wnWqelPhmj7UoM,2092
 territories_dashboard_lib/website_lib/templatetags/other_filters.py,sha256=EEczSQi8lJZ_rfceuXQz3iF1SIxh5d-3-liTY8lkKtU,944
-territories_dashboard_lib-0.1.13.dist-info/licenses/licence.md,sha256=9Tat8mM_Yyww-wmWps8avlOhzumqEUGYy8853tKy7aE,7804
-territories_dashboard_lib-0.1.13.dist-info/METADATA,sha256=k0H8xZJhACk0h9I5VEnDRR6XP90I9YcjIac8xtFV6fc,6191
-territories_dashboard_lib-0.1.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-territories_dashboard_lib-0.1.13.dist-info/top_level.txt,sha256=Cih-lil8CSXTpDZV6fgHKIKIBtUjDaNpmkiuW2TSzsk,26
-territories_dashboard_lib-0.1.13.dist-info/RECORD,,
+territories_dashboard_lib-0.1.14.dist-info/licenses/licence.md,sha256=9Tat8mM_Yyww-wmWps8avlOhzumqEUGYy8853tKy7aE,7804
+territories_dashboard_lib-0.1.14.dist-info/METADATA,sha256=35N62TKRRKroNWcPTU4QbYGRJ7AjYLWw4kij3p8ggyU,6191
+territories_dashboard_lib-0.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+territories_dashboard_lib-0.1.14.dist-info/top_level.txt,sha256=Cih-lil8CSXTpDZV6fgHKIKIBtUjDaNpmkiuW2TSzsk,26
+territories_dashboard_lib-0.1.14.dist-info/RECORD,,