praisonaiagents 0.0.88__py3-none-any.whl → 0.0.90__py3-none-any.whl

praisonaiagents/agents/autoagents.py

@@ -8,10 +8,10 @@ It automatically handles agent creation, task setup, and execution flow.
 from .agents import PraisonAIAgents
 from ..agent.agent import Agent
 from ..task.task import Task
-from typing import List, Any, Optional, Dict
+from typing import List, Any, Optional, Dict, Tuple
 import logging
 import os
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from ..main import display_instruction, display_tool_call, display_interaction, client
 
 # Define Pydantic models for structured output
@@ -22,6 +22,7 @@ class TaskConfig(BaseModel):
     tools: List[str]
 
 class AgentConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
     name: str
     role: str
     goal: str
@@ -30,6 +31,7 @@ class AgentConfig(BaseModel):
     tasks: List[TaskConfig]
 
 class AutoAgentsConfig(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
     main_instruction: str
     process_type: str
     agents: List[AgentConfig]
@@ -255,7 +257,7 @@ Return the configuration in a structured JSON format matching the AutoAgentsConf
             logging.error(f"Error generating configuration: {e}")
             raise
 
-    def _create_agents_and_tasks(self, config: AutoAgentsConfig) -> tuple[List[Agent], List[Task]]:
+    def _create_agents_and_tasks(self, config: AutoAgentsConfig) -> Tuple[List[Agent], List[Task]]:
         """Create agents and tasks from configuration"""
         agents = []
         tasks = []
@@ -283,7 +285,7 @@ Return the configuration in a structured JSON format matching the AutoAgentsConf
                 respect_context_window=self.respect_context_window,
                 code_execution_mode=self.code_execution_mode,
                 embedder_config=self.embedder_config,
-                knowledge_sources=self.knowledge_sources,
+                knowledge=self.knowledge_sources,
                 use_system_prompt=self.use_system_prompt,
                 cache=self.cache,
                 allow_delegation=self.allow_delegation,

praisonaiagents/main.py

@@ -4,7 +4,7 @@ import json
 import logging
 from typing import List, Optional, Dict, Any, Union, Literal, Type
 from openai import OpenAI
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from rich import print
 from rich.console import Console
 from rich.panel import Panel
@@ -365,6 +365,7 @@ class ReflectionOutput(BaseModel):
 client = OpenAI(api_key=(os.environ["OPENAI_API_KEY"] if os.environ.get("OPENAI_API_KEY") else "xxxx"))
 
 class TaskOutput(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
     description: str
     summary: Optional[str] = None
     raw: str

praisonaiagents/process/process.py

@@ -1,7 +1,7 @@
 import logging
 import asyncio
 from typing import Dict, Optional, List, Any, AsyncGenerator
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
 from ..agent.agent import Agent
 from ..task.task import Task
 from ..main import display_error, client
@@ -9,6 +9,7 @@ import csv
 import os
 
 class LoopItems(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
     items: List[Any]
 
 class Process:
@@ -30,6 +31,44 @@ class Process:
         self.task_retry_counter: Dict[str, int] = {} # Initialize retry counter
         self.workflow_finished = False # ADDED: Workflow finished flag
 
+    def _build_task_context(self, current_task: Task) -> str:
+        """Build context for a task based on its retain_full_context setting"""
+        if not (current_task.previous_tasks or current_task.context):
+            return ""
+            
+        context = "\nInput data from previous tasks:"
+        
+        if current_task.retain_full_context:
+            # Original behavior: include all previous tasks
+            for prev_name in current_task.previous_tasks:
+                prev_task = next((t for t in self.tasks.values() if t.name == prev_name), None)
+                if prev_task and prev_task.result:
+                    context += f"\n{prev_name}: {prev_task.result.raw}"
+                    
+            # Add data from context tasks
+            if current_task.context:
+                for ctx_task in current_task.context:
+                    if ctx_task.result and ctx_task.name != current_task.name:
+                        context += f"\n{ctx_task.name}: {ctx_task.result.raw}"
+        else:
+            # New behavior: only include the most recent previous task
+            if current_task.previous_tasks:
+                # Get the most recent previous task (last in the list)
+                prev_name = current_task.previous_tasks[-1]
+                prev_task = next((t for t in self.tasks.values() if t.name == prev_name), None)
+                if prev_task and prev_task.result:
+                    context += f"\n{prev_name}: {prev_task.result.raw}"
+                    
+            # For context tasks, still include the most recent one
+            if current_task.context:
+                # Get the most recent context task with a result
+                for ctx_task in reversed(current_task.context):
+                    if ctx_task.result and ctx_task.name != current_task.name:
+                        context += f"\n{ctx_task.name}: {ctx_task.result.raw}"
+                        break  # Only include the most recent one
+                        
+        return context
+
     def _find_next_not_started_task(self) -> Optional[Task]:
         """Fallback mechanism to find the next 'not started' task."""
         fallback_attempts = 0
@@ -147,25 +186,8 @@ Description length: {len(current_task.description)}
             """)
 
             # Add context from previous tasks to description
-            if current_task.previous_tasks or current_task.context:
-                context = "\nInput data from previous tasks:"
-
-                # Add data from previous tasks in workflow
-                for prev_name in current_task.previous_tasks:
-                    prev_task = next((t for t in self.tasks.values() if t.name == prev_name), None)
-                    if prev_task and prev_task.result:
-                        # Handle loop data
-                        if current_task.task_type == "loop":
-                            context += f"\n{prev_name}: {prev_task.result.raw}"
-                        else:
-                            context += f"\n{prev_name}: {prev_task.result.raw}"
-
-                # Add data from context tasks
-                if current_task.context:
-                    for ctx_task in current_task.context:
-                        if ctx_task.result and ctx_task.name != current_task.name:
-                            context += f"\n{ctx_task.name}: {ctx_task.result.raw}"
-
+            context = self._build_task_context(current_task)
+            if context:
                 # Update task description with context
                 current_task.description = current_task.description + context
 
@@ -778,25 +800,8 @@ Description length: {len(current_task.description)}
             """)
 
             # Add context from previous tasks to description
-            if current_task.previous_tasks or current_task.context:
-                context = "\nInput data from previous tasks:"
-
-                # Add data from previous tasks in workflow
-                for prev_name in current_task.previous_tasks:
-                    prev_task = next((t for t in self.tasks.values() if t.name == prev_name), None)
-                    if prev_task and prev_task.result:
-                        # Handle loop data
-                        if current_task.task_type == "loop":
-                            context += f"\n{prev_name}: {prev_task.result.raw}"
-                        else:
-                            context += f"\n{prev_name}: {prev_task.result.raw}"
-
-                # Add data from context tasks
-                if current_task.context:
-                    for ctx_task in current_task.context:
-                        if ctx_task.result and ctx_task.name != current_task.name:
-                            context += f"\n{ctx_task.name}: {ctx_task.result.raw}"
-
+            context = self._build_task_context(current_task)
+            if context:
                 # Update task description with context
                 current_task.description = current_task.description + context
 

praisonaiagents/task/task.py

@@ -39,7 +39,8 @@ class Task:
         memory=None,
         quality_check=True,
         input_file: Optional[str] = None,
-        rerun: bool = False # Renamed from can_rerun and logic inverted, default True for backward compatibility
+        rerun: bool = False, # Renamed from can_rerun and logic inverted, default True for backward compatibility
+        retain_full_context: bool = False # By default, only use previous task output, not all previous tasks
     ):
         # Add check if memory config is provided
         if memory is not None or (config and config.get('memory_config')):
@@ -78,6 +79,7 @@ class Task:
         self.memory = memory
         self.quality_check = quality_check
         self.rerun = rerun # Assigning the rerun parameter
+        self.retain_full_context = retain_full_context
 
         # Set logger level based on config verbose level
         verbose = self.config.get("verbose", 0)
@@ -213,9 +215,20 @@ class Task:
                 logger.info(f"Task {self.id}: Calculating quality metrics for output: {task_output.raw[:100]}...")
 
                 # Get quality metrics from LLM
+                # Determine which LLM model to use based on agent configuration
+                llm_model = None
+                if self.agent:
+                    if getattr(self.agent, '_using_custom_llm', False) and hasattr(self.agent, 'llm_instance'):
+                        # For custom LLM instances (like Ollama)
+                        llm_model = self.agent.llm_instance
+                    elif hasattr(self.agent, 'llm') and self.agent.llm:
+                        # For standard model strings
+                        llm_model = self.agent.llm
+                
                 metrics = self.memory.calculate_quality_metrics(
                     task_output.raw,
-                    self.expected_output
+                    self.expected_output,
+                    llm=llm_model
                 )
                 logger.info(f"Task {self.id}: Quality metrics calculated: {metrics}")
 

{praisonaiagents-0.0.88.dist-info → praisonaiagents-0.0.90.dist-info}/METADATA

@@ -1,8 +1,9 @@
 Metadata-Version: 2.4
 Name: praisonaiagents
-Version: 0.0.88
+Version: 0.0.90
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
+Requires-Python: >=3.10
 Requires-Dist: pydantic
 Requires-Dist: rich
 Requires-Dist: openai

{praisonaiagents-0.0.88.dist-info → praisonaiagents-0.0.90.dist-info}/RECORD

@@ -1,11 +1,11 @@
 praisonaiagents/__init__.py,sha256=Z2_rSA6mYozz0r3ioUgKzl3QV8uWRDS_QaqPg2oGjqg,1324
-praisonaiagents/main.py,sha256=l29nGEbV2ReBi4szURbnH0Fk0w2F_QZTmECysyZjYcA,15066
+praisonaiagents/main.py,sha256=EsMRCT1tYjHH7hgoXov5s1caIBeRkpIPK8EZQsMKlw4,15138
 praisonaiagents/agent/__init__.py,sha256=j0T19TVNbfZcClvpbZDDinQxZ0oORgsMrMqx16jZ-bA,128
 praisonaiagents/agent/agent.py,sha256=-zENKxcaAWH5KJOed4KmcpAeBDNtRlxqG58QHdLH6RA,86334
 praisonaiagents/agent/image_agent.py,sha256=-5MXG594HVwSpFMcidt16YBp7udtik-Cp7eXlzLE1fY,8696
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
 praisonaiagents/agents/agents.py,sha256=lFWJDZeWQcr6RttV-pxvny-jfAM3UWiYjMnYo8pZYe0,59429
-praisonaiagents/agents/autoagents.py,sha256=olYDn--rlJp-SckxILqmREkkgNlzCgEEcAUzfMj-54E,13518
+praisonaiagents/agents/autoagents.py,sha256=Lc_b9mO2MeefBrsHkHoqFxEr5iRGrYuzDhslyybXwdw,13649
 praisonaiagents/knowledge/__init__.py,sha256=xL1Eh-a3xsHyIcU4foOWF-JdWYIYBALJH9bge0Ujuto,246
 praisonaiagents/knowledge/chunking.py,sha256=G6wyHa7_8V0_7VpnrrUXbEmUmptlT16ISJYaxmkSgmU,7678
 praisonaiagents/knowledge/knowledge.py,sha256=Po0JZsgjYJrXdNSggmUGOWidZEF0f8xo4nhsZZfh8tY,13217
@@ -16,9 +16,9 @@ praisonaiagents/mcp/mcp.py,sha256=-U6md6zHoJZCWF8XFq921Yy5CcSNaGqvjg3aRT737LM,16
 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
-praisonaiagents/process/process.py,sha256=HPw84OhnKQW3EyrDkpoQu0DcpxThbrzR2hWUgwQh9Pw,59955
+praisonaiagents/process/process.py,sha256=7nGV-d9lDlQO6d7X4nMb7f6pMKCYNfoFzTrVvPrUefo,60179
 praisonaiagents/task/__init__.py,sha256=VL5hXVmyGjINb34AalxpBMl-YW9m5EDcRkMTKkSSl7c,80
-praisonaiagents/task/task.py,sha256=8KztSUKMO74y619TyI8d5DMJ1xPbyQXIB0Ux583oOVw,14259
+praisonaiagents/task/task.py,sha256=JShYyMkAC1_bhEt0s0CXwJtQFXY6bNu-rlb0mHyyoXM,15034
 praisonaiagents/tools/__init__.py,sha256=CWOYV9SudYY82r45LnNgaVRV3cmsAFdasNRkPrLsgmI,9198
 praisonaiagents/tools/arxiv_tools.py,sha256=1stb31zTjLTon4jCnpZG5de9rKc9QWgC0leLegvPXWo,10528
 praisonaiagents/tools/calculator_tools.py,sha256=S1xPT74Geurvjm52QMMIG29zDXVEWJmM6nmyY7yF298,9571
@@ -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.88.dist-info/METADATA,sha256=p9uG4zmHdSBsddSEP1qMPi-mGztIUp0k92pYWGpnMDQ,1244
-praisonaiagents-0.0.88.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-praisonaiagents-0.0.88.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.88.dist-info/RECORD,,
+praisonaiagents-0.0.90.dist-info/METADATA,sha256=HrNS7WT3LB14TVihEpeYTvisD7XGxmZve7dmkiN-GzU,1268
+praisonaiagents-0.0.90.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+praisonaiagents-0.0.90.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.90.dist-info/RECORD,,

{praisonaiagents-0.0.88.dist-info → praisonaiagents-0.0.90.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.8.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any