praisonaiagents 0.0.85__py3-none-any.whl → 0.0.87__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -526,6 +526,44 @@ Your Goal: {self.goal}
             tools=self.tools
         )
 
+    def _cast_arguments(self, func, arguments):
+        """Cast arguments to their expected types based on function signature."""
+        if not callable(func) or not arguments:
+            return arguments
+        
+        try:
+            sig = inspect.signature(func)
+            casted_args = {}
+            
+            for param_name, arg_value in arguments.items():
+                if param_name in sig.parameters:
+                    param = sig.parameters[param_name]
+                    if param.annotation != inspect.Parameter.empty:
+                        # Handle common type conversions
+                        if param.annotation == int and isinstance(arg_value, (str, float)):
+                            try:
+                                casted_args[param_name] = int(float(arg_value))
+                            except (ValueError, TypeError):
+                                casted_args[param_name] = arg_value
+                        elif param.annotation == float and isinstance(arg_value, (str, int)):
+                            try:
+                                casted_args[param_name] = float(arg_value)
+                            except (ValueError, TypeError):
+                                casted_args[param_name] = arg_value
+                        elif param.annotation == bool and isinstance(arg_value, str):
+                            casted_args[param_name] = arg_value.lower() in ('true', '1', 'yes', 'on')
+                        else:
+                            casted_args[param_name] = arg_value
+                    else:
+                        casted_args[param_name] = arg_value
+                else:
+                    casted_args[param_name] = arg_value
+            
+            return casted_args
+        except Exception as e:
+            logging.debug(f"Type casting failed for {getattr(func, '__name__', 'unknown function')}: {e}")
+            return arguments
+
     def execute_tool(self, function_name, arguments):
         """
         Execute a tool dynamically based on the function name and arguments.
@@ -576,7 +614,8 @@ Your Goal: {self.goal}
                     run_params = {k: v for k, v in arguments.items() 
                                   if k in inspect.signature(instance.run).parameters 
                                   and k != 'self'}
-                    return instance.run(**run_params)
+                    casted_params = self._cast_arguments(instance.run, run_params)
+                    return instance.run(**casted_params)
 
                 # CrewAI: If it's a class with an _run method, instantiate and call _run
                 elif inspect.isclass(func) and hasattr(func, '_run'):
@@ -584,11 +623,13 @@ Your Goal: {self.goal}
                     run_params = {k: v for k, v in arguments.items() 
                                   if k in inspect.signature(instance._run).parameters 
                                   and k != 'self'}
-                    return instance._run(**run_params)
+                    casted_params = self._cast_arguments(instance._run, run_params)
+                    return instance._run(**casted_params)
 
                 # Otherwise treat as regular function
                 elif callable(func):
-                    return func(**arguments)
+                    casted_arguments = self._cast_arguments(func, arguments)
+                    return func(**casted_arguments)
             except Exception as e:
                 error_msg = str(e)
                 logging.error(f"Error executing tool {function_name}: {error_msg}")

praisonaiagents/agents/agents.py

@@ -13,6 +13,16 @@ from ..task.task import Task
 from ..process.process import Process, LoopItems
 import asyncio
 import uuid
+from enum import Enum
+
+# Task status constants
+class TaskStatus(Enum):
+    """Enumeration for task status values to ensure consistency"""
+    COMPLETED = "completed"
+    IN_PROGRESS = "in progress"
+    NOT_STARTED = "not started"
+    FAILED = "failed"
+    UNKNOWN = "unknown"
 
 # Set up logger
 logger = logging.getLogger(__name__)
@@ -49,6 +59,55 @@ def process_video(video_path: str, seconds_per_frame=2):
     video.release()
     return base64_frames
 
+def process_task_context(context_item, verbose=0, user_id=None):
+    """
+    Process a single context item for task execution.
+    This helper function avoids code duplication between async and sync execution methods.
+    
+    Args:
+        context_item: The context item to process (can be string, list, task object, or dict)
+        verbose: Verbosity level for logging
+        user_id: User ID for database queries
+        
+    Returns:
+        str: Formatted context string for this item
+    """
+    if isinstance(context_item, str):
+        return f"Input Content:\n{context_item}"
+    elif isinstance(context_item, list):
+        return f"Input Content: {' '.join(str(x) for x in context_item)}"
+    elif hasattr(context_item, 'result'):  # Task object
+        # Ensure the previous task is completed before including its result
+        task_status = getattr(context_item, 'status', None)
+        task_name = context_item.name if context_item.name else context_item.description
+        
+        if context_item.result and task_status == TaskStatus.COMPLETED.value:
+            return f"Result of previous task {task_name}:\n{context_item.result.raw}"
+        elif task_status == TaskStatus.COMPLETED.value and not context_item.result:
+            return f"Previous task {task_name} completed but produced no result."
+        else:
+            return f"Previous task {task_name} is not yet completed (status: {task_status or TaskStatus.UNKNOWN.value})."
+    elif isinstance(context_item, dict) and "vector_store" in context_item:
+        from ..knowledge.knowledge import Knowledge
+        try:
+            # Handle both string and dict configs
+            cfg = context_item["vector_store"]
+            if isinstance(cfg, str):
+                cfg = json.loads(cfg)
+            
+            knowledge = Knowledge(config={"vector_store": cfg}, verbose=verbose)
+            
+            # Only use user_id as filter
+            db_results = knowledge.search(
+                context_item.get("query", ""),  # Use query from context if available
+                user_id=user_id if user_id else None
+            )
+            return f"[DB Context]: {str(db_results)}"
+        except Exception as e:
+            return f"[Vector DB Error]: {e}"
+    else:
+        return str(context_item)  # Fallback for unknown types
+
 class PraisonAIAgents:
     def __init__(self, agents, tasks=None, verbose=0, completion_checker=None, max_retries=5, process="sequential", manager_llm=None, memory=False, memory_config=None, embedder=None, user_id=None, max_iter=10, stream=True, name: Optional[str] = None):
         # Add check at the start if memory is requested
@@ -250,44 +309,21 @@ Expected Output: {task.expected_output}.
         if task.context:
             context_results = []  # Use list to avoid duplicates
             for context_item in task.context:
-                if isinstance(context_item, str):
-                    context_results.append(f"Input Content:\n{context_item}")
-                elif isinstance(context_item, list):
-                    context_results.append(f"Input Content: {' '.join(str(x) for x in context_item)}")
-                elif hasattr(context_item, 'result'):  # Task object
-                    if context_item.result:
-                        context_results.append(
-                            f"Result of previous task {context_item.name if context_item.name else context_item.description}:\n{context_item.result.raw}"
-                        )
-                    else:
-                        context_results.append(
-                            f"Previous task {context_item.name if context_item.name else context_item.description} has no result yet."
-                        )
-                elif isinstance(context_item, dict) and "vector_store" in context_item:
-                    from ..knowledge.knowledge import Knowledge
-                    try:
-                        # Handle both string and dict configs
-                        cfg = context_item["vector_store"]
-                        if isinstance(cfg, str):
-                            cfg = json.loads(cfg)
-                        
-                        knowledge = Knowledge(config={"vector_store": cfg}, verbose=self.verbose)
-                        
-                        # Only use user_id as filter
-                        db_results = knowledge.search(
-                            task.description,
-                            user_id=self.user_id if self.user_id else None
-                        )
-                        context_results.append(f"[DB Context]: {str(db_results)}")
-                    except Exception as e:
-                        context_results.append(f"[Vector DB Error]: {e}")
+                # Use the centralized helper function
+                context_str = process_task_context(context_item, self.verbose, self.user_id)
+                context_results.append(context_str)
             
-            # Join unique context results
+            # Join unique context results with proper formatting
             unique_contexts = list(dict.fromkeys(context_results))  # Remove duplicates
+            if self.verbose >= 3:
+                logger.info(f"Task {task_id} context items: {len(unique_contexts)}")
+                for i, ctx in enumerate(unique_contexts):
+                    logger.info(f"Context {i+1}: {ctx[:100]}...")
+            context_separator = '\n\n'
             task_prompt += f"""
 Context:
 
-{'  '.join(unique_contexts)}
+{context_separator.join(unique_contexts)}
 """
         task_prompt += "Please provide only the final result of your work. Do not add any conversation or extra explanation."
 
@@ -573,44 +609,21 @@ Expected Output: {task.expected_output}.
         if task.context:
             context_results = []  # Use list to avoid duplicates
             for context_item in task.context:
-                if isinstance(context_item, str):
-                    context_results.append(f"Input Content:\n{context_item}")
-                elif isinstance(context_item, list):
-                    context_results.append(f"Input Content: {' '.join(str(x) for x in context_item)}")
-                elif hasattr(context_item, 'result'):  # Task object
-                    if context_item.result:
-                        context_results.append(
-                            f"Result of previous task {context_item.name if context_item.name else context_item.description}:\n{context_item.result.raw}"
-                        )
-                    else:
-                        context_results.append(
-                            f"Previous task {context_item.name if context_item.name else context_item.description} has no result yet."
-                        )
-                elif isinstance(context_item, dict) and "vector_store" in context_item:
-                    from ..knowledge.knowledge import Knowledge
-                    try:
-                        # Handle both string and dict configs
-                        cfg = context_item["vector_store"]
-                        if isinstance(cfg, str):
-                            cfg = json.loads(cfg)
-                        
-                        knowledge = Knowledge(config={"vector_store": cfg}, verbose=self.verbose)
-                        
-                        # Only use user_id as filter
-                        db_results = knowledge.search(
-                            task.description,
-                            user_id=self.user_id if self.user_id else None
-                        )
-                        context_results.append(f"[DB Context]: {str(db_results)}")
-                    except Exception as e:
-                        context_results.append(f"[Vector DB Error]: {e}")
+                # Use the centralized helper function
+                context_str = process_task_context(context_item, self.verbose, self.user_id)
+                context_results.append(context_str)
             
-            # Join unique context results
+            # Join unique context results with proper formatting
             unique_contexts = list(dict.fromkeys(context_results))  # Remove duplicates
+            if self.verbose >= 3:
+                logger.info(f"Task {task_id} context items: {len(unique_contexts)}")
+                for i, ctx in enumerate(unique_contexts):
+                    logger.info(f"Context {i+1}: {ctx[:100]}...")
+            context_separator = '\n\n'
             task_prompt += f"""
 Context:
 
-{'  '.join(unique_contexts)}
+{context_separator.join(unique_contexts)}
 """
 
         # Add memory context if available

praisonaiagents/mcp/mcp.py

@@ -212,6 +212,18 @@ class MCP:
         
         # Set up stdio client
         self.is_sse = False
+        
+        # Ensure UTF-8 encoding in environment for Docker compatibility
+        env = kwargs.get('env', {})
+        if not env:
+            env = os.environ.copy()
+        env.update({
+            'PYTHONIOENCODING': 'utf-8',
+            'LC_ALL': 'C.UTF-8',
+            'LANG': 'C.UTF-8'
+        })
+        kwargs['env'] = env
+        
         self.server_params = StdioServerParameters(
             command=cmd,
             args=arguments,

{praisonaiagents-0.0.85.dist-info → praisonaiagents-0.0.87.dist-info}/METADATA

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

{praisonaiagents-0.0.85.dist-info → praisonaiagents-0.0.87.dist-info}/RECORD

@@ -1,10 +1,10 @@
 praisonaiagents/__init__.py,sha256=Z2_rSA6mYozz0r3ioUgKzl3QV8uWRDS_QaqPg2oGjqg,1324
 praisonaiagents/main.py,sha256=l29nGEbV2ReBi4szURbnH0Fk0w2F_QZTmECysyZjYcA,15066
 praisonaiagents/agent/__init__.py,sha256=j0T19TVNbfZcClvpbZDDinQxZ0oORgsMrMqx16jZ-bA,128
-praisonaiagents/agent/agent.py,sha256=9vexAh3Jch5Fqst2aT-jf6xU1wAr4t0NePJZMmtVK_g,84183
+praisonaiagents/agent/agent.py,sha256=rnUCrrEB_7kLrSsHwZydiRg7ygIokGIrKZ0P6WYuj4M,86363
 praisonaiagents/agent/image_agent.py,sha256=-5MXG594HVwSpFMcidt16YBp7udtik-Cp7eXlzLE1fY,8696
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
-praisonaiagents/agents/agents.py,sha256=HQXAuvV_cORa-NUNVknve4d0B1OIqS6W5jYkw_bYEyA,59519
+praisonaiagents/agents/agents.py,sha256=lFWJDZeWQcr6RttV-pxvny-jfAM3UWiYjMnYo8pZYe0,59429
 praisonaiagents/agents/autoagents.py,sha256=olYDn--rlJp-SckxILqmREkkgNlzCgEEcAUzfMj-54E,13518
 praisonaiagents/knowledge/__init__.py,sha256=xL1Eh-a3xsHyIcU4foOWF-JdWYIYBALJH9bge0Ujuto,246
 praisonaiagents/knowledge/chunking.py,sha256=G6wyHa7_8V0_7VpnrrUXbEmUmptlT16ISJYaxmkSgmU,7678
@@ -12,7 +12,7 @@ praisonaiagents/knowledge/knowledge.py,sha256=Po0JZsgjYJrXdNSggmUGOWidZEF0f8xo4n
 praisonaiagents/llm/__init__.py,sha256=ttPQQJQq6Tah-0updoEXDZFKWtJAM93rBWRoIgxRWO8,689
 praisonaiagents/llm/llm.py,sha256=Y8z7mfzL_OMhoPSIr7k7Demk8HvHmJZv80EXFY6SUEU,91863
 praisonaiagents/mcp/__init__.py,sha256=ibbqe3_7XB7VrIcUcetkZiUZS1fTVvyMy_AqCSFG8qc,240
-praisonaiagents/mcp/mcp.py,sha256=foarT5IoCZ6V8P9AbnqnWQHKmshJoD24gf3OP4sD_IM,16419
+praisonaiagents/mcp/mcp.py,sha256=-U6md6zHoJZCWF8XFq921Yy5CcSNaGqvjg3aRT737LM,16765
 praisonaiagents/mcp/mcp_sse.py,sha256=DLh3F_aoVRM1X-7hgIOWOw4FQ1nGmn9YNbQTesykzn4,6792
 praisonaiagents/memory/memory.py,sha256=I8dOTkrl1i-GgQbDcrFOsSruzJ7MiI6Ys37DK27wrUs,35537
 praisonaiagents/process/__init__.py,sha256=lkYbL7Hn5a0ldvJtkdH23vfIIZLIcanK-65C0MwaorY,52
@@ -40,7 +40,7 @@ praisonaiagents/tools/xml_tools.py,sha256=iYTMBEk5l3L3ryQ1fkUnNVYK-Nnua2Kx2S0dxN
 praisonaiagents/tools/yaml_tools.py,sha256=uogAZrhXV9O7xvspAtcTfpKSQYL2nlOTvCQXN94-G9A,14215
 praisonaiagents/tools/yfinance_tools.py,sha256=s2PBj_1v7oQnOobo2fDbQBACEHl61ftG4beG6Z979ZE,8529
 praisonaiagents/tools/train/data/generatecot.py,sha256=H6bNh-E2hqL5MW6kX3hqZ05g9ETKN2-kudSjiuU_SD8,19403
-praisonaiagents-0.0.85.dist-info/METADATA,sha256=p4gpH5C_8N2UL7IKRZlaJXBd_qjL36bpdoRly8NMzoE,1244
-praisonaiagents-0.0.85.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-praisonaiagents-0.0.85.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.85.dist-info/RECORD,,
+praisonaiagents-0.0.87.dist-info/METADATA,sha256=W0Db67jMCP_PNX-Y9cjasKCxLKN6r5oTwtuAzBR_pNM,1244
+praisonaiagents-0.0.87.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+praisonaiagents-0.0.87.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.87.dist-info/RECORD,,