Paillat-dev/Botator
1
0
Fork 0
mirror of https://github.com/Paillat-dev/Botator.git synced 2026-01-02 01:06:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Images] Fixed images recognition with google

Browse Source
This commit is contained in:
Alexis LEBEL
2023-04-02 14:42:37 +02:00
parent 187b833474
commit dc48b7d21e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/makeprompt.py
View File

@@ -398,16 +398,16 @@ async def gpt_prompt(bot, messages, message, data_dict, prompt, guild_data):
): ):
for attachment in msg.attachments: for attachment in msg.attachments:
path = f"./../database/google-vision/results/{attachment.id}.txt" path = f"./../database/google-vision/results/{attachment.id}.txt"
if images_usage >= 6 and guild_data["premium"] == 0: if data_dict['images_usage'] >= 6 and guild_data["premium"] == 0:
guild_data["images_limit_reached"] = True guild_data["images_limit_reached"] = True
elif images_usage >= 30 and guild_data["premium"] == 1: elif data_dict['images_usage'] >= 30 and guild_data["premium"] == 1:
guild_data["images_limit_reached"] = True guild_data["images_limit_reached"] = True
if ( if (
attachment.url.endswith((".png", ".jpg", ".jpeg", ".gif")) attachment.url.endswith((".png", ".jpg", ".jpeg", ".gif"))
and not guild_data["images_limit_reached"] and not guild_data["images_limit_reached"]
and not os.path.exists(path) and not os.path.exists(path)
): ):
images_usage += 1 data_dict['images_usage'] += 1
analysis = await vision_processing.process(attachment) analysis = await vision_processing.process(attachment)
if analysis != None: if analysis != None:
content = f"{content} \n\n {analysis}" content = f"{content} \n\n {analysis}"
@@ -446,7 +446,7 @@ async def gpt_prompt(bot, messages, message, data_dict, prompt, guild_data):
) )
curs_data.execute( curs_data.execute(
"UPDATE images SET usage_count = ? WHERE guild_id = ?", "UPDATE images SET usage_count = ? WHERE guild_id = ?",
(images_usage, message.guild.id), (data_dict['images_usage'], message.guild.id),
) )
else: else:
msgs.append({"role": role, "content": f"{content}", "name": name}) msgs.append({"role": role, "content": f"{content}", "name": name})

4
code/vision_processing.py
View File

@@ -10,7 +10,7 @@ from google.cloud import vision
try: try:
client = vision.ImageAnnotatorClient() client = vision.ImageAnnotatorClient()
except: except:
debug("Google Vision API is not setup, please run /setup") print("Google Vision API is not setup, please run /setup")
@@ -64,4 +64,4 @@ async def process(attachment):
return final return final
except Exception as e: except Exception as e:
debug("Error while processing image: " + str(e)) print("Error while processing image: " + str(e))