lionagi 0.0.105__tar.gz → 0.0.106__tar.gz

{lionagi-0.0.105 → lionagi-0.0.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lionagi
-Version: 0.0.105
+Version: 0.0.106
 Summary: Towards automated general intelligence.
 Author: HaiyangLi
 Author-email: Haiyang Li <ocean@lionagi.ai>

{lionagi-0.0.105 → lionagi-0.0.106}/lionagi/session/conversation.py

@@ -40,7 +40,7 @@ class Conversation:
         self.msg = Message()
         self.responses = []
 
-    def initiate_conversation(self, system, instruction, context=None, name=None):
+    def initiate_conversation(self, system=None, instruction=None, context=None, name=None):
         """
         Initiate a conversation with a system setting and user instruction.
 
@@ -55,7 +55,7 @@ class Conversation:
         self.add_messages(instruction=instruction, context=context, name=name)
 
     # modify the message adding to accomodate tools
-    def add_messages(self, system=None, instruction=None, context=None, response=None, tool=None, name=None):
+    def add_messages(self, system=None, instruction=None, context=None, response=None, name=None):
         """
         Add messages to the conversation, including system setting, user instruction, and assistant response.
 
@@ -67,7 +67,8 @@ class Conversation:
             tool (dict): The tool information for the message. Default is None.
             name (str): The name associated with the message. Default is None.
         """
-        msg = self.msg(system=system, instruction=instruction, context=context, response=response, tool=tool, name=name)
+        msg = self.msg(system=system, instruction=instruction, context=context, 
+                       response=response, name=name)
         self.messages.append(msg)
 
     def change_system(self, system):

{lionagi-0.0.105 → lionagi-0.0.106}/lionagi/session/message.py

@@ -40,7 +40,8 @@ class Message:
         self.metadata = None
         self._logger = DataLogger()
     
-    def create_message(self, system=None, instruction=None, context=None, response=None, tool=None, name=None):
+    def create_message(self, system=None, instruction=None, context=None, response=None, name=None):
+
         """
         Create a message based on the provided information.
 
@@ -52,25 +53,29 @@ class Message:
             tool (dict): The tool information for the message. Default is None.
             name (str): The name associated with the message. Default is None.
         """
-        if sum(l_call([system, instruction, response, tool], bool)) > 1:
+        if sum(l_call([system, instruction, response], bool)) > 1:
             raise ValueError("Error: Message cannot have more than one role.")
         
         else: 
             if response:
                 self.role = "assistant"
-                response = response["message"]
-                if str(response['content']) == "None":
-                    try:
-                        # currently can only support a single function response
-                        if response['tool_calls'][0]['type'] == 'function':
-                            self.name = name or ("func_" + response['tool_calls'][0]['function']['name'])
-                            content = response['tool_calls'][0]['function']['arguments']
-                            self.content = {"function":self.name, "arguments": content}
-                    except:
-                        raise ValueError("Response message must be one of regular response or function calling")
-                else:
-                    self.content = response['content']
-                    self.name = name or "assistant"
+                try:
+                    response = response["message"]
+                    if str(response['content']) == "None":
+                        try:
+                            if response['tool_calls'][0]['type'] == 'function':
+                                self.name = name or ("func_" + response['tool_calls'][0]['function']['name'])
+                                content = response['tool_calls'][0]['function']['arguments']
+                                self.content = {"function":self.name, "arguments": content}
+                        except:
+                            raise ValueError("Response message must be one of regular response or function calling")
+                    else:
+                        self.content = response['content']
+                        self.name = name or "assistant"
+                except:
+                    self.name = name or "func_call"
+                    self.content = {"function call result": response}
+                
             elif instruction:
                 self.role = "user"
                 self.content = {"instruction": instruction}
@@ -81,10 +86,6 @@ class Message:
                 self.role = "system"
                 self.content = system
                 self.name = name or "system"
-            elif tool:
-                self.role = "tool"
-                self.content = tool
-                self.name = name or "tool"
     
     def to_json(self):
         """
@@ -106,7 +107,8 @@ class Message:
         self._logger({**self.metadata, **out})
         return out
         
-    def __call__(self, system=None, instruction=None, context=None, response=None, name=None, tool=None):
+    def __call__(self, system=None, instruction=None, context=None, 
+                 response=None, name=None):
         """
         Create and return a message in JSON format.
 
@@ -121,7 +123,8 @@ class Message:
         Returns:
             dict: The message in JSON format.
         """
-        self.create_message(system, instruction, context, response, tool, name)
+        self.create_message(system=system, instruction=instruction, 
+                            context=context, response=response, name=name)
         return self.to_json()
     
     def to_csv(self, dir=None, filename=None, verbose=True, timestamp=True, dir_exist_ok=True, file_exist_ok=False):

{lionagi-0.0.105 → lionagi-0.0.106}/lionagi/session/session.py

@@ -1,5 +1,6 @@
 import aiohttp
 import asyncio
+import json
 from typing import Any
 
 from .conversation import Conversation
@@ -120,7 +121,7 @@ class Session():
         """
         self.api_service = api_service
     
-    async def _output(self, output, invoke=True, out=True):
+    async def _output(self, invoke=True, out=True, tool_parser=None):
         """
         Process the output, invoke tools if needed, and optionally return the output.
 
@@ -134,13 +135,14 @@ class Session():
         """
         if invoke:
             try: 
-                func, args = self.toolmanager._get_function_call(output)
+                func, args = self.toolmanager._get_function_call(self.conversation.responses[-1]['content'])
                 outs = await self.toolmanager.ainvoke(func, args)
-                self.conversation.add_messages(tool=outs)
+                outs = tool_parser(outs) if tool_parser else outs
+                self.conversation.add_messages(response=outs)
             except:
                 pass
         if out:
-            return output
+            return self.conversation.responses[-1]['content']
         
     def register_tools(self, tools, funcs, update=False, new=False, prefix=None, postfix=None):
         """
@@ -157,7 +159,7 @@ class Session():
         funcs = to_list(funcs)
         self.toolmanager.register_tools(tools, funcs, update, new, prefix, postfix)
     
-    async def initiate(self, instruction, system=None, context=None, out=True, name=None, invoke=True, **kwargs) -> Any:
+    async def initiate(self, instruction, system=None, context=None, name=None, invoke=True, out=True, tool_parser=None, **kwargs) -> Any:
         """
         Start a new conversation session with the provided instruction.
 
@@ -177,11 +179,10 @@ class Session():
         system = system or self.system
         self.conversation.initiate_conversation(system=system, instruction=instruction, context=context, name=name)
         await self.call_chatcompletion(**config)
-        output = self.conversation.responses[-1]['content']
         
-        return await self._output(output, invoke, out)
+        return await self._output(invoke, out, tool_parser)
 
-    async def followup(self, instruction, system=None, context=None, out=True, name=None, invoke=True, **kwargs) -> Any:
+    async def followup(self, instruction, system=None, context=None, out=True, name=None, invoke=True, tool_parser=None, **kwargs) -> Any:
         """
         Continue the conversation with the provided instruction.
 
@@ -202,9 +203,9 @@ class Session():
         self.conversation.add_messages(instruction=instruction, context=context, name=name)
         config = {**self.llmconfig, **kwargs}
         await self.call_chatcompletion(**config)
-        output = self.conversation.responses[-1]['content']
+
         
-        return await self._output(output, invoke, out)
+        return await self._output(invoke, out, tool_parser)
     
     def create_payload_chatcompletion(self, **kwargs):
         """
@@ -288,4 +289,21 @@ class Session():
         dir = dir or self._logger.dir
         if dir is None:
             raise ValueError("No directory specified.")
-        self._logger.to_csv(dir=dir, filename=filename, **kwags)
+        self._logger.to_csv(dir=dir, filename=filename, **kwags)
+
+    def is_invoked(self):
+        msg = self.conversation.messages[-1]
+        try: 
+            if "function call result" in json.loads(msg['content']).keys():
+                return True
+        except: 
+            return False
+
+    async def auto_followup(self, instruct, num=3, tool_parser=None, **kwags):
+        cont_ = True
+        while num > 0 and cont_ is True:
+            await self.followup(instruct,tool_parser=tool_parser, tool_choice="auto", **kwags)
+            num -= 1
+            cont_ = True if self.is_invoked() else False
+        if num == 0:
+            await self.followup(instruct, **kwags)

{lionagi-0.0.105 → lionagi-0.0.106}/lionagi/utils/tool_util.py

@@ -92,32 +92,32 @@ class ToolManager:
         name = f"{prefix or ''}{name}{postfix or '1'}" if new else name                
         self.registry.update(self._to_dict(name, function, content)) 
                 
-    def invoke(self, name, args):
+    def invoke(self, name, kwargs):
         """
         Invoke a registered function with the provided arguments.
 
         Parameters:
             name (str): The name of the function to invoke.
-            args (dict): The arguments to pass to the function.
+            kwargs (dict): The arguments to pass to the function.
 
         Returns:
             Any: The result of invoking the function.
         """
         if self._name_existed(name):
             try:
-                return self.registry[name](**args)
+                return self.registry[name](**kwargs)
             except Exception as e:
-                raise ValueError(f"Error when invoking function {name} with arguments {args} with error message {e}")
+                raise ValueError(f"Error when invoking function {name} with arguments {kwargs} with error message {e}")
         else: 
             raise ValueError(f"Function {name} is not registered.")
     
-    async def ainvoke(self, name, args):
+    async def ainvoke(self, name, kwargs):
         """
         Asynchronously invoke a registered function with the provided arguments.
 
         Parameters:
             name (str): The name of the function to invoke.
-            args (dict): The arguments to pass to the function.
+            kwargs (dict): The arguments to pass to the function.
 
         Returns:
             Any: The result of invoking the function asynchronously.
@@ -127,11 +127,11 @@ class ToolManager:
             function = self.registry[name]["function"]
             try:
                 if asyncio.iscoroutinefunction(function):
-                    return await function(**args)
+                    return await function(**kwargs)
                 else:
-                    return function(**args)
+                    return function(**kwargs)
             except Exception as e:
-                raise ValueError(f"Error when invoking function {name} with arguments {args} with error message {e}")
+                raise ValueError(f"Error when invoking function {name} with arguments {kwargs} with error message {e}")
         else: 
             raise ValueError(f"Function {name} is not registered.")
     

lionagi-0.0.106/lionagi/version.py

@@ -0,0 +1 @@
+__version__ = "0.0.106"

{lionagi-0.0.105 → lionagi-0.0.106}/lionagi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lionagi
-Version: 0.0.105
+Version: 0.0.106
 Summary: Towards automated general intelligence.
 Author: HaiyangLi
 Author-email: Haiyang Li <ocean@lionagi.ai>

lionagi-0.0.105/lionagi/version.py

@@ -1 +0,0 @@
-__version__ = "0.0.105"