Skip to content

Commit

Permalink
Update version (#463)
Browse files Browse the repository at this point in the history
* Update to newer version of python

* Update chart.yaml to indicate that this is a major, potentially breaking change

* Merge main into this branch
Added Lower Decks season 4
3 typos fixed

* Removed unused packages

* bumping openai_model to gpt-3.5-turbo-instruct

---------

Co-authored-by: Peter of the Norse <[email protected]>
Co-authored-by: Zane <[email protected]>
  • Loading branch information
3 people authored Jan 5, 2024
1 parent fcd15f6 commit 1de72b8
Show file tree
Hide file tree
Showing 9 changed files with 444 additions and 89 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:22.04


# Install apt dependencies
Expand Down
4 changes: 2 additions & 2 deletions charts/agimus/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ apiVersion: v2
name: agimus
description: A helm chart for a discord bot that also runs a mysql db
type: application
version: v1.30.0
appVersion: v1.30.0
version: v2.0.0
appVersion: v2.0.0
2 changes: 1 addition & 1 deletion cogs/poker.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ async def resolve_poker(self, payload:discord.RawReactionActionEvent):
i = 0
for d in poker_game["discards"]:
if d == True:
hand[i] = deck.draw(1)
hand[i] = deck.draw()
i += 1
if doubled:
# if they doubled their bet, take that extra out now
Expand Down
2 changes: 1 addition & 1 deletion commands/gifbomb.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ async def gifbomb(ctx:discord.ApplicationContext, query:str):
await ctx.respond(embed=discord.Embed(
title="Whoops",
description="There was a problem requesting the Gifs from Tenor!",
color=discord.color.red()
color=discord.Color.red()
), ephemeral=True
)
2 changes: 1 addition & 1 deletion configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
],
"enabled": true,
"data": null,
"openai_model": "text-davinci-002",
"openai_model": "gpt-3.5-turbo-instruct",
"parameters": []
},
"aliases": {
Expand Down
366 changes: 366 additions & 0 deletions data/episodes/lowerdecks.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion data/help/slots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
`/slots spin` - run a random slot machine (or choose a specific slot)
`/slots jackpot` - see the current jackpot value
`/slots jackpots` - see a history of jackpots
`/setwager` - set your default wager (from 1 to 25)
`/setwager` - set your default wager (from 1 to 100)
`/scores` - see the top scores
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ services:
restart: on-failure
extra_hosts:
- "host.docker.internal:host-gateway"
depends_on:
- db
db:
image: mysql:latest
environment:
Expand Down
151 changes: 69 additions & 82 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,96 +1,83 @@
aiodns==3.0.0
aiohttp==3.8.4
APScheduler==3.9.1
async-timeout==4.0.2
attrs==21.2.0
beautifulsoup4==4.11.1
cachetools==5.1.0
certifi==2021.5.30
cffi==1.14.6
aiodns==3.1.1
aiohttp==3.9.1
aiosignal==1.3.1
APScheduler==3.10.4
async-timeout==4.0.3
attrs==21.4.0
beautifulsoup4==4.12.2
cachetools==5.3.2
certifi==2023.11.17
cffi==1.16.0
chardet==4.0.0
charset-normalizer==2.0.6
click==8.0.1
colorama==0.4.4
cycler==0.11.0
charset-normalizer==2.1.1
colorama==0.4.6
contourpy==1.2.0
cycler==0.12.1
docopt==0.6.2
feedparser==6.0.9
Flask==2.0.1
fonttools==4.34.2
et-xmlfile==1.1.0
feedparser==6.0.11
fonttools==4.47.0
frozenlist==1.4.1
fuzzywuzzy==0.18.0
google-api-core==2.8.0
google-api-python-client==2.48.0
google-auth==2.6.6
google-auth-httplib2==0.1.0
googleapis-common-protos==1.56.1
httplib2==0.20.4
huesdk==1.1
humanize==4.2.3
idna==3.2
inflect==5.6.0
itsdangerous==2.0.1
jaraco.context==4.1.1
Jinja2==3.0.1
joblib==1.1.0
kiwisolver==1.4.3
Levenshtein==0.15.0
MarkupSafe==2.0.1
matplotlib==3.5.2
more-itertools==8.13.0
multidict==5.1.0
mysql-connector-python==8.0.26
num2words==0.5.10
numpy==1.21.2
openai==0.20.0
google-api-core==2.15.0
google-api-python-client==2.111.0
google-auth==2.25.2
google-auth-httplib2==0.2.0
googleapis-common-protos==1.62.0
httplib2==0.22.0
huesdk==1.7
humanize==4.9.0
idna==3.6
ifaddr==0.2.0
jaraco.context==4.3.0
kiwisolver==1.4.5
Levenshtein==0.23.0
matplotlib==3.8.2
more-itertools==8.14.0
multidict==5.2.0
mysql-connector-python==8.2.0
num2words==0.5.13
numpy==1.26.2
openai==0.28.1
openpyxl==3.1.2
packaging==21.3
phue==1.1
pandas==2.0.3
pandas-stubs==2.0.1.230501
pilgram==1.2.1
Pillow==8.3.2
Pint==0.19.2
pipreqs==0.4.10
prettytable==3.3.0
protobuf==3.18.0
py-cord-dev==2.5.0rc5
pyactiveresource==2.2.2
pyasn1==0.4.8
pyasn1-modules==0.2.8
pycares==4.0.0
pycparser==2.20
PyJWT==2.3.0
pyparsing==3.0.9
Pillow==8.4.0
prettytable==3.9.0
protobuf==4.21.12
py-cord @ git+https://github.com/Pycord-Development/pycord@8af8454a5befbdd6589d24016dcc7bfee252de0b
pyasn1==0.5.1
pyasn1-modules==0.3.0
pycares==4.4.0
pycparser==2.21
pyparsing==3.1.1
python-dateutil==2.8.2
python-dotenv==0.19.0
pytz==2022.1
python-dotenv==1.0.0
pytz==2023.3.post1
pytz-deprecation-shim==0.1.0.post0
PyYAML==6.0
quantulum3==0.7.10
rapidfuzz==1.6.2
ratelimit==2.2.1
requests==2.26.0
rsa==4.8
scikit-learn==1.0.2
scipy==1.8.1
rapidfuzz==3.6.1
requests==2.31.0
rsa==4.9
sgmllib3k==1.0.0
ShopifyAPI==10.0.0
six==1.16.0
sklearn==0.0
soupsieve==2.3.2.post1
stemming==1.0.1
tabulate==0.8.9
texttable==1.6.4
threadpoolctl==3.1.0
tmdbsimple==2.8.0
treys==0.1.3
tabulate==0.9.0
tmdbsimple==2.9.1
tqdm==4.66.1
treys==0.1.8
trivia.py==1.0.8
typing-extensions==4.5.0
tzdata==2022.1
tzlocal==4.2
types-pytz==2023.3.1.1
typing_extensions==4.5.0
tzdata==2023.4
tzlocal==4.3.1
uritemplate==4.1.1
urllib3==1.26.7
wcwidth==0.2.5
websockets==10.3
Werkzeug==2.0.1
urllib3==1.26.18
wcwidth==0.2.12
websockets==10.4
wolframalpha==5.0.0
wordcloud==1.8.2.2
wordcloud==1.9.3
xmltodict==0.13.0
yarg==0.1.9
yarl==1.6.3
yarl==1.9.4
zeroconf==0.131.0

0 comments on commit 1de72b8

Please sign in to comment.