Update handler.py
Browse files- handler.py +27 -26
handler.py
CHANGED
|
@@ -7,55 +7,56 @@ import base64
|
|
| 7 |
|
| 8 |
class EndpointHandler:
|
| 9 |
def __init__(self, path=""):
|
| 10 |
-
|
| 11 |
-
|
| 12 |
-
|
| 13 |
-
print("Loading processor...")
|
| 14 |
-
self.processor = AutoProcessor.from_pretrained(base_model_id)
|
| 15 |
-
|
| 16 |
-
print("Loading base model...")
|
| 17 |
self.model = LlavaForConditionalGeneration.from_pretrained(
|
| 18 |
-
|
| 19 |
load_in_4bit=True,
|
| 20 |
torch_dtype=torch.float16,
|
| 21 |
device_map="auto"
|
| 22 |
)
|
| 23 |
-
|
| 24 |
-
print(f"Loading LoRA adapters from repository path: {path}...")
|
| 25 |
-
# This assumes your repo at `path` contains the LoRA adapter files
|
| 26 |
-
self.model.load_adapter(path)
|
| 27 |
-
print("✅ Model and adapters loaded successfully.")
|
| 28 |
|
| 29 |
def __call__(self, data: dict) -> dict:
|
| 30 |
-
# --- Simplified and Corrected Inference Logic ---
|
| 31 |
payload = data.pop("inputs", data)
|
| 32 |
-
|
| 33 |
-
prompt_text = payload.pop("prompt", "
|
|
|
|
| 34 |
image_b64 = payload.pop("image_b64", None)
|
| 35 |
max_new_tokens = payload.pop("max_new_tokens", 200)
|
| 36 |
|
| 37 |
image = None
|
| 38 |
-
if
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 39 |
try:
|
| 40 |
image_bytes = base64.b64decode(image_b64)
|
| 41 |
-
image = Image.open(BytesIO(image_bytes))
|
| 42 |
except Exception as e:
|
| 43 |
return {"error": f"Failed to decode base64 image: {e}"}
|
| 44 |
|
| 45 |
-
#
|
| 46 |
if image is not None:
|
| 47 |
-
# --- Case 1: Multimodal (Image + Text)
|
|
|
|
| 48 |
prompt = f"USER: <image>\n{prompt_text} ASSISTANT:"
|
| 49 |
-
inputs = self.processor(text=prompt, images=image, return_tensors="pt").to(
|
| 50 |
output = self.model.generate(**inputs, max_new_tokens=max_new_tokens)
|
|
|
|
|
|
|
| 51 |
else:
|
| 52 |
-
# --- Case 2: Text-Only
|
|
|
|
| 53 |
prompt = f"USER: {prompt_text} ASSISTANT:"
|
| 54 |
-
inputs = self.processor(text=prompt, return_tensors="pt").to(
|
| 55 |
output = self.model.generate(**inputs, max_new_tokens=max_new_tokens)
|
|
|
|
| 56 |
|
| 57 |
-
# Decode the output and extract the assistant's response
|
| 58 |
-
full_response = self.processor.decode(output[0], skip_special_tokens=True)
|
| 59 |
assistant_response = full_response.split("ASSISTANT:")[-1].strip()
|
| 60 |
-
|
| 61 |
return {"generated_text": assistant_response}
|
|
|
|
| 7 |
|
| 8 |
class EndpointHandler:
|
| 9 |
def __init__(self, path=""):
|
| 10 |
+
print(f"Loading processor and model from: {path}...")
|
| 11 |
+
self.processor = AutoProcessor.from_pretrained(path)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 12 |
self.model = LlavaForConditionalGeneration.from_pretrained(
|
| 13 |
+
path,
|
| 14 |
load_in_4bit=True,
|
| 15 |
torch_dtype=torch.float16,
|
| 16 |
device_map="auto"
|
| 17 |
)
|
| 18 |
+
print("✅ Model loaded successfully.")
|
|
|
|
|
|
|
|
|
|
|
|
|
| 19 |
|
| 20 |
def __call__(self, data: dict) -> dict:
|
|
|
|
| 21 |
payload = data.pop("inputs", data)
|
| 22 |
+
|
| 23 |
+
prompt_text = payload.pop("prompt", "Describe the image in detail.")
|
| 24 |
+
image_url = payload.pop("image_url", None)
|
| 25 |
image_b64 = payload.pop("image_b64", None)
|
| 26 |
max_new_tokens = payload.pop("max_new_tokens", 200)
|
| 27 |
|
| 28 |
image = None
|
| 29 |
+
# Try to load an image if provided
|
| 30 |
+
if image_url:
|
| 31 |
+
try:
|
| 32 |
+
response = requests.get(image_url)
|
| 33 |
+
response.raise_for_status()
|
| 34 |
+
image = Image.open(BytesIO(response.content))
|
| 35 |
+
except Exception as e:
|
| 36 |
+
return {"error": f"Failed to load image from URL: {e}"}
|
| 37 |
+
elif image_b64:
|
| 38 |
try:
|
| 39 |
image_bytes = base64.b64decode(image_b64)
|
| 40 |
+
image = Image.open(BytesIO(image_bytes))
|
| 41 |
except Exception as e:
|
| 42 |
return {"error": f"Failed to decode base64 image: {e}"}
|
| 43 |
|
| 44 |
+
# Check if an image is present and choose the correct logic path
|
| 45 |
if image is not None:
|
| 46 |
+
# --- Case 1: Multimodal (Image + Text) ---
|
| 47 |
+
print("Processing multimodal request...")
|
| 48 |
prompt = f"USER: <image>\n{prompt_text} ASSISTANT:"
|
| 49 |
+
inputs = self.processor(text=prompt, images=image, return_tensors="pt").to("cuda")
|
| 50 |
output = self.model.generate(**inputs, max_new_tokens=max_new_tokens)
|
| 51 |
+
full_response = self.processor.decode(output[0], skip_special_tokens=True)
|
| 52 |
+
|
| 53 |
else:
|
| 54 |
+
# --- Case 2: Text-Only ---
|
| 55 |
+
print("Processing text-only request...")
|
| 56 |
prompt = f"USER: {prompt_text} ASSISTANT:"
|
| 57 |
+
inputs = self.processor(text=prompt, return_tensors="pt").to("cuda")
|
| 58 |
output = self.model.generate(**inputs, max_new_tokens=max_new_tokens)
|
| 59 |
+
full_response = self.processor.decode(output[0], skip_special_tokens=True)
|
| 60 |
|
|
|
|
|
|
|
| 61 |
assistant_response = full_response.split("ASSISTANT:")[-1].strip()
|
|
|
|
| 62 |
return {"generated_text": assistant_response}
|