refactor: container

Author: pipech

raven/omni_channel_chat/README.md

@@ -22,7 +22,7 @@
 
 **Remark**
 
-1. Public / Private file has to be handle properly, currently files upload to raven will be private file but chat required it to be private.
+1. Public / Private file has to be handle properly, currently files upload to raven will be private file but chat required it to be private
 
 ## TODO
 
@@ -34,3 +34,10 @@
 
 - [ ] Instagram
 - [ ] WhatsApp
+
+### Misc
+
+- [ ] Outgoing messages needs message id so we could reply to it properly
+- [x] Provider from social login has to change to use provider id, using just "facebook" or "line" will cause error when there are more than 1 provider per each provider (prefix like `OCC_` should be add to provider)
+- [x] On BaseMessage `provider` should be change to `provider_id`
+- [ ] Create inject interface for connector class

raven/omni_channel_chat/doctype/omni_channel_chat_provider/provider/facebook_provider.py

@@ -32,7 +32,7 @@ class FacebookConfig:
 
 
 class FacebookProvider(Provider[FacebookMessagingEvent]):
-	fb_api_url = "https://graph.facebook.com/v25.0/me/messages"
+	fb_api_url = "https://graph.facebook.com/v25.0"
 
 	def __init__(self, config):
 		super().__init__(config=config)
@@ -90,7 +90,7 @@ def get_user_info(self, user_id: str) -> UserInfo:
 	def show_typing(self, user_id: str) -> None:
 		with httpx.Client() as client:
 			client.post(
-				self.fb_api_url,
+				f"{self.fb_api_url}/me/messages",
 				params={"access_token": self.config.page_access_token},
 				json={"recipient": {"id": user_id}, "sender_action": "typing_on"},
 			)
@@ -101,7 +101,7 @@ def send_reply(self, message: BaseMessage) -> None:
 	def send_message(self, message: BaseMessage) -> None:
 		with httpx.Client() as client:
 			client.post(
-				self.fb_api_url,
+				f"{self.fb_api_url}/me/messages",
 				params={"access_token": self.config.page_access_token},
 				json={"recipient": {"id": message.user_id}, "message": message.to_provider()},
 			)
@@ -127,7 +127,11 @@ def event_mapper(self, event: FacebookMessagingEvent) -> BaseMessage | None:
 
 		if "text" in message:
 			return TextMessage(
-				provider="facebook", user_id=user_id, metadata=metadata, text=message["text"]
+				provider=self.provider_config.provider,
+				provider_id=self.provider_config.name,
+				user_id=user_id,
+				metadata=metadata,
+				text=message["text"],
 			)
 
 		for attachment in message.get("attachments") or []:
@@ -137,14 +141,16 @@ def event_mapper(self, event: FacebookMessagingEvent) -> BaseMessage | None:
 				continue
 			if att_type == "image":
 				return ImageMessage(
-					provider="facebook",
+					provider=self.provider_config.provider,
+					provider_id=self.provider_config.name,
 					user_id=user_id,
 					metadata=metadata,
 					file=self.download_attachment(url),
 				)
 			if att_type in ("file", "document"):
 				return FileMessage(
-					provider="facebook",
+					provider=self.provider_config.provider,
+					provider_id=self.provider_config.name,
 					user_id=user_id,
 					metadata=metadata,
 					file=self.download_attachment(url),

raven/omni_channel_chat/doctype/omni_channel_chat_provider/provider/line_provider.py

@@ -22,6 +22,7 @@
 	FileContent,
 	FileMessage,
 	ImageMessage,
+	UserInfo,
 )
 from raven.omni_channel_chat.models.message import (
 	TextMessage as StdTextMessage,
@@ -50,14 +51,14 @@ def handle_frappe_api(self, callback: Callable[[BaseMessage], None]) -> Response
 		headers: dict = dict(request.headers)
 		return self.handle_webhook(body=body, headers=headers, callback=callback)
 
-	def get_user_info(self, user_id: str) -> dict:
+	def get_user_info(self, user_id: str) -> UserInfo:
 		with ApiClient(self.config) as api_client:
 			profile = MessagingApi(api_client).get_profile(user_id)
-			return {
-				"user_id": profile.user_id,
-				"display_name": profile.display_name,
-				"picture_url": profile.picture_url,
-			}
+			return UserInfo(
+				user_id=profile.user_id,
+				display_name=profile.display_name,
+				picture_url=profile.picture_url,
+			)
 
 	def show_typing(self, user_id: str) -> None:
 		with ApiClient(self.config) as api_client:
@@ -85,7 +86,7 @@ def send_reply(self, message: BaseMessage) -> None:
 	def send_message(self, message: BaseMessage) -> None:
 		with ApiClient(self.config) as api_client:
 			MessagingApi(api_client).push_message(
-				PushMessageRequest(to=message.user_id, messages=[message.to_provider()])
+				PushMessageRequest(to=message.user_id, messages=[message.to_line()])
 			)
 
 	def download_attachment(self, message_id: str, file_name: str | None = None) -> FileContent:
@@ -103,20 +104,26 @@ def event_mapper(self, event: LineEvent) -> BaseMessage | None:
 
 		if isinstance(msg, TextMessageContent):
 			return StdTextMessage(
-				provider="line", user_id=user_id, metadata=metadata, text=msg.text
+				provider=self.provider_config.provider,
+				provider_id=self.provider_config.name,
+				user_id=user_id,
+				metadata=metadata,
+				text=msg.text,
 			)
 
 		if isinstance(msg, ImageMessageContent):
 			return ImageMessage(
-				provider="line",
+				provider=self.provider_config.provider,
+				provider_id=self.provider_config.name,
 				user_id=user_id,
 				metadata=metadata,
 				file=self.download_attachment(msg.id, f"{msg.id}.jpg"),
 			)
 
 		if isinstance(msg, FileMessageContent):
 			return FileMessage(
-				provider="line",
+				provider=self.provider_config.provider,
+				provider_id=self.provider_config.name,
 				user_id=user_id,
 				metadata=metadata,
 				file=self.download_attachment(msg.id, msg.file_name),

raven/omni_channel_chat/models/message.py

@@ -56,6 +56,8 @@ def build_line_sender(self) -> LineSender | None:
 @dataclass(kw_only=True)
 class BaseMessage(ABC, LineMessageMixin):
 	provider: "ProviderType"
+
+	provider_id: str
 	user_id: str
 
 	sender: SenderInfo | None = None