Antonio Cheong
commited on
Commit
·
8d0fca8
1
Parent(s):
62f6814
rollback bugfixes
Browse files- src/EdgeGPT.py +28 -25
src/EdgeGPT.py
CHANGED
@@ -34,7 +34,7 @@ HEADERS = {
|
|
34 |
"sec-ch-ua-arch": '"x86"',
|
35 |
"sec-ch-ua-bitness": '"64"',
|
36 |
"sec-ch-ua-full-version": '"109.0.1518.78"',
|
37 |
-
|
38 |
"sec-ch-ua-mobile": "?0",
|
39 |
"sec-ch-ua-model": "",
|
40 |
"sec-ch-ua-platform": '"Windows"',
|
@@ -50,35 +50,36 @@ HEADERS = {
|
|
50 |
}
|
51 |
|
52 |
HEADERS_INIT_CONVER = {
|
53 |
-
|
54 |
-
|
55 |
"accept-language": "en-US,en;q=0.9",
|
56 |
-
|
57 |
-
|
58 |
-
|
59 |
-
|
60 |
-
|
61 |
-
|
62 |
-
|
63 |
-
|
64 |
-
|
65 |
-
|
66 |
-
|
67 |
-
|
68 |
-
|
69 |
-
|
70 |
-
|
71 |
-
|
72 |
-
|
73 |
-
}
|
|
|
74 |
|
75 |
class NotAllowedToAccess(Exception):
|
76 |
pass
|
77 |
|
78 |
|
79 |
class ConversationStyle(Enum):
|
80 |
-
creative = "
|
81 |
-
balanced = "
|
82 |
precise = "h3precise"
|
83 |
|
84 |
|
@@ -259,10 +260,12 @@ class ChatHub:
|
|
259 |
if obj is None or obj == "":
|
260 |
continue
|
261 |
response = json.loads(obj)
|
262 |
-
if response.get("type") == 1 and response["arguments"][0].get(
|
|
|
|
|
263 |
yield False, response["arguments"][0]["messages"][0][
|
264 |
"adaptiveCards"
|
265 |
-
][0]["body"][0]
|
266 |
elif response.get("type") == 2:
|
267 |
final = True
|
268 |
yield True, response
|
|
|
34 |
"sec-ch-ua-arch": '"x86"',
|
35 |
"sec-ch-ua-bitness": '"64"',
|
36 |
"sec-ch-ua-full-version": '"109.0.1518.78"',
|
37 |
+
"sec-ch-ua-full-version-list": '"Chromium";v="110.0.5481.192", "Not A(Brand";v="24.0.0.0", "Microsoft Edge";v="110.0.1587.69"',
|
38 |
"sec-ch-ua-mobile": "?0",
|
39 |
"sec-ch-ua-model": "",
|
40 |
"sec-ch-ua-platform": '"Windows"',
|
|
|
50 |
}
|
51 |
|
52 |
HEADERS_INIT_CONVER = {
|
53 |
+
"authority": "edgeservices.bing.com",
|
54 |
+
"accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",
|
55 |
"accept-language": "en-US,en;q=0.9",
|
56 |
+
"cache-control": "max-age=0",
|
57 |
+
"sec-ch-ua": '"Chromium";v="110", "Not A(Brand";v="24", "Microsoft Edge";v="110"',
|
58 |
+
"sec-ch-ua-arch": '"x86"',
|
59 |
+
"sec-ch-ua-bitness": '"64"',
|
60 |
+
"sec-ch-ua-full-version": '"110.0.1587.69"',
|
61 |
+
"sec-ch-ua-full-version-list": '"Chromium";v="110.0.5481.192", "Not A(Brand";v="24.0.0.0", "Microsoft Edge";v="110.0.1587.69"',
|
62 |
+
"sec-ch-ua-mobile": "?0",
|
63 |
+
"sec-ch-ua-model": '""',
|
64 |
+
"sec-ch-ua-platform": '"Windows"',
|
65 |
+
"sec-ch-ua-platform-version": '"15.0.0"',
|
66 |
+
"sec-fetch-dest": "document",
|
67 |
+
"sec-fetch-mode": "navigate",
|
68 |
+
"sec-fetch-site": "none",
|
69 |
+
"sec-fetch-user": "?1",
|
70 |
+
"upgrade-insecure-requests": "1",
|
71 |
+
"user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.1587.69",
|
72 |
+
"x-edge-shopping-flag": "1",
|
73 |
+
}
|
74 |
+
|
75 |
|
76 |
class NotAllowedToAccess(Exception):
|
77 |
pass
|
78 |
|
79 |
|
80 |
class ConversationStyle(Enum):
|
81 |
+
creative = "h3relaxedimg"
|
82 |
+
balanced = "galileo"
|
83 |
precise = "h3precise"
|
84 |
|
85 |
|
|
|
260 |
if obj is None or obj == "":
|
261 |
continue
|
262 |
response = json.loads(obj)
|
263 |
+
if response.get("type") == 1 and response["arguments"][0].get(
|
264 |
+
"messages"
|
265 |
+
):
|
266 |
yield False, response["arguments"][0]["messages"][0][
|
267 |
"adaptiveCards"
|
268 |
+
][0]["body"][0].get("text")
|
269 |
elif response.get("type") == 2:
|
270 |
final = True
|
271 |
yield True, response
|