Merge remote-tracking branch 'upstream/dev' into feat/replace-logs

surfsense_backend/app/db.py

@@ -80,6 +80,7 @@ class SearchSourceConnectorType(str, Enum):
     WEBCRAWLER_CONNECTOR = "WEBCRAWLER_CONNECTOR"
     BOOKSTACK_CONNECTOR = "BOOKSTACK_CONNECTOR"
     CIRCLEBACK_CONNECTOR = "CIRCLEBACK_CONNECTOR"
+    MCP_CONNECTOR = "MCP_CONNECTOR"  # Model Context Protocol - User-defined API tools
 
 
 class LiteLLMProvider(str, Enum):
@@ -412,8 +413,17 @@ class NewChatMessage(BaseModel, TimestampMixin):
         index=True,
     )
 
-    # Relationship
+    # Track who sent this message (for shared chats)
+    author_id = Column(
+        UUID(as_uuid=True),
+        ForeignKey("user.id", ondelete="SET NULL"),
+        nullable=True,
+        index=True,
+    )
+
+    # Relationships
     thread = relationship("NewChatThread", back_populates="messages")
+    author = relationship("User")
 
 
 class Document(BaseModel, TimestampMixin):
@@ -611,7 +621,8 @@ class SearchSourceConnector(BaseModel, TimestampMixin):
             "search_space_id",
             "user_id",
             "connector_type",
-            name="uq_searchspace_user_connector_type",
+            "name",
+            name="uq_searchspace_user_connector_type_name",
         ),
     )
 
@@ -919,6 +930,10 @@ if config.AUTH_TYPE == "GOOGLE":
         )
         pages_used = Column(Integer, nullable=False, default=0, server_default="0")
 
+        # User profile from OAuth
+        display_name = Column(String, nullable=True)
+        avatar_url = Column(String, nullable=True)
+
 else:
 
     class User(SQLAlchemyBaseUserTableUUID, Base):
@@ -958,6 +973,10 @@ else:
         )
         pages_used = Column(Integer, nullable=False, default=0, server_default="0")
 
+        # User profile (can be set manually for non-OAuth users)
+        display_name = Column(String, nullable=True)
+        avatar_url = Column(String, nullable=True)
+
 
 engine = create_async_engine(DATABASE_URL)
 async_session_maker = async_sessionmaker(engine, expire_on_commit=False)