You've already forked JapariArchive
Removed persistent aiohttp session and added smaller sessions
This commit is contained in:
@@ -3,6 +3,7 @@ from typing import TYPE_CHECKING
|
|||||||
import asyncio
|
import asyncio
|
||||||
import gc
|
import gc
|
||||||
import traceback
|
import traceback
|
||||||
|
import aiohttp
|
||||||
|
|
||||||
from Classifier.classifyHelper import classify_all
|
from Classifier.classifyHelper import classify_all
|
||||||
from Database.x_classes import DownloadMode
|
from Database.x_classes import DownloadMode
|
||||||
@@ -82,7 +83,8 @@ async def download_post(artist: x_accounts, tweet: Tweet, botData: RuntimeBotDat
|
|||||||
image_containers = [x_posts_images(tweet.id, idx, file = url) for idx, url in enumerate(media)]
|
image_containers = [x_posts_images(tweet.id, idx, file = url) for idx, url in enumerate(media)]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
downloaded_media = await tweetHelper.DownloadMedia(tweet.id, tweet.author.id, tweet.author.username, media, botData.session)
|
async with aiohttp.ClientSession() as session:
|
||||||
|
downloaded_media = await tweetHelper.DownloadMedia(tweet.id, tweet.author.id, tweet.author.username, media, session)
|
||||||
except DOWNLOAD_FAIL as e:
|
except DOWNLOAD_FAIL as e:
|
||||||
x_post.error_id = e.code
|
x_post.error_id = e.code
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
|
import aiohttp
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from Classifier.classifyHelper import classify_all
|
from Classifier.classifyHelper import classify_all
|
||||||
@@ -85,7 +86,8 @@ class Commands(commands.Cog):
|
|||||||
image_containers : list[x_posts_images] = []
|
image_containers : list[x_posts_images] = []
|
||||||
media = await tweetHelper.GetTweetMediaUrls(tweet)
|
media = await tweetHelper.GetTweetMediaUrls(tweet)
|
||||||
image_containers = [x_posts_images(tweet.id, idx, file = url) for idx, url in enumerate(media)]
|
image_containers = [x_posts_images(tweet.id, idx, file = url) for idx, url in enumerate(media)]
|
||||||
downloaded_media = await tweetHelper.DownloadMedia(tweet.id, tweet.author.id, tweet.author.username, media, botData.session)
|
async with aiohttp.ClientSession() as session:
|
||||||
|
downloaded_media = await tweetHelper.DownloadMedia(tweet.id, tweet.author.id, tweet.author.username, media, session)
|
||||||
|
|
||||||
vox_labels = []
|
vox_labels = []
|
||||||
final_filtered_tags = {}
|
final_filtered_tags = {}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class RuntimeBotData:
|
|||||||
db : DatabaseController = None
|
db : DatabaseController = None
|
||||||
vox : VoxClassifier = None
|
vox : VoxClassifier = None
|
||||||
classifier : WDClassifier = None
|
classifier : WDClassifier = None
|
||||||
session : aiohttp.ClientSession = None
|
#session : aiohttp.ClientSession = None
|
||||||
|
|
||||||
xView : XView = None
|
xView : XView = None
|
||||||
yView : YView = None
|
yView : YView = None
|
||||||
@@ -33,4 +33,4 @@ class RuntimeBotData:
|
|||||||
self.yView = YView(self)
|
self.yView = YView(self)
|
||||||
|
|
||||||
#connector = aiohttp.TCPConnector(limit=60)
|
#connector = aiohttp.TCPConnector(limit=60)
|
||||||
self.session = aiohttp.ClientSession()
|
#self.session = aiohttp.ClientSession()
|
||||||
Reference in New Issue
Block a user