[chore] convert response to JSON not string

NimbleBoxAI · Oct 10, 2023 · 82ba3dc · 82ba3dc
1 parent f42ad56
commit 82ba3dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cf_internal b/cf_internal
diff --git a/server/chainfury_server/api/prompts.py b/server/chainfury_server/api/prompts.py
@@ -8,7 +8,7 @@
 from typing import Annotated, Any, Tuple, Dict
 from pydantic import BaseModel
 from sqlalchemy.orm import Session
-from dataclasses import dataclass
+from dataclasses import dataclass, asdict
 
 from chainfury_server.schemas.prompt_schema import PromptBody
 from chainfury_server.commons.utils import get_user_from_jwt, verify_user
@@ -101,9 +101,8 @@ def _get_streaming_response(result):
             content=_get_streaming_response(result),
         )
     else:
-        out = result.__dict__
-        out.pop("prompt")
-        return out
+        # out = result.__dict__
+        return result.to_dict()
 
 
 class InternalFeedbackModel(BaseModel):

diff --git a/server/chainfury_server/engines/fury.py b/server/chainfury_server/engines/fury.py
@@ -1,4 +1,5 @@
 import time
+import json
 import traceback
 from pprint import pprint, pformat
 from functools import partial
@@ -34,7 +35,7 @@ def run(self, chatbot: ChatBot, prompt: PromptBody, db: Session, start: float) -
             callback = FuryThoughts(db, prompt_row.id)
             mainline_out, full_ir = chain(prompt.new_message, thoughts_callback=callback, print_thoughts=False)
             result = CFPromptResult(
-                result=str(mainline_out),
+                result=json.dumps(mainline_out),
                 thought=[{"engine": "fury", "ir_steps": callback.count, "thoughts": list(full_ir.keys())}],
                 num_tokens=1,
                 prompt=prompt_row,