PraisonAI 0.0.37__py3-none-any.whl → 0.0.39__py3-none-any.whl

praisonai/agents_generator.py

@@ -18,6 +18,7 @@ from praisonai_tools import (
     YoutubeVideoSearchTool
 )
 from .inbuilt_tools import *
+from .inc import PraisonAIModel
 import inspect
 from pathlib import Path
 import importlib
@@ -46,7 +47,7 @@ def disable_crewai_telemetry():
 disable_crewai_telemetry()
 
 class AgentsGenerator:
-    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None):
+    def __init__(self, agent_file, framework, config_list, log_level=None, agent_callback=None, task_callback=None, agent_yaml=None):
         """
         Initialize the AgentsGenerator object.
 
@@ -57,6 +58,7 @@ class AgentsGenerator:
             log_level (int, optional): The logging level to use. Defaults to logging.INFO.
             agent_callback (callable, optional): A callback function to be executed after each agent step.
             task_callback (callable, optional): A callback function to be executed after each tool run.
+            agent_yaml (str, optional): The content of the YAML file. Defaults to None.
 
         Attributes:
             agent_file (str): The path to the agent file.
@@ -72,6 +74,7 @@ class AgentsGenerator:
         self.log_level = log_level
         self.agent_callback = agent_callback
         self.task_callback = task_callback
+        self.agent_yaml = agent_yaml
         self.log_level = log_level or logging.getLogger().getEffectiveLevel()
         if self.log_level == logging.NOTSET:
             self.log_level = os.environ.get('LOGLEVEL', 'INFO').upper()
@@ -169,14 +172,17 @@ class AgentsGenerator:
 
         This function first loads the agent configuration from the specified file. It then initializes the tools required for the agents based on the specified framework. If the specified framework is "autogen", it loads the LLM configuration dynamically and creates an AssistantAgent for each role in the configuration. It then adds tools to the agents if specified in the configuration. Finally, it prepares tasks for the agents based on the configuration and initiates the tasks using the crew of agents. If the specified framework is not "autogen", it creates a crew of agents and initiates tasks based on the configuration.
         """
-        if self.agent_file == '/app/api:app' or self.agent_file == 'api:app':
-            self.agent_file = 'agents.yaml'
-        try:
-            with open(self.agent_file, 'r') as f:
-                config = yaml.safe_load(f)
-        except FileNotFoundError:
-            print(f"File not found: {self.agent_file}")
-            return
+        if self.agent_yaml:
+            config = yaml.safe_load(self.agent_yaml)
+        else:
+            if self.agent_file == '/app/api:app' or self.agent_file == 'api:app':
+                self.agent_file = 'agents.yaml'
+            try:
+                with open(self.agent_file, 'r') as f:
+                    config = yaml.safe_load(f)
+            except FileNotFoundError:
+                print(f"File not found: {self.agent_file}")
+                return
 
         topic = config['topic']
         tools_dict = {
@@ -270,7 +276,7 @@ class AgentsGenerator:
             result = "### Output ###\n"+response[-1].summary if hasattr(response[-1], 'summary') else ""
             if agentops_exists:
                 agentops.end_session("Success")
-        else:
+        else: # framework=crewai
             if agentops_exists:
                 agentops.init(os.environ.get("AGENTOPS_API_KEY"), tags=["crewai"])
             for role, details in config['roles'].items():
@@ -280,7 +286,40 @@ class AgentsGenerator:
                 
                 # Adding tools to the agent if exists
                 agent_tools = [tools_dict[tool] for tool in details.get('tools', []) if tool in tools_dict]
-                agent = Agent(role=role_filled, goal=goal_filled, backstory=backstory_filled, tools=agent_tools, allow_delegation=False)
+                
+                llm_model = details.get('llm')  # Get the llm configuration
+                if llm_model:
+                    llm = PraisonAIModel(
+                        model=llm_model.get("model", os.environ.get("MODEL_NAME", "openai/gpt-4o")),
+                    ).get_model()
+                else:
+                    llm = PraisonAIModel().get_model()
+
+                function_calling_llm_model = details.get('function_calling_llm')
+                if function_calling_llm_model:
+                    function_calling_llm = PraisonAIModel(
+                        model=function_calling_llm_model.get("model", os.environ.get("MODEL_NAME", "openai/gpt-4o")),
+                    ).get_model()
+                else:
+                    function_calling_llm = PraisonAIModel().get_model()
+                
+                agent = Agent(
+                    role=role_filled, 
+                    goal=goal_filled, 
+                    backstory=backstory_filled, 
+                    tools=agent_tools, 
+                    allow_delegation=details.get('allow_delegation', False),
+                    llm=llm,
+                    function_calling_llm=function_calling_llm,
+                    max_iter=details.get('max_iter', 15),
+                    max_rpm=details.get('max_rpm'),
+                    max_execution_time=details.get('max_execution_time'),
+                    verbose=details.get('verbose', True),
+                    cache=details.get('cache', True),
+                    system_template=details.get('system_template'),
+                    prompt_template=details.get('prompt_template'),
+                    response_template=details.get('response_template'),
+                )
                 
                 # Set agent callback if provided
                 if self.agent_callback:

praisonai/auto.py

@@ -6,6 +6,8 @@ import os
 import json
 import yaml
 from rich import print
+import logging
+logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO').upper(), format='%(asctime)s - %(levelname)s - %(message)s')
 
 # Define Pydantic models outside of the generate method
 class TaskDetails(BaseModel):

praisonai/chainlit_ui.py

@@ -10,6 +10,8 @@ from dotenv import load_dotenv
 load_dotenv()
 from contextlib import redirect_stdout
 from io import StringIO
+import logging
+logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO').upper(), format='%(asctime)s - %(levelname)s - %(message)s')
 
 framework = "crewai"
 config_list = [

praisonai/cli.py

@@ -29,7 +29,7 @@ except ImportError:
     GRADIO_AVAILABLE = False
 
 class PraisonAI:
-    def __init__(self, agent_file="agents.yaml", framework="", auto=False, init=False):
+    def __init__(self, agent_file="agents.yaml", framework="", auto=False, init=False, agent_yaml=None):
         """
         Initialize the PraisonAI object with default parameters.
 
@@ -45,7 +45,9 @@ class PraisonAI:
             framework (str): The framework to use.
             auto (bool): A flag indicating whether to enable auto mode.
             init (bool): A flag indicating whether to enable initialization mode.
+            agent_yaml (str, optional): The content of the YAML file. Defaults to None.
         """
+        self.agent_yaml = agent_yaml
         self.config_list = [
             {
                 'model': os.environ.get("OPENAI_MODEL_NAME", "gpt-4o"),
@@ -121,11 +123,11 @@ class PraisonAI:
                 self.create_chainlit_interface()
             else:
                 # Modify below code to allow default ui
-                agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list)
+                agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list, agent_yaml=self.agent_yaml)
                 result = agents_generator.generate_crew_and_kickoff()
                 return result
         else:
-            agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list)
+            agents_generator = AgentsGenerator(self.agent_file, self.framework, self.config_list, agent_yaml=self.agent_yaml)
             result = agents_generator.generate_crew_and_kickoff()
             return result
             

praisonai/deploy.py

@@ -56,7 +56,7 @@ class CloudDeployer:
             file.write("FROM python:3.11-slim\n")
             file.write("WORKDIR /app\n")
             file.write("COPY . .\n")
-            file.write("RUN pip install flask praisonai==0.0.37 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.39 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

praisonai/inc/__init__.py

@@ -0,0 +1,2 @@
+# praisonai/inc/__init__.py
+from .models import PraisonAIModel

praisonai/inc/models.py

@@ -0,0 +1,124 @@
+# praisonai/inc/models.py
+import os
+import logging
+logger = logging.getLogger(__name__)
+logging.basicConfig(level=os.environ.get('LOGLEVEL', 'INFO').upper(), format='%(asctime)s - %(levelname)s - %(message)s')
+
+# Conditionally import modules based on availability
+try:
+    from langchain_openai import ChatOpenAI  # pip install langchain-openai
+    OPENAI_AVAILABLE = True
+except ImportError:
+    OPENAI_AVAILABLE = False
+
+try:
+    from langchain_google_genai import ChatGoogleGenerativeAI  # pip install langchain-google-genai
+    GOOGLE_GENAI_AVAILABLE = True
+except ImportError:
+    GOOGLE_GENAI_AVAILABLE = False
+
+try:
+    from langchain_anthropic import ChatAnthropic  # pip install langchain-anthropic
+    ANTHROPIC_AVAILABLE = True
+except ImportError:
+    ANTHROPIC_AVAILABLE = False
+
+try:
+    from langchain_cohere import ChatCohere  # pip install langchain-cohere
+    COHERE_AVAILABLE = True
+except ImportError:
+    COHERE_AVAILABLE = False
+
+class PraisonAIModel:
+    def __init__(self, model=None, api_key_var=None, base_url=None):
+        """
+        Initializes the PraisonAIModel with the provided parameters or environment variables.
+
+        Args:
+            model (str, optional): The name of the OpenAI model. Defaults to None.
+            api_key_var (str, optional): The OpenAI API key. Defaults to None.
+            base_url (str, optional): The base URL for the OpenAI API. Defaults to None.
+        """
+        self.model =  model or os.getenv("OPENAI_MODEL_NAME", "gpt-4o")
+        if self.model.startswith("openai/"):
+            self.api_key_var = "OPENAI_API_KEY"
+            self.base_url = base_url or "https://api.openai.com/v1"
+            self.model_name = self.model.replace("openai/", "")
+        elif self.model.startswith("groq/"):
+            self.api_key_var = "GROQ_API_KEY"
+            self.base_url = base_url or "https://api.groq.com/openai/v1"
+            self.model_name = self.model.replace("groq/", "")
+        elif self.model.startswith("cohere/"):
+            self.api_key_var = "COHERE_API_KEY"
+            self.base_url = ""
+            self.model_name = self.model.replace("cohere/", "")
+        elif self.model.startswith("ollama/"):
+            self.api_key_var = "OLLAMA_API_KEY"
+            self.base_url = base_url or "http://localhost:11434/v1"
+            self.model_name = self.model.replace("ollama/", "")
+        elif self.model.startswith("anthropic/"):
+            self.api_key_var = "ANTHROPIC_API_KEY"
+            self.base_url = ""
+            self.model_name = self.model.replace("anthropic/", "")
+        elif self.model.startswith("google/"):
+            self.api_key_var = "GOOGLE_API_KEY"
+            self.base_url = ""
+            self.model_name = self.model.replace("google/", "")
+        else: 
+            self.api_key_var = api_key_var or "OPENAI_API_KEY" 
+            self.base_url = base_url or os.environ.get("OPENAI_API_BASE", "https://api.openai.com/v1")
+            self.model_name = self.model
+        logger.debug(f"Initialized PraisonAIModel with model {self.model_name}, api_key_var {self.api_key_var}, and base_url {self.base_url}")
+        self.api_key = os.environ.get(self.api_key_var, "nokey")
+
+    def get_model(self):
+        """
+        Returns an instance of the langchain Chat client with the configured parameters.
+
+        Returns:
+            Chat: An instance of the langchain Chat client.
+        """
+        if self.model.startswith("google/"):
+            if GOOGLE_GENAI_AVAILABLE:
+                return ChatGoogleGenerativeAI(
+                    model=self.model_name,
+                    google_api_key=self.api_key
+                )
+            else:
+                raise ImportError(
+                    "Required Langchain Integration 'langchain-google-genai' not found. "
+                    "Please install with 'pip install langchain-google-genai'"
+                )
+        elif self.model.startswith("cohere/"):
+            if COHERE_AVAILABLE:
+                return ChatCohere(
+                    model=self.model_name,
+                    cohere_api_key=self.api_key,
+                )
+            else:
+                raise ImportError(
+                    "Required Langchain Integration 'langchain-cohere' not found. "
+                    "Please install with 'pip install langchain-cohere'"
+                )
+        elif self.model.startswith("anthropic/"):
+            if ANTHROPIC_AVAILABLE:
+                return ChatAnthropic(
+                    model=self.model_name,
+                    anthropic_api_key=self.api_key,
+                )
+            else:
+                raise ImportError(
+                    "Required Langchain Integration 'langchain-anthropic' not found. "
+                    "Please install with 'pip install langchain-anthropic'"
+                )
+        elif OPENAI_AVAILABLE:
+            return ChatOpenAI(
+                model=self.model_name,
+                api_key=self.api_key,
+                base_url=self.base_url,
+            )
+        else:
+            raise ImportError(
+                "Required Langchain Integration 'langchain-openai' not found. "
+                "Please install with 'pip install langchain-openai'"
+            )

{praisonai-0.0.37.dist-info → praisonai-0.0.39.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.37
+Version: 0.0.39
 Summary: PraisonAI application combines AutoGen and CrewAI or similar frameworks into a low-code solution for building and managing multi-agent LLM systems, focusing on simplicity, customization, and efficient human-agent collaboration.
 Author: Mervin Praison
 Requires-Python: >=3.10,<3.13
@@ -9,14 +9,22 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: agentops
+Provides-Extra: anthropic
 Provides-Extra: api
+Provides-Extra: cohere
+Provides-Extra: google
 Provides-Extra: gradio
+Provides-Extra: openai
 Provides-Extra: ui
-Requires-Dist: agentops (==0.2.3) ; extra == "agentops"
+Requires-Dist: agentops (>=0.2.6) ; extra == "agentops"
 Requires-Dist: chainlit (>=1.1.301,<2.0.0) ; extra == "ui"
 Requires-Dist: crewai (>=0.32.0)
 Requires-Dist: flask (>=3.0.0) ; extra == "api"
 Requires-Dist: gradio (>=4.26.0) ; extra == "gradio"
+Requires-Dist: langchain-anthropic (>=0.1.13) ; extra == "anthropic"
+Requires-Dist: langchain-cohere (>=0.1.4) ; extra == "cohere"
+Requires-Dist: langchain-google-genai (>=1.0.4) ; extra == "google"
+Requires-Dist: langchain-openai (>=0.1.7) ; extra == "openai"
 Requires-Dist: markdown (>=3.5)
 Requires-Dist: praisonai-tools (>=0.0.7)
 Requires-Dist: pyautogen (>=0.2.19)
@@ -357,4 +365,6 @@ OPENAI_API_KEY=your-mistral-api-key
 - Submit a pull request via GitHub's web interface.
 - Await feedback from project maintainers.
 
+## Star History
 
+[![Star History Chart](https://api.star-history.com/svg?repos=MervinPraison/PraisonAI&type=Date)](https://docs.praison.ai)

{praisonai-0.0.37.dist-info → praisonai-0.0.39.dist-info}/RECORD

@@ -1,20 +1,22 @@
 praisonai/__init__.py,sha256=JrgyPlzZfLlozoW7SHZ1nVJ63rLPR3ki2k5ZPywYrnI,175
 praisonai/__main__.py,sha256=MVgsjMThjBexHt4nhd760JCqvP4x0IQcwo8kULOK4FQ,144
-praisonai/agents_generator.py,sha256=K4I5o7UliVhIb9nSFoGsCsJpPe7Cxtsg4Mflgtp2pHE,15030
-praisonai/auto.py,sha256=CpE9zUbdCP1wR0aLZWKVLxiLU9JOQprRNBK9WKDZVQo,7758
-praisonai/chainlit_ui.py,sha256=uXo7KTuOH09cu_rLU5RU5JLVCKSc9FM5IcpuW_SVG90,12079
-praisonai/cli.py,sha256=W_PL7bWnEEuFYBT24mh8171f7TiE_LdxVfrM16fp7Pc,10868
-praisonai/deploy.py,sha256=mQkAIR4X3ZWQCgX-EIJ3rKPeft9bH4cnCj5IriHHG9o,6031
+praisonai/agents_generator.py,sha256=DoRYanu16HIAcmIcxiWeHaklfY_IaFb3CUoqBvhOh4A,16930
+praisonai/auto.py,sha256=9spTXqj47Hmmqv5QHRYE_RzSVHH_KoPbaZjskUj2UcE,7895
+praisonai/chainlit_ui.py,sha256=bNR7s509lp0I9JlJNvwCZRUZosC64qdvlFCt8NmFamQ,12216
+praisonai/cli.py,sha256=cwuXGubuac7yTeiqx5o5S7ZN7erZAfe-6p35b3HM5SU,11066
+praisonai/deploy.py,sha256=suxuznJ9YRBG9NjMMR5lEVjSTIS_27dcy5ACaYaiZtU,6031
 praisonai/inbuilt_tools/__init__.py,sha256=mUKnbL6Gram9c9f2m8wJwEzURBLmPEOcHzwySBH89YA,74
 praisonai/inbuilt_tools/autogen_tools.py,sha256=svYkM2N7DVFvbiwgoAS7U_MqTOD8rHf8VD3BaFUV5_Y,14907
+praisonai/inc/__init__.py,sha256=sPDlYBBwdk0VlWzaaM_lG0_LD07lS2HRGvPdxXJFiYg,62
+praisonai/inc/models.py,sha256=ySFxObHtuPxnmhjmx4MrFY86dH8h3xthLGzGW7XRr08,5207
 praisonai/public/fantasy.svg,sha256=4Gs3kIOux-pjGtw6ogI_rv5_viVJxnE5gRwGilsSg0o,1553
 praisonai/public/game.svg,sha256=y2QMaA01m8XzuDjTOBWzupOC3-TpnUl9ah89mIhviUw,2406
 praisonai/public/movie.svg,sha256=aJ2EQ8vXZusVsF2SeuAVxP4RFJzQ14T26ejrGYdBgzk,1289
 praisonai/public/thriller.svg,sha256=2dYY72EcgbEyTxS4QzjAm37Y4srtPWEW4vCMFki98ZI,3163
 praisonai/test.py,sha256=RZKq3UEFb6AnFFiHER3zBXfNmlteSLBlrTmOvnpnZLo,4092
 praisonai/version.py,sha256=ugyuFliEqtAwQmH4sTlc16YXKYbFWDmfyk87fErB8-8,21
-praisonai-0.0.37.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
-praisonai-0.0.37.dist-info/METADATA,sha256=Xpz7nJpDWwWqRC69QYlUVUwv2ecyxdATFgwkhjxhYw0,10359
-praisonai-0.0.37.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-praisonai-0.0.37.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
-praisonai-0.0.37.dist-info/RECORD,,
+praisonai-0.0.39.dist-info/LICENSE,sha256=kqvFysVlnFxYOu0HxCe2HlmZmJtdmNGOxWRRkT9TsWc,1035
+praisonai-0.0.39.dist-info/METADATA,sha256=OHIsvAkxdbEEXGMtAijYIspkd71u8a-XXjAP9cuebBA,10854
+praisonai-0.0.39.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+praisonai-0.0.39.dist-info/entry_points.txt,sha256=Qg41eW3A1-dvdV5tF7LqChfYof8Rihk2rN1fiEE3vnk,53
+praisonai-0.0.39.dist-info/RECORD,,