msb-public
/
RedditVideoMakerBot
mirror of https://github.com/elebumm/RedditVideoMakerBot
1
0
Code Issues Projects Releases Wiki Activity

fixes in async code

Browse Source
pull/933/head
Drugsosos 3 years ago
parent 9ffbce78d2
commit 31b3003310
No known key found for this signature in database
GPG Key ID: 8E35176FE617E28D
6 changed files with 82 additions and 71 deletions
Show Stats Download Patch File Download Diff File

19
TTS/TikTok.py
Unescape View File

@ -71,7 +71,7 @@ class TikTok(BaseApiTTS): # TikTok Text-to-Speech Wrapper
) )
random_voice: bool = False random_voice: bool = False
uri_base: str = attrib( uri_base: str = attrib(
default='https://api16-normal-useast5.us.tiktokv.com/media/api/text/speech/invoke', default='https://api16-normal-useast5.us.tiktokv.com/media/api/text/speech/invoke/',
kw_only=True, kw_only=True,
) )
max_chars = 300 max_chars = 300
@ -91,11 +91,12 @@ class TikTok(BaseApiTTS): # TikTok Text-to-Speech Wrapper
self, self,
text: str, text: str,
): ):
return await self.client.post( async with self.client.post(
f'{self.uri_base}', f'{self.uri_base}',
params={ params={
'text_speaker': self.voice, 'text_speaker': self.voice,
'req_text': text, 'req_text': text,
'speaker_map_type': 0, 'speaker_map_type': 0,
} }) as results:
) results = await results.json()
return results['data']['v_str']

23
TTS/engine_wrapper.py
Unescape View File

@ -49,29 +49,31 @@ class TTSEngine:
print_step('Saving Text to MP3 files...') print_step('Saving Text to MP3 files...')
await self.call_tts('title', self.reddit_object['thread_title']) async_tasks_primary = list()
async_tasks_offset = 1
async_tasks_primary.append(self.call_tts('title', self.reddit_object['thread_title']))
if self.reddit_object['thread_post'] and settings.config['settings']['storymode']: if self.reddit_object['thread_post'] and settings.config['settings']['storymode']:
await self.call_tts('posttext', self.reddit_object['thread_post']) async_tasks_primary.append(self.call_tts('posttext', self.reddit_object['thread_post']))
async_tasks_offset += 1
async_tasks_primary = [ async_tasks_primary.extend([
self.call_tts(str(idx), comment['comment_body']) self.call_tts(str(idx), comment['comment_body'])
for idx, comment in enumerate(self.reddit_object['comments']) for idx, comment in enumerate(self.reddit_object['comments'])
] ])
async_tasks_primary_results = list()
for task in track( for task in track(
as_completed(async_tasks_primary), as_completed(async_tasks_primary),
description='Saving...', description='Saving...',
total=async_tasks_primary.__len__() total=async_tasks_primary.__len__()
): ):
await task async_tasks_primary_results.append(await task)
async_tasks_primary.clear()
print_substep('Saved Text to MP3 files successfully.', style='bold green') print_substep('Saved Text to MP3 files successfully.', style='bold green')
return [ return [
comments for comments, condition in comments for comments, condition in
zip(self.reddit_object['comments'], async_tasks_primary[async_tasks_offset:]) zip(range(self.reddit_object['comments'].__len__()), async_tasks_primary_results)
if condition if condition
] ]
@ -85,10 +87,11 @@ class TTSEngine:
filepath=f'{self.path}/{filename}.mp3' filepath=f'{self.path}/{filename}.mp3'
) )
clip_length = audio_length(f'assets/audio/{filename}.mp3') clip_length = audio_length(f'{self.path}/{filename}.mp3')
if self.__total_length + clip_length <= self.max_length: if self.__total_length + clip_length <= self.max_length:
self.max_length += clip_length self.__total_length += clip_length
print(clip_length, '/', self.__total_length)
return True return True
return False return False

10
TTS/streamlabs_polly.py
Unescape View File

@ -56,16 +56,16 @@ class StreamlabsPolly(BaseApiTTS):
else get_random_voice(voices) else get_random_voice(voices)
) )
response = await self.client.post( async with self.client.post(
self.url, self.url,
data={ data={
'voice': voice, 'voice': voice,
'text': text, 'text': text,
'service': 'polly', 'service': 'polly',
} }
) ) as response:
speak_url = await( speak_url = await(
await response.json() await response.json()
)['speak_url'] )['speak_url']
return await self.client.get(speak_url) return await self.client.get(speak_url)

55
video_creation/final_video.py
Unescape View File

@ -79,7 +79,7 @@ def make_final_video(
clip_start: float, clip_start: float,
) -> 'AudioFileClip': ) -> 'AudioFileClip':
return ( return (
AudioFileClip(f'assets/audio/{clip_title}.mp3') AudioFileClip(f'assets/temp/mp3/{clip_title}.mp3')
.set_start(clip_start) .set_start(clip_start)
) )
@ -97,34 +97,29 @@ def make_final_video(
audio_clips.append(audio_title) audio_clips.append(audio_title)
indexes_for_videos = list() indexes_for_videos = list()
for audio in track( for idx, audio in track(
indexes_of_clips, enumerate(indexes_of_clips),
description='Gathering audio clips...', description='Gathering audio clips...',
): ):
temp_audio_clip = create_audio_clip( temp_audio_clip = create_audio_clip(
audio, audio,
correct_audio_offset + video_duration, correct_audio_offset + video_duration,
) )
if video_duration + temp_audio_clip.duration + correct_audio_offset + delay_before_end > max_length: if video_duration + temp_audio_clip.duration + correct_audio_offset + delay_before_end <= max_length:
continue video_duration += temp_audio_clip.duration + correct_audio_offset
video_duration += temp_audio_clip.duration + correct_audio_offset audio_clips.append(temp_audio_clip)
audio_clips.append(temp_audio_clip) indexes_for_videos.append(idx)
indexes_for_videos.append(audio)
video_duration += delay_before_end video_duration += delay_before_end
for idx in indexes_of_clips:
audio_clips.append(AudioFileClip(f'assets/temp/mp3/{idx}.mp3'))
audio_composite = concatenate_audioclips(audio_clips) audio_composite = concatenate_audioclips(audio_clips)
console.log(f'[bold green] Video Will Be: {audio_composite.length} Seconds Long') console.log(f'[bold green] Video Will Be: {audio_composite.end} Seconds Long')
# add title to video # add title to video
image_clips = list()
# Gather all images # Gather all images
new_opacity = 1 if opacity is None or float(opacity) >= 1 else float(opacity) # TODO move to pydentic and percents new_opacity = 1 if opacity is None or float(opacity) >= 1 else float(opacity) # TODO move to pydentic and percents
def create_image_clip( def create_image_clip(
self,
image_title: str | int, image_title: str | int,
audio_start: float, audio_start: float,
audio_end: float, audio_end: float,
@ -132,30 +127,30 @@ def make_final_video(
) -> 'ImageClip': ) -> 'ImageClip':
return ( return (
ImageClip(f'assets/temp/png/{image_title}.png') ImageClip(f'assets/temp/png/{image_title}.png')
.set_start(audio_start - self.time_before_tts) .set_start(audio_start - time_before_tts)
.set_end(audio_end + self.time_before_tts) .set_end(audio_end + time_before_tts)
.set_duration(self.time_before_tts * 2 + audio_duration, change_end=False) .set_duration(time_before_tts * 2 + audio_duration, change_end=False)
.set_opacity(new_opacity) .set_opacity(new_opacity)
.resize(width=W - 100) .resize(width=W - 100)
) )
image_clips = list()
index_offset = 1 image_clips.append(
create_image_clip(
image_clips.insert( 'title',
0, audio_clips[0].start,
ImageClip('assets/temp/png/title.png') audio_clips[0].end,
.set_duration(audio_clips[0].duration) audio_clips[0].duration
.resize(width=W - 100) )
.set_opacity(new_opacity),
) )
for photo_idx in indexes_of_clips: for photo_idx in indexes_for_videos:
image_clips.append( image_clips.append(
create_image_clip( create_image_clip(
f'comment_{photo_idx}', f'comment_{photo_idx}',
audio_clips[photo_idx + index_offset].start, audio_clips[photo_idx].start,
audio_clips[photo_idx + index_offset].end, audio_clips[photo_idx].end,
audio_clips[photo_idx + index_offset].duration audio_clips[photo_idx].duration
) )
) )
@ -175,7 +170,7 @@ def make_final_video(
download_background(background_config) download_background(background_config)
background_clip = ( background_clip = (
VideoFileClip('assets/temp/background.mp4') VideoFileClip('assets/backgrounds/background.mp4')
.set_start(0) .set_start(0)
.set_end(video_duration + delay_before_end) .set_end(video_duration + delay_before_end)
.without_audio() .without_audio()
@ -248,7 +243,7 @@ def make_final_video(
'assets/temp/temp_audio.mp4', 'assets/temp/temp_audio.mp4',
0, 0,
video_duration, video_duration,
targetname=f"results/{subreddit}/{filename}", targetname=f'results/{subreddit}/{filename}',
) )
else: else:
print('debug duck') print('debug duck')

31
video_creation/screenshot_downloader.py
Unescape View File

@ -18,7 +18,6 @@ from attr import attrs, attrib
from attr.validators import instance_of, optional from attr.validators import instance_of, optional
from typing import TypeVar, Optional, Callable, Union from typing import TypeVar, Optional, Callable, Union
_function = TypeVar('_function', bound=Callable[..., object]) _function = TypeVar('_function', bound=Callable[..., object])
_exceptions = TypeVar('_exceptions', bound=Optional[Union[type, tuple, list]]) _exceptions = TypeVar('_exceptions', bound=Optional[Union[type, tuple, list]])
@ -212,12 +211,7 @@ class RedditScreenshot(Browser, Wait):
screenshot_idx (int): List with indexes of voiced comments screenshot_idx (int): List with indexes of voiced comments
""" """
reddit_object: dict reddit_object: dict
screenshot_idx: list = attrib() screenshot_idx: list
@screenshot_idx.validator
def validate_screenshot_idx(self, attribute, value):
if value <= 0:
raise ValueError('Check screenshot_num in config')
async def __dark_theme( async def __dark_theme(
self, self,
@ -352,12 +346,21 @@ class RedditScreenshot(Browser, Wait):
self.screenshot_idx self.screenshot_idx
] ]
for task in track( def chunks(lst, n):
as_completed(async_tasks_primary), """Yield successive n-sized chunks from lst."""
description='Downloading screenshots...', for i in range(0, len(lst), n):
total=async_tasks_primary.__len__(), yield lst[i:i + n]
):
await task
print_substep('Screenshots downloaded Successfully.', style='bold green') for idx, tasks in enumerate(
[chunk for chunk in chunks(async_tasks_primary, 15)],
start=1,
):
for task in track(
as_completed(tasks),
description=f'Downloading comments: Chunk {idx}',
total=tasks.__len__()
):
await task
print_substep('Comments downloaded Successfully.', style='bold green')
await self.close_browser() await self.close_browser()

15
video_creation/voices.py
Unescape View File

@ -37,13 +37,22 @@ async def save_text_to_mp3(
if voice.casefold() in map(lambda _: _.casefold(), TTSProviders): if voice.casefold() in map(lambda _: _.casefold(), TTSProviders):
break break
print('Unknown Choice') print('Unknown Choice')
engine_instance = TTSEngine(get_case_insensitive_key_value(TTSProviders, voice), reddit_obj) TTS_instance = get_case_insensitive_key_value(TTSProviders, voice)
return await engine_instance.run() if TTS_instance == StreamlabsPolly or TTS_instance == TikTok:
from aiohttp import ClientSession
async with ClientSession() as client:
engine_instance = TTSEngine(TTS_instance(client), reddit_obj)
results = await engine_instance.run()
else:
engine_instance = TTSEngine(TTS_instance, reddit_obj)
results = await engine_instance.run()
return results
def get_case_insensitive_key_value( def get_case_insensitive_key_value(
input_dict, input_dict,
key key,
) -> object: ) -> object:
return next( 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()),

Write Preview
Loading…
Cancel
Save