mirror of
https://github.com/infiniflow/ragflow.git
synced 2026-07-06 03:18:36 +08:00
15f50e5cb2
## Summary - The `ChatChannel` DB column was renamed from `dialog_id` to `chat_id` via a migration (added in a prior commit). - Aligns the REST API layer (`chat_channel_api.py`, `chat_channel_service.py`) to use `chat_id` consistently. - Updates the frontend (`interface.ts`, `hooks.ts`, `connect-dialog-modal.tsx`, `added-channel-card.tsx`) to read/write `chat_id` instead of `dialog_id`. - The joined `dialog_name` alias in the list query is unchanged (backend still returns it under that name). Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
83 lines
2.8 KiB
Python
83 lines
2.8 KiB
Python
#
|
|
# Copyright 2024 The InfiniFlow Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
#
|
|
import logging
|
|
|
|
from peewee import JOIN
|
|
|
|
from api.db.db_models import DB, ChatChannel, Dialog
|
|
from api.db.services.common_service import CommonService
|
|
|
|
LOGGER = logging.getLogger(__name__)
|
|
|
|
|
|
class ChatChannelService(CommonService):
|
|
model = ChatChannel
|
|
|
|
@classmethod
|
|
@DB.connection_context()
|
|
def list(cls, tenant_id):
|
|
"""List a tenant's chat channel bots with their connected dialog (no credentials)."""
|
|
fields = [
|
|
cls.model.id,
|
|
cls.model.name,
|
|
cls.model.channel,
|
|
cls.model.chat_id,
|
|
cls.model.status,
|
|
Dialog.name.alias("dialog_name"),
|
|
]
|
|
return list(
|
|
cls.model.select(*fields)
|
|
.join(
|
|
Dialog,
|
|
join_type=JOIN.LEFT_OUTER,
|
|
on=(Dialog.id == cls.model.chat_id),
|
|
)
|
|
.where(cls.model.tenant_id == tenant_id)
|
|
.order_by(cls.model.create_time.desc())
|
|
.dicts()
|
|
)
|
|
|
|
@classmethod
|
|
@DB.connection_context()
|
|
def list_active(cls):
|
|
"""Return all enabled chat channel bots across tenants (with credentials)."""
|
|
return list(cls.model.select().where(cls.model.status == 1))
|
|
|
|
@classmethod
|
|
@DB.connection_context()
|
|
def accessible(cls, channel_id: str, user_id: str) -> bool:
|
|
"""Return whether the user can access the chat channel's tenant."""
|
|
e, channel = cls.get_by_id(channel_id)
|
|
if not e:
|
|
LOGGER.warning("chat channel access denied: not found channel_id=%s user_id=%s", channel_id, user_id)
|
|
return False
|
|
|
|
if channel.tenant_id == user_id:
|
|
return True
|
|
|
|
from api.db.services.user_service import TenantService
|
|
|
|
joined_tenants = TenantService.get_joined_tenants_by_user_id(user_id)
|
|
has_access = any(tenant["tenant_id"] == channel.tenant_id for tenant in joined_tenants)
|
|
if not has_access:
|
|
LOGGER.warning(
|
|
"chat channel access denied: tenant mismatch channel_id=%s user_id=%s tenant_id=%s",
|
|
channel_id,
|
|
user_id,
|
|
channel.tenant_id,
|
|
)
|
|
return has_access
|