merge

zhaoqingang

2024-11-22 600d2205367bf914dceaf97e6f082383aa54348c

merge

 app/api/chat.py

@@ -209,11 +209,11 @@
                question = message.get("message")
                try:
                    SessionService(db).create_session(
                        session_id=chat_id,
                        name=question,
                        agent_id=agent_id,
                        agent_type=AgentType.BASIC,
                        user_id=current_user.id
                        chat_id,
                        question,
                        agent_id,
                        AgentType.BASIC,
                        current_user.id
                    )
                except Exception as e:
                    logger.error(e)
@@ -237,7 +237,7 @@
                                                              message={"role": "assistant", "content": result})
                        except Exception as e:
                            logger.error(e)
                        logger.error("-----------------11111111--------------------")
                        logger.error("-----------------返回数据--------------------")
                        await websocket.send_json(result | data)
                    except Exception as e2:


 app/service/session.py

@@ -22,12 +22,13 @@
        返回:
            SessionModel: 新创建的会话模型实例，如果会话ID已存在则返回None。
        """
        logger.error("-------------xieru")
        existing_session = self.get_session_by_id(session_id)
        if existing_session:
            message=existing_session.message
            message.append({"role": "user", "content": name})
            self.update_session(session_id, message=message)

        logger.error("-------------xieru------------1")
        new_session = SessionModel(
            id=session_id,
            name=name[0:200],
@@ -68,12 +69,15 @@
        session = self.db.query(SessionModel).filter_by(id=session_id).first()
        if session:
            if "message" in kwargs:

                message = session.message
                logger.error(kwargs)
                message.append(kwargs["message"])
                session = message
                session.message = message
                logger.error("更新数据--------------------------11111111-")
                logger.error(message)
                self.db.commit()
                self.db.refresh(session)
                logger.error("更新数据完成--------------------------1111111122222222-")
        return session

    def delete_session(self, session_id: str) -> None: