This commit is contained in:
Bruce MacDonald
2023-06-27 17:26:31 -04:00
parent ece5259bc2
commit 7454900733
3 changed files with 62 additions and 36 deletions

View File

@@ -1,39 +1,59 @@
from aiohttp import web
import aiohttp_cors
from ollama import engine
def set_parser(parser):
parser.add_argument('--host', default='127.0.0.1')
parser.add_argument('--port', default=7734)
parser.add_argument("--host", default="127.0.0.1")
parser.add_argument("--port", default=7734)
parser.set_defaults(fn=serve)
def serve(models_home='.', *args, **kwargs):
def serve(models_home=".", *args, **kwargs):
app = web.Application()
app.add_routes([
web.post('/load', load),
web.post('/unload', unload),
web.post('/generate', generate),
])
app.update({
'llms': {},
'models_home': models_home,
})
cors = aiohttp_cors.setup(
app,
defaults={
"*": aiohttp_cors.ResourceOptions(
allow_credentials=True,
expose_headers="*",
allow_headers="*",
)
},
)
app.add_routes(
[
web.post("/load", load),
web.post("/unload", unload),
web.post("/generate", generate),
]
)
for route in app.router.routes():
cors.add(route)
app.update(
{
"llms": {},
"models_home": models_home,
}
)
web.run_app(app, **kwargs)
async def load(request):
body = await request.json()
model = body.get('model')
model = body.get("model")
if not model:
raise web.HTTPBadRequest()
kwargs = {
'llms': request.app.get('llms'),
'models_home': request.app.get('models_home'),
"llms": request.app.get("llms"),
"models_home": request.app.get("models_home"),
}
engine.load(model, **kwargs)
@@ -42,21 +62,21 @@ async def load(request):
async def unload(request):
body = await request.json()
model = body.get('model')
model = body.get("model")
if not model:
raise web.HTTPBadRequest()
engine.unload(model, llms=request.app.get('llms'))
engine.unload(model, llms=request.app.get("llms"))
return web.Response()
async def generate(request):
body = await request.json()
model = body.get('model')
model = body.get("model")
if not model:
raise web.HTTPBadRequest()
prompt = body.get('prompt')
prompt = body.get("prompt")
if not prompt:
raise web.HTTPBadRequest()
@@ -64,12 +84,12 @@ async def generate(request):
await response.prepare(request)
kwargs = {
'llms': request.app.get('llms'),
'models_home': request.app.get('models_home'),
"llms": request.app.get("llms"),
"models_home": request.app.get("models_home"),
}
for output in engine.generate(model, prompt, **kwargs):
await response.write(output.encode('utf-8'))
await response.write(b'\n')
await response.write(output.encode("utf-8"))
await response.write(b"\n")
return response