Skip to content
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
2 changes: 2 additions & 0 deletions backend/app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from app.routers import dbt_router, github_router, slack_router, mongodb_router, snowflake_router, notion_router, excel_online_router, s3_router, rest_api_router, jira_router, stripe_router, pipedrive_router
from app.routers import template_router
from app.routers import hubspot_router
from app.routers import salesforce_router
from app.models import User
from app.auth import hash_password, GUEST_USER_ID, ADMIN_USER_ID

Expand Down Expand Up @@ -245,6 +246,7 @@ async def httpx_connect_error_handler(_request: Request, exc: httpx.ConnectError
app.include_router(stripe_router.router, prefix=prefix)
app.include_router(template_router.router, prefix=prefix)
app.include_router(hubspot_router.router, prefix=prefix)
app.include_router(salesforce_router.router, prefix=prefix)
app.include_router(pipedrive_router.router, prefix=prefix)


Expand Down
17 changes: 17 additions & 0 deletions backend/app/routers/ask.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
from app.scripts.ask_snowflake import ask_snowflake
from app.scripts.ask_stripe import ask_stripe
from app.scripts.ask_pipedrive import ask_pipedrive
from app.scripts.ask_salesforce import ask_salesforce
from app.scripts.ask_sql import ask_sql
from app.scripts.ask_sql_multi import ask_sql_multi_source
from app.scripts.sql_utils import validate_source_relationships
Expand Down Expand Up @@ -506,6 +507,22 @@ async def dispatch_question(
history=history,
channel=channel,
)
elif source.type == "salesforce":
meta = source.metadata_ or {}
sf_token = meta.get("accessToken", "")
sf_url = meta.get("instanceUrl", "")
if not sf_token or not sf_url:
raise HTTPException(400, "Salesforce source missing accessToken or instanceUrl in metadata")
result = await ask_salesforce(
access_token=sf_token,
instance_url=sf_url,
question=question,
agent_description=agent.description or "",
source_name=source.name,
llm_overrides=llm_overrides,
history=history,
channel=channel,
)
else:
raise HTTPException(400, f"Unsupported source type: {source.type}")

Expand Down
2 changes: 1 addition & 1 deletion backend/app/routers/crud.py
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ async def create_source(
user: User = Depends(require_user),
):
"""Create a non-file source (BigQuery, Google Sheets, SQL). Credentials stored locally in metadata."""
valid_types = ("bigquery", "google_sheets", "sql_database", "firebase", "mongodb", "snowflake", "notion", "excel_online", "s3", "rest_api", "jira", "hubspot", "stripe", "pipedrive")
valid_types = ("bigquery", "google_sheets", "sql_database", "firebase", "mongodb", "snowflake", "notion", "excel_online", "s3", "rest_api", "jira", "hubspot", "stripe", "pipedrive", "salesforce")
if body.type not in valid_types:
raise HTTPException(400, f"type must be one of: {', '.join(valid_types)}")
source_id = str(uuid.uuid4())
Expand Down
90 changes: 90 additions & 0 deletions backend/app/routers/salesforce_router.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
"""
Salesforce CRM discovery and connection testing.
"""
import asyncio
from fastapi import APIRouter, Depends, HTTPException
from app.auth import require_user
from app.models import User, Source
from app.database import get_db
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from app.routers.crud import _sanitize_for_json

router = APIRouter(prefix="/salesforce", tags=["salesforce"])


@router.post("/test-connection")
async def test_connection(body: dict, user: User = Depends(require_user)):
"""Test Salesforce API connection with the provided access token and instance URL."""
access_token = body.get("accessToken", "")
instance_url = body.get("instanceUrl", "")
if not access_token:
raise HTTPException(400, "accessToken is required")
if not instance_url:
raise HTTPException(400, "instanceUrl is required")

# Normalize instance URL (remove trailing slash)
instance_url = instance_url.rstrip("/")

from app.scripts.ask_salesforce import _test_connection_sync
loop = asyncio.get_event_loop()
try:
result = await loop.run_in_executor(None, lambda: _test_connection_sync(access_token, instance_url))
except Exception as e:
raise HTTPException(400, f"Connection failed: {e}")
return result


@router.post("/discover")
async def discover_objects(body: dict, user: User = Depends(require_user)):
"""Discover available Salesforce CRM objects and their counts."""
access_token = body.get("accessToken", "")
instance_url = body.get("instanceUrl", "")
if not access_token:
raise HTTPException(400, "accessToken is required")
if not instance_url:
raise HTTPException(400, "instanceUrl is required")

instance_url = instance_url.rstrip("/")

from app.scripts.ask_salesforce import _discover_objects_sync
loop = asyncio.get_event_loop()
try:
result = await loop.run_in_executor(None, lambda: _discover_objects_sync(access_token, instance_url))
except Exception as e:
raise HTTPException(400, f"Discovery failed: {e}")
return _sanitize_for_json(result)


@router.post("/sources/{source_id}/refresh-metadata")
async def refresh_source_metadata(
source_id: str, db: AsyncSession = Depends(get_db), user: User = Depends(require_user),
):
r = await db.execute(select(Source).where(Source.id == source_id, Source.user_id == user.id))
source = r.scalar_one_or_none()
if not source:
raise HTTPException(404, "Source not found")
if source.type != "salesforce":
raise HTTPException(400, "Source is not Salesforce")

meta = dict(source.metadata_ or {})
access_token = meta.get("accessToken", "")
instance_url = meta.get("instanceUrl", "")
if not access_token or not instance_url:
raise HTTPException(400, "Source missing accessToken or instanceUrl")

instance_url = instance_url.rstrip("/")

from app.scripts.ask_salesforce import _discover_objects_sync, REPORT_TEMPLATES
loop = asyncio.get_event_loop()
try:
result = await loop.run_in_executor(None, lambda: _discover_objects_sync(access_token, instance_url))
except Exception as e:
raise HTTPException(400, f"Refresh failed: {e}")

meta["objectCounts"] = result.get("objectCounts", {})
meta["report_templates"] = REPORT_TEMPLATES
source.metadata_ = _sanitize_for_json(meta)
await db.commit()
await db.refresh(source)
return {"metaJSON": source.metadata_}
Loading
Loading