From 5873bdce599da4026dcc169d28b72e1b7aa4b4ab Mon Sep 17 00:00:00 2001 From: lanqian528 <5499636+lanqian528@users.noreply.github.com> Date: Wed, 4 Dec 2024 07:36:46 +0800 Subject: [PATCH] v1.7.4-beta1 fix bugs --- gateway/backend.py | 23 ++- gateway/reverseProxy.py | 32 +++- templates/chatgpt.html | 63 ++++---- templates/chatgpt_context.json | 164 ++++++++++++------- templates/gpts_context.json | 282 ++++++++++++++++++++------------- utils/configs.py | 2 + version.txt | 2 +- 7 files changed, 357 insertions(+), 211 deletions(-) diff --git a/gateway/backend.py b/gateway/backend.py index 838c4d1..b3453f4 100644 --- a/gateway/backend.py +++ b/gateway/backend.py @@ -18,7 +18,8 @@ from gateway.chatgpt import chatgpt_html from gateway.reverseProxy import chatgpt_reverse_proxy, content_generator, get_real_req_token, headers_reject_list from utils.Client import Client from utils.Logger import logger -from utils.configs import x_sign, turnstile_solver_url, chatgpt_base_url_list, no_sentinel, sentinel_proxy_url_list +from utils.configs import x_sign, turnstile_solver_url, chatgpt_base_url_list, no_sentinel, sentinel_proxy_url_list, \ + force_no_history banned_paths = [ "backend-api/accounts/logout_all", @@ -322,6 +323,18 @@ if no_sentinel: await clients.close() del clients + history = True + try: + req_json = json.loads(data) + history = not req_json.get("history_and_training_disabled", False) + except Exception: + pass + if force_no_history: + history = False + req_json = json.loads(data) + req_json["history_and_training_disabled"] = True + data = json.dumps(req_json).encode("utf-8") + background = BackgroundTask(c_close, client, clients) r = await client.post_stream(f"{host_url}/backend-api/conversation", params=params, headers=headers, cookies=request_cookies, data=data, stream=True, allow_redirects=False) @@ -333,8 +346,12 @@ if no_sentinel: if x_sign: rheaders.update({"x-sign": x_sign}) if 'stream' in rheaders.get("content-type", ""): - return StreamingResponse(content_generator(r, token), headers=rheaders, - media_type=rheaders.get("content-type"), background=background) + conv_key = r.cookies.get("conv_key", "") + response = StreamingResponse(content_generator(r, token, history), + media_type=r.headers.get("content-type", ""), + background=background) + response.set_cookie("conv_key", value=conv_key) + return response else: return Response(content=(await r.atext()), headers=rheaders, media_type=rheaders.get("content-type"), status_code=r.status_code, background=background) diff --git a/gateway/reverseProxy.py b/gateway/reverseProxy.py index a5a2caa..76dd007 100644 --- a/gateway/reverseProxy.py +++ b/gateway/reverseProxy.py @@ -13,7 +13,7 @@ from chatgpt.authorization import verify_token, get_req_token from chatgpt.fp import get_fp from utils.Client import Client from utils.Logger import logger -from utils.configs import chatgpt_base_url_list, sentinel_proxy_url_list +from utils.configs import chatgpt_base_url_list, sentinel_proxy_url_list, force_no_history def generate_current_time(): @@ -108,12 +108,12 @@ def save_conversation(token, conversation_id, title=None): logger.info(f"Conversation ID: {conversation_id}, Title: {title}") -async def content_generator(r, token): +async def content_generator(r, token, history=True): conversation_id = None title = None async for chunk in r.aiter_content(): try: - if (len(token) != 45 and not token.startswith("eyJhbGciOi")) and (not conversation_id or not title): + if history and (len(token) != 45 and not token.startswith("eyJhbGciOi")) and (not conversation_id or not title): chat_chunk = chunk.decode('utf-8') if chat_chunk.startswith("data: {"): if "\n\nevent: delta" in chat_chunk: @@ -206,6 +206,20 @@ async def chatgpt_reverse_proxy(request: Request, path: str): data = await request.body() + history = True + if path.endswith("backend-api/conversation"): + try: + req_json = json.loads(data) + history = not req_json.get("history_and_training_disabled", False) + except Exception: + pass + if force_no_history: + history = False + req_json = json.loads(data) + req_json["history_and_training_disabled"] = True + data = json.dumps(req_json).encode("utf-8") + + if sentinel_proxy_url_list and "backend-api/sentinel/chat-requirements" in path: client = Client(proxy=random.choice(sentinel_proxy_url_list)) else: @@ -226,8 +240,11 @@ async def chatgpt_reverse_proxy(request: Request, path: str): logger.info(f"Request proxy: {proxy_url}") logger.info(f"Request UA: {user_agent}") logger.info(f"Request impersonate: {impersonate}") - return StreamingResponse(content_generator(r, token), media_type=r.headers.get("content-type", ""), - background=background) + conv_key = r.cookies.get("conv_key", "") + response = StreamingResponse(content_generator(r, token, history), media_type=r.headers.get("content-type", ""), + background=background) + response.set_cookie("conv_key", value=conv_key) + return response else: if "/backend-api/conversation" in path or "/register-websocket" in path: response = Response(content=(await r.atext()), media_type=r.headers.get("content-type"), @@ -236,6 +253,7 @@ async def chatgpt_reverse_proxy(request: Request, path: str): content = await r.atext() content = (content .replace("ab.chatgpt.com", origin_host) + .replace("webrtc.chatgpt.com", origin_host) .replace("cdn.oaistatic.com", origin_host) # .replace("files.oaiusercontent.com", origin_host) .replace("chatgpt.com", origin_host) @@ -244,10 +262,12 @@ async def chatgpt_reverse_proxy(request: Request, path: str): content_type = rheaders.get("content-type", "") cache_control = rheaders.get("cache-control", "") expires = rheaders.get("expires", "") + content_disposition = rheaders.get("content-disposition", "") rheaders = { "cache-control": cache_control, "content-type": content_type, - "expires": expires + "expires": expires, + "content-disposition": content_disposition } response = Response(content=content, headers=rheaders, status_code=r.status_code, background=background) diff --git a/templates/chatgpt.html b/templates/chatgpt.html index a77a781..d67d91a 100644 --- a/templates/chatgpt.html +++ b/templates/chatgpt.html @@ -1,5 +1,5 @@ - + @@ -18,31 +18,30 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + @@ -158,7 +157,7 @@
- - diff --git a/templates/chatgpt_context.json b/templates/chatgpt_context.json index c47edc8..ed3ead4 100644 --- a/templates/chatgpt_context.json +++ b/templates/chatgpt_context.json @@ -17,12 +17,12 @@ "user": { "id": "user-chatgpt" }, - "expires": "2025-02-26T16:39:37.135Z", + "expires": "2025-03-03T02:24:36.189Z", "accessToken": "", "authProvider": "login-web" }, "dataUpdateCount": 1, - "dataUpdatedAt": 1732811977271, + "dataUpdatedAt": 1733192676299, "error": null, "errorUpdateCount": 0, "errorUpdatedAt": 0, @@ -38,14 +38,14 @@ "user": { "id": "user-chatgpt" }, - "expires": "2025-02-26T16:39:37.135Z", + "expires": "2025-03-03T02:24:36.189Z", "accessToken": "", "authProvider": "login-web" }, "user": { "id": "user-chatgpt" }, - "cluster": "unified-8", + "cluster": "unified-16", "userCountry": "US", "userRegion": "New York", "userRegionCode": "1", @@ -313,8 +313,8 @@ }, "562926978": { "name": "562926978", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "5NtGLuwEGvKkFrz0jD9Jgb:100.00:1", "secondary_exposures": [ { "gate": "1457171347", @@ -323,8 +323,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp" } ] }, @@ -418,8 +418,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp" } ] }, @@ -522,7 +522,7 @@ "989108178": { "name": "989108178", "value": false, - "rule_id": "2IPlNE4lgwrh0MfAfdxRES:0.00:1", + "rule_id": "4sTodKrNyByM4guZ68MORR", "secondary_exposures": [ { "gate": "1457171347", @@ -531,30 +531,15 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" - }, - { - "gate": "697158486", - "gateValue": "false", - "ruleID": "5KvTiw548r4tjqy7oHEcAL" - }, - { - "gate": "3199899666", - "gateValue": "false", - "ruleID": "default" - }, - { - "gate": "2048457345", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp" } ] }, "989226566": { "name": "989226566", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "6yqqYAWKtmfU8A7QGdiky4", "secondary_exposures": [ { "gate": "1457171347", @@ -563,8 +548,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp" } ] }, @@ -724,8 +709,8 @@ }, "1426009137": { "name": "1426009137", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "7D8EAif25E3Y8A3zkg6ljp", "secondary_exposures": [ { "gate": "1457171347", @@ -827,12 +812,6 @@ "rule_id": "2CwIChuIr7SLQ2CyqRegF2", "secondary_exposures": [] }, - "1666487044": { - "name": "1666487044", - "value": false, - "rule_id": "2FIt63MiniZJkSS0ySTaoY:0.00:1", - "secondary_exposures": [] - }, "1684776951": { "name": "1684776951", "value": true, @@ -1160,8 +1139,8 @@ }, "2775516364": { "name": "2775516364", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "62xFU2LRHp4dPsOwj2jVUT", "secondary_exposures": [ { "gate": "1457171347", @@ -1170,8 +1149,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp" } ] }, @@ -1727,7 +1706,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": false, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "layerAssignment", "rule_id": "layerAssignment", @@ -1740,7 +1725,8 @@ "personalized_onboarding", "write_custom_instructions_in_onboarding", "plus_rl_during_onboarding_minutes_after_creation", - "onboarding_show_custom_instructions_page" + "onboarding_show_custom_instructions_page", + "onboarding_flow_tool_steps" ], "is_user_in_experiment": false, "is_experiment_active": true, @@ -2682,15 +2668,15 @@ "value": { "enable_arch_updates": false }, - "group": "layerAssignment", - "rule_id": "layerAssignment", + "group": "abandoned", + "rule_id": "abandoned", "is_device_based": true, "secondary_exposures": [], "explicit_parameters": [ "enable_arch_updates" ], "is_user_in_experiment": false, - "is_experiment_active": true, + "is_experiment_active": false, "is_in_layer": true }, "1722608525": { @@ -3464,7 +3450,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": false, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "abandoned", "rule_id": "abandoned", @@ -3485,7 +3477,13 @@ "group": "prestart", "rule_id": "prestart", "is_device_based": false, - "secondary_exposures": [], + "secondary_exposures": [ + { + "gate": "1132191510", + "gateValue": "false", + "ruleID": "default" + } + ], "explicit_parameters": [ "snowflake_composer_entry_point" ], @@ -3697,7 +3695,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": false, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "targetingGate", "rule_id": "targetingGate", @@ -4870,7 +4874,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": false, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "prestart", "rule_id": "prestart", @@ -4884,7 +4894,9 @@ "keep_onboarding_after_dismiss", "write_custom_instructions_in_onboarding", "onboarding_show_custom_instructions_page", - "plus_rl_during_onboarding_minutes_after_creation" + "plus_rl_during_onboarding_minutes_after_creation", + "onboarding_show_other_option", + "onboarding_flow_tool_steps" ], "is_user_in_experiment": false, "is_experiment_active": false, @@ -5152,7 +5164,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": false, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "layerAssignment", "rule_id": "layerAssignment", @@ -5408,7 +5426,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": false, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "launchedGroup", "rule_id": "launchedGroup", @@ -5642,7 +5666,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": false, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "targetingGate", "rule_id": "targetingGate", @@ -5670,9 +5700,21 @@ "group": "default", "rule_id": "default", "is_device_based": false, - "secondary_exposures": [], + "secondary_exposures": [ + { + "gate": "1132191510", + "gateValue": "false", + "ruleID": "default" + } + ], "explicit_parameters": [], - "undelegated_secondary_exposures": [] + "undelegated_secondary_exposures": [ + { + "gate": "1132191510", + "gateValue": "false", + "ruleID": "default" + } + ] }, "1238742812": { "name": "1238742812", @@ -6260,7 +6302,7 @@ "sdkType": "statsig-node", "sdkVersion": "5.26.0" }, - "time": 1732811680973, + "time": 1733192442367, "evaluated_keys": { "userID": "user-chatgpt", "customIDs": { @@ -6284,7 +6326,7 @@ "isIos": false, "isAndroidChrome": false, "isElectron": false, - "cspScriptNonce": "bb6aa07d-4bdb-49d9-a007-4e33ffaa987f" + "cspScriptNonce": "4fce7440-fa5b-4791-9f2c-b1d6807d2708" }, "routes/_conversation": { "prefetchSearch": null diff --git a/templates/gpts_context.json b/templates/gpts_context.json index be79c9a..db9ca02 100644 --- a/templates/gpts_context.json +++ b/templates/gpts_context.json @@ -3,14 +3,14 @@ "user": { "id": "user-chatgpt" }, - "expires": "2025-02-26T16:42:25.251Z", + "expires": "2025-03-03T23:33:59.799Z", "accessToken": "", "authProvider": "login-web" }, "user": { "id": "user-chatgpt" }, - "cluster": "unified-8", + "cluster": "unified-16", "userCountry": "US", "userRegion": "New York", "userRegionCode": "1", @@ -278,8 +278,8 @@ }, "562926978": { "name": "562926978", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "5NtGLuwEGvKkFrz0jD9Jgb:100.00:1", "secondary_exposures": [ { "gate": "1457171347", @@ -288,8 +288,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp:60.00:1" } ] }, @@ -359,6 +359,12 @@ "rule_id": "3hRSthtIBD5acnNskGRJjV", "secondary_exposures": [] }, + "645560164": { + "name": "645560164", + "value": false, + "rule_id": "default", + "secondary_exposures": [] + }, "711369489": { "name": "711369489", "value": false, @@ -383,8 +389,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp:60.00:1" } ] }, @@ -487,7 +493,7 @@ "989108178": { "name": "989108178", "value": false, - "rule_id": "2IPlNE4lgwrh0MfAfdxRES:0.00:1", + "rule_id": "4sTodKrNyByM4guZ68MORR", "secondary_exposures": [ { "gate": "1457171347", @@ -496,30 +502,15 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" - }, - { - "gate": "697158486", - "gateValue": "false", - "ruleID": "5KvTiw548r4tjqy7oHEcAL" - }, - { - "gate": "3199899666", - "gateValue": "false", - "ruleID": "default" - }, - { - "gate": "2048457345", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp:60.00:1" } ] }, "989226566": { "name": "989226566", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "6yqqYAWKtmfU8A7QGdiky4", "secondary_exposures": [ { "gate": "1457171347", @@ -528,8 +519,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp:60.00:1" } ] }, @@ -560,14 +551,8 @@ "1074323483": { "name": "1074323483", "value": false, - "rule_id": "K8Z1UK9UqlAfqutxTFwFR:0.00:4", - "secondary_exposures": [ - { - "gate": "491279851", - "gateValue": "false", - "ruleID": "default" - } - ] + "rule_id": "disabled", + "secondary_exposures": [] }, "1103845153": { "name": "1103845153", @@ -689,8 +674,8 @@ }, "1426009137": { "name": "1426009137", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "7D8EAif25E3Y8A3zkg6ljp:60.00:1", "secondary_exposures": [ { "gate": "1457171347", @@ -792,12 +777,6 @@ "rule_id": "2CwIChuIr7SLQ2CyqRegF2", "secondary_exposures": [] }, - "1666487044": { - "name": "1666487044", - "value": false, - "rule_id": "2FIt63MiniZJkSS0ySTaoY:0.00:1", - "secondary_exposures": [] - }, "1684776951": { "name": "1684776951", "value": true, @@ -972,6 +951,12 @@ "rule_id": "1XW58zJg16b7h0clyVhEW3:100.00:10", "secondary_exposures": [] }, + "2420509970": { + "name": "2420509970", + "value": true, + "rule_id": "6pgwKYvzYmSTzlrSjZlKMS", + "secondary_exposures": [] + }, "2436427643": { "name": "2436427643", "value": false, @@ -1002,8 +987,8 @@ }, "2445152477": { "name": "2445152477", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "5qtlunRMswJX2JGoF8GikC", "secondary_exposures": [] }, "2449630478": { @@ -1125,8 +1110,8 @@ }, "2775516364": { "name": "2775516364", - "value": false, - "rule_id": "default", + "value": true, + "rule_id": "62xFU2LRHp4dPsOwj2jVUT", "secondary_exposures": [ { "gate": "1457171347", @@ -1135,8 +1120,8 @@ }, { "gate": "1426009137", - "gateValue": "false", - "ruleID": "default" + "gateValue": "true", + "ruleID": "7D8EAif25E3Y8A3zkg6ljp:60.00:1" } ] }, @@ -1145,15 +1130,10 @@ "value": false, "rule_id": "4jCRuoOxK8tLEGn9ngylXq", "secondary_exposures": [ - { - "gate": "491279851", - "gateValue": "false", - "ruleID": "default" - }, { "gate": "1074323483", "gateValue": "false", - "ruleID": "K8Z1UK9UqlAfqutxTFwFR:0.00:4" + "ruleID": "disabled" } ] }, @@ -1174,16 +1154,16 @@ "value": false, "rule_id": "default", "secondary_exposures": [ + { + "gate": "1074323483", + "gateValue": "false", + "ruleID": "disabled" + }, { "gate": "491279851", "gateValue": "false", "ruleID": "default" }, - { - "gate": "1074323483", - "gateValue": "false", - "ruleID": "K8Z1UK9UqlAfqutxTFwFR:0.00:4" - }, { "gate": "3011415004", "gateValue": "false", @@ -1417,6 +1397,11 @@ "value": false, "rule_id": "default", "secondary_exposures": [ + { + "gate": "2478069220", + "gateValue": "false", + "ruleID": "default" + }, { "gate": "3860901052", "gateValue": "false", @@ -1692,7 +1677,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": true, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "layerAssignment", "rule_id": "layerAssignment", @@ -1705,7 +1696,8 @@ "personalized_onboarding", "write_custom_instructions_in_onboarding", "plus_rl_during_onboarding_minutes_after_creation", - "onboarding_show_custom_instructions_page" + "onboarding_show_custom_instructions_page", + "onboarding_flow_tool_steps" ], "is_user_in_experiment": false, "is_experiment_active": true, @@ -2504,16 +2496,6 @@ "is_experiment_active": false, "is_in_layer": true }, - "1248699119": { - "name": "1248699119", - "value": {}, - "group": "prestart", - "rule_id": "prestart", - "is_device_based": false, - "secondary_exposures": [], - "is_user_in_experiment": false, - "is_experiment_active": false - }, "1277879515": { "name": "1277879515", "value": { @@ -2645,17 +2627,19 @@ "1597388338": { "name": "1597388338", "value": { - "enable_arch_updates": false + "enable_arch_updates": false, + "include_pin_state": true, + "include_legacy_sidebar_contents": true }, - "group": "layerAssignment", - "rule_id": "layerAssignment", + "group": "abandoned", + "rule_id": "abandoned", "is_device_based": true, "secondary_exposures": [], "explicit_parameters": [ "enable_arch_updates" ], "is_user_in_experiment": false, - "is_experiment_active": true, + "is_experiment_active": false, "is_in_layer": true }, "1722608525": { @@ -3035,23 +3019,14 @@ "2272050751": { "name": "2272050751", "value": { - "enable_arch_updates": false + "enable_arch_updates": false, + "include_pin_state": true, + "include_legacy_sidebar_contents": true }, "group": "abandoned", "rule_id": "abandoned", "is_device_based": true, - "secondary_exposures": [ - { - "gate": "491279851", - "gateValue": "false", - "ruleID": "default" - }, - { - "gate": "3011415004", - "gateValue": "false", - "ruleID": "7pUMK6uci7sslAj8bP7VEA" - } - ], + "secondary_exposures": [], "explicit_parameters": [ "enable_arch_updates" ], @@ -3266,6 +3241,37 @@ "is_experiment_active": false, "is_in_layer": true }, + "2380789656": { + "name": "2380789656", + "value": { + "enable_arch_updates": false, + "include_pin_state": true, + "include_legacy_sidebar_contents": true + }, + "group": "prestart", + "rule_id": "prestart", + "is_device_based": true, + "secondary_exposures": [ + { + "gate": "491279851", + "gateValue": "false", + "ruleID": "default" + }, + { + "gate": "3011415004", + "gateValue": "false", + "ruleID": "7pUMK6uci7sslAj8bP7VEA" + } + ], + "explicit_parameters": [ + "include_pin_state", + "include_legacy_sidebar_contents", + "enable_arch_updates" + ], + "is_user_in_experiment": false, + "is_experiment_active": false, + "is_in_layer": true + }, "2395035283": { "name": "2395035283", "value": { @@ -3429,7 +3435,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": true, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "abandoned", "rule_id": "abandoned", @@ -3450,7 +3462,13 @@ "group": "prestart", "rule_id": "prestart", "is_device_based": false, - "secondary_exposures": [], + "secondary_exposures": [ + { + "gate": "1132191510", + "gateValue": "false", + "ruleID": "default" + } + ], "explicit_parameters": [ "snowflake_composer_entry_point" ], @@ -3662,7 +3680,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": true, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "targetingGate", "rule_id": "targetingGate", @@ -3919,7 +3943,9 @@ "2795141704": { "name": "2795141704", "value": { - "enable_arch_updates": false + "enable_arch_updates": false, + "include_pin_state": true, + "include_legacy_sidebar_contents": true }, "group": "prestart", "rule_id": "prestart", @@ -4835,7 +4861,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": true, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "prestart", "rule_id": "prestart", @@ -4849,7 +4881,9 @@ "keep_onboarding_after_dismiss", "write_custom_instructions_in_onboarding", "onboarding_show_custom_instructions_page", - "plus_rl_during_onboarding_minutes_after_creation" + "plus_rl_during_onboarding_minutes_after_creation", + "onboarding_show_other_option", + "onboarding_flow_tool_steps" ], "is_user_in_experiment": false, "is_experiment_active": false, @@ -5117,17 +5151,23 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": true, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, - "group": "layerAssignment", - "rule_id": "layerAssignment", + "group": "launchedGroup", + "rule_id": "launchedGroup", "is_device_based": false, "secondary_exposures": [], "explicit_parameters": [ "one_announcement_tooltip_per_session" ], "is_user_in_experiment": false, - "is_experiment_active": true, + "is_experiment_active": false, "is_in_layer": true }, "3917128856": { @@ -5373,7 +5413,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": true, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "launchedGroup", "rule_id": "launchedGroup", @@ -5535,7 +5581,9 @@ "660512088": { "name": "660512088", "value": { - "enable_arch_updates": false + "enable_arch_updates": false, + "include_pin_state": true, + "include_legacy_sidebar_contents": true }, "group": "default", "rule_id": "default", @@ -5607,7 +5655,13 @@ "enable_mobile_app_upsell_banner": false, "onboarding_show_custom_instructions_page": false, "one_tooltip_per_session": false, - "one_announcement_tooltip_per_session": false + "one_announcement_tooltip_per_session": true, + "onboarding_show_other_option": false, + "onboarding_flow_tool_steps": [ + "dalle", + "file_upload", + "canvas" + ] }, "group": "targetingGate", "rule_id": "targetingGate", @@ -5635,9 +5689,21 @@ "group": "default", "rule_id": "default", "is_device_based": false, - "secondary_exposures": [], + "secondary_exposures": [ + { + "gate": "1132191510", + "gateValue": "false", + "ruleID": "default" + } + ], "explicit_parameters": [], - "undelegated_secondary_exposures": [] + "undelegated_secondary_exposures": [ + { + "gate": "1132191510", + "gateValue": "false", + "ruleID": "default" + } + ] }, "1238742812": { "name": "1238742812", @@ -6225,7 +6291,7 @@ "sdkType": "statsig-node", "sdkVersion": "5.26.0" }, - "time": 1732811998887, + "time": 1733268738993, "evaluated_keys": { "userID": "user-chatgpt", "customIDs": { diff --git a/utils/configs.py b/utils/configs.py index 29dd2f6..62024cb 100644 --- a/utils/configs.py +++ b/utils/configs.py @@ -64,6 +64,7 @@ platform_tuple = ast.literal_eval(platform_tuple_str) enable_gateway = is_true(os.getenv('ENABLE_GATEWAY', False)) auto_seed = is_true(os.getenv('AUTO_SEED', True)) +force_no_history = is_true(os.getenv('FORCE_NO_HISTORY', False)) no_sentinel = is_true(os.getenv('NO_SENTINEL', False)) with open('version.txt') as f: @@ -97,4 +98,5 @@ logger.info("OAI_LANGUAGE: " + str(oai_language)) logger.info("------------------------- Gateway --------------------------") logger.info("ENABLE_GATEWAY: " + str(enable_gateway)) logger.info("AUTO_SEED: " + str(auto_seed)) +logger.info("FORCE_NO_HISTORY: " + str(force_no_history)) logger.info("-" * 60) diff --git a/version.txt b/version.txt index 2d3e01c..5b733c1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.7.3-beta4 \ No newline at end of file +v1.7.4-beta1 \ No newline at end of file