Update zh.py

zh.py

@@ -245,7 +245,7 @@ async def main():
                     with av.open('output.mp4', mode='w') as writer:
                         video = writer.add_stream('h264', rate=8)
                         video.height = reader.shape[1]
-                        video.width = reader.width
+                        video.width = reader.shape[2]
                         video.pix_fmt = 'yuv420p'
                         with av.open(io.BytesIO(await sys.modules.get(__name__).google(scripts[0].get('narration'))), format='mp3') as container:
                             audio = writer.add_stream('aac', rate=container.streams.audio[0].rate)
@@ -269,7 +269,7 @@ async def main():
                         pathlib.Path(__file__).resolve().parent.joinpath('subtitle.ass').write_text(pathlib.Path(__file__).resolve().parent.joinpath('subtitle').read_text().replace('prompt', scripts[0].get('narration').replace('，', '， ')))
                         graph.link_nodes(graph.add_buffer(height=video.height, width=video.width, format='rgb24'), graph.add('subtitles', 'subtitle.ass'), graph.add('buffersink')).configure()
                         frames = []
-                        for frame in reader.decode():
+                        for frame in reader:
                             graph.push(av.VideoFrame.from_ndarray(frame))
                             while True:
                                 try: frames += graph.pull(),
@@ -288,7 +288,7 @@ async def main():
                                 with aiohttp.MultipartWriter('form-data') as mpwriter:
                                     mpwriter.append(script.get('prompt')).set_content_disposition('form-data', name='prompt')
                                     mpwriter.append(negative).set_content_disposition('form-data', name='negative')
-                                    mpwriter.append(buffer.getvalue(), {'Content-Type':'image/png'}).set_content_disposition('form-data', name='image', filename='image.png')
+                                    mpwriter.append(buffer.getvalue(), {'Content-Type':'application/octet-stream'}).set_content_disposition('form-data', name='image', filename='image.pyz')
                                     tail = 'https://chaowenguo-zh.ms.show/'
                                     async with client.post(urllib.parse.urljoin(tail, 'start'), data=mpwriter) as _: pass
                                     while True:
@@ -299,38 +299,37 @@ async def main():
                                                     case 404: await asyncio.sleep(60)
                                                     case 500 | 429: break
                                                     case 200:
-                                                        with zipfile.ZipFile(io.BytesIO(await get.content.read())) as archive: 
-                                                            with av.open(io.BytesIO(archive.read('output.mp4'))) as reader:
-                                                                with av.open(io.BytesIO(await sys.modules.get(__name__).google(script.get('narration'))), format='mp3') as container:
-                                                                    speed = builtins.float(container.streams.audio[0].duration * container.streams.audio[0].time_base) / 10
-                                                                    print(speed)
-                                                                    graph = av.filter.Graph()
-                                                                    graph.link_nodes(graph.add_abuffer(template=container.streams.audio[0]), graph.add('atempo', builtins.str(speed)), graph.add('apad', 'whole_dur=10'), graph.add('atrim', '0:10'), graph.add('abuffersink')).configure()
-                                                                    frames = []
-                                                                    for frame in container.decode():
-                                                                        graph.push(frame)
-                                                                        while True:
-                                                                            try: frames += graph.pull(),
-                                                                            except (av.BlockingIOError, av.EOFError): break
-                                                                    for frame in frames:
-                                                                        frame.time_base = audio.codec_context.time_base
-                                                                        frame.pts = audioPts
-                                                                        audioPts += frame.samples
-                                                                        writer.mux(audio.encode(frame))
-                                                                graph = av.filter.Graph()
-                                                                pathlib.Path(__file__).resolve().parent.joinpath('subtitle.ass').write_text(pathlib.Path(__file__).resolve().parent.joinpath('subtitle').read_text().replace('prompt', script.get('narration').replace('，', '， ')))
-                                                                graph.link_nodes(graph.add_buffer(template=reader.streams.video[0]), graph.add('subtitles', 'subtitle.ass'), graph.add('buffersink')).configure()
-                                                                frames = []
-                                                                for frame in reader.decode():
-                                                                    graph.push(frame)
-                                                                    while True:
-                                                                        try: frames += graph.pull(),
-                                                                        except (av.BlockingIOError, av.EOFError): break
-                                                                for frame in frames:
-                                                                    frame.time_base = video.codec_context.time_base
-                                                                    frame.pts = videoPts
-                                                                    videoPts += video.codec_context.time_base.denominator / reader.streams.video[0].average_rate
-                                                                    writer.mux(video.encode(frame))
+                                                        reader = numpy.load(io.BytesIO(await get.content.read())).get('arr_0')
+                                                        with av.open(io.BytesIO(await sys.modules.get(__name__).google(script.get('narration'))), format='mp3') as container:
+                                                            speed = builtins.float(container.streams.audio[0].duration * container.streams.audio[0].time_base) / 10
+                                                            print(speed)
+                                                            graph = av.filter.Graph()
+                                                            graph.link_nodes(graph.add_abuffer(template=container.streams.audio[0]), graph.add('atempo', builtins.str(speed)), graph.add('apad', 'whole_dur=10'), graph.add('atrim', '0:10'), graph.add('abuffersink')).configure()
+                                                            frames = []
+                                                            for frame in container.decode():
+                                                                graph.push(frame)
+                                                                while True:
+                                                                    try: frames += graph.pull(),
+                                                                    except (av.BlockingIOError, av.EOFError): break
+                                                            for frame in frames:
+                                                                frame.time_base = audio.codec_context.time_base
+                                                                frame.pts = audioPts
+                                                                audioPts += frame.samples
+                                                                writer.mux(audio.encode(frame))
+                                                        graph = av.filter.Graph()
+                                                        pathlib.Path(__file__).resolve().parent.joinpath('subtitle.ass').write_text(pathlib.Path(__file__).resolve().parent.joinpath('subtitle').read_text().replace('prompt', script.get('narration').replace('，', '， ')))
+                                                        graph.link_nodes(graph.add_buffer(height=video.height, width=video.width, format='rgb24'), graph.add('subtitles', 'subtitle.ass'), graph.add('buffersink')).configure()
+                                                        frames = []
+                                                        for frame in reader:
+                                                            graph.push(av.VideoFrame.from_ndarray(frame))
+                                                            while True:
+                                                                try: frames += graph.pull(),
+                                                                except (av.BlockingIOError, av.EOFError): break
+                                                        for frame in frames:
+                                                            frame.time_base = video.codec_context.time_base
+                                                            frame.pts = videoPts
+                                                            videoPts += video.codec_context.time_base.denominator / reader.streams.video[0].average_rate
+                                                            writer.mux(video.encode(frame))
                                                         outer = True
                                                         break
                                         except aiohttp.ClientConnectionError: pass