Fixing the sorting logic for trackdays, now it actually shows up sorted, fuck u JT
This commit is contained in:
parent
016c29e584
commit
9444f2621a
7
Makefile
7
Makefile
@ -6,6 +6,9 @@ format:
|
|||||||
clean:
|
clean:
|
||||||
docker rm -f dragon-bot-test
|
docker rm -f dragon-bot-test
|
||||||
|
|
||||||
|
build-test:
|
||||||
|
docker build -f ./Dockerfile-test-env -t dragon-bot-test .
|
||||||
|
|
||||||
DRAGON_ENV := "test"
|
DRAGON_ENV := "test"
|
||||||
test: clean format
|
test: clean format build-test
|
||||||
docker run -ti -v ${PWD}/app:/app --rm --name dragon-bot-test -e DRAGON_ENV=${DRAGON_ENV} -e discord_token=${discord_token} dragon-bot-test bash
|
docker run -ti -v ${PWD}/app:/app --rm --name dragon-bot-test -e DRAGON_ENV=${DRAGON_ENV} -e discord_token=${discord_token} dragon-bot-test bash
|
||||||
|
@ -11,7 +11,7 @@ def get_player(player):
|
|||||||
"TRN-Api-Key": os.getenv("tracker_network_token"),
|
"TRN-Api-Key": os.getenv("tracker_network_token"),
|
||||||
}
|
}
|
||||||
|
|
||||||
response = requests.get(url).json()["data"]
|
response = requests.get(url, headers=headers).json()["data"]
|
||||||
|
|
||||||
# Build the embed
|
# Build the embed
|
||||||
embed = discord.Embed(description="-------", color=discord.Color.red(), type="rich")
|
embed = discord.Embed(description="-------", color=discord.Color.red(), type="rich")
|
||||||
|
@ -1,6 +1,9 @@
|
|||||||
import discord
|
import openai
|
||||||
|
import os
|
||||||
from discord import option
|
from discord import option
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
|
import discord
|
||||||
|
import requests
|
||||||
|
|
||||||
|
|
||||||
class Gpt(commands.Cog):
|
class Gpt(commands.Cog):
|
||||||
@ -13,52 +16,33 @@ class Gpt(commands.Cog):
|
|||||||
description="Talk to an LLM",
|
description="Talk to an LLM",
|
||||||
)
|
)
|
||||||
@option(name="question", description="The question to ask", required=True)
|
@option(name="question", description="The question to ask", required=True)
|
||||||
@option(
|
|
||||||
name="temperature", description="I dunno", min_value=0, max_value=1, default=0.1
|
|
||||||
)
|
|
||||||
@option(name="top_p", description="I dunno", min_value=0, max_value=1, default=0.75)
|
|
||||||
@option(name="top_k", description="I dunno", min_value=0, max_value=100, default=40)
|
|
||||||
@option(name="beams", description="I dunno", min_value=0, max_value=4, default=4)
|
|
||||||
@option(
|
|
||||||
name="tokens", description="I dunno", min_value=1, max_value=512, default=128
|
|
||||||
)
|
|
||||||
async def gpt(
|
async def gpt(
|
||||||
self,
|
self,
|
||||||
ctx,
|
ctx,
|
||||||
question: str,
|
question: str,
|
||||||
temperature: int,
|
|
||||||
top_p: int,
|
|
||||||
top_k: int,
|
|
||||||
beams: int,
|
|
||||||
tokens: int,
|
|
||||||
):
|
):
|
||||||
import requests
|
openai.api_key = os.getenv("OPENAI_API_KEY")
|
||||||
|
|
||||||
await ctx.defer()
|
completion = openai.ChatCompletion.create(
|
||||||
response = requests.post(
|
model="gpt-3.5-turbo",
|
||||||
"https://tloen-alpaca-lora.hf.space/run/predict",
|
messages=[
|
||||||
json={
|
{"role": "system", "content": "You are a helpful assistant."},
|
||||||
"data": [
|
{"role": "user", "content": "Hello!"},
|
||||||
question,
|
],
|
||||||
"",
|
)
|
||||||
float(temperature),
|
|
||||||
float(top_p),
|
|
||||||
float(top_k),
|
|
||||||
int(beams),
|
|
||||||
int(tokens),
|
|
||||||
]
|
|
||||||
},
|
|
||||||
).json()
|
|
||||||
|
|
||||||
data = response["data"][0]
|
|
||||||
|
|
||||||
embed = discord.Embed(
|
embed = discord.Embed(
|
||||||
description=data,
|
description=completion.choices[0].message,
|
||||||
color=discord.Color.green(),
|
color=discord.Color.green(),
|
||||||
type="rich",
|
type="rich",
|
||||||
)
|
)
|
||||||
|
|
||||||
embed.set_author(name="You asked me: %s" % question)
|
embed.set_
|
||||||
|
|
||||||
|
embed.set_author(
|
||||||
|
name="You asked me: %s" % question,
|
||||||
|
icon_url="https://upload.wikimedia.org/wikipedia/commons/thumb/0/04/ChatGPT_logo.svg/2048px-ChatGPT_logo.svg.png",
|
||||||
|
)
|
||||||
|
|
||||||
await ctx.followup.send(embed=embed)
|
await ctx.followup.send(embed=embed)
|
||||||
|
|
||||||
|
@ -47,16 +47,17 @@ async def get_msreg(track):
|
|||||||
if track not in events:
|
if track not in events:
|
||||||
events[track] = []
|
events[track] = []
|
||||||
events[track].append(event_object)
|
events[track].append(event_object)
|
||||||
|
for track, track_events in events.items():
|
||||||
|
events[track] = sorted(
|
||||||
|
track_events,
|
||||||
|
key=lambda event: datetime.fromisoformat(
|
||||||
|
event["event_date"]
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
except TypeError:
|
except TypeError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# sort track events by date
|
|
||||||
def date_to_datetime(input):
|
|
||||||
return datetime.strptime(input["event_date"], "%Y-%m-%d")
|
|
||||||
|
|
||||||
for races in events.values():
|
|
||||||
sorted(races, key=date_to_datetime)
|
|
||||||
|
|
||||||
return events
|
return events
|
||||||
|
|
||||||
|
|
||||||
|
@ -83,7 +83,6 @@ env:
|
|||||||
PYTHONUNBUFFERED: 1
|
PYTHONUNBUFFERED: 1
|
||||||
|
|
||||||
secrets:
|
secrets:
|
||||||
apex_api_key: apex_api_key
|
|
||||||
discord_token: discord_token
|
discord_token: discord_token
|
||||||
ffxiv_token: ffxiv_token
|
ffxiv_token: ffxiv_token
|
||||||
OPENAI_API_KEY: OPENAI_API_KEY
|
OPENAI_API_KEY: OPENAI_API_KEY
|
||||||
|
Loading…
x
Reference in New Issue
Block a user