From a36d1f196618033501425526f370c058960cf1ec Mon Sep 17 00:00:00 2001 From: Dita Aji Pratama Date: Sat, 29 Aug 2026 22:46:29 +0700 Subject: [PATCH] Small refactor --- hendrik.py | 81 +++++++++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 47 deletions(-) diff --git a/hendrik.py b/hendrik.py index 8711165..01ef983 100644 --- a/hendrik.py +++ b/hendrik.py @@ -1,82 +1,69 @@ -import os, sys -import argparse - -import threading, time, signal +import os, sys, argparse, threading, time, signal import config -from tools import coder, carrack, ragroleplay, vision, imagegen +from lib import gadget, personality, moop, ragroleplay as ragroleplay_lib +from tools import coder, carrack, ragroleplay as ragroleplay_tools, vision, imagegen +from services.llm_client import LLMClient from services.xmpp_client import XMPPClient from services.telegram_client import TelegramClient -from services.llm_client import LLMClient - -from lib import gadget, personality, moop -import lib.ragroleplay as ragroleplay_lib from interfaces.tui import HendrikTUI tools_definition = [ - # Coder Tools gadget.tools_mapping( schema = coder.schema_read_file, handler = coder.read_file ), gadget.tools_mapping( schema = coder.schema_write_file, handler = coder.write_file ), gadget.tools_mapping( schema = coder.schema_edit_file, handler = coder.edit_file ), - gadget.tools_mapping( schema = coder.schema_run_bash, handler = coder.run_bash ), - gadget.tools_mapping( schema = coder.schema_search_code, handler = coder.search_code ), - gadget.tools_mapping( schema = coder.schema_git_operation, handler = coder.git_operation ), - gadget.tools_mapping( schema = coder.schema_workspace_change, handler = coder.workspace_change ), gadget.tools_mapping( schema = coder.schema_search_grep, handler = coder.search_grep ), gadget.tools_mapping( schema = coder.schema_search_glob, handler = coder.search_glob ), - # Carrack Tools gadget.tools_mapping( schema = carrack.schema_sendhttprequest, handler = carrack.sendhttprequest ), - # Vision Tools - gadget.tools_mapping( schema = vision.schema_describe_image, handler = vision.describe_image ), - + gadget.tools_mapping( schema = vision.schema_describe_image, handler = vision.describe_image ), # Image Generation Tools - gadget.tools_mapping( schema = imagegen.schema_generate_image, handler = imagegen.generate_image ), + gadget.tools_mapping( schema = imagegen.schema_generate_image, handler = imagegen.generate_image ), # Rag Roleplay Tools - gadget.tools_mapping( schema = ragroleplay.schema_users_store, handler = ragroleplay.users_store ), - gadget.tools_mapping( schema = ragroleplay.schema_user_load, handler = ragroleplay.user_load ), # s_load - gadget.tools_mapping( schema = ragroleplay.schema_users_update, handler = ragroleplay.users_update ), - gadget.tools_mapping( schema = ragroleplay.schema_users_delete, handler = ragroleplay.users_delete ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_users_store, handler = ragroleplay_tools.users_store ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_user_load, handler = ragroleplay_tools.user_load ), # s_load + gadget.tools_mapping( schema = ragroleplay_tools.schema_users_update, handler = ragroleplay_tools.users_update ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_users_delete, handler = ragroleplay_tools.users_delete ), - gadget.tools_mapping( schema = ragroleplay.schema_memories_summarize, handler = ragroleplay.memories_summarize ), - gadget.tools_mapping( schema = ragroleplay.schema_memories_store, handler = ragroleplay.memories_store ), - gadget.tools_mapping( schema = ragroleplay.schema_memories_latest, handler = ragroleplay.memories_latest ), # _load_latest - gadget.tools_mapping( schema = ragroleplay.schema_memories_filter, handler = ragroleplay.memories_filter ), # _load - gadget.tools_mapping( schema = ragroleplay.schema_memories_check, handler = ragroleplay.memories_check ), # ? - gadget.tools_mapping( schema = ragroleplay.schema_memories_update, handler = ragroleplay.memories_update ), - gadget.tools_mapping( schema = ragroleplay.schema_memories_delete, handler = ragroleplay.memories_delete ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_memories_summarize, handler = ragroleplay_tools.memories_summarize ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_memories_store, handler = ragroleplay_tools.memories_store ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_memories_latest, handler = ragroleplay_tools.memories_latest ), # _load_latest + gadget.tools_mapping( schema = ragroleplay_tools.schema_memories_filter, handler = ragroleplay_tools.memories_filter ), # _load + gadget.tools_mapping( schema = ragroleplay_tools.schema_memories_check, handler = ragroleplay_tools.memories_check ), # ? + gadget.tools_mapping( schema = ragroleplay_tools.schema_memories_update, handler = ragroleplay_tools.memories_update ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_memories_delete, handler = ragroleplay_tools.memories_delete ), - gadget.tools_mapping( schema = ragroleplay.schema_worlds_store, handler = ragroleplay.worlds_store ), - gadget.tools_mapping( schema = ragroleplay.schema_worlds_filter, handler = ragroleplay.worlds_filter ), - gadget.tools_mapping( schema = ragroleplay.schema_worlds_update, handler = ragroleplay.worlds_update ), - gadget.tools_mapping( schema = ragroleplay.schema_worlds_delete, handler = ragroleplay.worlds_delete ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_worlds_store, handler = ragroleplay_tools.worlds_store ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_worlds_filter, handler = ragroleplay_tools.worlds_filter ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_worlds_update, handler = ragroleplay_tools.worlds_update ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_worlds_delete, handler = ragroleplay_tools.worlds_delete ), - gadget.tools_mapping( schema = ragroleplay.schema_objects_store, handler = ragroleplay.objects_store ), - gadget.tools_mapping( schema = ragroleplay.schema_objects_filter, handler = ragroleplay.objects_filter ), - gadget.tools_mapping( schema = ragroleplay.schema_objects_update, handler = ragroleplay.objects_update ), - gadget.tools_mapping( schema = ragroleplay.schema_objects_delete, handler = ragroleplay.objects_delete ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_objects_store, handler = ragroleplay_tools.objects_store ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_objects_filter, handler = ragroleplay_tools.objects_filter ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_objects_update, handler = ragroleplay_tools.objects_update ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_objects_delete, handler = ragroleplay_tools.objects_delete ), - gadget.tools_mapping( schema = ragroleplay.schema_outfits_store, handler = ragroleplay.outfits_store ), - gadget.tools_mapping( schema = ragroleplay.schema_outfits_filter, handler = ragroleplay.outfits_filter ), - gadget.tools_mapping( schema = ragroleplay.schema_outfits_update, handler = ragroleplay.outfits_update ), - gadget.tools_mapping( schema = ragroleplay.schema_outfits_delete, handler = ragroleplay.outfits_delete ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_outfits_store, handler = ragroleplay_tools.outfits_store ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_outfits_filter, handler = ragroleplay_tools.outfits_filter ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_outfits_update, handler = ragroleplay_tools.outfits_update ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_outfits_delete, handler = ragroleplay_tools.outfits_delete ), - gadget.tools_mapping( schema = ragroleplay.schema_todos_store, handler = ragroleplay.todos_store ), - gadget.tools_mapping( schema = ragroleplay.schema_todos_filter, handler = ragroleplay.todos_filter ), - gadget.tools_mapping( schema = ragroleplay.schema_todos_update, handler = ragroleplay.todos_update ), - gadget.tools_mapping( schema = ragroleplay.schema_todos_delete, handler = ragroleplay.todos_delete ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_todos_store, handler = ragroleplay_tools.todos_store ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_todos_filter, handler = ragroleplay_tools.todos_filter ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_todos_update, handler = ragroleplay_tools.todos_update ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_todos_delete, handler = ragroleplay_tools.todos_delete ), - gadget.tools_mapping( schema = ragroleplay.schema_end_session, handler = ragroleplay.end_session ), + gadget.tools_mapping( schema = ragroleplay_tools.schema_end_session, handler = ragroleplay_tools.end_session ), ]