compuglobal 0.3.2__tar.gz → 0.3.4__tar.gz

{compuglobal-0.3.2 → compuglobal-0.3.4}/.vscode/settings.json

@@ -16,5 +16,10 @@
     ],
     "files.trimTrailingWhitespace": true,
     "files.trimFinalNewlines": true,
-    "files.insertFinalNewline": true
+    "files.insertFinalNewline": true,
+    "workbench.colorCustomizations": {
+    "titleBar.activeBackground": "#003366",
+    "titleBar.activeForeground": "#ffffff",
+    "statusBar.background": "#003366"
+  }
 }

{compuglobal-0.3.2 → compuglobal-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: compuglobal
-Version: 0.3.2
+Version: 0.3.4
 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

{compuglobal-0.3.2 → compuglobal-0.3.4}/compuglobal/__init__.py

@@ -19,7 +19,7 @@ from .models.stream import StreamOverlay, Stream
 __title__ = "compuglobal"
 __author__ = "MitchellAW"
 __license__ = "MIT"
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 __all__ = [
     "APIPageStatusError",

{compuglobal-0.3.2 → compuglobal-0.3.4}/compuglobal/models/comic.py

@@ -53,14 +53,16 @@ class ComicOverlay(BaseModel, frozen=True):
     d: int = Field(alias="d", description="Duration (unused)", default=0)
 
     @classmethod
-    def from_subtitles(cls, *, subtitles: List[Subtitle], font_family: FontFamily) -> "ComicOverlay":
+    def from_subtitles(
+        cls, *, subtitles: List[Subtitle], font_family: FontFamily = FontFamily.IMPACT
+    ) -> "ComicOverlay":
         """Builds a comic overlay using a list of Subtitles.
 
         Parameters
         ----------
         subtitles : List[Subtitle]
             A list of subtitles
-        font_family : FontFamily
+        font_family : FontFamily, optional
             The family of font to use for the new overlay.
 
         Returns
@@ -110,7 +112,7 @@ class ComicPanel(BaseModel, frozen=True):
         return cls(e=screencap.frame.key, ts=screencap.frame.timestamp, o=overlays)
 
     def get_encoded(self) -> str:
-        """get_encoded Gets the base 64 encoded representation of this panel
+        """Gets the base 64 encoded representation of this panel
 
         Returns
         -------
@@ -125,7 +127,7 @@ class ComicPanel(BaseModel, frozen=True):
 
 
 class ComicStrip(BaseModel):
-    """ComicStrip _summary_
+    """A comic strip composed of multiple comic panels in a given layout.
 
     Attributes
     ----------
@@ -159,9 +161,10 @@ class ComicStrip(BaseModel):
         panels = [
             ComicPanel(
                 e=screencap.frame.key,
-                ts=screencap.frame.timestamp,
-                o=cls.build_comic_overlays(screencap.subtitles, font_family=font_family),
+                ts=subtitle.representative_timestamp,
+                o=cls.build_comic_overlays([subtitle], font_family=font_family),
             )
+            for subtitle in screencap.subtitles
         ]
 
         return cls(panels=panels)

{compuglobal-0.3.2 → compuglobal-0.3.4}/compuglobal/models/episode.py

@@ -60,12 +60,12 @@ class EpisodeSummary(BaseModel, frozen=True):
         A list of 20 frame IDs distributed throughout the episode.
     """
 
-    key: str
-    season: int
-    episode_number: int
-    title: str
-    original_air_date: str
-    frames: List[int]
+    key: str = Field(alias="Key")
+    season: int = Field(alias="Season")
+    episode_number: int = Field(alias="EpisodeNumber")
+    title: str = Field(alias="Title")
+    original_air_date: str = Field(alias="OriginalAirDate")
+    frames: List[int] = Field(alias="Frames")
 
 
 class Episode(BaseModel, frozen=True):

{compuglobal-0.3.2 → compuglobal-0.3.4}/docs/conf.py

@@ -1,3 +1,5 @@
+from compuglobal import __version__
+
 # Configuration file for the Sphinx documentation builder.
 #
 # For the full list of built-in configuration values, see the documentation:
@@ -9,7 +11,7 @@
 project = "compuglobal"
 copyright = "2018, MitchellAW"
 author = "MitchellAW"
-release = "0.3.2"
+release = __version__
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

{compuglobal-0.3.2 → compuglobal-0.3.4}/examples/basic_example.py

@@ -13,29 +13,35 @@ async def main():
     frinkiac = compuglobal.Frinkiac()
 
     # Getting a screencap from The Simpsons using search terms
-    searched_screencap = await frinkiac.search_for_screencap("Stupid Sexy Flanders")
-    print(searched_screencap)
+    searched_screencap = await frinkiac.search_for_screencap("garbage water")
+    print(f"Screencap:\n{searched_screencap}\n")
 
     # Getting a random screencap from The Simpsons
     random_screencap = await frinkiac.get_random_screencap()
 
     # Gets the image of the screencap without any captions
     image = await frinkiac.get_image_url(random_screencap)
-    print(image)
+    print(f"Image url:\n{image}\n")
 
     # Gets the image of the screencap with captions matching the quotes of the
     # screencap embedded in the image
-    comic_panel = await frinkiac.get_comic_panel_url(random_screencap)
-    print(comic_panel)
+    comic_panel = await frinkiac.get_comic_panel_url(searched_screencap)
+    print(f"Custom comic panel:\n{comic_panel}\n")
 
     # Gets a comic strip with mulitple screencaps and captions matching the quotes
     # of each screencap in the image
-    comic_strip = await frinkiac.get_comic_strip_url(random_screencap)
-    print(comic_strip)
+    comic_strip = await frinkiac.get_comic_strip_url(searched_screencap)
+    print(f"Custom comic strip:\n{comic_strip}\n")
 
     # Gets the gif of the screencap with captions embedded
     gif = await frinkiac.get_gif_url(searched_screencap)
-    print(gif)
+    print(f"Custom gif:\n{gif}\n")
+
+    navigator = await frinkiac.navigator()
+    print(f"Navigator returned {len(navigator)} episodes.\n")
+
+    discover = await frinkiac.discover()
+    print(f"Discover returned {len(discover)} results.\n")
 
     # Close API Client
     await frinkiac.close()