Merge pull request #214 from MervinPraison/develop

Adding Depends 9

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.11-slim
 WORKDIR /app
 COPY . .
-RUN pip install flask praisonai==2.0.4 gunicorn markdown
+RUN pip install flask praisonai==2.0.10 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.4 gunicorn markdown\n&#34;)
+            file.write(&#34;RUN pip install flask praisonai==2.0.10 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,7 +8808,24 @@ 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 = "82b910cae134177cc79a3b6ca572ee14bf95ee3bf9d334012ca5890bdb5feb69"
+content-hash = "5a229528c29be5c9d62bcd02ad55be9c3c7ddd3b43eb91e707849c929e1b6bd4"

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.4.tar.gz"
+    url "https://github.com/MervinPraison/PraisonAI/archive/refs/tags/2.0.10.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.4 gunicorn markdown\n")
+            file.write("RUN pip install flask praisonai==2.0.10 gunicorn markdown\n")
             file.write("EXPOSE 8080\n")
             file.write('CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]\n')
             

pyproject.toml

@@ -1,17 +1,6 @@
-[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.4"
+version = "2.0.10"
 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 = ""
@@ -23,29 +12,13 @@ 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"
+    "praisonaiagents>=0.0.4",
+    "python-dotenv>=0.19.0",
+    "instructor>=1.3.3",
+    "PyYAML>=6.0"
 ]
 
-[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"]
@@ -63,8 +36,8 @@ chat = [
     "crawl4ai==0.3.4",
     "sqlalchemy>=2.0.36",
     "playwright>=1.47.0",
-    "rich>=13.7",
-    "instructor>=0.4.8",
+    "rich",
+    "instructor",
     "pydantic<=2.10.1"
 ]
 code = [
@@ -96,17 +69,19 @@ call = [
     "fastapi>=0.95.0",
     "uvicorn>=0.20.0",
     "websockets>=12.0",
-    "python-dotenv>=1.0.1",
+    "python-dotenv>=0.19.0",
     "flaml[automl]>=2.3.1",
     "pyngrok>=1.4.0",
-    "rich>=13.7",
+    "rich",
     "openai>=1.54.0",
-    "instructor>=0.4.8"
+    "instructor"
 ]
+crewai = ["crewai>=0.32.0", "praisonai-tools>=0.0.7", "instructor"]
+autogen = ["pyautogen>=0.2.19", "praisonai-tools>=0.0.7", "instructor", "crewai"]
 
 [tool.poetry]
 name = "PraisonAI"
-version = "2.0.4"
+version = "2.0.10"
 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 = ""
@@ -124,10 +99,10 @@ python = ">=3.10,<3.13"
 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"
+python-dotenv = ">=0.19.0"
+instructor = ">=1.3.3"
+PyYAML = ">=6.0"
 pyautogen = {version = ">=0.2.19", optional = true}
 crewai = {version = ">=0.32.0", optional = true}
 praisonai-tools = {version = ">=0.0.7", optional = true}
@@ -208,7 +183,10 @@ aiosqlite = ">=0.20.0"
 greenlet = ">=3.0.3"
 
 [build-system]
-requires = ["poetry-core", "setuptools>=42"]
+requires = [
+    "poetry-core",
+    "setuptools>=42",
+]
 build-backend = "poetry.core.masonry.api"
 
 

uv.lock

@@ -3067,7 +3067,7 @@ wheels = [
 
 [[package]]
 name = "praisonai"
-version = "2.0.4"
+version = "2.0.10"
 source = { editable = "." }
 dependencies = [
     { name = "instructor" },
@@ -3178,7 +3178,7 @@ requires-dist = [
     { name = "crawl4ai", marker = "extra == 'chat'", specifier = "==0.3.4" },
     { name = "crawl4ai", marker = "extra == 'code'", specifier = "==0.3.4" },
     { name = "crawl4ai", marker = "extra == 'realtime'", specifier = "==0.3.4" },
-    { name = "crewai", marker = "extra == 'autogen'", specifier = ">=0.32.0" },
+    { name = "crewai", marker = "extra == 'autogen'" },
     { name = "crewai", marker = "extra == 'crewai'", specifier = ">=0.32.0" },
     { name = "duckduckgo-search", marker = "extra == 'realtime'", specifier = ">=6.3.0" },
     { name = "fastapi", marker = "extra == 'call'", specifier = ">=0.95.0" },
@@ -3188,11 +3188,11 @@ requires-dist = [
     { name = "greenlet", marker = "extra == 'chat'", specifier = ">=3.0.3" },
     { name = "greenlet", marker = "extra == 'code'", specifier = ">=3.0.3" },
     { name = "greenlet", marker = "extra == 'realtime'", specifier = ">=3.0.3" },
-    { name = "instructor", specifier = ">=0.4.8" },
-    { name = "instructor", marker = "extra == 'autogen'", specifier = ">=0.4.8" },
-    { name = "instructor", marker = "extra == 'call'", specifier = ">=0.4.8" },
-    { name = "instructor", marker = "extra == 'chat'", specifier = ">=0.4.8" },
-    { name = "instructor", marker = "extra == 'crewai'", specifier = ">=0.4.8" },
+    { name = "instructor", specifier = ">=1.3.3" },
+    { name = "instructor", marker = "extra == 'autogen'" },
+    { name = "instructor", marker = "extra == 'call'" },
+    { name = "instructor", marker = "extra == 'chat'" },
+    { name = "instructor", marker = "extra == 'crewai'" },
     { name = "langchain-anthropic", marker = "extra == 'anthropic'", specifier = ">=0.1.13" },
     { name = "langchain-cohere", marker = "extra == 'cohere'", specifier = ">=0.1.4" },
     { name = "langchain-google-genai", marker = "extra == 'google'", specifier = ">=1.0.4" },
@@ -3213,12 +3213,12 @@ requires-dist = [
     { name = "pydantic", marker = "extra == 'code'", specifier = "<=2.10.1" },
     { name = "pyngrok", marker = "extra == 'call'", specifier = ">=1.4.0" },
     { name = "pyparsing", specifier = ">=3.0.0" },
-    { name = "python-dotenv", specifier = ">=1.0.1" },
-    { name = "python-dotenv", marker = "extra == 'call'", specifier = ">=1.0.1" },
+    { name = "python-dotenv", specifier = ">=0.19.0" },
+    { name = "python-dotenv", marker = "extra == 'call'", specifier = ">=0.19.0" },
     { name = "pyyaml", specifier = ">=6.0" },
     { name = "rich", specifier = ">=13.7" },
-    { name = "rich", marker = "extra == 'call'", specifier = ">=13.7" },
-    { name = "rich", marker = "extra == 'chat'", specifier = ">=13.7" },
+    { name = "rich", marker = "extra == 'call'" },
+    { name = "rich", marker = "extra == 'chat'" },
     { name = "sqlalchemy", marker = "extra == 'chat'", specifier = ">=2.0.36" },
     { name = "sqlalchemy", marker = "extra == 'code'", specifier = ">=2.0.36" },
     { name = "sqlalchemy", marker = "extra == 'realtime'", specifier = ">=2.0.36" },