Merge remote-tracking branch 'origin/main'

Author: solovieff

kibernikto/bots/cybernoone/_cybernoone.py

@@ -58,13 +58,13 @@ async def heed_and_reply(self, message: str, author=NOT_GIVEN, save_to_history=T
                 print(traceback.format_exc())
                 return f"Я не справился! Горе мне! {str(e)}"
 
-    def _reset(self):
+    def _reset(self, **kwargs):
         """
         Adding additional data to default system message
 
         :return:
         """
-        super()._reset()
+        super()._reset(**kwargs)
         wai = self.full_config.who_am_i.format(self.full_config.name)
         if self.chat_info and self.add_chat_info:
             conversation_information = self._get_telegram_chat_info()
@@ -74,19 +74,18 @@ def _reset(self):
     def _get_telegram_chat_info(self):
         if self.chat_info is None:
             return ""
+        chat_descr_string = "[Static info from client app]\n"
         if self.chat_info.is_personal:
-            chat_descr_string = "[Interlocutor info]"
             chat_descr_string += f"Name: {self.chat_info.aiogram_user.full_name}."
             if self.chat_info.bio:
                 chat_descr_string += f"Bio: {self.chat_info.bio}."
             if self.chat_info.birthday:
                 chat_descr_string += f"Birthday: {self.chat_info.birthday}."
         else:
-            chat_descr_string = "Chat group info:\n"
             chat_descr_string += f"Title: {self.chat_info.full_name}."
             if self.chat_info.description:
                 chat_descr_string += f"Description: {self.chat_info.description}."
-        chat_descr_string = f"{chat_descr_string}"
+        chat_descr_string = f"{chat_descr_string}\n[End static info from client app]\n"
 
         # print(f"{self.__class__.__name__}: {chat_descr_string}")
         return chat_descr_string
@@ -106,8 +105,8 @@ async def update_configuration(self, config_to_use: OpenAiExecutorConfig):
         self.tools = config_to_use.tools
 
         print(f'- {self.__class__.__name__} for "{self.chat_info.full_name}" (id: {self.full_config.id}) update!')
-        print(f'- {self.tools_names}')
-        print(f'- {self.max_messages}')
-        print(f'- {self.model}')
-        print(f'- {self.full_config.who_am_i}')
+        # print(f'- {self.tools_names}')
+        # print(f'- {self.max_messages}')
+        # print(f'- {self.model}')
+        # print(f'- {self.full_config.who_am_i}')
         self._reset()

kibernikto/interactors/llm_executor.py

@@ -39,7 +39,7 @@ class LLMExecutorConfig(BaseModel):
     summarize_request: str | None = AI_SETTINGS.OPENAI_SUMMARY
     max_words_before_summary: int = AI_SETTINGS.OPENAI_MAX_WORDS
     tool_call_hole_deepness: int = AI_SETTINGS.OPENAI_TOOLS_DEEPNESS_LEVEL
-    reaction_calls: list = ('никто', 'хонда', 'урод')
+    reaction_calls: list = ['никто', 'хонда', 'урод'],
     tools: List[Toolbox] = []
     hide_errors: bool = False
 

kibernikto/interactors/openai_executor.py

@@ -38,7 +38,7 @@ class OpenAiExecutorConfig(BaseModel):
     summarize_request: str | None = AI_SETTINGS.OPENAI_SUMMARY
     max_words_before_summary: int = AI_SETTINGS.OPENAI_MAX_WORDS
     tool_call_hole_deepness: int = AI_SETTINGS.OPENAI_TOOLS_DEEPNESS_LEVEL
-    reaction_calls: list = ('никто', 'хонда', 'урод')
+    reaction_calls: list = ['никто', 'хонда', 'урод']
     tools: List[Toolbox] = []
     hide_errors: bool = False
     app_id: str = AI_SETTINGS.OPENAI_INSTANCE_ID
@@ -170,9 +170,19 @@ async def heed(self, message, author=None):
         self.reset_if_usercall(message)
         pass
 
-    async def single_request(self, message, model=None, response_type: Literal['text', 'json_object'] = 'text'):
+    async def single_request(self, message, model=None, response_type: Literal['text', 'json_object'] = 'text',
+                             additional_content: dict = None):
         this_message = dict(content=f"{message}", role=OpenAIRoles.user.value)
 
+        if additional_content:
+            this_message = {
+                "role": "user",
+                "content": [
+                    {"type": "text", "text": message},
+                    additional_content
+                ]
+            }
+
         response_format = {"type": response_type}
 
         headers = self.default_headers
@@ -240,9 +250,12 @@ async def _run_for_messages(self, full_prompt, author=NOT_GIVEN,
         usage_dict = self.process_usage(completion.usage)
         return choice, usage_dict
 
-    async def heed_and_reply(self, message: str, author=NOT_GIVEN, save_to_history=True,
-                             response_type: Literal['text', 'json_object'] = 'text',
-                             additional_content: dict = None, with_history: bool = True) -> str:
+    async def heed_and_reply(self, **kwargs):
+        return await self.request_llm(**kwargs)
+
+    async def request_llm(self, message: str, author=NOT_GIVEN, save_to_history=True,
+                          response_type: Literal['text', 'json_object'] = 'text',
+                          additional_content: dict = None, with_history: bool = True) -> str:
         """
         Sends message to OpenAI and receives response. Can preprocess user message and work before actual API call.
         :param additional_content: for example type: image_url

kibernikto/utils/environment.py

@@ -1,15 +1,15 @@
-from kibernikto.bots.ai_settings import AI_SETTINGS
+from kibernikto.bots.ai_settings import AI_SETTINGS, AiSettings
 
 import logging
 
 from kibernikto.plugins import KiberniktoPlugin
 
 
-def print_banner():
+def print_banner(ai_settings: AiSettings = AI_SETTINGS):
     print("\t")
-    print('\t%-20s%-20s' % ("avatar model:", AI_SETTINGS.OPENAI_API_MODEL))
-    print('\t%-20s%-20s' % ("avatar host:", AI_SETTINGS.OPENAI_BASE_URL))
-    print('\t%-20s%-20s' % ("avatar temp:", AI_SETTINGS.OPENAI_TEMPERATURE))
+    print('\t%-20s%-20s' % ("avatar model:", ai_settings.OPENAI_API_MODEL))
+    print('\t%-20s%-20s' % ("avatar host:", ai_settings.OPENAI_BASE_URL))
+    print('\t%-20s%-20s' % ("avatar temp:", ai_settings.OPENAI_TEMPERATURE))
 
 
 def print_plugin_banner(kbnktp_plgn: KiberniktoPlugin):
@@ -34,16 +34,16 @@ def configure_logger():
         datefmt='%Y-%m-%d:%H:%M:%S',
         level=logging.DEBUG)
     logger = logging.getLogger('openai')
-    logger.setLevel(logging.INFO)
+    logger.setLevel(logging.WARNING)
 
     logger = logging.getLogger('aiosqlite')
     logger.setLevel(logging.ERROR)
 
     logger = logging.getLogger('httpcore')
-    logger.setLevel(logging.INFO)
+    logger.setLevel(logging.WARNING)
 
     logger = logging.getLogger('httpx')
-    logger.setLevel(logging.INFO)
+    logger.setLevel(logging.WARNING)
 
     logger = logging.getLogger('asyncio')
-    logger.setLevel(logging.INFO)
+    logger.setLevel(logging.WARNING)