Merge pull request #209 from MervinPraison/develop

Develop

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.11-slim
 WORKDIR /app
 COPY . .
-RUN pip install flask praisonai==2.0.0 gunicorn markdown
+RUN pip install flask praisonai==2.0.4 gunicorn markdown
 EXPOSE 8080
 CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]

docs/api/praisonai/deploy.html

@@ -110,7 +110,7 @@ Loads environment variables from .env file or system and sets them.</p>
             file.write(&#34;FROM python:3.11-slim\n&#34;)
             file.write(&#34;WORKDIR /app\n&#34;)
             file.write(&#34;COPY . .\n&#34;)
-            file.write(&#34;RUN pip install flask praisonai==2.0.0 gunicorn markdown\n&#34;)
+            file.write(&#34;RUN pip install flask praisonai==2.0.4 gunicorn markdown\n&#34;)
             file.write(&#34;EXPOSE 8080\n&#34;)
             file.write(&#39;CMD [&#34;gunicorn&#34;, &#34;-b&#34;, &#34;0.0.0.0:8080&#34;, &#34;api:app&#34;]\n&#39;)
             

poetry.lock

@@ -8808,24 +8808,7 @@ enabler = ["pytest-enabler (>=2.2)"]
 test = ["big-O", "importlib-resources", "jaraco.functools", "jaraco.itertools", "jaraco.test", "more-itertools", "pytest (>=6,!=8.1.*)", "pytest-ignore-flaky"]
 type = ["pytest-mypy"]
 
-[extras]
-agentops = ["agentops"]
-anthropic = ["langchain-anthropic"]
-api = ["flask"]
-autogen = ["crewai", "instructor", "praisonai-tools", "pyautogen"]
-call = ["fastapi", "flaml", "instructor", "openai", "pyngrok", "python-dotenv", "rich", "twilio", "uvicorn", "websockets"]
-chat = ["aiosqlite", "chainlit", "crawl4ai", "greenlet", "instructor", "litellm", "playwright", "pydantic", "rich", "sqlalchemy", "tavily-python"]
-code = ["aiosqlite", "chainlit", "crawl4ai", "greenlet", "litellm", "playwright", "pydantic", "sqlalchemy", "tavily-python"]
-cohere = ["langchain-cohere"]
-crewai = ["crewai", "instructor", "praisonai-tools"]
-google = ["langchain-google-genai"]
-gradio = ["gradio"]
-openai = ["langchain-openai"]
-realtime = ["aiosqlite", "chainlit", "crawl4ai", "duckduckgo_search", "greenlet", "litellm", "plotly", "sqlalchemy", "tavily-python", "websockets", "yfinance"]
-train = []
-ui = ["chainlit"]
-
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.10,<3.13"
-content-hash = "4bf535a5deaebe29ec78389b4f7fe5d8fb67695c21a9209b8f566e059a36027f"
+content-hash = "82b910cae134177cc79a3b6ca572ee14bf95ee3bf9d334012ca5890bdb5feb69"

praisonai.rb

@@ -3,7 +3,7 @@ class Praisonai < Formula
   
     desc "AI tools for various AI applications"
     homepage "https://github.com/MervinPraison/PraisonAI"
-    url "https://github.com/MervinPraison/PraisonAI/archive/refs/tags/2.0.0.tar.gz"
+    url "https://github.com/MervinPraison/PraisonAI/archive/refs/tags/2.0.4.tar.gz"
     sha256 "1828fb9227d10f991522c3f24f061943a254b667196b40b1a3e4a54a8d30ce32"  # Replace with actual SHA256 checksum
     license "MIT"
   

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

pyproject.toml

@@ -1,16 +1,112 @@
+[build-system]
+requires = [
+    "poetry-core>=1.0.0",
+    "setuptools>=42",
+    "wheel>=0.37.0",
+    "instructor>=0.4.8",
+    "python-dotenv>=1.0.1",
+    "PyYAML>=6.0"
+]
+build-backend = "poetry.core.masonry.api"
+
 [project]
 name = "PraisonAI"
-version = "2.0.0"
+version = "2.0.4"
 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."
 readme = "README.md"
 license = ""
+requires-python = ">=3.10,<3.13"
 authors = [
     { name = "Mervin Praison" }
 ]
+dependencies = [
+    "rich>=13.7",
+    "markdown>=3.5",
+    "pyparsing>=3.0.0",
+    "python-dotenv>=1.0.1",
+    "instructor>=0.4.8",
+    "PyYAML>=6.0",
+    "praisonaiagents>=0.0.4"
+]
+
+[project.scripts]
+praisonai = "praisonai.__main__:main"
+setup-conda-env = "setup.setup_conda_env:main"
+praisonai-call = "praisonai.api.call:main"
+
+[project.optional-dependencies]
+autogen = [
+    "pyautogen>=0.2.19",
+    "praisonai-tools>=0.0.7",
+    "instructor>=0.4.8",
+    "crewai>=0.32.0"
+]
+crewai = [
+    "crewai>=0.32.0",
+    "praisonai-tools>=0.0.7",
+    "instructor>=0.4.8"
+]
+ui = ["chainlit==2.0rc1"]
+gradio = ["gradio>=4.26.0"]
+api = ["flask>=3.0.0"]
+agentops = ["agentops>=0.3.12"]
+google = ["langchain-google-genai>=1.0.4"]
+openai = ["langchain-openai>=0.1.7"]
+anthropic = ["langchain-anthropic>=0.1.13"]
+cohere = ["langchain-cohere>=0.1.4"]
+chat = [
+    "chainlit==2.0rc1",
+    "litellm>=1.41.8",
+    "aiosqlite>=0.20.0",
+    "greenlet>=3.0.3",
+    "tavily-python==0.5.0",
+    "crawl4ai==0.3.4",
+    "sqlalchemy>=2.0.36",
+    "playwright>=1.47.0",
+    "rich>=13.7",
+    "instructor>=0.4.8",
+    "pydantic<=2.10.1"
+]
+code = [
+    "chainlit==2.0rc1",
+    "litellm>=1.41.8",
+    "aiosqlite>=0.20.0",
+    "greenlet>=3.0.3",
+    "tavily-python==0.5.0",
+    "crawl4ai==0.3.4",
+    "sqlalchemy>=2.0.36",
+    "playwright>=1.47.0",
+    "pydantic<=2.10.1"
+]
+realtime = [
+    "chainlit==2.0rc1",
+    "litellm>=1.41.8",
+    "aiosqlite>=0.20.0",
+    "greenlet>=3.0.3",
+    "tavily-python==0.5.0",
+    "crawl4ai==0.3.4",
+    "websockets>=12.0",
+    "plotly>=5.24.0",
+    "yfinance>=0.2.44",
+    "duckduckgo_search>=6.3.0",
+    "sqlalchemy>=2.0.36"
+]
+call = [
+    "twilio>=7.0.0",
+    "fastapi>=0.95.0",
+    "uvicorn>=0.20.0",
+    "websockets>=12.0",
+    "python-dotenv>=1.0.1",
+    "flaml[automl]>=2.3.1",
+    "pyngrok>=1.4.0",
+    "rich>=13.7",
+    "openai>=1.54.0",
+    "instructor>=0.4.8"
+]
 
 [tool.poetry]
 name = "PraisonAI"
-version = "2.0.0"
+version = "2.0.4"
 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 = ""
@@ -28,8 +124,9 @@ python = ">=3.10,<3.13"
 rich = ">=13.7"
 markdown = ">=3.5"
 pyparsing = ">=3.0.0"
-python-dotenv = {version = ">=1.0.1"}
+python-dotenv = ">=1.0.1"
 instructor = ">=0.4.8"
+PyYAML = ">=6.0"
 praisonaiagents = ">=0.0.4"
 pyautogen = {version = ">=0.2.19", optional = true}
 crewai = {version = ">=0.32.0", optional = true}

requirements.txt

@@ -1,7 +1,9 @@
 rich>=13.7
-pyautogen>=0.2.19
-crewai>=0.30.4
-gradio>=4.20.0
-chainlit>=1.1.301
+markdown>=3.5
+pyparsing>=3.0.0
+python-dotenv>=1.0.1
+instructor>=0.4.8
+PyYAML>=6.0
+praisonaiagents>=0.0.4
 duckduckgo_search
 praisonai_tools