Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Importation errors in tests /community and /core #505

Merged
merged 1 commit into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkgs/community/tests/unit/toolkits/GithubToolkit_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import pytest
import logging
from swarmauri.tools.concrete.AdditionTool import AdditionTool
from swarmauri_community.community.tools.concrete.GithubRepoTool import GithubRepoTool
from swarmauri_community.community.toolkits.concrete.GithubToolkit import (
from swarmauri_community.tools.concrete.GithubRepoTool import GithubRepoTool
from swarmauri_community.toolkits.concrete.GithubToolkit import (
GithubToolkit as Toolkit,
)
from dotenv import load_dotenv
Expand Down Expand Up @@ -66,7 +66,7 @@ def test_add_tool():
],
)
@pytest.mark.unit
@patch("swarmauri_community.community.tools.concrete.GithubRepoTool.Github")
@patch("swarmauri_community.tools.concrete.GithubRepoTool.Github")
def test_call_github_repo_tool(mock_github, action, kwargs, method_called):
expected_keys = {action}
toolkit = Toolkit(token=token)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.CaptchaGeneratorTool import (
from swarmauri_community.tools.concrete.CaptchaGeneratorTool import (
CaptchaGeneratorTool as Tool,
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.DaleChallReadabilityTool import (
from swarmauri_community.tools.concrete.DaleChallReadabilityTool import (
DaleChallReadabilityTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/DownloadPdfTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import pytest
from unittest.mock import patch, MagicMock
import requests
from swarmauri_community.community.tools.concrete.DownloadPdfTool import (
from swarmauri_community.tools.concrete.DownloadPdfTool import (
DownloadPDFTool as Tool,
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import json
import pytest
from swarmauri_community.community.tools.concrete.EntityRecognitionTool import (
from swarmauri_community.tools.concrete.EntityRecognitionTool import (
EntityRecognitionTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/FoliumTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import base64

import pytest
from swarmauri_community.community.tools.concrete.FoliumTool import FoliumTool as Tool
from swarmauri_community.tools.concrete.FoliumTool import FoliumTool as Tool


@pytest.mark.unit
Expand Down
4 changes: 2 additions & 2 deletions pkgs/community/tests/unit/tools/GithubBranchTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dotenv import load_dotenv

import pytest
from swarmauri_community.community.tools.concrete.GithubBranchTool import (
from swarmauri_community.tools.concrete.GithubBranchTool import (
GithubBranchTool as Tool,
)

Expand Down Expand Up @@ -81,7 +81,7 @@ def test_serialization():
reason="Skipping due to environment variable not set",
)
@pytest.mark.unit
@patch("swarmauri_community.community.tools.concrete.GithubTool.Github")
@patch("swarmauri_community.tools.concrete.GithubTool.Github")
def test_call(mock_github, action, kwargs, method_called):
expected_keys = {action}
token = os.getenv("GITHUBTOOL_TEST_TOKEN")
Expand Down
4 changes: 2 additions & 2 deletions pkgs/community/tests/unit/tools/GithubCommitTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dotenv import load_dotenv

import pytest
from swarmauri_community.community.tools.concrete.GithubCommitTool import (
from swarmauri_community.tools.concrete.GithubCommitTool import (
GithubCommitTool as Tool,
)

Expand Down Expand Up @@ -84,7 +84,7 @@ def test_serialization():
reason="Skipping due to environment variable not set",
)
@pytest.mark.unit
@patch("swarmauri_community.community.tools.concrete.GithubCommitTool.Github")
@patch("swarmauri_community.tools.concrete.GithubCommitTool.Github")
def test_call(mock_github, action, kwargs, method_called):
expected_keys = {action}
token = os.getenv("GITHUBTOOL_TEST_TOKEN")
Expand Down
4 changes: 2 additions & 2 deletions pkgs/community/tests/unit/tools/GithubIssueTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dotenv import load_dotenv

import pytest
from swarmauri_community.community.tools.concrete.GithubIssueTool import (
from swarmauri_community.tools.concrete.GithubIssueTool import (
GithubIssueTool as Tool,
)

Expand Down Expand Up @@ -78,7 +78,7 @@ def test_serialization():
reason="Skipping due to environment variable not set",
)
@pytest.mark.unit
@patch("swarmauri_community.community.tools.concrete.GithubIssueTool.Github")
@patch("swarmauri_community.tools.concrete.GithubIssueTool.Github")
def test_call(mock_github, action, kwargs, method_called):
expected_keys = {action}
token = os.getenv("GITHUBTOOL_TEST_TOKEN")
Expand Down
4 changes: 2 additions & 2 deletions pkgs/community/tests/unit/tools/GithubPRTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dotenv import load_dotenv

import pytest
from swarmauri_community.community.tools.concrete.GithubPRTool import (
from swarmauri_community.tools.concrete.GithubPRTool import (
GithubPRTool as Tool,
)

Expand Down Expand Up @@ -71,7 +71,7 @@ def test_serialization():
reason="Skipping due to environment variable not set",
)
@pytest.mark.unit
@patch("swarmauri_community.community.tools.concrete.GithubPRTool.Github")
@patch("swarmauri_community.tools.concrete.GithubPRTool.Github")
def test_call(mock_github, action, kwargs, method_called):
expected_keys = {action}
token = os.getenv("GITHUBTOOL_TEST_TOKEN")
Expand Down
4 changes: 2 additions & 2 deletions pkgs/community/tests/unit/tools/GithubRepoTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dotenv import load_dotenv

import pytest
from swarmauri_community.community.tools.concrete.GithubRepoTool import (
from swarmauri_community.tools.concrete.GithubRepoTool import (
GithubRepoTool as Tool,
)

Expand Down Expand Up @@ -71,7 +71,7 @@ def test_serialization():
reason="Skipping due to environment variable not set",
)
@pytest.mark.unit
@patch("swarmauri_community.community.tools.concrete.GithubRepoTool.Github")
@patch("swarmauri_community.tools.concrete.GithubRepoTool.Github")
def test_call(mock_github, action, kwargs, method_called):
expected_keys = {action}
token = os.getenv("GITHUBTOOL_TEST_TOKEN")
Expand Down
4 changes: 2 additions & 2 deletions pkgs/community/tests/unit/tools/GithubTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from dotenv import load_dotenv

import pytest
from swarmauri_community.community.tools.concrete.GithubTool import GithubTool as Tool
from swarmauri_community.tools.concrete.GithubTool import GithubTool as Tool

load_dotenv()

Expand Down Expand Up @@ -193,7 +193,7 @@ def test_serialization():
reason="Skipping due to environment variable not set",
)
@pytest.mark.unit
@patch("swarmauri_community.community.tools.concrete.GithubTool.Github")
@patch("swarmauri_community.tools.concrete.GithubTool.Github")
def test_call(mock_github, action, kwargs, method_called):
expected_keys = {action}
token = os.getenv("GITHUBTOOL_TEST_TOKEN")
Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/GmailReadTool_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.GmailReadTool import (
from swarmauri_community.tools.concrete.GmailReadTool import (
GmailReadTool as Tool,
)
from unittest.mock import patch, MagicMock
Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/GmailSendTool_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import patch, MagicMock

import pytest
from swarmauri_community.community.tools.concrete.GmailSendTool import (
from swarmauri_community.tools.concrete.GmailSendTool import (
GmailSendTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/LexicalDensity_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.LexicalDensityTool import (
from swarmauri_community.tools.concrete.LexicalDensityTool import (
LexicalDensityTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/PaCAMPTool_test.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest
import numpy as np
from swarmauri_community.community.tools.concrete.PaCMAPTool import PaCMAPTool as Tool
from swarmauri_community.tools.concrete.PaCMAPTool import PaCMAPTool as Tool


@pytest.mark.unit
Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/PsutilTool_test.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from unittest.mock import patch, MagicMock
import pytest
import psutil
from swarmauri_community.community.tools.concrete.PsutilTool import PsutilTool as Tool
from swarmauri_community.tools.concrete.PsutilTool import PsutilTool as Tool


@pytest.mark.unit
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import base64
from PIL import Image
import pytest
from swarmauri_community.community.tools.concrete.QrCodeGeneratorTool import (
from swarmauri_community.tools.concrete.QrCodeGeneratorTool import (
QrCodeGeneratorTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/SMOGIndex_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.SMOGIndexTool import (
from swarmauri_community.tools.concrete.SMOGIndexTool import (
SMOGIndexTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/SentenceComplexity_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.SentenceComplexityTool import (
from swarmauri_community.tools.concrete.SentenceComplexityTool import (
SentenceComplexityTool as Tool,
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.SentimentAnalysisTool import (
from swarmauri_community.tools.concrete.SentimentAnalysisTool import (
SentimentAnalysisTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/WebScrapingTool_test.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import pytest
from swarmauri_community.community.tools.concrete.WebScrapingTool import (
from swarmauri_community.tools.concrete.WebScrapingTool import (
WebScrapingTool as Tool,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/community/tests/unit/tools/ZapierHookTool_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import pytest
import requests
from swarmauri_community.community.tools.concrete.ZapierHookTool import (
from swarmauri_community.tools.concrete.ZapierHookTool import (
ZapierHookTool as Tool,
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import pytest
from swarmauri.documents.concrete.Document import Document
from swarmauri_community.community.vector_stores.CloudQdrantVectorStore import (
from swarmauri_community.vector_stores.CloudQdrantVectorStore import (
CloudQdrantVectorStore,
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import pytest
from swarmauri.documents.concrete.Document import Document
from swarmauri_community.community.vector_stores.PersistentChromaDBVectorStore import (
from swarmauri_community.vector_stores.PersistentChromaDBVectorStore import (
PersistentChromaDBVectorStore,
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os
import pytest
from swarmauri.documents.concrete.Document import Document
from swarmauri_community.community.vector_stores.PersistentQdrantVectorStore import (
from swarmauri_community.vector_stores.PersistentQdrantVectorStore import (
PersistentQdrantVectorStore,
)

Expand Down
2 changes: 1 addition & 1 deletion pkgs/core/swarmauri_core/parsers/IParser.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from abc import ABC, abstractmethod
from typing import List, Union, Any

from swarmauri.core.documents.IDocument import IDocument
from swarmauri_core.documents.IDocument import IDocument
from typing_extensions import Annotated

FilePath = Annotated[str, "FilePath"]
Expand Down
Loading