praisonaiagents 0.0.6__py3-none-any.whl → 0.0.8__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -17,13 +17,92 @@ from ..main import (
 )
 
 class Agent:
+    def _generate_tool_definition(self, function_name):
+        """
+        Generate a tool definition from a function name by inspecting the function.
+        """
+        # First try to get the tool definition if it exists
+        tool_def_name = f"{function_name}_definition"
+        tool_def = globals().get(tool_def_name)
+        if not tool_def:
+            import __main__
+            tool_def = getattr(__main__, tool_def_name, None)
+        
+        if tool_def:
+            return tool_def
+
+        # If no definition exists, try to generate one from the function
+        func = globals().get(function_name)
+        if not func:
+            import __main__
+            func = getattr(__main__, function_name, None)
+
+        if not func or not callable(func):
+            return None
+
+        import inspect
+        sig = inspect.signature(func)
+        parameters = {
+            "type": "object",
+            "properties": {},
+            "required": []
+        }
+        
+        # Parse docstring for parameter descriptions
+        docstring = inspect.getdoc(func)
+        param_descriptions = {}
+        if docstring:
+            import re
+            param_section = re.split(r'\s*Args:\s*', docstring)
+            if len(param_section) > 1:
+                param_lines = param_section[1].split('\n')
+                for line in param_lines:
+                    line = line.strip()
+                    if line and ':' in line:
+                        param_name, param_desc = line.split(':', 1)
+                        param_descriptions[param_name.strip()] = param_desc.strip()
+
+        for name, param in sig.parameters.items():
+            param_type = "string"  # Default type
+            if param.annotation != inspect.Parameter.empty:
+                if param.annotation == int:
+                    param_type = "integer"
+                elif param.annotation == float:
+                    param_type = "number"
+                elif param.annotation == bool:
+                    param_type = "boolean"
+                elif param.annotation == list:
+                    param_type = "array"
+                elif param.annotation == dict:
+                    param_type = "object"
+            
+            param_info = {"type": param_type}
+            if name in param_descriptions:
+                param_info["description"] = param_descriptions[name]
+            
+            parameters["properties"][name] = param_info
+            if param.default == inspect.Parameter.empty:
+                parameters["required"].append(name)
+
+        # Extract description from docstring
+        description = docstring.split('\n')[0] if docstring else f"Function {function_name}"
+
+        return {
+            "type": "function",
+            "function": {
+                "name": function_name,
+                "description": description,
+                "parameters": parameters
+            }
+        }
+
     def __init__(
         self,
         name: str,
         role: str,
         goal: str,
         backstory: str,
-        llm: Optional[Union[str, Any]] = "gpt-4o-mini",
+        llm: Optional[Union[str, Any]] = "gpt-4o",
         tools: Optional[List[Any]] = None,
         function_calling_llm: Optional[Any] = None,
         max_iter: int = 20,
@@ -46,14 +125,16 @@ class Agent:
         use_system_prompt: Optional[bool] = True,
         markdown: bool = True,
         self_reflect: bool = True,
-        max_reflection_iter: int = 3
+        max_reflect: int = 3,
+        min_reflect: int = 1,
+        reflect_llm: Optional[str] = None
     ):
         self.name = name
         self.role = role
         self.goal = goal
         self.backstory = backstory
         self.llm = llm
-        self.tools = tools if tools else []
+        self.tools = tools if tools else []  # Store original tools
         self.function_calling_llm = function_calling_llm
         self.max_iter = max_iter
         self.max_rpm = max_rpm
@@ -76,21 +157,29 @@ class Agent:
         self.chat_history = []
         self.markdown = markdown
         self.self_reflect = self_reflect
-        self.max_reflection_iter = max_reflection_iter
-
+        self.max_reflect = max_reflect
+        self.min_reflect = min_reflect
+        self.reflect_llm = reflect_llm
     def execute_tool(self, function_name, arguments):
+        """
+        Execute a tool dynamically based on the function name and arguments.
+        """
         logging.debug(f"{self.name} executing tool {function_name} with arguments: {arguments}")
-        if function_name == "get_weather":
-            location = arguments.get("location", "Unknown Location")
-            return {"temperature": "25C", "condition": "Sunny", "location": location}
-        elif function_name == "search_tool":
-            query = arguments.get("query", "AI trends in 2024")
-            return {"results": [
-                {"title": "AI advancements in 2024", "link": "url1", "summary": "Lots of advancements"},
-                {"title": "New trends in AI", "link": "url2", "summary": "New trends being found"}
-            ]}
-        else:
-            return f"Tool '{function_name}' is not recognized"
+
+        # Try to get the function from globals first
+        func = globals().get(function_name)
+        if not func:
+            # Then try to get from the main module
+            import __main__
+            func = getattr(__main__, function_name, None)
+
+        if func and callable(func):
+            try:
+                return func(**arguments)
+            except Exception as e:
+                return {"error": str(e)}
+        
+        return {"error": f"Tool '{function_name}' is not callable"}
 
     def clear_history(self):
         self.chat_history = []
@@ -104,26 +193,25 @@ class Agent:
         logging.debug(f"{self.name} sending messages to LLM: {messages}")
 
         formatted_tools = []
+        if tools is None:
+            tools = self.tools
         if tools:
             for tool in tools:
-                if isinstance(tool, dict):
+                if isinstance(tool, str):
+                    # Generate tool definition for string tool names
+                    tool_def = self._generate_tool_definition(tool)
+                    if tool_def:
+                        formatted_tools.append(tool_def)
+                    else:
+                        logging.warning(f"Could not generate definition for tool: {tool}")
+                elif isinstance(tool, dict):
                     formatted_tools.append(tool)
                 elif hasattr(tool, "to_openai_tool"):
                     formatted_tools.append(tool.to_openai_tool())
-                elif isinstance(tool, str):
-                    formatted_tools.append({
-                        "type": "function",
-                        "function": {
-                            "name": tool,
-                            "description": f"This is a tool called {tool}",
-                            "parameters": {
-                                "type": "object",
-                                "properties": {},
-                            },
-                        }
-                    })
+                elif callable(tool):
+                    formatted_tools.append(self._generate_tool_definition(tool.__name__))
                 else:
-                    display_error(f"Warning: Tool {tool} not recognized")
+                    logging.warning(f"Tool {tool} not recognized")
 
         try:
             initial_response = client.chat.completions.create(
@@ -223,29 +311,7 @@ class Agent:
                 if self.verbose:
                     display_instruction(f"Agent {self.name} is processing prompt: {prompt}")
 
-                formatted_tools = []
-                if tools:
-                    for tool in tools:
-                        if isinstance(tool, dict):
-                            formatted_tools.append(tool)
-                        elif hasattr(tool, "to_openai_tool"):
-                            formatted_tools.append(tool.to_openai_tool())
-                        elif isinstance(tool, str):
-                            formatted_tools.append({
-                                "type": "function",
-                                "function": {
-                                    "name": tool,
-                                    "description": f"This is a tool called {tool}",
-                                    "parameters": {
-                                        "type": "object",
-                                        "properties": {},
-                                    },
-                                }
-                            })
-                        else:
-                            display_error(f"Warning: Tool {tool} not recognized")
-
-                response = self._chat_completion(messages, temperature=temperature, tools=formatted_tools if formatted_tools else None)
+                response = self._chat_completion(messages, temperature=temperature, tools=tools if tools else None)
                 if not response:
                     return None
                     
@@ -308,7 +374,7 @@ class Agent:
 
                 try:
                     reflection_response = client.beta.chat.completions.parse(
-                        model=self.llm,
+                        model=self.reflect_llm if self.reflect_llm else self.llm,
                         messages=messages,
                         temperature=temperature,
                         response_format=ReflectionOutput
@@ -317,35 +383,42 @@ class Agent:
                     reflection_output = reflection_response.choices[0].message.parsed
 
                     if self.verbose:
-                        display_self_reflection(f"Agent {self.name} self reflection: reflection='{reflection_output.reflection}' satisfactory='{reflection_output.satisfactory}'")
+                        display_self_reflection(f"Agent {self.name} self reflection (using {self.reflect_llm if self.reflect_llm else self.llm}): reflection='{reflection_output.reflection}' satisfactory='{reflection_output.satisfactory}'")
 
                     messages.append({"role": "assistant", "content": f"Self Reflection: {reflection_output.reflection} Satisfactory?: {reflection_output.satisfactory}"})
 
-                    if reflection_output.satisfactory == "yes":
+                    # Only consider satisfactory after minimum reflections
+                    if reflection_output.satisfactory == "yes" and reflection_count >= self.min_reflect - 1:
+                        if self.verbose:
+                            display_self_reflection("Agent marked the response as satisfactory after meeting minimum reflections")
+                        self.chat_history.append({"role": "user", "content": prompt})
+                        self.chat_history.append({"role": "assistant", "content": response_text})
+                        display_interaction(prompt, response_text, markdown=self.markdown, generation_time=time.time() - start_time)
+                        return response_text
+
+                    # Check if we've hit max reflections
+                    if reflection_count >= self.max_reflect - 1:
                         if self.verbose:
-                            display_self_reflection("Agent marked the response as satisfactory")
+                            display_self_reflection("Maximum reflection count reached, returning current response")
+                        self.chat_history.append({"role": "user", "content": prompt})
                         self.chat_history.append({"role": "assistant", "content": response_text})
                         display_interaction(prompt, response_text, markdown=self.markdown, generation_time=time.time() - start_time)
                         return response_text
 
-                    logging.debug(f"{self.name} reflection not satisfactory, requesting regeneration.")
+                    logging.debug(f"{self.name} reflection count {reflection_count + 1}, continuing reflection process")
                     messages.append({"role": "user", "content": "Now regenerate your response using the reflection you made"})
                     response = self._chat_completion(messages, temperature=temperature, tools=None, stream=True)
                     response_text = response.choices[0].message.content.strip()
+                    reflection_count += 1
+                    continue  # Continue the loop for more reflections
+
                 except Exception as e:
                     display_error(f"Error in parsing self-reflection json {e}. Retrying")
                     logging.error("Reflection parsing failed.", exc_info=True)
                     messages.append({"role": "assistant", "content": f"Self Reflection failed."})
+                    reflection_count += 1
+                    continue  # Continue even after error to try again
                 
-                reflection_count += 1
-
-                self.chat_history.append({"role": "user", "content": prompt})
-                self.chat_history.append({"role": "assistant", "content": response_text})
-
-                if self.verbose:
-                    logging.info(f"Agent {self.name} final response: {response_text}")
-                display_interaction(prompt, response_text, markdown=self.markdown, generation_time=time.time() - start_time)
-                return response_text
             except Exception as e:
                 display_error(f"Error in chat: {e}")
                 return None 

{praisonaiagents-0.0.6.dist-info → praisonaiagents-0.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: praisonaiagents
-Version: 0.0.6
+Version: 0.0.8
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
 Requires-Dist: pydantic

{praisonaiagents-0.0.6.dist-info → praisonaiagents-0.0.8.dist-info}/RECORD

@@ -1,7 +1,7 @@
 praisonaiagents/__init__.py,sha256=gI8vEabBTRPsE_E8GA5sBMi4sTtJI-YokPrH2Nor-k0,741
 praisonaiagents/main.py,sha256=zDhN5KKtKbfruolDNxlyJkcFlkSt4KQkQTDRfQVAhxc,3960
 praisonaiagents/agent/__init__.py,sha256=sKO8wGEXvtCrvV1e834r1Okv0XAqAxqZCqz6hKLiTvA,79
-praisonaiagents/agent/agent.py,sha256=CCCjv-qtr6hSB-BG7C8l3z-pXQpnTkX9bW6me36YiaU,15512
+praisonaiagents/agent/agent.py,sha256=ov7WrSpgsbjqLt2yJVEmqVyVMPJqBgwkUTk1tim0dGg,18241
 praisonaiagents/agents/__init__.py,sha256=7RDeQNSqZg5uBjD4M_0p_F6YgfWuDuxPFydPU50kDYc,120
 praisonaiagents/agents/agents.py,sha256=NkosnTo41bB9H0lYt_YQIHwaRyW2Bcp_4KKpYWeaFk0,13696
 praisonaiagents/build/lib/praisonaiagents/__init__.py,sha256=Nqnn8clbgv-5l0PgxcTOldg8mkMKrFn4TvPL-rYUUGg,1
@@ -14,7 +14,7 @@ praisonaiagents/build/lib/praisonaiagents/task/__init__.py,sha256=VL5hXVmyGjINb3
 praisonaiagents/build/lib/praisonaiagents/task/task.py,sha256=4Y1qX8OeEFcid2yhAiPYylvHpuDmWORsyNL16_BiVvI,1831
 praisonaiagents/task/__init__.py,sha256=VL5hXVmyGjINb34AalxpBMl-YW9m5EDcRkMTKkSSl7c,80
 praisonaiagents/task/task.py,sha256=4Y1qX8OeEFcid2yhAiPYylvHpuDmWORsyNL16_BiVvI,1831
-praisonaiagents-0.0.6.dist-info/METADATA,sha256=h8kr0CxgMZqba1kw61zV-7La4LhpEvWQIpS9gNJWiXE,232
-praisonaiagents-0.0.6.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-praisonaiagents-0.0.6.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.6.dist-info/RECORD,,
+praisonaiagents-0.0.8.dist-info/METADATA,sha256=wIiXOiCtBxNdqhBruAc7ECloBsy_SIW-K33C1acNfOI,232
+praisonaiagents-0.0.8.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+praisonaiagents-0.0.8.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.8.dist-info/RECORD,,