diff --git a/llmage/init.py b/llmage/init.py index 4a756db..aef56ae 100644 --- a/llmage/init.py +++ b/llmage/init.py @@ -1,5 +1,12 @@ -from llmage.llmclient import get_llm, inference, get_llmcatelogs, \ - get_llms_by_catelog +from llmage.llmclient import ( + get_llm, + inference, + get_llmcatelogs, + get_llms_by_catelog, + default_sysmessage, + default_usrmessage, + default_llmmessage +) from ahserver.serverenv import ServerEnv def load_llmage(): @@ -8,4 +15,7 @@ def load_llmage(): env.inference = inference env.get_llms_by_catelog = get_llms_by_catelog env.get_llmcatelogs = get_llmcatelogs + env.default_sysmessage = default_sysmessage + env.default_usrmessage = default_usrmessage + env.default_llmmessage = default_llmmessage diff --git a/llmage/llmclient.py b/llmage/llmclient.py index f78f654..a50127f 100644 --- a/llmage/llmclient.py +++ b/llmage/llmclient.py @@ -4,6 +4,24 @@ from appPublic.log import debug, exception from uapi.appapi import UAPI, sor_get_callerid, sor_get_uapi from ahserver.serverenv import get_serverenv +def default_sysmessage(): + return """{ + "role":"system", + "content":"{{content}}" + }""" + +def default_usrmessage(): + return """{ + "role":"user", + "content":"{{content}}" + } + +def default_llmmessage(): + return """{ + "role":"assisant", + "content":"{{content}}" + }""" + async def get_llmcatelogs(): db = DBPools() dbname = get_serverenv('get_module_dbname')('llmage') diff --git a/wwwroot/llm_dialog.ui b/wwwroot/llm_dialog.ui index 5bb9eea..9364580 100644 --- a/wwwroot/llm_dialog.ui +++ b/wwwroot/llm_dialog.ui @@ -15,9 +15,9 @@ "modeltypeid":"{{llm.catelogid}}", "output_view":{{llm.output_view}}, "input_from":"userinput", - "system_message_format":{{llm.system_message}}, - "user_message_format":{{llm.user_message}}, - "llm_message_format":{{llm.assisant_message}}, + "system_message_format":{{llm.system_message or default_sysmessage()}}, + "user_message_format":{{llm.user_message or default_usrmessage()}}, + "llm_message_format":{{llm.assisant_message or default_llmmessage()}}, "icon":"{{entire_url('/appbase/get_icon.dspy')}}?id={{llm.iconid}}", "url":"{{entire_url('/llmage/llminference.dspy')}}", "model":"{{llm.model}}",