PraisonAI 0.0.36__tar.gz → 0.0.38__tar.gz

{praisonai-0.0.36 → praisonai-0.0.38}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PraisonAI
-Version: 0.0.36
+Version: 0.0.38
 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)
@@ -299,6 +307,30 @@ gcloud run deploy praisonai-service \
     --set-env-vars OPENAI_MODEL_NAME=${OPENAI_MODEL_NAME},OPENAI_API_KEY=${OPENAI_API_KEY},OPENAI_API_BASE=${OPENAI_API_BASE}
 ```
 
+### Commands to Install Dependencies:
+
+1. **Install all dependencies, including dev dependencies:**
+   ```sh
+   poetry install
+   ```
+
+2. **Install only documentation dependencies:**
+   ```sh
+   poetry install --with docs
+   ```
+
+3. **Install only test dependencies:**
+   ```sh
+   poetry install --with test
+   ```
+
+4. **Install only dev dependencies:**
+   ```sh
+   poetry install --with dev
+   ```
+
+This configuration ensures that your development dependencies are correctly categorized and installed as needed.
+
 ## Other Models
 
 ```bash
@@ -333,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.36 → praisonai-0.0.38}/README.md

@@ -271,6 +271,30 @@ gcloud run deploy praisonai-service \
     --set-env-vars OPENAI_MODEL_NAME=${OPENAI_MODEL_NAME},OPENAI_API_KEY=${OPENAI_API_KEY},OPENAI_API_BASE=${OPENAI_API_BASE}
 ```
 
+### Commands to Install Dependencies:
+
+1. **Install all dependencies, including dev dependencies:**
+   ```sh
+   poetry install
+   ```
+
+2. **Install only documentation dependencies:**
+   ```sh
+   poetry install --with docs
+   ```
+
+3. **Install only test dependencies:**
+   ```sh
+   poetry install --with test
+   ```
+
+4. **Install only dev dependencies:**
+   ```sh
+   poetry install --with dev
+   ```
+
+This configuration ensures that your development dependencies are correctly categorized and installed as needed.
+
 ## Other Models
 
 ```bash
@@ -305,3 +329,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.36 → praisonai-0.0.38}/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
@@ -26,12 +27,12 @@ from praisonai_tools import BaseTool
 import os
 import logging
 
-agentops = False
+agentops_exists = False
 try:
     import agentops
-    agentops = True
+    agentops_exists = True
 except ImportError:
-    agentops = False
+    agentops_exists = False
 
 os.environ["OTEL_SDK_DISABLED"] = "true"
 
@@ -221,6 +222,8 @@ class AgentsGenerator:
             # print(self.config_list)
             llm_config = {"config_list": self.config_list}
             
+            if agentops_exists:
+                agentops.init(os.environ.get("AGENTOPS_API_KEY"), tags=["autogen"])
             # Assuming the user proxy agent is set up as per your requirements
             user_proxy = autogen.UserProxyAgent(
                 name="User",
@@ -264,10 +267,13 @@ class AgentsGenerator:
                         # Additional fields like carryover can be added based on dependencies
                     }
                     tasks.append(chat_task)
-
             response = user_proxy.initiate_chats(tasks)
             result = "### Output ###\n"+response[-1].summary if hasattr(response[-1], 'summary') else ""
-        else:
+            if agentops_exists:
+                agentops.end_session("Success")
+        else: # framework=crewai
+            if agentops_exists:
+                agentops.init(os.environ.get("AGENTOPS_API_KEY"), tags=["crewai"])
             for role, details in config['roles'].items():
                 role_filled = details['role'].format(topic=topic)
                 goal_filled = details['goal'].format(topic=topic)
@@ -275,7 +281,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:
@@ -294,15 +333,12 @@ class AgentsGenerator:
                         task.callback = self.task_callback
 
                     tasks.append(task)
-            if agentops:
-                agentops.init()
+            
             crew = Crew(
                 agents=list(agents.values()),
                 tasks=tasks,
                 verbose=2
             )
-            if agentops:
-                agentops.end_session("Success")
             
             self.logger.debug("Final Crew Configuration:")
             self.logger.debug(f"Agents: {crew.agents}")
@@ -310,5 +346,7 @@ class AgentsGenerator:
 
             response = crew.kickoff()
             result = f"### Task Output ###\n{response}"
+            if agentops_exists:
+                agentops.end_session("Success")
         return result
 

{praisonai-0.0.36 → praisonai-0.0.38}/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-0.0.36 → praisonai-0.0.38}/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-0.0.36 → praisonai-0.0.38}/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.36 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==0.0.38 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

praisonai-0.0.38/praisonai/inc/__init__.py

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

praisonai-0.0.38/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.38/pyproject.toml

@@ -0,0 +1,95 @@
+[tool.poetry]
+name = "PraisonAI"
+version = "0.0.38"
+description = "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."
+authors = ["Mervin Praison"]
+license = ""
+readme = "README.md"
+
+[tool.poetry.urls]
+Homepage = "https://docs.praison.ai"
+Repository = "https://github.com/mervinpraison/PraisonAI"
+
+[tool.setuptools]
+packages = ["PraisonAI"]
+
+[tool.poetry.dependencies]
+python = ">=3.10,<3.13"
+rich = ">=13.7"
+pyautogen = ">=0.2.19"
+crewai = ">=0.32.0"
+markdown = ">=3.5"
+praisonai-tools = ">=0.0.7"
+pyparsing = ">=3.0.0" # Added to fix a colab issue. Temp Fix.
+chainlit = {version = "^1.1.301", optional = true}
+gradio = {version = ">=4.26.0", optional = true}
+flask = {version = ">=3.0.0", optional = true}
+agentops = {version = ">=0.2.6", optional = true}
+langchain-google-genai = {version = ">=1.0.4", optional = true}
+langchain-anthropic = {version = ">=0.1.13", optional = true}
+langchain-openai = {version = ">=0.1.7", optional = true}
+langchain-cohere = {version = ">=0.1.4", optional = true}
+
+[tool.poetry.group.docs.dependencies]
+mkdocs = "*"
+markdown-include = "*"
+mkdocs-material = "*"
+mkdocs-jupyter = "*"
+mkdocs-glightbox = "*"
+pymdown-extensions = "*"
+Pygments = "*"
+mkdocstrings = "*"
+mkdocs-apidoc = "*"
+mkdocstrings-python = "*"
+pdoc3 = "*"
+
+[tool.poetry.group.test.dependencies]
+pytest = "8.2.2"
+pre-commit = "3.7.1"
+unittest-xml-reporting = "3.2.0"
+xmlrunner = "*"
+unittest2 = "*"
+
+[tool.poetry.group.dev.dependencies]
+pytest = "8.2.2"
+pre-commit = "3.7.1"
+unittest-xml-reporting = "3.2.0"
+mkdocs = "*"
+markdown-include = "*"
+mkdocs-material = "*"
+mkdocs-jupyter = "*"
+mkdocs-glightbox = "*"
+pymdown-extensions = "*"
+Pygments = "*"
+mkdocstrings = "*"
+mkdocs-apidoc = "*"
+mkdocstrings-python = "*"
+pdoc3 = "*"
+xmlrunner = "*"
+unittest2 = "*"
+chainlit = "^1.1.301"
+gradio = ">=4.26.0"
+flask = ">=3.0.0"
+agentops = ">=0.2.6"
+langchain-google-genai = ">=1.0.4"
+langchain-anthropic = ">=0.1.13"
+langchain-openai = ">=0.1.7"
+langchain-cohere = ">=0.1.4"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+
+[tool.poetry.scripts]
+praisonai = "praisonai.__main__:main"
+
+[tool.poetry.extras]
+ui = ["chainlit"]
+gradio = ["gradio"]
+api = ["flask"]
+agentops = ["agentops"]
+google = ["langchain-google-genai"]
+openai = ["langchain-openai"]
+anthropic = ["langchain-anthropic"]
+cohere = ["langchain-cohere"]

praisonai-0.0.36/pyproject.toml

@@ -1,45 +0,0 @@
-[tool.poetry]
-name = "PraisonAI"
-version = "0.0.36"
-description = "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."
-authors = ["Mervin Praison"]
-license = ""
-readme = "README.md"
-
-[tool.poetry.urls]
-Homepage = "https://docs.praison.ai"
-Repository = "https://github.com/mervinpraison/PraisonAI"
-
-[tool.setuptools]
-packages = ["PraisonAI"]
-
-[tool.poetry.dependencies]
-python = ">=3.10,<3.13"
-rich = ">=13.7"
-pyautogen = ">=0.2.19"
-crewai = ">=0.32.0"
-markdown = ">=3.5"
-praisonai-tools = ">=0.0.7"
-pyparsing = ">=3.0.0"
-chainlit = {version = "^1.1.301", optional = true}
-gradio = {version = ">=4.26.0", optional = true}
-flask = {version = ">=3.0.0", optional = true}
-agentops = {version = "==0.2.3", optional = true}
-
-[tool.poetry.dev-dependencies]
-pytest = "8.2.2"
-pre-commit = "3.7.1"
-unittest-xml-reporting = "3.2.0"
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.poetry.scripts]
-praisonai = "praisonai.__main__:main"
-
-[tool.poetry.extras]
-ui = ["chainlit"]
-gradio = ["gradio"]
-api = ["flask"]
-agentops = ["agentops"]