Merge branch 'main' of https://github.com/joaomdmoura/crewAI

AgentOps-AI · May 21, 2024 · 2d88109 · 2d88109
2 parents 54237c9 + a336381
commit 2d88109
Show file tree

Hide file tree

Showing 70 changed files with 209,309 additions and 2,886 deletions.
diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -0,0 +1,16 @@
+name: Lint
+
+on: [pull_request]
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Requirements
+        run: |
+          pip install ruff
+
+      - name: Run Ruff Linter
+        run: ruff check --exclude "templates","__init__.py"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Install Requirements
         run: |

diff --git a/.github/workflows/type-checker.yml b/.github/workflows/type-checker.yml
@@ -1,4 +1,3 @@
-
 name: Run Type Checks
 
 on: [pull_request]
@@ -12,19 +11,16 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Install Requirements
         run: |
-          sudo apt-get update &&
-          pip install poetry &&
-          poetry lock &&
-          poetry install
+          pip install mypy
 
       - name: Run type checks
-        run: poetry run pyright
+        run: mypy src
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,21 +1,7 @@
 repos:
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 23.12.1
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.4
     hooks:
-      - id: black
-        language_version: python3.11
-        files: \.(py)$
-        exclude: 'src/crewai/cli/templates/(crew|main)\.py'
-
-  - repo: https://github.com/pycqa/isort
-    rev: 5.13.2
-    hooks:
-      - id: isort
-        name: isort (python)
-        args: ["--profile", "black", "--filter-files"]
-
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v2.2.1
-    hooks:
-      - id: autoflake
-        args: ['--in-place', '--remove-all-unused-imports', '--remove-unused-variables', '--ignore-init-module-imports']
+      # Run the linter.
+      - id: ruff
+        args: [--fix]
diff --git a/README.md b/README.md
@@ -231,7 +231,7 @@ poetry run pytest
 ### Running static type checks
 
 ```bash
-poetry run pyright
+poetry run mypy
 ```
 
 ### Packaging

diff --git a/docs/how-to/LLM-Connections.md b/docs/how-to/LLM-Connections.md
@@ -103,7 +103,8 @@ general_agent = Agent(role = "Math Professor",
                       verbose = True,
                       llm = llm)
 task = Task (description="""what is 3 + 5""",
-             agent = general_agent)
+             agent = general_agent,
+             expected_output="A numerical answer.")
 
 crew = Crew(
             agents=[general_agent],

diff --git a/docs/tools/CSVSearchTool.md b/docs/tools/CSVSearchTool.md
@@ -50,7 +50,7 @@ tool = CSVSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/CodeDocsSearchTool.md b/docs/tools/CodeDocsSearchTool.md
@@ -53,7 +53,7 @@ tool = CodeDocsSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/DOCXSearchTool.md b/docs/tools/DOCXSearchTool.md
@@ -48,7 +48,7 @@ tool = DOCXSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/DirectorySearchTool.md b/docs/tools/DirectorySearchTool.md
@@ -43,7 +43,7 @@ tool = DirectorySearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/GitHubSearchTool.md b/docs/tools/GitHubSearchTool.md
@@ -55,7 +55,7 @@ tool = GithubSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/JSONSearchTool.md b/docs/tools/JSONSearchTool.md
@@ -48,7 +48,7 @@ tool = JSONSearchTool(
             },
         },
         "embedder": {
-            "provider": "google",
+            "provider": "google", # or openai, ollama, ...
             "config": {
                 "model": "models/embedding-001",
                 "task_type": "retrieval_document",

diff --git a/docs/tools/MDXSearchTool.md b/docs/tools/MDXSearchTool.md
@@ -49,7 +49,7 @@ tool = MDXSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/PDFSearchTool.md b/docs/tools/PDFSearchTool.md
@@ -48,7 +48,7 @@ tool = PDFSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/PGSearchTool.md b/docs/tools/PGSearchTool.md
@@ -48,7 +48,7 @@ tool = PGSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/TXTSearchTool.md b/docs/tools/TXTSearchTool.md
@@ -50,7 +50,7 @@ tool = TXTSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/WebsiteSearchTool.md b/docs/tools/WebsiteSearchTool.md
@@ -48,7 +48,7 @@ tool = WebsiteSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/XMLSearchTool.md b/docs/tools/XMLSearchTool.md
@@ -48,7 +48,7 @@ tool = XMLSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/YoutubeChannelSearchTool.md b/docs/tools/YoutubeChannelSearchTool.md
@@ -48,7 +48,7 @@ tool = YoutubeChannelSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",

diff --git a/docs/tools/YoutubeVideoSearchTool.md b/docs/tools/YoutubeVideoSearchTool.md
@@ -52,7 +52,7 @@ tool = YoutubeVideoSearchTool(
             ),
         ),
         embedder=dict(
-            provider="google",
+            provider="google", # or openai, ollama, ...
             config=dict(
                 model="models/embedding-001",
                 task_type="retrieval_document",