From 53db79ab2922a469177866adf460a66966c62254 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 21:39:18 +0000 Subject: [PATCH] fixup: Format Python code with Black --- GUI.py | 7 +- TTS/TikTok.py | 4 +- TTS/aws_polly.py | 4 +- TTS/elevenlabs.py | 8 +- TTS/engine_wrapper.py | 24 ++--- TTS/pyttsx.py | 4 +- TTS/streamlabs_polly.py | 4 +- main.py | 17 ++-- reddit/subreddit.py | 25 ++--- utils/ai_methods.py | 20 +--- utils/console.py | 17 +--- utils/ffmpeg_install.py | 8 +- utils/gui_utils.py | 22 +---- utils/imagenarator.py | 8 +- utils/playwright.py | 4 +- utils/settings.py | 32 ++----- utils/subreddit.py | 19 +--- utils/thumbnail.py | 12 +-- utils/videos.py | 8 +- utils/voice.py | 4 +- video_creation/background.py | 12 +-- video_creation/final_video.py | 122 ++++++------------------ video_creation/screenshot_downloader.py | 40 ++------ video_creation/voices.py | 14 +-- 24 files changed, 109 insertions(+), 330 deletions(-) diff --git a/GUI.py b/GUI.py index c230f6c..01fe90d 100644 --- a/GUI.py +++ b/GUI.py @@ -3,8 +3,7 @@ from pathlib import Path # Used "tomlkit" instead of "toml" because it doesn't change formatting on "dump" import tomlkit -from flask import (Flask, redirect, render_template, request, - send_from_directory, url_for) +from flask import Flask, redirect, render_template, request, send_from_directory, url_for import utils.gui_utils as gui @@ -76,9 +75,7 @@ def settings(): # Change settings config = gui.modify_settings(data, config_load, checks) - return render_template( - "settings.html", file="config.toml", data=config, checks=checks - ) + return render_template("settings.html", file="config.toml", data=config, checks=checks) # Make videos.json accessible diff --git a/TTS/TikTok.py b/TTS/TikTok.py index f947732..23d2918 100644 --- a/TTS/TikTok.py +++ b/TTS/TikTok.py @@ -86,9 +86,7 @@ class TikTok: "Cookie": f"sessionid={settings.config['settings']['tts']['tiktok_sessionid']}", } - self.URI_BASE = ( - "https://api16-normal-c-useast1a.tiktokv.com/media/api/text/speech/invoke/" - ) + self.URI_BASE = "https://api16-normal-c-useast1a.tiktokv.com/media/api/text/speech/invoke/" self.max_chars = 200 self._session = requests.Session() diff --git a/TTS/aws_polly.py b/TTS/aws_polly.py index 58323f9..4d55860 100644 --- a/TTS/aws_polly.py +++ b/TTS/aws_polly.py @@ -41,9 +41,7 @@ class AWSPolly: raise ValueError( f"Please set the TOML variable AWS_VOICE to a valid voice. options are: {voices}" ) - voice = str( - settings.config["settings"]["tts"]["aws_polly_voice"] - ).capitalize() + voice = str(settings.config["settings"]["tts"]["aws_polly_voice"]).capitalize() try: # Request speech synthesis response = polly.synthesize_speech( diff --git a/TTS/elevenlabs.py b/TTS/elevenlabs.py index 4b3c2d6..e896621 100644 --- a/TTS/elevenlabs.py +++ b/TTS/elevenlabs.py @@ -17,13 +17,9 @@ class elevenlabs: if random_voice: voice = self.randomvoice() else: - voice = str( - settings.config["settings"]["tts"]["elevenlabs_voice_name"] - ).capitalize() + voice = str(settings.config["settings"]["tts"]["elevenlabs_voice_name"]).capitalize() - audio = self.client.generate( - text=text, voice=voice, model="eleven_multilingual_v1" - ) + audio = self.client.generate(text=text, voice=voice, model="eleven_multilingual_v1") save(audio=audio, filename=filepath) def initialize(self): diff --git a/TTS/engine_wrapper.py b/TTS/engine_wrapper.py index f7a08f5..6d498d2 100644 --- a/TTS/engine_wrapper.py +++ b/TTS/engine_wrapper.py @@ -14,7 +14,9 @@ from utils import settings from utils.console import print_step, print_substep from utils.voice import sanitize_text -DEFAULT_MAX_LENGTH: int = 50 # Video length variable, edit this on your own risk. It should work, but it's not supported +DEFAULT_MAX_LENGTH: int = ( + 50 # Video length variable, edit this on your own risk. It should work, but it's not supported +) class TTSEngine: @@ -56,9 +58,7 @@ class TTSEngine: comment["comment_body"] = re.sub(regex_urls, " ", comment["comment_body"]) comment["comment_body"] = comment["comment_body"].replace("\n", ". ") comment["comment_body"] = re.sub(r"\bAI\b", "A.I", comment["comment_body"]) - comment["comment_body"] = re.sub( - r"\bAGI\b", "A.G.I", comment["comment_body"] - ) + comment["comment_body"] = re.sub(r"\bAGI\b", "A.G.I", comment["comment_body"]) if comment["comment_body"][-1] != ".": comment["comment_body"] += "." comment["comment_body"] = comment["comment_body"].replace(". . .", ".") @@ -80,17 +80,13 @@ class TTSEngine: if len(self.reddit_object["thread_post"]) > self.tts_module.max_chars: self.split_post(self.reddit_object["thread_post"], "postaudio") else: - self.call_tts( - "postaudio", process_text(self.reddit_object["thread_post"]) - ) + self.call_tts("postaudio", process_text(self.reddit_object["thread_post"])) elif settings.config["settings"]["storymodemethod"] == 1: for idx, text in track(enumerate(self.reddit_object["thread_post"])): self.call_tts(f"postaudio-{idx}", process_text(text)) else: - for idx, comment in track( - enumerate(self.reddit_object["comments"]), "Saving..." - ): + for idx, comment in track(enumerate(self.reddit_object["comments"]), "Saving..."): # ! Stop creating mp3 files if the length is greater than max length. if self.length > self.max_length and idx > 1: self.length -= self.last_clip_length @@ -173,9 +169,7 @@ class TTSEngine: fps=44100, ) silence = volumex(silence, 0) - silence.write_audiofile( - f"{self.path}/silence.mp3", fps=44100, verbose=False, logger=None - ) + silence.write_audiofile(f"{self.path}/silence.mp3", fps=44100, verbose=False, logger=None) def process_text(text: str, clean: bool = True): @@ -183,8 +177,6 @@ def process_text(text: str, clean: bool = True): new_text = sanitize_text(text) if clean else text if lang: print_substep("Translating Text...") - translated_text = translators.translate_text( - text, translator="google", to_language=lang - ) + translated_text = translators.translate_text(text, translator="google", to_language=lang) new_text = sanitize_text(translated_text) return new_text diff --git a/TTS/pyttsx.py b/TTS/pyttsx.py index a80bf2d..bf47601 100644 --- a/TTS/pyttsx.py +++ b/TTS/pyttsx.py @@ -21,9 +21,7 @@ class pyttsx: if voice_id == "" or voice_num == "": voice_id = 2 voice_num = 3 - raise ValueError( - "set pyttsx values to a valid value, switching to defaults" - ) + raise ValueError("set pyttsx values to a valid value, switching to defaults") else: voice_id = int(voice_id) voice_num = int(voice_num) diff --git a/TTS/streamlabs_polly.py b/TTS/streamlabs_polly.py index f59626d..1541fac 100644 --- a/TTS/streamlabs_polly.py +++ b/TTS/streamlabs_polly.py @@ -42,9 +42,7 @@ class StreamlabsPolly: raise ValueError( f"Please set the config variable STREAMLABS_POLLY_VOICE to a valid voice. options are: {voices}" ) - voice = str( - settings.config["settings"]["tts"]["streamlabs_polly_voice"] - ).capitalize() + voice = str(settings.config["settings"]["tts"]["streamlabs_polly_voice"]).capitalize() body = {"voice": voice, "text": text, "service": "polly"} headers = {"Referer": "https://streamlabs.com/"} diff --git a/main.py b/main.py index 3470fbc..a2abddf 100755 --- a/main.py +++ b/main.py @@ -15,13 +15,14 @@ from utils.console import print_markdown, print_step, print_substep from utils.ffmpeg_install import ffmpeg_install from utils.id import id from utils.version import checkversion -from video_creation.background import (chop_background, - download_background_audio, - download_background_video, - get_background_config) +from video_creation.background import ( + chop_background, + download_background_audio, + download_background_video, + get_background_config, +) from video_creation.final_video import make_final_video -from video_creation.screenshot_downloader import \ - get_screenshots_of_reddit_posts +from video_creation.screenshot_downloader import get_screenshots_of_reddit_posts from video_creation.voices import save_text_to_mp3 __VERSION__ = "3.2.1" @@ -101,9 +102,7 @@ if __name__ == "__main__": sys.exit() try: if config["reddit"]["thread"]["post_id"]: - for index, post_id in enumerate( - config["reddit"]["thread"]["post_id"].split("+") - ): + for index, post_id in enumerate(config["reddit"]["thread"]["post_id"].split("+")): index += 1 print_step( f'on the {index}{("st" if index % 10 == 1 else ("nd" if index % 10 == 2 else ("rd" if index % 10 == 3 else "th")))} post of {len(config["reddit"]["thread"]["post_id"].split("+"))}' diff --git a/reddit/subreddit.py b/reddit/subreddit.py index fcf85f3..5f2ac5f 100644 --- a/reddit/subreddit.py +++ b/reddit/subreddit.py @@ -22,9 +22,7 @@ def get_subreddit_threads(POST_ID: str): content = {} if settings.config["reddit"]["creds"]["2fa"]: - print( - "\nEnter your two-factor authentication code from your authenticator app.\n" - ) + print("\nEnter your two-factor authentication code from your authenticator app.\n") code = input("> ") print() pw = settings.config["reddit"]["creds"]["password"] @@ -57,9 +55,7 @@ def get_subreddit_threads(POST_ID: str): ]: # note to user. you can have multiple subreddits via reddit.subreddit("redditdev+learnpython") try: subreddit = reddit.subreddit( - re.sub( - r"r\/", "", input("What subreddit would you like to pull from? ") - ) + re.sub(r"r\/", "", input("What subreddit would you like to pull from? ")) # removes the r/ from the input ) except ValueError: @@ -69,9 +65,7 @@ def get_subreddit_threads(POST_ID: str): sub = settings.config["reddit"]["thread"]["subreddit"] print_substep(f"Using subreddit: r/{sub} from TOML config") subreddit_choice = sub - if ( - str(subreddit_choice).casefold().startswith("r/") - ): # removes the r/ from the input + if str(subreddit_choice).casefold().startswith("r/"): # removes the r/ from the input subreddit_choice = subreddit_choice[2:] subreddit = reddit.subreddit(subreddit_choice) @@ -82,12 +76,8 @@ def get_subreddit_threads(POST_ID: str): settings.config["reddit"]["thread"]["post_id"] and len(str(settings.config["reddit"]["thread"]["post_id"]).split("+")) == 1 ): - submission = reddit.submission( - id=settings.config["reddit"]["thread"]["post_id"] - ) - elif settings.config["ai"][ - "ai_similarity_enabled" - ]: # ai sorting based on comparison + submission = reddit.submission(id=settings.config["reddit"]["thread"]["post_id"]) + elif settings.config["ai"]["ai_similarity_enabled"]: # ai sorting based on comparison threads = subreddit.hot(limit=50) keywords = settings.config["ai"]["ai_similarity_keywords"].split(",") keywords = [keyword.strip() for keyword in keywords] @@ -105,10 +95,7 @@ def get_subreddit_threads(POST_ID: str): if submission is None: return get_subreddit_threads(POST_ID) # submission already done. rerun - elif ( - not submission.num_comments - and settings.config["settings"]["storymode"] == "false" - ): + elif not submission.num_comments and settings.config["settings"]["storymode"] == "false": print_substep("No comments found. Skipping.") exit() diff --git a/utils/ai_methods.py b/utils/ai_methods.py index 8c3fbf1..e628942 100644 --- a/utils/ai_methods.py +++ b/utils/ai_methods.py @@ -5,12 +5,8 @@ from transformers import AutoModel, AutoTokenizer # Mean Pooling - Take attention mask into account for correct averaging def mean_pooling(model_output, attention_mask): - token_embeddings = model_output[ - 0 - ] # First element of model_output contains all token embeddings - input_mask_expanded = ( - attention_mask.unsqueeze(-1).expand(token_embeddings.size()).float() - ) + token_embeddings = model_output[0] # First element of model_output contains all token embeddings + input_mask_expanded = attention_mask.unsqueeze(-1).expand(token_embeddings.size()).float() return torch.sum(token_embeddings * input_mask_expanded, 1) / torch.clamp( input_mask_expanded.sum(1), min=1e-9 ) @@ -36,19 +32,13 @@ def sort_by_similarity(thread_objects, keywords): ) with torch.no_grad(): threads_embeddings = model(**encoded_threads) - threads_embeddings = mean_pooling( - threads_embeddings, encoded_threads["attention_mask"] - ) + threads_embeddings = mean_pooling(threads_embeddings, encoded_threads["attention_mask"]) # Keywords inference - encoded_keywords = tokenizer( - keywords, padding=True, truncation=True, return_tensors="pt" - ) + encoded_keywords = tokenizer(keywords, padding=True, truncation=True, return_tensors="pt") with torch.no_grad(): keywords_embeddings = model(**encoded_keywords) - keywords_embeddings = mean_pooling( - keywords_embeddings, encoded_keywords["attention_mask"] - ) + keywords_embeddings = mean_pooling(keywords_embeddings, encoded_keywords["attention_mask"]) # Compare every keyword w/ every thread embedding threads_embeddings_tensor = torch.tensor(threads_embeddings) diff --git a/utils/console.py b/utils/console.py index 7ac8a70..18c3248 100644 --- a/utils/console.py +++ b/utils/console.py @@ -49,10 +49,7 @@ def handle_input( optional=False, ): if optional: - console.print( - message - + "\n[green]This is an optional value. Do you want to skip it? (y/n)" - ) + console.print(message + "\n[green]This is an optional value. Do you want to skip it? (y/n)") if input().casefold().startswith("y"): return default if default is not NotImplemented else "" if default is not NotImplemented: @@ -86,11 +83,7 @@ def handle_input( console.print("[red]" + err_message) continue elif match != "" and re.match(match, user_input) is None: - console.print( - "[red]" - + err_message - + "\nAre you absolutely sure it's correct?(y/n)" - ) + console.print("[red]" + err_message + "\nAre you absolutely sure it's correct?(y/n)") if input().casefold().startswith("y"): break continue @@ -123,9 +116,5 @@ def handle_input( if user_input in options: return user_input console.print( - "[red bold]" - + err_message - + "\nValid options are: " - + ", ".join(map(str, options)) - + "." + "[red bold]" + err_message + "\nValid options are: " + ", ".join(map(str, options)) + "." ) diff --git a/utils/ffmpeg_install.py b/utils/ffmpeg_install.py index b29301f..b2c673d 100644 --- a/utils/ffmpeg_install.py +++ b/utils/ffmpeg_install.py @@ -7,7 +7,9 @@ import requests def ffmpeg_install_windows(): try: - ffmpeg_url = "https://github.com/GyanD/codexffmpeg/releases/download/6.0/ffmpeg-6.0-full_build.zip" + ffmpeg_url = ( + "https://github.com/GyanD/codexffmpeg/releases/download/6.0/ffmpeg-6.0-full_build.zip" + ) ffmpeg_zip_filename = "ffmpeg.zip" ffmpeg_extracted_folder = "ffmpeg" @@ -127,9 +129,7 @@ def ffmpeg_install(): elif os.name == "mac": ffmpeg_install_mac() else: - print( - "Your OS is not supported. Please install FFmpeg manually and try again." - ) + print("Your OS is not supported. Please install FFmpeg manually and try again.") exit() else: print("Please install FFmpeg manually and try again.") diff --git a/utils/gui_utils.py b/utils/gui_utils.py index 9d644d8..f683adf 100644 --- a/utils/gui_utils.py +++ b/utils/gui_utils.py @@ -67,11 +67,7 @@ def check(value, checks): and not hasattr(value, "__iter__") and ( ("nmin" in checks and checks["nmin"] is not None and value < checks["nmin"]) - or ( - "nmax" in checks - and checks["nmax"] is not None - and value > checks["nmax"] - ) + or ("nmax" in checks and checks["nmax"] is not None and value > checks["nmax"]) ) ): incorrect = True @@ -80,16 +76,8 @@ def check(value, checks): not incorrect and hasattr(value, "__iter__") and ( - ( - "nmin" in checks - and checks["nmin"] is not None - and len(value) < checks["nmin"] - ) - or ( - "nmax" in checks - and checks["nmax"] is not None - and len(value) > checks["nmax"] - ) + ("nmin" in checks and checks["nmin"] is not None and len(value) < checks["nmin"]) + or ("nmax" in checks and checks["nmax"] is not None and len(value) > checks["nmax"]) ) ): incorrect = True @@ -162,9 +150,7 @@ def delete_background(key): # Add background video def add_background(youtube_uri, filename, citation, position): # Validate YouTube URI - regex = re.compile(r"(?:\/|%3D|v=|vi=)([0-9A-z\-_]{11})(?:[%#?&]|$)").search( - youtube_uri - ) + regex = re.compile(r"(?:\/|%3D|v=|vi=)([0-9A-z\-_]{11})(?:[%#?&]|$)").search(youtube_uri) if not regex: flash("YouTube URI is invalid!", "error") diff --git a/utils/imagenarator.py b/utils/imagenarator.py index e26f9e7..509882d 100644 --- a/utils/imagenarator.py +++ b/utils/imagenarator.py @@ -19,9 +19,7 @@ def draw_multiple_line_text( font_height = getheight(font, text) image_width, image_height = image.size lines = textwrap.wrap(text, width=wrap) - y = (image_height / 2) - ( - ((font_height + (len(lines) * padding) / len(lines)) * len(lines)) / 2 - ) + y = (image_height / 2) - (((font_height + (len(lines) * padding) / len(lines)) * len(lines)) / 2) for line in lines: line_width, line_height = getsize(font, line) if transparent: @@ -73,7 +71,5 @@ def imagemaker(theme, reddit_obj: dict, txtclr, padding=5, transparent=False) -> for idx, text in track(enumerate(texts), "Rendering Image"): image = Image.new("RGBA", size, theme) text = process_text(text, False) - draw_multiple_line_text( - image, text, font, txtclr, padding, wrap=30, transparent=transparent - ) + draw_multiple_line_text(image, text, font, txtclr, padding, wrap=30, transparent=transparent) image.save(f"assets/temp/{id}/png/img{idx}.png") diff --git a/utils/playwright.py b/utils/playwright.py index be046e6..9672f03 100644 --- a/utils/playwright.py +++ b/utils/playwright.py @@ -1,7 +1,5 @@ def clear_cookie_by_name(context, cookie_cleared_name): cookies = context.cookies() - filtered_cookies = [ - cookie for cookie in cookies if cookie["name"] != cookie_cleared_name - ] + filtered_cookies = [cookie for cookie in cookies if cookie["name"] != cookie_cleared_name] context.clear_cookies() context.add_cookies(filtered_cookies) diff --git a/utils/settings.py b/utils/settings.py index 2a91723..2ebaef3 100755 --- a/utils/settings.py +++ b/utils/settings.py @@ -53,11 +53,7 @@ def check(value, checks, name): and not hasattr(value, "__iter__") and ( ("nmin" in checks and checks["nmin"] is not None and value < checks["nmin"]) - or ( - "nmax" in checks - and checks["nmax"] is not None - and value > checks["nmax"] - ) + or ("nmax" in checks and checks["nmax"] is not None and value > checks["nmax"]) ) ): incorrect = True @@ -65,16 +61,8 @@ def check(value, checks, name): not incorrect and hasattr(value, "__iter__") and ( - ( - "nmin" in checks - and checks["nmin"] is not None - and len(value) < checks["nmin"] - ) - or ( - "nmax" in checks - and checks["nmax"] is not None - and len(value) > checks["nmax"] - ) + ("nmin" in checks and checks["nmin"] is not None and len(value) < checks["nmin"]) + or ("nmax" in checks and checks["nmax"] is not None and len(value) > checks["nmax"]) ) ): incorrect = True @@ -82,15 +70,9 @@ def check(value, checks, name): if incorrect: value = handle_input( message=( - ( - ("[blue]Example: " + str(checks["example"]) + "\n") - if "example" in checks - else "" - ) + (("[blue]Example: " + str(checks["example"]) + "\n") if "example" in checks else "") + "[red]" - + ("Non-optional ", "Optional ")[ - "optional" in checks and checks["optional"] is True - ] + + ("Non-optional ", "Optional ")["optional" in checks and checks["optional"] is True] ) + "[#C0CAF5 bold]" + str(name) @@ -131,9 +113,7 @@ def check_toml(template_file, config_file) -> Tuple[bool, Dict]: try: template = toml.load(template_file) except Exception as error: - console.print( - f"[red bold]Encountered error when trying to to load {template_file}: {error}" - ) + console.print(f"[red bold]Encountered error when trying to to load {template_file}: {error}") return False try: config = toml.load(config_file) diff --git a/utils/subreddit.py b/utils/subreddit.py index a3732f6..403b6d3 100644 --- a/utils/subreddit.py +++ b/utils/subreddit.py @@ -6,9 +6,7 @@ from utils.ai_methods import sort_by_similarity from utils.console import print_substep -def get_subreddit_undone( - submissions: list, subreddit, times_checked=0, similarity_scores=None -): +def get_subreddit_undone(submissions: list, subreddit, times_checked=0, similarity_scores=None): """_summary_ Args: @@ -20,9 +18,7 @@ def get_subreddit_undone( """ # Second try of getting a valid Submission if times_checked and settings.config["ai"]["ai_similarity_enabled"]: - print( - "Sorting based on similarity for a different date filter and thread limit.." - ) + print("Sorting based on similarity for a different date filter and thread limit..") submissions = sort_by_similarity( submissions, keywords=settings.config["ai"]["ai_similarity_enabled"] ) @@ -31,9 +27,7 @@ def get_subreddit_undone( if not exists("./video_creation/data/videos.json"): with open("./video_creation/data/videos.json", "w+") as f: json.dump([], f) - with open( - "./video_creation/data/videos.json", "r", encoding="utf-8" - ) as done_vids_raw: + with open("./video_creation/data/videos.json", "r", encoding="utf-8") as done_vids_raw: done_videos = json.load(done_vids_raw) for i, submission in enumerate(submissions): if already_done(done_videos, submission): @@ -49,8 +43,7 @@ def get_subreddit_undone( print_substep("This post was pinned by moderators. Skipping...") continue if ( - submission.num_comments - <= int(settings.config["reddit"]["thread"]["min_comments"]) + submission.num_comments <= int(settings.config["reddit"]["thread"]["min_comments"]) and not settings.config["settings"]["storymode"] ): print_substep( @@ -59,9 +52,7 @@ def get_subreddit_undone( continue if settings.config["settings"]["storymode"]: if not submission.selftext: - print_substep( - "You are trying to use story mode on post with no post text" - ) + print_substep("You are trying to use story mode on post with no post text") continue else: # Check for the length of the post text diff --git a/utils/thumbnail.py b/utils/thumbnail.py index aeb82b4..172b454 100644 --- a/utils/thumbnail.py +++ b/utils/thumbnail.py @@ -1,15 +1,11 @@ from PIL import ImageDraw, ImageFont -def create_thumbnail( - thumbnail, font_family, font_size, font_color, width, height, title -): +def create_thumbnail(thumbnail, font_family, font_size, font_color, width, height, title): font = ImageFont.truetype(font_family + ".ttf", font_size) Xaxis = width - (width * 0.2) # 20% of the width sizeLetterXaxis = font_size * 0.5 # 50% of the font size - XaxisLetterQty = round( - Xaxis / sizeLetterXaxis - ) # Quantity of letters that can fit in the X axis + XaxisLetterQty = round(Xaxis / sizeLetterXaxis) # Quantity of letters that can fit in the X axis MarginYaxis = height * 0.12 # 12% of the height MarginXaxis = width * 0.05 # 5% of the width # 1.1 rem @@ -34,8 +30,6 @@ def create_thumbnail( # loop for put the title in the thumbnail for i in range(0, len(arrayTitle)): # 1.1 rem - draw.text( - (MarginXaxis, MarginYaxis + (LineHeight * i)), arrayTitle[i], rgb, font=font - ) + draw.text((MarginXaxis, MarginYaxis + (LineHeight * i)), arrayTitle[i], rgb, font=font) return thumbnail diff --git a/utils/videos.py b/utils/videos.py index c30cb2c..7c756fc 100755 --- a/utils/videos.py +++ b/utils/videos.py @@ -19,9 +19,7 @@ def check_done( Returns: Submission|None: Reddit object in args """ - with open( - "./video_creation/data/videos.json", "r", encoding="utf-8" - ) as done_vids_raw: + with open("./video_creation/data/videos.json", "r", encoding="utf-8") as done_vids_raw: done_videos = json.load(done_vids_raw) for video in done_videos: if video["id"] == str(redditobj): @@ -35,9 +33,7 @@ def check_done( return redditobj -def save_data( - subreddit: str, filename: str, reddit_title: str, reddit_id: str, credit: str -): +def save_data(subreddit: str, filename: str, reddit_title: str, reddit_id: str, credit: str): """Saves the videos that have already been generated to a JSON file in video_creation/data/videos.json Args: diff --git a/utils/voice.py b/utils/voice.py index 9bc09d8..56595fc 100644 --- a/utils/voice.py +++ b/utils/voice.py @@ -43,9 +43,7 @@ def sleep_until(time) -> None: if sys.version_info[0] >= 3 and time.tzinfo: end = time.astimezone(timezone.utc).timestamp() else: - zoneDiff = ( - pytime.time() - (datetime.now() - datetime(1970, 1, 1)).total_seconds() - ) + zoneDiff = pytime.time() - (datetime.now() - datetime(1970, 1, 1)).total_seconds() end = (time - datetime(1970, 1, 1)).total_seconds() + zoneDiff # Type check diff --git a/video_creation/background.py b/video_creation/background.py index dc26395..43be69a 100644 --- a/video_creation/background.py +++ b/video_creation/background.py @@ -60,9 +60,7 @@ def get_start_and_end_times(video_length: int, length_of_clip: int) -> Tuple[int def get_background_config(mode: str): """Fetch the background/s configuration""" try: - choice = str( - settings.config["settings"]["background"][f"background_{mode}"] - ).casefold() + choice = str(settings.config["settings"]["background"][f"background_{mode}"]).casefold() except AttributeError: print_substep("No background selected. Picking random background'") choice = None @@ -122,9 +120,7 @@ def download_background_audio(background_config: Tuple[str, str, str]): print_substep("Background audio downloaded successfully! 🎉", style="bold green") -def chop_background( - background_config: Dict[str, Tuple], video_length: int, reddit_object: dict -): +def chop_background(background_config: Dict[str, Tuple], video_length: int, reddit_object: dict): """Generates the background audio and footage to be used in the video and writes it to assets/temp/background.mp3 and assets/temp/background.mp4 Args: @@ -137,9 +133,7 @@ def chop_background( print_step("Volume was set to 0. Skipping background audio creation . . .") else: print_step("Finding a spot in the backgrounds audio to chop...✂️") - audio_choice = ( - f"{background_config['audio'][2]}-{background_config['audio'][1]}" - ) + audio_choice = f"{background_config['audio'][2]}-{background_config['audio'][1]}" background_audio = AudioFileClip(f"assets/backgrounds/audio/{audio_choice}") start_time_audio, end_time_audio = get_start_and_end_times( video_length, background_audio.duration diff --git a/video_creation/final_video.py b/video_creation/final_video.py index d071d00..101d0f7 100644 --- a/video_creation/final_video.py +++ b/video_creation/final_video.py @@ -77,9 +77,7 @@ def name_normalize(name: str) -> str: lang = settings.config["reddit"]["thread"]["post_lang"] if lang: print_substep("Translating filename...") - translated_name = translators.translate_text( - name, translator="google", to_language=lang - ) + translated_name = translators.translate_text(name, translator="google", to_language=lang) return translated_name else: return name @@ -118,10 +116,7 @@ def create_fancy_thumbnail(image, text, text_color, padding, wrap=35): lines = textwrap.wrap(text, width=wrap) y = ( (image_height / 2) - - ( - ((getheight(font, text) + (len(lines) * padding) / len(lines)) * len(lines)) - / 2 - ) + - (((getheight(font, text) + (len(lines) * padding) / len(lines)) * len(lines)) / 2) + 30 ) draw = ImageDraw.Draw(image) @@ -138,52 +133,28 @@ def create_fancy_thumbnail(image, text, text_color, padding, wrap=35): if len(lines) == 3: lines = textwrap.wrap(text, width=wrap + 10) font_title_size = 40 - font = ImageFont.truetype( - os.path.join("fonts", "Roboto-Bold.ttf"), font_title_size - ) + font = ImageFont.truetype(os.path.join("fonts", "Roboto-Bold.ttf"), font_title_size) y = ( (image_height / 2) - - ( - ( - (getheight(font, text) + (len(lines) * padding) / len(lines)) - * len(lines) - ) - / 2 - ) + - (((getheight(font, text) + (len(lines) * padding) / len(lines)) * len(lines)) / 2) + 35 ) elif len(lines) == 4: lines = textwrap.wrap(text, width=wrap + 10) font_title_size = 35 - font = ImageFont.truetype( - os.path.join("fonts", "Roboto-Bold.ttf"), font_title_size - ) + font = ImageFont.truetype(os.path.join("fonts", "Roboto-Bold.ttf"), font_title_size) y = ( (image_height / 2) - - ( - ( - (getheight(font, text) + (len(lines) * padding) / len(lines)) - * len(lines) - ) - / 2 - ) + - (((getheight(font, text) + (len(lines) * padding) / len(lines)) * len(lines)) / 2) + 40 ) elif len(lines) > 4: lines = textwrap.wrap(text, width=wrap + 10) font_title_size = 30 - font = ImageFont.truetype( - os.path.join("fonts", "Roboto-Bold.ttf"), font_title_size - ) + font = ImageFont.truetype(os.path.join("fonts", "Roboto-Bold.ttf"), font_title_size) y = ( (image_height / 2) - - ( - ( - (getheight(font, text) + (len(lines) * padding) / len(lines)) - * len(lines) - ) - / 2 - ) + - (((getheight(font, text) + (len(lines) * padding) / len(lines)) * len(lines)) / 2) + 30 ) @@ -200,9 +171,7 @@ def merge_background_audio(audio: ffmpeg, reddit_id: str): audio (ffmpeg): The TTS final audio but without background. reddit_id (str): The ID of subreddit """ - background_audio_volume = settings.config["settings"]["background"][ - "background_audio_volume" - ] + background_audio_volume = settings.config["settings"]["background"]["background_audio_volume"] if background_audio_volume == 0: return audio # Return the original audio else: @@ -256,42 +225,27 @@ def make_final_video( if settings.config["settings"]["storymode"]: if settings.config["settings"]["storymodemethod"] == 0: audio_clips = [ffmpeg.input(f"assets/temp/{reddit_id}/mp3/title.mp3")] - audio_clips.insert( - 1, ffmpeg.input(f"assets/temp/{reddit_id}/mp3/postaudio.mp3") - ) + audio_clips.insert(1, ffmpeg.input(f"assets/temp/{reddit_id}/mp3/postaudio.mp3")) elif settings.config["settings"]["storymodemethod"] == 1: audio_clips = [ ffmpeg.input(f"assets/temp/{reddit_id}/mp3/postaudio-{i}.mp3") - for i in track( - range(number_of_clips + 1), "Collecting the audio files..." - ) + for i in track(range(number_of_clips + 1), "Collecting the audio files...") ] - audio_clips.insert( - 0, ffmpeg.input(f"assets/temp/{reddit_id}/mp3/title.mp3") - ) + audio_clips.insert(0, ffmpeg.input(f"assets/temp/{reddit_id}/mp3/title.mp3")) else: audio_clips = [ - ffmpeg.input(f"assets/temp/{reddit_id}/mp3/{i}.mp3") - for i in range(number_of_clips) + ffmpeg.input(f"assets/temp/{reddit_id}/mp3/{i}.mp3") for i in range(number_of_clips) ] audio_clips.insert(0, ffmpeg.input(f"assets/temp/{reddit_id}/mp3/title.mp3")) audio_clips_durations = [ - float( - ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/{i}.mp3")["format"][ - "duration" - ] - ) + float(ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/{i}.mp3")["format"]["duration"]) for i in range(number_of_clips) ] audio_clips_durations.insert( 0, - float( - ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/title.mp3")["format"][ - "duration" - ] - ), + float(ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/title.mp3")["format"]["duration"]), ) audio_concat = ffmpeg.concat(*audio_clips, a=1, v=0) ffmpeg.output( @@ -334,19 +288,13 @@ def make_final_video( if settings.config["settings"]["storymode"]: audio_clips_durations = [ float( - ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/postaudio-{i}.mp3")[ - "format" - ]["duration"] + ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/postaudio-{i}.mp3")["format"]["duration"] ) for i in range(number_of_clips) ] audio_clips_durations.insert( 0, - float( - ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/title.mp3")["format"][ - "duration" - ] - ), + float(ffmpeg.probe(f"assets/temp/{reddit_id}/mp3/title.mp3")["format"]["duration"]), ) if settings.config["settings"]["storymodemethod"] == 0: image_clips.insert( @@ -363,9 +311,7 @@ def make_final_video( ) current_time += audio_clips_durations[0] elif settings.config["settings"]["storymodemethod"] == 1: - for i in track( - range(0, number_of_clips + 1), "Collecting the image files..." - ): + for i in track(range(0, number_of_clips + 1), "Collecting the image files..."): image_clips.append( ffmpeg.input(f"assets/temp/{reddit_id}/png/img{i}.png")["v"].filter( "scale", screenshot_width, -1 @@ -381,9 +327,9 @@ def make_final_video( else: for i in range(0, number_of_clips + 1): image_clips.append( - ffmpeg.input(f"assets/temp/{reddit_id}/png/comment_{i}.png")[ - "v" - ].filter("scale", screenshot_width, -1) + ffmpeg.input(f"assets/temp/{reddit_id}/png/comment_{i}.png")["v"].filter( + "scale", screenshot_width, -1 + ) ) image_overlay = image_clips[i].filter("colorchannelmixer", aa=opacity) assert ( @@ -405,15 +351,11 @@ def make_final_video( subreddit = settings.config["reddit"]["thread"]["subreddit"] if not exists(f"./results/{subreddit}"): - print_substep( - "The 'results' folder could not be found so it was automatically created." - ) + print_substep("The 'results' folder could not be found so it was automatically created.") os.makedirs(f"./results/{subreddit}") if not exists(f"./results/{subreddit}/OnlyTTS") and allowOnlyTTSFolder: - print_substep( - "The 'OnlyTTS' folder could not be found so it was automatically created." - ) + print_substep("The 'OnlyTTS' folder could not be found so it was automatically created.") os.makedirs(f"./results/{subreddit}/OnlyTTS") # create a thumbnail for the video @@ -427,11 +369,7 @@ def make_final_video( os.makedirs(f"./results/{subreddit}/thumbnails") # get the first file with the .png extension from assets/backgrounds and use it as a background for the thumbnail first_image = next( - ( - file - for file in os.listdir("assets/backgrounds") - if file.endswith(".png") - ), + (file for file in os.listdir("assets/backgrounds") if file.endswith(".png")), None, ) if first_image is None: @@ -453,9 +391,7 @@ def make_final_video( title_thumb, ) thumbnailSave.save(f"./assets/temp/{reddit_id}/thumbnail.png") - print_substep( - f"Thumbnail - Building Thumbnail in assets/temp/{reddit_id}/thumbnail.png" - ) + print_substep(f"Thumbnail - Building Thumbnail in assets/temp/{reddit_id}/thumbnail.png") text = f"Background by {background_config['video'][2]}" background_clip = ffmpeg.drawtext( @@ -496,9 +432,7 @@ def make_final_video( "b:a": "192k", "threads": multiprocessing.cpu_count(), }, - ).overwrite_output().global_args( - "-progress", progress.output_file.name - ).run( + ).overwrite_output().global_args("-progress", progress.output_file.name).run( quiet=True, overwrite_output=True, capture_stdout=False, @@ -528,9 +462,7 @@ def make_final_video( "b:a": "192k", "threads": multiprocessing.cpu_count(), }, - ).overwrite_output().global_args( - "-progress", progress.output_file.name - ).run( + ).overwrite_output().global_args("-progress", progress.output_file.name).run( quiet=True, overwrite_output=True, capture_stdout=False, diff --git a/video_creation/screenshot_downloader.py b/video_creation/screenshot_downloader.py index 161c1fe..507fb51 100644 --- a/video_creation/screenshot_downloader.py +++ b/video_creation/screenshot_downloader.py @@ -36,9 +36,7 @@ def get_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): # set the theme and disable non-essential cookies if settings.config["settings"]["theme"] == "dark": - cookie_file = open( - "./video_creation/data/cookie-dark-mode.json", encoding="utf-8" - ) + cookie_file = open("./video_creation/data/cookie-dark-mode.json", encoding="utf-8") bgcolor = (33, 33, 36, 255) txtcolor = (240, 240, 240) transparent = False @@ -48,21 +46,15 @@ def get_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): bgcolor = (0, 0, 0, 0) txtcolor = (255, 255, 255) transparent = True - cookie_file = open( - "./video_creation/data/cookie-dark-mode.json", encoding="utf-8" - ) + cookie_file = open("./video_creation/data/cookie-dark-mode.json", encoding="utf-8") else: # Switch to dark theme - cookie_file = open( - "./video_creation/data/cookie-dark-mode.json", encoding="utf-8" - ) + cookie_file = open("./video_creation/data/cookie-dark-mode.json", encoding="utf-8") bgcolor = (33, 33, 36, 255) txtcolor = (240, 240, 240) transparent = False else: - cookie_file = open( - "./video_creation/data/cookie-light-mode.json", encoding="utf-8" - ) + cookie_file = open("./video_creation/data/cookie-light-mode.json", encoding="utf-8") bgcolor = (255, 255, 255, 255) txtcolor = (0, 0, 0) transparent = False @@ -107,12 +99,8 @@ def get_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): page.set_viewport_size(ViewportSize(width=1920, height=1080)) page.wait_for_load_state() - page.locator(f'input[name="username"]').fill( - settings.config["reddit"]["creds"]["username"] - ) - page.locator(f'input[name="password"]').fill( - settings.config["reddit"]["creds"]["password"] - ) + page.locator(f'input[name="username"]').fill(settings.config["reddit"]["creds"]["username"]) + page.locator(f'input[name="password"]').fill(settings.config["reddit"]["creds"]["password"]) page.get_by_role("button", name="Log In").click() page.wait_for_timeout(5000) @@ -193,9 +181,7 @@ def get_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): location[i] = float("{:.2f}".format(location[i] * zoom)) page.screenshot(clip=location, path=postcontentpath) else: - page.locator('[data-test-id="post-content"]').screenshot( - path=postcontentpath - ) + page.locator('[data-test-id="post-content"]').screenshot(path=postcontentpath) except Exception as e: print_substep("Something went wrong!", style="red") resp = input( @@ -209,9 +195,7 @@ def get_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): "green", ) - resp = input( - "Do you want the error traceback for debugging purposes? (y/n)" - ) + resp = input("Do you want the error traceback for debugging purposes? (y/n)") if not resp.casefold().startswith("y"): exit() @@ -256,13 +240,9 @@ def get_screenshots_of_reddit_posts(reddit_object: dict, screenshot_num: int): # zoom the body of the page page.evaluate("document.body.style.zoom=" + str(zoom)) # scroll comment into view - page.locator( - f"#t1_{comment['comment_id']}" - ).scroll_into_view_if_needed() + page.locator(f"#t1_{comment['comment_id']}").scroll_into_view_if_needed() # as zooming the body doesn't change the properties of the divs, we need to adjust for the zoom - location = page.locator( - f"#t1_{comment['comment_id']}" - ).bounding_box() + location = page.locator(f"#t1_{comment['comment_id']}").bounding_box() for i in location: location[i] = float("{:.2f}".format(location[i] * zoom)) page.screenshot( diff --git a/video_creation/voices.py b/video_creation/voices.py index fa29c01..ad94a14 100644 --- a/video_creation/voices.py +++ b/video_creation/voices.py @@ -36,9 +36,7 @@ def save_text_to_mp3(reddit_obj) -> Tuple[int, int]: voice = settings.config["settings"]["tts"]["voice_choice"] if str(voice).casefold() in map(lambda _: _.casefold(), TTSProviders): - text_to_mp3 = TTSEngine( - get_case_insensitive_key_value(TTSProviders, voice), reddit_obj - ) + text_to_mp3 = TTSEngine(get_case_insensitive_key_value(TTSProviders, voice), reddit_obj) else: while True: print_step("Please choose one of the following TTS providers: ") @@ -47,18 +45,12 @@ def save_text_to_mp3(reddit_obj) -> Tuple[int, int]: if choice.casefold() in map(lambda _: _.casefold(), TTSProviders): break print("Unknown Choice") - text_to_mp3 = TTSEngine( - get_case_insensitive_key_value(TTSProviders, choice), reddit_obj - ) + text_to_mp3 = TTSEngine(get_case_insensitive_key_value(TTSProviders, choice), reddit_obj) return text_to_mp3.run() def get_case_insensitive_key_value(input_dict, key): return next( - ( - value - for dict_key, value in input_dict.items() - if dict_key.lower() == key.lower() - ), + (value for dict_key, value in input_dict.items() if dict_key.lower() == key.lower()), None, )