Skip to content

Implement Content-Length Header in the Blocking API #4124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Lexazan wants to merge 1 commit into from
Closed

Implement Content-Length Header in the Blocking API #4124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 37 additions & 15 deletions extensions/api/blocking_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ def do_POST(self):
body = json.loads(self.rfile.read(content_length).decode('utf-8'))

if self.path == '/api/v1/generate':
self.send_response(200)
self.send_header('Content-Type', 'application/json')
self.end_headers()

prompt = body['prompt']
generate_params = build_parameters(body)
stopping_strings = generate_params.pop('stopping_strings')
Expand All @@ -65,14 +61,17 @@ def do_POST(self):
'text': answer
}]
})

response_encoded = response.encode('utf-8')

self.wfile.write(response.encode('utf-8'))

elif self.path == '/api/v1/chat':
self.send_response(200)
self.send_header('Content-Type', 'application/json')
self.send_header('content-length', len(response_encoded))
self.end_headers()

self.wfile.write(response_encoded)

elif self.path == '/api/v1/chat':
user_input = body['user_input']
regenerate = body.get('regenerate', False)
_continue = body.get('_continue', False)
Expand All @@ -93,26 +92,32 @@ def do_POST(self):
}]
})

self.wfile.write(response.encode('utf-8'))
response_encoded = response.encode('utf-8')

elif self.path == '/api/v1/stop-stream':
self.send_response(200)
self.send_header('Content-Type', 'application/json')
self.send_header('content-length', len(response_encoded))
self.end_headers()

self.wfile.write(response_encoded)

elif self.path == '/api/v1/stop-stream':
stop_everything_event()

response = json.dumps({
'results': 'success'
})

self.wfile.write(response.encode('utf-8'))
response_encoded = response.encode('utf-8')

elif self.path == '/api/v1/model':
self.send_response(200)
self.send_header('Content-Type', 'application/json')
self.send_header('content-length', len(response_encoded))
self.end_headers()

self.wfile.write(response_encoded)

elif self.path == '/api/v1/model':
# by default return the same as the GET interface
result = shared.model_name

Expand Down Expand Up @@ -144,7 +149,14 @@ def do_POST(self):
except Exception as e:
response = json.dumps({'error': {'message': repr(e)}})

self.wfile.write(response.encode('utf-8'))
response_encoded = response.encode('utf-8')

self.send_response(200)
self.send_header('Content-Type', 'application/json')
self.send_header('content-length', len(response_encoded))
self.end_headers()

self.wfile.write(response_encoded)
raise e

shared.args.model = shared.model_name
Expand All @@ -167,21 +179,31 @@ def do_POST(self):
'result': result,
})

self.wfile.write(response.encode('utf-8'))
response_encoded = response.encode('utf-8')

elif self.path == '/api/v1/token-count':
self.send_response(200)
self.send_header('Content-Type', 'application/json')
self.send_header('content-length', len(response_encoded))
self.end_headers()

self.wfile.write(response_encoded)

elif self.path == '/api/v1/token-count':
tokens = encode(body['prompt'])[0]
response = json.dumps({
'results': [{
'tokens': len(tokens)
}]
})

self.wfile.write(response.encode('utf-8'))
response_encoded = response.encode('utf-8')

self.send_response(200)
self.send_header('Content-Type', 'application/json')
self.send_header('content-length', len(response_encoded))
self.end_headers()

self.wfile.write(response_encoded)
else:
self.send_error(404)

Expand Down