Spaces:
Running
on
Zero
Running
on
Zero
Commit
·
46c8f02
1
Parent(s):
ca208c8
Rename get_user_message to get_last_user_message for clarity and update usage in http_bot
Browse files- app.py +1 -1
- conversation.py +5 -5
app.py
CHANGED
@@ -246,7 +246,7 @@ def http_bot(
|
|
246 |
|
247 |
try:
|
248 |
# Stream output
|
249 |
-
message = state.
|
250 |
logger.info(f"==== User message ====\n{message}")
|
251 |
logger.info(f"==== Image paths ====\n{all_image_paths}")
|
252 |
|
|
|
246 |
|
247 |
try:
|
248 |
# Stream output
|
249 |
+
message = state.get_last_user_message(source=state.USER)
|
250 |
logger.info(f"==== User message ====\n{message}")
|
251 |
logger.info(f"==== Image paths ====\n{all_image_paths}")
|
252 |
|
conversation.py
CHANGED
@@ -174,14 +174,14 @@ class Conversation:
|
|
174 |
|
175 |
return images
|
176 |
|
177 |
-
def
|
178 |
assert len(self.messages) > 0, "No message in the conversation."
|
179 |
assert source in [self.USER, self.ASSISTANT, None], f"Invalid source: {source}"
|
180 |
-
for i
|
181 |
-
if source and
|
182 |
continue
|
183 |
-
if
|
184 |
-
return
|
185 |
|
186 |
def to_gradio_chatbot(self):
|
187 |
ret = []
|
|
|
174 |
|
175 |
return images
|
176 |
|
177 |
+
def get_last_user_message(self, source: Union[str, None] = None):
|
178 |
assert len(self.messages) > 0, "No message in the conversation."
|
179 |
assert source in [self.USER, self.ASSISTANT, None], f"Invalid source: {source}"
|
180 |
+
for i in range(len(self.messages) - 1, -1, -1):
|
181 |
+
if source and self.messages[i]["role"] != source:
|
182 |
continue
|
183 |
+
if self.messages[i]["role"] == self.USER:
|
184 |
+
return self.messages[i]["content"]
|
185 |
|
186 |
def to_gradio_chatbot(self):
|
187 |
ret = []
|