fix: load complete items and send TMDb auth header (#43)

Author: Teagan42

mcp_plex/loader.py

@@ -65,9 +65,9 @@ async def _fetch_tmdb_movie(
     client: httpx.AsyncClient, tmdb_id: str, api_key: str
 ) -> Optional[TMDBMovie]:
     url = (
-        f"https://api.themoviedb.org/3/movie/{tmdb_id}?api_key={api_key}&append_to_response=reviews"
+        f"https://api.themoviedb.org/3/movie/{tmdb_id}?append_to_response=reviews"
     )
-    resp = await client.get(url)
+    resp = await client.get(url, headers={"Authorization": f"Bearer {api_key}"})
     if resp.is_success:
         return TMDBMovie.model_validate(resp.json())
     return None
@@ -77,9 +77,9 @@ async def _fetch_tmdb_show(
     client: httpx.AsyncClient, tmdb_id: str, api_key: str
 ) -> Optional[TMDBShow]:
     url = (
-        f"https://api.themoviedb.org/3/tv/{tmdb_id}?api_key={api_key}&append_to_response=reviews"
+        f"https://api.themoviedb.org/3/tv/{tmdb_id}?append_to_response=reviews"
     )
-    resp = await client.get(url)
+    resp = await client.get(url, headers={"Authorization": f"Bearer {api_key}"})
     if resp.is_success:
         return TMDBShow.model_validate(resp.json())
     return None
@@ -90,8 +90,8 @@ async def _fetch_tmdb_episode(
 ) -> Optional[TMDBEpisode]:
     """Attempt to fetch TMDb data for a TV episode by its ID."""
 
-    url = f"https://api.themoviedb.org/3/tv/episode/{tmdb_id}?api_key={api_key}"
-    resp = await client.get(url)
+    url = f"https://api.themoviedb.org/3/tv/episode/{tmdb_id}"
+    resp = await client.get(url, headers={"Authorization": f"Bearer {api_key}"})
     if resp.is_success:
         return TMDBEpisode.model_validate(resp.json())
     return None
@@ -190,19 +190,25 @@ async def _augment_episode(
     results: List[AggregatedItem] = []
     async with httpx.AsyncClient(timeout=30) as client:
         movie_section = server.library.section("Movies")
-        movie_tasks = [_augment_movie(client, movie) for movie in movie_section.all()]
+        movie_tasks = [
+            _augment_movie(client, movie.fetchItem(movie.ratingKey))
+            for movie in movie_section.all()
+        ]
         if movie_tasks:
             results.extend(await _gather_in_batches(movie_tasks, batch_size))
 
         show_section = server.library.section("TV Shows")
         for show in show_section.all():
-            show_ids = _extract_external_ids(show)
+            full_show = show.fetchItem(show.ratingKey)
+            show_ids = _extract_external_ids(full_show)
             show_tmdb: Optional[TMDBShow] = None
             if show_ids.tmdb:
                 show_tmdb = await _fetch_tmdb_show(client, show_ids.tmdb, tmdb_api_key)
             episode_tasks = [
-                _augment_episode(client, episode, show_tmdb)
-                for episode in show.episodes()
+                _augment_episode(
+                    client, episode.fetchItem(episode.ratingKey), show_tmdb
+                )
+                for episode in full_show.episodes()
             ]
             if episode_tasks:
                 results.extend(await _gather_in_batches(episode_tasks, batch_size))
@@ -348,7 +354,7 @@ async def run(
             parts.extend(r.get("content", "") for r in getattr(item.tmdb, "reviews", []))
         text = "\n".join(p for p in parts if p)
         payload = {
-            "data": item.model_dump(),
+            "data": item.model_dump(mode="json"),
             "title": item.plex.title,
             "type": item.plex.type,
         }
@@ -357,7 +363,7 @@ async def run(
         if item.plex.year is not None:
             payload["year"] = item.plex.year
         if item.plex.added_at is not None:
-            payload["added_at"] = item.plex.added_at
+            payload["added_at"] = int(item.plex.added_at.timestamp())
         point_id: int | str = (
             int(item.plex.rating_key)
             if item.plex.rating_key.isdigit()
@@ -453,7 +459,7 @@ async def run(
     else:
         logger.info("No points to upsert")
 
-    json.dump([item.model_dump() for item in items], fp=sys.stdout, indent=2)
+    json.dump([item.model_dump(mode="json") for item in items], fp=sys.stdout, indent=2)
     sys.stdout.write("\n")
 
 

mcp_plex/types.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from datetime import datetime
 from typing import List, Literal, Optional
 
 from pydantic import BaseModel, Field
@@ -121,7 +122,7 @@ class PlexItem(BaseModel):
     title: str
     summary: Optional[str] = None
     year: Optional[int] = None
-    added_at: Optional[int] = None
+    added_at: Optional[datetime] = None
     guids: List[PlexGuid] = Field(default_factory=list)
     thumb: Optional[str] = None
     art: Optional[str] = None

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mcp-plex"
-version = "0.26.8"
+version = "0.26.9"
 
 description = "Plex-Oriented Model Context Protocol Server"
 requires-python = ">=3.11,<3.13"

tests/test_load_from_plex.py

@@ -8,38 +8,51 @@
 
 
 def test_load_from_plex(monkeypatch):
-    movie = types.SimpleNamespace(
-        ratingKey="101",
-        guid="plex://movie/101",
-        type="movie",
-        title="Inception",
-        guids=[
-            types.SimpleNamespace(id="imdb://tt1375666"),
-            types.SimpleNamespace(id="tmdb://27205"),
-        ],
+    def add_fetch(obj):
+        obj.fetchItem = lambda key: obj
+        return obj
+
+    movie = add_fetch(
+        types.SimpleNamespace(
+            ratingKey="101",
+            guid="plex://movie/101",
+            type="movie",
+            title="Inception",
+            guids=[
+                types.SimpleNamespace(id="imdb://tt1375666"),
+                types.SimpleNamespace(id="tmdb://27205"),
+            ],
+        )
     )
 
-    ep1 = types.SimpleNamespace(
-        ratingKey="102",
-        guid="plex://episode/102",
-        type="episode",
-        title="Pilot",
-        guids=[
-            types.SimpleNamespace(id="imdb://tt0959621"),
-            types.SimpleNamespace(id="tmdb://62085"),
-        ],
+    ep1 = add_fetch(
+        types.SimpleNamespace(
+            ratingKey="102",
+            guid="plex://episode/102",
+            type="episode",
+            title="Pilot",
+            guids=[
+                types.SimpleNamespace(id="imdb://tt0959621"),
+                types.SimpleNamespace(id="tmdb://62085"),
+            ],
+        )
     )
-    ep2 = types.SimpleNamespace(
-        ratingKey="103",
-        guid="plex://episode/103",
-        type="episode",
-        title="Cat's in the Bag...",
-        guids=[types.SimpleNamespace(id="imdb://tt0959622")],
+    ep2 = add_fetch(
+        types.SimpleNamespace(
+            ratingKey="103",
+            guid="plex://episode/103",
+            type="episode",
+            title="Cat's in the Bag...",
+            guids=[types.SimpleNamespace(id="imdb://tt0959622")],
+        )
     )
 
-    show = types.SimpleNamespace(
-        guids=[types.SimpleNamespace(id="tmdb://1396")],
-        episodes=lambda: [ep1, ep2],
+    show = add_fetch(
+        types.SimpleNamespace(
+            ratingKey="201",
+            guids=[types.SimpleNamespace(id="tmdb://1396")],
+            episodes=lambda: [ep1, ep2],
+        )
     )
 
     movie_section = types.SimpleNamespace(all=lambda: [movie])
@@ -51,6 +64,8 @@ def test_load_from_plex(monkeypatch):
 
     async def handler(request):
         url = str(request.url)
+        if "themoviedb.org" in url:
+            assert request.headers.get("Authorization") == "Bearer key"
         if "tt1375666" in url:
             return httpx.Response(
                 200,

tests/test_loader_unit.py

@@ -83,16 +83,19 @@ async def imdb_mock(request):
         return httpx.Response(404)
 
     async def tmdb_movie_mock(request):
+        assert request.headers.get("Authorization") == "Bearer k"
         if "good" in str(request.url):
             return httpx.Response(200, json={"id": 1, "title": "M"})
         return httpx.Response(404)
 
     async def tmdb_show_mock(request):
+        assert request.headers.get("Authorization") == "Bearer k"
         if "good" in str(request.url):
             return httpx.Response(200, json={"id": 1, "name": "S"})
         return httpx.Response(404)
 
     async def tmdb_episode_mock(request):
+        assert request.headers.get("Authorization") == "Bearer k"
         if "good" in str(request.url):
             return httpx.Response(200, json={"id": 1, "name": "E"})
         return httpx.Response(404)