[release] Bump to version 46.0

- Add sentiment parsing for Scrobbles with notes

PROJECT.org

@@ -93,11 +93,7 @@ fetching and simple saving.
 :LOGBOOK:
 CLOCK: [2025-07-09 Wed 09:55]--[2025-07-09 Wed 10:15] =>  0:20
 :END:
-* Backlog [-1/13] :vrobbler:project:personal:
-** TODO [#C] Add sentiment parsing for Scrobbles with notes :vrobbler:project:scrobbles:sentiment:
-:PROPERTIES:
-:ID:       37781d6a-f3b0-48b2-bf98-33c2c791cf85
-:END:
+* Backlog [0/12] :vrobbler:project:personal:
 ** TODO [#C] Create small utility to clean up tracks scrobbled with wonky playback times :vrobbler:personal:bug:music:scrobbles:
 :PROPERTIES:
 :ID:       702462cf-d54b-48c6-8a7c-78b8de751deb
@@ -486,7 +482,7 @@ whatever time KoReader reports, we need to know, given the date and the user
 profile's historic timezone, how many hours to adjust the KoReader time to get
 to GMT to save it in the database.
 
-** TODO [#A] Make IMAP and WebDAV configurable :webdav:feature:imap:importers:
+** TODO [#B] Make IMAP and WebDAV configurable :webdav:feature:imap:importers:
 :PROPERTIES:
 :ID:       b1426d92-2feb-4d15-9738-d5b7b0594f96
 :END:
@@ -509,6 +505,39 @@ needed import celery task. This is how the WebDAV celery task currently works.
 This would also be an opporunity to clean up the code around WebDAV imports
 and make them more re-usable for other import services.
 
+* Version 46.0 [1/1]
+** DONE [#C] Add sentiment parsing for Scrobbles with notes :scrobbles:sentiment:
+:PROPERTIES:
+:ID:       37781d6a-f3b0-48b2-bf98-33c2c791cf85
+:END:
+
+*** Description
+
+Not sure how useful this would be, but I wonder if we can add a `sentiment` JSONField
+on each scrobble that can store the output of VADER over the notes in a scrobble with notes.
+
+I'm not sure that the value prop here is worth the storage and processing time.
+
+But if we do add it, it should be a process that scans for scrobbles with both notes and no
+sentiment field value (unless --overwrite is used) and just run periodically.
+
+
+* Version 45.1 [1/1]
+** DONE [#B] Mopidy favorites or monthly playlist adds should look at all scrobbles :bug:mopidy:favorites:tracks:
+:PROPERTIES:
+:ID:       0be7d11e-e268-2fd5-836a-e5b4d210e0fa
+:END:
+
+*** Description
+
+When favoriting a track and trying to add it to the Moidy favorite playlist, it
+sometimes happens that one scrobble did not come from Mopidy, but an earlier or
+later one did.
+
+Can we scan all the scrobbles of the track for a given user to see if any have
+`mopidy_uri` in the log and if so, use that to send along to Mopidy?
+
+
 * Version 45.0 [1/1]
 ** DONE [#B] Add ability to add mopidy tracks to Monthly playlists :feature:favorites:tracks:
 :PROPERTIES:

justfile

@@ -15,9 +15,11 @@ celery:
 celery-beat:
     poetry run celery -A vrobbler beat -l info
 
-release kind="minor":
-    poetry run python scripts/release.py {{kind}}
-
 push:
     git push && git push gitea
     git push --tags && git push --tags gitea
+
+release kind="minor":
+    poetry run python scripts/release.py {{kind}}
+    just push
+    

poetry.lock

@@ -5439,6 +5439,21 @@ brotli = ["brotli (==1.0.9) ; os_name != \"nt\" and python_version < \"3\" and p
 secure = ["certifi", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "ipaddress ; python_version == \"2.7\"", "pyOpenSSL (>=0.14)", "urllib3-secure-extra"]
 socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
 
+[[package]]
+name = "vadersentiment"
+version = "3.3.2"
+description = "VADER Sentiment Analysis. VADER (Valence Aware Dictionary and sEntiment Reasoner) is a lexicon and rule-based sentiment analysis tool that is specifically attuned to sentiments expressed in social media, and works well on texts from other domains."
+optional = false
+python-versions = "*"
+groups = ["main"]
+files = [
+    {file = "vaderSentiment-3.3.2-py2.py3-none-any.whl", hash = "sha256:3bf1d243b98b1afad575b9f22bc2cb1e212b94ff89ca74f8a23a588d024ea311"},
+    {file = "vaderSentiment-3.3.2.tar.gz", hash = "sha256:5d7c06e027fc8b99238edb0d53d970cf97066ef97654009890b83703849632f9"},
+]
+
+[package.dependencies]
+requests = "*"
+
 [[package]]
 name = "vine"
 version = "5.1.0"
@@ -6005,4 +6020,4 @@ cffi = ["cffi (>=1.17,<2.0) ; platform_python_implementation != \"PyPy\" and pyt
 [metadata]
 lock-version = "2.1"
 python-versions = ">=3.11,<3.15"
-content-hash = "bd3f14a9cfce403db426af98774f1e3c41b97283aa43f4bd80f84594ee0dd726"
+content-hash = "78ba52d0e6ea492efceb14fcd42ace25abfb66d42c3aff28f2fe1a31a9aa03b5"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vrobbler"
-version = "45.0"
+version = "46.0"
 description = ""
 authors = ["Colin Powell <colin@unbl.ink>"]
 
@@ -62,6 +62,7 @@ recipe-scrapers = "^15.11.0"
 gpxpy = "^1.6.2"
 fitparse = "^1.2.0"
 lxml = ">=5.5.0"
+vaderSentiment = "^3.3.2"
 
 [tool.poetry.group.test]
 optional = true

scripts/release.py

@@ -124,7 +124,7 @@ def main():
 
     if not done_items:
         print("No DONE items found in Backlog — nothing to release.")
-        sys.exit(0)
+        sys.exit(1)
 
     # ---------------------------------------------------------------
     # 4. Build the new Version section text

vrobbler/apps/scrobbles/management/commands/backfill_scrobble_sentiment.py

@@ -0,0 +1,68 @@
+from django.core.management.base import BaseCommand
+from django.db import models
+
+from scrobbles.models import Scrobble
+from scrobbles.utils import analyze_scrobble_sentiment
+
+
+class Command(BaseCommand):
+    help = "Backfill VADER sentiment analysis for scrobbles with notes"
+
+    def add_arguments(self, parser):
+        parser.add_argument(
+            "--commit",
+            action="store_true",
+            help="Actually update scrobble logs with sentiment data",
+        )
+        parser.add_argument(
+            "--overwrite",
+            action="store_true",
+            help="Re-analyze scrobbles that already have sentiment data",
+        )
+
+    def handle(self, *args, **options):
+        commit = options["commit"]
+        overwrite = options["overwrite"]
+
+        qs = Scrobble.objects.filter(
+            ~models.Q(log__notes__isnull=True)
+            & ~models.Q(log__notes=[])
+            & ~models.Q(log__notes={})
+        )
+        if not overwrite:
+            qs = qs.filter(log__sentiment__isnull=True)
+
+        total = qs.count()
+        analyzed_count = 0
+        skipped_count = 0
+
+        self.stdout.write(f"Found {total} scrobbles to process")
+
+        for scrobble in qs.iterator():
+            if commit:
+                analyzed = analyze_scrobble_sentiment(scrobble, overwrite=overwrite)
+            else:
+                notes_str = ""
+                if scrobble.logdata:
+                    notes_str = scrobble.logdata.notes_as_str()
+                analyzed = bool(notes_str)
+
+            if analyzed:
+                analyzed_count += 1
+                if commit:
+                    scores = (scrobble.log or {}).get("sentiment", {})
+                    self.stdout.write(
+                        f"  Updated scrobble {scrobble.id}: compound={scores.get('compound', 'N/A')}"
+                    )
+                else:
+                    self.stdout.write(
+                        f"  [DRY RUN] Would analyze scrobble {scrobble.id}"
+                    )
+            else:
+                skipped_count += 1
+
+        self.stdout.write(
+            f"\nAnalyzed {analyzed_count} scrobbles, skipped {skipped_count}"
+        )
+        if not commit:
+            self.stdout.write("Run with --commit to persist changes")

vrobbler/apps/scrobbles/models.py

@@ -882,8 +882,14 @@ class Scrobble(TimeStampedModel):
                 logger.warning("Log data could not be loaded", e)
                 return logdata_cls()
 
+        # Strip log-only keys (stored in JSONField but not part of LogData dataclass)
+        logdata_kwargs = {
+            k: v for k, v in log_dict.items()
+            if k in logdata_cls.__dataclass_fields__
+        }
+
         try:
-            return logdata_cls(**log_dict)
+            return logdata_cls(**logdata_kwargs)
         except ParseError as e:
             logger.warning(
                 "Could not parse log data",

vrobbler/apps/scrobbles/tasks.py

@@ -12,6 +12,7 @@ from charts.utils import (
 from django.apps import apps
 from django.conf import settings
 from django.contrib.auth import get_user_model
+from django.db import models
 from django.utils import timezone
 
 logger = logging.getLogger(__name__)
@@ -544,6 +545,30 @@ def send_mood_checkin():
     send_mood_checkin_reminders()
 
 
+@shared_task
+def backfill_scrobble_sentiment():
+    """Backfill VADER sentiment for scrobbles with notes (replaces @hourly cron)."""
+    from scrobbles.models import Scrobble
+    from scrobbles.utils import analyze_scrobble_sentiment
+
+    qs = Scrobble.objects.filter(
+        models.Q(log__notes__isnull=False)
+        & ~models.Q(log__notes=[])
+        & ~models.Q(log__notes={})
+        & models.Q(log__sentiment__isnull=True)
+    )
+
+    count = 0
+    for scrobble in qs.iterator():
+        if analyze_scrobble_sentiment(scrobble):
+            count += 1
+
+    logger.info(
+        "Backfilled sentiment for %d scrobbles",
+        count,
+    )
+
+
 @shared_task
 def add_favorite_to_mopidy_playlist(favorite_id):
     from scrobbles.models import FavoriteMedia
@@ -576,3 +601,91 @@ def remove_favorite_from_mopidy_playlist(user_id, track_id):
         track=track,
     )
     remove_track_from_mopidy_favorites_playlist(proxy)
+
+
+@shared_task
+def add_scrobble_to_mopidy_queue(scrobble_id):
+    from scrobbles.models import Scrobble
+
+    scrobble = Scrobble.objects.filter(id=scrobble_id).first()
+    if not scrobble:
+        return
+
+    profile = scrobble.user.profile
+    mopidy_url = profile.mopidy_api_url
+    if not mopidy_url:
+        return
+
+    mopidy_uri = (scrobble.log or {}).get("raw_data", {}).get("mopidy_uri")
+    track = scrobble.track if scrobble.media_type == "Track" else None
+    if not mopidy_uri and track:
+        sibling = (
+            Scrobble.objects.filter(track=track, user=scrobble.user)
+            .order_by("-timestamp")
+            .iterator()
+        )
+        for s in sibling:
+            uri = (s.log or {}).get("raw_data", {}).get("mopidy_uri")
+            if uri:
+                mopidy_uri = uri
+                break
+
+    if not mopidy_uri:
+        logger.warning(
+            "No Mopidy URI found for scrobble",
+            extra={"scrobble_id": scrobble_id, "user_id": scrobble.user_id},
+        )
+        return
+
+    import requests
+
+    rpc_url = mopidy_url.rstrip("/") + "/rpc"
+    payload = {
+        "jsonrpc": "2.0",
+        "id": 1,
+        "method": "core.tracklist.add",
+        "params": {"uris": [mopidy_uri]},
+    }
+    try:
+        resp = requests.post(rpc_url, json=payload, timeout=10)
+        resp.raise_for_status()
+        rpc_result = resp.json()
+        if rpc_result.get("error"):
+            logger.error(
+                "Mopidy error adding to queue",
+                extra={"error": rpc_result["error"], "scrobble_id": scrobble_id},
+            )
+        else:
+            logger.info(
+                "Added track to Mopidy queue",
+                extra={"scrobble_id": scrobble_id, "mopidy_uri": mopidy_uri},
+            )
+    except requests.RequestException as e:
+        logger.error(
+            "Failed to add track to Mopidy queue",
+            extra={"scrobble_id": scrobble_id, "error": str(e)},
+        )
+
+
+@shared_task
+def add_scrobble_to_mopidy_monthly_playlist(scrobble_id):
+    from scrobbles.models import Scrobble
+    from scrobbles.utils import add_track_to_mopidy_monthly_playlist
+
+    scrobble = Scrobble.objects.filter(id=scrobble_id).first()
+    if not scrobble:
+        return
+
+    track = scrobble.track if scrobble.media_type == "Track" else None
+    if track:
+        sibling = (
+            Scrobble.objects.filter(track=track, user=scrobble.user)
+            .order_by("-timestamp")
+            .iterator()
+        )
+        for s in sibling:
+            if (s.log or {}).get("raw_data", {}).get("mopidy_uri"):
+                scrobble = s
+                break
+
+    add_track_to_mopidy_monthly_playlist(scrobble)

vrobbler/apps/scrobbles/utils.py

@@ -468,9 +468,22 @@ def _ensure_mopidy_playlist(profile):
     return result
 
 
-def add_track_to_mopidy_favorites_playlist(favorite):
+def _scrobble_with_mopidy_uri(track, user):
+    """Find a scrobble for this track+user that has a mopidy_uri in its log."""
     from scrobbles.models import Scrobble
 
+    for scrobble in (
+        Scrobble.objects.filter(track=track, user=user)
+        .order_by("-timestamp")
+        .iterator()
+    ):
+        raw_data = scrobble.log.get("raw_data") or {}
+        if raw_data.get("mopidy_uri"):
+            return scrobble
+    return None
+
+
+def add_track_to_mopidy_favorites_playlist(favorite):
     if favorite.media_type != "Track" or not favorite.track:
         return
 
@@ -479,15 +492,7 @@ def add_track_to_mopidy_favorites_playlist(favorite):
         return
 
     track = favorite.track
-    scrobble = (
-        Scrobble.objects.filter(
-            track=track,
-            user=favorite.user,
-            log__raw_data__mopidy_uri__isnull=False,
-        )
-        .order_by("-timestamp")
-        .first()
-    )
+    scrobble = _scrobble_with_mopidy_uri(track, favorite.user)
 
     if not scrobble:
         logger.warning(
@@ -496,7 +501,7 @@ def add_track_to_mopidy_favorites_playlist(favorite):
         )
         return
 
-    mopidy_uri = scrobble.log["raw_data"]["mopidy_uri"]
+    mopidy_uri = (scrobble.log or {}).get("raw_data", {}).get("mopidy_uri")
 
     try:
         playlist = _ensure_mopidy_playlist(profile)
@@ -557,8 +562,6 @@ def resubmit_favorites_to_mopidy(user):
 
 
 def remove_track_from_mopidy_favorites_playlist(favorite):
-    from scrobbles.models import Scrobble
-
     if favorite.media_type != "Track" or not favorite.track:
         return
 
@@ -567,15 +570,7 @@ def remove_track_from_mopidy_favorites_playlist(favorite):
         return
 
     track = favorite.track
-    scrobble = (
-        Scrobble.objects.filter(
-            track=track,
-            user=favorite.user,
-            log__raw_data__mopidy_uri__isnull=False,
-        )
-        .order_by("-timestamp")
-        .first()
-    )
+    scrobble = _scrobble_with_mopidy_uri(track, favorite.user)
 
     if not scrobble:
         logger.warning(
@@ -584,7 +579,7 @@ def remove_track_from_mopidy_favorites_playlist(favorite):
         )
         return
 
-    mopidy_uri = scrobble.log["raw_data"]["mopidy_uri"]
+    mopidy_uri = (scrobble.log or {}).get("raw_data", {}).get("mopidy_uri")
 
     try:
         playlist = _ensure_mopidy_playlist(profile)
@@ -655,7 +650,7 @@ def add_track_to_mopidy_monthly_playlist(scrobble):
     if not pattern or not profile.mopidy_api_url:
         return
 
-    mopidy_uri = scrobble.log.get("raw_data", {}).get("mopidy_uri")
+    mopidy_uri = (scrobble.log or {}).get("raw_data", {}).get("mopidy_uri")
     if not mopidy_uri:
         return
 
@@ -807,3 +802,32 @@ def tokenize_title_to_tags(title: str) -> list[str]:
         w.lower() for w in cleaned.split() if w.lower() not in STOPWORDS and len(w) > 2
     ]
     return words
+
+
+def analyze_scrobble_sentiment(scrobble, overwrite=False) -> bool:
+    """Run VADER sentiment analysis on a scrobble's notes.
+
+    Stores result in log["sentiment"] as a dict with keys:
+    neg, neu, pos, compound.
+
+    Returns True if analyzed, False if skipped (no notes or already done).
+    """
+    from vaderSentiment.vaderSentiment import SentimentIntensityAnalyzer
+
+    log = scrobble.log or {}
+    if not overwrite and log.get("sentiment") is not None:
+        return False
+
+    notes_str = ""
+    if scrobble.logdata:
+        notes_str = scrobble.logdata.notes_as_str()
+    if not notes_str:
+        return False
+
+    analyzer = SentimentIntensityAnalyzer()
+    scores = analyzer.polarity_scores(notes_str)
+
+    log["sentiment"] = scores
+    scrobble.log = log
+    scrobble.save(update_fields=["log"])
+    return True

vrobbler/apps/scrobbles/views.py

@@ -992,46 +992,11 @@ def add_to_mopidy_queue(request, uuid):
         )
         return redirect("scrobbles:detail", uuid=uuid)
 
-    raw_data = scrobble.log.get("raw_data", {})
-    mopidy_uri = raw_data.get("mopidy_uri")
-    logger.debug(mopidy_uri)
-
-    if not mopidy_uri:
-        messages.add_message(
-            request,
-            messages.ERROR,
-            "No Mopidy URI found for this scrobble.",
-        )
-        return redirect("scrobbles:detail", uuid=uuid)
-
-    rpc_url = mopidy_url.rstrip("/") + "/rpc"
-    payload = {
-        "jsonrpc": "2.0",
-        "id": 1,
-        "method": "core.tracklist.add",
-        "params": {"uris": [mopidy_uri]},
-    }
-
-    try:
-        resp = requests.post(rpc_url, json=payload, timeout=10)
-        resp.raise_for_status()
-        rpc_result = resp.json()
-        if rpc_result.get("error"):
-            messages.add_message(
-                request,
-                messages.ERROR,
-                f'Mopidy error: {rpc_result["error"]}',
-            )
-        else:
-            msg = f'Added "{scrobble.media_obj}" to Mopidy queue.'
-            messages.add_message(request, messages.SUCCESS, msg)
-    except requests.RequestException as e:
-        messages.add_message(
-            request,
-            messages.ERROR,
-            f"Failed to contact Mopidy: {e}",
-        )
+    from scrobbles.tasks import add_scrobble_to_mopidy_queue as task
 
+    task.delay(scrobble.id)
+    msg = f'Adding "{scrobble.media_obj}" to Mopidy queue.'
+    messages.add_message(request, messages.SUCCESS, msg)
     return redirect("scrobbles:detail", uuid=uuid)
 
 
@@ -1055,13 +1020,13 @@ def add_to_mopidy_monthly_playlist(request, uuid):
     now = now_user_timezone(profile)
     playlist_name = DateFormat(now).format(pattern)
 
-    from scrobbles.utils import add_track_to_mopidy_monthly_playlist
+    from scrobbles.tasks import add_scrobble_to_mopidy_monthly_playlist as task
 
-    add_track_to_mopidy_monthly_playlist(scrobble)
+    task.delay(scrobble.id)
     messages.add_message(
         request,
         messages.SUCCESS,
-        f'Added "{scrobble.media_obj}" to monthly playlist "{playlist_name}".',
+        f'Adding "{scrobble.media_obj}" to monthly playlist "{playlist_name}".',
     )
     return redirect("scrobbles:detail", uuid=uuid)
 
@@ -1275,6 +1240,17 @@ class ScrobbleDetailView(DetailView):
                     user=self.request.user, **{fk_field: media_obj}
                 ).exists()
 
+        if media_type == "Track" and media_obj:
+            scrobbles = Scrobble.objects.filter(
+                track=media_obj, user=self.object.user
+            ).order_by("-timestamp")[:20]
+            context["has_mopidy_uri"] = any(
+                (s.log or {}).get("raw_data", {}).get("mopidy_uri")
+                for s in scrobbles
+            )
+        else:
+            context["has_mopidy_uri"] = False
+
         return context
 
 

vrobbler/settings.py

@@ -163,6 +163,10 @@ CELERY_BEAT_SCHEDULE = {
         "task": "scrobbles.tasks.send_mood_checkin",
         "schedule": crontab(hour="*/4", minute=0),
     },
+    "backfill-scrobble-sentiment": {
+        "task": "scrobbles.tasks.backfill_scrobble_sentiment",
+        "schedule": crontab(minute="0"),
+    },
 }
 
 INSTALLED_APPS = [

vrobbler/templates/scrobbles/scrobble_detail.html

@@ -66,7 +66,7 @@
 <h2>{{ object.logdata.title }}</h2>
 {% endif %}
 <h3 class="text-muted">{{ object.local_timestamp }}</h3>
-{% if object.media_type == "Track" and object.log.raw_data.mopidy_uri and user.profile.mopidy_api_url %}
+{% if object.media_type == "Track" and has_mopidy_uri and user.profile.mopidy_api_url %}
 <form method="post" action="{% url 'scrobbles:add-to-mopidy-queue' object.uuid %}" class="mb-1">
   {% csrf_token %}
     <button type="submit" class="btn btn-sm btn-outline-secondary">add to mopidy queue</button>
@@ -154,6 +154,20 @@
 {% if notes_html %}
 <div class="mb-3">
   <h4>Notes</h4>
+  <span class="badge fs-8
+      {% if sentiment.compound >= 0.5 %}bg-success
+      {% elif sentiment.compound >= 0.05 %}bg-info text-dark
+      {% elif sentiment.compound > -0.05 %}bg-secondary
+      {% elif sentiment.compound > -0.5 %}bg-warning text-dark
+      {% else %}bg-danger
+      {% endif %}">
+      {% if sentiment.compound >= 0.5 %}Positive
+      {% elif sentiment.compound >= 0.05 %}Slightly positive
+      {% elif sentiment.compound > -0.05 %}Neutral
+      {% elif sentiment.compound > -0.5 %}Slightly negative
+      {% else %}Negative
+      {% endif %}
+  </span>
   <div class="notes-list">
     {{ notes_html|safe }}
   </div>
@@ -161,6 +175,13 @@
 {% endif %}
 {% endwith %}
 
+{% with sentiment=object.log.sentiment %}
+{% if sentiment %}
+<div class="mb-3">
+</div>
+{% endif %}
+{% endwith %}
+
 {% if object.logdata.avg_seconds_per_page %}
 <p>Rate: {{object.logdata.avg_seconds_per_page}}s per page</p>
 {% endif %}