From d947c917e58bc6fec110acffc864f8c5963d36b9 Mon Sep 17 00:00:00 2001 From: gdw6463 Date: Fri, 10 May 2024 14:32:46 +0800 Subject: [PATCH] vlms updated --- src/blackbox/vlms.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/blackbox/vlms.py b/src/blackbox/vlms.py index dec79e8..caaa5f6 100644 --- a/src/blackbox/vlms.py +++ b/src/blackbox/vlms.py @@ -1,6 +1,6 @@ from fastapi import Request, Response, status from fastapi.responses import JSONResponse -from blackbox import Blackbox +from .blackbox import Blackbox from typing import Optional import requests @@ -48,14 +48,17 @@ class VLMS(Blackbox): return data.text async def fast_api_handler(self, request: Request) -> Response: - try: - data = await request.json() - except: - return JSONResponse(content={"error": "json parse error"}, status_code=status.HTTP_400_BAD_REQUEST) + # try: + # data = await request.json() + # except: + # return JSONResponse(content={"error": "json parse error"}, status_code=status.HTTP_400_BAD_REQUEST) - model_name = data.get("model_name") - prompt = data.get("prompt") - img_data = data.get("img_data") + # model_name = data.get("model_name") + # prompt = data.get("prompt") + # img_data = data.get("img_data") + model_name = request.get("model_name") + prompt = request.get("prompt") + img_data = request.get("img_data") if prompt is None: return JSONResponse(content={'error': "Question is required"}, status_code=status.HTTP_400_BAD_REQUEST) @@ -63,5 +66,5 @@ class VLMS(Blackbox): if model_name is None or model_name.isspace(): model_name = "Qwen-VL-Chat" - return JSONResponse(content={"response": self.processing(model_name, prompt, img_data)}, - status_code=status.HTTP_200_OK) \ No newline at end of file + jsonresp = str(JSONResponse(content={"response": self.processing(prompt, img_data, model_name)}).body, "utf-8") + return JSONResponse(content={"response": jsonresp}, status_code=status.HTTP_200_OK) \ No newline at end of file