format error msg

app.py

@@ -7,8 +7,8 @@ from collections import deque
 import contextlib
 from functools import partial
 import shutil
-import urllib.parse
 from datetime import datetime
+import traceback
 import uuid
 from enum import Enum
 from metagpt.logs import set_llm_stream_logfunc
@@ -40,6 +40,7 @@ class SentenceType(Enum):
     TEXT = "text"
     HIHT = "hint"
     ACTION = "action"
+    ERROR = "error"
 
 
 class MessageStatus(Enum):
@@ -63,7 +64,7 @@ class Sentences(BaseModel):
     role: Optional[str] = None
     skill: Optional[str] = None
     description: Optional[str] = None
-    timestamp: str = datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f%z")
+    timestamp: str = Field(default_factory=lambda: datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f%z"))
     status: str
     contents: list[dict]
 
@@ -84,14 +85,14 @@ class ThinkActStep(BaseModel):
     id: str
     status: str
     title: str
-    timestamp: str
+    timestamp: str = Field(default_factory=lambda: datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f%z"))
     description: str
     content: Sentence = None
 
 
 class ThinkActPrompt(BaseModel):
     message_id: int = None
-    timestamp: str = datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f%z")
+    timestamp: str = Field(default_factory=lambda: datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f%z"))
     step: ThinkActStep = None
     skill: Optional[str] = None
     role: Optional[str] = None
@@ -101,7 +102,6 @@ class ThinkActPrompt(BaseModel):
             id=str(tc_id),
             status="running",
             title=action.desc,
-            timestamp=datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%f%z"),
             description=action.desc,
         )
 
@@ -109,7 +109,7 @@ class ThinkActPrompt(BaseModel):
         if is_finished:
             self.step.status = "finish"
         self.step.content = Sentence(
-            type="text",
+            type=SentenceType.TEXT.value,
             id=str(1),
             value=SentenceValue(answer=message.content if is_finished else message),
             is_finished=is_finished,
@@ -121,19 +121,30 @@ class ThinkActPrompt(BaseModel):
 
     @property
     def prompt(self):
-        v = self.json(exclude_unset=True)
-        return urllib.parse.quote(v)
+        return self.json(exclude_unset=True)
 
 
 class MessageJsonModel(BaseModel):
     steps: list[Sentences]
     qa_type: str
-    created_at: datetime = datetime.now()
-    query_time: datetime = datetime.now()
-    answer_time: datetime = datetime.now()
+    created_at: datetime = Field(default_factory=datetime.now)
+    query_time: datetime = Field(default_factory=datetime.now)
+    answer_time: datetime = Field(default_factory=datetime.now)
     score: Optional[int] = None
     feedback: Optional[str] = None
 
+    def add_think_act(self, think_act_prompt: ThinkActPrompt):
+        s = Sentences(
+            action=think_act_prompt.step.title,
+            skill=think_act_prompt.skill,
+            description=think_act_prompt.step.description,
+            timestamp=think_act_prompt.timestamp,
+            status=think_act_prompt.step.status,
+            contents=[think_act_prompt.step.content.dict()],
+        )
+        self.steps.append(s)
+
+
     def add_think_act(self, think_act_prompt: ThinkActPrompt):
         s = Sentences(
             action=think_act_prompt.step.title,
@@ -147,8 +158,7 @@ class MessageJsonModel(BaseModel):
 
     @property
     def prompt(self):
-        v = self.json(exclude_unset=True)
-        return urllib.parse.quote(v)
+        return self.json(exclude_unset=True)
 
 
 async def create_message(req_model: NewMsg, request: Request):
@@ -201,15 +211,36 @@ async def create_message(req_model: NewMsg, request: Request):
                     break
 
                 await asyncio.sleep(0.5)
+            else:
+                task.cancel()
+                return
 
             act_result = await task
             think_act_prompt.update_act(act_result)
             yield think_act_prompt.prompt + "\n\n"
             answer.add_think_act(think_act_prompt)
         yield answer.prompt + "\n\n"  # Notify the front-end that the message is complete.
+    except Exception as ex:
+        description = str(ex)
+        answer = f"```python\n\n{traceback.format_exc()}\n\n```"
+        step = ThinkActStep(
+            id=tc_id,
+            status="failed",
+            title=description,
+            description=description,
+            content=Sentence(
+                type=SentenceType.ERROR.value,
+                id=1,
+                value=SentenceValue(answer=answer),
+                is_finished=True
+            ),
+        )
+        think_act_prompt = ThinkActPrompt(step=step)
+        yield think_act_prompt.prompt + "\n\n"
     finally:
         shutil.rmtree(CONFIG.WORKSPACE_PATH)
 
+
 default_llm_stream_log = partial(print, end="")