fix: add compatibility with v0.3.9 for Gemma3ChatHandler

Author: kossum

llama_cpp/llama_chat_format.py

@@ -3468,8 +3468,7 @@ def eval_image(self, llama: llama.Llama, image_url: str):
             self._llava_cpp.clip_image_u8_free(img_u8_p)
             raise ValueError("Failed to load image.")
 
-        img_f32 = self._llava_cpp.clip_image_f32_batch()
-        img_f32_p = ctypes.byref(img_f32)
+        img_f32_p = self._llava_cpp.clip_image_f32_batch_init()
         if not self._llava_cpp.clip_image_preprocess(self.clip_ctx, img_u8_p, img_f32_p):
             self._llava_cpp.clip_image_f32_batch_free(img_f32_p)
             self._llava_cpp.clip_image_u8_free(img_u8_p)

llama_cpp/llava_cpp.py

@@ -142,28 +142,6 @@ def llava_eval_image_embed(
 ################################################
 
 
-# struct clip_image_u8_batch {
-#     struct clip_image_u8 * data;
-#     size_t size;
-# };
-class clip_image_u8_batch(Structure):
-  _fields_ = [
-      ("data", c_void_p),
-      ("size", c_size_t),
-  ]
-
-
-# struct clip_image_f32_batch {
-#     struct clip_image_f32 * data;
-#     size_t size;
-# };
-class clip_image_f32_batch(Structure):
-  _fields_ = [
-      ("data", c_void_p),
-      ("size", c_size_t),
-  ]
-
-
 # /** load mmproj model */
 # CLIP_API struct clip_ctx * clip_model_load    (const char * fname, int verbosity);
 @ctypes_function("clip_model_load", [c_char_p, c_int], clip_ctx_p_ctypes)
@@ -192,21 +170,15 @@ def clip_image_u8_free(img: c_void_p, /):
     ...
 
 
-# CLIP_API void clip_image_f32_free(struct clip_image_f32 * img);
-@ctypes_function("clip_image_f32_free", [c_void_p], None)
-def clip_image_f32_free(img: c_void_p, /):
-    ...
-
-
-# CLIP_API void clip_image_u8_batch_free (struct clip_image_u8_batch  * batch);
-@ctypes_function("clip_image_u8_batch_free", [POINTER(clip_image_u8_batch)], None)
-def clip_image_u8_batch_free(batch: "_Pointer[clip_image_u8_batch]", /):
+# CLIP_API struct clip_image_f32_batch * clip_image_f32_batch_init();
+@ctypes_function("clip_image_f32_batch_init", [], c_void_p)
+def clip_image_f32_batch_init() -> Optional[c_void_p]:
     ...
 
 
 # CLIP_API void clip_image_f32_batch_free(struct clip_image_f32_batch * batch);
-@ctypes_function("clip_image_f32_batch_free", [POINTER(clip_image_f32_batch)], None)
-def clip_image_f32_batch_free(batch: "_Pointer[clip_image_f32_batch]", /):
+@ctypes_function("clip_image_f32_batch_free", [c_void_p], None)
+def clip_image_f32_batch_free(batch: c_void_p, /):
     ...
 
 
@@ -217,14 +189,14 @@ def clip_image_f32_batch_free(batch: "_Pointer[clip_image_f32_batch]", /):
     [
         clip_ctx_p_ctypes,
         c_void_p,
-        POINTER(clip_image_f32_batch),
+        c_void_p,
     ],
     c_bool,
 )
 def clip_image_preprocess(
     ctx: clip_ctx_p,
     img: c_void_p,
-    res_imgs: "_Pointer[clip_image_f32_batch]",
+    res_imgs: c_void_p,
     /,
 ) -> bool:
     ...
@@ -236,15 +208,15 @@ def clip_image_preprocess(
     [
         clip_ctx_p_ctypes,
         c_int,
-        POINTER(clip_image_f32_batch),
+        c_void_p,
         POINTER(c_float),
     ],
     c_bool,
 )
 def clip_image_batch_encode(
     ctx: clip_ctx_p,
     n_threads: c_int,
-    imgs: "_Pointer[clip_image_f32_batch]",
+    imgs: c_void_p,
     vec: c_void_p,
     /,
 ) -> bool: