Skip to content

Commit

Permalink
black
Browse files Browse the repository at this point in the history
  • Loading branch information
@subzeroid
subzeroid committed Nov 22, 2023
1 parent 6064d71 commit dccce94
Show file tree
Hide file tree
Showing 3 changed files with 119 additions and 72 deletions.
176 changes: 109 additions & 67 deletions instagrapi/image_util.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,22 +30,31 @@ def calc_resize(max_size, curr_size, min_size=(0, 0)):
max_width, max_height = max_size or (0, 0)
min_width, min_height = min_size or (0, 0)

if (max_width and min_width > max_width) or (max_height and min_height > max_height):
raise ValueError('Invalid min / max sizes.')
if (max_width and min_width > max_width) or (
max_height and min_height > max_height
):
raise ValueError("Invalid min / max sizes.")

orig_width, orig_height = curr_size
if max_width and max_height and (orig_width > max_width or orig_height > max_height):
if (
max_width
and max_height
and (orig_width > max_width or orig_height > max_height)
):
resize_factor = min(
1.0 * max_width / orig_width,
1.0 * max_height / orig_height)
1.0 * max_width / orig_width, 1.0 * max_height / orig_height
)
new_width = int(resize_factor * orig_width)
new_height = int(resize_factor * orig_height)
return new_width, new_height

elif min_width and min_height and (orig_width < min_width or orig_height < min_height):
elif (
min_width
and min_height
and (orig_width < min_width or orig_height < min_height)
):
resize_factor = max(
1.0 * min_width / orig_width,
1.0 * min_height / orig_height
1.0 * min_width / orig_width, 1.0 * min_height / orig_height
)
new_width = int(resize_factor * orig_width)
new_height = int(resize_factor * orig_height)
Expand All @@ -66,7 +75,7 @@ def calc_crop(aspect_ratios, curr_size):
min_aspect_ratio = float(aspect_ratios[0])
max_aspect_ratio = float(aspect_ratios[1])
else:
raise ValueError('Invalid aspect ratios')
raise ValueError("Invalid aspect ratios")
except TypeError:
# not a min-max range
min_aspect_ratio = float(aspect_ratios)
Expand All @@ -84,23 +93,27 @@ def calc_crop(aspect_ratios, curr_size):
# media is too tall
new_width = curr_width
new_height = new_width / min_aspect_ratio
left = int((curr_width - new_width)/2)
top = int((curr_height - new_height)/2)
right = int((curr_width + new_width)/2)
bottom = int((curr_height + new_height)/2)
left = int((curr_width - new_width) / 2)
top = int((curr_height - new_height) / 2)
right = int((curr_width + new_width) / 2)
bottom = int((curr_height + new_height) / 2)
return left, top, right, bottom


def is_remote(media):
"""Detect if media specified is a url"""
if re.match(r'^https?://', media):
if re.match(r"^https?://", media):
return True
return False


def prepare_image(img, max_size=(1080, 1350),
aspect_ratios=(4.0 / 5.0, 90.0 / 47.0),
save_path=None, **kwargs):
def prepare_image(
img,
max_size=(1080, 1350),
aspect_ratios=(4.0 / 5.0, 90.0 / 47.0),
save_path=None,
**kwargs
):
"""
Prepares an image file for posting.
Defaults for size and aspect ratio from https://help.instagram.com/1469029763400082
Expand All @@ -113,7 +126,7 @@ def prepare_image(img, max_size=(1080, 1350),
- **min_size**: tuple of (min_width, min_height)
:return:
"""
min_size = kwargs.pop('min_size', (320, 167))
min_size = kwargs.pop("min_size", (320, 167))
if is_remote(img):
res = requests.get(img)
im = Image.open(io.BytesIO(res.content))
Expand All @@ -129,27 +142,30 @@ def prepare_image(img, max_size=(1080, 1350),
if new_size:
im = im.resize(new_size)

if im.mode != 'RGB':
if im.mode != "RGB":
# Removes transparency (alpha)
im = im.convert('RGBA')
im2 = Image.new('RGB', im.size, (255, 255, 255))
im = im.convert("RGBA")
im2 = Image.new("RGB", im.size, (255, 255, 255))
im2.paste(im, (0, 0), im)
im = im2
if save_path:
im.save(save_path)

b = io.BytesIO()
im.save(b, 'JPEG')
im.save(b, "JPEG")
return b.getvalue(), im.size


def prepare_video(vid, thumbnail_frame_ts=0.0,
max_size=(1080, 1350),
aspect_ratios=(4.0 / 5.0, 90.0 / 47.0),
max_duration=60.0,
save_path=None,
skip_reencoding=False,
**kwargs):
def prepare_video(
vid,
thumbnail_frame_ts=0.0,
max_size=(1080, 1350),
aspect_ratios=(4.0 / 5.0, 90.0 / 47.0),
max_duration=60.0,
save_path=None,
skip_reencoding=False,
**kwargs
):
"""
Prepares a video file for posting.
Defaults for size and aspect ratio from https://help.instagram.com/1469029763400082
Expand All @@ -176,19 +192,21 @@ def prepare_video(vid, thumbnail_frame_ts=0.0,
from moviepy.video.io.VideoFileClip import VideoFileClip
from moviepy.video.fx.all import resize, crop

min_size = kwargs.pop('min_size', (612, 320))
progress_bar = True if kwargs.pop('progress_bar', None) else False
save_only = kwargs.pop('save_only', False)
preset = kwargs.pop('preset', 'medium')
min_size = kwargs.pop("min_size", (612, 320))
progress_bar = True if kwargs.pop("progress_bar", None) else False
save_only = kwargs.pop("save_only", False)
preset = kwargs.pop("preset", "medium")
if save_only and not save_path:
raise ValueError('"save_path" cannot be empty.')
if save_path:
if not save_path.lower().endswith('.mp4'):
raise ValueError('You must specify a .mp4 save path')
if not save_path.lower().endswith(".mp4"):
raise ValueError("You must specify a .mp4 save path")

vid_is_modified = False # flag to track if re-encoding can be skipped
vid_is_modified = False # flag to track if re-encoding can be skipped

temp_video_file = tempfile.NamedTemporaryFile(prefix='ipae_', suffix='.mp4', delete=False)
temp_video_file = tempfile.NamedTemporaryFile(
prefix="ipae_", suffix=".mp4", delete=False
)

if is_remote(vid):
# Download remote file
Expand All @@ -202,19 +220,21 @@ def prepare_video(vid, thumbnail_frame_ts=0.0,
vidclip = VideoFileClip(temp_video_file.name)

if vidclip.duration < 3 * 1.0:
raise ValueError('Duration is too short')
raise ValueError("Duration is too short")

if vidclip.duration > max_duration * 1.0:
vidclip = vidclip.subclip(0, max_duration)
vid_is_modified = True

if thumbnail_frame_ts > vidclip.duration:
raise ValueError('Invalid thumbnail frame')
raise ValueError("Invalid thumbnail frame")

if aspect_ratios:
crop_box = calc_crop(aspect_ratios, vidclip.size)
if crop_box:
vidclip = crop(vidclip, x1=crop_box[0], y1=crop_box[1], x2=crop_box[2], y2=crop_box[3])
vidclip = crop(
vidclip, x1=crop_box[0], y1=crop_box[1], x2=crop_box[2], y2=crop_box[3]
)
vid_is_modified = True

if max_size or min_size:
Expand All @@ -223,12 +243,21 @@ def prepare_video(vid, thumbnail_frame_ts=0.0,
vidclip = resize(vidclip, newsize=new_size)
vid_is_modified = True

temp_vid_output_file = tempfile.NamedTemporaryFile(prefix='ipae_', suffix='.mp4', delete=False)
temp_vid_output_file = tempfile.NamedTemporaryFile(
prefix="ipae_", suffix=".mp4", delete=False
)
if vid_is_modified or not skip_reencoding:
# write out
vidclip.write_videofile(
temp_vid_output_file.name, codec='libx264', audio=True, audio_codec='aac',
verbose=False, progress_bar=progress_bar, preset=preset, remove_temp=True)
temp_vid_output_file.name,
codec="libx264",
audio=True,
audio_codec="aac",
verbose=False,
progress_bar=progress_bar,
preset=preset,
remove_temp=True,
)
else:
# no reencoding
shutil.copyfile(video_src_filename, temp_vid_output_file.name)
Expand All @@ -237,12 +266,14 @@ def prepare_video(vid, thumbnail_frame_ts=0.0,
shutil.copyfile(temp_vid_output_file.name, save_path)

# Temp thumbnail img filename
temp_thumbnail_file = tempfile.NamedTemporaryFile(prefix='ipae_', suffix='.jpg', delete=False)
temp_thumbnail_file = tempfile.NamedTemporaryFile(
prefix="ipae_", suffix=".jpg", delete=False
)
vidclip.save_frame(temp_thumbnail_file.name, t=thumbnail_frame_ts)

video_duration = vidclip.duration
video_size = vidclip.size
del vidclip # clear it out
del vidclip # clear it out

video_thumbnail_content = temp_thumbnail_file.read()

Expand All @@ -251,55 +282,66 @@ def prepare_video(vid, thumbnail_frame_ts=0.0,
video_content = temp_vid_output_file.read()
else:
video_content_len = os.path.getsize(save_path)
video_content = save_path # return the file path instead
video_content = save_path # return the file path instead

if video_content_len > 50 * 1024 * 1000:
raise ValueError('Video file is too big.')
raise ValueError("Video file is too big.")

return video_content, video_size, video_duration, video_thumbnail_content


if __name__ == '__main__': # pragma: no cover
if __name__ == "__main__": # pragma: no cover
# pylint: disable-all
import argparse

parser = argparse.ArgumentParser(description='Demo media.py')
parser.add_argument('-i', '--image', dest='image', type=str)
parser.add_argument('-v', '--video', dest='video', type=str)
parser.add_argument('-video-story', dest='videostory', type=str)
parser = argparse.ArgumentParser(description="Demo media.py")
parser.add_argument("-i", "--image", dest="image", type=str)
parser.add_argument("-v", "--video", dest="video", type=str)
parser.add_argument("-video-story", dest="videostory", type=str)

args = parser.parse_args()

if args.image:
photo_data, size = prepare_image(args.image, max_size=(1000, 800), aspect_ratios=0.9)
print('Image dimensions: {0:d}x{1:d}'.format(size[0], size[1]))
photo_data, size = prepare_image(
args.image, max_size=(1000, 800), aspect_ratios=0.9
)
print("Image dimensions: {0:d}x{1:d}".format(size[0], size[1]))

def print_vid_info(video_data, size, duration, thumbnail_data):
print(
'vid file size: {0:d}, thumbnail file size: {1:d}, , '
'vid dimensions: {2:d}x{3:d}, duration: {4:f}'.format(
len(video_data), len(thumbnail_data), size[0], size[1], duration))
"vid file size: {0:d}, thumbnail file size: {1:d}, , "
"vid dimensions: {2:d}x{3:d}, duration: {4:f}".format(
len(video_data), len(thumbnail_data), size[0], size[1], duration
)
)

if args.video:
print('Example 1: Resize video to aspect ratio 1, duration 10s')
print("Example 1: Resize video to aspect ratio 1, duration 10s")
video_data, size, duration, thumbnail_data = prepare_video(
args.video, aspect_ratios=1.0, max_duration=10,
save_path='example1.mp4')
args.video, aspect_ratios=1.0, max_duration=10, save_path="example1.mp4"
)
print_vid_info(video_data, size, duration, thumbnail_data)

print('Example 2: Resize video to no greater than 480x480')
print("Example 2: Resize video to no greater than 480x480")
video_data, size, duration, thumbnail_data = prepare_video(
args.video, thumbnail_frame_ts=2.0, max_size=(480, 480))
args.video, thumbnail_frame_ts=2.0, max_size=(480, 480)
)
print_vid_info(video_data, size, duration, thumbnail_data)

print('Example 3: Leave video intact and speed up retrieval')
print("Example 3: Leave video intact and speed up retrieval")
video_data, size, duration, thumbnail_data = prepare_video(
args.video, max_size=None, skip_reencoding=True)
args.video, max_size=None, skip_reencoding=True
)
print_vid_info(video_data, size, duration, thumbnail_data)

if args.videostory:
print('Generate a video suitable for posting as a story')
print("Generate a video suitable for posting as a story")
video_data, size, duration, thumbnail_data = prepare_video(
args.videostory, aspect_ratios=(3.0/4), max_duration=14.9,
min_size=(612, 612), max_size=(1080, 1080), save_path='story.mp4')
args.videostory,
aspect_ratios=(3.0 / 4),
max_duration=14.9,
min_size=(612, 612),
max_size=(1080, 1080),
save_path="story.mp4",
)
print_vid_info(video_data, size, duration, thumbnail_data)
4 changes: 3 additions & 1 deletion instagrapi/mixins/location.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,9 @@ def location_medias_v1_chunk(
np = result.get("next_page")
ids = result.get("next_media_ids")
next_m_id = result.get("next_max_id")
next_max_id = base64.b64encode(json.dumps([next_m_id, np, ids]).encode()).decode()
next_max_id = base64.b64encode(
json.dumps([next_m_id, np, ids]).encode()
).decode()
for section in result.get("sections") or []:
layout_content = section.get("layout_content") or {}
nodes = layout_content.get("medias") or []
Expand Down
11 changes: 7 additions & 4 deletions instagrapi/mixins/photo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,15 @@ def photo_rupload(
assert isinstance(path, Path), f"Path must been Path, now {path} ({type(path)})"
valid_extensions = [".jpg", ".jpeg", ".png", ".webp"]
if path.suffix.lower() not in valid_extensions:
raise ValueError("Invalid file format. Only JPG/JPEG/PNG/WEBP files are supported.")
raise ValueError(
"Invalid file format. Only JPG/JPEG/PNG/WEBP files are supported."
)
image_type = "image/jpeg"
if path.suffix.lower() == ".png":
image_type = "image/png"
elif path.suffix.lower() == ".webp":
image_type = "image/webp"

# upload_id = 516057248854759
upload_id = upload_id or str(int(time.time() * 1000))
assert path, "Not specified path to photo"
Expand Down Expand Up @@ -201,7 +203,6 @@ def photo_rupload(
width, height = im.size
return upload_id, width, height


def photo_upload(
self,
path: Path,
Expand Down Expand Up @@ -237,7 +238,9 @@ def photo_upload(
path = Path(path)
valid_extensions = [".jpg", ".jpeg", ".png", ".webp"]
if path.suffix.lower() not in valid_extensions:
raise ValueError("Invalid file format. Only JPG/JPEG/PNG/WEBP files are supported.")
raise ValueError(
"Invalid file format. Only JPG/JPEG/PNG/WEBP files are supported."
)

upload_id, width, height = self.photo_rupload(path, upload_id)
for attempt in range(10):
Expand Down

0 comments on commit dccce94

Please sign in to comment.