fixed bugs for chat_history version

app/callbacks.py

@@ -1,4 +1,5 @@
 from typing import Dict, Any, List
+from datetime import datetime
 from langchain_core.callbacks import BaseCallbackHandler
 import schemas
 import crud
@@ -15,8 +16,8 @@ class LogResponseCallback(BaseCallbackHandler):
         """Run when llm ends running."""
         # TODO: The function on_llm_end is going to be called when the LLM stops sending 
         # the response. Use the crud.add_message function to capture that response.
-        print(outputs)
-        message = schemas.MessageBase(message=outputs.get('text'), type='AI')
+        # print("Full outputs object:", outputs)
+        message = schemas.MessageBase(message=outputs.generations[0][0].text, type='AI', timestamp=datetime.now())
         crud.add_message(self.db, message=message, username=self.user_request.username)
 
     def on_llm_start(

app/main.py

@@ -1,5 +1,6 @@
 import sys
 import os
+from datetime import datetime
 
 from langchain_core.runnables import Runnable
 from langchain_core.callbacks import BaseCallbackHandler
@@ -98,11 +99,14 @@ async def history_stream(request: Request, db: Session = Depends(get_db)):
     chat_history = crud.get_user_chat_history(db=db, username=user_request.username)
 
     # - We add as part of the user history the current question by using add_message.
-    message = schemas.MessageBase(message=user_request.question, type='User')
+    message = schemas.MessageBase(message=user_request.question, type='User', timestamp=datetime.now())
     crud.add_message(db, message=message, username=user_request.username)
 
     # - We create an instance of HistoryInput by using format_chat_history.
-    history_input = schemas.HistoryInput(question=user_request.username, chat_history=chat_history)
+    history_input = schemas.HistoryInput(
+        question=user_request.question, 
+        chat_history=prompts.format_chat_history(chat_history)
+    )
 
     # - We use the history input within the history chain.
     return EventSourceResponse(generate_stream(

app/models.py

@@ -50,6 +50,6 @@ class Message(Base):
     user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
     message = Column(String, nullable=False)
     type = Column(String, nullable=False)
-    timestamp = Column(DateTime, default=datetime.utcnow, nullable=False)
+    timestamp = Column(DateTime, default=datetime.now(), nullable=False)
     
     user = relationship("User", back_populates="messages")

app/prompts.py

@@ -37,12 +37,14 @@ def format_chat_history(messages: List[models.Message]):
     # TODO:  implement format_chat_history to format 
     # the list of Message into a text of chat history.
     
+    # Sort messages by timestamp using a lambda function
+    ordered_messages = sorted(messages, key=lambda m: m.timestamp, reverse=False)
     return '\n'.join([
         '[{}] {}: {}'.format(
             message.timestamp.strftime("%Y-%m-%d %H:%M:%S"),
             message.type,
             message.message
-        ) for message in messages
+        ) for message in ordered_messages
     ])
 
 
@@ -88,7 +90,7 @@ raw_prompt_formatted = format_prompt(prompt)
 
 
 # TODO: use format_prompt to create history_prompt_formatted
-history_prompt_formatted =  format_prompt(history_prompt)
+history_prompt_formatted = format_prompt(history_prompt)
 
 # TODO: use format_prompt to create standalone_prompt_formatted
 standalone_prompt_formatted: PromptTemplate = None

app/schemas.py

@@ -18,8 +18,9 @@ class UserRequest(BaseModel):
 # TODO: implement MessageBase as a schema mapping from the database model to the 
 # FastAPI data model. Basically MessageBase should have the same attributes as models.Message
 class MessageBase(BaseModel):
-    id: int
-    user_id: int
+    # id: int
+    # user_id: int
     message: str
     type: str
-    timestamp: datetime
+    timestamp: datetime
+    # user: str