praisonaiagents 0.0.18__tar.gz → 0.0.20__tar.gz

{praisonaiagents-0.0.18 → praisonaiagents-0.0.20}/PKG-INFO

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

{praisonaiagents-0.0.18 → praisonaiagents-0.0.20}/praisonaiagents/__init__.py

@@ -17,7 +17,8 @@ from .main import (
     clean_triple_backticks,
     error_logs,
     register_display_callback,
-    display_callbacks,
+    sync_display_callbacks,
+    async_display_callbacks,
 )
 
 __all__ = [
@@ -35,5 +36,6 @@ __all__ = [
     'clean_triple_backticks',
     'error_logs',
     'register_display_callback',
-    'display_callbacks',
+    'sync_display_callbacks',
+    'async_display_callbacks',
 ] 

praisonaiagents-0.0.20/praisonaiagents/main.py

@@ -0,0 +1,349 @@
+import os
+import time
+import json
+import logging
+from typing import List, Optional, Dict, Any, Union, Literal, Type
+from openai import OpenAI
+from pydantic import BaseModel
+from rich import print
+from rich.console import Console
+from rich.panel import Panel
+from rich.text import Text
+from rich.markdown import Markdown
+from rich.logging import RichHandler
+from rich.live import Live
+import asyncio
+
+LOGLEVEL = os.environ.get('LOGLEVEL', 'INFO').upper()
+
+logging.basicConfig(
+    level=getattr(logging, LOGLEVEL, logging.INFO),
+    format="%(asctime)s %(filename)s:%(lineno)d %(levelname)s %(message)s",
+    datefmt="[%X]",
+    handlers=[RichHandler(rich_tracebacks=True)]
+)
+
+# Global list to store error logs
+error_logs = []
+
+# Separate registries for sync and async callbacks
+sync_display_callbacks = {}
+async_display_callbacks = {}
+
+# At the top of the file, add display_callbacks to __all__
+__all__ = [
+    'error_logs',
+    'register_display_callback',
+    'sync_display_callbacks',
+    'async_display_callbacks',
+    # ... other exports
+]
+
+def register_display_callback(display_type: str, callback_fn, is_async: bool = False):
+    """Register a synchronous or asynchronous callback function for a specific display type.
+    
+    Args:
+        display_type (str): Type of display event ('interaction', 'self_reflection', etc.)
+        callback_fn: The callback function to register
+        is_async (bool): Whether the callback is asynchronous
+    """
+    if is_async:
+        async_display_callbacks[display_type] = callback_fn
+    else:
+        sync_display_callbacks[display_type] = callback_fn
+
+async def execute_callback(display_type: str, **kwargs):
+    """Execute both sync and async callbacks for a given display type.
+    
+    Args:
+        display_type (str): Type of display event
+        **kwargs: Arguments to pass to the callback functions
+    """
+    # Execute synchronous callback if registered
+    if display_type in sync_display_callbacks:
+        callback = sync_display_callbacks[display_type]
+        loop = asyncio.get_event_loop()
+        await loop.run_in_executor(None, lambda: callback(**kwargs))
+    
+    # Execute asynchronous callback if registered
+    if display_type in async_display_callbacks:
+        callback = async_display_callbacks[display_type]
+        await callback(**kwargs)
+
+def _clean_display_content(content: str, max_length: int = 20000) -> str:
+    """Helper function to clean and truncate content for display."""
+    if not content or not str(content).strip():
+        return ""
+        
+    content = str(content)
+    # Handle base64 content
+    if "base64" in content:
+        content_parts = []
+        for line in content.split('\n'):
+            if "base64" not in line:
+                content_parts.append(line)
+        content = '\n'.join(content_parts)
+    
+    # Truncate if too long
+    if len(content) > max_length:
+        content = content[:max_length] + "..."
+    
+    return content.strip()
+
+def display_interaction(message, response, markdown=True, generation_time=None, console=None):
+    """Synchronous version of display_interaction."""
+    if console is None:
+        console = Console()
+    
+    if isinstance(message, list):
+        text_content = next((item["text"] for item in message if item["type"] == "text"), "")
+        message = text_content
+
+    message = _clean_display_content(str(message))
+    response = _clean_display_content(str(response))
+
+    # Execute synchronous callback if registered
+    if 'interaction' in sync_display_callbacks:
+        sync_display_callbacks['interaction'](
+            message=message,
+            response=response,
+            markdown=markdown,
+            generation_time=generation_time
+        )
+
+    # Rest of the display logic...
+    if generation_time:
+        console.print(Text(f"Response generated in {generation_time:.1f}s", style="dim"))
+
+    if markdown:
+        console.print(Panel.fit(Markdown(message), title="Message", border_style="cyan"))
+        console.print(Panel.fit(Markdown(response), title="Response", border_style="cyan"))
+    else:
+        console.print(Panel.fit(Text(message, style="bold green"), title="Message", border_style="cyan"))
+        console.print(Panel.fit(Text(response, style="bold blue"), title="Response", border_style="cyan"))
+
+def display_self_reflection(message: str, console=None):
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    # Execute callback if registered
+    if 'self_reflection' in sync_display_callbacks:
+        sync_display_callbacks['self_reflection'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold yellow"), title="Self Reflection", border_style="magenta"))
+
+def display_instruction(message: str, console=None):
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    # Execute callback if registered
+    if 'instruction' in sync_display_callbacks:
+        sync_display_callbacks['instruction'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold blue"), title="Instruction", border_style="cyan"))
+
+def display_tool_call(message: str, console=None):
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    # Execute callback if registered
+    if 'tool_call' in sync_display_callbacks:
+        sync_display_callbacks['tool_call'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold cyan"), title="Tool Call", border_style="green"))
+
+def display_error(message: str, console=None):
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    # Execute callback if registered
+    if 'error' in sync_display_callbacks:
+        sync_display_callbacks['error'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold red"), title="Error", border_style="red"))
+    error_logs.append(message)
+
+def display_generating(content: str = "", start_time: Optional[float] = None):
+    if not content or not str(content).strip():
+        return Panel("", title="", border_style="green")
+    
+    elapsed_str = ""
+    if start_time is not None:
+        elapsed = time.time() - start_time
+        elapsed_str = f" {elapsed:.1f}s"
+    
+    content = _clean_display_content(str(content))
+    
+    # Execute callback if registered
+    if 'generating' in sync_display_callbacks:
+        sync_display_callbacks['generating'](
+            content=content,
+            elapsed_time=elapsed_str.strip() if elapsed_str else None
+        )
+    
+    return Panel(Markdown(content), title=f"Generating...{elapsed_str}", border_style="green")
+
+# Async versions with 'a' prefix
+async def adisplay_interaction(message, response, markdown=True, generation_time=None, console=None):
+    """Async version of display_interaction."""
+    if console is None:
+        console = Console()
+    
+    if isinstance(message, list):
+        text_content = next((item["text"] for item in message if item["type"] == "text"), "")
+        message = text_content
+
+    message = _clean_display_content(str(message))
+    response = _clean_display_content(str(response))
+
+    # Execute callbacks
+    await execute_callback(
+        'interaction',
+        message=message,
+        response=response,
+        markdown=markdown,
+        generation_time=generation_time
+    )
+
+    # Rest of the display logic...
+    if generation_time:
+        console.print(Text(f"Response generated in {generation_time:.1f}s", style="dim"))
+
+    if markdown:
+        console.print(Panel.fit(Markdown(message), title="Message", border_style="cyan"))
+        console.print(Panel.fit(Markdown(response), title="Response", border_style="cyan"))
+    else:
+        console.print(Panel.fit(Text(message, style="bold green"), title="Message", border_style="cyan"))
+        console.print(Panel.fit(Text(response, style="bold blue"), title="Response", border_style="cyan"))
+
+async def adisplay_self_reflection(message: str, console=None):
+    """Async version of display_self_reflection."""
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    if 'self_reflection' in async_display_callbacks:
+        await async_display_callbacks['self_reflection'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold yellow"), title="Self Reflection", border_style="magenta"))
+
+async def adisplay_instruction(message: str, console=None):
+    """Async version of display_instruction."""
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    if 'instruction' in async_display_callbacks:
+        await async_display_callbacks['instruction'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold blue"), title="Instruction", border_style="cyan"))
+
+async def adisplay_tool_call(message: str, console=None):
+    """Async version of display_tool_call."""
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    if 'tool_call' in async_display_callbacks:
+        await async_display_callbacks['tool_call'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold cyan"), title="Tool Call", border_style="green"))
+
+async def adisplay_error(message: str, console=None):
+    """Async version of display_error."""
+    if not message or not message.strip():
+        return
+    if console is None:
+        console = Console()
+    message = _clean_display_content(str(message))
+    
+    if 'error' in async_display_callbacks:
+        await async_display_callbacks['error'](message=message)
+    
+    console.print(Panel.fit(Text(message, style="bold red"), title="Error", border_style="red"))
+    error_logs.append(message)
+
+async def adisplay_generating(content: str = "", start_time: Optional[float] = None):
+    """Async version of display_generating."""
+    if not content or not str(content).strip():
+        return Panel("", title="", border_style="green")
+    
+    elapsed_str = ""
+    if start_time is not None:
+        elapsed = time.time() - start_time
+        elapsed_str = f" {elapsed:.1f}s"
+    
+    content = _clean_display_content(str(content))
+    
+    if 'generating' in async_display_callbacks:
+        await async_display_callbacks['generating'](
+            content=content,
+            elapsed_time=elapsed_str.strip() if elapsed_str else None
+        )
+    
+    return Panel(Markdown(content), title=f"Generating...{elapsed_str}", border_style="green")
+
+def clean_triple_backticks(text: str) -> str:
+    """Remove triple backticks and surrounding json fences from a string."""
+    cleaned = text.strip()
+    if cleaned.startswith("```json"):
+        cleaned = cleaned[len("```json"):].strip()
+    if cleaned.startswith("```"):
+        cleaned = cleaned[len("```"):].strip()
+    if cleaned.endswith("```"):
+        cleaned = cleaned[:-3].strip()
+    return cleaned
+
+class ReflectionOutput(BaseModel):
+    reflection: str
+    satisfactory: Literal["yes", "no"]
+
+client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"))
+
+class TaskOutput(BaseModel):
+    description: str
+    summary: Optional[str] = None
+    raw: str
+    pydantic: Optional[BaseModel] = None
+    json_dict: Optional[Dict[str, Any]] = None
+    agent: str
+    output_format: Literal["RAW", "JSON", "Pydantic"] = "RAW"
+
+    def json(self) -> Optional[str]:
+        if self.output_format == "JSON" and self.json_dict:
+            return json.dumps(self.json_dict)
+        return None
+
+    def to_dict(self) -> dict:
+        output_dict = {}
+        if self.json_dict:
+            output_dict.update(self.json_dict)
+        if self.pydantic:
+            output_dict.update(self.pydantic.model_dump())
+        return output_dict
+
+    def __str__(self):
+        if self.pydantic:
+            return str(self.pydantic)
+        elif self.json_dict:
+            return json.dumps(self.json_dict)
+        else:
+            return self.raw 

{praisonaiagents-0.0.18 → praisonaiagents-0.0.20}/praisonaiagents.egg-info/PKG-INFO

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

{praisonaiagents-0.0.18 → praisonaiagents-0.0.20}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "praisonaiagents"
-version = "0.0.18"
+version = "0.0.20"
 description = "Praison AI agents for completing complex tasks with Self Reflection Agents"
 authors = [
     { name="Mervin Praison" }

praisonaiagents-0.0.18/praisonaiagents/main.py

@@ -1,206 +0,0 @@
-import os
-import time
-import json
-import logging
-from typing import List, Optional, Dict, Any, Union, Literal, Type
-from openai import OpenAI
-from pydantic import BaseModel
-from rich import print
-from rich.console import Console
-from rich.panel import Panel
-from rich.text import Text
-from rich.markdown import Markdown
-from rich.logging import RichHandler
-from rich.live import Live
-
-LOGLEVEL = os.environ.get('LOGLEVEL', 'INFO').upper()
-
-logging.basicConfig(
-    level=getattr(logging, LOGLEVEL, logging.INFO),
-    format="%(asctime)s %(filename)s:%(lineno)d %(levelname)s %(message)s",
-    datefmt="[%X]",
-    handlers=[RichHandler(rich_tracebacks=True)]
-)
-
-# Global list to store error logs
-error_logs = []
-
-# Global callback registry
-display_callbacks = {}
-
-def register_display_callback(display_type: str, callback_fn):
-    """Register a callback function for a specific display type."""
-    display_callbacks[display_type] = callback_fn
-
-def _clean_display_content(content: str, max_length: int = 20000) -> str:
-    """Helper function to clean and truncate content for display."""
-    if not content or not str(content).strip():
-        return ""
-        
-    content = str(content)
-    # Handle base64 content
-    if "base64" in content:
-        content_parts = []
-        for line in content.split('\n'):
-            if "base64" not in line:
-                content_parts.append(line)
-        content = '\n'.join(content_parts)
-    
-    # Truncate if too long
-    if len(content) > max_length:
-        content = content[:max_length] + "..."
-    
-    return content.strip()
-
-def display_interaction(message, response, markdown=True, generation_time=None, console=None):
-    """Display the interaction between user and assistant."""
-    if console is None:
-        console = Console()
-    
-    # Handle multimodal content (list)
-    if isinstance(message, list):
-        text_content = next((item["text"] for item in message if item["type"] == "text"), "")
-        message = text_content
-
-    message = _clean_display_content(str(message))
-    response = _clean_display_content(str(response))
-
-    # Execute callback if registered
-    if 'interaction' in display_callbacks:
-        display_callbacks['interaction'](
-            message=message,
-            response=response,
-            markdown=markdown,
-            generation_time=generation_time
-        )
-
-    # Existing display logic...
-    if generation_time:
-        console.print(Text(f"Response generated in {generation_time:.1f}s", style="dim"))
-
-    if markdown:
-        console.print(Panel.fit(Markdown(message), title="Message", border_style="cyan"))
-        console.print(Panel.fit(Markdown(response), title="Response", border_style="cyan"))
-    else:
-        console.print(Panel.fit(Text(message, style="bold green"), title="Message", border_style="cyan"))
-        console.print(Panel.fit(Text(response, style="bold blue"), title="Response", border_style="cyan"))
-
-def display_self_reflection(message: str, console=None):
-    if not message or not message.strip():
-        return
-    if console is None:
-        console = Console()
-    message = _clean_display_content(str(message))
-    
-    # Execute callback if registered
-    if 'self_reflection' in display_callbacks:
-        display_callbacks['self_reflection'](message=message)
-    
-    console.print(Panel.fit(Text(message, style="bold yellow"), title="Self Reflection", border_style="magenta"))
-
-def display_instruction(message: str, console=None):
-    if not message or not message.strip():
-        return
-    if console is None:
-        console = Console()
-    message = _clean_display_content(str(message))
-    
-    # Execute callback if registered
-    if 'instruction' in display_callbacks:
-        display_callbacks['instruction'](message=message)
-    
-    console.print(Panel.fit(Text(message, style="bold blue"), title="Instruction", border_style="cyan"))
-
-def display_tool_call(message: str, console=None):
-    if not message or not message.strip():
-        return
-    if console is None:
-        console = Console()
-    message = _clean_display_content(str(message))
-    
-    # Execute callback if registered
-    if 'tool_call' in display_callbacks:
-        display_callbacks['tool_call'](message=message)
-    
-    console.print(Panel.fit(Text(message, style="bold cyan"), title="Tool Call", border_style="green"))
-
-def display_error(message: str, console=None):
-    if not message or not message.strip():
-        return
-    if console is None:
-        console = Console()
-    message = _clean_display_content(str(message))
-    
-    # Execute callback if registered
-    if 'error' in display_callbacks:
-        display_callbacks['error'](message=message)
-    
-    console.print(Panel.fit(Text(message, style="bold red"), title="Error", border_style="red"))
-    error_logs.append(message)
-
-def display_generating(content: str = "", start_time: Optional[float] = None):
-    if not content or not str(content).strip():
-        return Panel("", title="", border_style="green")
-    
-    elapsed_str = ""
-    if start_time is not None:
-        elapsed = time.time() - start_time
-        elapsed_str = f" {elapsed:.1f}s"
-    
-    content = _clean_display_content(str(content))
-    
-    # Execute callback if registered
-    if 'generating' in display_callbacks:
-        display_callbacks['generating'](
-            content=content,
-            elapsed_time=elapsed_str.strip() if elapsed_str else None
-        )
-    
-    return Panel(Markdown(content), title=f"Generating...{elapsed_str}", border_style="green")
-
-def clean_triple_backticks(text: str) -> str:
-    """Remove triple backticks and surrounding json fences from a string."""
-    cleaned = text.strip()
-    if cleaned.startswith("```json"):
-        cleaned = cleaned[len("```json"):].strip()
-    if cleaned.startswith("```"):
-        cleaned = cleaned[len("```"):].strip()
-    if cleaned.endswith("```"):
-        cleaned = cleaned[:-3].strip()
-    return cleaned
-
-class ReflectionOutput(BaseModel):
-    reflection: str
-    satisfactory: Literal["yes", "no"]
-
-client = OpenAI(api_key=os.environ.get("OPENAI_API_KEY"))
-
-class TaskOutput(BaseModel):
-    description: str
-    summary: Optional[str] = None
-    raw: str
-    pydantic: Optional[BaseModel] = None
-    json_dict: Optional[Dict[str, Any]] = None
-    agent: str
-    output_format: Literal["RAW", "JSON", "Pydantic"] = "RAW"
-
-    def json(self) -> Optional[str]:
-        if self.output_format == "JSON" and self.json_dict:
-            return json.dumps(self.json_dict)
-        return None
-
-    def to_dict(self) -> dict:
-        output_dict = {}
-        if self.json_dict:
-            output_dict.update(self.json_dict)
-        if self.pydantic:
-            output_dict.update(self.pydantic.model_dump())
-        return output_dict
-
-    def __str__(self):
-        if self.pydantic:
-            return str(self.pydantic)
-        elif self.json_dict:
-            return json.dumps(self.json_dict)
-        else:
-            return self.raw