storybook

.gitattributes

@@ -3,6 +3,3 @@ frontend/build/** linguist-generated
 **/poetry.lock linguist-generated
 
 docs/_javascript/** linguist-vendored
-
-# Exclude VCR cassettes from stats
-forge/tests/vcr_cassettes/**/**.y*ml linguist-generated

.github/workflows/autogpt-builder-ci.yml

@@ -1,36 +0,0 @@
-name: AutoGPT Builder CI
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - '.github/workflows/autogpt-builder-ci.yml'
-      - 'rnd/autogpt_builder/**'
-  pull_request:
-    paths:
-      - '.github/workflows/autogpt-builder-ci.yml'
-      - 'rnd/autogpt_builder/**'
-
-defaults:
-  run:
-    shell: bash
-    working-directory: rnd/autogpt_builder
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: Set up Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version: '21'
-
-    - name: Install dependencies
-      run: |
-        npm install
-
-    - name: Run lint
-      run: |
-        npm run lint

.github/workflows/autogpt-ci.yml

@@ -6,11 +6,13 @@ on:
     paths:
       - '.github/workflows/autogpt-ci.yml'
       - 'autogpt/**'
+      - '!autogpt/tests/vcr_cassettes'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
       - '.github/workflows/autogpt-ci.yml'
       - 'autogpt/**'
+      - '!autogpt/tests/vcr_cassettes'
 
 concurrency:
   group: ${{ format('autogpt-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
@@ -71,6 +73,37 @@ jobs:
           git config --global user.name "Auto-GPT-Bot"
           git config --global user.email "github-bot@agpt.co"
 
+      - name: Checkout cassettes
+        if: ${{ startsWith(github.event_name, 'pull_request') }}
+        env:
+          PR_BASE: ${{ github.event.pull_request.base.ref }}
+          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
+          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+        run: |
+          cassette_branch="${PR_AUTHOR}-${PR_BRANCH}"
+          cassette_base_branch="${PR_BASE}"
+          cd tests/vcr_cassettes
+
+          if ! git ls-remote --exit-code --heads origin $cassette_base_branch ; then
+            cassette_base_branch="master"
+          fi
+
+          if git ls-remote --exit-code --heads origin $cassette_branch ; then
+            git fetch origin $cassette_branch
+            git fetch origin $cassette_base_branch
+
+            git checkout $cassette_branch
+
+            # Pick non-conflicting cassette updates from the base branch
+            git merge --no-commit --strategy-option=ours origin/$cassette_base_branch
+            echo "Using cassettes from mirror branch '$cassette_branch'," \
+              "synced to upstream branch '$cassette_base_branch'."
+          else
+            git checkout -b $cassette_branch
+            echo "Branch '$cassette_branch' does not exist in cassette submodule." \
+              "Using cassettes from '$cassette_base_branch'."
+          fi
+
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -130,6 +163,80 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: autogpt-agent,${{ runner.os }}
 
+      - id: setup_git_auth
+        name: Set up git token authentication
+        # Cassettes may be pushed even when tests fail
+        if: success() || failure()
+        run: |
+          config_key="http.${{ github.server_url }}/.extraheader"
+          if [ "${{ runner.os }}" = 'macOS' ]; then
+            base64_pat=$(echo -n "pat:${{ secrets.PAT_REVIEW }}" | base64)
+          else
+            base64_pat=$(echo -n "pat:${{ secrets.PAT_REVIEW }}" | base64 -w0)
+          fi
+
+          git config "$config_key" \
+            "Authorization: Basic $base64_pat"
+
+          cd tests/vcr_cassettes
+          git config "$config_key" \
+            "Authorization: Basic $base64_pat"
+
+          echo "config_key=$config_key" >> $GITHUB_OUTPUT
+
+      - id: push_cassettes
+        name: Push updated cassettes
+        # For pull requests, push updated cassettes even when tests fail
+        if: github.event_name == 'push' || (! github.event.pull_request.head.repo.fork && (success() || failure()))
+        env:
+          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
+          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
+        run: |
+          if [ "${{ startsWith(github.event_name, 'pull_request') }}" = "true" ]; then
+            is_pull_request=true
+            cassette_branch="${PR_AUTHOR}-${PR_BRANCH}"
+          else
+            cassette_branch="${{ github.ref_name }}"
+          fi
+
+          cd tests/vcr_cassettes
+          # Commit & push changes to cassettes if any
+          if ! git diff --quiet; then
+            git add .
+            git commit -m "Auto-update cassettes"
+            git push origin HEAD:$cassette_branch
+            if [ ! $is_pull_request ]; then
+              cd ../..
+              git add tests/vcr_cassettes
+              git commit -m "Update cassette submodule"
+              git push origin HEAD:$cassette_branch
+            fi
+            echo "updated=true" >> $GITHUB_OUTPUT
+          else
+            echo "updated=false" >> $GITHUB_OUTPUT
+            echo "No cassette changes to commit"
+          fi
+
+      - name: Post Set up git token auth
+        if: steps.setup_git_auth.outcome == 'success'
+        run: |
+          git config --unset-all '${{ steps.setup_git_auth.outputs.config_key }}'
+          git submodule foreach git config --unset-all '${{ steps.setup_git_auth.outputs.config_key }}'
+
+      - name: Apply "behaviour change" label and comment on PR
+        if: ${{ startsWith(github.event_name, 'pull_request') }}
+        run: |
+          PR_NUMBER="${{ github.event.pull_request.number }}"
+          TOKEN="${{ secrets.PAT_REVIEW }}"
+          REPO="${{ github.repository }}"
+
+          if [[ "${{ steps.push_cassettes.outputs.updated }}" == "true" ]]; then
+            echo "Adding label and comment..."
+            echo $TOKEN | gh auth login --with-token
+            gh issue edit $PR_NUMBER --add-label "behaviour change"
+            gh issue comment $PR_NUMBER --body "You changed AutoGPT's behaviour on ${{ runner.os }}. The cassettes have been updated and will be merged to the submodule when this Pull Request gets merged."
+          fi
+
       - name: Upload logs to artifact
         if: always()
         uses: actions/upload-artifact@v4

.github/workflows/autogpt-docker-ci.yml

@@ -6,11 +6,13 @@ on:
     paths:
       - '.github/workflows/autogpt-docker-ci.yml'
       - 'autogpt/**'
+      - '!autogpt/tests/vcr_cassettes'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
       - '.github/workflows/autogpt-docker-ci.yml'
       - 'autogpt/**'
+      - '!autogpt/tests/vcr_cassettes'
 
 concurrency:
   group: ${{ format('autogpt-docker-ci-{0}', github.head_ref && format('pr-{0}', github.event.pull_request.number) || github.sha) }}

.github/workflows/autogpt-server-ci.yml

@@ -6,11 +6,13 @@ on:
     paths:
       - ".github/workflows/autogpt-server-ci.yml"
       - "rnd/autogpt_server/**"
+      - "!autogpt/tests/vcr_cassettes"
   pull_request:
     branches: [master, development, release-*]
     paths:
       - ".github/workflows/autogpt-server-ci.yml"
       - "rnd/autogpt_server/**"
+      - "!autogpt/tests/vcr_cassettes"
 
 concurrency:
   group: ${{ format('autogpt-server-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
@@ -263,4 +265,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: autogptserver-AppImage-${{ matrix.platform-os }}
-          path: /Users/runner/work/AutoGPT/AutoGPT/rnd/autogpt_server/dist/*.AppImage
+          path: /Users/runner/work/AutoGPT/AutoGPT/rnd/autogpt_server/build/*.AppImage

.github/workflows/forge-ci.yml

@@ -6,13 +6,11 @@ on:
     paths:
       - '.github/workflows/forge-ci.yml'
       - 'forge/**'
-      - '!forge/tests/vcr_cassettes'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
       - '.github/workflows/forge-ci.yml'
       - 'forge/**'
-      - '!forge/tests/vcr_cassettes'
 
 concurrency:
   group: ${{ format('forge-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}
@@ -68,37 +66,6 @@ jobs:
           fetch-depth: 0
           submodules: true
 
-      - name: Checkout cassettes
-        if: ${{ startsWith(github.event_name, 'pull_request') }}
-        env:
-          PR_BASE: ${{ github.event.pull_request.base.ref }}
-          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
-        run: |
-          cassette_branch="${PR_AUTHOR}-${PR_BRANCH}"
-          cassette_base_branch="${PR_BASE}"
-          cd tests/vcr_cassettes
-
-          if ! git ls-remote --exit-code --heads origin $cassette_base_branch ; then
-            cassette_base_branch="master"
-          fi
-
-          if git ls-remote --exit-code --heads origin $cassette_branch ; then
-            git fetch origin $cassette_branch
-            git fetch origin $cassette_base_branch
-
-            git checkout $cassette_branch
-
-            # Pick non-conflicting cassette updates from the base branch
-            git merge --no-commit --strategy-option=ours origin/$cassette_base_branch
-            echo "Using cassettes from mirror branch '$cassette_branch'," \
-              "synced to upstream branch '$cassette_base_branch'."
-          else
-            git checkout -b $cassette_branch
-            echo "Branch '$cassette_branch' does not exist in cassette submodule." \
-              "Using cassettes from '$cassette_base_branch'."
-          fi
-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
@@ -154,80 +121,6 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
           flags: forge,${{ runner.os }}
 
-      - id: setup_git_auth
-        name: Set up git token authentication
-        # Cassettes may be pushed even when tests fail
-        if: success() || failure()
-        run: |
-          config_key="http.${{ github.server_url }}/.extraheader"
-          if [ "${{ runner.os }}" = 'macOS' ]; then
-            base64_pat=$(echo -n "pat:${{ secrets.PAT_REVIEW }}" | base64)
-          else
-            base64_pat=$(echo -n "pat:${{ secrets.PAT_REVIEW }}" | base64 -w0)
-          fi
-
-          git config "$config_key" \
-            "Authorization: Basic $base64_pat"
-
-          cd tests/vcr_cassettes
-          git config "$config_key" \
-            "Authorization: Basic $base64_pat"
-
-          echo "config_key=$config_key" >> $GITHUB_OUTPUT
-
-      - id: push_cassettes
-        name: Push updated cassettes
-        # For pull requests, push updated cassettes even when tests fail
-        if: github.event_name == 'push' || (! github.event.pull_request.head.repo.fork && (success() || failure()))
-        env:
-          PR_BRANCH: ${{ github.event.pull_request.head.ref }}
-          PR_AUTHOR: ${{ github.event.pull_request.user.login }}
-        run: |
-          if [ "${{ startsWith(github.event_name, 'pull_request') }}" = "true" ]; then
-            is_pull_request=true
-            cassette_branch="${PR_AUTHOR}-${PR_BRANCH}"
-          else
-            cassette_branch="${{ github.ref_name }}"
-          fi
-
-          cd tests/vcr_cassettes
-          # Commit & push changes to cassettes if any
-          if ! git diff --quiet; then
-            git add .
-            git commit -m "Auto-update cassettes"
-            git push origin HEAD:$cassette_branch
-            if [ ! $is_pull_request ]; then
-              cd ../..
-              git add tests/vcr_cassettes
-              git commit -m "Update cassette submodule"
-              git push origin HEAD:$cassette_branch
-            fi
-            echo "updated=true" >> $GITHUB_OUTPUT
-          else
-            echo "updated=false" >> $GITHUB_OUTPUT
-            echo "No cassette changes to commit"
-          fi
-
-      - name: Post Set up git token auth
-        if: steps.setup_git_auth.outcome == 'success'
-        run: |
-          git config --unset-all '${{ steps.setup_git_auth.outputs.config_key }}'
-          git submodule foreach git config --unset-all '${{ steps.setup_git_auth.outputs.config_key }}'
-
-      - name: Apply "behaviour change" label and comment on PR
-        if: ${{ startsWith(github.event_name, 'pull_request') }}
-        run: |
-          PR_NUMBER="${{ github.event.pull_request.number }}"
-          TOKEN="${{ secrets.PAT_REVIEW }}"
-          REPO="${{ github.repository }}"
-
-          if [[ "${{ steps.push_cassettes.outputs.updated }}" == "true" ]]; then
-            echo "Adding label and comment..."
-            echo $TOKEN | gh auth login --with-token
-            gh issue edit $PR_NUMBER --add-label "behaviour change"
-            gh issue comment $PR_NUMBER --body "You changed AutoGPT's behaviour on ${{ runner.os }}. The cassettes have been updated and will be merged to the submodule when this Pull Request gets merged."
-          fi
-
       - name: Upload logs to artifact
         if: always()
         uses: actions/upload-artifact@v4

.github/workflows/pr-label.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches: [ master, development, release-* ]
     paths-ignore:
-      - 'forge/tests/vcr_cassettes'
+      - 'autogpt/tests/vcr_cassettes'
       - 'benchmark/reports/**'
   # So that the `dirtyLabel` is removed if conflicts are resolve
   # We recommend `pull_request_target` so that github secrets are available.

.github/workflows/python-checks.yml

@@ -9,7 +9,7 @@ on:
       - 'forge/**'
       - 'benchmark/**'
       - '**.py'
-      - '!forge/tests/vcr_cassettes'
+      - '!autogpt/tests/vcr_cassettes'
   pull_request:
     branches: [ master, development, release-* ]
     paths:
@@ -18,7 +18,7 @@ on:
       - 'forge/**'
       - 'benchmark/**'
       - '**.py'
-      - '!forge/tests/vcr_cassettes'
+      - '!autogpt/tests/vcr_cassettes'
 
 concurrency:
   group: ${{ format('lint-ci-{0}', github.head_ref && format('{0}-{1}', github.event_name, github.event.pull_request.number) || github.sha) }}

.gitignore

@@ -32,6 +32,7 @@ dist/
 downloads/
 eggs/
 .eggs/
+lib/
 lib64/
 parts/
 sdist/
@@ -169,5 +170,3 @@ pri*
 # ignore
 ig*
 .github_access_token
-LICENSE.rtf
-rnd/autogpt_server/settings.py

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "forge/tests/vcr_cassettes"]
-	path = forge/tests/vcr_cassettes
+[submodule "autogpt/tests/vcr_cassettes"]
+	path = autogpt/tests/vcr_cassettes
 	url = https://github.com/Significant-Gravitas/Auto-GPT-test-cassettes

.pre-commit-config.yaml

@@ -97,7 +97,7 @@ repos:
         alias: pyright-benchmark
         entry: poetry -C benchmark run pyright
         args: [-p, benchmark, benchmark]
-        files: ^benchmark/(agbenchmark/|tests/|poetry\.lock$)
+        files: ^benchmark/(agbenchmark|tests)/
         types: [file]
         language: system
         pass_filenames: false

README.md

@@ -24,7 +24,7 @@ Be part of the revolution! **AutoGPT** is here to stay, at the forefront of AI i
  | 
 **🚀 [Contributing](CONTRIBUTING.md)**
  | 
-**🛠️ [Build your own Agent - Quickstart](FORGE-QUICKSTART.md)**
+**🛠️ [Build your own Agent - Quickstart](QUICKSTART.md)**
 
 ## 🧱 Building blocks
 

autogpt/.gitattributes

@@ -0,0 +1,5 @@
+# Exclude VCR cassettes from stats
+tests/vcr_cassettes/**/**.y*ml linguist-generated
+
+# Mark documentation as such
+docs/**.md linguist-documentation

autogpt/autogpt/agent_factory/configurators.py

@@ -104,5 +104,5 @@ def create_agent_state(
             allow_fs_access=not app_config.restrict_to_workspace,
             use_functions_api=app_config.openai_functions,
         ),
-        history=Agent.default_settings.history.model_copy(deep=True),
+        history=Agent.default_settings.history.copy(deep=True),
     )

autogpt/autogpt/agent_factory/profile_generator.py

@@ -137,7 +137,7 @@ class AgentProfileGeneratorConfiguration(SystemConfiguration):
                     required=True,
                 ),
             },
-        ).model_dump()
+        ).dict()
     )
 
 
@@ -156,7 +156,7 @@ class AgentProfileGenerator(PromptStrategy):
         self._model_classification = model_classification
         self._system_prompt_message = system_prompt
         self._user_prompt_template = user_prompt_template
-        self._create_agent_function = CompletionModelFunction.model_validate(
+        self._create_agent_function = CompletionModelFunction.parse_obj(
             create_agent_function
         )
 
@@ -222,7 +222,7 @@ async def generate_agent_profile_for_task(
     AIConfig: The AIConfig object tailored to the user's input
     """
     agent_profile_generator = AgentProfileGenerator(
-        **AgentProfileGenerator.default_configuration.model_dump()  # HACK
+        **AgentProfileGenerator.default_configuration.dict()  # HACK
     )
 
     prompt = agent_profile_generator.build_prompt(task)

autogpt/autogpt/agents/agent.py

@@ -100,9 +100,7 @@ class Agent(BaseAgent[OneShotAgentActionProposal], Configurable[AgentSettings]):
         super().__init__(settings)
 
         self.llm_provider = llm_provider
-        prompt_config = OneShotAgentPromptStrategy.default_configuration.model_copy(
-            deep=True
-        )
+        prompt_config = OneShotAgentPromptStrategy.default_configuration.copy(deep=True)
         prompt_config.use_functions_api = (
             settings.config.use_functions_api
             # Anthropic currently doesn't support tools + prefilling :(
@@ -113,18 +111,14 @@ class Agent(BaseAgent[OneShotAgentActionProposal], Configurable[AgentSettings]):
 
         # Components
         self.system = SystemComponent()
-        self.history = (
-            ActionHistoryComponent(
-                settings.history,
-                lambda x: self.llm_provider.count_tokens(x, self.llm.name),
-                llm_provider,
-                ActionHistoryConfiguration(
-                    model_name=app_config.fast_llm, max_tokens=self.send_token_limit
-                ),
-            )
-            .run_after(WatchdogComponent)
-            .run_after(SystemComponent)
-        )
+        self.history = ActionHistoryComponent(
+            settings.history,
+            lambda x: self.llm_provider.count_tokens(x, self.llm.name),
+            llm_provider,
+            ActionHistoryConfiguration(
+                model_name=app_config.fast_llm, max_tokens=self.send_token_limit
+            ),
+        ).run_after(WatchdogComponent)
         if not app_config.noninteractive_mode:
             self.user_interaction = UserInteractionComponent()
         self.file_manager = FileManagerComponent(file_storage, settings)
@@ -162,7 +156,7 @@ class Agent(BaseAgent[OneShotAgentActionProposal], Configurable[AgentSettings]):
         constraints = await self.run_pipeline(DirectiveProvider.get_constraints)
         best_practices = await self.run_pipeline(DirectiveProvider.get_best_practices)
 
-        directives = self.state.directives.model_copy(deep=True)
+        directives = self.state.directives.copy(deep=True)
         directives.resources += resources
         directives.constraints += constraints
         directives.best_practices += best_practices

autogpt/autogpt/agents/prompt_strategies/one_shot.py

@@ -28,13 +28,15 @@ _RESPONSE_INTERFACE_NAME = "AssistantResponse"
 
 class AssistantThoughts(ModelWithSummary):
     observations: str = Field(
-        description="Relevant observations from your last action (if any)"
+        ..., description="Relevant observations from your last action (if any)"
     )
-    text: str = Field(description="Thoughts")
-    reasoning: str = Field(description="Reasoning behind the thoughts")
-    self_criticism: str = Field(description="Constructive self-criticism")
-    plan: list[str] = Field(description="Short list that conveys the long-term plan")
-    speak: str = Field(description="Summary of thoughts, to say to user")
+    text: str = Field(..., description="Thoughts")
+    reasoning: str = Field(..., description="Reasoning behind the thoughts")
+    self_criticism: str = Field(..., description="Constructive self-criticism")
+    plan: list[str] = Field(
+        ..., description="Short list that conveys the long-term plan"
+    )
+    speak: str = Field(..., description="Summary of thoughts, to say to user")
 
     def summary(self) -> str:
         return self.text
@@ -94,9 +96,7 @@ class OneShotAgentPromptStrategy(PromptStrategy):
         logger: Logger,
     ):
         self.config = configuration
-        self.response_schema = JSONSchema.from_dict(
-            OneShotAgentActionProposal.model_json_schema()
-        )
+        self.response_schema = JSONSchema.from_dict(OneShotAgentActionProposal.schema())
         self.logger = logger
 
     @property
@@ -182,7 +182,7 @@ class OneShotAgentPromptStrategy(PromptStrategy):
         )
 
     def response_format_instruction(self, use_functions_api: bool) -> tuple[str, str]:
-        response_schema = self.response_schema.model_copy(deep=True)
+        response_schema = self.response_schema.copy(deep=True)
         assert response_schema.properties
         if use_functions_api and "use_tool" in response_schema.properties:
             del response_schema.properties["use_tool"]
@@ -274,8 +274,5 @@ class OneShotAgentPromptStrategy(PromptStrategy):
                 raise InvalidAgentResponseError("Assistant did not use a tool")
             assistant_reply_dict["use_tool"] = response.tool_calls[0].function
 
-        parsed_response = OneShotAgentActionProposal.model_validate(
-            assistant_reply_dict
-        )
-        parsed_response.raw_message = response.copy()
+        parsed_response = OneShotAgentActionProposal.parse_obj(assistant_reply_dict)
         return parsed_response

autogpt/autogpt/app/agent_protocol_server.py

@@ -314,7 +314,7 @@ class AgentProtocolServer:
                             ""
                             if tool_result is None
                             else (
-                                orjson.loads(tool_result.model_dump_json())
+                                orjson.loads(tool_result.json())
                                 if not isinstance(tool_result, ActionErrorResult)
                                 else {
                                     "error": str(tool_result.error),
@@ -327,7 +327,7 @@ class AgentProtocolServer:
                 if last_proposal and tool_result
                 else {}
             ),
-            **assistant_response.model_dump(),
+            **assistant_response.dict(),
         }
 
         task_cumulative_cost = agent.llm_provider.get_incurred_cost()
@@ -451,9 +451,7 @@ class AgentProtocolServer:
         """
         task_llm_budget = self._task_budgets[task.task_id]
 
-        task_llm_provider_config = self.llm_provider._configuration.model_copy(
-            deep=True
-        )
+        task_llm_provider_config = self.llm_provider._configuration.copy(deep=True)
         _extra_request_headers = task_llm_provider_config.extra_request_headers
         _extra_request_headers["AP-TaskID"] = task.task_id
         if step_id:
@@ -461,7 +459,7 @@ class AgentProtocolServer:
         if task.additional_input and (user_id := task.additional_input.get("user_id")):
             _extra_request_headers["AutoGPT-UserID"] = user_id
 
-        settings = self.llm_provider._settings.model_copy()
+        settings = self.llm_provider._settings.copy()
         settings.budget = task_llm_budget
         settings.configuration = task_llm_provider_config
         task_llm_provider = self.llm_provider.__class__(

autogpt/autogpt/app/cli.py

@@ -113,7 +113,7 @@ def cli(ctx: click.Context):
 @click.option(
     "--component-config-file",
     help="Path to a json configuration file",
-    type=click.Path(exists=True, dir_okay=False, resolve_path=True, path_type=Path),
+    type=click.Path(exists=True, dir_okay=False, resolve_path=True),
 )
 def run(
     continuous: bool,

autogpt/autogpt/app/config.py

@@ -5,7 +5,7 @@ import logging
 import os
 import re
 from pathlib import Path
-from typing import Optional, Union
+from typing import Any, Optional, Union
 
 import forge
 from forge.config.base import BaseConfig
@@ -13,7 +13,7 @@ from forge.llm.providers import CHAT_MODELS, ModelName
 from forge.llm.providers.openai import OpenAICredentials, OpenAIModelName
 from forge.logging.config import LoggingConfig
 from forge.models.config import Configurable, UserConfigurable
-from pydantic import SecretStr, ValidationInfo, field_validator
+from pydantic import SecretStr, validator
 
 logger = logging.getLogger(__name__)
 
@@ -91,15 +91,15 @@ class AppConfig(BaseConfig):
         default=AZURE_CONFIG_FILE, from_env="AZURE_CONFIG_FILE"
     )
 
-    @field_validator("openai_functions")
-    def validate_openai_functions(cls, value: bool, info: ValidationInfo):
-        if value:
-            smart_llm = info.data["smart_llm"]
+    @validator("openai_functions")
+    def validate_openai_functions(cls, v: bool, values: dict[str, Any]):
+        if v:
+            smart_llm = values["smart_llm"]
             assert CHAT_MODELS[smart_llm].has_function_call_api, (
                 f"Model {smart_llm} does not support tool calling. "
                 "Please disable OPENAI_FUNCTIONS or choose a suitable model."
             )
-        return value
+        return v
 
 
 class ConfigBuilder(Configurable[AppConfig]):

autogpt/poetry.lock

@@ -10,7 +10,7 @@ files = []
 develop = false
 
 [package.dependencies]
-agent-protocol-client = {git = "https://github.com/Significant-Gravitas/agent-protocol.git", subdirectory = "packages/client/python"}
+agent-protocol-client = "^1.1.0"
 click = "^8.1.3"
 click-default-group = "^1.2.4"
 colorama = "^0.4.6"
@@ -18,16 +18,14 @@ fastapi = "^0.109.1"
 gitpython = "^3.1.32"
 httpx = "^0.24.0"
 matplotlib = "^3.7.2"
-multidict = "^6.0.5"
 networkx = "^3.1"
 openai = "^1.7.2"
 pandas = "^2.0.3"
 pexpect = "^4.8.0"
 psutil = "^5.9.5"
-pydantic = "^2.7.2"
-pydantic-settings = "^2.3.4"
+pydantic = "^1.10.9"
 pytest = "^7.3.2"
-pytest-asyncio = "^0.23.3"
+pytest-asyncio = "^0.21.1"
 python-dotenv = "^1.0.0"
 python-multipart = "^0.0.7"
 pyvis = "^0.3.2"
@@ -35,7 +33,8 @@ requests = "^2.31.0"
 selenium = "^4.11.2"
 tabulate = "^0.9.0"
 toml = "^0.10.2"
-uvicorn = ">=0.23.2,<1"
+types-requests = "^2.31.0.1"
+uvicorn = "^0.23.2"
 
 [package.source]
 type = "directory"
@@ -46,22 +45,17 @@ name = "agent-protocol-client"
 version = "1.1.0"
 description = "Agent Communication Protocol Client"
 optional = true
-python-versions = "^3.7"
-files = []
-develop = false
+python-versions = ">=3.7,<4.0"
+files = [
+    {file = "agent_protocol_client-1.1.0-py3-none-any.whl", hash = "sha256:0e8c6c97244189666ed18e320410abddce8c9dfb75437da1e590bbef3b6268be"},
+    {file = "agent_protocol_client-1.1.0.tar.gz", hash = "sha256:aa7e1042de1249477fdc29c2df08a44f2233dade9c02c1279e37c98e9d3a0d72"},
+]
 
 [package.dependencies]
-aiohttp = "^3.8.4"
-pydantic = ">=1.10.5, <3.0.0"
-python-dateutil = "^2.8.2"
-urllib3 = "^1.25.3"
-
-[package.source]
-type = "git"
-url = "https://github.com/Significant-Gravitas/agent-protocol.git"
-reference = "HEAD"
-resolved_reference = "beb098517b0b9e255024d1b57df236f0329f4b1c"
-subdirectory = "packages/client/python"
+aiohttp = ">=3.8.4,<4.0.0"
+pydantic = ">=1.10.5,<2.0.0"
+python-dateutil = ">=2.8.2,<3.0.0"
+urllib3 = ">=1.25.3,<2.0.0"
 
 [[package]]
 name = "aiohttp"
@@ -173,17 +167,6 @@ files = [
 [package.dependencies]
 frozenlist = ">=1.1.0"
 
-[[package]]
-name = "annotated-types"
-version = "0.7.0"
-description = "Reusable constraint types to use with typing.Annotated"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53"},
-    {file = "annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"},
-]
-
 [[package]]
 name = "anthropic"
 version = "0.25.1"
@@ -276,6 +259,17 @@ files = [
     {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"},
 ]
 
+[[package]]
+name = "asynctest"
+version = "0.13.0"
+description = "Enhance the standard unittest package with features for testing asyncio libraries"
+optional = false
+python-versions = ">=3.5"
+files = [
+    {file = "asynctest-0.13.0-py3-none-any.whl", hash = "sha256:5da6118a7e6d6b54d83a8f7197769d046922a44d2a99c21382f0a6e4fadae676"},
+    {file = "asynctest-0.13.0.tar.gz", hash = "sha256:c27862842d15d83e6a34eb0b2866c323880eb3a75e4485b079ea11748fd77fac"},
+]
+
 [[package]]
 name = "attrs"
 version = "23.2.0"
@@ -295,6 +289,21 @@ tests = ["attrs[tests-no-zope]", "zope-interface"]
 tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"]
 tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"]
 
+[[package]]
+name = "autoflake"
+version = "2.2.1"
+description = "Removes unused imports and unused variables"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "autoflake-2.2.1-py3-none-any.whl", hash = "sha256:265cde0a43c1f44ecfb4f30d95b0437796759d07be7706a2f70e4719234c0f79"},
+    {file = "autoflake-2.2.1.tar.gz", hash = "sha256:62b7b6449a692c3c9b0c916919bbc21648da7281e8506bcf8d3f8280e431ebc1"},
+]
+
+[package.dependencies]
+pyflakes = ">=3.0.0"
+tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""}
+
 [[package]]
 name = "autogpt-forge"
 version = "0.2.0"
@@ -309,6 +318,7 @@ aiohttp = "^3.8.5"
 anthropic = "^0.25.1"
 beautifulsoup4 = "^4.12.2"
 boto3 = "^1.33.6"
+bs4 = "^0.0.1"
 charset-normalizer = "^3.1.0"
 chromadb = "^0.4.10"
 click = "*"
@@ -316,10 +326,9 @@ colorama = "^0.4.6"
 demjson3 = "^3.0.0"
 docker = "*"
 duckduckgo-search = "^6.1.7"
-en-core-web-sm = {url = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.7.1/en_core_web_sm-3.7.1-py3-none-any.whl"}
 fastapi = "^0.109.1"
 gitpython = "^3.1.32"
-google-api-python-client = "^2.116"
+google-api-python-client = "*"
 google-cloud-logging = "^3.8.0"
 google-cloud-storage = "^2.13.0"
 groq = "^0.8.0"
@@ -330,7 +339,7 @@ litellm = "^1.17.9"
 openai = "^1.7.2"
 Pillow = "*"
 playsound = "~1.2.2"
-pydantic = "^2.7.2"
+pydantic = "*"
 pylatexenc = "*"
 pypdf = "^3.1.0"
 python-docx = "*"
@@ -345,7 +354,7 @@ sqlalchemy = "^2.0.19"
 tenacity = "^8.2.2"
 tiktoken = ">=0.7.0,<1.0.0"
 toml = "^0.10.2"
-uvicorn = ">=0.23.2,<1"
+uvicorn = "^0.23.2"
 watchdog = "4.0.0"
 webdriver-manager = "^4.0.1"
 
@@ -555,6 +564,19 @@ urllib3 = {version = ">=1.25.4,<2.1", markers = "python_version >= \"3.10\""}
 [package.extras]
 crt = ["awscrt (==0.19.19)"]
 
+[[package]]
+name = "bs4"
+version = "0.0.1"
+description = "Dummy package for Beautiful Soup"
+optional = false
+python-versions = "*"
+files = [
+    {file = "bs4-0.0.1.tar.gz", hash = "sha256:36ecea1fd7cc5c0c6e4a1ff075df26d50da647b75376626cc186e2212886dd3a"},
+]
+
+[package.dependencies]
+beautifulsoup4 = "*"
+
 [[package]]
 name = "build"
 version = "1.0.3"
@@ -686,6 +708,17 @@ files = [
     {file = "cfgv-3.4.0.tar.gz", hash = "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560"},
 ]
 
+[[package]]
+name = "chardet"
+version = "5.2.0"
+description = "Universal encoding detector for Python 3"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "chardet-5.2.0-py3-none-any.whl", hash = "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970"},
+    {file = "chardet-5.2.0.tar.gz", hash = "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7"},
+]
+
 [[package]]
 name = "charset-normalizer"
 version = "3.3.2"
@@ -1087,33 +1120,78 @@ tomli = {version = "*", optional = true, markers = "python_full_version <= \"3.1
 toml = ["tomli"]
 
 [[package]]
-name = "cx_Freeze"
-version = "7.1.1"
+name = "cssselect"
+version = "1.2.0"
+description = "cssselect parses CSS3 Selectors and translates them to XPath 1.0"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "cssselect-1.2.0-py2.py3-none-any.whl", hash = "sha256:da1885f0c10b60c03ed5eccbb6b68d6eff248d91976fcde348f395d54c9fd35e"},
+    {file = "cssselect-1.2.0.tar.gz", hash = "sha256:666b19839cfaddb9ce9d36bfe4c969132c647b92fc9088c4e23f786b30f1b3dc"},
+]
+
+[[package]]
+name = "cx-freeze"
+version = "7.0.0"
 description = "Create standalone executables from Python scripts"
 optional = false
 python-versions = ">=3.8"
-files = []
-develop = true
+files = [
+    {file = "cx_Freeze-7.0.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:421920dbee2b4aab53a81f6c99d18b00baf622a328eae8e489f162154a46192a"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5fa1ca4cf20c6ce45ce2e26bf8b2086525aaaa774e2ee1b16da4e0f9f18c7272"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a520bc6772325c0e38924da1d827fe370702f8df397f483691b94d36179beef6"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b89ed99a2f99fd2f3e28a91c85bdd75b4bfaf11b04729ba3282bfebdadadf880"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5174821c82826e5a57e43960877087f5af6073e3877b0b38a0be244111fe1a76"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:cfd18cc00f3240b03d5bdf9515d59ace0881b5b5b6f2e7655d857d1fb71f351d"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:bac44e65bdfce0839b9a6d15373ea084fda3cdbd902351cde530991b450c2b2d"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:51a374f273d575827efe4f7ed9a88b6cab78abffacb858c829d7cbe4dc4ff56e"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-win32.whl", hash = "sha256:6603e6c47a15bd84bfbb20d92dc01d5e586b54928eb618461d2f14305471d570"},
+    {file = "cx_Freeze-7.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:d7ec847af5afbe3c638a096aae4ff5982a17d95e2fb7975e525ecf9505a185ea"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:04b7a2e5c53f5d537f3d958ebf2b0a0a7cbe8daf980cb0087559a3e698abc582"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:50e7e78001d4f78e70a403ecb5507685854ce1e6c3ff37bec1920eb6f2256534"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2d37ed560e86ca7958684701a6ae7f3300226d0d7c861ca5b90c78bf4c619ad2"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:42145dc5c2c7a98c620b30b7e25661954817a13355c50c4219a4a4954b39db39"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6f9034d6f9c10d84d7edc0e4f4020e878de367e83c5877c039aa3c8b733bc318"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:adc6bdba9ff8705745831620efb6ee5eff9ec6d31d9b8c56d2a61d6555299157"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:37a3234c0e54b4afd561b47be4f22a6496f9436275fb7b59d90d7a3269fb4d6f"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:83549f9f817cafa59ea2f6e2045c8fe119628458ff14bb732649b01b0a637f6d"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-win32.whl", hash = "sha256:c508cd354728367311a7deb5bb616eee441bf79c900e3129a49fd54a372dc223"},
+    {file = "cx_Freeze-7.0.0-cp311-cp311-win_amd64.whl", hash = "sha256:8fb71d23dba27dc40393a8b460bbf64759899246cd595860f66493cee64f27a5"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:648fd0acb439efe22dced2430cbaeca87e5ca9ab315d148933104376cca9553d"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:3125a8408da3ff4b0cf767689d678909f840dfe08633f5f2d3cfe333111dc334"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:07e56b06c7ca0bd2fc37e3783908767dbe1926e1e2609edcaefcc749ab584329"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:25531d5c61bb5e974d8a5d042f29a37a786e91c1d6f66e018fc50342a416f4e1"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f97154b4b60f6e1953ebce05803a5e11a35047d097fad60d7c181303b7c6ef6e"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:2333db5cfa6db700c79fd45d614d38e9d698f1df2a3c7e21ccbcc63cc8a7a9b7"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:d45a58e0a9b010e0823c30fb8eb2077560d2bb0f78e4481a55bdb6ad0729f390"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:0422dbd426fd9f4f4ec0cadc7e3192d38227464daa3eb215b03eb577cd9a49d4"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-win32.whl", hash = "sha256:2018e9cbf8172da09b311cfc3906503ee6ae88665ec77c543013173b2532b731"},
+    {file = "cx_Freeze-7.0.0-cp312-cp312-win_amd64.whl", hash = "sha256:ae5facd782b220bca6828eb6fb1834540cf431b1a615cc63652641bd070b11e6"},
+    {file = "cx_Freeze-7.0.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:f06368dd41568572818c4abfcf9b45449dced3fa9f1b5f29e3523ba4ff7fcfbb"},
+    {file = "cx_Freeze-7.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e203d90d8fa1cc4489b15edac7dfdd983518a02999f275897160fc0ecfa98e4c"},
+    {file = "cx_Freeze-7.0.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:f800b0bc2df14c66fcf2f220ecf273c5942d0b982268d8e5ccc9ef2fa56e576f"},
+    {file = "cx_Freeze-7.0.0-cp38-cp38-win32.whl", hash = "sha256:c52641ce2484222f4d60f0acbc79b2dfbfb984493101a4806c5af0ad379ebc82"},
+    {file = "cx_Freeze-7.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:92a15613be3fcc7a310e825c92ae3e83a7e689ade00ce2ea981403e4317c7234"},
+    {file = "cx_Freeze-7.0.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:60a0f674b6a55fdf46d0cc59122551a79221ceecd038fed8533dcbceb9714435"},
+    {file = "cx_Freeze-7.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bb15314e8395e9658a8a5e4e19558d0e096a68b76c744ba81ebc249061b7dd9e"},
+    {file = "cx_Freeze-7.0.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3290127acc67e830265265a911d9018640ffffb7fddb86eacb1e3d83ed4136c4"},
+    {file = "cx_Freeze-7.0.0-cp39-cp39-win32.whl", hash = "sha256:aa885f2fb29b9f7d9a7d8af223d38d98905484cc2356c474bb1d6fd1704323ad"},
+    {file = "cx_Freeze-7.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:fe4dbbfd52454c8ddb550f112713ee2ac36cc024303557763b605e35cdb6b9a8"},
+    {file = "cx_freeze-7.0.0.tar.gz", hash = "sha256:b03f2854a15dd1e8962660d18882a71fefba0e1b6f68337193d4a072d1fc36e6"},
+]
 
 [package.dependencies]
 cx-Logging = {version = ">=3.1", markers = "sys_platform == \"win32\""}
-dmgbuild = {version = ">=1.6.1", markers = "sys_platform == \"darwin\""}
-filelock = {version = ">=3.12.3", markers = "sys_platform == \"linux\""}
+filelock = {version = ">=3.11.0", markers = "sys_platform == \"linux\""}
 lief = {version = ">=0.12.0,<0.15.0", markers = "sys_platform == \"win32\""}
 patchelf = {version = ">=0.14", markers = "sys_platform == \"linux\" and (platform_machine == \"aarch64\" or platform_machine == \"armv7l\" or platform_machine == \"i686\" or platform_machine == \"ppc64le\" or platform_machine == \"s390x\" or platform_machine == \"x86_64\")"}
-setuptools = ">=65.6.3,<71"
+setuptools = ">=62.6,<70"
 wheel = ">=0.42.0,<=0.43.0"
 
 [package.extras]
-dev = ["bump-my-version (==0.24.0)", "cibuildwheel (==2.19.1)", "pre-commit (==3.5.0)", "pre-commit (==3.7.1)"]
-doc = ["furo (==2024.5.6)", "myst-parser (==3.0.1)", "sphinx (==7.3.7)", "sphinx-new-tab-link (==0.4.0)", "sphinx-tabs (==3.4.5)"]
-test = ["coverage (==7.5.4)", "pluggy (==1.5.0)", "pytest (==8.2.2)", "pytest-cov (==5.0.0)", "pytest-datafiles (==3.0.0)", "pytest-mock (==3.14.0)", "pytest-timeout (==2.3.1)", "pytest-xdist[psutil] (==3.6.1)"]
-
-[package.source]
-type = "git"
-url = "https://github.com/ntindle/cx_Freeze.git"
-reference = "main"
-resolved_reference = "876fe77c97db749b7b0aed93c12142a7226ee7e4"
+dev = ["bump-my-version (==0.20.1)", "cibuildwheel (==2.17.0)", "pre-commit (==3.7.0)"]
+doc = ["furo (==2024.1.29)", "myst-parser (==2.0.0)", "sphinx (==7.3.7)", "sphinx-new-tab-link (==0.4.0)", "sphinx-tabs (==3.4.5)"]
+test = ["coverage (==7.4.4)", "pluggy (==1.4.0)", "pytest (==8.1.1)", "pytest-cov (==5.0.0)", "pytest-datafiles (==3.0.0)", "pytest-mock (==3.14.0)", "pytest-timeout (==2.3.1)", "pytest-xdist[psutil] (==3.6.0)"]
 
 [[package]]
 name = "cx-logging"
@@ -1262,27 +1340,6 @@ files = [
     {file = "distro-1.9.0.tar.gz", hash = "sha256:2fa77c6fd8940f116ee1d6b94a2f90b13b5ea8d019b98bc8bafdcabcdd9bdbed"},
 ]
 
-[[package]]
-name = "dmgbuild"
-version = "1.6.1"
-description = "macOS command line utility to build disk images"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "dmgbuild-1.6.1-py3-none-any.whl", hash = "sha256:45dba6af4a64872c6a91eb335ebeaf5e1f4f4f39c89fd77cf40e841bd1226166"},
-    {file = "dmgbuild-1.6.1.tar.gz", hash = "sha256:7ced2603d684e29c22b4cd507d1e15a1907e91b86259924b8cfe480d80553b43"},
-]
-
-[package.dependencies]
-ds-store = ">=1.1.0"
-mac-alias = ">=2.0.1"
-
-[package.extras]
-badge-icons = ["pyobjc-framework-Quartz (>=3.0.4)"]
-dev = ["pre-commit", "tox"]
-docs = ["sphinx", "sphinx-autobuild", "sphinx-rtd-theme"]
-test = ["pytest", "pytest-cov", "pytest-tldr"]
-
 [[package]]
 name = "docker"
 version = "7.0.0"
@@ -1304,25 +1361,6 @@ urllib3 = ">=1.26.0"
 ssh = ["paramiko (>=2.4.3)"]
 websockets = ["websocket-client (>=1.3.0)"]
 
-[[package]]
-name = "ds-store"
-version = "1.3.1"
-description = "Manipulate Finder .DS_Store files from Python"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "ds_store-1.3.1-py3-none-any.whl", hash = "sha256:fbacbb0bd5193ab3e66e5a47fff63619f15e374ffbec8ae29744251a6c8f05b5"},
-    {file = "ds_store-1.3.1.tar.gz", hash = "sha256:c27d413caf13c19acb85d75da4752673f1f38267f9eb6ba81b3b5aa99c2d207c"},
-]
-
-[package.dependencies]
-mac-alias = ">=2.0.1"
-
-[package.extras]
-dev = ["pre-commit", "tox"]
-docs = ["sphinx", "sphinx-autobuild", "sphinx-rtd-theme"]
-test = ["pytest", "pytest-cov", "pytest-tldr"]
-
 [[package]]
 name = "duckduckgo-search"
 version = "6.1.7"
@@ -1650,6 +1688,20 @@ smb = ["smbprotocol"]
 ssh = ["paramiko"]
 tqdm = ["tqdm"]
 
+[[package]]
+name = "ftfy"
+version = "6.1.3"
+description = "Fixes mojibake and other problems with Unicode, after the fact"
+optional = false
+python-versions = ">=3.8,<4"
+files = [
+    {file = "ftfy-6.1.3-py3-none-any.whl", hash = "sha256:e49c306c06a97f4986faa7a8740cfe3c13f3106e85bcec73eb629817e671557c"},
+    {file = "ftfy-6.1.3.tar.gz", hash = "sha256:693274aead811cff24c1e8784165aa755cd2f6e442a5ec535c7d697f6422a422"},
+]
+
+[package.dependencies]
+wcwidth = ">=0.2.12,<0.3.0"
+
 [[package]]
 name = "gitdb"
 version = "4.0.11"
@@ -1713,20 +1765,20 @@ grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0.dev0)"]
 
 [[package]]
 name = "google-api-python-client"
-version = "2.136.0"
+version = "2.114.0"
 description = "Google API Client Library for Python"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "google-api-python-client-2.136.0.tar.gz", hash = "sha256:161c722c8864e7ed39393e2b7eea76ef4e1c933a6a59f9d7c70409b6635f225d"},
-    {file = "google_api_python_client-2.136.0-py2.py3-none-any.whl", hash = "sha256:5a554c8b5edf0a609b905d89d7ced82e8f6ac31da1e4d8d5684ef63dbc0e49f5"},
+    {file = "google-api-python-client-2.114.0.tar.gz", hash = "sha256:e041bbbf60e682261281e9d64b4660035f04db1cccba19d1d68eebc24d1465ed"},
+    {file = "google_api_python_client-2.114.0-py2.py3-none-any.whl", hash = "sha256:690e0bb67d70ff6dea4e8a5d3738639c105a478ac35da153d3b2a384064e9e1a"},
 ]
 
 [package.dependencies]
 google-api-core = ">=1.31.5,<2.0.dev0 || >2.3.0,<3.0.0.dev0"
-google-auth = ">=1.32.0,<2.24.0 || >2.24.0,<2.25.0 || >2.25.0,<3.0.0.dev0"
-google-auth-httplib2 = ">=0.2.0,<1.0.0"
-httplib2 = ">=0.19.0,<1.dev0"
+google-auth = ">=1.19.0,<3.0.0.dev0"
+google-auth-httplib2 = ">=0.1.0"
+httplib2 = ">=0.15.0,<1.dev0"
 uritemplate = ">=3.0.1,<5"
 
 [[package]]
@@ -2467,6 +2519,17 @@ files = [
 docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"]
 testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-ruff", "zipp (>=3.17)"]
 
+[[package]]
+name = "inflection"
+version = "0.5.1"
+description = "A port of Ruby on Rails inflector to Python"
+optional = false
+python-versions = ">=3.5"
+files = [
+    {file = "inflection-0.5.1-py2.py3-none-any.whl", hash = "sha256:f38b2b640938a4f35ade69ac3d053042959b62a0f1076a5bbaa1b9526605a8a2"},
+    {file = "inflection-0.5.1.tar.gz", hash = "sha256:1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"},
+]
+
 [[package]]
 name = "iniconfig"
 version = "2.0.0"
@@ -2937,22 +3000,6 @@ html5 = ["html5lib"]
 htmlsoup = ["BeautifulSoup4"]
 source = ["Cython (>=3.0.7)"]
 
-[[package]]
-name = "mac-alias"
-version = "2.2.2"
-description = "Generate/parse Mac OS Alias records from Python"
-optional = false
-python-versions = ">=3.7"
-files = [
-    {file = "mac_alias-2.2.2-py3-none-any.whl", hash = "sha256:504ab8ac546f35bbd75ad014d6ad977c426660aa721f2cd3acf3dc2f664141bd"},
-    {file = "mac_alias-2.2.2.tar.gz", hash = "sha256:c99c728eb512e955c11f1a6203a0ffa8883b26549e8afe68804031aa5da856b7"},
-]
-
-[package.extras]
-dev = ["pre-commit", "tox"]
-docs = ["sphinx", "sphinx-autobuild", "sphinx-rtd-theme"]
-test = ["pytest", "pytest-cov", "pytest-tldr"]
-
 [[package]]
 name = "markupsafe"
 version = "2.1.3"
@@ -3525,6 +3572,31 @@ typing-extensions = ">=4.7,<5"
 [package.extras]
 datalib = ["numpy (>=1)", "pandas (>=1.2.3)", "pandas-stubs (>=1.1.0.11)"]
 
+[[package]]
+name = "openapi-python-client"
+version = "0.14.1"
+description = "Generate modern Python clients from OpenAPI"
+optional = false
+python-versions = ">=3.8,<4.0"
+files = [
+    {file = "openapi_python_client-0.14.1-py3-none-any.whl", hash = "sha256:765d16b5566bb03941f871b8bf493e2a3191f4cc96e8c7b4f337bd584619b78d"},
+    {file = "openapi_python_client-0.14.1.tar.gz", hash = "sha256:13574d2f3acbccea615364e8e49789829fce254d2123a0a9c0918f36b7368018"},
+]
+
+[package.dependencies]
+attrs = ">=21.3.0"
+autoflake = ">=1.4,<3.0.0"
+black = ">=23"
+colorama = {version = ">=0.4.3,<0.5.0", markers = "sys_platform == \"win32\""}
+httpx = ">=0.15.4,<0.25.0"
+isort = ">=5.0.5,<6.0.0"
+jinja2 = ">=3.0.0,<4.0.0"
+pydantic = ">=1.6.1,<2.0.0"
+python-dateutil = ">=2.8.1,<3.0.0"
+PyYAML = ">=6.0,<7.0"
+shellingham = ">=1.3.2,<2.0.0"
+typer = ">0.6,<0.10"
+
 [[package]]
 name = "opentelemetry-api"
 version = "1.22.0"
@@ -4211,6 +4283,87 @@ files = [
 [package.extras]
 test = ["enum34", "ipaddress", "mock", "pywin32", "wmi"]
 
+[[package]]
+name = "psycopg2-binary"
+version = "2.9.9"
+description = "psycopg2 - Python-PostgreSQL Database Adapter"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "psycopg2-binary-2.9.9.tar.gz", hash = "sha256:7f01846810177d829c7692f1f5ada8096762d9172af1b1a28d4ab5b77c923c1c"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c2470da5418b76232f02a2fcd2229537bb2d5a7096674ce61859c3229f2eb202"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:c6af2a6d4b7ee9615cbb162b0738f6e1fd1f5c3eda7e5da17861eacf4c717ea7"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:75723c3c0fbbf34350b46a3199eb50638ab22a0228f93fb472ef4d9becc2382b"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:83791a65b51ad6ee6cf0845634859d69a038ea9b03d7b26e703f94c7e93dbcf9"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0ef4854e82c09e84cc63084a9e4ccd6d9b154f1dbdd283efb92ecd0b5e2b8c84"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed1184ab8f113e8d660ce49a56390ca181f2981066acc27cf637d5c1e10ce46e"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:d2997c458c690ec2bc6b0b7ecbafd02b029b7b4283078d3b32a852a7ce3ddd98"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:b58b4710c7f4161b5e9dcbe73bb7c62d65670a87df7bcce9e1faaad43e715245"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:0c009475ee389757e6e34611d75f6e4f05f0cf5ebb76c6037508318e1a1e0d7e"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:8dbf6d1bc73f1d04ec1734bae3b4fb0ee3cb2a493d35ede9badbeb901fb40f6f"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-win32.whl", hash = "sha256:3f78fd71c4f43a13d342be74ebbc0666fe1f555b8837eb113cb7416856c79682"},
+    {file = "psycopg2_binary-2.9.9-cp310-cp310-win_amd64.whl", hash = "sha256:876801744b0dee379e4e3c38b76fc89f88834bb15bf92ee07d94acd06ec890a0"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:ee825e70b1a209475622f7f7b776785bd68f34af6e7a46e2e42f27b659b5bc26"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:1ea665f8ce695bcc37a90ee52de7a7980be5161375d42a0b6c6abedbf0d81f0f"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:143072318f793f53819048fdfe30c321890af0c3ec7cb1dfc9cc87aa88241de2"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c332c8d69fb64979ebf76613c66b985414927a40f8defa16cf1bc028b7b0a7b0"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f7fc5a5acafb7d6ccca13bfa8c90f8c51f13d8fb87d95656d3950f0158d3ce53"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:977646e05232579d2e7b9c59e21dbe5261f403a88417f6a6512e70d3f8a046be"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:b6356793b84728d9d50ead16ab43c187673831e9d4019013f1402c41b1db9b27"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:bc7bb56d04601d443f24094e9e31ae6deec9ccb23581f75343feebaf30423359"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:77853062a2c45be16fd6b8d6de2a99278ee1d985a7bd8b103e97e41c034006d2"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:78151aa3ec21dccd5cdef6c74c3e73386dcdfaf19bced944169697d7ac7482fc"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-win32.whl", hash = "sha256:dc4926288b2a3e9fd7b50dc6a1909a13bbdadfc67d93f3374d984e56f885579d"},
+    {file = "psycopg2_binary-2.9.9-cp311-cp311-win_amd64.whl", hash = "sha256:b76bedd166805480ab069612119ea636f5ab8f8771e640ae103e05a4aae3e417"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:8532fd6e6e2dc57bcb3bc90b079c60de896d2128c5d9d6f24a63875a95a088cf"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b0605eaed3eb239e87df0d5e3c6489daae3f7388d455d0c0b4df899519c6a38d"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8f8544b092a29a6ddd72f3556a9fcf249ec412e10ad28be6a0c0d948924f2212"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2d423c8d8a3c82d08fe8af900ad5b613ce3632a1249fd6a223941d0735fce493"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:2e5afae772c00980525f6d6ecf7cbca55676296b580c0e6abb407f15f3706996"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6e6f98446430fdf41bd36d4faa6cb409f5140c1c2cf58ce0bbdaf16af7d3f119"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:c77e3d1862452565875eb31bdb45ac62502feabbd53429fdc39a1cc341d681ba"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:cb16c65dcb648d0a43a2521f2f0a2300f40639f6f8c1ecbc662141e4e3e1ee07"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:911dda9c487075abd54e644ccdf5e5c16773470a6a5d3826fda76699410066fb"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:57fede879f08d23c85140a360c6a77709113efd1c993923c59fde17aa27599fe"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-win32.whl", hash = "sha256:64cf30263844fa208851ebb13b0732ce674d8ec6a0c86a4e160495d299ba3c93"},
+    {file = "psycopg2_binary-2.9.9-cp312-cp312-win_amd64.whl", hash = "sha256:81ff62668af011f9a48787564ab7eded4e9fb17a4a6a74af5ffa6a457400d2ab"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2293b001e319ab0d869d660a704942c9e2cce19745262a8aba2115ef41a0a42a"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:03ef7df18daf2c4c07e2695e8cfd5ee7f748a1d54d802330985a78d2a5a6dca9"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0a602ea5aff39bb9fac6308e9c9d82b9a35c2bf288e184a816002c9fae930b77"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8359bf4791968c5a78c56103702000105501adb557f3cf772b2c207284273984"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:275ff571376626195ab95a746e6a04c7df8ea34638b99fc11160de91f2fef503"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:f9b5571d33660d5009a8b3c25dc1db560206e2d2f89d3df1cb32d72c0d117d52"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:420f9bbf47a02616e8554e825208cb947969451978dceb77f95ad09c37791dae"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:4154ad09dac630a0f13f37b583eae260c6aa885d67dfbccb5b02c33f31a6d420"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a148c5d507bb9b4f2030a2025c545fccb0e1ef317393eaba42e7eabd28eb6041"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-win32.whl", hash = "sha256:68fc1f1ba168724771e38bee37d940d2865cb0f562380a1fb1ffb428b75cb692"},
+    {file = "psycopg2_binary-2.9.9-cp37-cp37m-win_amd64.whl", hash = "sha256:281309265596e388ef483250db3640e5f414168c5a67e9c665cafce9492eda2f"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:60989127da422b74a04345096c10d416c2b41bd7bf2a380eb541059e4e999980"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:246b123cc54bb5361588acc54218c8c9fb73068bf227a4a531d8ed56fa3ca7d6"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34eccd14566f8fe14b2b95bb13b11572f7c7d5c36da61caf414d23b91fcc5d94"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:18d0ef97766055fec15b5de2c06dd8e7654705ce3e5e5eed3b6651a1d2a9a152"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:d3f82c171b4ccd83bbaf35aa05e44e690113bd4f3b7b6cc54d2219b132f3ae55"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ead20f7913a9c1e894aebe47cccf9dc834e1618b7aa96155d2091a626e59c972"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ca49a8119c6cbd77375ae303b0cfd8c11f011abbbd64601167ecca18a87e7cdd"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:323ba25b92454adb36fa425dc5cf6f8f19f78948cbad2e7bc6cdf7b0d7982e59"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:1236ed0952fbd919c100bc839eaa4a39ebc397ed1c08a97fc45fee2a595aa1b3"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:729177eaf0aefca0994ce4cffe96ad3c75e377c7b6f4efa59ebf003b6d398716"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-win32.whl", hash = "sha256:804d99b24ad523a1fe18cc707bf741670332f7c7412e9d49cb5eab67e886b9b5"},
+    {file = "psycopg2_binary-2.9.9-cp38-cp38-win_amd64.whl", hash = "sha256:a6cdcc3ede532f4a4b96000b6362099591ab4a3e913d70bcbac2b56c872446f7"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:72dffbd8b4194858d0941062a9766f8297e8868e1dd07a7b36212aaa90f49472"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:30dcc86377618a4c8f3b72418df92e77be4254d8f89f14b8e8f57d6d43603c0f"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:31a34c508c003a4347d389a9e6fcc2307cc2150eb516462a7a17512130de109e"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:15208be1c50b99203fe88d15695f22a5bed95ab3f84354c494bcb1d08557df67"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1873aade94b74715be2246321c8650cabf5a0d098a95bab81145ffffa4c13876"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3a58c98a7e9c021f357348867f537017057c2ed7f77337fd914d0bedb35dace7"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:4686818798f9194d03c9129a4d9a702d9e113a89cb03bffe08c6cf799e053291"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ebdc36bea43063116f0486869652cb2ed7032dbc59fbcb4445c4862b5c1ecf7f"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:ca08decd2697fdea0aea364b370b1249d47336aec935f87b8bbfd7da5b2ee9c1"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ac05fb791acf5e1a3e39402641827780fe44d27e72567a000412c648a85ba860"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-win32.whl", hash = "sha256:9dba73be7305b399924709b91682299794887cbbd88e38226ed9f6712eabee90"},
+    {file = "psycopg2_binary-2.9.9-cp39-cp39-win_amd64.whl", hash = "sha256:f7ae5d65ccfbebdfa761585228eb4d0df3a8b15cfb53bd953e713e09fbb12957"},
+]
+
 [[package]]
 name = "ptyprocess"
 version = "0.7.0"
@@ -4283,6 +4436,17 @@ files = [
 [package.extras]
 tests = ["pytest"]
 
+[[package]]
+name = "py-cpuinfo"
+version = "9.0.0"
+description = "Get CPU info with pure Python"
+optional = false
+python-versions = "*"
+files = [
+    {file = "py-cpuinfo-9.0.0.tar.gz", hash = "sha256:3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690"},
+    {file = "py_cpuinfo-9.0.0-py3-none-any.whl", hash = "sha256:859625bc251f64e21f077d099d4162689c762b5d6a4c3c97553d56241c9674d5"},
+]
+
 [[package]]
 name = "pyasn1"
 version = "0.5.1"
@@ -4332,132 +4496,55 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.7.4"
-description = "Data validation using Python type hints"
+version = "1.10.13"
+description = "Data validation and settings management using python type hints"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.7"
 files = [
-    {file = "pydantic-2.7.4-py3-none-any.whl", hash = "sha256:ee8538d41ccb9c0a9ad3e0e5f07bf15ed8015b481ced539a1759d8cc89ae90d0"},
-    {file = "pydantic-2.7.4.tar.gz", hash = "sha256:0c84efd9548d545f63ac0060c1e4d39bb9b14db8b3c0652338aecc07b5adec52"},
+    {file = "pydantic-1.10.13-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:efff03cc7a4f29d9009d1c96ceb1e7a70a65cfe86e89d34e4a5f2ab1e5693737"},
+    {file = "pydantic-1.10.13-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3ecea2b9d80e5333303eeb77e180b90e95eea8f765d08c3d278cd56b00345d01"},
+    {file = "pydantic-1.10.13-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1740068fd8e2ef6eb27a20e5651df000978edce6da6803c2bef0bc74540f9548"},
+    {file = "pydantic-1.10.13-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84bafe2e60b5e78bc64a2941b4c071a4b7404c5c907f5f5a99b0139781e69ed8"},
+    {file = "pydantic-1.10.13-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bc0898c12f8e9c97f6cd44c0ed70d55749eaf783716896960b4ecce2edfd2d69"},
+    {file = "pydantic-1.10.13-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:654db58ae399fe6434e55325a2c3e959836bd17a6f6a0b6ca8107ea0571d2e17"},
+    {file = "pydantic-1.10.13-cp310-cp310-win_amd64.whl", hash = "sha256:75ac15385a3534d887a99c713aa3da88a30fbd6204a5cd0dc4dab3d770b9bd2f"},
+    {file = "pydantic-1.10.13-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c553f6a156deb868ba38a23cf0df886c63492e9257f60a79c0fd8e7173537653"},
+    {file = "pydantic-1.10.13-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5e08865bc6464df8c7d61439ef4439829e3ab62ab1669cddea8dd00cd74b9ffe"},
+    {file = "pydantic-1.10.13-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e31647d85a2013d926ce60b84f9dd5300d44535a9941fe825dc349ae1f760df9"},
+    {file = "pydantic-1.10.13-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:210ce042e8f6f7c01168b2d84d4c9eb2b009fe7bf572c2266e235edf14bacd80"},
+    {file = "pydantic-1.10.13-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8ae5dd6b721459bfa30805f4c25880e0dd78fc5b5879f9f7a692196ddcb5a580"},
+    {file = "pydantic-1.10.13-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f8e81fc5fb17dae698f52bdd1c4f18b6ca674d7068242b2aff075f588301bbb0"},
+    {file = "pydantic-1.10.13-cp311-cp311-win_amd64.whl", hash = "sha256:61d9dce220447fb74f45e73d7ff3b530e25db30192ad8d425166d43c5deb6df0"},
+    {file = "pydantic-1.10.13-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4b03e42ec20286f052490423682016fd80fda830d8e4119f8ab13ec7464c0132"},
+    {file = "pydantic-1.10.13-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f59ef915cac80275245824e9d771ee939133be38215555e9dc90c6cb148aaeb5"},
+    {file = "pydantic-1.10.13-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a1f9f747851338933942db7af7b6ee8268568ef2ed86c4185c6ef4402e80ba8"},
+    {file = "pydantic-1.10.13-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:97cce3ae7341f7620a0ba5ef6cf043975cd9d2b81f3aa5f4ea37928269bc1b87"},
+    {file = "pydantic-1.10.13-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:854223752ba81e3abf663d685f105c64150873cc6f5d0c01d3e3220bcff7d36f"},
+    {file = "pydantic-1.10.13-cp37-cp37m-win_amd64.whl", hash = "sha256:b97c1fac8c49be29486df85968682b0afa77e1b809aff74b83081cc115e52f33"},
+    {file = "pydantic-1.10.13-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c958d053453a1c4b1c2062b05cd42d9d5c8eb67537b8d5a7e3c3032943ecd261"},
+    {file = "pydantic-1.10.13-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c5370a7edaac06daee3af1c8b1192e305bc102abcbf2a92374b5bc793818599"},
+    {file = "pydantic-1.10.13-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d6f6e7305244bddb4414ba7094ce910560c907bdfa3501e9db1a7fd7eaea127"},
+    {file = "pydantic-1.10.13-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d3a3c792a58e1622667a2837512099eac62490cdfd63bd407993aaf200a4cf1f"},
+    {file = "pydantic-1.10.13-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c636925f38b8db208e09d344c7aa4f29a86bb9947495dd6b6d376ad10334fb78"},
+    {file = "pydantic-1.10.13-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:678bcf5591b63cc917100dc50ab6caebe597ac67e8c9ccb75e698f66038ea953"},
+    {file = "pydantic-1.10.13-cp38-cp38-win_amd64.whl", hash = "sha256:6cf25c1a65c27923a17b3da28a0bdb99f62ee04230c931d83e888012851f4e7f"},
+    {file = "pydantic-1.10.13-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8ef467901d7a41fa0ca6db9ae3ec0021e3f657ce2c208e98cd511f3161c762c6"},
+    {file = "pydantic-1.10.13-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:968ac42970f57b8344ee08837b62f6ee6f53c33f603547a55571c954a4225691"},
+    {file = "pydantic-1.10.13-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9849f031cf8a2f0a928fe885e5a04b08006d6d41876b8bbd2fc68a18f9f2e3fd"},
+    {file = "pydantic-1.10.13-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:56e3ff861c3b9c6857579de282ce8baabf443f42ffba355bf070770ed63e11e1"},
+    {file = "pydantic-1.10.13-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f00790179497767aae6bcdc36355792c79e7bbb20b145ff449700eb076c5f96"},
+    {file = "pydantic-1.10.13-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:75b297827b59bc229cac1a23a2f7a4ac0031068e5be0ce385be1462e7e17a35d"},
+    {file = "pydantic-1.10.13-cp39-cp39-win_amd64.whl", hash = "sha256:e70ca129d2053fb8b728ee7d1af8e553a928d7e301a311094b8a0501adc8763d"},
+    {file = "pydantic-1.10.13-py3-none-any.whl", hash = "sha256:b87326822e71bd5f313e7d3bfdc77ac3247035ac10b0c0618bd99dcf95b1e687"},
+    {file = "pydantic-1.10.13.tar.gz", hash = "sha256:32c8b48dcd3b2ac4e78b0ba4af3a2c2eb6048cb75202f0ea7b34feb740efc340"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.18.4"
-typing-extensions = ">=4.6.1"
+typing-extensions = ">=4.2.0"
 
 [package.extras]
-email = ["email-validator (>=2.0.0)"]
-
-[[package]]
-name = "pydantic-core"
-version = "2.18.4"
-description = "Core functionality for Pydantic validation and serialization"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pydantic_core-2.18.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:f76d0ad001edd426b92233d45c746fd08f467d56100fd8f30e9ace4b005266e4"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:59ff3e89f4eaf14050c8022011862df275b552caef8082e37b542b066ce1ff26"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a55b5b16c839df1070bc113c1f7f94a0af4433fcfa1b41799ce7606e5c79ce0a"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4d0dcc59664fcb8974b356fe0a18a672d6d7cf9f54746c05f43275fc48636851"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8951eee36c57cd128f779e641e21eb40bc5073eb28b2d23f33eb0ef14ffb3f5d"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4701b19f7e3a06ea655513f7938de6f108123bf7c86bbebb1196eb9bd35cf724"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e00a3f196329e08e43d99b79b286d60ce46bed10f2280d25a1718399457e06be"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:97736815b9cc893b2b7f663628e63f436018b75f44854c8027040e05230eeddb"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:6891a2ae0e8692679c07728819b6e2b822fb30ca7445f67bbf6509b25a96332c"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bc4ff9805858bd54d1a20efff925ccd89c9d2e7cf4986144b30802bf78091c3e"},
-    {file = "pydantic_core-2.18.4-cp310-none-win32.whl", hash = "sha256:1b4de2e51bbcb61fdebd0ab86ef28062704f62c82bbf4addc4e37fa4b00b7cbc"},
-    {file = "pydantic_core-2.18.4-cp310-none-win_amd64.whl", hash = "sha256:6a750aec7bf431517a9fd78cb93c97b9b0c496090fee84a47a0d23668976b4b0"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:942ba11e7dfb66dc70f9ae66b33452f51ac7bb90676da39a7345e99ffb55402d"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b2ebef0e0b4454320274f5e83a41844c63438fdc874ea40a8b5b4ecb7693f1c4"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a642295cd0c8df1b86fc3dced1d067874c353a188dc8e0f744626d49e9aa51c4"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f09baa656c904807e832cf9cce799c6460c450c4ad80803517032da0cd062e2"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:98906207f29bc2c459ff64fa007afd10a8c8ac080f7e4d5beff4c97086a3dabd"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:19894b95aacfa98e7cb093cd7881a0c76f55731efad31073db4521e2b6ff5b7d"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0fbbdc827fe5e42e4d196c746b890b3d72876bdbf160b0eafe9f0334525119c8"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f85d05aa0918283cf29a30b547b4df2fbb56b45b135f9e35b6807cb28bc47951"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e85637bc8fe81ddb73fda9e56bab24560bdddfa98aa64f87aaa4e4b6730c23d2"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:2f5966897e5461f818e136b8451d0551a2e77259eb0f73a837027b47dc95dab9"},
-    {file = "pydantic_core-2.18.4-cp311-none-win32.whl", hash = "sha256:44c7486a4228413c317952e9d89598bcdfb06399735e49e0f8df643e1ccd0558"},
-    {file = "pydantic_core-2.18.4-cp311-none-win_amd64.whl", hash = "sha256:8a7164fe2005d03c64fd3b85649891cd4953a8de53107940bf272500ba8a788b"},
-    {file = "pydantic_core-2.18.4-cp311-none-win_arm64.whl", hash = "sha256:4e99bc050fe65c450344421017f98298a97cefc18c53bb2f7b3531eb39bc7805"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:6f5c4d41b2771c730ea1c34e458e781b18cc668d194958e0112455fff4e402b2"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2fdf2156aa3d017fddf8aea5adfba9f777db1d6022d392b682d2a8329e087cef"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4748321b5078216070b151d5271ef3e7cc905ab170bbfd27d5c83ee3ec436695"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:847a35c4d58721c5dc3dba599878ebbdfd96784f3fb8bb2c356e123bdcd73f34"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3c40d4eaad41f78e3bbda31b89edc46a3f3dc6e171bf0ecf097ff7a0ffff7cb1"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:21a5e440dbe315ab9825fcd459b8814bb92b27c974cbc23c3e8baa2b76890077"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01dd777215e2aa86dfd664daed5957704b769e726626393438f9c87690ce78c3"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4b06beb3b3f1479d32befd1f3079cc47b34fa2da62457cdf6c963393340b56e9"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:564d7922e4b13a16b98772441879fcdcbe82ff50daa622d681dd682175ea918c"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:0eb2a4f660fcd8e2b1c90ad566db2b98d7f3f4717c64fe0a83e0adb39766d5b8"},
-    {file = "pydantic_core-2.18.4-cp312-none-win32.whl", hash = "sha256:8b8bab4c97248095ae0c4455b5a1cd1cdd96e4e4769306ab19dda135ea4cdb07"},
-    {file = "pydantic_core-2.18.4-cp312-none-win_amd64.whl", hash = "sha256:14601cdb733d741b8958224030e2bfe21a4a881fb3dd6fbb21f071cabd48fa0a"},
-    {file = "pydantic_core-2.18.4-cp312-none-win_arm64.whl", hash = "sha256:c1322d7dd74713dcc157a2b7898a564ab091ca6c58302d5c7b4c07296e3fd00f"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:823be1deb01793da05ecb0484d6c9e20baebb39bd42b5d72636ae9cf8350dbd2"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ebef0dd9bf9b812bf75bda96743f2a6c5734a02092ae7f721c048d156d5fabae"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ae1d6df168efb88d7d522664693607b80b4080be6750c913eefb77e34c12c71a"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f9899c94762343f2cc2fc64c13e7cae4c3cc65cdfc87dd810a31654c9b7358cc"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:99457f184ad90235cfe8461c4d70ab7dd2680e28821c29eca00252ba90308c78"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18f469a3d2a2fdafe99296a87e8a4c37748b5080a26b806a707f25a902c040a8"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7cdf28938ac6b8b49ae5e92f2735056a7ba99c9b110a474473fd71185c1af5d"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:938cb21650855054dc54dfd9120a851c974f95450f00683399006aa6e8abb057"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:44cd83ab6a51da80fb5adbd9560e26018e2ac7826f9626bc06ca3dc074cd198b"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:972658f4a72d02b8abfa2581d92d59f59897d2e9f7e708fdabe922f9087773af"},
-    {file = "pydantic_core-2.18.4-cp38-none-win32.whl", hash = "sha256:1d886dc848e60cb7666f771e406acae54ab279b9f1e4143babc9c2258213daa2"},
-    {file = "pydantic_core-2.18.4-cp38-none-win_amd64.whl", hash = "sha256:bb4462bd43c2460774914b8525f79b00f8f407c945d50881568f294c1d9b4443"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:44a688331d4a4e2129140a8118479443bd6f1905231138971372fcde37e43528"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a2fdd81edd64342c85ac7cf2753ccae0b79bf2dfa063785503cb85a7d3593223"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:86110d7e1907ab36691f80b33eb2da87d780f4739ae773e5fc83fb272f88825f"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:46387e38bd641b3ee5ce247563b60c5ca098da9c56c75c157a05eaa0933ed154"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:123c3cec203e3f5ac7b000bd82235f1a3eced8665b63d18be751f115588fea30"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dc1803ac5c32ec324c5261c7209e8f8ce88e83254c4e1aebdc8b0a39f9ddb443"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53db086f9f6ab2b4061958d9c276d1dbe3690e8dd727d6abf2321d6cce37fa94"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:abc267fa9837245cc28ea6929f19fa335f3dc330a35d2e45509b6566dc18be23"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a0d829524aaefdebccb869eed855e2d04c21d2d7479b6cada7ace5448416597b"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:509daade3b8649f80d4e5ff21aa5673e4ebe58590b25fe42fac5f0f52c6f034a"},
-    {file = "pydantic_core-2.18.4-cp39-none-win32.whl", hash = "sha256:ca26a1e73c48cfc54c4a76ff78df3727b9d9f4ccc8dbee4ae3f73306a591676d"},
-    {file = "pydantic_core-2.18.4-cp39-none-win_amd64.whl", hash = "sha256:c67598100338d5d985db1b3d21f3619ef392e185e71b8d52bceacc4a7771ea7e"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:574d92eac874f7f4db0ca653514d823a0d22e2354359d0759e3f6a406db5d55d"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1f4d26ceb5eb9eed4af91bebeae4b06c3fb28966ca3a8fb765208cf6b51102ab"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77450e6d20016ec41f43ca4a6c63e9fdde03f0ae3fe90e7c27bdbeaece8b1ed4"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d323a01da91851a4f17bf592faf46149c9169d68430b3146dcba2bb5e5719abc"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:43d447dd2ae072a0065389092a231283f62d960030ecd27565672bd40746c507"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:578e24f761f3b425834f297b9935e1ce2e30f51400964ce4801002435a1b41ef"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:81b5efb2f126454586d0f40c4d834010979cb80785173d1586df845a632e4e6d"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ab86ce7c8f9bea87b9d12c7f0af71102acbf5ecbc66c17796cff45dae54ef9a5"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:90afc12421df2b1b4dcc975f814e21bc1754640d502a2fbcc6d41e77af5ec312"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:51991a89639a912c17bef4b45c87bd83593aee0437d8102556af4885811d59f5"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:293afe532740370aba8c060882f7d26cfd00c94cae32fd2e212a3a6e3b7bc15e"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b48ece5bde2e768197a2d0f6e925f9d7e3e826f0ad2271120f8144a9db18d5c8"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:eae237477a873ab46e8dd748e515c72c0c804fb380fbe6c85533c7de51f23a8f"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:834b5230b5dfc0c1ec37b2fda433b271cbbc0e507560b5d1588e2cc1148cf1ce"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e858ac0a25074ba4bce653f9b5d0a85b7456eaddadc0ce82d3878c22489fa4ee"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:2fd41f6eff4c20778d717af1cc50eca52f5afe7805ee530a4fbd0bae284f16e9"},
-    {file = "pydantic_core-2.18.4.tar.gz", hash = "sha256:ec3beeada09ff865c344ff3bc2f427f5e6c26401cc6113d77e372c3fdac73864"},
-]
-
-[package.dependencies]
-typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
-
-[[package]]
-name = "pydantic-settings"
-version = "2.3.4"
-description = "Settings management using Pydantic"
-optional = true
-python-versions = ">=3.8"
-files = [
-    {file = "pydantic_settings-2.3.4-py3-none-any.whl", hash = "sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a"},
-    {file = "pydantic_settings-2.3.4.tar.gz", hash = "sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7"},
-]
-
-[package.dependencies]
-pydantic = ">=2.7.0"
-python-dotenv = ">=0.21.0"
-
-[package.extras]
-toml = ["tomli (>=2.0.1)"]
-yaml = ["pyyaml (>=6.0.1)"]
+dotenv = ["python-dotenv (>=0.10.4)"]
+email = ["email-validator (>=1.0.3)"]
 
 [[package]]
 name = "pyflakes"
@@ -4676,21 +4763,41 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no
 
 [[package]]
 name = "pytest-asyncio"
-version = "0.23.7"
+version = "0.21.1"
 description = "Pytest support for asyncio"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.7"
 files = [
-    {file = "pytest_asyncio-0.23.7-py3-none-any.whl", hash = "sha256:009b48127fbe44518a547bddd25611551b0e43ccdbf1e67d12479f569832c20b"},
-    {file = "pytest_asyncio-0.23.7.tar.gz", hash = "sha256:5f5c72948f4c49e7db4f29f2521d4031f1c27f86e57b046126654083d4770268"},
+    {file = "pytest-asyncio-0.21.1.tar.gz", hash = "sha256:40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d"},
+    {file = "pytest_asyncio-0.21.1-py3-none-any.whl", hash = "sha256:8666c1c8ac02631d7c51ba282e0c69a8a452b211ffedf2599099845da5c5c37b"},
 ]
 
 [package.dependencies]
-pytest = ">=7.0.0,<9"
+pytest = ">=7.0.0"
 
 [package.extras]
 docs = ["sphinx (>=5.3)", "sphinx-rtd-theme (>=1.0)"]
-testing = ["coverage (>=6.2)", "hypothesis (>=5.7.1)"]
+testing = ["coverage (>=6.2)", "flaky (>=3.5.0)", "hypothesis (>=5.7.1)", "mypy (>=0.931)", "pytest-trio (>=0.7.0)"]
+
+[[package]]
+name = "pytest-benchmark"
+version = "4.0.0"
+description = "A ``pytest`` fixture for benchmarking code. It will group the tests into rounds that are calibrated to the chosen timer."
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pytest-benchmark-4.0.0.tar.gz", hash = "sha256:fb0785b83efe599a6a956361c0691ae1dbb5318018561af10f3e915caa0048d1"},
+    {file = "pytest_benchmark-4.0.0-py3-none-any.whl", hash = "sha256:fdb7db64e31c8b277dff9850d2a2556d8b60bcb0ea6524e36e28ffd7c87f71d6"},
+]
+
+[package.dependencies]
+py-cpuinfo = "*"
+pytest = ">=3.8"
+
+[package.extras]
+aspect = ["aspectlib"]
+elasticsearch = ["elasticsearch"]
+histogram = ["pygal", "pygaljs"]
 
 [[package]]
 name = "pytest-cov"
@@ -4710,6 +4817,17 @@ pytest = ">=4.6"
 [package.extras]
 testing = ["fields", "hunter", "process-tests", "pytest-xdist", "six", "virtualenv"]
 
+[[package]]
+name = "pytest-integration"
+version = "0.2.3"
+description = "Organizing pytests by integration or not"
+optional = false
+python-versions = ">=3.6"
+files = [
+    {file = "pytest_integration-0.2.3-py3-none-any.whl", hash = "sha256:7f59ed1fa1cc8cb240f9495b68bc02c0421cce48589f78e49b7b842231604b12"},
+    {file = "pytest_integration-0.2.3.tar.gz", hash = "sha256:b00988a5de8a6826af82d4c7a3485b43fbf32c11235e9f4a8b7225eef5fbcf65"},
+]
+
 [[package]]
 name = "pytest-mock"
 version = "3.12.0"
@@ -4933,6 +5051,25 @@ files = [
     {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"},
 ]
 
+[[package]]
+name = "readability-lxml"
+version = "0.8.1"
+description = "fast html to text parser (article readability tool) with python 3 support"
+optional = false
+python-versions = "*"
+files = [
+    {file = "readability-lxml-0.8.1.tar.gz", hash = "sha256:e51fea56b5909aaf886d307d48e79e096293255afa567b7d08bca94d25b1a4e1"},
+    {file = "readability_lxml-0.8.1-py3-none-any.whl", hash = "sha256:e0d366a21b1bd6cca17de71a4e6ea16fcfaa8b0a5b4004e39e2c7eff884e6305"},
+]
+
+[package.dependencies]
+chardet = "*"
+cssselect = "*"
+lxml = "*"
+
+[package.extras]
+test = ["timeout-decorator"]
+
 [[package]]
 name = "referencing"
 version = "0.32.1"
@@ -5292,18 +5429,30 @@ tornado = ["tornado (>=5)"]
 
 [[package]]
 name = "setuptools"
-version = "70.1.1"
+version = "69.0.3"
 description = "Easily download, build, install, upgrade, and uninstall Python packages"
 optional = false
 python-versions = ">=3.8"
 files = [
-    {file = "setuptools-70.1.1-py3-none-any.whl", hash = "sha256:a58a8fde0541dab0419750bcc521fbdf8585f6e5cb41909df3a472ef7b81ca95"},
-    {file = "setuptools-70.1.1.tar.gz", hash = "sha256:937a48c7cdb7a21eb53cd7f9b59e525503aa8abaf3584c730dc5f7a5bec3a650"},
+    {file = "setuptools-69.0.3-py3-none-any.whl", hash = "sha256:385eb4edd9c9d5c17540511303e39a147ce2fc04bc55289c322b9e5904fe2c05"},
+    {file = "setuptools-69.0.3.tar.gz", hash = "sha256:be1af57fc409f93647f2e8e4573a142ed38724b8cdd389706a867bb4efcf1e78"},
 ]
 
 [package.extras]
-docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "pyproject-hooks (!=1.1)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
-testing = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "importlib-metadata", "ini2toml[lite] (>=0.14)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "jaraco.test", "mypy (==1.10.0)", "packaging (>=23.2)", "pip (>=19.1)", "pyproject-hooks (!=1.1)", "pytest (>=6,!=8.1.1)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-home (>=0.5)", "pytest-mypy", "pytest-perf", "pytest-ruff (>=0.3.2)", "pytest-subprocess", "pytest-timeout", "pytest-xdist (>=3)", "tomli", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "pygments-github-lexers (==0.0.5)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-favicon", "sphinx-inline-tabs", "sphinx-lint", "sphinx-notfound-page (>=1,<2)", "sphinx-reredirects", "sphinxcontrib-towncrier"]
+testing = ["build[virtualenv]", "filelock (>=3.4.0)", "flake8-2020", "ini2toml[lite] (>=0.9)", "jaraco.develop (>=7.21)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "pip (>=19.1)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy (>=0.9.1)", "pytest-perf", "pytest-ruff", "pytest-timeout", "pytest-xdist", "tomli-w (>=1.0.0)", "virtualenv (>=13.0.0)", "wheel"]
+testing-integration = ["build[virtualenv] (>=1.0.3)", "filelock (>=3.4.0)", "jaraco.envs (>=2.2)", "jaraco.path (>=3.2.0)", "packaging (>=23.1)", "pytest", "pytest-enabler", "pytest-xdist", "tomli", "virtualenv (>=13.0.0)", "wheel"]
+
+[[package]]
+name = "shellingham"
+version = "1.5.4"
+description = "Tool to Detect Surrounding Shell"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "shellingham-1.5.4-py2.py3-none-any.whl", hash = "sha256:7ecfff8f2fd72616f7481040475a65b2bf8af90a56c89140852d1120324e8686"},
+    {file = "shellingham-1.5.4.tar.gz", hash = "sha256:8dbca0739d487e5bd35ab3ca4b36e11c4078f3a234bfce294b0a0291363404de"},
+]
 
 [[package]]
 name = "six"
@@ -6065,6 +6214,20 @@ dev = ["autoflake (>=1.3.1,<2.0.0)", "flake8 (>=3.8.3,<4.0.0)", "pre-commit (>=2
 doc = ["cairosvg (>=2.5.2,<3.0.0)", "mdx-include (>=1.4.1,<2.0.0)", "mkdocs (>=1.1.2,<2.0.0)", "mkdocs-material (>=8.1.4,<9.0.0)", "pillow (>=9.3.0,<10.0.0)"]
 test = ["black (>=22.3.0,<23.0.0)", "coverage (>=6.2,<7.0)", "isort (>=5.0.6,<6.0.0)", "mypy (==0.910)", "pytest (>=4.4.0,<8.0.0)", "pytest-cov (>=2.10.0,<5.0.0)", "pytest-sugar (>=0.9.4,<0.10.0)", "pytest-xdist (>=1.32.0,<4.0.0)", "rich (>=10.11.0,<14.0.0)", "shellingham (>=1.3.0,<2.0.0)"]
 
+[[package]]
+name = "types-beautifulsoup4"
+version = "4.12.0.20240106"
+description = "Typing stubs for beautifulsoup4"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "types-beautifulsoup4-4.12.0.20240106.tar.gz", hash = "sha256:98d628985b71b140bd3bc22a8cb0ab603c2f2d08f20d37925965eb4a21739be8"},
+    {file = "types_beautifulsoup4-4.12.0.20240106-py3-none-any.whl", hash = "sha256:cbdd60ab8aeac737ac014431b6e921b43e84279c0405fdd25a6900bb0e71da5b"},
+]
+
+[package.dependencies]
+types-html5lib = "*"
+
 [[package]]
 name = "types-colorama"
 version = "0.4.15.20240106"
@@ -6076,6 +6239,64 @@ files = [
     {file = "types_colorama-0.4.15.20240106-py3-none-any.whl", hash = "sha256:18294bc18f60dc0b4895de8119964a5d895f5e180c2d1308fdd33009c0fa0f38"},
 ]
 
+[[package]]
+name = "types-html5lib"
+version = "1.1.11.20240106"
+description = "Typing stubs for html5lib"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "types-html5lib-1.1.11.20240106.tar.gz", hash = "sha256:fc3a1b18eb601b3eeaf92c900bd67675c0a4fa1dd1d2a2893ebdb46923547ee9"},
+    {file = "types_html5lib-1.1.11.20240106-py3-none-any.whl", hash = "sha256:61993cb89220107481e0f1da65c388ff8cf3d8c5f6e8483c97559639a596b697"},
+]
+
+[[package]]
+name = "types-markdown"
+version = "3.5.0.20240106"
+description = "Typing stubs for Markdown"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "types-Markdown-3.5.0.20240106.tar.gz", hash = "sha256:be47d35cbe61d458bd17aec127f1da233cd6ed96fa9a131c710378a4e8857030"},
+    {file = "types_Markdown-3.5.0.20240106-py3-none-any.whl", hash = "sha256:c23569d33718475dfae25c0036c6e6866f409e7077ee8a0728ab3db263d8e4a5"},
+]
+
+[[package]]
+name = "types-pillow"
+version = "10.2.0.20240111"
+description = "Typing stubs for Pillow"
+optional = false
+python-versions = ">=3.8"
+files = [
+    {file = "types-Pillow-10.2.0.20240111.tar.gz", hash = "sha256:e8d359bfdc5a149a3c90a7e153cb2d0750ddf7fc3508a20dfadabd8a9435e354"},
+    {file = "types_Pillow-10.2.0.20240111-py3-none-any.whl", hash = "sha256:1f4243b30c143b56b0646626f052e4269123e550f9096cdfb5fbd999daee7dbb"},
+]
+
+[[package]]
+name = "types-requests"
+version = "2.31.0.6"
+description = "Typing stubs for requests"
+optional = true
+python-versions = ">=3.7"
+files = [
+    {file = "types-requests-2.31.0.6.tar.gz", hash = "sha256:cd74ce3b53c461f1228a9b783929ac73a666658f223e28ed29753771477b3bd0"},
+    {file = "types_requests-2.31.0.6-py3-none-any.whl", hash = "sha256:a2db9cb228a81da8348b49ad6db3f5519452dd20a9c1e1a868c83c5fe88fd1a9"},
+]
+
+[package.dependencies]
+types-urllib3 = "*"
+
+[[package]]
+name = "types-urllib3"
+version = "1.26.25.14"
+description = "Typing stubs for urllib3"
+optional = true
+python-versions = "*"
+files = [
+    {file = "types-urllib3-1.26.25.14.tar.gz", hash = "sha256:229b7f577c951b8c1b92c1bc2b2fdb0b49847bd2af6d1cc2a2e3dd340f3bda8f"},
+    {file = "types_urllib3-1.26.25.14-py3-none-any.whl", hash = "sha256:9683bbb7fb72e32bfe9d2be6e04875fbe1b3eeec3cbb4ea231435aa7fd6b4f0e"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.9.0"
@@ -6384,7 +6605,7 @@ anyio = ">=3.0.0"
 name = "wcwidth"
 version = "0.2.13"
 description = "Measures the displayed width of unicode strings in a terminal"
-optional = true
+optional = false
 python-versions = "*"
 files = [
     {file = "wcwidth-0.2.13-py2.py3-none-any.whl", hash = "sha256:3da69048e4540d84af32131829ff948f1e022c1c6bdb8d6102117aac784f6859"},
@@ -6757,4 +6978,4 @@ benchmark = ["agbenchmark"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "b3d4efee5861b32152024dada1ec61f4241122419cb538012c00a6ed55ac8a4b"
+content-hash = "a378031626ad6640c66c53d2b58266d7d464462b69f0b5b5b95c317bd20c6b79"

autogpt/pyproject.toml

@@ -20,24 +20,44 @@ serve = "autogpt.app.cli:serve"
 
 [tool.poetry.dependencies]
 python = "^3.10"
+anthropic = "^0.25.1"
 autogpt-forge = { path = "../forge", develop = true }
 # autogpt-forge = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "forge"}
+beautifulsoup4 = "^4.12.2"
+charset-normalizer = "^3.1.0"
 click = "*"
 colorama = "^0.4.6"
 distro = "^1.8.0"
+en-core-web-sm = { url = "https://github.com/explosion/spacy-models/releases/download/en_core_web_sm-3.7.1/en_core_web_sm-3.7.1-py3-none-any.whl" }
 fastapi = "^0.109.1"
-gitpython = "^3.1.32"
+ftfy = "^6.1.1"
+google-api-python-client = "*"
 hypercorn = "^0.14.4"
+inflection = "*"
+jsonschema = "*"
+numpy = "*"
 openai = "^1.7.2"
 orjson = "^3.8.10"
-pydantic = "^2.7.2"
+Pillow = "*"
+pydantic = "*"
+python-docx = "*"
 python-dotenv = "^1.0.0"
+pyyaml = "^6.0"
+readability-lxml = "^0.8.1"
 requests = "*"
 sentry-sdk = "^1.40.4"
+spacy = "^3.7.4"
+tenacity = "^8.2.2"
+
+# OpenAI and Generic plugins import
+openapi-python-client = "^0.14.0"
 
 # Benchmarking
 agbenchmark = { path = "../benchmark", optional = true }
 # agbenchmark = {git = "https://github.com/Significant-Gravitas/AutoGPT.git", subdirectory = "benchmark", optional = true}
+psycopg2-binary = "^2.9.9"
+multidict = "6.0.5"
+cx-freeze = "7.0.0"
 
 [tool.poetry.extras]
 benchmark = ["agbenchmark"]
@@ -45,28 +65,27 @@ benchmark = ["agbenchmark"]
 [tool.poetry.group.dev.dependencies]
 black = "^23.12.1"
 flake8 = "^7.0.0"
+gitpython = "^3.1.32"
 isort = "^5.13.1"
 pre-commit = "*"
 pyright = "^1.1.364"
-
-# Type stubs
+types-beautifulsoup4 = "*"
 types-colorama = "*"
+types-Markdown = "*"
+types-Pillow = "*"
 
 # Testing
+asynctest = "*"
+coverage = "*"
 pytest = "*"
 pytest-asyncio = "*"
+pytest-benchmark = "*"
 pytest-cov = "*"
+pytest-integration = "*"
 pytest-mock = "*"
 pytest-recording = "*"
 pytest-xdist = "*"
-
-[tool.poetry.group.build]
-optional = true
-
-[tool.poetry.group.build.dependencies]
-cx-freeze = { git = "https://github.com/ntindle/cx_Freeze.git", rev = "main" }
-# HACK: switch to cx-freeze release package after #2442 and #2472 are merged: https://github.com/marcelotduarte/cx_Freeze/pulls?q=is:pr+%232442+OR+%232472+
-# cx-freeze = { version = "^7.2.0", optional = true }
+vcrpy = { git = "https://github.com/Significant-Gravitas/vcrpy.git", rev = "master" }
 
 
 [build-system]
@@ -89,3 +108,7 @@ skip_glob = ["data"]
 pythonVersion = "3.10"
 exclude = ["data/**", "**/node_modules", "**/__pycache__", "**/.*"]
 ignore = ["../forge/**"]
+
+
+[tool.pytest.ini_options]
+markers = ["slow", "requires_openai_api_key", "requires_huggingface_api_key"]

autogpt/scripts/git_log_to_release_notes.py

@@ -19,7 +19,7 @@ from autogpt.app.utils import coroutine
     help="Path to the git repository",
 )
 @coroutine
-async def generate_release_notes(repo_path: Optional[str | Path] = None):
+async def generate_release_notes(repo_path: Optional[Path] = None):
     logger = logging.getLogger(generate_release_notes.name)  # pyright: ignore
 
     repo = Repo(repo_path, search_parent_directories=True)

autogpt/setup.py

@@ -1,9 +1,7 @@
-import platform
-from pathlib import Path
 from pkgutil import iter_modules
-from typing import Union
+from shutil import which
 
-from cx_Freeze import Executable, setup  # type: ignore
+from cx_Freeze import Executable, setup
 
 packages = [
     m.name
@@ -13,47 +11,11 @@ packages = [
     and ("poetry" in m.module_finder.path)  # type: ignore
 ]
 
-# set the icon based on the platform
-icon = "../../assets/gpt_dark_RGB.ico"
-if platform.system() == "Darwin":
-    icon = "../../assets/gpt_dark_RGB.icns"
-elif platform.system() == "Linux":
-    icon = "../../assets/gpt_dark_RGB.png"
-
-
-def txt_to_rtf(input_file: Union[str, Path], output_file: Union[str, Path]) -> None:
-    """
-    Convert a text file to RTF format.
-
-    Args:
-    input_file (Union[str, Path]): Path to the input text file.
-    output_file (Union[str, Path]): Path to the output RTF file.
-
-    Returns:
-    None
-    """
-    input_path = Path(input_file)
-    output_path = Path(output_file)
-
-    with input_path.open("r", encoding="utf-8") as txt_file:
-        content = txt_file.read()
-
-    # RTF header
-    rtf = r"{\rtf1\ansi\deff0 {\fonttbl {\f0 Times New Roman;}}\f0\fs24 "
-
-    # Replace newlines with RTF newline
-    rtf += content.replace("\n", "\\par ")
-
-    # Close RTF document
-    rtf += "}"
-
-    with output_path.open("w", encoding="utf-8") as rtf_file:
-        rtf_file.write(rtf)
-
-
-# Convert LICENSE to LICENSE.rtf
-license_file = "LICENSE.rtf"
-txt_to_rtf("../LICENSE", license_file)
+icon = (
+    "../../assets/gpt_dark_RGB.icns"
+    if which("sips")
+    else "../../assets/gpt_dark_RGB.ico"
+)
 
 
 setup(
@@ -93,7 +55,6 @@ setup(
             "target_name": "AutoGPT",
             "add_to_path": True,
             "install_icon": "../assets/gpt_dark_RGB.ico",
-            "license_file": license_file,
         },
     },
 )

autogpt/tests/conftest.py

@@ -20,6 +20,7 @@ from autogpt.app.main import _configure_llm_provider
 
 pytest_plugins = [
     "tests.integration.agent_factory",
+    "tests.vcr",
 ]
 
 
@@ -95,7 +96,7 @@ def agent(
             allow_fs_access=not config.restrict_to_workspace,
             use_functions_api=config.openai_functions,
         ),
-        history=Agent.default_settings.history.model_copy(deep=True),
+        history=Agent.default_settings.history.copy(deep=True),
     )
 
     agent = Agent(

autogpt/tests/integration/agent_factory.py

@@ -28,7 +28,7 @@ def dummy_agent(config: AppConfig, llm_provider: MultiProvider):
             smart_llm=config.smart_llm,
             use_functions_api=config.openai_functions,
         ),
-        history=Agent.default_settings.history.model_copy(deep=True),
+        history=Agent.default_settings.history.copy(deep=True),
     )
 
     local = config.file_storage_backend == FileStorageBackendName.LOCAL

autogpt/tests/integration/test_execute_code.py

@@ -4,15 +4,13 @@ import tempfile
 from pathlib import Path
 
 import pytest
-
-from forge.file_storage.base import FileStorage
-from forge.utils.exceptions import InvalidArgumentError, OperationNotAllowedError
-
-from .code_executor import (
+from forge.components.code_executor.code_executor import (
     CodeExecutorComponent,
     is_docker_available,
     we_are_running_in_a_docker_container,
 )
+from forge.file_storage.base import FileStorage
+from forge.utils.exceptions import InvalidArgumentError, OperationNotAllowedError
 
 
 @pytest.fixture
@@ -105,22 +103,6 @@ def test_execute_python_file_not_found(code_executor_component: CodeExecutorComp
         code_executor_component.execute_python_file(Path("notexist.py"))
 
 
-def test_execute_shell(
-    code_executor_component: CodeExecutorComponent, random_string: str
-):
-    code_executor_component.config.shell_command_control = "allowlist"
-    code_executor_component.config.shell_allowlist = ["echo"]
-    result = code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
-    assert f"Hello {random_string}!" in result
-
-
-def test_execute_shell_local_commands_not_allowed(
-    code_executor_component: CodeExecutorComponent, random_string: str
-):
-    with pytest.raises(OperationNotAllowedError, match="not allowed"):
-        code_executor_component.execute_shell(f"echo 'Hello {random_string}!'")
-
-
 def test_execute_shell_denylist_should_deny(
     code_executor_component: CodeExecutorComponent, random_string: str
 ):

autogpt/tests/integration/test_image_gen.py

@@ -4,22 +4,17 @@ from pathlib import Path
 from unittest.mock import patch
 
 import pytest
-from PIL import Image
-from pydantic import SecretStr, ValidationError
-
 from forge.components.image_gen import ImageGeneratorComponent
 from forge.components.image_gen.image_gen import ImageGeneratorConfiguration
 from forge.file_storage.base import FileStorage
 from forge.llm.providers.openai import OpenAICredentials
+from PIL import Image
+from pydantic import SecretStr
 
 
 @pytest.fixture
 def image_gen_component(storage: FileStorage):
-    try:
-        cred = OpenAICredentials.from_env()
-    except ValidationError:
-        cred = OpenAICredentials(api_key=SecretStr("test"))
-
+    cred = OpenAICredentials.from_env()
     return ImageGeneratorComponent(storage, openai_credentials=cred)
 
 
@@ -39,6 +34,7 @@ def image_size(request):
     return request.param
 
 
+@pytest.mark.requires_openai_api_key
 @pytest.mark.vcr
 def test_dalle(
     image_gen_component: ImageGeneratorComponent,
@@ -56,6 +52,7 @@ def test_dalle(
     reason="The image is too big to be put in a cassette for a CI pipeline. "
     "We're looking into a solution."
 )
+@pytest.mark.requires_huggingface_api_key
 @pytest.mark.parametrize(
     "image_model",
     ["CompVis/stable-diffusion-v1-4", "stabilityai/stable-diffusion-2-1"],

autogpt/tests/integration/test_web_selenium.py

@@ -1,20 +1,19 @@
-from pathlib import Path
-
 import pytest
+from forge.components.web.selenium import BrowsingError, WebSeleniumComponent
 
-from forge.llm.providers.multi import MultiProvider
-
-from . import BrowsingError, WebSeleniumComponent
+from autogpt.agents.agent import Agent
 
 
 @pytest.fixture
-def web_selenium_component(app_data_dir: Path):
-    return WebSeleniumComponent(MultiProvider(), app_data_dir)
+def web_selenium_component(agent: Agent):
+    return agent.web_selenium
 
 
+@pytest.mark.vcr
+@pytest.mark.requires_openai_api_key
 @pytest.mark.asyncio
 async def test_browse_website_nonexistent_url(
-    web_selenium_component: WebSeleniumComponent,
+    web_selenium_component: WebSeleniumComponent, cached_openai_client: None
 ):
     url = "https://auto-gpt-thinks-this-website-does-not-exist.com"
     question = "How to execute a barrel roll"

autogpt/tests/unit/test_file_operations.py

@@ -2,11 +2,9 @@ import os
 from pathlib import Path
 
 import pytest
-
-from forge.agent.base import BaseAgentSettings
 from forge.file_storage import FileStorage
 
-from . import FileManagerComponent
+from autogpt.agents.agent import Agent
 
 
 @pytest.fixture()
@@ -15,13 +13,8 @@ def file_content():
 
 
 @pytest.fixture
-def file_manager_component(storage: FileStorage):
-    return FileManagerComponent(
-        storage,
-        BaseAgentSettings(
-            agent_id="TestAgent", name="TestAgent", description="Test Agent description"
-        ),
-    )
+def file_manager_component(agent: Agent):
+    return agent.file_manager
 
 
 @pytest.fixture()
@@ -48,14 +41,15 @@ def test_nested_file(storage: FileStorage):
 async def test_read_file(
     test_file_path: Path,
     file_content,
-    file_manager_component: FileManagerComponent,
+    file_manager_component,
+    agent: Agent,
 ):
-    await file_manager_component.workspace.write_file(test_file_path.name, file_content)
+    await agent.file_manager.workspace.write_file(test_file_path.name, file_content)
     content = file_manager_component.read_file(test_file_path.name)
     assert content.replace("\r", "") == file_content
 
 
-def test_read_file_not_found(file_manager_component: FileManagerComponent):
+def test_read_file_not_found(file_manager_component):
     filename = "does_not_exist.txt"
     with pytest.raises(FileNotFoundError):
         file_manager_component.read_file(filename)
@@ -63,12 +57,12 @@ def test_read_file_not_found(file_manager_component: FileManagerComponent):
 
 @pytest.mark.asyncio
 async def test_write_to_file_relative_path(
-    test_file_name: Path, file_manager_component: FileManagerComponent
+    test_file_name: Path, file_manager_component, agent: Agent
 ):
     new_content = "This is new content.\n"
     await file_manager_component.write_to_file(test_file_name, new_content)
     with open(
-        file_manager_component.workspace.get_path(test_file_name), "r", encoding="utf-8"
+        agent.file_manager.workspace.get_path(test_file_name), "r", encoding="utf-8"
     ) as f:
         content = f.read()
     assert content == new_content
@@ -76,7 +70,7 @@ async def test_write_to_file_relative_path(
 
 @pytest.mark.asyncio
 async def test_write_to_file_absolute_path(
-    test_file_path: Path, file_manager_component: FileManagerComponent
+    test_file_path: Path, file_manager_component
 ):
     new_content = "This is new content.\n"
     await file_manager_component.write_to_file(test_file_path, new_content)
@@ -86,18 +80,18 @@ async def test_write_to_file_absolute_path(
 
 
 @pytest.mark.asyncio
-async def test_list_files(file_manager_component: FileManagerComponent):
+async def test_list_files(file_manager_component, agent: Agent):
     # Create files A and B
     file_a_name = "file_a.txt"
     file_b_name = "file_b.txt"
     test_directory = Path("test_directory")
 
-    await file_manager_component.workspace.write_file(file_a_name, "This is file A.")
-    await file_manager_component.workspace.write_file(file_b_name, "This is file B.")
+    await agent.file_manager.workspace.write_file(file_a_name, "This is file A.")
+    await agent.file_manager.workspace.write_file(file_b_name, "This is file B.")
 
     # Create a subdirectory and place a copy of file_a in it
-    file_manager_component.workspace.make_dir(test_directory)
-    await file_manager_component.workspace.write_file(
+    agent.file_manager.workspace.make_dir(test_directory)
+    await agent.file_manager.workspace.write_file(
         test_directory / file_a_name, "This is file A in the subdirectory."
     )
 
@@ -107,10 +101,10 @@ async def test_list_files(file_manager_component: FileManagerComponent):
     assert os.path.join(test_directory, file_a_name) in files
 
     # Clean up
-    file_manager_component.workspace.delete_file(file_a_name)
-    file_manager_component.workspace.delete_file(file_b_name)
-    file_manager_component.workspace.delete_file(test_directory / file_a_name)
-    file_manager_component.workspace.delete_dir(test_directory)
+    agent.file_manager.workspace.delete_file(file_a_name)
+    agent.file_manager.workspace.delete_file(file_b_name)
+    agent.file_manager.workspace.delete_file(test_directory / file_a_name)
+    agent.file_manager.workspace.delete_dir(test_directory)
 
     # Case 2: Search for a file that does not exist and make sure we don't throw
     non_existent_file = "non_existent_file.txt"

autogpt/tests/unit/test_gcs_file_storage.py

@@ -4,12 +4,11 @@ from pathlib import Path
 
 import pytest
 import pytest_asyncio
+from forge.file_storage.gcs import GCSFileStorage, GCSFileStorageConfiguration
 from google.auth.exceptions import GoogleAuthError
 from google.cloud import storage
 from google.cloud.exceptions import NotFound
 
-from .gcs import GCSFileStorage, GCSFileStorageConfiguration
-
 try:
     storage.Client()
 except GoogleAuthError:

autogpt/tests/unit/test_git_commands.py

@@ -1,11 +1,11 @@
 import pytest
+from forge.components.git_operations import GitOperationsComponent
+from forge.file_storage.base import FileStorage
+from forge.utils.exceptions import CommandExecutionError
 from git.exc import GitCommandError
 from git.repo.base import Repo
 
-from forge.file_storage.base import FileStorage
-from forge.utils.exceptions import CommandExecutionError
-
-from . import GitOperationsComponent
+from autogpt.agents.agent import Agent
 
 
 @pytest.fixture
@@ -14,14 +14,15 @@ def mock_clone_from(mocker):
 
 
 @pytest.fixture
-def git_ops_component():
-    return GitOperationsComponent()
+def git_ops_component(agent: Agent):
+    return agent.git_ops
 
 
 def test_clone_auto_gpt_repository(
     git_ops_component: GitOperationsComponent,
     storage: FileStorage,
     mock_clone_from,
+    agent: Agent,
 ):
     mock_clone_from.return_value = None
 
@@ -45,6 +46,7 @@ def test_clone_repository_error(
     git_ops_component: GitOperationsComponent,
     storage: FileStorage,
     mock_clone_from,
+    agent: Agent,
 ):
     url = "https://github.com/this-repository/does-not-exist.git"
     clone_path = storage.get_path("does-not-exist")

autogpt/tests/unit/test_json.py

@@ -1,8 +1,7 @@
 import json
 
 import pytest
-
-from .parsing import json_loads
+from forge.json.parsing import json_loads
 
 _JSON_FIXABLE: list[tuple[str, str]] = [
     # Missing comma

autogpt/tests/unit/test_local_file_storage.py

@@ -1,8 +1,7 @@
 from pathlib import Path
 
 import pytest
-
-from .local import FileStorageConfiguration, LocalFileStorage
+from forge.file_storage.local import FileStorageConfiguration, LocalFileStorage
 
 _ACCESSIBLE_PATHS = [
     Path("."),

autogpt/tests/unit/test_logs.py

@@ -1,6 +1,5 @@
 import pytest
-
-from .utils import remove_color_codes
+from forge.logging.utils import remove_color_codes
 
 
 @pytest.mark.parametrize(

autogpt/tests/unit/test_s3_file_storage.py

@@ -5,8 +5,7 @@ from pathlib import Path
 import pytest
 import pytest_asyncio
 from botocore.exceptions import ClientError
-
-from .s3 import S3FileStorage, S3FileStorageConfiguration
+from forge.file_storage.s3 import S3FileStorage, S3FileStorageConfiguration
 
 if not (os.getenv("S3_ENDPOINT_URL") and os.getenv("AWS_ACCESS_KEY_ID")):
     pytest.skip("S3 environment variables are not set", allow_module_level=True)

autogpt/tests/unit/test_text_file_parsers.py

@@ -9,8 +9,7 @@ import docx
 import pytest
 import yaml
 from bs4 import BeautifulSoup
-
-from .file_operations import decode_textual_file, is_file_binary_fn
+from forge.utils.file_operations import decode_textual_file, is_file_binary_fn
 
 logger = logging.getLogger(__name__)
 

autogpt/tests/unit/test_url_validation.py

@@ -1,8 +1,7 @@
 import pytest
+from forge.utils.url_validator import validate_url
 from pytest import raises
 
-from .url_validator import validate_url
-
 
 @validate_url
 def dummy_method(url):

autogpt/tests/unit/test_web_search.py

@@ -1,23 +1,19 @@
 import json
 
 import pytest
+from forge.components.web.search import WebSearchComponent
+from forge.utils.exceptions import ConfigurationError
 from googleapiclient.errors import HttpError
-from httplib2 import Response
 from pydantic import SecretStr
 
-from forge.utils.exceptions import ConfigurationError
-
-from . import WebSearchComponent
+from autogpt.agents.agent import Agent
 
 
 @pytest.fixture
-def web_search_component():
-    component = WebSearchComponent()
-    if component.config.google_api_key is None:
-        component.config.google_api_key = SecretStr("test")
-    if component.config.google_custom_search_engine_id is None:
-        component.config.google_custom_search_engine_id = SecretStr("test")
-    return component
+def web_search_component(agent: Agent):
+    agent.web_search.config.google_api_key = SecretStr("test")
+    agent.web_search.config.google_custom_search_engine_id = SecretStr("test")
+    return agent.web_search
 
 
 @pytest.mark.parametrize(
@@ -138,11 +134,16 @@ def test_google_official_search_errors(
     error_msg,
     web_search_component: WebSearchComponent,
 ):
+    class resp:
+        def __init__(self, _status, _reason):
+            self.status = _status
+            self.reason = _reason
+
     response_content = {
         "error": {"code": http_code, "message": error_msg, "reason": "backendError"}
     }
     error = HttpError(
-        resp=Response({"status": http_code, "reason": error_msg}),
+        resp=resp(http_code, error_msg),
         content=str.encode(json.dumps(response_content)),
         uri="https://www.googleapis.com/customsearch/v1?q=invalid+query&cx",
     )

benchmark/agbenchmark/__main__.py

@@ -97,9 +97,7 @@ def start():
     help="Write log output to a file instead of the terminal.",
 )
 # @click.argument(
-#     "agent_path",
-#     type=click.Path(exists=True, file_okay=False, path_type=Path),
-#     required=False,
+#     "agent_path", type=click.Path(exists=True, file_okay=False), required=False
 # )
 def run(
     maintain: bool,
@@ -278,9 +276,7 @@ def list_challenges(include_unavailable: bool, only_names: bool, output_json: bo
         return
 
     if output_json:
-        click.echo(
-            json.dumps([json.loads(c.info.model_dump_json()) for c in challenges])
-        )
+        click.echo(json.dumps([json.loads(c.info.json()) for c in challenges]))
         return
 
     headers = tuple(
@@ -328,7 +324,7 @@ def info(name: str, json: bool):
             continue
 
         if json:
-            click.echo(challenge.info.model_dump_json())
+            click.echo(challenge.info.json())
             break
 
         pretty_print_model(challenge.info)

benchmark/agbenchmark/app.py

@@ -16,7 +16,7 @@ from agent_protocol_client import AgentApi, ApiClient, ApiException, Configurati
 from agent_protocol_client.models import Task, TaskRequestBody
 from fastapi import APIRouter, FastAPI, HTTPException, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
-from pydantic import BaseModel, ConfigDict, ValidationError
+from pydantic import BaseModel, Extra, ValidationError
 
 from agbenchmark.challenges import ChallengeInfo
 from agbenchmark.config import AgentBenchmarkConfig
@@ -52,9 +52,7 @@ while challenge_spec_files:
 
     logger.debug(f"Loading {challenge_relpath}...")
     try:
-        challenge_info = ChallengeInfo.model_validate_json(
-            challenge_spec_file.read_text()
-        )
+        challenge_info = ChallengeInfo.parse_file(challenge_spec_file)
     except ValidationError as e:
         if logging.getLogger().level == logging.DEBUG:
             logger.warning(f"Spec file {challenge_relpath} failed to load:\n{e}")
@@ -66,7 +64,7 @@ while challenge_spec_files:
         challenge_info.eval_id = str(uuid.uuid4())
         # this will sort all the keys of the JSON systematically
         # so that the order is always the same
-        write_pretty_json(challenge_info.model_dump(), challenge_spec_file)
+        write_pretty_json(challenge_info.dict(), challenge_spec_file)
 
     CHALLENGES[challenge_info.eval_id] = challenge_info
 
@@ -113,7 +111,8 @@ class CreateReportRequest(BaseModel):
     # category: Optional[str] = []
     mock: Optional[bool] = False
 
-    model_config = ConfigDict(extra="forbid")
+    class Config:
+        extra = Extra.forbid  # this will forbid any extra fields
 
 
 updates_list = []
@@ -154,7 +153,7 @@ def setup_fastapi_app(agbenchmark_config: AgentBenchmarkConfig) -> FastAPI:
         pids = find_agbenchmark_without_uvicorn()
         logger.info(f"pids already running with agbenchmark: {pids}")
 
-        logger.debug(f"Request to /reports: {body.model_dump()}")
+        logger.debug(f"Request to /reports: {body.dict()}")
 
         # Start the benchmark in a separate thread
         benchmark_process = Process(
@@ -327,9 +326,7 @@ def setup_fastapi_app(agbenchmark_config: AgentBenchmarkConfig) -> FastAPI:
                 config={},
             )
 
-            logger.debug(
-                f"Returning evaluation data:\n{eval_info.model_dump_json(indent=4)}"
-            )
+            logger.debug(f"Returning evaluation data:\n{eval_info.json(indent=4)}")
             return eval_info
         except ApiException as e:
             logger.error(f"Error {e} whilst trying to evaluate task: {task_id}")

benchmark/agbenchmark/challenges/builtin.py

@@ -15,13 +15,7 @@ from agent_protocol_client import Configuration as ClientConfig
 from agent_protocol_client import Step
 from colorama import Fore, Style
 from openai import _load_client as get_openai_client
-from pydantic import (
-    BaseModel,
-    Field,
-    StringConstraints,
-    ValidationInfo,
-    field_validator,
-)
+from pydantic import BaseModel, Field, constr, validator
 
 from agbenchmark.agent_api_interface import download_agent_artifacts_into_folder
 from agbenchmark.agent_interface import copy_challenge_artifacts_into_workspace
@@ -52,9 +46,7 @@ class BuiltinChallengeSpec(BaseModel):
 
     class Info(BaseModel):
         difficulty: DifficultyLevel
-        description: Annotated[
-            str, StringConstraints(pattern=r"^Tests if the agent can.*")
-        ]
+        description: Annotated[str, constr(regex=r"^Tests if the agent can.*")]
         side_effects: list[str] = Field(default_factory=list)
 
     info: Info
@@ -68,26 +60,23 @@ class BuiltinChallengeSpec(BaseModel):
 
         class Eval(BaseModel):
             type: str
-            scoring: Optional[Literal["percentage", "scale", "binary"]] = None
-            template: Optional[
-                Literal["rubric", "reference", "question", "custom"]
-            ] = None
-            examples: Optional[str] = None
+            scoring: Optional[Literal["percentage", "scale", "binary"]]
+            template: Optional[Literal["rubric", "reference", "question", "custom"]]
+            examples: Optional[str]
 
-            @field_validator("scoring", "template")
-            def validate_eval_fields(cls, value, info: ValidationInfo):
-                field_name = info.field_name
-                if "type" in info.data and info.data["type"] == "llm":
-                    if value is None:
+            @validator("scoring", "template", always=True)
+            def validate_eval_fields(cls, v, values, field):
+                if "type" in values and values["type"] == "llm":
+                    if v is None:
                         raise ValueError(
-                            f"{field_name} must be provided when eval type is 'llm'"
+                            f"{field.name} must be provided when eval type is 'llm'"
                         )
                 else:
-                    if value is not None:
+                    if v is not None:
                         raise ValueError(
-                            f"{field_name} should only exist when eval type is 'llm'"
+                            f"{field.name} should only exist when eval type is 'llm'"
                         )
-                return value
+                return v
 
         eval: Eval
 
@@ -153,7 +142,7 @@ class BuiltinChallenge(BaseChallenge):
 
     @classmethod
     def from_challenge_spec_file(cls, spec_file: Path) -> type["BuiltinChallenge"]:
-        challenge_spec = BuiltinChallengeSpec.model_validate_json(spec_file.read_text())
+        challenge_spec = BuiltinChallengeSpec.parse_file(spec_file)
         challenge_spec.spec_file = spec_file
         return cls.from_challenge_spec(challenge_spec)
 
@@ -198,7 +187,7 @@ class BuiltinChallenge(BaseChallenge):
                     task_id = step.task_id
 
                 n_steps += 1
-                steps.append(step.model_copy())
+                steps.append(step.copy())
                 if step.additional_output:
                     agent_task_cost = step.additional_output.get(
                         "task_total_cost",

benchmark/agbenchmark/challenges/verticals/code/6_battleship/artifacts_in/abstract_class.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, validator
 
 
 # Models for the request and response payloads
@@ -10,7 +10,7 @@ class ShipPlacement(BaseModel):
     start: dict  # {"row": int, "column": str}
     direction: str
 
-    @field_validator("start")
+    @validator("start")
     def validate_start(cls, start):
         row, column = start.get("row"), start.get("column")
 

benchmark/agbenchmark/challenges/verticals/code/6_battleship/artifacts_out/abstract_class.py

@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Optional
 
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel, validator
 
 
 # Models for the request and response payloads
@@ -10,7 +10,7 @@ class ShipPlacement(BaseModel):
     start: dict  # {"row": int, "column": str}
     direction: str
 
-    @field_validator("start")
+    @validator("start")
     def validate_start(cls, start):
         row, column = start.get("row"), start.get("column")
 

benchmark/agbenchmark/challenges/webarena.py

@@ -6,7 +6,7 @@ from typing import ClassVar, Iterator, Literal
 import pytest
 import requests
 from agent_protocol_client import AgentApi, Step
-from pydantic import BaseModel, ValidationError, ValidationInfo, field_validator
+from pydantic import BaseModel, ValidationError, validator
 
 from agbenchmark.config import AgentBenchmarkConfig
 from agbenchmark.utils.data_types import Category, EvalResult
@@ -183,7 +183,7 @@ class WebArenaChallengeSpec(BaseModel):
     """The JungleGym site (base URL) at which to start"""
     require_login: bool
     require_reset: bool
-    storage_state: str | None = None
+    storage_state: str | None
 
     intent: str
     intent_template: str
@@ -195,36 +195,36 @@ class WebArenaChallengeSpec(BaseModel):
 
     class EvalSet(BaseModel):
         class StringMatchEvalSet(BaseModel):
-            exact_match: str | None = None
-            fuzzy_match: list[str] | None = None
-            must_include: list[str] | None = None
+            exact_match: str | None
+            fuzzy_match: list[str] | None
+            must_include: list[str] | None
 
-        reference_answers: StringMatchEvalSet | None = None
+        reference_answers: StringMatchEvalSet | None
         """For string_match eval, a set of criteria to judge the final answer"""
-        reference_answer_raw_annotation: str | None = None
-        string_note: str | None = None
-        annotation_note: str | None = None
+        reference_answer_raw_annotation: str | None
+        string_note: str | None
+        annotation_note: str | None
 
-        reference_url: str | None = None
+        reference_url: str | None
         """For url_match eval, the last URL that should be visited"""
-        url_note: str | None = None
+        url_note: str | None
 
         program_html: list[ProgramHtmlEval]
         """For program_html eval, a list of criteria to judge the site state by"""
 
         eval_types: list[EvalType]
 
-        @field_validator("eval_types")
-        def check_eval_parameters(cls, value: list[EvalType], info: ValidationInfo):
-            if "string_match" in value and not info.data["reference_answers"]:
+        @validator("eval_types")
+        def check_eval_parameters(cls, v: list[EvalType], values):
+            if "string_match" in v and not values.get("reference_answers"):
                 raise ValueError("'string_match' eval_type requires reference_answers")
-            if "url_match" in value and not info.data["reference_url"]:
+            if "url_match" in v and not values.get("reference_url"):
                 raise ValueError("'url_match' eval_type requires reference_url")
-            if "program_html" in value and not info.data["program_html"]:
+            if "program_html" in v and not values.get("program_html"):
                 raise ValueError(
                     "'program_html' eval_type requires at least one program_html eval"
                 )
-            return value
+            return v
 
         @property
         def evaluators(self) -> list[_Eval]:
@@ -292,7 +292,7 @@ class WebArenaChallenge(BaseChallenge):
         results = requests.get(source_url).json()["data"]
         if not results:
             raise ValueError(f"Could not fetch challenge {source_uri}")
-        return cls.from_challenge_spec(WebArenaChallengeSpec.model_validate(results[0]))
+        return cls.from_challenge_spec(WebArenaChallengeSpec.parse_obj(results[0]))
 
     @classmethod
     def from_challenge_spec(
@@ -500,7 +500,7 @@ def load_webarena_challenges(
     skipped = 0
     for entry in challenge_dicts:
         try:
-            challenge_spec = WebArenaChallengeSpec.model_validate(entry)
+            challenge_spec = WebArenaChallengeSpec.parse_obj(entry)
         except ValidationError as e:
             failed += 1
             logger.warning(f"Error validating WebArena challenge entry: {entry}")

benchmark/agbenchmark/config.py

@@ -4,8 +4,7 @@ from datetime import datetime
 from pathlib import Path
 from typing import Optional
 
-from pydantic import Field, ValidationInfo, field_validator
-from pydantic_settings import BaseSettings
+from pydantic import BaseSettings, Field, validator
 
 
 def _calculate_info_test_path(base_path: Path, benchmark_start_time: datetime) -> Path:
@@ -58,7 +57,7 @@ class AgentBenchmarkConfig(BaseSettings, extra="allow"):
     subject application exposes an Agent Protocol compliant API.
     """
 
-    agbenchmark_config_dir: Path = Field(exclude=True)
+    agbenchmark_config_dir: Path = Field(..., exclude=True)
     """Path to the agbenchmark_config folder of the subject agent application."""
 
     categories: list[str] | None = None
@@ -102,11 +101,11 @@ class AgentBenchmarkConfig(BaseSettings, extra="allow"):
     def config_file(self) -> Path:
         return self.agbenchmark_config_dir / "config.json"
 
-    @field_validator("reports_folder", mode="before")
-    def set_reports_folder(cls, value: Path, info: ValidationInfo):
-        if not value:
-            return info.data["agbenchmark_config_dir"] / "reports"
-        return value
+    @validator("reports_folder", pre=True, always=True)
+    def set_reports_folder(cls, v, values):
+        if not v:
+            return values["agbenchmark_config_dir"] / "reports"
+        return v
 
     def get_report_dir(self, benchmark_start_time: datetime) -> Path:
         return _calculate_info_test_path(self.reports_folder, benchmark_start_time)

benchmark/agbenchmark/reports/ReportManager.py

@@ -111,19 +111,17 @@ class SessionReportManager(BaseReportManager):
     def save(self) -> None:
         with self.report_file.open("w") as f:
             if self.report:
-                f.write(self.report.model_dump_json(indent=4))
+                f.write(self.report.json(indent=4))
             else:
-                json.dump(
-                    {k: v.model_dump() for k, v in self.tests.items()}, f, indent=4
-                )
+                json.dump({k: v.dict() for k, v in self.tests.items()}, f, indent=4)
 
     def load(self) -> None:
         super().load()
 
         if "tests" in self.tests:
-            self.report = Report.model_validate(self.tests)
+            self.report = Report.parse_obj(self.tests)
         else:
-            self.tests = {n: Test.model_validate(d) for n, d in self.tests.items()}
+            self.tests = {n: Test.parse_obj(d) for n, d in self.tests.items()}
 
     def add_test_report(self, test_name: str, test_report: Test) -> None:
         if self.report:
@@ -157,7 +155,7 @@ class SessionReportManager(BaseReportManager):
                 total_cost=self.get_total_costs(),
             ),
             tests=copy.copy(self.tests),
-            config=config.model_dump(exclude={"reports_folder"}, exclude_none=True),
+            config=config.dict(exclude={"reports_folder"}, exclude_none=True),
         )
 
         agent_categories = get_highest_achieved_difficulty_per_category(self.report)

benchmark/agbenchmark/reports/processing/process_report.py

@@ -27,7 +27,7 @@ def get_reports_data(report_path: str) -> dict[str, Any]:
         with open(Path(subdir) / file, "r") as f:
             # Load the JSON data from the file
             json_data = json.load(f)
-            converted_data = Report.model_validate(json_data)
+            converted_data = Report.parse_obj(json_data)
             # get the last directory name in the path as key
             reports_data[subdir_name] = converted_data
 

benchmark/agbenchmark/reports/processing/report_types.py

@@ -6,13 +6,7 @@ import logging
 from typing import Annotated, Any, Dict, List
 
 from agent_protocol_client import Step
-from pydantic import (
-    BaseModel,
-    Field,
-    StringConstraints,
-    ValidationInfo,
-    field_validator,
-)
+from pydantic import BaseModel, Field, constr, validator
 
 datetime_format = r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:00$"
 logger = logging.getLogger(__name__)
@@ -36,20 +30,20 @@ class TestResult(BaseModel):
     cost: float | None = None
     """The (known) cost incurred by the run, e.g. from using paid LLM APIs"""
 
-    @field_validator("fail_reason")
-    def success_xor_fail_reason(cls, value, info: ValidationInfo):
-        if bool(value) == bool(info.data["success"]):
+    @validator("fail_reason")
+    def success_xor_fail_reason(cls, v: str | None, values: dict[str, Any]):
+        if bool(v) == bool(values["success"]):
             logger.error(
                 "Error validating `success ^ fail_reason` on TestResult: "
-                f"success = {repr(info.data['success'])}; "
-                f"fail_reason = {repr(value)}"
+                f"success = {repr(values['success'])}; "
+                f"fail_reason = {repr(v)}"
             )
-        if value:
-            success = info.data["success"]
+        if v:
+            success = values["success"]
             assert not success, "fail_reason must only be specified if success=False"
         else:
-            assert info.data["success"], "fail_reason is required if success=False"
-        return value
+            assert values["success"], "fail_reason is required if success=False"
+        return v
 
 
 class TestMetrics(BaseModel):
@@ -94,7 +88,7 @@ class Test(BaseModel):
 class ReportBase(BaseModel):
     command: str
     completion_time: str | None = None
-    benchmark_start_time: Annotated[str, StringConstraints(pattern=datetime_format)]
+    benchmark_start_time: Annotated[str, constr(regex=datetime_format)]
     metrics: MetricsOverall
     config: Dict[str, str | dict[str, str]]
     agent_git_commit_sha: str | None = None

benchmark/agbenchmark/reports/processing/report_types_v2.py

@@ -1,7 +1,7 @@
 """Model definitions for use in the API"""
 from typing import Annotated
 
-from pydantic import BaseModel, StringConstraints
+from pydantic import BaseModel, constr
 
 datetime_format = r"^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\+00:00$"
 
@@ -37,7 +37,7 @@ class RunDetails(BaseModel):
     run_id: str | None = None
     command: str
     completion_time: str | None = None
-    benchmark_start_time: Annotated[str, StringConstraints(pattern=datetime_format)]
+    benchmark_start_time: Annotated[str, constr(regex=datetime_format)]
 
 
 class BenchmarkRun(BaseModel):

benchmark/agbenchmark/reports/reports.py

@@ -45,7 +45,7 @@ def update_regression_tests(
         # if the last 3 tests were successful, add to the regression tests
         test_report.metrics.is_regression = True
         SingletonReportManager().REGRESSION_MANAGER.add_test(
-            test_name, test_report.model_dump(include={"difficulty", "data_path"})
+            test_name, test_report.dict(include={"difficulty", "data_path"})
         )
 
 

benchmark/agbenchmark/schema.py

@@ -7,9 +7,10 @@ from pydantic import BaseModel, Field
 
 class TaskRequestBody(BaseModel):
     input: str = Field(
+        ...,
         min_length=1,
         description="Input prompt for the task.",
-        examples=["Write the words you receive to the file 'output.txt'."],
+        example="Write the words you receive to the file 'output.txt'.",
     )
     additional_input: Optional[dict[str, Any]] = Field(default_factory=dict)
 

benchmark/agbenchmark/utils/dependencies/main.py

@@ -220,7 +220,7 @@ class DependencyManager(object):
         labels = {}
         for item in self.items:
             assert item.cls and issubclass(item.cls, BaseChallenge)
-            data = item.cls.info.model_dump()
+            data = item.cls.info.dict()
 
             node_name = get_name(item)
             data["name"] = node_name

benchmark/agbenchmark/utils/utils.py

@@ -135,7 +135,7 @@ def pretty_print_model(model: BaseModel, include_header: bool = True) -> None:
     if include_header:
         # Try to find the ID and/or name attribute of the model
         id, name = None, None
-        for attr, value in model.model_dump().items():
+        for attr, value in model.dict().items():
             if attr == "id" or attr.endswith("_id"):
                 id = value
             if attr.endswith("name"):
@@ -148,8 +148,8 @@ def pretty_print_model(model: BaseModel, include_header: bool = True) -> None:
         )
         indent = " " * 2
 
-    k_col_width = max(len(k) for k in model.model_dump().keys())
-    for k, v in model.model_dump().items():
+    k_col_width = max(len(k) for k in model.dict().keys())
+    for k, v in model.dict().items():
         v_fmt = repr(v)
         if v is None or v == "":
             v_fmt = click.style(v_fmt, fg="black")

benchmark/poetry.lock

@@ -5,22 +5,17 @@ name = "agent-protocol-client"
 version = "1.1.0"
 description = "Agent Communication Protocol Client"
 optional = false
-python-versions = "^3.7"
-files = []
-develop = false
+python-versions = ">=3.7,<4.0"
+files = [
+    {file = "agent_protocol_client-1.1.0-py3-none-any.whl", hash = "sha256:0e8c6c97244189666ed18e320410abddce8c9dfb75437da1e590bbef3b6268be"},
+    {file = "agent_protocol_client-1.1.0.tar.gz", hash = "sha256:aa7e1042de1249477fdc29c2df08a44f2233dade9c02c1279e37c98e9d3a0d72"},
+]
 
 [package.dependencies]
-aiohttp = "^3.8.4"
-pydantic = ">=1.10.5, <3.0.0"
-python-dateutil = "^2.8.2"
-urllib3 = "^1.25.3"
-
-[package.source]
-type = "git"
-url = "https://github.com/Significant-Gravitas/agent-protocol.git"
-reference = "HEAD"
-resolved_reference = "beb098517b0b9e255024d1b57df236f0329f4b1c"
-subdirectory = "packages/client/python"
+aiohttp = ">=3.8.4,<4.0.0"
+pydantic = ">=1.10.5,<2.0.0"
+python-dateutil = ">=2.8.2,<3.0.0"
+urllib3 = ">=1.25.3,<2.0.0"
 
 [[package]]
 name = "aiohttp"
@@ -132,17 +127,6 @@ files = [
 [package.dependencies]
 frozenlist = ">=1.1.0"
 
-[[package]]
-name = "annotated-types"
-version = "0.7.0"
-description = "Reusable constraint types to use with typing.Annotated"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53"},
-    {file = "annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89"},
-]
-
 [[package]]
 name = "anyio"
 version = "4.2.0"
@@ -1456,101 +1440,85 @@ files = [
 
 [[package]]
 name = "multidict"
-version = "6.0.5"
+version = "6.0.4"
 description = "multidict implementation"
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:228b644ae063c10e7f324ab1ab6b548bdf6f8b47f3ec234fef1093bc2735e5f9"},
-    {file = "multidict-6.0.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:896ebdcf62683551312c30e20614305f53125750803b614e9e6ce74a96232604"},
-    {file = "multidict-6.0.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:411bf8515f3be9813d06004cac41ccf7d1cd46dfe233705933dd163b60e37600"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1d147090048129ce3c453f0292e7697d333db95e52616b3793922945804a433c"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:215ed703caf15f578dca76ee6f6b21b7603791ae090fbf1ef9d865571039ade5"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7c6390cf87ff6234643428991b7359b5f59cc15155695deb4eda5c777d2b880f"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21fd81c4ebdb4f214161be351eb5bcf385426bf023041da2fd9e60681f3cebae"},
-    {file = "multidict-6.0.5-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3cc2ad10255f903656017363cd59436f2111443a76f996584d1077e43ee51182"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:6939c95381e003f54cd4c5516740faba40cf5ad3eeff460c3ad1d3e0ea2549bf"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:220dd781e3f7af2c2c1053da9fa96d9cf3072ca58f057f4c5adaaa1cab8fc442"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:766c8f7511df26d9f11cd3a8be623e59cca73d44643abab3f8c8c07620524e4a"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:fe5d7785250541f7f5019ab9cba2c71169dc7d74d0f45253f8313f436458a4ef"},
-    {file = "multidict-6.0.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c1c1496e73051918fcd4f58ff2e0f2f3066d1c76a0c6aeffd9b45d53243702cc"},
-    {file = "multidict-6.0.5-cp310-cp310-win32.whl", hash = "sha256:7afcdd1fc07befad18ec4523a782cde4e93e0a2bf71239894b8d61ee578c1319"},
-    {file = "multidict-6.0.5-cp310-cp310-win_amd64.whl", hash = "sha256:99f60d34c048c5c2fabc766108c103612344c46e35d4ed9ae0673d33c8fb26e8"},
-    {file = "multidict-6.0.5-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:f285e862d2f153a70586579c15c44656f888806ed0e5b56b64489afe4a2dbfba"},
-    {file = "multidict-6.0.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:53689bb4e102200a4fafa9de9c7c3c212ab40a7ab2c8e474491914d2305f187e"},
-    {file = "multidict-6.0.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:612d1156111ae11d14afaf3a0669ebf6c170dbb735e510a7438ffe2369a847fd"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7be7047bd08accdb7487737631d25735c9a04327911de89ff1b26b81745bd4e3"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:de170c7b4fe6859beb8926e84f7d7d6c693dfe8e27372ce3b76f01c46e489fcf"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:04bde7a7b3de05732a4eb39c94574db1ec99abb56162d6c520ad26f83267de29"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:85f67aed7bb647f93e7520633d8f51d3cbc6ab96957c71272b286b2f30dc70ed"},
-    {file = "multidict-6.0.5-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:425bf820055005bfc8aa9a0b99ccb52cc2f4070153e34b701acc98d201693733"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:d3eb1ceec286eba8220c26f3b0096cf189aea7057b6e7b7a2e60ed36b373b77f"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:7901c05ead4b3fb75113fb1dd33eb1253c6d3ee37ce93305acd9d38e0b5f21a4"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:e0e79d91e71b9867c73323a3444724d496c037e578a0e1755ae159ba14f4f3d1"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:29bfeb0dff5cb5fdab2023a7a9947b3b4af63e9c47cae2a10ad58394b517fddc"},
-    {file = "multidict-6.0.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e030047e85cbcedbfc073f71836d62dd5dadfbe7531cae27789ff66bc551bd5e"},
-    {file = "multidict-6.0.5-cp311-cp311-win32.whl", hash = "sha256:2f4848aa3baa109e6ab81fe2006c77ed4d3cd1e0ac2c1fbddb7b1277c168788c"},
-    {file = "multidict-6.0.5-cp311-cp311-win_amd64.whl", hash = "sha256:2faa5ae9376faba05f630d7e5e6be05be22913782b927b19d12b8145968a85ea"},
-    {file = "multidict-6.0.5-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:51d035609b86722963404f711db441cf7134f1889107fb171a970c9701f92e1e"},
-    {file = "multidict-6.0.5-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:cbebcd5bcaf1eaf302617c114aa67569dd3f090dd0ce8ba9e35e9985b41ac35b"},
-    {file = "multidict-6.0.5-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2ffc42c922dbfddb4a4c3b438eb056828719f07608af27d163191cb3e3aa6cc5"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ceb3b7e6a0135e092de86110c5a74e46bda4bd4fbfeeb3a3bcec79c0f861e450"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:79660376075cfd4b2c80f295528aa6beb2058fd289f4c9252f986751a4cd0496"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e4428b29611e989719874670fd152b6625500ad6c686d464e99f5aaeeaca175a"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d84a5c3a5f7ce6db1f999fb9438f686bc2e09d38143f2d93d8406ed2dd6b9226"},
-    {file = "multidict-6.0.5-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:76c0de87358b192de7ea9649beb392f107dcad9ad27276324c24c91774ca5271"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:79a6d2ba910adb2cbafc95dad936f8b9386e77c84c35bc0add315b856d7c3abb"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:92d16a3e275e38293623ebf639c471d3e03bb20b8ebb845237e0d3664914caef"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_ppc64le.whl", hash = "sha256:fb616be3538599e797a2017cccca78e354c767165e8858ab5116813146041a24"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_s390x.whl", hash = "sha256:14c2976aa9038c2629efa2c148022ed5eb4cb939e15ec7aace7ca932f48f9ba6"},
-    {file = "multidict-6.0.5-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:435a0984199d81ca178b9ae2c26ec3d49692d20ee29bc4c11a2a8d4514c67eda"},
-    {file = "multidict-6.0.5-cp312-cp312-win32.whl", hash = "sha256:9fe7b0653ba3d9d65cbe7698cca585bf0f8c83dbbcc710db9c90f478e175f2d5"},
-    {file = "multidict-6.0.5-cp312-cp312-win_amd64.whl", hash = "sha256:01265f5e40f5a17f8241d52656ed27192be03bfa8764d88e8220141d1e4b3556"},
-    {file = "multidict-6.0.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:19fe01cea168585ba0f678cad6f58133db2aa14eccaf22f88e4a6dccadfad8b3"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6bf7a982604375a8d49b6cc1b781c1747f243d91b81035a9b43a2126c04766f5"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:107c0cdefe028703fb5dafe640a409cb146d44a6ae201e55b35a4af8e95457dd"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:403c0911cd5d5791605808b942c88a8155c2592e05332d2bf78f18697a5fa15e"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:aeaf541ddbad8311a87dd695ed9642401131ea39ad7bc8cf3ef3967fd093b626"},
-    {file = "multidict-6.0.5-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e4972624066095e52b569e02b5ca97dbd7a7ddd4294bf4e7247d52635630dd83"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:d946b0a9eb8aaa590df1fe082cee553ceab173e6cb5b03239716338629c50c7a"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b55358304d7a73d7bdf5de62494aaf70bd33015831ffd98bc498b433dfe5b10c"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:a3145cb08d8625b2d3fee1b2d596a8766352979c9bffe5d7833e0503d0f0b5e5"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:d65f25da8e248202bd47445cec78e0025c0fe7582b23ec69c3b27a640dd7a8e3"},
-    {file = "multidict-6.0.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:c9bf56195c6bbd293340ea82eafd0071cb3d450c703d2c93afb89f93b8386ccc"},
-    {file = "multidict-6.0.5-cp37-cp37m-win32.whl", hash = "sha256:69db76c09796b313331bb7048229e3bee7928eb62bab5e071e9f7fcc4879caee"},
-    {file = "multidict-6.0.5-cp37-cp37m-win_amd64.whl", hash = "sha256:fce28b3c8a81b6b36dfac9feb1de115bab619b3c13905b419ec71d03a3fc1423"},
-    {file = "multidict-6.0.5-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:76f067f5121dcecf0d63a67f29080b26c43c71a98b10c701b0677e4a065fbd54"},
-    {file = "multidict-6.0.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b82cc8ace10ab5bd93235dfaab2021c70637005e1ac787031f4d1da63d493c1d"},
-    {file = "multidict-6.0.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5cb241881eefd96b46f89b1a056187ea8e9ba14ab88ba632e68d7a2ecb7aadf7"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e8e94e6912639a02ce173341ff62cc1201232ab86b8a8fcc05572741a5dc7d93"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:09a892e4a9fb47331da06948690ae38eaa2426de97b4ccbfafbdcbe5c8f37ff8"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:55205d03e8a598cfc688c71ca8ea5f66447164efff8869517f175ea632c7cb7b"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37b15024f864916b4951adb95d3a80c9431299080341ab9544ed148091b53f50"},
-    {file = "multidict-6.0.5-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f2a1dee728b52b33eebff5072817176c172050d44d67befd681609b4746e1c2e"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:edd08e6f2f1a390bf137080507e44ccc086353c8e98c657e666c017718561b89"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:60d698e8179a42ec85172d12f50b1668254628425a6bd611aba022257cac1386"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3d25f19500588cbc47dc19081d78131c32637c25804df8414463ec908631e453"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:4cc0ef8b962ac7a5e62b9e826bd0cd5040e7d401bc45a6835910ed699037a461"},
-    {file = "multidict-6.0.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:eca2e9d0cc5a889850e9bbd68e98314ada174ff6ccd1129500103df7a94a7a44"},
-    {file = "multidict-6.0.5-cp38-cp38-win32.whl", hash = "sha256:4a6a4f196f08c58c59e0b8ef8ec441d12aee4125a7d4f4fef000ccb22f8d7241"},
-    {file = "multidict-6.0.5-cp38-cp38-win_amd64.whl", hash = "sha256:0275e35209c27a3f7951e1ce7aaf93ce0d163b28948444bec61dd7badc6d3f8c"},
-    {file = "multidict-6.0.5-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:e7be68734bd8c9a513f2b0cfd508802d6609da068f40dc57d4e3494cefc92929"},
-    {file = "multidict-6.0.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1d9ea7a7e779d7a3561aade7d596649fbecfa5c08a7674b11b423783217933f9"},
-    {file = "multidict-6.0.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ea1456df2a27c73ce51120fa2f519f1bea2f4a03a917f4a43c8707cf4cbbae1a"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf590b134eb70629e350691ecca88eac3e3b8b3c86992042fb82e3cb1830d5e1"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5c0631926c4f58e9a5ccce555ad7747d9a9f8b10619621f22f9635f069f6233e"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dce1c6912ab9ff5f179eaf6efe7365c1f425ed690b03341911bf4939ef2f3046"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c0868d64af83169e4d4152ec612637a543f7a336e4a307b119e98042e852ad9c"},
-    {file = "multidict-6.0.5-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:141b43360bfd3bdd75f15ed811850763555a251e38b2405967f8e25fb43f7d40"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:7df704ca8cf4a073334e0427ae2345323613e4df18cc224f647f251e5e75a527"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:6214c5a5571802c33f80e6c84713b2c79e024995b9c5897f794b43e714daeec9"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:cd6c8fca38178e12c00418de737aef1261576bd1b6e8c6134d3e729a4e858b38"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:e02021f87a5b6932fa6ce916ca004c4d441509d33bbdbeca70d05dff5e9d2479"},
-    {file = "multidict-6.0.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:ebd8d160f91a764652d3e51ce0d2956b38efe37c9231cd82cfc0bed2e40b581c"},
-    {file = "multidict-6.0.5-cp39-cp39-win32.whl", hash = "sha256:04da1bb8c8dbadf2a18a452639771951c662c5ad03aefe4884775454be322c9b"},
-    {file = "multidict-6.0.5-cp39-cp39-win_amd64.whl", hash = "sha256:d6f6d4f185481c9669b9447bf9d9cf3b95a0e9df9d169bbc17e363b7d5487755"},
-    {file = "multidict-6.0.5-py3-none-any.whl", hash = "sha256:0d63c74e3d7ab26de115c49bffc92cc77ed23395303d496eae515d4204a625e7"},
-    {file = "multidict-6.0.5.tar.gz", hash = "sha256:f7e301075edaf50500f0b341543c41194d8df3ae5caf4702f2095f3ca73dd8da"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0b1a97283e0c85772d613878028fec909f003993e1007eafa715b24b377cb9b8"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:eeb6dcc05e911516ae3d1f207d4b0520d07f54484c49dfc294d6e7d63b734171"},
+    {file = "multidict-6.0.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d6d635d5209b82a3492508cf5b365f3446afb65ae7ebd755e70e18f287b0adf7"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c048099e4c9e9d615545e2001d3d8a4380bd403e1a0578734e0d31703d1b0c0b"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ea20853c6dbbb53ed34cb4d080382169b6f4554d394015f1bef35e881bf83547"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:16d232d4e5396c2efbbf4f6d4df89bfa905eb0d4dc5b3549d872ab898451f569"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:36c63aaa167f6c6b04ef2c85704e93af16c11d20de1d133e39de6a0e84582a93"},
+    {file = "multidict-6.0.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:64bdf1086b6043bf519869678f5f2757f473dee970d7abf6da91ec00acb9cb98"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:43644e38f42e3af682690876cff722d301ac585c5b9e1eacc013b7a3f7b696a0"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:7582a1d1030e15422262de9f58711774e02fa80df0d1578995c76214f6954988"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:ddff9c4e225a63a5afab9dd15590432c22e8057e1a9a13d28ed128ecf047bbdc"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ee2a1ece51b9b9e7752e742cfb661d2a29e7bcdba2d27e66e28a99f1890e4fa0"},
+    {file = "multidict-6.0.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a2e4369eb3d47d2034032a26c7a80fcb21a2cb22e1173d761a162f11e562caa5"},
+    {file = "multidict-6.0.4-cp310-cp310-win32.whl", hash = "sha256:574b7eae1ab267e5f8285f0fe881f17efe4b98c39a40858247720935b893bba8"},
+    {file = "multidict-6.0.4-cp310-cp310-win_amd64.whl", hash = "sha256:4dcbb0906e38440fa3e325df2359ac6cb043df8e58c965bb45f4e406ecb162cc"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:0dfad7a5a1e39c53ed00d2dd0c2e36aed4650936dc18fd9a1826a5ae1cad6f03"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:64da238a09d6039e3bd39bb3aee9c21a5e34f28bfa5aa22518581f910ff94af3"},
+    {file = "multidict-6.0.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:ff959bee35038c4624250473988b24f846cbeb2c6639de3602c073f10410ceba"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:01a3a55bd90018c9c080fbb0b9f4891db37d148a0a18722b42f94694f8b6d4c9"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:c5cb09abb18c1ea940fb99360ea0396f34d46566f157122c92dfa069d3e0e982"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:666daae833559deb2d609afa4490b85830ab0dfca811a98b70a205621a6109fe"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:11bdf3f5e1518b24530b8241529d2050014c884cf18b6fc69c0c2b30ca248710"},
+    {file = "multidict-6.0.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d18748f2d30f94f498e852c67d61261c643b349b9d2a581131725595c45ec6c"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:458f37be2d9e4c95e2d8866a851663cbc76e865b78395090786f6cd9b3bbf4f4"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:b1a2eeedcead3a41694130495593a559a668f382eee0727352b9a41e1c45759a"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:7d6ae9d593ef8641544d6263c7fa6408cc90370c8cb2bbb65f8d43e5b0351d9c"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:5979b5632c3e3534e42ca6ff856bb24b2e3071b37861c2c727ce220d80eee9ed"},
+    {file = "multidict-6.0.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:dcfe792765fab89c365123c81046ad4103fcabbc4f56d1c1997e6715e8015461"},
+    {file = "multidict-6.0.4-cp311-cp311-win32.whl", hash = "sha256:3601a3cece3819534b11d4efc1eb76047488fddd0c85a3948099d5da4d504636"},
+    {file = "multidict-6.0.4-cp311-cp311-win_amd64.whl", hash = "sha256:81a4f0b34bd92df3da93315c6a59034df95866014ac08535fc819f043bfd51f0"},
+    {file = "multidict-6.0.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:67040058f37a2a51ed8ea8f6b0e6ee5bd78ca67f169ce6122f3e2ec80dfe9b78"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:853888594621e6604c978ce2a0444a1e6e70c8d253ab65ba11657659dcc9100f"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:39ff62e7d0f26c248b15e364517a72932a611a9b75f35b45be078d81bdb86603"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:af048912e045a2dc732847d33821a9d84ba553f5c5f028adbd364dd4765092ac"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b1e8b901e607795ec06c9e42530788c45ac21ef3aaa11dbd0c69de543bfb79a9"},
+    {file = "multidict-6.0.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:62501642008a8b9871ddfccbf83e4222cf8ac0d5aeedf73da36153ef2ec222d2"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:99b76c052e9f1bc0721f7541e5e8c05db3941eb9ebe7b8553c625ef88d6eefde"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:509eac6cf09c794aa27bcacfd4d62c885cce62bef7b2c3e8b2e49d365b5003fe"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:21a12c4eb6ddc9952c415f24eef97e3e55ba3af61f67c7bc388dcdec1404a067"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:5cad9430ab3e2e4fa4a2ef4450f548768400a2ac635841bc2a56a2052cdbeb87"},
+    {file = "multidict-6.0.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ab55edc2e84460694295f401215f4a58597f8f7c9466faec545093045476327d"},
+    {file = "multidict-6.0.4-cp37-cp37m-win32.whl", hash = "sha256:5a4dcf02b908c3b8b17a45fb0f15b695bf117a67b76b7ad18b73cf8e92608775"},
+    {file = "multidict-6.0.4-cp37-cp37m-win_amd64.whl", hash = "sha256:6ed5f161328b7df384d71b07317f4d8656434e34591f20552c7bcef27b0ab88e"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:5fc1b16f586f049820c5c5b17bb4ee7583092fa0d1c4e28b5239181ff9532e0c"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1502e24330eb681bdaa3eb70d6358e818e8e8f908a22a1851dfd4e15bc2f8161"},
+    {file = "multidict-6.0.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b692f419760c0e65d060959df05f2a531945af31fda0c8a3b3195d4efd06de11"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:45e1ecb0379bfaab5eef059f50115b54571acfbe422a14f668fc8c27ba410e7e"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ddd3915998d93fbcd2566ddf9cf62cdb35c9e093075f862935573d265cf8f65d"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:59d43b61c59d82f2effb39a93c48b845efe23a3852d201ed2d24ba830d0b4cf2"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc8e1d0c705233c5dd0c5e6460fbad7827d5d36f310a0fadfd45cc3029762258"},
+    {file = "multidict-6.0.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d6aa0418fcc838522256761b3415822626f866758ee0bc6632c9486b179d0b52"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:6748717bb10339c4760c1e63da040f5f29f5ed6e59d76daee30305894069a660"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:4d1a3d7ef5e96b1c9e92f973e43aa5e5b96c659c9bc3124acbbd81b0b9c8a951"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:4372381634485bec7e46718edc71528024fcdc6f835baefe517b34a33c731d60"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:fc35cb4676846ef752816d5be2193a1e8367b4c1397b74a565a9d0389c433a1d"},
+    {file = "multidict-6.0.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:4b9d9e4e2b37daddb5c23ea33a3417901fa7c7b3dee2d855f63ee67a0b21e5b1"},
+    {file = "multidict-6.0.4-cp38-cp38-win32.whl", hash = "sha256:e41b7e2b59679edfa309e8db64fdf22399eec4b0b24694e1b2104fb789207779"},
+    {file = "multidict-6.0.4-cp38-cp38-win_amd64.whl", hash = "sha256:d6c254ba6e45d8e72739281ebc46ea5eb5f101234f3ce171f0e9f5cc86991480"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:16ab77bbeb596e14212e7bab8429f24c1579234a3a462105cda4a66904998664"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc779e9e6f7fda81b3f9aa58e3a6091d49ad528b11ed19f6621408806204ad35"},
+    {file = "multidict-6.0.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4ceef517eca3e03c1cceb22030a3e39cb399ac86bff4e426d4fc6ae49052cc60"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:281af09f488903fde97923c7744bb001a9b23b039a909460d0f14edc7bf59706"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:52f2dffc8acaba9a2f27174c41c9e57f60b907bb9f096b36b1a1f3be71c6284d"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b41156839806aecb3641f3208c0dafd3ac7775b9c4c422d82ee2a45c34ba81ca"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d5e3fc56f88cc98ef8139255cf8cd63eb2c586531e43310ff859d6bb3a6b51f1"},
+    {file = "multidict-6.0.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8316a77808c501004802f9beebde51c9f857054a0c871bd6da8280e718444449"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f70b98cd94886b49d91170ef23ec5c0e8ebb6f242d734ed7ed677b24d50c82cf"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:bf6774e60d67a9efe02b3616fee22441d86fab4c6d335f9d2051d19d90a40063"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e69924bfcdda39b722ef4d9aa762b2dd38e4632b3641b1d9a57ca9cd18f2f83a"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:6b181d8c23da913d4ff585afd1155a0e1194c0b50c54fcfe286f70cdaf2b7176"},
+    {file = "multidict-6.0.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:52509b5be062d9eafc8170e53026fbc54cf3b32759a23d07fd935fb04fc22d95"},
+    {file = "multidict-6.0.4-cp39-cp39-win32.whl", hash = "sha256:27c523fbfbdfd19c6867af7346332b62b586eed663887392cff78d614f9ec313"},
+    {file = "multidict-6.0.4-cp39-cp39-win_amd64.whl", hash = "sha256:33029f5734336aa0d4c0384525da0387ef89148dc7191aae00ca5fb23d7aafc2"},
+    {file = "multidict-6.0.4.tar.gz", hash = "sha256:3666906492efb76453c0e7b97f2cf459b0682e7402c0489a95484965dbc1da49"},
 ]
 
 [[package]]
@@ -2080,132 +2048,55 @@ files = [
 
 [[package]]
 name = "pydantic"
-version = "2.7.4"
-description = "Data validation using Python type hints"
+version = "1.10.13"
+description = "Data validation and settings management using python type hints"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.7"
 files = [
-    {file = "pydantic-2.7.4-py3-none-any.whl", hash = "sha256:ee8538d41ccb9c0a9ad3e0e5f07bf15ed8015b481ced539a1759d8cc89ae90d0"},
-    {file = "pydantic-2.7.4.tar.gz", hash = "sha256:0c84efd9548d545f63ac0060c1e4d39bb9b14db8b3c0652338aecc07b5adec52"},
+    {file = "pydantic-1.10.13-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:efff03cc7a4f29d9009d1c96ceb1e7a70a65cfe86e89d34e4a5f2ab1e5693737"},
+    {file = "pydantic-1.10.13-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:3ecea2b9d80e5333303eeb77e180b90e95eea8f765d08c3d278cd56b00345d01"},
+    {file = "pydantic-1.10.13-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1740068fd8e2ef6eb27a20e5651df000978edce6da6803c2bef0bc74540f9548"},
+    {file = "pydantic-1.10.13-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84bafe2e60b5e78bc64a2941b4c071a4b7404c5c907f5f5a99b0139781e69ed8"},
+    {file = "pydantic-1.10.13-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:bc0898c12f8e9c97f6cd44c0ed70d55749eaf783716896960b4ecce2edfd2d69"},
+    {file = "pydantic-1.10.13-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:654db58ae399fe6434e55325a2c3e959836bd17a6f6a0b6ca8107ea0571d2e17"},
+    {file = "pydantic-1.10.13-cp310-cp310-win_amd64.whl", hash = "sha256:75ac15385a3534d887a99c713aa3da88a30fbd6204a5cd0dc4dab3d770b9bd2f"},
+    {file = "pydantic-1.10.13-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c553f6a156deb868ba38a23cf0df886c63492e9257f60a79c0fd8e7173537653"},
+    {file = "pydantic-1.10.13-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:5e08865bc6464df8c7d61439ef4439829e3ab62ab1669cddea8dd00cd74b9ffe"},
+    {file = "pydantic-1.10.13-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e31647d85a2013d926ce60b84f9dd5300d44535a9941fe825dc349ae1f760df9"},
+    {file = "pydantic-1.10.13-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:210ce042e8f6f7c01168b2d84d4c9eb2b009fe7bf572c2266e235edf14bacd80"},
+    {file = "pydantic-1.10.13-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:8ae5dd6b721459bfa30805f4c25880e0dd78fc5b5879f9f7a692196ddcb5a580"},
+    {file = "pydantic-1.10.13-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:f8e81fc5fb17dae698f52bdd1c4f18b6ca674d7068242b2aff075f588301bbb0"},
+    {file = "pydantic-1.10.13-cp311-cp311-win_amd64.whl", hash = "sha256:61d9dce220447fb74f45e73d7ff3b530e25db30192ad8d425166d43c5deb6df0"},
+    {file = "pydantic-1.10.13-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:4b03e42ec20286f052490423682016fd80fda830d8e4119f8ab13ec7464c0132"},
+    {file = "pydantic-1.10.13-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f59ef915cac80275245824e9d771ee939133be38215555e9dc90c6cb148aaeb5"},
+    {file = "pydantic-1.10.13-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5a1f9f747851338933942db7af7b6ee8268568ef2ed86c4185c6ef4402e80ba8"},
+    {file = "pydantic-1.10.13-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:97cce3ae7341f7620a0ba5ef6cf043975cd9d2b81f3aa5f4ea37928269bc1b87"},
+    {file = "pydantic-1.10.13-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:854223752ba81e3abf663d685f105c64150873cc6f5d0c01d3e3220bcff7d36f"},
+    {file = "pydantic-1.10.13-cp37-cp37m-win_amd64.whl", hash = "sha256:b97c1fac8c49be29486df85968682b0afa77e1b809aff74b83081cc115e52f33"},
+    {file = "pydantic-1.10.13-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c958d053453a1c4b1c2062b05cd42d9d5c8eb67537b8d5a7e3c3032943ecd261"},
+    {file = "pydantic-1.10.13-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:4c5370a7edaac06daee3af1c8b1192e305bc102abcbf2a92374b5bc793818599"},
+    {file = "pydantic-1.10.13-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7d6f6e7305244bddb4414ba7094ce910560c907bdfa3501e9db1a7fd7eaea127"},
+    {file = "pydantic-1.10.13-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d3a3c792a58e1622667a2837512099eac62490cdfd63bd407993aaf200a4cf1f"},
+    {file = "pydantic-1.10.13-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c636925f38b8db208e09d344c7aa4f29a86bb9947495dd6b6d376ad10334fb78"},
+    {file = "pydantic-1.10.13-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:678bcf5591b63cc917100dc50ab6caebe597ac67e8c9ccb75e698f66038ea953"},
+    {file = "pydantic-1.10.13-cp38-cp38-win_amd64.whl", hash = "sha256:6cf25c1a65c27923a17b3da28a0bdb99f62ee04230c931d83e888012851f4e7f"},
+    {file = "pydantic-1.10.13-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:8ef467901d7a41fa0ca6db9ae3ec0021e3f657ce2c208e98cd511f3161c762c6"},
+    {file = "pydantic-1.10.13-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:968ac42970f57b8344ee08837b62f6ee6f53c33f603547a55571c954a4225691"},
+    {file = "pydantic-1.10.13-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9849f031cf8a2f0a928fe885e5a04b08006d6d41876b8bbd2fc68a18f9f2e3fd"},
+    {file = "pydantic-1.10.13-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:56e3ff861c3b9c6857579de282ce8baabf443f42ffba355bf070770ed63e11e1"},
+    {file = "pydantic-1.10.13-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:9f00790179497767aae6bcdc36355792c79e7bbb20b145ff449700eb076c5f96"},
+    {file = "pydantic-1.10.13-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:75b297827b59bc229cac1a23a2f7a4ac0031068e5be0ce385be1462e7e17a35d"},
+    {file = "pydantic-1.10.13-cp39-cp39-win_amd64.whl", hash = "sha256:e70ca129d2053fb8b728ee7d1af8e553a928d7e301a311094b8a0501adc8763d"},
+    {file = "pydantic-1.10.13-py3-none-any.whl", hash = "sha256:b87326822e71bd5f313e7d3bfdc77ac3247035ac10b0c0618bd99dcf95b1e687"},
+    {file = "pydantic-1.10.13.tar.gz", hash = "sha256:32c8b48dcd3b2ac4e78b0ba4af3a2c2eb6048cb75202f0ea7b34feb740efc340"},
 ]
 
 [package.dependencies]
-annotated-types = ">=0.4.0"
-pydantic-core = "2.18.4"
-typing-extensions = ">=4.6.1"
+typing-extensions = ">=4.2.0"
 
 [package.extras]
-email = ["email-validator (>=2.0.0)"]
-
-[[package]]
-name = "pydantic-core"
-version = "2.18.4"
-description = "Core functionality for Pydantic validation and serialization"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pydantic_core-2.18.4-cp310-cp310-macosx_10_12_x86_64.whl", hash = "sha256:f76d0ad001edd426b92233d45c746fd08f467d56100fd8f30e9ace4b005266e4"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:59ff3e89f4eaf14050c8022011862df275b552caef8082e37b542b066ce1ff26"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a55b5b16c839df1070bc113c1f7f94a0af4433fcfa1b41799ce7606e5c79ce0a"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:4d0dcc59664fcb8974b356fe0a18a672d6d7cf9f54746c05f43275fc48636851"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8951eee36c57cd128f779e641e21eb40bc5073eb28b2d23f33eb0ef14ffb3f5d"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4701b19f7e3a06ea655513f7938de6f108123bf7c86bbebb1196eb9bd35cf724"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e00a3f196329e08e43d99b79b286d60ce46bed10f2280d25a1718399457e06be"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:97736815b9cc893b2b7f663628e63f436018b75f44854c8027040e05230eeddb"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:6891a2ae0e8692679c07728819b6e2b822fb30ca7445f67bbf6509b25a96332c"},
-    {file = "pydantic_core-2.18.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:bc4ff9805858bd54d1a20efff925ccd89c9d2e7cf4986144b30802bf78091c3e"},
-    {file = "pydantic_core-2.18.4-cp310-none-win32.whl", hash = "sha256:1b4de2e51bbcb61fdebd0ab86ef28062704f62c82bbf4addc4e37fa4b00b7cbc"},
-    {file = "pydantic_core-2.18.4-cp310-none-win_amd64.whl", hash = "sha256:6a750aec7bf431517a9fd78cb93c97b9b0c496090fee84a47a0d23668976b4b0"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-macosx_10_12_x86_64.whl", hash = "sha256:942ba11e7dfb66dc70f9ae66b33452f51ac7bb90676da39a7345e99ffb55402d"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b2ebef0e0b4454320274f5e83a41844c63438fdc874ea40a8b5b4ecb7693f1c4"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a642295cd0c8df1b86fc3dced1d067874c353a188dc8e0f744626d49e9aa51c4"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:5f09baa656c904807e832cf9cce799c6460c450c4ad80803517032da0cd062e2"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:98906207f29bc2c459ff64fa007afd10a8c8ac080f7e4d5beff4c97086a3dabd"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:19894b95aacfa98e7cb093cd7881a0c76f55731efad31073db4521e2b6ff5b7d"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0fbbdc827fe5e42e4d196c746b890b3d72876bdbf160b0eafe9f0334525119c8"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f85d05aa0918283cf29a30b547b4df2fbb56b45b135f9e35b6807cb28bc47951"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e85637bc8fe81ddb73fda9e56bab24560bdddfa98aa64f87aaa4e4b6730c23d2"},
-    {file = "pydantic_core-2.18.4-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:2f5966897e5461f818e136b8451d0551a2e77259eb0f73a837027b47dc95dab9"},
-    {file = "pydantic_core-2.18.4-cp311-none-win32.whl", hash = "sha256:44c7486a4228413c317952e9d89598bcdfb06399735e49e0f8df643e1ccd0558"},
-    {file = "pydantic_core-2.18.4-cp311-none-win_amd64.whl", hash = "sha256:8a7164fe2005d03c64fd3b85649891cd4953a8de53107940bf272500ba8a788b"},
-    {file = "pydantic_core-2.18.4-cp311-none-win_arm64.whl", hash = "sha256:4e99bc050fe65c450344421017f98298a97cefc18c53bb2f7b3531eb39bc7805"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:6f5c4d41b2771c730ea1c34e458e781b18cc668d194958e0112455fff4e402b2"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:2fdf2156aa3d017fddf8aea5adfba9f777db1d6022d392b682d2a8329e087cef"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4748321b5078216070b151d5271ef3e7cc905ab170bbfd27d5c83ee3ec436695"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:847a35c4d58721c5dc3dba599878ebbdfd96784f3fb8bb2c356e123bdcd73f34"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3c40d4eaad41f78e3bbda31b89edc46a3f3dc6e171bf0ecf097ff7a0ffff7cb1"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:21a5e440dbe315ab9825fcd459b8814bb92b27c974cbc23c3e8baa2b76890077"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01dd777215e2aa86dfd664daed5957704b769e726626393438f9c87690ce78c3"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:4b06beb3b3f1479d32befd1f3079cc47b34fa2da62457cdf6c963393340b56e9"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:564d7922e4b13a16b98772441879fcdcbe82ff50daa622d681dd682175ea918c"},
-    {file = "pydantic_core-2.18.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:0eb2a4f660fcd8e2b1c90ad566db2b98d7f3f4717c64fe0a83e0adb39766d5b8"},
-    {file = "pydantic_core-2.18.4-cp312-none-win32.whl", hash = "sha256:8b8bab4c97248095ae0c4455b5a1cd1cdd96e4e4769306ab19dda135ea4cdb07"},
-    {file = "pydantic_core-2.18.4-cp312-none-win_amd64.whl", hash = "sha256:14601cdb733d741b8958224030e2bfe21a4a881fb3dd6fbb21f071cabd48fa0a"},
-    {file = "pydantic_core-2.18.4-cp312-none-win_arm64.whl", hash = "sha256:c1322d7dd74713dcc157a2b7898a564ab091ca6c58302d5c7b4c07296e3fd00f"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-macosx_10_12_x86_64.whl", hash = "sha256:823be1deb01793da05ecb0484d6c9e20baebb39bd42b5d72636ae9cf8350dbd2"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ebef0dd9bf9b812bf75bda96743f2a6c5734a02092ae7f721c048d156d5fabae"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ae1d6df168efb88d7d522664693607b80b4080be6750c913eefb77e34c12c71a"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:f9899c94762343f2cc2fc64c13e7cae4c3cc65cdfc87dd810a31654c9b7358cc"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:99457f184ad90235cfe8461c4d70ab7dd2680e28821c29eca00252ba90308c78"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18f469a3d2a2fdafe99296a87e8a4c37748b5080a26b806a707f25a902c040a8"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7cdf28938ac6b8b49ae5e92f2735056a7ba99c9b110a474473fd71185c1af5d"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:938cb21650855054dc54dfd9120a851c974f95450f00683399006aa6e8abb057"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:44cd83ab6a51da80fb5adbd9560e26018e2ac7826f9626bc06ca3dc074cd198b"},
-    {file = "pydantic_core-2.18.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:972658f4a72d02b8abfa2581d92d59f59897d2e9f7e708fdabe922f9087773af"},
-    {file = "pydantic_core-2.18.4-cp38-none-win32.whl", hash = "sha256:1d886dc848e60cb7666f771e406acae54ab279b9f1e4143babc9c2258213daa2"},
-    {file = "pydantic_core-2.18.4-cp38-none-win_amd64.whl", hash = "sha256:bb4462bd43c2460774914b8525f79b00f8f407c945d50881568f294c1d9b4443"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-macosx_10_12_x86_64.whl", hash = "sha256:44a688331d4a4e2129140a8118479443bd6f1905231138971372fcde37e43528"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a2fdd81edd64342c85ac7cf2753ccae0b79bf2dfa063785503cb85a7d3593223"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:86110d7e1907ab36691f80b33eb2da87d780f4739ae773e5fc83fb272f88825f"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:46387e38bd641b3ee5ce247563b60c5ca098da9c56c75c157a05eaa0933ed154"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:123c3cec203e3f5ac7b000bd82235f1a3eced8665b63d18be751f115588fea30"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dc1803ac5c32ec324c5261c7209e8f8ce88e83254c4e1aebdc8b0a39f9ddb443"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:53db086f9f6ab2b4061958d9c276d1dbe3690e8dd727d6abf2321d6cce37fa94"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:abc267fa9837245cc28ea6929f19fa335f3dc330a35d2e45509b6566dc18be23"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:a0d829524aaefdebccb869eed855e2d04c21d2d7479b6cada7ace5448416597b"},
-    {file = "pydantic_core-2.18.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:509daade3b8649f80d4e5ff21aa5673e4ebe58590b25fe42fac5f0f52c6f034a"},
-    {file = "pydantic_core-2.18.4-cp39-none-win32.whl", hash = "sha256:ca26a1e73c48cfc54c4a76ff78df3727b9d9f4ccc8dbee4ae3f73306a591676d"},
-    {file = "pydantic_core-2.18.4-cp39-none-win_amd64.whl", hash = "sha256:c67598100338d5d985db1b3d21f3619ef392e185e71b8d52bceacc4a7771ea7e"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-macosx_10_12_x86_64.whl", hash = "sha256:574d92eac874f7f4db0ca653514d823a0d22e2354359d0759e3f6a406db5d55d"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:1f4d26ceb5eb9eed4af91bebeae4b06c3fb28966ca3a8fb765208cf6b51102ab"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77450e6d20016ec41f43ca4a6c63e9fdde03f0ae3fe90e7c27bdbeaece8b1ed4"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d323a01da91851a4f17bf592faf46149c9169d68430b3146dcba2bb5e5719abc"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:43d447dd2ae072a0065389092a231283f62d960030ecd27565672bd40746c507"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:578e24f761f3b425834f297b9935e1ce2e30f51400964ce4801002435a1b41ef"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:81b5efb2f126454586d0f40c4d834010979cb80785173d1586df845a632e4e6d"},
-    {file = "pydantic_core-2.18.4-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:ab86ce7c8f9bea87b9d12c7f0af71102acbf5ecbc66c17796cff45dae54ef9a5"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-macosx_10_12_x86_64.whl", hash = "sha256:90afc12421df2b1b4dcc975f814e21bc1754640d502a2fbcc6d41e77af5ec312"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:51991a89639a912c17bef4b45c87bd83593aee0437d8102556af4885811d59f5"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:293afe532740370aba8c060882f7d26cfd00c94cae32fd2e212a3a6e3b7bc15e"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b48ece5bde2e768197a2d0f6e925f9d7e3e826f0ad2271120f8144a9db18d5c8"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:eae237477a873ab46e8dd748e515c72c0c804fb380fbe6c85533c7de51f23a8f"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:834b5230b5dfc0c1ec37b2fda433b271cbbc0e507560b5d1588e2cc1148cf1ce"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e858ac0a25074ba4bce653f9b5d0a85b7456eaddadc0ce82d3878c22489fa4ee"},
-    {file = "pydantic_core-2.18.4-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:2fd41f6eff4c20778d717af1cc50eca52f5afe7805ee530a4fbd0bae284f16e9"},
-    {file = "pydantic_core-2.18.4.tar.gz", hash = "sha256:ec3beeada09ff865c344ff3bc2f427f5e6c26401cc6113d77e372c3fdac73864"},
-]
-
-[package.dependencies]
-typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0"
-
-[[package]]
-name = "pydantic-settings"
-version = "2.3.4"
-description = "Settings management using Pydantic"
-optional = false
-python-versions = ">=3.8"
-files = [
-    {file = "pydantic_settings-2.3.4-py3-none-any.whl", hash = "sha256:11ad8bacb68a045f00e4f862c7a718c8a9ec766aa8fd4c32e39a0594b207b53a"},
-    {file = "pydantic_settings-2.3.4.tar.gz", hash = "sha256:c5802e3d62b78e82522319bbc9b8f8ffb28ad1c988a99311d04f2a6051fca0a7"},
-]
-
-[package.dependencies]
-pydantic = ">=2.7.0"
-python-dotenv = ">=0.21.0"
-
-[package.extras]
-toml = ["tomli (>=2.0.1)"]
-yaml = ["pyyaml (>=6.0.1)"]
+dotenv = ["python-dotenv (>=0.10.4)"]
+email = ["email-validator (>=1.0.3)"]
 
 [[package]]
 name = "pyflakes"
@@ -2301,21 +2192,21 @@ testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "no
 
 [[package]]
 name = "pytest-asyncio"
-version = "0.23.7"
+version = "0.21.1"
 description = "Pytest support for asyncio"
 optional = false
-python-versions = ">=3.8"
+python-versions = ">=3.7"
 files = [
-    {file = "pytest_asyncio-0.23.7-py3-none-any.whl", hash = "sha256:009b48127fbe44518a547bddd25611551b0e43ccdbf1e67d12479f569832c20b"},
-    {file = "pytest_asyncio-0.23.7.tar.gz", hash = "sha256:5f5c72948f4c49e7db4f29f2521d4031f1c27f86e57b046126654083d4770268"},
+    {file = "pytest-asyncio-0.21.1.tar.gz", hash = "sha256:40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d"},
+    {file = "pytest_asyncio-0.21.1-py3-none-any.whl", hash = "sha256:8666c1c8ac02631d7c51ba282e0c69a8a452b211ffedf2599099845da5c5c37b"},
 ]
 
 [package.dependencies]
-pytest = ">=7.0.0,<9"
+pytest = ">=7.0.0"
 
 [package.extras]
 docs = ["sphinx (>=5.3)", "sphinx-rtd-theme (>=1.0)"]
-testing = ["coverage (>=6.2)", "hypothesis (>=5.7.1)"]
+testing = ["coverage (>=6.2)", "flaky (>=3.5.0)", "hypothesis (>=5.7.1)", "mypy (>=0.931)", "pytest-trio (>=0.7.0)"]
 
 [[package]]
 name = "pytest-cov"
@@ -2737,6 +2628,31 @@ exceptiongroup = {version = "*", markers = "python_version < \"3.11\""}
 trio = ">=0.11"
 wsproto = ">=0.14"
 
+[[package]]
+name = "types-requests"
+version = "2.31.0.6"
+description = "Typing stubs for requests"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "types-requests-2.31.0.6.tar.gz", hash = "sha256:cd74ce3b53c461f1228a9b783929ac73a666658f223e28ed29753771477b3bd0"},
+    {file = "types_requests-2.31.0.6-py3-none-any.whl", hash = "sha256:a2db9cb228a81da8348b49ad6db3f5519452dd20a9c1e1a868c83c5fe88fd1a9"},
+]
+
+[package.dependencies]
+types-urllib3 = "*"
+
+[[package]]
+name = "types-urllib3"
+version = "1.26.25.14"
+description = "Typing stubs for urllib3"
+optional = false
+python-versions = "*"
+files = [
+    {file = "types-urllib3-1.26.25.14.tar.gz", hash = "sha256:229b7f577c951b8c1b92c1bc2b2fdb0b49847bd2af6d1cc2a2e3dd340f3bda8f"},
+    {file = "types_urllib3-1.26.25.14-py3-none-any.whl", hash = "sha256:9683bbb7fb72e32bfe9d2be6e04875fbe1b3eeec3cbb4ea231435aa7fd6b4f0e"},
+]
+
 [[package]]
 name = "typing-extensions"
 version = "4.9.0"
@@ -2948,4 +2864,4 @@ multidict = ">=4.0"
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.10"
-content-hash = "26bd75befe5223095b65be293086edf52f34f9043e49107c80a105dc0387dd6a"
+content-hash = "4a980e6d8f54a2f7f6a3c55d4f40ac3a4b27b5ac6573dd2a39e11213a4b126dd"

benchmark/pyproject.toml

@@ -9,47 +9,43 @@ packages = [{ include = "agbenchmark" }]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-agent-protocol-client = {git = "https://github.com/Significant-Gravitas/agent-protocol.git", subdirectory = "packages/client/python"}
-click = "^8.1.3"
-click-default-group = "^1.2.4"
-colorama = "^0.4.6"
-fastapi = "^0.109.1"
-gitpython = "^3.1.32"
-httpx = "^0.24.0"
-matplotlib = "^3.7.2"
-# Multidict 6.0.4 fails to install and is a dependency of aiohttp which is a depenedency of agent-protocol-client
-multidict = "^6.0.5"
-networkx = "^3.1"
+pytest = "^7.3.2"
+requests = "^2.31.0"
 openai = "^1.7.2"
-pandas = "^2.0.3"
+pydantic = "^1.10.9"
+python-dotenv = "^1.0.0"
+click = "^8.1.3"
+types-requests = "^2.31.0.1"
 pexpect = "^4.8.0"
 psutil = "^5.9.5"
-pydantic = "^2.7.2"
-pydantic-settings = "^2.3.4"
-pytest = "^7.3.2"
-pytest-asyncio = "^0.23.3"
-python-dotenv = "^1.0.0"
-python-multipart = "^0.0.7"
+matplotlib = "^3.7.2"
+pandas = "^2.0.3"
+gitpython = "^3.1.32"
+networkx = "^3.1"
+colorama = "^0.4.6"
 pyvis = "^0.3.2"
-requests = "^2.31.0"
 selenium = "^4.11.2"
-tabulate = "^0.9.0"
+pytest-asyncio = "^0.21.1"
+uvicorn = "^0.23.2"
+fastapi = "^0.109.1"
+python-multipart = "^0.0.7"
 toml = "^0.10.2"
-uvicorn = ">=0.23.2,<1"
+# helicone = "^1.0.9"  # incompatible with openai@^1.0.0
+httpx = "^0.24.0"
+agent-protocol-client = "^1.1.0"
+click-default-group = "^1.2.4"
+tabulate = "^0.9.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "^23.12.1"
 flake8 = "^7.0.0"
 isort = "^5.13.1"
 pyright = "^1.1.364"
-pre-commit = "^3.3.3"
-
-# Testing
-pytest-cov = "^5.0.0"
-
-# Dependencies for stuff in reports/
+pandas = "^2.0.3"
 gspread = "^5.10.0"
 oauth2client = "^4.1.3"
+pre-commit = "^3.3.3"
+pytest-cov = "^5.0.0"
 
 [tool.poetry.scripts]
 agbenchmark = "agbenchmark.__main__:cli"

benchmark/reports/format.py

@@ -1,24 +1,20 @@
 #!/usr/bin/env python3
 
-from pathlib import Path
-
 import click
 
 from agbenchmark.reports.processing.report_types import Report
 
 
 @click.command()
-@click.argument(
-    "report_json_file", type=click.Path(exists=True, dir_okay=False, path_type=Path)
-)
-def print_markdown_report(report_json_file: Path):
+@click.argument("report_json_file", type=click.Path(exists=True, dir_okay=False))
+def print_markdown_report(report_json_file: str):
     """
     Generates a Markdown report from a given report.json file.
 
     :param report_json_file: Path to the report.json file.
     :return: A string containing the Markdown formatted report.
     """
-    report = Report.model_validate_json(report_json_file.read_text())
+    report = Report.parse_file(report_json_file)
 
     # Header and metadata
     click.echo("# Benchmark Report")

benchmark/reports/match_records.py

@@ -14,7 +14,7 @@ from pydantic import BaseModel, Field
 class Metrics(BaseModel):
     difficulty: str
     success: bool
-    success_percent: float = Field(alias="success_%")
+    success_percent: float = Field(..., alias="success_%")
     run_time: Optional[str] = None
     fail_reason: Optional[str] = None
     attempted: Optional[bool] = None
@@ -100,7 +100,7 @@ def get_reports():
                         # Load the JSON data from the file
                         json_data = json.load(f)
                         print(f"Processing {report_file}")
-                        report = Report.model_validate(json_data)
+                        report = Report.parse_obj(json_data)
 
                         for test_name, test_data in report.tests.items():
                             test_json = {

docs/content/AutoGPT/configuration/options.md

@@ -1,7 +1,6 @@
 # Configuration
 
-Configuration of sensitive settings such as API credentials is done through environment variables.
-You can set configuration variables via the `.env` file. If you don't have a `.env` file, create a copy of `.env.template` in your `AutoGPT` folder and name it `.env`.
+Configuration is controlled through the `Config` object. You can set configuration variables via the `.env` file. If you don't have a `.env` file, create a copy of `.env.template` in your `AutoGPT` folder and name it `.env`.
 
 ## Environment Variables
 
@@ -22,7 +21,7 @@ You can set configuration variables via the `.env` file. If you don't have a `.e
 - `GROQ_API_KEY`: Set this if you want to use Groq models with AutoGPT
 - `HUGGINGFACE_API_TOKEN`: HuggingFace API, to be used for both image generation and audio to text. Optional.
 - `HUGGINGFACE_IMAGE_MODEL`: HuggingFace model to use for image generation. Default: CompVis/stable-diffusion-v1-4
-- `OPENAI_API_KEY`: Set this if you want to use OpenAI models; [OpenAI API Key](https://platform.openai.com/account/api-keys).
+- `OPENAI_API_KEY`: *REQUIRED*- Your [OpenAI API Key](https://platform.openai.com/account/api-keys).
 - `OPENAI_ORGANIZATION`: Organization ID in OpenAI. Optional.
 - `PLAIN_OUTPUT`: Plain output, which disables the spinner. Default: False
 - `RESTRICT_TO_WORKSPACE`: The restrict file reading and writing to the workspace directory. Default: True
@@ -32,3 +31,4 @@ You can set configuration variables via the `.env` file. If you don't have a `.e
 - `TEMPERATURE`: Value of temperature given to OpenAI. Value from 0 to 2. Lower is more deterministic, higher is more random. See https://platform.openai.com/docs/api-reference/completions/create#completions/create-temperature
 - `TEXT_TO_SPEECH_PROVIDER`: Text to Speech Provider. Options are `gtts`, `macos`, `elevenlabs`, and `streamelements`. Default: gtts
 - `USE_AZURE`: Use Azure's LLM Default: False
+- `WIPE_REDIS_ON_START`: Wipes data / index on start. Default: True

docs/content/AutoGPT/setup/docker.md

@@ -71,25 +71,18 @@
           - ./logs:/app/logs
           ## uncomment following lines if you want to make use of these files
           ## you must have them existing in the same folder as this docker-compose.yml
-          ## component configuration file
-          #- type: bind
-          #  source: ./config.json
-          #  target: /app/config.json
     ```
     </details>
 
 
-1. Download [`.env.template`][.env.template] and save it as `.env` in the AutoGPT folder.
-2. Follow the standard [configuration instructions](../index.md#completing-the-setup),
+4. Download [`.env.template`][.env.template] and save it as `.env` in the AutoGPT folder.
+5. Follow the standard [configuration instructions](../index.md#completing-the-setup),
    from step 3 onwards and excluding `poetry install` steps.
-3. Pull the latest image from [Docker Hub]
+6. Pull the latest image from [Docker Hub]
 
     ```shell
     docker pull significantgravitas/auto-gpt
     ```
-4. _Optional: mount configuration file._
-      If you have component configuration file, for example `config.json`, place it in `autogpt/data/` directory. Or place it in `autogpt/` and uncomment the line in `docker-compose.yml` that mounts it.
-      To learn more about configuring, see [Component configuration](../../forge/components/components.md#json-configuration)
 
 !!! note "Docker only supports headless browsing"
     AutoGPT uses a browser in headless mode by default: `HEADLESS_BROWSER=True`.

docs/content/AutoGPT/setup/index.md

@@ -50,13 +50,7 @@ Since we don't ship AutoGPT as a desktop application, you'll need to download th
 ### Completing the Setup
 
 Once you have cloned or downloaded the project, you can find the AutoGPT Agent in the
-`autogpt/` folder.
-Inside this folder you can configure the AutoGPT application with an `.env` file and (optionally) a JSON configuration file:
-
-- `.env` for environment variables, which are mostly used for sensitive data like API keys
-- a JSON configuration file to customize certain features of AutoGPT's [Components](../../forge/components/introduction.md)
-
-See the [Configuration](../configuration/options.md) reference for a list of available environment variables.
+`autogpt/` folder. In this folder:
 
 1. Find the file named `.env.template`. This file may
     be hidden by default in some operating systems due to the dot prefix. To reveal
@@ -77,9 +71,6 @@ See the [Configuration](../configuration/options.md) reference for a list of ava
 6. Save and close the `.env` file.
 7. _Optional: run `poetry install` to install all required dependencies._ The
     application also checks for and installs any required dependencies when it starts.
-8. _Optional: configure the JSON file (e.g. `config.json`) with your desired settings._
-    The application will use default settings if you don't provide a JSON configuration file.
-    Learn how to [set up the JSON configuration file](../../forge/components/components.md#json-configuration)
 
 You should now be able to explore the CLI (`./autogpt.sh --help`) and run the application.
 
@@ -88,6 +79,7 @@ See the [user guide](../usage.md) for further instructions.
 [show hidden files/Windows]: https://support.microsoft.com/en-us/windows/view-hidden-files-and-folders-in-windows-97fbc472-c603-9d90-91d0-1166d1d9f4b5
 [show hidden files/macOS]: https://www.pcmag.com/how-to/how-to-access-your-macs-hidden-files
 
+
 ## Setting up LLM providers
 
 You can use AutoGPT with any of the following LLM providers.

docs/content/forge/components/built-in-components.md

@@ -1,25 +1,25 @@
 # Built-in Components
 
 This page lists all [🧩 Components](./components.md) and [⚙️ Protocols](./protocols.md) they implement that are natively provided. They are used by the AutoGPT agent.
-Some components have additional configuration options listed in the table, see [Component configuration](./components.md/#component-configuration) to learn more.
+Some components have additional configuration options listed in the table, see [Component configuration](./components.md/#ordering-components) to learn more.
 
 !!! note
-    If a configuration field uses environment variable, it still can be passed using configuration model. ### Value from the configuration takes precedence over env var! Env var will be only applied if value in the configuration is not set.
+    If a configuration field uses environment variable, it still can be passed using configuration model. **Value from the configuration takes precedence over env var!** Env var will be only applied if value in the configuration is not set.
 
 ## `SystemComponent`
 
 Essential component to allow an agent to finish.
 
-### DirectiveProvider
+**DirectiveProvider**
 
 - Constraints about API budget
-
-### MessageProvider
+  
+**MessageProvider**
 
 - Current time and date
 - Remaining API budget and warnings if budget is low
 
-### CommandProvider
+**CommandProvider**
 
 - `finish` used when task is completed
 
@@ -27,7 +27,7 @@ Essential component to allow an agent to finish.
 
 Adds ability to interact with user in CLI.
 
-### CommandProvider
+**CommandProvider**
 
 - `ask_user` used to ask user for input
 
@@ -36,20 +36,18 @@ Adds ability to interact with user in CLI.
 Adds ability to read and write persistent files to local storage, Google Cloud Storage or Amazon's S3.
 Necessary for saving and loading agent's state (preserving session).
 
-### `FileManagerConfiguration`
-
 | Config variable  | Details                                | Type  | Default                            |
 | ---------------- | -------------------------------------- | ----- | ---------------------------------- |
-| `storage_path`     | Path to agent files, e.g. state        | `str` | `agents/{agent_id}/`[^1]           |
+| `files_path`     | Path to agent files, e.g. state        | `str` | `agents/{agent_id}/`[^1]           |
 | `workspace_path` | Path to files that agent has access to | `str` | `agents/{agent_id}/workspace/`[^1] |
 
 [^1] This option is set dynamically during component construction as opposed to by default inside the configuration model, `{agent_id}` is replaced with the agent's unique identifier.
 
-### DirectiveProvider
+**DirectiveProvider**
 
 - Resource information that it's possible to read and write files
 
-### CommandProvider
+**CommandProvider**
 
 - `read_file` used to read file
 - `write_file` used to write file
@@ -59,8 +57,6 @@ Necessary for saving and loading agent's state (preserving session).
 
 Lets the agent execute non-interactive Shell commands and Python code. Python execution works only if Docker is available.
 
-### `CodeExecutorConfiguration`
-
 | Config variable          | Details                                              | Type                        | Default           |
 | ------------------------ | ---------------------------------------------------- | --------------------------- | ----------------- |
 | `execute_local_commands` | Enable shell command execution                       | `bool`                      | `False`           |
@@ -69,7 +65,7 @@ Lets the agent execute non-interactive Shell commands and Python code. Python ex
 | `shell_denylist`         | List of prohibited shell commands                    | `List[str]`                 | `[]`              |
 | `docker_container_name`  | Name of the Docker container used for code execution | `str`                       | `"agent_sandbox"` |
 
-### CommandProvider
+**CommandProvider**
 
 - `execute_shell` execute shell command
 - `execute_shell_popen` execute shell command with popen
@@ -80,28 +76,25 @@ Lets the agent execute non-interactive Shell commands and Python code. Python ex
 
 Keeps track of agent's actions and their outcomes. Provides their summary to the prompt.
 
-### `ActionHistoryConfiguration`
-
 | Config variable        | Details                                                 | Type        | Default            |
 | ---------------------- | ------------------------------------------------------- | ----------- | ------------------ |
 | `model_name`           | Name of the llm model used to compress the history      | `ModelName` | `"gpt-3.5-turbo"`  |
 | `max_tokens`           | Maximum number of tokens to use for the history summary | `int`       | `1024`             |
 | `spacy_language_model` | Language model used for summary chunking using spacy    | `str`       | `"en_core_web_sm"` |
-| `full_message_count`   | Number of cycles to include unsummarized in the prompt  | `int`       | `4`                |
 
-### MessageProvider
+**MessageProvider**
 
 - Agent's progress summary
 
-### AfterParse
+**AfterParse**
 
 - Register agent's action
 
-### ExecutionFailure
+**ExecutionFailure**
 
 - Rewinds the agent's action, so it isn't saved
 
-### AfterExecute
+**AfterExecute**
 
 - Saves the agent's action result in the history
 
@@ -109,14 +102,12 @@ Keeps track of agent's actions and their outcomes. Provides their summary to the
 
 Adds ability to iteract with git repositories and GitHub.
 
-### `GitOperationsConfiguration`
-
 | Config variable   | Details                                   | Type  | Default |
 | ----------------- | ----------------------------------------- | ----- | ------- |
 | `github_username` | GitHub username, *ENV:* `GITHUB_USERNAME` | `str` | `None`  |
 | `github_api_key`  | GitHub API key, *ENV:* `GITHUB_API_KEY`   | `str` | `None`  |
 
-### CommandProvider
+**CommandProvider**
 
 - `clone_repository` used to clone a git repository
 
@@ -131,9 +122,7 @@ Link to the appropriate settings page: [Hugging Face > Settings > Tokens](https:
 
 ### Stable Diffusion WebUI
 
-It is possible to use your own self-hosted Stable Diffusion WebUI with AutoGPT. ### Make sure you are running WebUI with `--api` enabled.
-
-### `ImageGeneratorConfiguration`
+It is possible to use your own self-hosted Stable Diffusion WebUI with AutoGPT. **Make sure you are running WebUI with `--api` enabled.**
 
 | Config variable           | Details                                                       | Type                                    | Default                           |
 | ------------------------- | ------------------------------------------------------------- | --------------------------------------- | --------------------------------- |
@@ -145,7 +134,7 @@ It is possible to use your own self-hosted Stable Diffusion WebUI with AutoGPT.
 
 [available models]: https://huggingface.co/models?pipeline_tag=text-to-image
 
-### CommandProvider
+**CommandProvider**
 
 - `generate_image` used to generate an image given a prompt
 
@@ -153,19 +142,17 @@ It is possible to use your own self-hosted Stable Diffusion WebUI with AutoGPT.
 
 Allows agent to search the web. Google credentials aren't required for DuckDuckGo. [Instructions how to set up Google API key](../../AutoGPT/configuration/search.md)
 
-### `WebSearchConfiguration`
-
 | Config variable                  | Details                                                                 | Type  | Default |
 | -------------------------------- | ----------------------------------------------------------------------- | ----- | ------- |
 | `google_api_key`                 | Google API key, *ENV:* `GOOGLE_API_KEY`                                 | `str` | `None`  |
 | `google_custom_search_engine_id` | Google Custom Search Engine ID, *ENV:* `GOOGLE_CUSTOM_SEARCH_ENGINE_ID` | `str` | `None`  |
 | `duckduckgo_max_attempts`        | Maximum number of attempts to search using DuckDuckGo                   | `int` | `3`     |
 
-### DirectiveProvider
+**DirectiveProvider**
 
 - Resource information that it's possible to search the web
 
-### CommandProvider
+**CommandProvider**
 
 - `search_web` used to search the web using DuckDuckGo
 - `google` used to search the web using Google, requires API key
@@ -174,8 +161,6 @@ Allows agent to search the web. Google credentials aren't required for DuckDuckG
 
 Allows agent to read websites using Selenium.
 
-### `WebSeleniumConfiguration`
-
 | Config variable               | Details                                     | Type                                          | Default                                                                                                                      |
 | ----------------------------- | ------------------------------------------- | --------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- |
 | `model_name`                  | Name of the llm model used to read websites | `ModelName`                                   | `"gpt-3.5-turbo"`                                                                                                            |
@@ -184,11 +169,11 @@ Allows agent to read websites using Selenium.
 | `user_agent`                  | User agent used by the browser              | `str`                                         | `"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36"` |
 | `browse_spacy_language_model` | Spacy language model used for chunking text | `str`                                         | `"en_core_web_sm"`                                                                                                           |
 
-### DirectiveProvider
+**DirectiveProvider**
 
 - Resource information that it's possible to read websites
 
-### CommandProvider
+**CommandProvider**
 
 - `read_website` used to read a specific url and look for specific topics or answer a question
 
@@ -196,11 +181,11 @@ Allows agent to read websites using Selenium.
 
 Adds ability to keep up-to-date file and folder content in the prompt.
 
-### MessageProvider
+**MessageProvider**
 
 - Content of elements in the context
 
-### CommandProvider
+**CommandProvider**
 
 - `open_file` used to open a file into context
 - `open_folder` used to open a folder into context
@@ -210,6 +195,6 @@ Adds ability to keep up-to-date file and folder content in the prompt.
 
 Watches if agent is looping and switches to smart mode if necessary.
 
-### AfterParse
+**AfterParse**
 
 - Investigates what happened and switches to smart mode if necessary

docs/content/forge/components/creating-components.md

@@ -37,7 +37,7 @@ Since components are regular classes you can pass data (including other componen
 For example we can pass a config object and then retrieve an API key from it when needed:
 
 ```py
-class DataComponent(MessageProvider):
+class ConfigurableComponent(MessageProvider):
     def __init__(self, config: Config):
         self.config = config
 
@@ -51,35 +51,6 @@ class DataComponent(MessageProvider):
 !!! note
     Component-specific configuration handling isn't implemented yet.
 
-## Configuring components
-
-Components can be configured using a pydantic model.
-To make component configurable, it must inherit from `ConfigurableComponent[BM]` where `BM` is the configuration class inheriting from pydantic's `BaseModel`.
-You should pass the configuration instance to the `ConfigurableComponent`'s `__init__` or set its `config` property directly.
-Using configuration allows you to load confugration from a file, and also serialize and deserialize it easily for any agent.
-To learn more about configuration, including storing sensitive information and serialization see [Component Configuration](./components.md#component-configuration).
-
-```py
-# Example component configuration
-class UserGreeterConfiguration(BaseModel):
-    user_name: str
-
-class UserGreeterComponent(MessageProvider, ConfigurableComponent[UserGreeterConfiguration]):
-    def __init__(self):
-        # Creating configuration instance
-        # You could also pass it to the component constructor
-        # e.g. `def __init__(self, config: UserGreeterConfiguration):`
-        config = UserGreeterConfiguration(user_name="World")
-        # Passing the configuration instance to the parent class
-        UserGreeterComponent.__init__(self, config)
-        # This has the same effect as the line above:
-        # self.config = UserGreeterConfiguration(user_name="World")
-
-    def get_messages(self) -> Iterator[ChatMessage]:
-        # You can use the configuration like a regular model
-        yield ChatMessage.system(f"Hello, {self.config.user_name}!")
-```
-
 ## Providing commands
 
 To extend what an agent can do, you need to provide commands using `CommandProvider` protocol. For example to allow agent to multiply two numbers, you can create a component like this:

docs/content/forge/components/introduction.md

@@ -10,7 +10,7 @@ This guide explains the component-based architecture of AutoGPT agents. It's a n
 
 Agent is composed of *components*, and each *component* implements a range of *protocols* (interfaces), each one providing a specific functionality, e.g. additional commands or messages. Each *protocol* is handled in a specific order, defined by the agent. This allows for a clear separation of concerns and a more modular design.
 
-This system is simple, flexible, and doesn't hide any data - anything can still be passed or accessed directly from or between components.
+This system is simple, flexible, requires basically no configuration, and doesn't hide any data - anything can still be passed or accessed directly from or between components.
 
 ### Definitions & Guides
 

docs/content/forge/get-started.md

@@ -19,16 +19,16 @@ Forge is a ready-to-go template for *your* agent application. All the boilerplat
 
 ### 🚀 **Get Started!**
 
-The best way to get started is to fork or download the AutoGPT repository and look at the example agent in `forge/forge/agent/forge_agent.py`.
-This can work as a starting point for your own agent.
-Agents are built using *components* which provide different functionality, see the [Component Introduction](./components/introduction.md). You can find built-in components in `forge/forge/components/`.
-
-!!! warning
-    The tutorial series below is out of date.
-
 The getting started [tutorial series](https://aiedge.medium.com/autogpt-forge-e3de53cc58ec) will guide you through the process of setting up your project all the way through to building a generalist agent.  
 
 1. [AutoGPT Forge: A Comprehensive Guide to Your First Steps](https://aiedge.medium.com/autogpt-forge-a-comprehensive-guide-to-your-first-steps-a1dfdf46e3b4)
 2. [AutoGPT Forge: The Blueprint of an AI Agent](https://aiedge.medium.com/autogpt-forge-the-blueprint-of-an-ai-agent-75cd72ffde6)
 3. [AutoGPT Forge: Interacting with your Agent](https://aiedge.medium.com/autogpt-forge-interacting-with-your-agent-1214561b06b)
 4. [AutoGPT Forge: Crafting Intelligent Agent Logic](https://medium.com/@aiedge/autogpt-forge-crafting-intelligent-agent-logic-bc5197b14cb4)
+
+Coming soon:
+
+5. Interacting with and Benchmarking your Agent
+6. Abilities
+7. The Planning Loop
+8. Memories

forge/conftest.py

@@ -1,41 +0,0 @@
-import uuid
-from pathlib import Path
-
-import pytest
-
-from forge.file_storage.base import FileStorage, FileStorageConfiguration
-from forge.file_storage.local import LocalFileStorage
-
-pytest_plugins = [
-    "tests.vcr",
-]
-
-
-@pytest.fixture(scope="session", autouse=True)
-def load_env_vars():
-    from dotenv import load_dotenv
-
-    load_dotenv()
-
-
-@pytest.fixture()
-def tmp_project_root(tmp_path: Path) -> Path:
-    return tmp_path
-
-
-@pytest.fixture()
-def app_data_dir(tmp_project_root: Path) -> Path:
-    dir = tmp_project_root / "data"
-    dir.mkdir(parents=True, exist_ok=True)
-    return dir
-
-
-@pytest.fixture()
-def storage(app_data_dir: Path) -> FileStorage:
-    storage = LocalFileStorage(
-        FileStorageConfiguration(
-            root=Path(f"{app_data_dir}/{str(uuid.uuid4())}"), restrict_to_root=False
-        )
-    )
-    storage.initialize()
-    return storage

forge/forge/agent/base.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import copy
 import inspect
+import json
 import logging
 from abc import ABCMeta, abstractmethod
 from typing import (
@@ -18,8 +19,7 @@ from typing import (
 )
 
 from colorama import Fore
-from pydantic import BaseModel, Field, ValidationInfo, field_validator
-from pydantic_core import from_json, to_json
+from pydantic import BaseModel, Field, parse_raw_as, validator
 
 from forge.agent import protocols
 from forge.agent.components import (
@@ -47,6 +47,11 @@ DEFAULT_TRIGGERING_PROMPT = (
 )
 
 
+# HACK: This is a workaround wrapper to de/serialize component configs until pydantic v2
+class ModelContainer(BaseModel):
+    models: dict[str, BaseModel]
+
+
 class BaseAgentConfiguration(SystemConfiguration):
     allow_fs_access: bool = UserConfigurable(default=False)
 
@@ -72,10 +77,10 @@ class BaseAgentConfiguration(SystemConfiguration):
     `0` to stop the agent.
     """
 
-    cycles_remaining: int = cycle_budget
+    cycles_remaining = cycle_budget
     """The number of cycles remaining within the `cycle_budget`."""
 
-    cycle_count: int = 0
+    cycle_count = 0
     """The number of cycles that the agent has run since its initialization."""
 
     send_token_limit: Optional[int] = None
@@ -84,11 +89,11 @@ class BaseAgentConfiguration(SystemConfiguration):
     defaults to 75% of `llm.max_tokens`.
     """
 
-    @field_validator("use_functions_api")
-    def validate_openai_functions(cls, value: bool, info: ValidationInfo):
-        if value:
-            smart_llm = info.data["smart_llm"]
-            fast_llm = info.data["fast_llm"]
+    @validator("use_functions_api")
+    def validate_openai_functions(cls, v: bool, values: dict[str, Any]):
+        if v:
+            smart_llm = values["smart_llm"]
+            fast_llm = values["fast_llm"]
             assert all(
                 [
                     not any(s in name for s in {"-0301", "-0314"})
@@ -98,7 +103,7 @@ class BaseAgentConfiguration(SystemConfiguration):
                 f"Model {smart_llm} does not support OpenAI Functions. "
                 "Please disable OPENAI_FUNCTIONS or choose a suitable model."
             )
-        return value
+        return v
 
 
 class BaseAgentSettings(SystemSettings):
@@ -272,15 +277,17 @@ class BaseAgent(Generic[AnyProposal], metaclass=AgentMeta):
         return method_result
 
     def dump_component_configs(self) -> str:
-        configs: dict[str, Any] = {}
+        configs = {}
         for component in self.components:
             if isinstance(component, ConfigurableComponent):
                 config_type_name = component.config.__class__.__name__
                 configs[config_type_name] = component.config
-        return to_json(configs).decode()
+        data = ModelContainer(models=configs).json()
+        raw = parse_raw_as(dict[str, dict[str, Any]], data)
+        return json.dumps(raw["models"], indent=4)
 
     def load_component_configs(self, serialized_configs: str):
-        configs_dict: dict[str, dict[str, Any]] = from_json(serialized_configs)
+        configs_dict = parse_raw_as(dict[str, dict[str, Any]], serialized_configs)
 
         for component in self.components:
             if not isinstance(component, ConfigurableComponent):
@@ -290,7 +297,7 @@ class BaseAgent(Generic[AnyProposal], metaclass=AgentMeta):
             if config_type_name in configs_dict:
                 # Parse the serialized data and update the existing config
                 updated_data = configs_dict[config_type_name]
-                data = {**component.config.model_dump(), **updated_data}
+                data = {**component.config.dict(), **updated_data}
                 component.config = component.config.__class__(**data)
 
     def _collect_components(self):
@@ -346,7 +353,7 @@ class BaseAgent(Generic[AnyProposal], metaclass=AgentMeta):
                 copied_item = item.copy()
             elif isinstance(item, BaseModel):
                 # Deep copy for Pydantic models (deep=True to also copy nested models)
-                copied_item = item.model_copy(deep=True)
+                copied_item = item.copy(deep=True)
             else:
                 # Deep copy for other objects
                 copied_item = copy.deepcopy(item)

forge/forge/agent/components.py

@@ -67,7 +67,7 @@ class ConfigurableComponent(ABC, Generic[BM]):
         if not hasattr(self, "_config") or self._config is None:
             # Load configuration from environment variables
             updated = _update_user_config_from_env(config)
-            config = self.config_class(**deep_update(config.model_dump(), updated))
+            config = self.config_class(**deep_update(config.dict(), updated))
         self._config = config
 
 

forge/forge/agent/forge_agent.py

@@ -24,7 +24,7 @@ from forge.config.ai_profile import AIProfile
 from forge.file_storage.base import FileStorage
 from forge.llm.prompting.schema import ChatPrompt
 from forge.llm.prompting.utils import dump_prompt
-from forge.llm.providers.schema import AssistantChatMessage, AssistantFunctionCall
+from forge.llm.providers.schema import AssistantFunctionCall
 from forge.llm.providers.utils import function_specs_from_commands
 from forge.models.action import (
     ActionErrorResult,
@@ -149,7 +149,7 @@ class ForgeAgent(ProtocolAgent, BaseAgent):
         self.reset_trace()
 
         # Get directives
-        directives = self.state.directives.model_copy(deep=True)
+        directives = self.state.directives.copy(deep=True)
         directives.resources += await self.run_pipeline(DirectiveProvider.get_resources)
         directives.constraints += await self.run_pipeline(
             DirectiveProvider.get_constraints
@@ -178,9 +178,6 @@ class ForgeAgent(ProtocolAgent, BaseAgent):
             use_tool=AssistantFunctionCall(
                 name="finish", arguments={"reason": "Unimplemented logic"}
             ),
-            raw_message=AssistantChatMessage(
-                content="finish(reason='Unimplemented logic')"
-            ),
         )
 
         self.config.cycle_count += 1

forge/forge/agent_protocol/agent_test.py

@@ -12,9 +12,9 @@ from .models.task import StepRequestBody, Task, TaskListResponse, TaskRequestBod
 
 
 @pytest.fixture
-def agent(tmp_project_root: Path):
+def agent(test_workspace: Path):
     db = AgentDB("sqlite:///test.db")
-    config = FileStorageConfiguration(root=tmp_project_root)
+    config = FileStorageConfiguration(root=test_workspace)
     workspace = LocalFileStorage(config)
     return ProtocolAgent(db, workspace)
 

forge/forge/agent_protocol/models/artifact.py

@@ -1,34 +1,38 @@
 from datetime import datetime
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, Field
 
 
 class Artifact(BaseModel):
     created_at: datetime = Field(
+        ...,
         description="The creation datetime of the task.",
-        examples=["2023-01-01T00:00:00Z"],
-    )
-    modified_at: datetime = Field(
-        description="The modification datetime of the task.",
-        examples=["2023-01-01T00:00:00Z"],
-    )
-    artifact_id: str = Field(
-        description="ID of the artifact.",
-        examples=["b225e278-8b4c-4f99-a696-8facf19f0e56"],
-    )
-    agent_created: bool = Field(
-        description="Whether the artifact has been created by the agent.",
-        examples=[False],
-    )
-    relative_path: str = Field(
-        description="Relative path of the artifact in the agents workspace.",
-        examples=["/my_folder/my_other_folder/"],
-    )
-    file_name: str = Field(
-        description="Filename of the artifact.",
-        examples=["main.py"],
-    )
-
-    model_config = ConfigDict(
+        example="2023-01-01T00:00:00Z",
         json_encoders={datetime: lambda v: v.isoformat()},
     )
+    modified_at: datetime = Field(
+        ...,
+        description="The modification datetime of the task.",
+        example="2023-01-01T00:00:00Z",
+        json_encoders={datetime: lambda v: v.isoformat()},
+    )
+    artifact_id: str = Field(
+        ...,
+        description="ID of the artifact.",
+        example="b225e278-8b4c-4f99-a696-8facf19f0e56",
+    )
+    agent_created: bool = Field(
+        ...,
+        description="Whether the artifact has been created by the agent.",
+        example=False,
+    )
+    relative_path: str = Field(
+        ...,
+        description="Relative path of the artifact in the agents workspace.",
+        example="/my_folder/my_other_folder/",
+    )
+    file_name: str = Field(
+        ...,
+        description="Filename of the artifact.",
+        example="main.py",
+    )

forge/forge/agent_protocol/models/pagination.py

@@ -2,7 +2,7 @@ from pydantic import BaseModel, Field
 
 
 class Pagination(BaseModel):
-    total_items: int = Field(description="Total number of items.", examples=[42])
-    total_pages: int = Field(description="Total number of pages.", examples=[97])
-    current_page: int = Field(description="Current_page page number.", examples=[1])
-    page_size: int = Field(description="Number of items per page.", examples=[25])
+    total_items: int = Field(..., description="Total number of items.", example=42)
+    total_pages: int = Field(..., description="Total number of pages.", example=97)
+    current_page: int = Field(..., description="Current_page page number.", example=1)
+    page_size: int = Field(..., description="Number of items per page.", example=25)

forge/forge/agent_protocol/models/task.py

@@ -4,7 +4,7 @@ from datetime import datetime
 from enum import Enum
 from typing import Any, List, Optional
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, Field
 
 from .artifact import Artifact
 from .pagination import Pagination
@@ -12,48 +12,48 @@ from .pagination import Pagination
 
 class TaskRequestBody(BaseModel):
     input: str = Field(
+        ...,
         min_length=1,
         description="Input prompt for the task.",
-        examples=["Write the words you receive to the file 'output.txt'."],
+        example="Write the words you receive to the file 'output.txt'.",
     )
     additional_input: dict[str, Any] = Field(default_factory=dict)
 
 
 class Task(TaskRequestBody):
     created_at: datetime = Field(
+        ...,
         description="The creation datetime of the task.",
-        examples=["2023-01-01T00:00:00Z"],
+        example="2023-01-01T00:00:00Z",
+        json_encoders={datetime: lambda v: v.isoformat()},
     )
     modified_at: datetime = Field(
+        ...,
         description="The modification datetime of the task.",
-        examples=["2023-01-01T00:00:00Z"],
+        example="2023-01-01T00:00:00Z",
+        json_encoders={datetime: lambda v: v.isoformat()},
     )
     task_id: str = Field(
+        ...,
         description="The ID of the task.",
-        examples=["50da533e-3904-4401-8a07-c49adf88b5eb"],
+        example="50da533e-3904-4401-8a07-c49adf88b5eb",
     )
     artifacts: list[Artifact] = Field(
         default_factory=list,
         description="A list of artifacts that the task has produced.",
-        examples=[
+        example=[
             "7a49f31c-f9c6-4346-a22c-e32bc5af4d8e",
             "ab7b4091-2560-4692-a4fe-d831ea3ca7d6",
         ],
     )
 
-    model_config = ConfigDict(
-        json_encoders={datetime: lambda v: v.isoformat()},
-    )
-
 
 class StepRequestBody(BaseModel):
     name: Optional[str] = Field(
-        default=None,
-        description="The name of the task step.",
-        examples=["Write to file"],
+        default=None, description="The name of the task step.", example="Write to file"
     )
     input: str = Field(
-        description="Input prompt for the step.", examples=["Washington"]
+        ..., description="Input prompt for the step.", example="Washington"
     )
     additional_input: dict[str, Any] = Field(default_factory=dict)
 
@@ -66,44 +66,40 @@ class StepStatus(Enum):
 
 class Step(StepRequestBody):
     created_at: datetime = Field(
+        ...,
         description="The creation datetime of the task.",
-        examples=[
-            "2023-01-01T00:00:00Z",
-        ],
+        example="2023-01-01T00:00:00Z",
+        json_encoders={datetime: lambda v: v.isoformat()},
     )
     modified_at: datetime = Field(
+        ...,
         description="The modification datetime of the task.",
-        examples=[
-            "2023-01-01T00:00:00Z",
-        ],
+        example="2023-01-01T00:00:00Z",
+        json_encoders={datetime: lambda v: v.isoformat()},
     )
     task_id: str = Field(
+        ...,
         description="The ID of the task this step belongs to.",
-        examples=[
-            "50da533e-3904-4401-8a07-c49adf88b5eb",
-        ],
+        example="50da533e-3904-4401-8a07-c49adf88b5eb",
     )
     step_id: str = Field(
+        ...,
         description="The ID of the task step.",
-        examples=[
-            "6bb1801a-fd80-45e8-899a-4dd723cc602e",
-        ],
+        example="6bb1801a-fd80-45e8-899a-4dd723cc602e",
     )
     name: Optional[str] = Field(
-        default=None,
-        description="The name of the task step.",
-        examples=["Write to file"],
+        default=None, description="The name of the task step.", example="Write to file"
     )
     status: StepStatus = Field(
-        description="The status of the task step.", examples=["created"]
+        ..., description="The status of the task step.", example="created"
     )
     output: Optional[str] = Field(
         default=None,
         description="Output of the task step.",
-        examples=[
+        example=(
             "I am going to use the write_to_file command and write Washington "
             "to a file called output.txt <write_to_file('output.txt', 'Washington')"
-        ],
+        ),
     )
     additional_output: Optional[dict[str, Any]] = None
     artifacts: list[Artifact] = Field(
@@ -111,11 +107,7 @@ class Step(StepRequestBody):
         description="A list of artifacts that the step has produced.",
     )
     is_last: bool = Field(
-        description="Whether this is the last step in the task.", examples=[True]
-    )
-
-    model_config = ConfigDict(
-        json_encoders={datetime: lambda v: v.isoformat()},
+        ..., description="Whether this is the last step in the task.", example=True
     )
 
 

forge/forge/components/README.md

@@ -33,7 +33,7 @@ class MyAgent(BaseAgent):
 ## Component configuration
 
 Each component can have its own configuration defined using a regular pydantic `BaseModel`.
-To ensure the configuration is loaded from the file correctly, the component must inherit from `ConfigurableComponent[BM]` where `BM` is the configuration model it uses.
+To ensure the configuration is loaded from the file correctly, the component must inherit from `ConfigurableComponent[T]` where `T` is the configuration model it uses.
 `ConfigurableComponent` provides a `config` attribute that holds the configuration instance.
 It's possible to either set the `config` attribute directly or pass the configuration instance to the component's constructor.
 Extra configuration (i.e. for components that are not part of the agent) can be passed and will be silently ignored. Extra config won't be applied even if the component is added later.
@@ -72,73 +72,6 @@ class SensitiveConfig(BaseModel):
     api_key: SecretStr = UserConfigurable(from_env="API_KEY", exclude=True)
 ```
 
-### Configuration serialization
-
-`BaseAgent` provides two methods:
-1. `dump_component_configs`: Serializes all components' configurations as json string.
-1. `load_component_configs`: Deserializes json string to configuration and applies it.
-
-### JSON configuration
-
-You can specify a JSON file (e.g. `config.json`) to use for the configuration when launching an agent.
-This file contains settings for individual [Components](../components/introduction.md) that AutoGPT uses.
-To specify the file use `--component-config-file` CLI option, for example to use `config.json`:
-
-```shell
-./autogpt.sh run --component-config-file config.json
-```
-
-!!! note
-    If you're using Docker to run AutoGPT, you need to mount or copy the configuration file to the container.
-    See [Docker Guide](../../AutoGPT/setup/docker.md) for more information.
-
-### Example JSON configuration
-
-You can copy configuration you want to change, for example to `autogpt/config.json` and modify it to your needs.
-*Most configuration has default values, it's better to set only values you want to modify.*
-You can see the available configuration fields and default values in [Build-in Components](./built-in-components.md).
-You can set sensitive variables in the `.json` file as well but it's recommended to use environment variables instead.
-
-```json
-{
-    "CodeExecutorConfiguration": {
-        "execute_local_commands": false,
-        "shell_command_control": "allowlist",
-        "shell_allowlist": ["cat", "echo"],
-        "shell_denylist": [],
-        "docker_container_name": "agent_sandbox"
-    },
-    "FileManagerConfiguration": {
-        "storage_path": "agents/AutoGPT/",
-        "workspace_path": "agents/AutoGPT/workspace"
-    },
-    "GitOperationsConfiguration": {
-        "github_username": null
-    },
-    "ActionHistoryConfiguration": {
-        "model_name": "gpt-3.5-turbo",
-        "max_tokens": 1024,
-        "spacy_language_model": "en_core_web_sm"
-    },
-    "ImageGeneratorConfiguration": {
-        "image_provider": "dalle",
-        "huggingface_image_model": "CompVis/stable-diffusion-v1-4",
-        "sd_webui_url": "http://localhost:7860"
-    },
-    "WebSearchConfiguration": {
-        "duckduckgo_max_attempts": 3
-    },
-    "WebSeleniumConfiguration": {
-        "model_name": "gpt-3.5-turbo",
-        "web_browser": "chrome",
-        "headless": true,
-        "user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.97 Safari/537.36",
-        "browse_spacy_language_model": "en_core_web_sm"
-    }
-}
-
-```
-
 ## Ordering components
 
 The execution order of components is important because some may depend on the results of the previous ones.

forge/forge/components/action_history/action_history.py

@@ -10,7 +10,6 @@ from forge.llm.prompting.utils import indent
 from forge.llm.providers import ChatMessage, MultiProvider
 from forge.llm.providers.multi import ModelName
 from forge.llm.providers.openai import OpenAIModelName
-from forge.llm.providers.schema import ToolResultMessage
 
 from .model import ActionResult, AnyProposal, Episode, EpisodicActionHistory
 
@@ -22,8 +21,6 @@ class ActionHistoryConfiguration(BaseModel):
     """Maximum number of tokens to use up with generated history messages"""
     spacy_language_model: str = "en_core_web_sm"
     """Language model used for summary chunking using spacy"""
-    full_message_count: int = 4
-    """Number of latest non-summarized messages to include in the history"""
 
 
 class ActionHistoryComponent(
@@ -49,47 +46,12 @@ class ActionHistoryComponent(
         self.llm_provider = llm_provider
 
     def get_messages(self) -> Iterator[ChatMessage]:
-        messages: list[ChatMessage] = []
-        step_summaries: list[str] = []
-        tokens: int = 0
-        n_episodes = len(self.event_history.episodes)
-
-        # Include a summary for all except a few latest steps
-        for i, episode in enumerate(reversed(self.event_history.episodes)):
-            # Use full format for a few steps, summary or format for older steps
-            if i < self.config.full_message_count:
-                messages.insert(0, episode.action.raw_message)
-                tokens += self.count_tokens(str(messages[0]))  # HACK
-                if episode.result:
-                    result_message = self._make_result_message(episode, episode.result)
-                    messages.insert(1, result_message)
-                    tokens += self.count_tokens(str(result_message))  # HACK
-                continue
-            elif episode.summary is None:
-                step_content = indent(episode.format(), 2).strip()
-            else:
-                step_content = episode.summary
-
-            step = f"* Step {n_episodes - i}: {step_content}"
-
-            if self.config.max_tokens and self.count_tokens:
-                step_tokens = self.count_tokens(step)
-                if tokens + step_tokens > self.config.max_tokens:
-                    break
-                tokens += step_tokens
-
-            step_summaries.insert(0, step)
-
-        if step_summaries:
-            step_summaries_fmt = "\n\n".join(step_summaries)
-            yield ChatMessage.system(
-                f"## Progress on your Task so far\n"
-                "Here is a summary of the steps that you have executed so far, "
-                "use this as your consideration for determining the next action!\n"
-                f"{step_summaries_fmt}"
-            )
-
-        yield from messages
+        if progress := self._compile_progress(
+            self.event_history.episodes,
+            self.config.max_tokens,
+            self.count_tokens,
+        ):
+            yield ChatMessage.system(f"## Progress on your Task so far\n\n{progress}")
 
     def after_parse(self, result: AnyProposal) -> None:
         self.event_history.register_action(result)
@@ -100,41 +62,6 @@ class ActionHistoryComponent(
             self.llm_provider, self.config.model_name, self.config.spacy_language_model
         )
 
-    @staticmethod
-    def _make_result_message(episode: Episode, result: ActionResult) -> ChatMessage:
-        if result.status == "success":
-            return (
-                ToolResultMessage(
-                    content=str(result.outputs),
-                    tool_call_id=episode.action.raw_message.tool_calls[0].id,
-                )
-                if episode.action.raw_message.tool_calls
-                else ChatMessage.user(
-                    f"{episode.action.use_tool.name} returned: "
-                    + (
-                        f"```\n{result.outputs}\n```"
-                        if "\n" in str(result.outputs)
-                        else f"`{result.outputs}`"
-                    )
-                )
-            )
-        elif result.status == "error":
-            return (
-                ToolResultMessage(
-                    content=f"{result.reason}\n\n{result.error or ''}".strip(),
-                    is_error=True,
-                    tool_call_id=episode.action.raw_message.tool_calls[0].id,
-                )
-                if episode.action.raw_message.tool_calls
-                else ChatMessage.user(
-                    f"{episode.action.use_tool.name} raised an error: ```\n"
-                    f"{result.reason}\n"
-                    "```"
-                )
-            )
-        else:
-            return ChatMessage.user(result.feedback)
-
     def _compile_progress(
         self,
         episode_history: list[Episode[AnyProposal]],
@@ -149,8 +76,8 @@ class ActionHistoryComponent(
         n_episodes = len(episode_history)
 
         for i, episode in enumerate(reversed(episode_history)):
-            # Use full format for a few latest steps, summary or format for older steps
-            if i < self.config.full_message_count or episode.summary is None:
+            # Use full format for the latest 4 steps, summary or format for older steps
+            if i < 4 or episode.summary is None:
                 step_content = indent(episode.format(), 2).strip()
             else:
                 step_content = episode.summary

forge/forge/components/action_history/model.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import asyncio
 from typing import TYPE_CHECKING, Generic
 
-from pydantic import BaseModel, Field
+from pydantic import Field
+from pydantic.generics import GenericModel
 
 from forge.content_processing.text import summarize_text
 from forge.llm.prompting.utils import format_numbered_list, indent
@@ -15,7 +16,7 @@ if TYPE_CHECKING:
     from forge.llm.providers import MultiProvider
 
 
-class Episode(BaseModel, Generic[AnyProposal]):
+class Episode(GenericModel, Generic[AnyProposal]):
     action: AnyProposal
     result: ActionResult | None
     summary: str | None = None
@@ -51,7 +52,7 @@ class Episode(BaseModel, Generic[AnyProposal]):
         return executed_action + action_result
 
 
-class EpisodicActionHistory(BaseModel, Generic[AnyProposal]):
+class EpisodicActionHistory(GenericModel, Generic[AnyProposal]):
     """Utility container for an action history"""
 
     episodes: list[Episode[AnyProposal]] = Field(default_factory=list)

forge/forge/components/code_executor/__init__.py

@@ -1,6 +1,8 @@
 from .code_executor import CodeExecutionError, CodeExecutorComponent
 
 __all__ = [
+    "ALLOWLIST_CONTROL",
+    "DENYLIST_CONTROL",
     "CodeExecutionError",
     "CodeExecutorComponent",
 ]

forge/forge/components/code_executor/code_executor.py

@@ -83,9 +83,7 @@ class CodeExecutorComponent(
 
         # Change container name if it's empty or default to prevent different agents
         # from using the same container
-        default_container_name = self.config.model_fields[
-            "docker_container_name"
-        ].default
+        default_container_name = self.config.__fields__["docker_container_name"].default
         if (
             not self.config.docker_container_name
             or self.config.docker_container_name == default_container_name

forge/forge/components/file_manager/file_manager.py

@@ -3,7 +3,7 @@ import os
 from pathlib import Path
 from typing import Iterator, Optional
 
-from pydantic import BaseModel, ConfigDict
+from pydantic import BaseModel
 
 from forge.agent import BaseAgentSettings
 from forge.agent.components import ConfigurableComponent
@@ -22,11 +22,10 @@ class FileManagerConfiguration(BaseModel):
     workspace_path: str
     """Path to files that agent has access to"""
 
-    model_config = ConfigDict(
+    class Config:
         # Prevent mutation of the configuration
         # as this wouldn't be reflected in the file storage
-        frozen=False
-    )
+        allow_mutation = False
 
 
 class FileManagerComponent(
@@ -89,8 +88,7 @@ class FileManagerComponent(
             self._file_storage.make_dir(f"agents/{save_as_id}")
             # Save state
             await self._file_storage.write_file(
-                f"agents/{save_as_id}/{self.STATE_FILE}",
-                self.agent_state.model_dump_json(),
+                f"agents/{save_as_id}/{self.STATE_FILE}", self.agent_state.json()
             )
             # Copy workspace
             self._file_storage.copy(
@@ -99,7 +97,7 @@ class FileManagerComponent(
             )
         else:
             await self.storage.write_file(
-                self.storage.root / self.STATE_FILE, self.agent_state.model_dump_json()
+                self.storage.root / self.STATE_FILE, self.agent_state.json()
             )
 
     def get_resources(self) -> Iterator[str]:

forge/forge/components/git_operations/git_operations.py

@@ -14,9 +14,9 @@ from forge.utils.url_validator import validate_url
 
 
 class GitOperationsConfiguration(BaseModel):
-    github_username: Optional[str] = UserConfigurable(None, from_env="GITHUB_USERNAME")
+    github_username: Optional[str] = UserConfigurable(from_env="GITHUB_USERNAME")
     github_api_key: Optional[SecretStr] = UserConfigurable(
-        None, from_env="GITHUB_API_KEY", exclude=True
+        from_env="GITHUB_API_KEY", exclude=True
     )
 
 

forge/forge/components/image_gen/image_gen.py

@@ -27,11 +27,11 @@ class ImageGeneratorConfiguration(BaseModel):
     image_provider: Literal["dalle", "huggingface", "sdwebui"] = "dalle"
     huggingface_image_model: str = "CompVis/stable-diffusion-v1-4"
     huggingface_api_token: Optional[SecretStr] = UserConfigurable(
-        None, from_env="HUGGINGFACE_API_TOKEN", exclude=True
+        from_env="HUGGINGFACE_API_TOKEN", exclude=True
     )
     sd_webui_url: str = "http://localhost:7860"
     sd_webui_auth: Optional[SecretStr] = UserConfigurable(
-        None, from_env="SD_WEBUI_AUTH", exclude=True
+        from_env="SD_WEBUI_AUTH", exclude=True
     )
 
 

forge/forge/components/web/search.py

@@ -18,10 +18,10 @@ logger = logging.getLogger(__name__)
 
 class WebSearchConfiguration(BaseModel):
     google_api_key: Optional[SecretStr] = UserConfigurable(
-        None, from_env="GOOGLE_API_KEY", exclude=True
+        from_env="GOOGLE_API_KEY", exclude=True
     )
     google_custom_search_engine_id: Optional[SecretStr] = UserConfigurable(
-        None, from_env="GOOGLE_CUSTOM_SEARCH_ENGINE_ID", exclude=True
+        from_env="GOOGLE_CUSTOM_SEARCH_ENGINE_ID", exclude=True
     )
     duckduckgo_max_attempts: int = 3
 
@@ -173,7 +173,7 @@ class WebSearchComponent(
             search_results = result.get("items", [])
 
             # Create a list of only the URLs from the search results
-            search_results_links = [item["link"] for item in search_results]  # type: ignore # noqa
+            search_results_links = [item["link"] for item in search_results]
 
         except HttpError as e:
             # Handle errors in the API call

forge/forge/config/ai_directives.py

@@ -25,4 +25,4 @@ class AIDirectives(BaseModel):
             resources=self.resources + other.resources,
             constraints=self.constraints + other.constraints,
             best_practices=self.best_practices + other.best_practices,
-        ).model_copy(deep=True)
+        ).copy(deep=True)

forge/forge/conftest.py

@@ -0,0 +1,8 @@
+from pathlib import Path
+
+import pytest
+
+
+@pytest.fixture()
+def test_workspace(tmp_path: Path) -> Path:
+    return tmp_path

forge/forge/llm/prompting/schema.py

@@ -27,7 +27,7 @@ class ChatPrompt(BaseModel):
     prefill_response: str = ""
 
     def raw(self) -> list[ChatMessageDict]:
-        return [m.model_dump() for m in self.messages]  # type: ignore
+        return [m.dict() for m in self.messages]  # type: ignore
 
     def __str__(self):
         return "\n\n".join(

forge/forge/llm/providers/_openai_base.py

@@ -10,7 +10,6 @@ from typing import (
     Sequence,
     TypeVar,
     cast,
-    get_args,
 )
 
 import sentry_sdk
@@ -68,11 +67,11 @@ class _BaseOpenAIProvider(BaseModelProvider[_ModelName, _ModelProviderSettings])
             raise ValueError(f"{self.__class__.__name__}.MODELS is not set")
 
         if not settings:
-            settings = self.default_settings.model_copy(deep=True)
+            settings = self.default_settings.copy(deep=True)
         if not settings.credentials:
-            settings.credentials = get_args(  # Union[Credentials, None] -> Credentials
-                self.default_settings.model_fields["credentials"].annotation
-            )[0].from_env()
+            settings.credentials = self.default_settings.__fields__[
+                "credentials"
+            ].type_.from_env()
 
         super(_BaseOpenAIProvider, self).__init__(settings=settings, logger=logger)
 
@@ -249,7 +248,7 @@ class BaseOpenAIChatProvider(
                     openai_messages.append(
                         cast(
                             ChatCompletionAssistantMessageParam,
-                            _assistant_msg.model_dump(exclude_none=True),
+                            _assistant_msg.dict(exclude_none=True),
                         )
                     )
                     openai_messages.append(
@@ -310,7 +309,7 @@ class BaseOpenAIChatProvider(
             kwargs["extra_headers"].update(extra_headers.copy())  # type: ignore
 
         prepped_messages: list[ChatCompletionMessageParam] = [
-            message.model_dump(  # type: ignore
+            message.dict(  # type: ignore
                 include={"role", "content", "tool_calls", "tool_call_id", "name"},
                 exclude_none=True,
             )

forge/forge/llm/providers/anthropic.py

@@ -43,7 +43,6 @@ _P = ParamSpec("_P")
 class AnthropicModelName(str, enum.Enum):
     CLAUDE3_OPUS_v1 = "claude-3-opus-20240229"
     CLAUDE3_SONNET_v1 = "claude-3-sonnet-20240229"
-    CLAUDE3_5_SONNET_v1 = "claude-3-5-sonnet-20240620"
     CLAUDE3_HAIKU_v1 = "claude-3-haiku-20240307"
 
 
@@ -66,14 +65,6 @@ ANTHROPIC_CHAT_MODELS = {
             max_tokens=200000,
             has_function_call_api=True,
         ),
-        ChatModelInfo(
-            name=AnthropicModelName.CLAUDE3_5_SONNET_v1,
-            provider_name=ModelProviderName.ANTHROPIC,
-            prompt_token_cost=3 / 1e6,
-            completion_token_cost=15 / 1e6,
-            max_tokens=200000,
-            has_function_call_api=True,
-        ),
         ChatModelInfo(
             name=AnthropicModelName.CLAUDE3_HAIKU_v1,
             provider_name=ModelProviderName.ANTHROPIC,
@@ -129,7 +120,7 @@ class AnthropicProvider(BaseChatModelProvider[AnthropicModelName, AnthropicSetti
         logger: Optional[logging.Logger] = None,
     ):
         if not settings:
-            settings = self.default_settings.model_copy(deep=True)
+            settings = self.default_settings.copy(deep=True)
         if not settings.credentials:
             settings.credentials = AnthropicCredentials.from_env()
 
@@ -250,7 +241,7 @@ class AnthropicProvider(BaseChatModelProvider[AnthropicModelName, AnthropicSetti
                 )
                 if attempts < self._configuration.fix_failed_parse_tries:
                     anthropic_messages.append(
-                        _assistant_msg.model_dump(include={"role", "content"})  # type: ignore # noqa
+                        _assistant_msg.dict(include={"role", "content"})  # type: ignore
                     )
                     anthropic_messages.append(
                         {

forge/forge/llm/providers/multi.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import logging
-from typing import Any, Callable, Iterator, Optional, Sequence, TypeVar, get_args
+from typing import Any, Callable, Iterator, Optional, Sequence, TypeVar
 
 from pydantic import ValidationError
 
@@ -125,16 +125,14 @@ class MultiProvider(BaseChatModelProvider[ModelName, ModelProviderSettings]):
         _provider = self._provider_instances.get(provider_name)
         if not _provider:
             Provider = self._get_provider_class(provider_name)
-            settings = Provider.default_settings.model_copy(deep=True)
+            settings = Provider.default_settings.copy(deep=True)
             settings.budget = self._budget
             settings.configuration.extra_request_headers.update(
                 self._settings.configuration.extra_request_headers
             )
             if settings.credentials is None:
                 try:
-                    Credentials = get_args(  # Union[Credentials, None] -> Credentials
-                        settings.model_fields["credentials"].annotation
-                    )[0]
+                    Credentials = settings.__fields__["credentials"].type_
                     settings.credentials = Credentials.from_env()
                 except ValidationError as e:
                     raise ValueError(

forge/forge/llm/providers/openai.py

@@ -197,7 +197,7 @@ chat_model_mapping = {
 }
 for base, copies in chat_model_mapping.items():
     for copy in copies:
-        copy_info = OPEN_AI_CHAT_MODELS[base].model_copy(update={"name": copy})
+        copy_info = OPEN_AI_CHAT_MODELS[base].copy(update={"name": copy})
         OPEN_AI_CHAT_MODELS[copy] = copy_info
         if copy.endswith(("-0301", "-0314")):
             copy_info.has_function_call_api = False
@@ -219,19 +219,15 @@ class OpenAICredentials(ModelProviderCredentials):
     api_base: Optional[SecretStr] = UserConfigurable(
         default=None, from_env="OPENAI_API_BASE_URL"
     )
-    organization: Optional[SecretStr] = UserConfigurable(
-        default=None, from_env="OPENAI_ORGANIZATION"
-    )
+    organization: Optional[SecretStr] = UserConfigurable(from_env="OPENAI_ORGANIZATION")
 
     api_type: Optional[SecretStr] = UserConfigurable(
         default=None,
         from_env=lambda: cast(
             SecretStr | None,
-            (
-                "azure"
-                if os.getenv("USE_AZURE") == "True"
-                else os.getenv("OPENAI_API_TYPE")
-            ),
+            "azure"
+            if os.getenv("USE_AZURE") == "True"
+            else os.getenv("OPENAI_API_TYPE"),
         ),
     )
     api_version: Optional[SecretStr] = UserConfigurable(
@@ -371,7 +367,7 @@ class OpenAIProvider(
         num_tokens = 0
         for message in messages:
             num_tokens += tokens_per_message
-            for key, value in message.model_dump().items():
+            for key, value in message.dict().items():
                 num_tokens += len(tokenizer.encode(value))
                 if key == "name":
                     num_tokens += tokens_per_name
@@ -629,4 +625,4 @@ def _tool_calls_compat_extract_calls(response: str) -> Iterator[AssistantToolCal
 
     for t in tool_calls:
         t["id"] = str(uuid.uuid4())
-        yield AssistantToolCall.model_validate(t)
+        yield AssistantToolCall.parse_obj(t)

forge/forge/llm/providers/schema.py

@@ -17,7 +17,7 @@ from typing import (
     TypeVar,
 )
 
-from pydantic import BaseModel, ConfigDict, Field, SecretStr
+from pydantic import BaseModel, Field, SecretStr
 
 from forge.logging.utils import fmt_kwargs
 from forge.models.config import (
@@ -204,7 +204,8 @@ class ModelProviderCredentials(ProviderCredentials):
     api_version: SecretStr | None = UserConfigurable(default=None)
     deployment_id: SecretStr | None = UserConfigurable(default=None)
 
-    model_config = ConfigDict(extra="ignore")
+    class Config(ProviderCredentials.Config):
+        extra = "ignore"
 
 
 class ModelProviderUsage(BaseModel):
@@ -288,7 +289,7 @@ class BaseModelProvider(
         logger: Optional[logging.Logger] = None,
     ):
         if not settings:
-            settings = self.default_settings.model_copy(deep=True)
+            settings = self.default_settings.copy(deep=True)
 
         self._settings = settings
         self._configuration = settings.configuration
@@ -355,7 +356,7 @@ class EmbeddingModelResponse(ModelResponse):
     """Standard response struct for a response from an embedding model."""
 
     embedding: Embedding = Field(default_factory=list)
-    completion_tokens_used: int = Field(default=0, frozen=True)
+    completion_tokens_used: int = Field(default=0, const=True)
 
 
 class BaseEmbeddingModelProvider(BaseModelProvider[_ModelName, _ModelProviderSettings]):

forge/forge/models/action.py

@@ -3,13 +3,8 @@ from __future__ import annotations
 from typing import Any, Literal, Optional, TypeVar
 
 from pydantic import BaseModel
-from pydantic.json_schema import (
-    DEFAULT_REF_TEMPLATE,
-    GenerateJsonSchema,
-    JsonSchemaMode,
-)
 
-from forge.llm.providers.schema import AssistantChatMessage, AssistantFunctionCall
+from forge.llm.providers.schema import AssistantFunctionCall
 
 from .utils import ModelWithSummary
 
@@ -18,34 +13,6 @@ class ActionProposal(BaseModel):
     thoughts: str | ModelWithSummary
     use_tool: AssistantFunctionCall
 
-    raw_message: AssistantChatMessage = None  # type: ignore
-    """
-    The message from which the action proposal was parsed. To be set by the parser.
-    """
-
-    @classmethod
-    def model_json_schema(
-        cls,
-        by_alias: bool = True,
-        ref_template: str = DEFAULT_REF_TEMPLATE,
-        schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-        mode: JsonSchemaMode = "validation",
-        **kwargs,
-    ):
-        """
-        The schema for this ActionProposal model, excluding the 'raw_message' property.
-        """
-        schema = super().model_json_schema(
-            by_alias=by_alias,
-            ref_template=ref_template,
-            schema_generator=schema_generator,
-            mode=mode,
-            **kwargs,
-        )
-        if "raw_message" in schema["properties"]:  # must check because schema is cached
-            del schema["properties"]["raw_message"]
-        return schema
-
 
 AnyProposal = TypeVar("AnyProposal", bound=ActionProposal)
 

forge/forge/models/config.py

@@ -2,19 +2,16 @@ import os
 import typing
 from typing import Any, Callable, Generic, Optional, Type, TypeVar, get_args
 
-from pydantic import BaseModel, ConfigDict, Field, ValidationError
-from pydantic._internal._model_construction import (  # HACK shouldn't be used
-    ModelMetaclass,
-)
-from pydantic.fields import FieldInfo
-from pydantic_core import PydanticUndefined, PydanticUndefinedType
+from pydantic import BaseModel, Field, ValidationError
+from pydantic.fields import ModelField, Undefined, UndefinedType
+from pydantic.main import ModelMetaclass
 
 T = TypeVar("T")
 M = TypeVar("M", bound=BaseModel)
 
 
 def UserConfigurable(
-    default: T | PydanticUndefinedType = PydanticUndefined,
+    default: T | UndefinedType = Undefined,
     *args,
     default_factory: Optional[Callable[[], T]] = None,
     from_env: Optional[str | Callable[[], T | None]] = None,
@@ -23,27 +20,16 @@ def UserConfigurable(
     **kwargs,
 ) -> T:
     # TODO: use this to auto-generate docs for the application configuration
-    field_info: FieldInfo = Field(
+    return Field(
         default,
         *args,
         default_factory=default_factory,
+        from_env=from_env,
         description=description,
         exclude=exclude,
         **kwargs,
+        user_configurable=True,
     )
-    field_info.metadata.append(("user_configurable", True))
-    field_info.metadata.append(("from_env", from_env))
-
-    return field_info  # type: ignore
-
-
-def _get_field_metadata(field: FieldInfo, key: str, default: Any = None) -> Any:
-    for item in field.metadata:
-        if isinstance(item, tuple) and item[0] == key:
-            return item[1]
-        if isinstance(item, str) and item == key:
-            return True
-    return default
 
 
 class SystemConfiguration(BaseModel):
@@ -59,17 +45,14 @@ class SystemConfiguration(BaseModel):
         attribute that can be passed to UserConfigurable.
         """
 
-        def infer_field_value(field: FieldInfo):
+        def infer_field_value(field: ModelField):
+            field_info = field.field_info
             default_value = (
                 field.default
-                if field.default not in (None, PydanticUndefined)
-                else (
-                    field.default_factory()
-                    if field.default_factory
-                    else PydanticUndefined
-                )
+                if field.default not in (None, Undefined)
+                else (field.default_factory() if field.default_factory else Undefined)
             )
-            if from_env := _get_field_metadata(field, "from_env"):
+            if from_env := field_info.extra.get("from_env"):
                 val_from_env = (
                     os.getenv(from_env) if type(from_env) is str else from_env()
                 )
@@ -79,9 +62,10 @@ class SystemConfiguration(BaseModel):
 
         return _recursive_init_model(cls, infer_field_value)
 
-    model_config = ConfigDict(
-        extra="forbid", use_enum_values=True, validate_assignment=True
-    )
+    class Config:
+        extra = "forbid"
+        use_enum_values = True
+        validate_assignment = True
 
 
 SC = TypeVar("SC", bound=SystemConfiguration)
@@ -93,9 +77,10 @@ class SystemSettings(BaseModel):
     name: str
     description: str
 
-    model_config = ConfigDict(
-        extra="forbid", use_enum_values=True, validate_assignment=True
-    )
+    class Config:
+        extra = "forbid"
+        use_enum_values = True
+        validate_assignment = True
 
 
 S = TypeVar("S", bound=SystemSettings)
@@ -118,7 +103,7 @@ class Configurable(Generic[S]):
         base_config = _update_user_config_from_env(cls.default_settings)
         final_configuration = deep_update(base_config, overrides)
 
-        return cls.default_settings.__class__.model_validate(final_configuration)
+        return cls.default_settings.__class__.parse_obj(final_configuration)
 
 
 def _update_user_config_from_env(instance: BaseModel) -> dict[str, Any]:
@@ -137,15 +122,14 @@ def _update_user_config_from_env(instance: BaseModel) -> dict[str, Any]:
         The user config fields of the instance.
     """
 
-    def infer_field_value(field: FieldInfo, value):
+    def infer_field_value(field: ModelField, value):
+        field_info = field.field_info
         default_value = (
             field.default
-            if field.default not in (None, PydanticUndefined)
+            if field.default not in (None, Undefined)
             else (field.default_factory() if field.default_factory else None)
         )
-        if value == default_value and (
-            from_env := _get_field_metadata(field, "from_env")
-        ):
+        if value == default_value and (from_env := field_info.extra.get("from_env")):
             val_from_env = os.getenv(from_env) if type(from_env) is str else from_env()
             if val_from_env is not None:
                 return val_from_env
@@ -153,10 +137,10 @@ def _update_user_config_from_env(instance: BaseModel) -> dict[str, Any]:
 
     def init_sub_config(model: Type[SC]) -> SC | None:
         try:
-            return model.model_validate(model.from_env(), strict=True)
+            return model.from_env()
         except ValidationError as e:
             # Gracefully handle missing fields
-            if all(e["type"] == "missing" for e in e.errors()):
+            if all(e["type"] == "value_error.missing" for e in e.errors()):
                 return None
             raise
 
@@ -165,7 +149,7 @@ def _update_user_config_from_env(instance: BaseModel) -> dict[str, Any]:
 
 def _recursive_init_model(
     model: Type[M],
-    infer_field_value: Callable[[FieldInfo], Any],
+    infer_field_value: Callable[[ModelField], Any],
 ) -> M:
     """
     Recursively initialize the user configuration fields of a Pydantic model.
@@ -180,31 +164,31 @@ def _recursive_init_model(
         BaseModel: An instance of the model with the initialized configuration.
     """
     user_config_fields = {}
-    for name, field in model.model_fields.items():
-        if _get_field_metadata(field, "user_configurable"):
+    for name, field in model.__fields__.items():
+        if "user_configurable" in field.field_info.extra:
             user_config_fields[name] = infer_field_value(field)
-        elif isinstance(field.annotation, ModelMetaclass) and issubclass(
-            field.annotation, SystemConfiguration
+        elif type(field.outer_type_) is ModelMetaclass and issubclass(
+            field.outer_type_, SystemConfiguration
         ):
             try:
                 user_config_fields[name] = _recursive_init_model(
-                    model=field.annotation,
+                    model=field.outer_type_,
                     infer_field_value=infer_field_value,
                 )
             except ValidationError as e:
                 # Gracefully handle missing fields
-                if all(e["type"] == "missing" for e in e.errors()):
+                if all(e["type"] == "value_error.missing" for e in e.errors()):
                     user_config_fields[name] = None
                 raise
 
     user_config_fields = remove_none_items(user_config_fields)
 
-    return model.model_validate(user_config_fields)
+    return model.parse_obj(user_config_fields)
 
 
 def _recurse_user_config_fields(
     model: BaseModel,
-    infer_field_value: Callable[[FieldInfo, Any], Any],
+    infer_field_value: Callable[[ModelField, Any], Any],
     init_sub_config: Optional[
         Callable[[Type[SystemConfiguration]], SystemConfiguration | None]
     ] = None,
@@ -227,11 +211,11 @@ def _recurse_user_config_fields(
     """
     user_config_fields = {}
 
-    for name, field in model.model_fields.items():
+    for name, field in model.__fields__.items():
         value = getattr(model, name)
 
         # Handle individual field
-        if _get_field_metadata(field, "user_configurable"):
+        if "user_configurable" in field.field_info.extra:
             user_config_fields[name] = infer_field_value(field, value)
 
         # Recurse into nested config object
@@ -276,7 +260,7 @@ def _recurse_user_config_fields(
 
 def _recurse_user_config_values(
     instance: BaseModel,
-    get_field_value: Callable[[FieldInfo, T], T] = lambda _, v: v,
+    get_field_value: Callable[[ModelField, T], T] = lambda _, v: v,
 ) -> dict[str, Any]:
     """
     This function recursively traverses the user configuration values in a Pydantic
@@ -294,8 +278,8 @@ def _recurse_user_config_values(
     user_config_values = {}
 
     for name, value in instance.__dict__.items():
-        field = instance.model_fields[name]
-        if _get_field_metadata(field, "user_configurable"):
+        field = instance.__fields__[name]
+        if "user_configurable" in field.field_info.extra:
             user_config_values[name] = get_field_value(field, value)
         elif isinstance(value, SystemConfiguration):
             user_config_values[name] = _recurse_user_config_values(
@@ -329,7 +313,7 @@ def _get_non_default_user_config_values(instance: BaseModel) -> dict[str, Any]:
         dict[str, Any]: The non-default user config values on the instance.
     """
 
-    def get_field_value(field: FieldInfo, value):
+    def get_field_value(field: ModelField, value):
         default = field.default_factory() if field.default_factory else field.default
         if value != default:
             return value
@@ -363,8 +347,6 @@ def deep_update(original_dict: dict, update_dict: dict) -> dict:
 def remove_none_items(d):
     if isinstance(d, dict):
         return {
-            k: remove_none_items(v)
-            for k, v in d.items()
-            if v not in (None, PydanticUndefined)
+            k: remove_none_items(v) for k, v in d.items() if v not in (None, Undefined)
         }
     return d

forge/forge/models/json_schema.py

@@ -57,7 +57,7 @@ class JSONSchema(BaseModel):
 
     @staticmethod
     def from_dict(schema: dict) -> "JSONSchema":
-        definitions = schema.get("$defs", {})
+        definitions = schema.get("definitions", {})
         schema = _resolve_type_refs_in_schema(schema, definitions)
 
         return JSONSchema(

forge/forge/models/providers.py

@@ -1,9 +1,9 @@
 import abc
 import enum
 import math
-from typing import Generic, TypeVar
+from typing import Callable, Generic, TypeVar
 
-from pydantic import BaseModel, ConfigDict, Secret, SecretBytes, SecretStr
+from pydantic import BaseModel, SecretBytes, SecretField, SecretStr
 
 from forge.models.config import SystemConfiguration, UserConfigurable
 
@@ -38,18 +38,17 @@ class ProviderCredentials(SystemConfiguration):
     def unmasked(self) -> dict:
         return unmask(self)
 
-    model_config = ConfigDict(
-        json_encoders={
+    class Config(SystemConfiguration.Config):
+        json_encoders: dict[type[SecretField], Callable[[SecretField], str | None]] = {
             SecretStr: lambda v: v.get_secret_value() if v else None,
             SecretBytes: lambda v: v.get_secret_value() if v else None,
-            Secret: lambda v: v.get_secret_value() if v else None,
+            SecretField: lambda v: v.get_secret_value() if v else None,
         }
-    )
 
 
 def unmask(model: BaseModel):
     unmasked_fields = {}
-    for field_name, _ in model.model_fields.items():
+    for field_name, _ in model.__fields__.items():
         value = getattr(model, field_name)
         if isinstance(value, SecretStr):
             unmasked_fields[field_name] = value.get_secret_value()