formatting

pull/3/head
Michael Yang 2023-09-20 20:15:09 -07:00
parent 924017de97
commit c564d05de5
1 changed files with 93 additions and 82 deletions

View File

@ -17,114 +17,125 @@ client = discord.Client(intents=intents)
@client.event
async def on_ready():
logging.info(
'Ready! Invite URL: %s',
discord.utils.oauth_url(
client.application_id,
permissions=discord.Permissions(read_messages=True, send_messages=True),
scopes=['bot']))
logging.info(
'Ready! Invite URL: %s',
discord.utils.oauth_url(
client.application_id,
permissions=discord.Permissions(read_messages=True, send_messages=True),
scopes=['bot'],
))
async def generate_response(prompt, context=[]):
body = {
key: value
for key, value in {
'model': args.ollama_model,
'prompt': prompt,
'context': context,
}.items() if value
}
body = {
key: value
for key, value in {
'model': args.ollama_model,
'prompt': prompt,
'context': context,
}.items() if value
}
async with aiohttp.ClientSession() as session:
async with session.post(
f'http://{args.ollama_host}:{args.ollama_port}/api/generate',
json=body) as r:
async for line in r.content:
yield json.loads(line)
async with aiohttp.ClientSession() as session:
async with session.post(
f'http://{args.ollama_host}:{args.ollama_port}/api/generate',
json=body) as r:
async for line in r.content:
yield json.loads(line)
async def buffered_generate_response(prompt, context=[]):
buffer = ''
async for chunk in generate_response(prompt, context):
if chunk['done']:
yield buffer, chunk
break
buffer = ''
async for chunk in generate_response(prompt, context):
if chunk['done']:
yield buffer, chunk
break
buffer += chunk['response']
if len(buffer) >= args.buffer_size:
yield buffer, chunk
buffer = ''
buffer += chunk['response']
if len(buffer) >= args.buffer_size:
yield buffer, chunk
buffer = ''
def save_session(response, chunk):
context = msgpack.packb(chunk['context'])
redis.hset(f'ollama:{response.id}', 'context', context)
context = msgpack.packb(chunk['context'])
redis.hset(f'ollama:{response.id}', 'context', context)
redis.expire(f'ollama:{response.id}', 60 * 60 * 24 * 7)
logging.info(
'saving message=%s: len(context)=%d',
response.id,
len(chunk['context']),
)
redis.expire(f'ollama:{response.id}', 60 * 60 * 24 * 7)
logging.info('saving message=%s: len(context)=%d', response.id, len(chunk['context']))
def load_session(reference):
kwargs = {}
if reference:
context = redis.hget(f'ollama:{reference.message_id}', 'context')
kwargs['context'] = msgpack.unpackb(context) if context else []
kwargs = {}
if reference:
context = redis.hget(f'ollama:{reference.message_id}', 'context')
kwargs['context'] = msgpack.unpackb(context) if context else []
if kwargs.get('context'):
logging.info(
'loading message=%s: len(context)=%d',
reference.message_id,
len(kwargs['context']))
if kwargs.get('context'):
logging.info(
'loading message=%s: len(context)=%d',
reference.message_id,
len(kwargs['context']),
)
return kwargs
return kwargs
@client.event
async def on_message(message):
if message.author == client.user:
return
if message.author == client.user:
return
if client.user.id in message.raw_mentions:
raw_content = message.content.replace(f'<@{client.user.id}>', '').strip()
if raw_content.strip() == '':
raw_content = 'Tell me about yourself.'
if client.user.id in message.raw_mentions:
raw_content = message.content.replace(f'<@{client.user.id}>', '').strip()
if raw_content.strip() == '':
raw_content = 'Tell me about yourself.'
response = None
response_content = ''
async with message.channel.typing():
await message.add_reaction('🤔')
response = None
response_content = ''
async with message.channel.typing():
await message.add_reaction('🤔')
context = []
if reference := message.reference:
if session := load_session(message.reference):
context = session.get('context', [])
context = []
if reference := message.reference:
if session := load_session(message.reference):
context = session.get('context', [])
reference_message = await message.channel.fetch_message(reference.message_id)
reference_content = reference_message.content
raw_content = '\n'.join([
raw_content,
'Use it to answer the prompt:',
reference_content,
])
reference_message = await message.channel.fetch_message(
reference.message_id)
reference_content = reference_message.content
raw_content = '\n'.join([
raw_content,
'Use it to answer the prompt:',
reference_content,
])
async for buffer, chunk in buffered_generate_response(raw_content, context=context):
response_content += buffer
if chunk['done']:
save_session(response, chunk)
break
async for buffer, chunk in buffered_generate_response(
raw_content,
context=context,
):
response_content += buffer
if chunk['done']:
save_session(response, chunk)
break
if not response:
response = await message.reply(response_content)
await message.remove_reaction('🤔', client.user)
continue
if not response:
response = await message.reply(response_content)
await message.remove_reaction('🤔', client.user)
continue
if len(response_content) + 3 >= 2000:
response = await response.reply(buffer)
response_content = buffer
continue
if len(response_content) + 3 >= 2000:
response = await response.reply(buffer)
response_content = buffer
continue
await response.edit(content=response_content + '...')
await response.edit(content=response_content + '...')
await response.edit(content=response_content)
await response.edit(content=response_content)
parser = argparse.ArgumentParser()
@ -142,9 +153,9 @@ args = parser.parse_args()
args.redis.parent.mkdir(parents=True, exist_ok=True)
try:
redis = Redis(args.redis)
client.run(os.getenv('DISCORD_TOKEN'), root_logger=True)
redis = Redis(args.redis)
client.run(os.getenv('DISCORD_TOKEN'), root_logger=True)
except KeyboardInterrupt:
pass
pass
redis.close()