cleanup

Author: hazelnutcloud

godot/examples/simple/message.gd

@@ -1,23 +1,42 @@
 class_name Message
 extends Node
 
+var ai_avatar = preload ("res://addons/godot-llama-cpp/assets/godot-llama-cpp-1024x1024.svg")
+var user_avatar = preload ("res://examples/simple/user.svg")
+var system_avatar = preload("res://examples/simple/system.svg")
+var stylebox: StyleBoxTexture = StyleBoxTexture.new()
+
 @onready var text_container = %Text
 @onready var icon = %Panel
-@export_enum("user", "assistant") var sender: String
+@export_enum("user", "assistant", "system") var sender: String:
+	get:
+		return sender
+	set(value):
+		sender = value
+		if icon == null: return
+		if value == "user":
+			stylebox.texture = user_avatar
+		elif value == "assistant":
+			stylebox.texture = ai_avatar
+		else:
+			stylebox.texture = system_avatar
+		icon.add_theme_stylebox_override("panel", stylebox)
 @export var include_in_prompt: bool = true
-var text:
+@export var text: String:
 	get:
-		return text_container.text
+		return text
 	set(value):
+		text = value
+		if text_container == null: 
+			return
 		text_container.text = value
 
 var completion_id: int = -1
 var pending: bool = false
 var errored: bool = false
 
-func set_text(new_text: String):
-	text_container.text = new_text
-	
-func append_text(new_text: String):
-	text_container.text += new_text
+func _ready():
+	text_container.text = text
+	sender = sender
+
 

godot/examples/simple/message.tscn

@@ -1,13 +1,10 @@
-[gd_scene load_steps=5 format=3 uid="uid://t862t0v8ht2q"]
+[gd_scene load_steps=4 format=3 uid="uid://t862t0v8ht2q"]
 
 [ext_resource type="Script" path="res://examples/simple/message.gd" id="1_pko33"]
-[ext_resource type="Texture2D" uid="uid://dplw232htshgc" path="res://addons/godot-llama-cpp/assets/godot-llama-cpp-1024x1024.svg" id="2_dvc7y"]
+[ext_resource type="Texture2D" uid="uid://dplw232htshgc" path="res://addons/godot-llama-cpp/assets/godot-llama-cpp-1024x1024.svg" id="2_xf8it"]
 
-[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_t8bgj"]
-texture = ExtResource("2_dvc7y")
-
-[sub_resource type="Theme" id="Theme_bw3pb"]
-Panel/styles/panel = SubResource("StyleBoxTexture_t8bgj")
+[sub_resource type="StyleBoxTexture" id="StyleBoxTexture_ki268"]
+texture = ExtResource("2_xf8it")
 
 [node name="RichTextLabel" type="HBoxContainer"]
 anchors_preset = 15
@@ -18,14 +15,13 @@ grow_vertical = 2
 size_flags_horizontal = 3
 theme_override_constants/separation = 20
 script = ExtResource("1_pko33")
-sender = "assistant"
 
 [node name="Panel" type="Panel" parent="."]
 unique_name_in_owner = true
 custom_minimum_size = Vector2(80, 80)
 layout_mode = 2
 size_flags_vertical = 0
-theme = SubResource("Theme_bw3pb")
+theme_override_styles/panel = SubResource("StyleBoxTexture_ki268")
 
 [node name="Text" type="RichTextLabel" parent="."]
 unique_name_in_owner = true

godot/examples/simple/simple.gd

@@ -9,7 +9,7 @@ func _on_text_edit_submit(input: String) -> void:
 	handle_input(input)
 
 func handle_input(input: String) -> void:
-	var messages = [{ "sender": "system", "text": "You are a pirate chatbot who always responds in pirate speak!" }]
+	var messages = []
 	messages.append_array(messages_container.get_children().filter(func(msg: Message): return msg.include_in_prompt).map(
 		func(msg: Message) -> Dictionary:
 			return { "text": msg.text, "sender": msg.sender }
@@ -22,7 +22,7 @@ func handle_input(input: String) -> void:
 
 	var user_message: Message = message.instantiate()
 	messages_container.add_child(user_message)
-	user_message.set_text(input)
+	user_message.text = input
 	user_message.sender = "user"
 	user_message.completion_id = completion_id
 
@@ -31,7 +31,6 @@ func handle_input(input: String) -> void:
 	ai_message.sender = "assistant"
 	ai_message.completion_id = completion_id
 	ai_message.pending = true
-	ai_message.grab_focus()
 
 func _on_llama_context_completion_generated(chunk: Dictionary) -> void:
 	var completion_id = chunk.id
@@ -43,6 +42,6 @@ func _on_llama_context_completion_generated(chunk: Dictionary) -> void:
 		elif chunk.has("text"):
 			if msg.pending:
 				msg.pending = false
-				msg.set_text(chunk["text"])
+				msg.text = chunk["text"]
 			else:
-				msg.append_text(chunk["text"])
+				msg.text += chunk["text"]

godot/examples/simple/simple.tscn

@@ -45,10 +45,8 @@ theme_override_constants/separation = 30
 
 [node name="RichTextLabel2" parent="Panel/MarginContainer/VBoxContainer/ScrollContainer/MessagesContainer" instance=ExtResource("2_7iip7")]
 layout_mode = 2
-include_in_prompt = false
-
-[node name="Text" parent="Panel/MarginContainer/VBoxContainer/ScrollContainer/MessagesContainer/RichTextLabel2" index="1"]
-text = "How can I help you?"
+sender = "system"
+text = "You are a pirate chatbot who always responds in pirate speak!"
 
 [node name="HBoxContainer" type="HBoxContainer" parent="Panel/MarginContainer/VBoxContainer"]
 layout_mode = 2
@@ -74,5 +72,3 @@ unique_name_in_owner = true
 [connection signal="submit" from="Panel/MarginContainer/VBoxContainer/HBoxContainer/TextEdit" to="." method="_on_text_edit_submit"]
 [connection signal="pressed" from="Panel/MarginContainer/VBoxContainer/HBoxContainer/Button" to="Panel/MarginContainer/VBoxContainer/HBoxContainer/TextEdit" method="_on_button_pressed"]
 [connection signal="completion_generated" from="LlamaContext" to="." method="_on_llama_context_completion_generated"]
-
-[editable path="Panel/MarginContainer/VBoxContainer/ScrollContainer/MessagesContainer/RichTextLabel2"]

godot/examples/simple/system.svg

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ckurx0p0r4v1t"
+path="res://.godot/imported/system.svg-d1b27c65464663409463ff5f8dfc9953.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://examples/simple/system.svg"
+dest_files=["res://.godot/imported/system.svg-d1b27c65464663409463ff5f8dfc9953.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/examples/simple/system.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://l8xuk1t4hnof"
+path="res://.godot/imported/user.svg-fbe84d041cfa09d8365142161c3b195f.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://examples/simple/user.svg"
+dest_files=["res://.godot/imported/user.svg-fbe84d041cfa09d8365142161c3b195f.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/examples/simple/user.svg

@@ -18,7 +18,3 @@ config/icon="res://icon.svg"
 [editor_plugins]
 
 enabled=PackedStringArray("res://addons/godot-llama-cpp/plugin.cfg")
-
-[gui]
-
-theme/default_theme_scale=2.0

godot/examples/simple/user.svg.import

@@ -67,8 +67,6 @@ void LlamaContext::_enter_tree() {
 		return;
 	}
 
-	model->load_model();
-
 	if (model->model == NULL) {
 		UtilityFunctions::printerr(vformat("%s: Failed to initialize llama context, model property not defined", __func__));
 		return;
@@ -336,9 +334,6 @@ void LlamaContext::_exit_tree() {
 	if (ctx) {
 		llama_free(ctx);
 	}
-	if (model->model) {
-		llama_free_model(model->model);
-	}
 	if (sampling_ctx) {
 		llama_sampling_free(sampling_ctx);
 	}

godot/project.godot

@@ -3,6 +3,7 @@
 #include <godot_cpp/classes/project_settings.hpp>
 #include <godot_cpp/core/class_db.hpp>
 #include <godot_cpp/variant/utility_functions.hpp>
+#include <godot_cpp/classes/engine.hpp>
 
 using namespace godot;
 
@@ -23,6 +24,10 @@ void LlamaModel::load_model() {
 		return;
 	}
 
+	if (Engine::get_singleton()->is_editor_hint()) {
+		return;
+	}
+
 	String absPath = ProjectSettings::get_singleton()->globalize_path(get_path());
 
 	model = llama_load_model_from_file(absPath.utf8().get_data(), model_params);

llama.cpp

@@ -20,6 +20,7 @@ Variant godot::LlamaModelLoader::_load(const String &path, const String &origina
 	}
 
   model->set_path(path);
+  model->load_model();
 
 	return { model };
 }