compuglobal 0.3.7__tar.gz → 0.4.0__tar.gz

{compuglobal-0.3.7 → compuglobal-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compuglobal
-Version: 0.3.7
+Version: 0.4.0
 Summary: Python wrapper for the CGHMC API (Frinkiac, Morbotron Master Of All Science and more.
 Keywords: The Simpsons,Futurama,Rick and Morty,West Wing,Frinkiac,Morbotron,Master of all Science,Capital Beat,API,API Wrapper,CompuGlobal,CompuGlobalHyperMegaNet,CGHMC
 Author: MitchellAW
@@ -12,7 +12,7 @@ Classifier: Programming Language :: Python :: 3.14
 Classifier: Operating System :: OS Independent
 Classifier: Intended Audience :: Developers
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.13.0
+Requires-Dist: aiohttp>=3.14.0
 Requires-Dist: pydantic>=2.13.0
 Project-URL: Documentation, https://compuglobal.readthedocs.io/en/latest/
 Project-URL: Source, https://github.com/MitchellAW/CompuGlobal
@@ -29,6 +29,9 @@ CompuGlobal
 .. image:: https://img.shields.io/pypi/pyversions/compuglobal.svg
    :target: https://pypi.python.org/pypi/compuglobal
 
+.. image:: https://app.readthedocs.org/projects/compuglobal/badge/?version=latest&style=flat
+   :target: https://compuglobal.readthedocs.io/en/latest/
+
 .. image:: https://img.shields.io/github/actions/workflow/status/MitchellAW/CompuGlobal/test.yml?label=tests
    :target: https://github.com/MitchellAW/CompuGlobal/actions/workflows/test.yml
 
@@ -86,29 +89,6 @@ Basic Usage
 
 For documented examples, check `here.`_
 
-What's New
-------------
-**0.3.0 - Breaking changes**
-
-These changes are to accommodate the extensive update to the APIs with new features:
-
-- All synchronous implementations of the package have been removed
-- The async endpoints persist and are now accessible via **compuglobal** or **compuglobal.aio** as done previously
-- The `Master Of All Science`_ API appears to be unavailable at this point in time and redirects to Frinkiac, I have added a **deprecation warning** to this API and it will remain unless the API returns
-- The package now requires **Python 3.13+**
-- Image, comic, and gif generation are all now performed using the API rather than from a Screencap
-
-.. code-block:: py
-
-    # This is now async
-    simpsons = compuglobal.Frinkiac()
-
-    # Previous usage
-    await screencap.get_gif_url()
-
-    # New usage
-    await simpsons.get_gif_url(screencap)
-
 Preview
 ------------
 .. image:: https://raw.githubusercontent.com/MitchellAW/MitchellAW.github.io/refs/heads/master/images/nothing-at-all.gif

{compuglobal-0.3.7 → compuglobal-0.4.0}/README.rst

@@ -10,6 +10,9 @@ CompuGlobal
 .. image:: https://img.shields.io/pypi/pyversions/compuglobal.svg
    :target: https://pypi.python.org/pypi/compuglobal
 
+.. image:: https://app.readthedocs.org/projects/compuglobal/badge/?version=latest&style=flat
+   :target: https://compuglobal.readthedocs.io/en/latest/
+
 .. image:: https://img.shields.io/github/actions/workflow/status/MitchellAW/CompuGlobal/test.yml?label=tests
    :target: https://github.com/MitchellAW/CompuGlobal/actions/workflows/test.yml
 
@@ -67,29 +70,6 @@ Basic Usage
 
 For documented examples, check `here.`_
 
-What's New
-------------
-**0.3.0 - Breaking changes**
-
-These changes are to accommodate the extensive update to the APIs with new features:
-
-- All synchronous implementations of the package have been removed
-- The async endpoints persist and are now accessible via **compuglobal** or **compuglobal.aio** as done previously
-- The `Master Of All Science`_ API appears to be unavailable at this point in time and redirects to Frinkiac, I have added a **deprecation warning** to this API and it will remain unless the API returns
-- The package now requires **Python 3.13+**
-- Image, comic, and gif generation are all now performed using the API rather than from a Screencap
-
-.. code-block:: py
-
-    # This is now async
-    simpsons = compuglobal.Frinkiac()
-
-    # Previous usage
-    await screencap.get_gif_url()
-
-    # New usage
-    await simpsons.get_gif_url(screencap)
-
 Preview
 ------------
 .. image:: https://raw.githubusercontent.com/MitchellAW/MitchellAW.github.io/refs/heads/master/images/nothing-at-all.gif

{compuglobal-0.3.7 → compuglobal-0.4.0}/compuglobal/__init__.py

@@ -11,16 +11,18 @@ from compuglobal.aio import (
 from compuglobal.errors import APIPageStatusError, NoSearchResultsFoundError
 from compuglobal.models.comic import ComicLayout, ComicOverlay, ComicPanel, ComicStrip
 from compuglobal.models.episode import Episode, EpisodeMetadata, EpisodeSummary
-from compuglobal.models.font import FontAlignment, FontColorRGB, FontFamily
+from compuglobal.models.font import FontAlignment, FontColor, FontFamily
 from compuglobal.models.frame import Frame, FrameResult
+from compuglobal.models.overlay import OverlayFormat
 from compuglobal.models.screencap import Screencap, ScreencapMoment
 from compuglobal.models.stream import Stream, StreamOverlay
 from compuglobal.models.subtitle import Subtitle
+from compuglobal.models.timestamp import Timestamp
 
 __title__ = "compuglobal"
 __author__ = "MitchellAW"
 __license__ = "MIT"
-__version__ = "0.3.7"
+__version__ = "0.4.0"
 
 __all__ = [
     "APIPageStatusError",
@@ -34,7 +36,7 @@ __all__ = [
     "EpisodeMetadata",
     "EpisodeSummary",
     "FontAlignment",
-    "FontColorRGB",
+    "FontColor",
     "FontFamily",
     "Frame",
     "FrameResult",
@@ -42,9 +44,11 @@ __all__ = [
     "MasterOfAllScience",
     "Morbotron",
     "NoSearchResultsFoundError",
+    "OverlayFormat",
     "Screencap",
     "ScreencapMoment",
     "Stream",
     "StreamOverlay",
     "Subtitle",
+    "Timestamp",
 ]

{compuglobal-0.3.7 → compuglobal-0.4.0}/compuglobal/aio.py

@@ -1,6 +1,8 @@
 """Used for interacting with and building CGHMC APIs."""
 
 import json
+import logging
+from typing import overload
 from warnings import deprecated
 
 import aiohttp
@@ -15,19 +17,44 @@ from compuglobal.models.comic import ComicPanel, ComicStrip
 from compuglobal.models.episode import Episode, EpisodeSummary
 from compuglobal.models.font import FontFamily
 from compuglobal.models.frame import Frame, FrameResult
+from compuglobal.models.overlay import OverlayFormat
 from compuglobal.models.screencap import Screencap, ScreencapMoment
 from compuglobal.models.stream import Stream
 from compuglobal.models.subtitle import Subtitle
 
+log = logging.getLogger(__name__)
+
 """Contains the async API Wrappers used for accessing all the cghmc API endpoints."""
 
 
 class AsyncCompuGlobalAPI:
-    """Represents a base API of the CGHMC family."""
+    """Represents a base API of the CGHMC family.
+
+    Parameters
+    ----------
+    session : aiohttp.ClientSession, optional
+        The client session to use for all API calls
+
+    Attributes
+    ----------
+    BASE_URL : str
+        The base url of the API
+    TITLE : str
+        The title of the API
+    DEFAULT_FORMAT : OverlayFormat
+        The default formatting to use in all comic/gif overlays
+    discovery : DiscoveryAPI
+        The discovery API with all discovery endpoints
+    media : MediaAPI
+        The media API with all media endpoints
+    metadata : MetadataAPI
+        The metadataAPI with all metadata endpoints
+
+    """
 
     BASE_URL: str
     TITLE: str
-    DEFAULT_FONT: FontFamily
+    DEFAULT_FORMAT: OverlayFormat
     _MAX_ALLOWED_SUBTITLES = 4
 
     discovery: DiscoveryAPI = DiscoveryAPI()
@@ -35,57 +62,31 @@ class AsyncCompuGlobalAPI:
     metadata: MetadataAPI = MetadataAPI()
 
     def __init__(self, session: aiohttp.ClientSession) -> None:
-        """Create an API using the given session and timeout.
-
-        Parameters
-        ----------
-        session : aiohttp.ClientSession | None, optional
-            The client session to use for all API calls
-
-        """
         self.client = CompuGlobalAPIClient(base_url=self.BASE_URL, session=session)
-        self.config = CompuGlobalAPIConfig(title=self.TITLE, default_font=self.DEFAULT_FONT)
+        self.config = CompuGlobalAPIConfig(title=self.TITLE, default_format=self.DEFAULT_FORMAT)
 
     async def get_screencap(
         self,
+        *,
         episode: str | None = None,
         timestamp: int | None = None,
-        frame: Frame | None = None,
     ) -> Screencap:
-        """Get the screencap for the given episode & timestamp, or a screencap of the Frame object.
+        """Get the screencap for the given episode & timestamp.
 
         Parameters
         ----------
-        episode : str, optional
+        episode : str | None, optional
             An episode key
-        timestamp : int, optional
+        timestamp : int | None, optional
             A timestamp of the screencap
-        frame : Frame, optional
-            A Frame object
 
         Returns
         -------
         Screencap
             The screencap for the given episode key and timestamp.
 
-        Raises
-        ------
-        TypeError
-            Must give only episode + timestamp, or a Frame object.
-
         """
-        if isinstance(episode, str) and isinstance(timestamp, int):
-            params = {"e": episode, "t": timestamp, "nearby": 1}
-
-        elif isinstance(frame, Frame):
-            params = {"e": frame.key, "t": frame.timestamp, "nearby": 1}
-
-        else:
-            invalid_args_error = (
-                f"Expected str and int or compuglobal.Frame, but received {type(episode)},"
-                f" {type(timestamp)} and {type(frame)} instead"
-            )
-            raise TypeError(invalid_args_error)
+        params = {"e": episode, "t": timestamp, "nearby": 1}
 
         request = self.discovery.CAPTION.build_request(self.client.base_url, query=params)
         caption = await self.client.handle_request(request)
@@ -103,14 +104,14 @@ class AsyncCompuGlobalAPI:
         ----------
         search_text : str
             The search text to query
-        season_minimum: int | None, optional
+        season_minimum : int | None, optional
             The minimum season allowed in the search results
-        season_maximum: int | None, optional
+        season_maximum : int | None, optional
             The maximum season allowed in the search results
 
         Returns
         -------
-        List[Frame]
+        list[FrameResult]
             A list of all frames found containing the search text.
 
         Raises
@@ -129,6 +130,13 @@ class AsyncCompuGlobalAPI:
         if len(search_results) > 0:
             return [FrameResult.model_validate(result) for result in search_results]
 
+        log.debug(
+            "No search results found | base_url=%s | search_text=%s | season_minimum=%s | season_maximum=%s",
+            self.BASE_URL,
+            search_text,
+            season_minimum,
+            season_maximum,
+        )
         raise NoSearchResultsFoundError
 
     async def search_for_screencap(
@@ -143,9 +151,9 @@ class AsyncCompuGlobalAPI:
         ----------
         search_text : str
             The search text to query
-        season_minimum: int | None, optional
+        season_minimum : int | None, optional
             The minimum season allowed in the search
-        season_maximum: int | None, optional
+        season_maximum : int | None, optional
             The maximum season allowed in the search
 
         Returns
@@ -156,7 +164,7 @@ class AsyncCompuGlobalAPI:
         """
         search_results = await self.search(search_text, season_minimum=season_minimum, season_maximum=season_maximum)
         result = search_results[0]
-        return await self.get_screencap(result.key, result.timestamp)
+        return await self.get_screencap(episode=result.key, timestamp=result.timestamp)
 
     async def get_random_screencap(
         self,
@@ -165,9 +173,16 @@ class AsyncCompuGlobalAPI:
     ) -> Screencap:
         """Get a random TV Show screencap.
 
+        Parameters
+        ----------
+        season_minimum : int | None, optional
+            Minimum season number allowed in random result
+        season_maximum : int | None, optional
+            Maximum season number allowed in random result
+
         Returns
         -------
-        compuglobal.Screencap
+        Screencap
             A random screencap object.
 
         """
@@ -208,7 +223,7 @@ class AsyncCompuGlobalAPI:
 
         Returns
         -------
-        List[Subtitle]
+        list[Subtitle]
             The list of subtitles
 
         """
@@ -222,7 +237,7 @@ class AsyncCompuGlobalAPI:
 
         Returns
         -------
-        List[ScreencapMoment]
+        list[ScreencapMoment]
             List of random screencap moments
 
         """
@@ -235,7 +250,7 @@ class AsyncCompuGlobalAPI:
 
         Returns
         -------
-        List[EpisodeSummary]
+        list[EpisodeSummary]
             A list of episode summaries
 
         """
@@ -248,18 +263,18 @@ class AsyncCompuGlobalAPI:
 
         Parameters
         ----------
-        key: str
+        key : str
             The episode key of the screencap.
-        timestamp: int
+        timestamp : int
             The timestamp of the screencap.
-        before: int
+        before : int
             The number of milliseconds before the timestamp.
-        after: int
+        after : int
             The number of milliseconds after the timestamp.
 
         Returns
         -------
-        list
+        list[Frame]
             A list of valid frames before and after the timestamp of
             the episode.
 
@@ -274,6 +289,11 @@ class AsyncCompuGlobalAPI:
     async def get_image_url(self, screencap: Screencap) -> str:
         """Get the direct image url for the screencap without any caption.
 
+        Parameters
+        ----------
+        screencap : Screencap
+            The screencap to use for generating the image url
+
         Returns
         -------
         str
@@ -283,15 +303,22 @@ class AsyncCompuGlobalAPI:
         path_params = {"key": screencap.frame.key, "timestamp": screencap.frame.timestamp}
         return self.media.IMAGE.build_encoded_url(self.client.base_url, path_params=path_params)
 
-    async def get_comic_panel_url(self, screencap: Screencap, subtitles: list[Subtitle] | None = None) -> str:
+    async def get_comic_panel_url(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | None = None,
+    ) -> str:
         """Get the URL for a single comic panel showing the given screencap with subtitles.
 
         Parameters
         ----------
         screencap : Screencap
             The screencap to use in the comic panel
-        subtitles : List[Subtitle], optional
+        subtitles : list[Subtitle] | None, optional
             A list of subtitles to overlay in the comic panel
+        overlay_format : OverlayFormat | None, optional
+            The formatting to use in the comic panel overlay (subtitle)
 
         Returns
         -------
@@ -299,25 +326,30 @@ class AsyncCompuGlobalAPI:
             The url of the comic panel
 
         """
-        if subtitles is None:
-            subtitles = screencap.subtitles
+        screencap, subtitles, overlay_format = self._resolve_overlay_inputs(screencap, subtitles, overlay_format)
 
-        screencap = screencap.model_copy(update={"subtitles": subtitles})
+        panel = ComicPanel.from_screencap(screencap=screencap, overlay_format=overlay_format)
 
-        panel = ComicPanel.from_screencap(screencap=screencap, font=self.config.default_font)
-
-        params = {"b64": panel.get_encoded()}
+        params = {"b64": panel.encoded}
         return self.media.COMIC_PANEL.build_encoded_url(self.client.base_url, query=params)
 
-    async def get_comic_strip_url(self, screencap: Screencap, subtitles: list[Subtitle] | None = None) -> str:
+    async def get_comic_strip_url(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | list[OverlayFormat] | None = None,
+    ) -> str:
         """Get the URL for a comic strip showing the given screencap with subtitles.
 
         Parameters
         ----------
         screencap : Screencap
             The screencap to use in the comic strip
-        subtitles : List[Subtitle], optional
+        subtitles : list[Subtitle] | None, optional
             The subtitles to overlay in the comic strip
+        overlay_format : OverlayFormat | list[OverlayFormat] | None, optional
+            The formatting to use in the comic strip overlays (subtitleS). See :meth:`OverlayFormat.normalise` for
+            full details on how formats are resolved.
 
         Returns
         -------
@@ -325,28 +357,63 @@ class AsyncCompuGlobalAPI:
             The url of the comic strip
 
         """
-        if subtitles is None:
-            subtitles = screencap.subtitles
+        screencap, subtitles, overlay_format = self._resolve_overlay_inputs(screencap, subtitles, overlay_format)
 
-        if len(subtitles) > self._MAX_ALLOWED_SUBTITLES:
-            subtitles = subtitles[: self._MAX_ALLOWED_SUBTITLES]
+        comic_strip = ComicStrip.from_screencap(screencap=screencap, overlay_format=overlay_format)
+        params = {"b64": comic_strip.encoded, "layout": comic_strip.layout}
+        return self.media.COMIC_STRIP.build_encoded_url(self.client.base_url, query=params)
 
-        # Change subtitles
-        screencap = screencap.model_copy(update={"subtitles": subtitles})
+    async def get_comic_maker_url(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | list[OverlayFormat] | None = None,
+    ) -> str:
+        """Get a url for making a comic with the given screencap, subtitles, and overlay format(s).
 
-        comic_strip = ComicStrip.from_screencap(screencap=screencap, font_family=self.config.default_font)
-        params = {"b64": comic_strip.get_encoded(), "layout": comic_strip.layout}
-        return self.media.COMIC_STRIP.build_encoded_url(self.client.base_url, query=params)
+        Parameters
+        ----------
+        screencap : Screencap
+            The screencap to make the comic with
+        subtitles : list[Subtitle] | None, optional
+            The subtitles to override in the comic maker, by default None
+        overlay_format : OverlayFormat | list[OverlayFormat] | None, optional
+            The subtitle/overlay formatting to override in the comic maker, by default None
+
+        Returns
+        -------
+        str
+            The url for making the comic
+
+        """
+        screencap, subtitles, overlay_format = self._resolve_overlay_inputs(screencap, subtitles, overlay_format)
+        path_params = {"key": screencap.frame.key, "timestamp": screencap.frame.timestamp}
+
+        strip = ComicStrip.from_screencap(screencap=screencap, overlay_format=overlay_format)
 
-    async def get_gif_url(self, screencap: Screencap, subtitles: list[Subtitle] | None = None) -> str:
+        return self.media.COMIC_MAKER.build_encoded_url(
+            base_url=self.BASE_URL,
+            path_params=path_params,
+            query={"b64": strip.encoded, "layout": strip.layout},
+        )
+
+    async def get_gif_url(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | list[OverlayFormat] | None = None,
+    ) -> str:
         """Get the URL for a gif of the given screencap with default or given subtitles.
 
         Parameters
         ----------
         screencap : Screencap
             The screencap to use for the gif
-        subtitles : List[Subtitle], optional
+        subtitles : list[Subtitle] | None, optional
             The subtitles to overlay in the gif
+        overlay_format : OverlayFormat | list[OverlayFormat] | None, optional
+            The formatting to use in the gif overlays (subtitles). See :meth:`OverlayFormat.normalise` for
+            full details on how formats are resolved.
 
         Returns
         -------
@@ -354,16 +421,9 @@ class AsyncCompuGlobalAPI:
             The URL of the gif, or a comic strip as a fallback if gif rendering fails.
 
         """
-        if subtitles is None:
-            subtitles = screencap.subtitles
+        screencap, subtitles, overlay_format = self._resolve_overlay_inputs(screencap, subtitles, overlay_format)
 
-        if len(subtitles) > self._MAX_ALLOWED_SUBTITLES:
-            subtitles = subtitles[: self._MAX_ALLOWED_SUBTITLES]
-
-        # Change subtitles
-        screencap = screencap.model_copy(update={"subtitles": subtitles})
-
-        stream = Stream.from_screencap(screencap=screencap, font_family=self.config.default_font)
+        stream = Stream.from_screencap(screencap=screencap, overlay_format=overlay_format)
 
         request = self.media.RENDER_GIF.build_request(self.client.base_url, body=stream)
         request.body = [request.body]
@@ -377,13 +437,93 @@ class AsyncCompuGlobalAPI:
 
         return await self.get_comic_strip_url(screencap)
 
+    async def get_gif_maker_url(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | list[OverlayFormat] | None = None,
+    ) -> str:
+        """Get a url for making a comic with the given screencap, subtitles, and overlay format(s).
+
+        Parameters
+        ----------
+        screencap : Screencap
+            The screencap to make the comic with
+        subtitles : list[Subtitle] | None, optional
+            The subtitles to override in the comic maker, by default None
+        overlay_format : OverlayFormat | list[OverlayFormat] | None, optional
+            The subtitle/overlay formatting to override in the comic maker, by default None
+
+        Returns
+        -------
+        str
+            The url for making the comic
+
+        """
+        screencap, subtitles, overlay_format = self._resolve_overlay_inputs(screencap, subtitles, overlay_format)
+
+        path_params = {
+            "key": screencap.frame.key,
+            "start_timestamp": screencap.start,
+            "end_timestamp": screencap.end,
+        }
+
+        stream = Stream.from_screencap(screencap=screencap, overlay_format=overlay_format)
+
+        return self.media.GIF_MAKER.build_encoded_url(
+            base_url=self.BASE_URL,
+            path_params=path_params,
+            query={"b64": stream.encoded},
+        )
+
+    @overload
+    def _resolve_overlay_inputs(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | None = None,
+    ) -> tuple[Screencap, list[Subtitle], OverlayFormat]: ...
+
+    @overload
+    def _resolve_overlay_inputs(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | list[OverlayFormat] | None = None,
+    ) -> tuple[Screencap, list[Subtitle], OverlayFormat | list[OverlayFormat]]: ...
+
+    def _resolve_overlay_inputs(
+        self,
+        screencap: Screencap,
+        subtitles: list[Subtitle] | None = None,
+        overlay_format: OverlayFormat | list[OverlayFormat] | None = None,
+    ) -> tuple[Screencap, list[Subtitle], OverlayFormat | list[OverlayFormat]]:
+
+        # Use default format if not given
+        overlay_format = overlay_format or self.config.default_format
+        if overlay_format != self.config.default_format:
+            log.debug("Using custom overlay format | screencap=%s | overlay_format=%s", screencap, overlay_format)
+
+        # Use screencap subtitles if not given
+        subtitles = subtitles or screencap.subtitles
+        if subtitles != screencap.subtitles:
+            log.debug("Using custom subtitles | screencap=%s | subtitles=%s", screencap, subtitles)
+
+        # Prevent too many subtitles being used
+        subtitles = subtitles[: self._MAX_ALLOWED_SUBTITLES]
+
+        # Change subtitles
+        screencap = screencap.model_copy(update={"subtitles": subtitles})
+
+        return screencap, subtitles, overlay_format
+
 
 class CapitalBeatUs(AsyncCompuGlobalAPI):
     """An API Wrapper for accessing CapitalBeatUs API endpoints (West Wing)."""
 
     BASE_URL = "https://capitalbeat.us"
     TITLE = "West Wing"
-    DEFAULT_FONT = FontFamily.IMPACT
+    DEFAULT_FORMAT = OverlayFormat(font_family=FontFamily.IMPACT)
 
 
 class Frinkiac(AsyncCompuGlobalAPI):
@@ -391,7 +531,7 @@ class Frinkiac(AsyncCompuGlobalAPI):
 
     BASE_URL = "https://frinkiac.com"
     TITLE = "Simpsons"
-    DEFAULT_FONT = FontFamily.AKBAR
+    DEFAULT_FORMAT = OverlayFormat(font_family=FontFamily.AKBAR)
 
 
 @deprecated("The MasterOfAllScience API is deprecated, and currently redirects to Frinkiac")
@@ -400,7 +540,7 @@ class MasterOfAllScience(AsyncCompuGlobalAPI):
 
     BASE_URL = "https://masterofallscience.com"
     TITLE = "Rick and Morty"
-    DEFAULT_FONT = FontFamily.IMPACT
+    DEFAULT_FORMAT = OverlayFormat(font_family=FontFamily.IMPACT)
 
 
 class Morbotron(AsyncCompuGlobalAPI):
@@ -408,4 +548,4 @@ class Morbotron(AsyncCompuGlobalAPI):
 
     BASE_URL = "https://morbotron.com"
     TITLE = "Futurama"
-    DEFAULT_FONT = FontFamily.FR_BOLD
+    DEFAULT_FORMAT = OverlayFormat(font_family=FontFamily.FR_BOLD)