nex/college-bot-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Fix screenshot errors

Browse source
This commit is contained in:
Nexus 2024-01-06 22:32:43 +00:00
parent 419ed8efe4
commit f46a82ded0
3 changed files with 32 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.idea/workspace.xml
View file

@ -4,8 +4,10 @@
<option name="autoReloadType" value="SELECTIVE" /> <option name="autoReloadType" value="SELECTIVE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Fix ollama"> <list default="true" id="aa6d62a8-d64d-4a60-a85f-8d9fa52b6b49" name="Changes" comment="Better log ollama">
<change beforePath="$PROJECT_DIR$/src/cogs/ollama.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cogs/ollama.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/cogs/screenshot.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/cogs/screenshot.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/main.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -78,7 +80,7 @@
<workItem from="1704296563227" duration="780000" /> <workItem from="1704296563227" duration="780000" />
<workItem from="1704317484555" duration="1407000" /> <workItem from="1704317484555" duration="1407000" />
<workItem from="1704572901106" duration="125000" /> <workItem from="1704572901106" duration="125000" />
<workItem from="1704573038888" duration="5748000" /> <workItem from="1704573038888" duration="7123000" />
</task> </task>
<task id="LOCAL-00001" summary="Update gitignore"> <task id="LOCAL-00001" summary="Update gitignore">
<option name="closed" value="true" /> <option name="closed" value="true" />
@ -192,7 +194,23 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1704578625479</updated> <updated>1704578625479</updated>
</task> </task>
<option name="localTasksCounter" value="15" /> <task id="LOCAL-00015" summary="Improve ollama UI">
<option name="closed" value="true" />
<created>1704578853090</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1704578853090</updated>
</task>
<task id="LOCAL-00016" summary="Better log ollama">
<option name="closed" value="true" />
<created>1704579168064</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1704579168064</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers /> <servers />
</component> </component>
<component name="TypeScriptGeneratedFilesManager"> <component name="TypeScriptGeneratedFilesManager">
@ -214,6 +232,8 @@
<MESSAGE value="Remove top level import" /> <MESSAGE value="Remove top level import" />
<MESSAGE value="Fix stupid aiohttp base url req" /> <MESSAGE value="Fix stupid aiohttp base url req" />
<MESSAGE value="Fix ollama" /> <MESSAGE value="Fix ollama" />
<option name="LAST_COMMIT_MESSAGE" value="Fix ollama" /> <MESSAGE value="Improve ollama UI" />
<MESSAGE value="Better log ollama" />
<option name="LAST_COMMIT_MESSAGE" value="Better log ollama" />
</component> </component>
</project> </project>

6
src/cogs/screenshot.py
View file

@ -8,6 +8,7 @@ import time
from urllib.parse import urlparse from urllib.parse import urlparse
import discord import discord
import selenium.common
from discord.ext import commands from discord.ext import commands
from PIL import Image from PIL import Image
from selenium import webdriver from selenium import webdriver
@ -123,6 +124,11 @@ class ScreenshotCog(commands.Cog):
start_request = time.time() start_request = time.time()
try: try:
await asyncio.to_thread(driver.get, url) await asyncio.to_thread(driver.get, url)
except selenium.common.WebDriverException as e:
if "TimeoutException" in str(e):
return await ctx.respond("Timed out while loading webpage.")
else:
return await ctx.respond("Failed to load webpage:\n```\n%s\n```" % str(e.msg))
except Exception as e: except Exception as e:
await ctx.respond("Failed to get the webpage: " + str(e)) await ctx.respond("Failed to get the webpage: " + str(e))
raise raise

2
src/main.py
View file

@ -13,7 +13,7 @@ log = logging.getLogger("jimmy")
CONFIG.setdefault("logging", {}) CONFIG.setdefault("logging", {})
logging.basicConfig( logging.basicConfig(
format="%(asctime)s %(levelname)s %(name)s %(message)s", format="%(asctime)s %(levelname)s %(name)s: %(message)s",
datefmt="%Y-%m-%d %H:%M:%S", datefmt="%Y-%m-%d %H:%M:%S",
level=CONFIG["logging"].get("level", "INFO"), level=CONFIG["logging"].get("level", "INFO"),
handlers=[ handlers=[