diff --git a/celery.log b/celery.log index 01f6805..78b9646 100644 --- a/celery.log +++ b/celery.log @@ -164,3 +164,46 @@ you should set broker_connection_retry_on_startup to True. [2026-02-09 18:31:03,713: INFO/ForkPoolWorker-1] Decoded JSON for 27: summary=True, tags=['development', 'research', 'new', 'company'] [2026-02-09 18:31:03,987: INFO/ForkPoolWorker-1] Successfully added tags ['development', 'research', 'new', 'company'] to bookmark 27 [2026-02-09 18:31:04,321: INFO/ForkPoolWorker-1] Task core.tasks.generate_summary[944ef664-f321-45b6-82f8-607291008ea6] succeeded in 13.666462198016234s: 'Generated summary and tags for bookmark 27' +[2026-02-09 19:04:23,495: INFO/MainProcess] Task core.tasks.process_bookmark[70bb649c-6afd-477d-ac5f-959b9ea12bb0] received +[2026-02-09 19:04:26,064: INFO/ForkPoolWorker-2] HTTP Request: GET https://facebook.com "HTTP/1.1 301 Moved Permanently" +[2026-02-09 19:04:26,361: INFO/ForkPoolWorker-2] HTTP Request: GET https://www.facebook.com/ "HTTP/1.1 400 Bad Request" +[2026-02-09 19:04:26,399: WARNING/ForkPoolWorker-2] Error fetching bookmark 28 (https://facebook.com): Client error '400 Bad Request' for url 'https://www.facebook.com/' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/400. Trying base domain backup. +[2026-02-09 19:04:26,403: ERROR/ForkPoolWorker-2] Error fetching base domain for bookmark 28: Client error '400 Bad Request' for url 'https://www.facebook.com/' +For more information check: https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/400 +[2026-02-09 19:04:27,088: INFO/MainProcess] Task core.tasks.generate_summary[b0feb8a7-8741-4581-a7f0-7e703e4a2e70] received +[2026-02-09 19:04:27,151: INFO/ForkPoolWorker-2] Task core.tasks.process_bookmark[70bb649c-6afd-477d-ac5f-959b9ea12bb0] succeeded in 3.190528256993275s: 'Processed bookmark 28' +[2026-02-09 19:04:28,313: INFO/ForkPoolWorker-1] Generating summary/tags for bookmark 28... +[2026-02-09 19:04:39,614: INFO/ForkPoolWorker-1] AI Raw Response for 28: { + "summary": "The webpage content could not be retrieved; requests to https://facebook.com and its base domain failed. No content was available for analysis, so no page details can be provided." +} +[2026-02-09 19:04:39,614: INFO/ForkPoolWorker-1] Decoded JSON for 28: summary=True, tags=[] +[2026-02-09 19:04:40,920: INFO/ForkPoolWorker-1] Task core.tasks.generate_summary[b0feb8a7-8741-4581-a7f0-7e703e4a2e70] succeeded in 13.627130784036126s: 'Generated summary for bookmark 28' +[2026-02-09 19:08:50,036: INFO/MainProcess] Task core.tasks.process_bookmark[ff409078-4458-47ef-b732-facaaf2cd761] received +[2026-02-09 19:08:50,262: INFO/ForkPoolWorker-2] HTTP Request: GET https://youtube.com "HTTP/1.1 301 Moved Permanently" +[2026-02-09 19:08:50,403: INFO/ForkPoolWorker-2] HTTP Request: GET https://www.youtube.com/ "HTTP/1.1 200 OK" +[2026-02-09 19:08:50,858: INFO/MainProcess] Task core.tasks.generate_summary[57582068-b4a2-48dc-9357-6d22a1ba1778] received +[2026-02-09 19:08:50,865: INFO/ForkPoolWorker-2] Task core.tasks.process_bookmark[ff409078-4458-47ef-b732-facaaf2cd761] succeeded in 0.824686923995614s: 'Processed bookmark 29' +[2026-02-09 19:08:50,927: INFO/ForkPoolWorker-1] Generating summary/tags for bookmark 29... +[2026-02-09 19:09:01,754: INFO/ForkPoolWorker-1] AI Raw Response for 29: { + "summary": "This is a YouTube footer listing navigational and legal links (About, Press, Copyright, Contact, Creators, Advertise, Developers, Terms, Privacy, Policy & Safety, How YouTube works, and Test new features). It also includes a 2026 copyright attribution to Google LLC." +} +[2026-02-09 19:09:01,754: INFO/ForkPoolWorker-1] Decoded JSON for 29: summary=True, tags=[] +[2026-02-09 19:09:01,769: INFO/ForkPoolWorker-1] Task core.tasks.generate_summary[57582068-b4a2-48dc-9357-6d22a1ba1778] succeeded in 10.908533619949594s: 'Generated summary for bookmark 29' +[2026-02-09 19:09:42,382: INFO/MainProcess] Task core.tasks.process_bookmark[21590aeb-6045-4341-8f97-80291d55e5bb] received +[2026-02-09 19:09:42,476: INFO/ForkPoolWorker-2] HTTP Request: GET https://youtube.com "HTTP/1.1 301 Moved Permanently" +[2026-02-09 19:09:42,577: INFO/ForkPoolWorker-2] HTTP Request: GET https://www.youtube.com/ "HTTP/1.1 200 OK" +[2026-02-09 19:09:42,874: INFO/MainProcess] Task core.tasks.generate_summary[3a3f1ae2-e049-44a0-8743-e0dd2392820f] received +[2026-02-09 19:09:42,877: INFO/ForkPoolWorker-2] Task core.tasks.process_bookmark[21590aeb-6045-4341-8f97-80291d55e5bb] succeeded in 0.48919728299370036s: 'Processed bookmark 29' +[2026-02-09 19:09:43,056: INFO/ForkPoolWorker-2] Generating summary/tags for bookmark 29... +[2026-02-09 19:09:53,936: INFO/ForkPoolWorker-2] AI Raw Response for 29: { + "summary": "The content is a YouTube footer listing navigation links to corporate and support resources — About, Press, Copyright, Contact, Creators, Advertise, Developers, Terms, Privacy, Policy & Safety, How YouTube works, and Test new features. It also includes a copyright notice attributing the site to Google LLC (2026)." +} +[2026-02-09 19:09:53,938: INFO/ForkPoolWorker-2] Decoded JSON for 29: summary=True, tags=[] +[2026-02-09 19:09:53,962: INFO/ForkPoolWorker-2] Task core.tasks.generate_summary[3a3f1ae2-e049-44a0-8743-e0dd2392820f] succeeded in 11.077497629041318s: 'Generated summary for bookmark 29' +[2026-02-09 19:20:12,359: INFO/MainProcess] Task core.tasks.process_bookmark[e19646b8-ea58-48a7-89e1-3d0429b9030a] received +[2026-02-09 19:20:26,876: INFO/ForkPoolWorker-2] HTTP Request: GET https://instagram.com "HTTP/1.1 301 Moved Permanently" +[2026-02-09 19:20:28,386: INFO/ForkPoolWorker-2] HTTP Request: GET https://www.instagram.com/ "HTTP/1.1 200 OK" +[2026-02-09 19:20:39,598: INFO/MainProcess] Task core.tasks.generate_summary[cfcfea70-d5a2-4694-9467-45333ac44d3f] received +[2026-02-09 19:20:40,610: INFO/ForkPoolWorker-2] Task core.tasks.process_bookmark[e19646b8-ea58-48a7-89e1-3d0429b9030a] succeeded in 24.209723198961s: 'Processed bookmark 30' +[2026-02-09 19:20:51,094: INFO/ForkPoolWorker-1] Task core.tasks.generate_summary[cfcfea70-d5a2-4694-9467-45333ac44d3f] succeeded in 8.763452520011924s: None diff --git a/config/__pycache__/settings.cpython-311.pyc b/config/__pycache__/settings.cpython-311.pyc index 59678c3..a9b1d17 100644 Binary files a/config/__pycache__/settings.cpython-311.pyc and b/config/__pycache__/settings.cpython-311.pyc differ diff --git a/config/settings.py b/config/settings.py index 5c78f07..e4d343c 100644 --- a/config/settings.py +++ b/config/settings.py @@ -58,6 +58,7 @@ INSTALLED_APPS = [ 'rest_framework', 'taggit', 'django_filters', + 'auditlog', 'core', ] @@ -67,6 +68,7 @@ MIDDLEWARE = [ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'auditlog.middleware.AuditlogMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', # Disable X-Frame-Options middleware to allow Flatlogic preview iframes. # 'django.middleware.clickjacking.XFrameOptionsMiddleware', @@ -213,4 +215,4 @@ CELERY_TASK_EAGER_PROPAGATES = True # Login/Logout Redirects LOGIN_REDIRECT_URL = 'home' -LOGOUT_REDIRECT_URL = 'home' +LOGOUT_REDIRECT_URL = 'home' \ No newline at end of file diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index 9b27003..850696c 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 12c7090..d0fde3d 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 8790f16..8dcc5c2 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/models.py b/core/models.py index 072391c..699adcf 100644 --- a/core/models.py +++ b/core/models.py @@ -82,4 +82,10 @@ class APIToken(models.Model): super().save(*args, **kwargs) def __str__(self): - return f"{self.name} - {self.user.username}" \ No newline at end of file + return f"{self.name} - {self.user.username}" + +from auditlog.registry import auditlog +auditlog.register(Bookmark) +auditlog.register(Team) +auditlog.register(TeamMembership) +auditlog.register(APIToken) diff --git a/core/templates/base.html b/core/templates/base.html index 293d348..5bd120f 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -140,6 +140,7 @@
  • Admin Panel
  • Task Monitor
    • {% endif %} +
  • Activity Log
  • diff --git a/core/templates/core/activity_log.html b/core/templates/core/activity_log.html new file mode 100644 index 0000000..6b61379 --- /dev/null +++ b/core/templates/core/activity_log.html @@ -0,0 +1,94 @@ +{% extends "base.html" %} + +{% block title %}Activity Log{% endblock %} + +{% block content %} +
    +
    +

    Activity Log

    +

    History of your actions and changes.

    +
    +
    + +
    +
    +
    + + + + + + + + + + + {% for entry in log_entries %} + + + + + + + {% empty %} + + + + {% endfor %} + +
    TimeActionResourceDetails
    + {{ entry.timestamp|date:"M d, Y H:i" }} + + {% if entry.action == 0 %} + Created + {% elif entry.action == 1 %} + Updated + {% elif entry.action == 2 %} + Deleted + {% else %} + Accessed + {% endif %} + + {{ entry.content_type.name|capfirst }} +
    + {{ entry.object_repr }} +     		+
    + {% if entry.changes %} + {{ entry.changes|truncatechars:100 }} + {% else %} + - + {% endif %} +
    +
    + + No activity recorded yet. +
    +
    +
    +
    + +{% if is_paginated %} +
    + +
    +{% endif %} +{% endblock %} diff --git a/core/urls.py b/core/urls.py index a3a0f7e..f2fc4bd 100644 --- a/core/urls.py +++ b/core/urls.py @@ -5,7 +5,8 @@ from core.views import ( BookmarkListView, BookmarkCreateView, BookmarkDetailView, BookmarkUpdateView, BookmarkDeleteView, TeamListView, TeamDetailView, BookmarkShareToggleView, - BookmarkRegenerateView, SummaryUpdateView, ExtractionUpdateView + BookmarkRegenerateView, SummaryUpdateView, ExtractionUpdateView, + UserActivityLogView ) router = DefaultRouter() @@ -26,6 +27,8 @@ urlpatterns = [ path("teams/", TeamListView.as_view(), name="team-list"), path("teams//", TeamDetailView.as_view(), name="team-detail"), + path("activity/", UserActivityLogView.as_view(), name="activity-log"), + path("api/status/", ApiStatusView.as_view(), name="api-status"), path("api/", include(router.urls)), -] \ No newline at end of file +] diff --git a/core/views.py b/core/views.py index cce8307..17286f5 100644 --- a/core/views.py +++ b/core/views.py @@ -8,6 +8,7 @@ from django.db import transaction from django.http import JsonResponse, HttpResponseRedirect from .models import Bookmark, Team, Extraction, BookmarkShare, Summary from .tasks import process_bookmark +from auditlog.models import LogEntry class BookmarkListView(LoginRequiredMixin, ListView): model = Bookmark @@ -187,4 +188,13 @@ class BookmarkShareToggleView(LoginRequiredMixin, View): else: shared = True - return JsonResponse({'shared': shared}) \ No newline at end of file + return JsonResponse({'shared': shared}) + +class UserActivityLogView(LoginRequiredMixin, ListView): + model = LogEntry + template_name = 'core/activity_log.html' + context_object_name = 'log_entries' + paginate_by = 20 + + def get_queryset(self): + return LogEntry.objects.filter(actor=self.request.user).select_related('content_type', 'actor').order_by('-timestamp') diff --git a/requirements.txt b/requirements.txt index afba81a..71f799b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,4 @@ redis==5.0.8 django-filter==24.3 flower==2.0.1 django-revproxy==0.11.0 +django-auditlog==3.4.1