Skip to content
Merged
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
13 changes: 7 additions & 6 deletions zulip_bots/zulip_bots/bots/salesforce/salesforce.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
import re
from typing import Any, Collection, Dict, List

import simple_salesforce
# Upstream issue with simple_salesforce
# https://github.com/simple-salesforce/simple-salesforce/issues/723
from simple_salesforce import Salesforce # type: ignore[attr-defined]
from simple_salesforce.exceptions import SalesforceAuthenticationFailed

from zulip_bots.bots.salesforce.utils import commands, default_query, link_query, object_types
from zulip_bots.lib import BotHandler
Expand Down Expand Up @@ -73,9 +76,7 @@ def format_result(
return output


def query_salesforce(
arg: str, salesforce: simple_salesforce.Salesforce, command: Dict[str, Any]
) -> str:
def query_salesforce(arg: str, salesforce: Salesforce, command: Dict[str, Any]) -> str:
arg = arg.strip()
qarg = arg.split(" -", 1)[0]
split_args: List[str] = []
Expand Down Expand Up @@ -164,12 +165,12 @@ def get_salesforce_response(self, content: str) -> str:
def initialize(self, bot_handler: BotHandler) -> None:
self.config_info = bot_handler.get_config_info("salesforce")
try:
self.sf = simple_salesforce.Salesforce(
self.sf = Salesforce(
username=self.config_info["username"],
password=self.config_info["password"],
security_token=self.config_info["security_token"],
)
except simple_salesforce.exceptions.SalesforceAuthenticationFailed as err:
except SalesforceAuthenticationFailed as err:
bot_handler.quit(f"Failed to log in to Salesforce. {err.code} {err.message}")

def handle_message(self, message: Dict[str, Any], bot_handler: BotHandler) -> None:
Expand Down
Loading