territories-dashboard-lib 0.1.10__tar.gz → 0.1.12__tar.gz

{territories_dashboard_lib-0.1.10/territories_dashboard_lib.egg-info → territories_dashboard_lib-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: territories-dashboard-lib
-Version: 0.1.10
+Version: 0.1.12
 Summary: Librairie pour la visualisation d'indicateurs territoriaux.
 Author-email: Bastien <bastien@prune.sh>
 Classifier: Programming Language :: Python :: 3
@@ -11,6 +11,17 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: licence.md
+Requires-Dist: django>=5.1.6
+Requires-Dist: django-nested-admin>=4.1.1
+Requires-Dist: geoip2>=5.1.0
+Requires-Dist: gunicorn>=23.0.0
+Requires-Dist: ipython>=8.32.0
+Requires-Dist: martor>=1.6.45
+Requires-Dist: pre-commit>=4.2.0
+Requires-Dist: psycopg2-binary>=2.9.10
+Requires-Dist: pydantic>=2.10.6
+Requires-Dist: pydantic-settings>=2.7.1
+Requires-Dist: whitenoise>=6.9.0
 Dynamic: license-file
 
 # Tableau de bord des indicateurs territoriaux

{territories_dashboard_lib-0.1.10 → territories_dashboard_lib-0.1.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "territories-dashboard-lib"
-version = "0.1.10"
+version = "0.1.12"
 description = "Librairie pour la visualisation d'indicateurs territoriaux."
 authors = [
     { name = "Bastien", email = "bastien@prune.sh" }
@@ -17,6 +17,20 @@ classifiers = [
     "Topic :: Software Development :: Libraries",
 ]
 
+dependencies = [
+    "django>=5.1.6",
+    "django-nested-admin>=4.1.1",
+    "geoip2>=5.1.0",
+    "gunicorn>=23.0.0",
+    "ipython>=8.32.0",
+    "martor>=1.6.45",
+    "pre-commit>=4.2.0",
+    "psycopg2-binary>=2.9.10",
+    "pydantic>=2.10.6",
+    "pydantic-settings>=2.7.1",
+    "whitenoise>=6.9.0",
+]
+
 [tool.setuptools]
 include-package-data = true
 

territories_dashboard_lib-0.1.12/territories_dashboard_lib/tracking_lib/geolocalisation/logic.py

@@ -0,0 +1,35 @@
+import os
+from functools import lru_cache
+
+import geoip2.database
+
+
+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]
+    else:
+        ip = request.META.get("REMOTE_ADDR")
+    return ip
+
+
+@lru_cache(maxsize=100_000)
+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)
+    try:
+        response = reader.country(ip_address)
+        country = response.country.iso_code
+    except geoip2.errors.AddressNotFoundError:
+        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-0.1.10 → territories_dashboard_lib-0.1.12}/territories_dashboard_lib/tracking_lib/logic.py

@@ -6,7 +6,10 @@ from django.http import HttpRequest, HttpResponse
 from django.urls import resolve
 
 from territories_dashboard_lib.tracking_lib.enums import TRACKING_COOKIE_NAME, EventType
-from territories_dashboard_lib.tracking_lib.models import Event, Page
+from territories_dashboard_lib.tracking_lib.geolocalisation.logic import (
+    get_country_of_ip,
+)
+from territories_dashboard_lib.tracking_lib.models import CookieInfo, Event, Page
 
 if TYPE_CHECKING:
     from territories_dashboard_lib.indicators_lib.models import Indicator, Theme
@@ -21,6 +24,11 @@ def get_or_set_tracking_cookie(request: HttpRequest, response: HttpResponse) ->
             value=tracking_cookie,
             max_age=timedelta(days=365),
         )
+    try:
+        CookieInfo.objects.get(id=tracking_cookie)
+    except CookieInfo.DoesNotExist:
+        country = get_country_of_ip(request)
+        CookieInfo.objects.create(id=tracking_cookie, country=country)
     return tracking_cookie
 
 

territories_dashboard_lib-0.1.12/territories_dashboard_lib/tracking_lib/migrations/0002_alter_event_created_at_alter_page_created_at.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.3 on 2025-06-26 12:58
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracking_lib', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='created_at',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AlterField(
+            model_name='page',
+            name='created_at',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

territories_dashboard_lib-0.1.12/territories_dashboard_lib/tracking_lib/migrations/0003_cookieinfo.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.1.6 on 2025-06-30 12:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracking_lib', '0002_alter_event_created_at_alter_page_created_at'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CookieInfo',
+            fields=[
+                ('id', models.TextField(primary_key=True, serialize=False)),
+                ('country', models.TextField(blank=True, null=True)),
+            ],
+        ),
+    ]

{territories_dashboard_lib-0.1.10 → territories_dashboard_lib-0.1.12}/territories_dashboard_lib/tracking_lib/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils import timezone
 
 from territories_dashboard_lib.indicators_lib.enums import MeshLevel
 from territories_dashboard_lib.tracking_lib.enums import EventType
@@ -10,7 +11,7 @@ class Page(models.Model):
     À chaque changement de paramètre (territoire, maille, territoire de comparaison) une nouvelle vue est enregistrée.
     """
 
-    created_at = models.DateTimeField(auto_now_add=True)
+    created_at = models.DateTimeField(default=timezone.now)
     cookie = models.TextField(
         help_text="Un cookie sans durée d'expiration est placé dans chaque nouvelle session, il possède une valeur aléatoire qui permet de tracer le navigateur du visiteur entre plusieurs visites."
     )
@@ -69,7 +70,7 @@ class Event(models.Model):
     Tracking des autres événements de l'application
     """
 
-    created_at = models.DateTimeField(auto_now_add=True)
+    created_at = models.DateTimeField(default=timezone.now)
     cookie = models.TextField(
         help_text="Un cookie sans durée d'expiration est placé dans chaque nouvelle session, il possède une valeur aléatoire qui permet de tracer le navigateur du visiteur entre plusieurs visites."
     )
@@ -77,3 +78,8 @@ class Event(models.Model):
     data = models.JSONField(null=True, blank=True)
     url = models.TextField(help_text="URL brut de la page")
     view = models.TextField(help_text="Nom de la vue dans Django")
+
+
+class CookieInfo(models.Model):
+    id = models.TextField(primary_key=True)
+    country = models.TextField(null=True, blank=True)

{territories_dashboard_lib-0.1.10 → territories_dashboard_lib-0.1.12/territories_dashboard_lib.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: territories-dashboard-lib
-Version: 0.1.10
+Version: 0.1.12
 Summary: Librairie pour la visualisation d'indicateurs territoriaux.
 Author-email: Bastien <bastien@prune.sh>
 Classifier: Programming Language :: Python :: 3
@@ -11,6 +11,17 @@ Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: licence.md
+Requires-Dist: django>=5.1.6
+Requires-Dist: django-nested-admin>=4.1.1
+Requires-Dist: geoip2>=5.1.0
+Requires-Dist: gunicorn>=23.0.0
+Requires-Dist: ipython>=8.32.0
+Requires-Dist: martor>=1.6.45
+Requires-Dist: pre-commit>=4.2.0
+Requires-Dist: psycopg2-binary>=2.9.10
+Requires-Dist: pydantic>=2.10.6
+Requires-Dist: pydantic-settings>=2.7.1
+Requires-Dist: whitenoise>=6.9.0
 Dynamic: license-file
 
 # Tableau de bord des indicateurs territoriaux

{territories_dashboard_lib-0.1.10 → territories_dashboard_lib-0.1.12}/territories_dashboard_lib.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ territories_dashboard_lib/__init__.py
 territories_dashboard_lib.egg-info/PKG-INFO
 territories_dashboard_lib.egg-info/SOURCES.txt
 territories_dashboard_lib.egg-info/dependency_links.txt
+territories_dashboard_lib.egg-info/requires.txt
 territories_dashboard_lib.egg-info/top_level.txt
 territories_dashboard_lib/commons/__init__.py
 territories_dashboard_lib/commons/decorators.py
@@ -57,7 +58,11 @@ territories_dashboard_lib/tracking_lib/models.py
 territories_dashboard_lib/tracking_lib/payloads.py
 territories_dashboard_lib/tracking_lib/urls.py
 territories_dashboard_lib/tracking_lib/views.py
+territories_dashboard_lib/tracking_lib/geolocalisation/__init__.py
+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/__init__.py
 territories_dashboard_lib/website_lib/__init__.py
 territories_dashboard_lib/website_lib/admin.py

territories_dashboard_lib-0.1.12/territories_dashboard_lib.egg-info/requires.txt

@@ -0,0 +1,11 @@
+django>=5.1.6
+django-nested-admin>=4.1.1
+geoip2>=5.1.0
+gunicorn>=23.0.0
+ipython>=8.32.0
+martor>=1.6.45
+pre-commit>=4.2.0
+psycopg2-binary>=2.9.10
+pydantic>=2.10.6
+pydantic-settings>=2.7.1
+whitenoise>=6.9.0