update

app.py

@@ -1,23 +1,24 @@
 from fastapi import FastAPI, Request
 from fastapi.responses import JSONResponse
 from starlette.middleware.cors import CORSMiddleware
-
 from chainlit.auth import create_jwt
 from chainlit.user import User
 from chainlit.utils import mount_chainlit
 from chainlit.context import init_http_context, init_ws_context
-from chainlit.session import WebsocketSession
+from chainlit.session import WebsocketSession, HTTPSession
 import chainlit as cl
+import assistant as giino
+
 
 app = FastAPI()
 
-app.add_middleware(
-    CORSMiddleware,
-    allow_origins=["*"],
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-)
+# app.add_middleware(
+#     CORSMiddleware,
+#     allow_origins=["*"],
+#     allow_credentials=True,
+#     allow_methods=["*"],
+#     allow_headers=["*"],
+# )
 
 
 @app.get("/custom-auth")
@@ -29,17 +30,74 @@ async def custom_auth():
 @app.get("/app")
 async def read_main():
     init_http_context()
-    await cl.Message(content="Hello, I am a chatbot!").send()
-    return {"message": "Hello World from main app"}
+    sid = await giino.start()
+    # await cl.Message(content="Hello, I am a chatbot!").send()
+    print(print("Session id from app:", cl.user_session.get("id")))
+    return {
+        "message": "Hello World from main app",
+        "sessionId": sid
+    }
 
-@app.get("/hello/{session_id}")
-async def hello(
+@app.get("/chat/{session_id}/{message}")
+async def chat(
     request: Request,
     session_id: str,
+    message: str
 ):
+    # http_session = HTTPSession(session_id=)
+    init_http_context()
     ws_session = WebsocketSession.get_by_id(session_id=session_id)
     init_ws_context(ws_session)
-    await cl.Message(content="Hello World").send()
-    return "Data sent to the websocket client"
+    # await cl.Message(content=message).send()
+    msg = await giino.chat(message)
+
+    return msg
+
+mount_chainlit(app=app, target="assistant.py", path="/telzho")
 
-mount_chainlit(app=app, target="giino-assistant.py", path="/telzho")
+# import httpx
+# from fastapi import FastAPI, HTTPException
+# from pydantic import BaseModel
+# import subprocess
+# import asyncio
+# import requests
+#
+# app = FastAPI()
+#
+#
+# class Message(BaseModel):
+#     message: str
+#
+#
+# @app.post("/send")
+# async def send_message(message: Message):
+#     try:
+#         # Send the message to the Chainlit app
+#         response = await forward_to_chainlit(message.message)
+#         return {"response": response}
+#     except Exception as e:
+#         raise HTTPException(status_code=500, detail=str(e))
+#
+# async def forward_to_chainlit(message: str) -> str:
+#     chainlit_url = "http://0.0.0.0:8000/api/chainlit"  # Adjust as needed
+#     payload = {"message": message}
+#
+#     async with httpx.AsyncClient() as client:
+#         response = await client.post(chainlit_url, json=payload)
+#         response.raise_for_status()  # Ensure the request was successful
+#         response_data = response.json()
+#         return response_data.get("response", "No response from Chainlit")
+#
+#
+#
+# # Existing code for Chainlit app setup...
+#
+# @app.on_event("startup")
+# async def startup_event():
+#     # Start the Chainlit app in a separate thread
+#     loop = asyncio.get_event_loop()
+#     loop.run_in_executor(None, start_chainlit)
+#
+#
+# def start_chainlit():
+#     subprocess.run(["chainlit", "run", "chainlit_app.py", "-h", "0.0.0.0", "-p", "8000"])

giino-assistant.py → assistant.py

@@ -184,6 +184,7 @@ async def set_starters():
 
 @cl.on_chat_start
 async def start():
+    print("Session id:", cl.user_session.get("id"))
     is_dev_mode = True if os.getenv("DEV_MODE") else False
 
     cl.user_session.set(
@@ -328,6 +329,7 @@ async def start():
 
     # Set the assistant in the user session
     cl.user_session.set("agent", telzho_assistant)
+    return cl.user_session.get("id")
 
 
 @cl.on_audio_chunk
@@ -385,6 +387,28 @@ async def on_audio_end(elements: list[ElementBased]):
     answer_message.elements = [output_audio_el]
     await answer_message.update()
 
+@cl.on_message
+async def chat(message: str):
+
+    message_history = cl.user_session.get("message_history")
+    message_history.append({"role": "user", "content": message})
+
+    msg = cl.Message(content="")
+    await msg.send()
+
+    # Retrieve the assistant from the user sessions
+    agent = cl.user_session.get("agent")
+
+    # Process the user message using the assistant
+    for delta in agent.run(message, stream=True):
+        for part in delta:
+            if token := part or "":
+                # Send the response back to the user
+                await msg.stream_token(token)
+
+    message_history.append({"role": "assistant", "content": msg.content})
+    await msg.update()
+    return msg.content
 
 @cl.on_message
 async def main(message: cl.Message):
@@ -407,6 +431,7 @@ async def main(message: cl.Message):
 
     message_history.append({"role": "assistant", "content": msg.content})
     await msg.update()
+    return msg.content
 
 # Run the Chainlit application
 if __name__ == "__main__":

run.py

@@ -34,4 +34,4 @@ async def main():
 
 asyncio.run(main())
 # web: docker-compose up --build
-# web: python -m chainlit run giino-assistant.py -h --port 8080
+# web: python -m chainlit run assistant.py -h --port 8080