Merge pull request #9 from jackrabbithanna/images-cont

Images cont

Author: jackrabbithanna

meson.build

@@ -1,5 +1,5 @@
 project('gnollama',
-          version: '0.4.0',
+          version: '0.5.0',
     meson_version: '>= 1.0.0',
   default_options: [ 'warning_level=2', 'werror=false', ],
 )

src/bubbles.py

@@ -4,7 +4,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from gi.repository import Gtk, GObject, Pango, GLib
+import base64
+from gi.repository import Gtk, GObject, Pango, GLib, Gdk
 from .markdown_view import MarkdownView
 
 class ChatBubble(Gtk.ListBoxRow):
@@ -40,9 +41,39 @@ def __init__(self, is_user=False, **kwargs):
 class UserBubble(ChatBubble):
     __gtype_name__ = 'UserBubble'
 
-    def __init__(self, text, **kwargs):
+
+    def __init__(self, text, images=None, **kwargs):
         super().__init__(is_user=True, **kwargs)
 
+        # If we have images, show them
+        if images:
+            images_box = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL)
+            images_box.set_spacing(6)
+            images_box.set_halign(Gtk.Align.END)
+            
+            for img_b64 in images:
+                try:
+                    # Decode base64
+                    start_idx = 0
+                    if "," in img_b64:
+                        start_idx = img_b64.find(",") + 1
+                    
+                    img_data = base64.b64decode(img_b64[start_idx:])
+                    bytes_data = GLib.Bytes.new(img_data)
+                    texture = Gdk.Texture.new_from_bytes(bytes_data)
+                    
+                    picture = Gtk.Picture.new_for_paintable(texture)
+                    picture.set_content_fit(Gtk.ContentFit.SCALE_DOWN)
+                    picture.set_size_request(200, 200) # Max size
+                    picture.set_can_shrink(True) # Allow shrinking
+                    
+                    # Wrap in frame or styling if needed, for now just the picture
+                    images_box.append(picture)
+                except Exception as e:
+                    print(f"Failed to load image in bubble: {e}")
+            
+            self.bubble_box.append(images_box)
+
         label = Gtk.Label(label=text)
         label.set_wrap(True)
         label.set_max_width_chars(50)

src/main.py

@@ -54,7 +54,7 @@ def on_about_action(self, *args):
         about = Adw.AboutDialog(application_name='gnollama',
                                 application_icon='com.github.jackrabbithanna.Gnollama',
                                 developer_name='Jackrabbithanna',
-                                version='0.4.0',
+                                version='0.5.0',
                                 developers=['Jackrabbithanna'],
                                 copyright='© 2025 Jackrabbithanna')
         # Translators: Replace "translator-credits" with your name/username, and optionally an email or URL.

src/tab.py

@@ -42,7 +42,8 @@ def append_response_chunk(self, text):
     def on_response_complete(self, tab, model_name):
         msg = {
             "role": "assistant", 
-            "content": self.current_response_full_text
+            "content": self.current_response_full_text,
+            "model": model_name
         }
         if self.current_thinking_full_text:
             msg["thinking_content"] = self.current_thinking_full_text
@@ -62,6 +63,15 @@ def on_response_complete(self, tab, model_name):
             thinking_val = getattr(self, 'current_thinking_val', None)
             if thinking_val is not None:
                 options['thinking_val'] = thinking_val
+                
+            # Save "logprobs" setting if present
+            logprobs_val = getattr(self, 'current_logprobs', None)
+            if logprobs_val is not None:
+                options['logprobs'] = logprobs_val
+                
+            top_logprobs_val = getattr(self, 'current_top_logprobs', None)
+            if top_logprobs_val is not None:
+                options['top_logprobs'] = top_logprobs_val
 
             self.storage.save_chat(self.chat_id, self.history, model=model_name, options=options, system=system)
 
@@ -84,6 +94,8 @@ def process(self, tab, **kwargs):
         self.current_options = kwargs.get('options')
         self.current_system = system
         self.current_thinking_val = kwargs.get('thinking')
+        self.current_logprobs = kwargs.get('logprobs')
+        self.current_top_logprobs = kwargs.get('top_logprobs')
 
         # Build messages
         messages = []
@@ -94,7 +106,10 @@ def process(self, tab, **kwargs):
         messages.append({"role": "user", "content": prompt})
 
         # Update our history with the user's message now
-        self.history.append({"role": "user", "content": prompt})
+        msg = {"role": "user", "content": prompt}
+        if kwargs.get('images'):
+             msg['images'] = kwargs['images']
+        self.history.append(msg)
 
         # Reset current response accumulator
         self.current_response_full_text = ""
@@ -380,9 +395,6 @@ def on_send_clicked(self, widget):
             truncated = prompt[:20] + "..." if len(prompt) > 20 else prompt
             self.tab_label.set_label(truncated)
 
-        self.add_message(prompt, sender=_("You"))
-        self.entry.set_text("")
-        
         # Get selected model
         selected_item = self.model_dropdown.get_selected_item()
         model_name = "llama3" # Fallback
@@ -404,13 +416,16 @@ def on_send_clicked(self, widget):
             # Clear image after reading
             self.on_clear_image_clicked(None)
 
+        self.add_message(prompt, sender=_("You"), images=images)
+        self.entry.set_text("")
+        
         thread = threading.Thread(target=self.process_request, args=(prompt, model_name, images))
         thread.daemon = True
         thread.start()
 
-    def add_message(self, text, sender="System"):
+    def add_message(self, text, sender="System", images=None):
         if sender == _("You"):
-            bubble = UserBubble(text)
+            bubble = UserBubble(text, images=images)
             self.chat_box.append(bubble)
         else:
             # System message or error
@@ -529,10 +544,12 @@ def load_initial_history(self, history):
             thinking_content = msg.get('thinking_content')
 
             if role == 'user':
-                self.add_message(content, sender=_("You"))
+                images = msg.get('images')
+                self.add_message(content, sender=_("You"), images=images)
             elif role == 'assistant':
                 # Reconstruct with AiBubble
-                bubble = AiBubble(model_name="Assistant")
+                model_name = msg.get('model', 'Assistant')
+                bubble = AiBubble(model_name=model_name)
                 if thinking_content:
                     bubble.append_thinking(thinking_content)
                 bubble.append_text(content)
@@ -611,6 +628,12 @@ def load_chat_settings(self, chat_data):
             if 'stats' in options:
                 self.stats_check.set_active(options['stats'])
 
+            # Logprobs
+            if 'logprobs' in options:
+                self.logprobs_check.set_active(options['logprobs'])
+            if 'top_logprobs' in options and options['top_logprobs'] is not None:
+                self.top_logprobs_entry.set_text(str(options['top_logprobs']))
+
     def process_request(self, prompt, model_name, images=None):
         host = self.host_entry.get_text()