k

backend/ee/onyx/server/tenants/provisioning.py

@@ -128,7 +128,6 @@ async def provision_tenant(tenant_id: str, email: str) -> None:
         with get_session_with_tenant(tenant_id) as db_session:
             create_milestone_and_report(
                 user=None,
-                tenant_id=tenant_id,
                 distinct_id=tenant_id,
                 event_type=MilestoneRecordType.TENANT_CREATED,
                 properties={

backend/onyx/auth/users.py

@@ -286,7 +286,6 @@ async def create(
             if not user_count:
                 create_milestone_and_report(
                     user=user,
-                    tenant_id=tenant_id,
                     distinct_id=user.email,
                     event_type=MilestoneRecordType.USER_SIGNED_UP,
                     properties=None,
@@ -295,7 +294,6 @@ async def create(
             else:
                 create_milestone_and_report(
                     user=user,
-                    tenant_id=tenant_id,
                     distinct_id=user.email,
                     event_type=MilestoneRecordType.MULTIPLE_USERS,
                     properties=None,

backend/onyx/background/indexing/run_indexing.py

@@ -401,7 +401,6 @@ def _run_indexing(
 
         create_milestone_and_report(
             user=None,
-            tenant_id=tenant_id,
             distinct_id=tenant_id or "N/A",
             event_type=MilestoneRecordType.CONNECTOR_SUCCEEDED,
             properties=None,

backend/onyx/chat/process_message.py

@@ -364,7 +364,6 @@ def stream_chat_message_objects(
 
         multi_assistant_milestone, _is_new = create_milestone_if_not_exists(
             user=user,
-            tenant_id=tenant_id,
             event_type=MilestoneRecordType.MULTIPLE_ASSISTANTS,
             db_session=db_session,
         )

backend/onyx/db/milestone.py

@@ -13,14 +13,12 @@
 
 def create_milestone(
     user: User | None,
-    tenant_id: str | None,
     event_type: MilestoneRecordType,
     db_session: Session,
 ) -> Milestone:
     milestone = Milestone(
         event_type=event_type,
         user_id=user.id if user else None,
-        tenant_id=tenant_id,
     )
     db_session.add(milestone)
     db_session.commit()
@@ -30,7 +28,6 @@ def create_milestone(
 
 def create_milestone_if_not_exists(
     user: User | None,
-    tenant_id: str | None,
     event_type: MilestoneRecordType,
     db_session: Session,
 ) -> tuple[Milestone, bool]:
@@ -41,18 +38,15 @@ def create_milestone_if_not_exists(
     # Every milestone should only happen once per deployment/tenant
     stmt = select(Milestone).where(
         Milestone.event_type == event_type,
-        Milestone.tenant_id == tenant_id,
     )
     result = db_session.execute(stmt)
     milestones = result.scalars().all()
 
     if len(milestones) > 1:
-        raise ValueError(
-            f"Multiple {event_type} milestones found for tenant {tenant_id}"
-        )
+        raise ValueError(f"Multiple {event_type} milestones found")
 
     if not milestones:
-        return create_milestone(user, tenant_id, event_type, db_session), True
+        return create_milestone(user, event_type, db_session), True
 
     return milestones[0], False
 

backend/onyx/db/models.py

@@ -1543,7 +1543,6 @@ class Milestone(Base):
     id: Mapped[UUID] = mapped_column(
         PGUUID(as_uuid=True), primary_key=True, default=uuid4
     )
-    tenant_id: Mapped[str | None] = mapped_column(String, nullable=True)
     user_id: Mapped[UUID | None] = mapped_column(
         ForeignKey("user.id", ondelete="CASCADE"), nullable=True
     )

backend/onyx/server/documents/connector.py

@@ -644,7 +644,6 @@ def get_connector_indexing_status(
     # Visiting admin page brings the user to the current connectors page which calls this endpoint
     create_milestone_and_report(
         user=user,
-        tenant_id=tenant_id,
         distinct_id=user.email if user else tenant_id or "N/A",
         event_type=MilestoneRecordType.VISITED_ADMIN_PAGE,
         properties=None,
@@ -697,7 +696,6 @@ def create_connector_from_model(
 
         create_milestone_and_report(
             user=user,
-            tenant_id=tenant_id,
             distinct_id=user.email if user else tenant_id or "N/A",
             event_type=MilestoneRecordType.CREATED_CONNECTOR,
             properties=None,
@@ -756,7 +754,6 @@ def create_connector_with_mock_credential(
 
         create_milestone_and_report(
             user=user,
-            tenant_id=tenant_id,
             distinct_id=user.email if user else tenant_id or "N/A",
             event_type=MilestoneRecordType.CREATED_CONNECTOR,
             properties=None,

backend/onyx/server/features/persona/api.py

@@ -181,7 +181,6 @@ def create_persona(
 
     create_milestone_and_report(
         user=user,
-        tenant_id=tenant_id,
         distinct_id=tenant_id or "N/A",
         event_type=MilestoneRecordType.CREATED_ASSISTANT,
         properties=None,

backend/onyx/server/manage/slack_bot.py

@@ -232,7 +232,6 @@ def create_bot(
 
     create_milestone_and_report(
         user=None,
-        tenant_id=tenant_id,
         distinct_id=tenant_id or "N/A",
         event_type=MilestoneRecordType.CREATED_ONYX_BOT,
         properties=None,

backend/onyx/server/query_and_chat/chat_backend.py

@@ -355,7 +355,6 @@ def handle_new_chat_message(
     with get_session_with_tenant(tenant_id) as db_session:
         create_milestone_and_report(
             user=user,
-            tenant_id=tenant_id,
             distinct_id=user.email if user else tenant_id or "N/A",
             event_type=MilestoneRecordType.RAN_QUERY,
             properties=None,

backend/onyx/utils/telemetry.py

@@ -132,13 +132,12 @@ def mt_cloud_telemetry(
 
 def create_milestone_and_report(
     user: User | None,
-    tenant_id: str | None,
     distinct_id: str,
     event_type: MilestoneRecordType,
     properties: dict | None,
     db_session: Session,
 ) -> None:
-    _, is_new = create_milestone_if_not_exists(user, tenant_id, event_type, db_session)
+    _, is_new = create_milestone_if_not_exists(user, event_type, db_session)
     if is_new:
         mt_cloud_telemetry(
             distinct_id=distinct_id,

backend/scripts/restart_containers.sh

@@ -48,4 +48,7 @@ sleep 1
 echo "Running Alembic migration..."
 alembic upgrade head
 
+# Run the following instead of the above if using MT cloud
+# alembic -n schema_private upgrade head
+
 echo "Containers restarted and migration completed."