fix: Fix bug in which emails would be fetched during initial indexing

backend/onyx/access/models.py

@@ -40,6 +40,14 @@ def truncate_set(s: set[str], max_len: int = 100) -> str:
     def num_entries(self) -> int:
         return len(self.external_user_emails) + len(self.external_user_group_ids)
 
+    @classmethod
+    def public(cls) -> "ExternalAccess":
+        return cls(
+            external_user_emails=set(),
+            external_user_group_ids=set(),
+            is_public=True,
+        )
+
     @classmethod
     def empty(cls) -> "ExternalAccess":
         """

backend/onyx/connectors/teams/connector.py

@@ -13,7 +13,6 @@
 from office365.teams.channels.channel import Channel  # type: ignore
 from office365.teams.team import Team  # type: ignore
 
-from onyx.access.models import ExternalAccess
 from onyx.configs.constants import DocumentSource
 from onyx.connectors.exceptions import ConnectorValidationError
 from onyx.connectors.exceptions import CredentialExpiredError
@@ -33,6 +32,7 @@
 from onyx.connectors.models import TextSection
 from onyx.connectors.teams.models import Message
 from onyx.connectors.teams.utils import fetch_expert_infos
+from onyx.connectors.teams.utils import fetch_external_access
 from onyx.connectors.teams.utils import fetch_messages
 from onyx.connectors.teams.utils import fetch_replies
 from onyx.file_processing.html_utils import parse_html_page_basic
@@ -43,7 +43,6 @@
 logger = setup_logger()
 
 _SLIM_DOC_BATCH_SIZE = 5000
-_PUBLIC_MEMBERSHIP_TYPE = "standard"  # public teams channel
 
 
 class TeamsCheckpoint(ConnectorCheckpoint):
@@ -260,18 +259,8 @@ def retrieve_all_slim_documents(
                     )
                     continue
 
-                is_public = _is_channel_public(channel=channel)
-                expert_infos = (
-                    set()
-                    if is_public
-                    else fetch_expert_infos(
-                        graph_client=self.graph_client, channel=channel
-                    )
-                )
-                external_user_emails = set(
-                    expert_info.email
-                    for expert_info in expert_infos
-                    if expert_info.email
+                external_access = fetch_external_access(
+                    graph_client=self.graph_client, channel=channel
                 )
 
                 messages = fetch_messages(
@@ -287,11 +276,7 @@ def retrieve_all_slim_documents(
                     slim_doc_buffer.append(
                         SlimDocument(
                             id=message.id,
-                            external_access=ExternalAccess(
-                                external_user_emails=external_user_emails,
-                                external_user_group_ids=set(),
-                                is_public=is_public,
-                            ),
+                            external_access=external_access,
                         )
                     )
 
@@ -336,9 +321,6 @@ def _convert_thread_to_document(
     if len(thread) == 0:
         return None
 
-    expert_infos = fetch_expert_infos(graph_client=graph_client, channel=channel)
-    emails = set(expert_info.email for expert_info in expert_infos if expert_info.email)
-
     most_recent_message_datetime: datetime | None = None
     top_message = thread[0]
     thread_text = ""
@@ -361,7 +343,10 @@ def _convert_thread_to_document(
         return None
 
     semantic_string = _construct_semantic_identifier(channel, top_message)
-    is_public = _is_channel_public(channel=channel)
+    expert_infos = fetch_expert_infos(graph_client=graph_client, channel=channel)
+    external_access = fetch_external_access(
+        graph_client=graph_client, channel=channel, expert_infos=expert_infos
+    )
 
     return Document(
         id=top_message.id,
@@ -372,11 +357,7 @@ def _convert_thread_to_document(
         doc_updated_at=most_recent_message_datetime,
         primary_owners=expert_infos,
         metadata={},
-        external_access=ExternalAccess(
-            external_user_emails=emails,
-            external_user_group_ids=set(),
-            is_public=is_public,
-        ),
+        external_access=external_access,
     )
 
 
@@ -558,12 +539,6 @@ def _collect_documents_for_channel(
             )
 
 
-def _is_channel_public(channel: Channel) -> bool:
-    return (
-        channel.membership_type and channel.membership_type == _PUBLIC_MEMBERSHIP_TYPE
-    )
-
-
 if __name__ == "__main__":
     from tests.daily.connectors.utils import load_everything_from_checkpoint_connector
 

backend/onyx/connectors/teams/utils.py

@@ -8,6 +8,7 @@
 from office365.teams.channels.channel import Channel  # type: ignore
 from office365.teams.channels.channel import ConversationMember  # type: ignore
 
+from onyx.access.models import ExternalAccess
 from onyx.connectors.interfaces import SecondsSinceUnixEpoch
 from onyx.connectors.models import BasicExpertInfo
 from onyx.connectors.teams.models import Message
@@ -16,6 +17,9 @@
 logger = setup_logger()
 
 
+_PUBLIC_MEMBERSHIP_TYPE = "standard"  # public teams channel
+
+
 def _retry(
     graph_client: GraphClient,
     request_url: str,
@@ -64,6 +68,34 @@ def _get_next_url(
     return next_url.removeprefix(graph_client.service_root_url()).removeprefix("/")
 
 
+def _get_or_fetch_email(
+    graph_client: GraphClient,
+    member: ConversationMember,
+) -> str | None:
+    if email := member.properties.get("email"):
+        return email
+
+    user_id = member.properties.get("userId")
+    if not user_id:
+        logger.warn(f"No user-id found for this member; {member=}")
+        return None
+
+    json_data = _retry(graph_client=graph_client, request_url=f"users/{user_id}")
+    email = json_data.get("userPrincipalName")
+
+    if not isinstance(email, str):
+        logger.warn(f"Expected email to be of type str, instead got {email=}")
+        return None
+
+    return email
+
+
+def _is_channel_public(channel: Channel) -> bool:
+    return (
+        channel.membership_type and channel.membership_type == _PUBLIC_MEMBERSHIP_TYPE
+    )
+
+
 def fetch_messages(
     graph_client: GraphClient,
     team_id: str,
@@ -115,28 +147,6 @@ def fetch_replies(
         )
 
 
-def _get_or_fetch_email(
-    graph_client: GraphClient,
-    member: ConversationMember,
-) -> str | None:
-    if email := member.properties.get("email"):
-        return email
-
-    user_id = member.properties.get("userId")
-    if not user_id:
-        logger.warn(f"No user-id found for this member; {member=}")
-        return None
-
-    json_data = _retry(graph_client=graph_client, request_url=f"users/{user_id}")
-    email = json_data.get("userPrincipalName")
-
-    if not isinstance(email, str):
-        logger.warn(f"Expected email to be of type str, instead got {email=}")
-        return None
-
-    return email
-
-
 def fetch_expert_infos(
     graph_client: GraphClient, channel: Channel
 ) -> list[BasicExpertInfo]:
@@ -164,3 +174,27 @@ def fetch_expert_infos(
         )
 
     return expert_infos
+
+
+def fetch_external_access(
+    graph_client: GraphClient,
+    channel: Channel,
+    expert_infos: list[BasicExpertInfo] | None = None,
+) -> ExternalAccess:
+    is_public = _is_channel_public(channel=channel)
+
+    if is_public:
+        return ExternalAccess.public()
+
+    expert_infos = (
+        expert_infos
+        if expert_infos is not None
+        else fetch_expert_infos(graph_client=graph_client, channel=channel)
+    )
+    emails = {expert_info.email for expert_info in expert_infos if expert_info.email}
+
+    return ExternalAccess(
+        external_user_emails=emails,
+        external_user_group_ids=set(),
+        is_public=is_public,
+    )

backend/tests/daily/connectors/google_drive/test_drive_perm_sync.py

@@ -74,16 +74,17 @@ def test_gdrive_perm_sync_with_real_data(
         doc_access_generator = gdrive_doc_sync(mock_cc_pair, lambda: [], mock_heartbeat)
         doc_access_list = list(doc_access_generator)
 
+    # Verify we got some results
+    assert len(doc_access_list) > 0
+    print(f"Found {len(doc_access_list)} documents with permissions")
+
     # create new connector
     with patch(
         "ee.onyx.external_permissions.google_drive.group_sync.GoogleDriveConnector",
         return_value=_build_connector(google_drive_service_acct_connector_factory),
     ):
-        external_user_groups = gdrive_group_sync("test_tenant", mock_cc_pair)
-
-    # Verify we got some results
-    assert len(doc_access_list) > 0
-    print(f"Found {len(doc_access_list)} documents with permissions")
+        external_user_group_generator = gdrive_group_sync("test_tenant", mock_cc_pair)
+        external_user_groups = list(external_user_group_generator)
 
     # map group ids to emails
     group_id_to_email_mapping: dict[str, set[str]] = defaultdict(set)

backend/tests/daily/connectors/teams/models.py

@@ -0,0 +1,21 @@
+from pydantic import BaseModel
+
+from onyx.access.models import ExternalAccess
+from onyx.connectors.models import Document
+
+
+class TeamsThread(BaseModel):
+    thread: str
+    external_access: ExternalAccess
+
+    @classmethod
+    def from_doc(cls, document: Document) -> "TeamsThread":
+
+        assert (
+            document.external_access
+        ), f"ExternalAccess should always be available, instead got {document=}"
+
+        return cls(
+            thread=document.get_text_content(),
+            external_access=document.external_access,
+        )