Spaces:
Sleeping
Sleeping
Update messagers/message_outputer.py
Browse files
messagers/message_outputer.py
CHANGED
@@ -24,22 +24,18 @@ class OpenaiStreamOutputer:
|
|
24 |
}
|
25 |
}
|
26 |
|
27 |
-
|
28 |
data_str = f"{json.dumps(data)}"
|
29 |
return data_str
|
30 |
|
31 |
-
def output(self, content=None, content_type="Completions"
|
32 |
data = self.default_data.copy()
|
33 |
if content_type == "Role":
|
34 |
data["choices"] = [
|
35 |
{
|
36 |
"index": 0,
|
37 |
-
"
|
38 |
-
|
39 |
-
"content": content,
|
40 |
-
},
|
41 |
-
"logprobs": None,
|
42 |
-
"finish_reason": "stop"
|
43 |
}
|
44 |
]
|
45 |
elif content_type in [
|
@@ -53,11 +49,7 @@ class OpenaiStreamOutputer:
|
|
53 |
data["choices"] = [
|
54 |
{
|
55 |
"index": 0,
|
56 |
-
"
|
57 |
-
"role": "user",
|
58 |
-
"content": content,
|
59 |
-
},
|
60 |
-
"logprobs": None,
|
61 |
"finish_reason": None,
|
62 |
}
|
63 |
]
|
@@ -65,11 +57,7 @@ class OpenaiStreamOutputer:
|
|
65 |
data["choices"] = [
|
66 |
{
|
67 |
"index": 0,
|
68 |
-
"
|
69 |
-
"role": "assistant",
|
70 |
-
"content": content,
|
71 |
-
},
|
72 |
-
"logprobs": None,
|
73 |
"finish_reason": "stop",
|
74 |
}
|
75 |
]
|
@@ -77,20 +65,8 @@ class OpenaiStreamOutputer:
|
|
77 |
data["choices"] = [
|
78 |
{
|
79 |
"index": 0,
|
80 |
-
"
|
81 |
-
"role": "assistant",
|
82 |
-
"content": content,
|
83 |
-
},
|
84 |
-
"logprobs": None,
|
85 |
"finish_reason": None,
|
86 |
}
|
87 |
]
|
88 |
-
|
89 |
-
# Update token counts
|
90 |
-
tokens_used = len(content.split())
|
91 |
-
self.token_manager.add_tokens(tokens_used) # hypothetical method
|
92 |
-
data["usage"]["prompt_tokens"] += tokens_count
|
93 |
-
data["usage"]["completion_tokens"] += tokens_used
|
94 |
-
data["usage"]["total_tokens"] = self.token_manager.get_total_tokens() # hypothetical method
|
95 |
-
|
96 |
-
return self.data_to_string(data, content_type)
|
|
|
24 |
}
|
25 |
}
|
26 |
|
27 |
+
def data_to_string(self, data={}, content_type=""):
|
28 |
data_str = f"{json.dumps(data)}"
|
29 |
return data_str
|
30 |
|
31 |
+
def output(self, content=None, content_type="Completions") -> str:
|
32 |
data = self.default_data.copy()
|
33 |
if content_type == "Role":
|
34 |
data["choices"] = [
|
35 |
{
|
36 |
"index": 0,
|
37 |
+
"delta": {"role": "assistant"},
|
38 |
+
"finish_reason": None,
|
|
|
|
|
|
|
|
|
39 |
}
|
40 |
]
|
41 |
elif content_type in [
|
|
|
49 |
data["choices"] = [
|
50 |
{
|
51 |
"index": 0,
|
52 |
+
"delta": {"content": content},
|
|
|
|
|
|
|
|
|
53 |
"finish_reason": None,
|
54 |
}
|
55 |
]
|
|
|
57 |
data["choices"] = [
|
58 |
{
|
59 |
"index": 0,
|
60 |
+
"delta": {},
|
|
|
|
|
|
|
|
|
61 |
"finish_reason": "stop",
|
62 |
}
|
63 |
]
|
|
|
65 |
data["choices"] = [
|
66 |
{
|
67 |
"index": 0,
|
68 |
+
"delta": {},
|
|
|
|
|
|
|
|
|
69 |
"finish_reason": None,
|
70 |
}
|
71 |
]
|
72 |
+
return self.data_to_string(data, content_type)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|