Skip to content

Self-improving AI Employees for everyone

refactor(nodes): migrate B8 plugins to folder shape (google/twitter/social)

trohitg33faf5deb82e
diff --git a/server/nodes/google/calendar.py b/server/nodes/google/calendar/__init__.py
similarity index 98%
rename from server/nodes/google/calendar.py
rename to server/nodes/google/calendar/__init__.py
index 6b143db1..b642a0d9 100644
--- a/server/nodes/google/calendar.py
+++ b/server/nodes/google/calendar/__init__.py
@@ -9,9 +9,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
-from ._base import build_google_service, run_sync, track_google_usage
+from .._base import build_google_service, run_sync, track_google_usage
_CREATE = {"displayOptions": {"show": {"operation": ["create"]}}}
diff --git a/server/nodes/google/contacts.py b/server/nodes/google/contacts/__init__.py
similarity index 98%
rename from server/nodes/google/contacts.py
rename to server/nodes/google/contacts/__init__.py
index 2d825846..c10e2500 100644
--- a/server/nodes/google/contacts.py
+++ b/server/nodes/google/contacts/__init__.py
@@ -8,9 +8,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
-from ._base import build_google_service, run_sync, track_google_usage
+from .._base import build_google_service, run_sync, track_google_usage
_CREATE = {"displayOptions": {"show": {"operation": ["create"]}}}
diff --git a/server/nodes/google/drive.py b/server/nodes/google/drive/__init__.py
similarity index 98%
rename from server/nodes/google/drive.py
rename to server/nodes/google/drive/__init__.py
index d966a225..0c804785 100644
--- a/server/nodes/google/drive.py
+++ b/server/nodes/google/drive/__init__.py
@@ -12,9 +12,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
-from ._base import build_google_service, run_sync, track_google_usage
+from .._base import build_google_service, run_sync, track_google_usage
_UPLOAD = {"displayOptions": {"show": {"operation": ["upload"]}}}
diff --git a/server/nodes/google/gmail.py b/server/nodes/google/gmail/__init__.py
similarity index 97%
rename from server/nodes/google/gmail.py
rename to server/nodes/google/gmail/__init__.py
index 951d9671..29cf127c 100644
--- a/server/nodes/google/gmail.py
+++ b/server/nodes/google/gmail/__init__.py
@@ -11,10 +11,10 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
-from ._base import build_google_service, run_sync, track_google_usage
-from ._gmail import fetch_email_details, format_message
+from .._base import build_google_service, run_sync, track_google_usage
+from .._gmail import fetch_email_details, format_message
class GmailParams(BaseModel):
diff --git a/server/nodes/google/gmail_receive.py b/server/nodes/google/gmail_receive/__init__.py
similarity index 97%
rename from server/nodes/google/gmail_receive.py
rename to server/nodes/google/gmail_receive/__init__.py
index 5e07c3a1..6b798e5b 100644
--- a/server/nodes/google/gmail_receive.py
+++ b/server/nodes/google/gmail_receive/__init__.py
@@ -14,10 +14,10 @@ from services.plugin import (
NodeContext, Operation, PollingTriggerNode, TaskQueue,
)
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
-from ._base import build_google_service, track_google_usage
-from ._gmail import fetch_email_details, mark_email_as_read, poll_gmail_ids
+from .._base import build_google_service, track_google_usage
+from .._gmail import fetch_email_details, mark_email_as_read, poll_gmail_ids
logger = get_logger(__name__)
diff --git a/server/nodes/google/sheets.py b/server/nodes/google/sheets/__init__.py
similarity index 98%
rename from server/nodes/google/sheets.py
rename to server/nodes/google/sheets/__init__.py
index 5ab39d28..28f1cd57 100644
--- a/server/nodes/google/sheets.py
+++ b/server/nodes/google/sheets/__init__.py
@@ -12,9 +12,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
-from ._base import build_google_service, run_sync, track_google_usage
+from .._base import build_google_service, run_sync, track_google_usage
class SheetsParams(BaseModel):
diff --git a/server/nodes/google/tasks.py b/server/nodes/google/tasks/__init__.py
similarity index 98%
rename from server/nodes/google/tasks.py
rename to server/nodes/google/tasks/__init__.py
index 5dc6d581..995a6384 100644
--- a/server/nodes/google/tasks.py
+++ b/server/nodes/google/tasks/__init__.py
@@ -8,9 +8,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import GoogleCredential
+from .._credentials import GoogleCredential
-from ._base import build_google_service, run_sync, track_google_usage
+from .._base import build_google_service, run_sync, track_google_usage
def _ensure_rfc3339(due: str) -> str:
diff --git a/server/nodes/social/social_receive.py b/server/nodes/social/social_receive/__init__.py
similarity index 99%
rename from server/nodes/social/social_receive.py
rename to server/nodes/social/social_receive/__init__.py
index 7623e427..dc0e0fe8 100644
--- a/server/nodes/social/social_receive.py
+++ b/server/nodes/social/social_receive/__init__.py
@@ -127,7 +127,7 @@ class SocialReceiveNode(ActionNode):
"""
import time
- from ._base import handle_social_receive
+ from .._base import handle_social_receive
start_time = time.time()
try:
diff --git a/server/nodes/social/social_send.py b/server/nodes/social/social_send/__init__.py
similarity index 99%
rename from server/nodes/social/social_send.py
rename to server/nodes/social/social_send/__init__.py
index 1d78389d..efd409f8 100644
--- a/server/nodes/social/social_send.py
+++ b/server/nodes/social/social_send/__init__.py
@@ -361,7 +361,7 @@ class SocialSendNode(ActionNode):
@Operation("send", cost={"service": "social", "action": "send", "count": 1})
async def send(self, ctx: NodeContext, params: SocialSendParams) -> Any:
- from ._base import handle_social_send
+ from .._base import handle_social_send
response = await handle_social_send(
node_id=ctx.node_id, node_type=self.type,
parameters=params.model_dump(), context=ctx.raw,
diff --git a/server/nodes/twitter/twitter_receive.py b/server/nodes/twitter/twitter_receive/__init__.py
similarity index 98%
rename from server/nodes/twitter/twitter_receive.py
rename to server/nodes/twitter/twitter_receive/__init__.py
index 0f77e56f..886f513a 100644
--- a/server/nodes/twitter/twitter_receive.py
+++ b/server/nodes/twitter/twitter_receive/__init__.py
@@ -8,7 +8,7 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import NodeContext, Operation, TaskQueue, TriggerNode
-from ._credentials import TwitterCredential
+from .._credentials import TwitterCredential
class TwitterReceiveParams(BaseModel):
diff --git a/server/nodes/twitter/twitter_search.py b/server/nodes/twitter/twitter_search/__init__.py
similarity index 98%
rename from server/nodes/twitter/twitter_search.py
rename to server/nodes/twitter/twitter_search/__init__.py
index bd596b0c..d66612e1 100644
--- a/server/nodes/twitter/twitter_search.py
+++ b/server/nodes/twitter/twitter_search/__init__.py
@@ -9,9 +9,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import TwitterCredential
+from .._credentials import TwitterCredential
-from ._base import (
+from .._base import (
call_with_retry, format_tweet, includes_lookups,
sync_search_recent, track_twitter_usage,
)
diff --git a/server/nodes/twitter/twitter_send.py b/server/nodes/twitter/twitter_send/__init__.py
similarity index 99%
rename from server/nodes/twitter/twitter_send.py
rename to server/nodes/twitter/twitter_send/__init__.py
index 4bf2487c..e2b42741 100644
--- a/server/nodes/twitter/twitter_send.py
+++ b/server/nodes/twitter/twitter_send/__init__.py
@@ -9,9 +9,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import TwitterCredential
+from .._credentials import TwitterCredential
-from ._base import (
+from .._base import (
call_with_retry, format_response, get_my_user_id, track_twitter_usage,
)
diff --git a/server/nodes/twitter/twitter_user.py b/server/nodes/twitter/twitter_user/__init__.py
similarity index 97%
rename from server/nodes/twitter/twitter_user.py
rename to server/nodes/twitter/twitter_user/__init__.py
index 80fbb550..e58355ab 100644
--- a/server/nodes/twitter/twitter_user.py
+++ b/server/nodes/twitter/twitter_user/__init__.py
@@ -9,9 +9,9 @@ from pydantic import BaseModel, ConfigDict, Field
from services.plugin import ActionNode, NodeContext, Operation, TaskQueue
-from ._credentials import TwitterCredential
+from .._credentials import TwitterCredential
-from ._base import call_with_retry, format_user, get_my_user_id, track_twitter_usage
+from .._base import call_with_retry, format_user, get_my_user_id, track_twitter_usage
class TwitterUserParams(BaseModel):