Niansuh commited on
Commit
1a5834c
·
verified ·
1 Parent(s): 944e367

Update api/utils.py

Browse files
Files changed (1) hide show
  1. api/utils.py +16 -12
api/utils.py CHANGED
@@ -20,7 +20,7 @@ from api.config import (
20
  )
21
  from api.models import ChatRequest
22
  from api.logger import (
23
- log_generated_chat_id,
24
  log_model_delay,
25
  log_http_error,
26
  log_request_error,
@@ -85,15 +85,17 @@ def strip_model_prefix(content: str, model_prefix: Optional[str] = None) -> str:
85
  # Process streaming response with headers from config.py
86
  async def process_streaming_response(request: ChatRequest):
87
  chat_id = generate_chat_id()
88
- log_generated_chat_id(chat_id, request.model)
 
 
 
 
 
 
89
 
90
  agent_mode = AGENT_MODE.get(request.model, {})
91
  trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
92
  model_prefix = MODEL_PREFIXES.get(request.model, "")
93
-
94
- # Check if the model is in MODEL_REFERERS, else no referer path
95
- referer_path = MODEL_REFERERS.get(request.model, "")
96
- referer_url = f"{BASE_URL}{referer_path}" if referer_path else BASE_URL
97
 
98
  # Generate headers for API chat request with dynamic Referer
99
  headers_api_chat = get_headers_api_chat(referer_url)
@@ -160,17 +162,19 @@ async def process_streaming_response(request: ChatRequest):
160
  # Process non-streaming response with headers from config.py
161
  async def process_non_streaming_response(request: ChatRequest):
162
  chat_id = generate_chat_id()
163
- log_generated_chat_id(chat_id, request.model)
164
-
165
- agent_mode = AGENT_MODE.get(request.model, {})
166
- trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
167
- model_prefix = MODEL_PREFIXES.get(request.model, "")
168
 
169
- # Check if the model is in MODEL_REFERERS, else no referer path
170
  referer_path = MODEL_REFERERS.get(request.model, "")
171
  referer_url = f"{BASE_URL}{referer_path}" if referer_path else BASE_URL
172
  chat_url = f"{referer_url}/chat/{chat_id}?model={request.model}"
173
 
 
 
 
 
 
 
 
174
  # Generate headers for API chat request and chat request with dynamic Referer
175
  headers_api_chat = get_headers_api_chat(referer_url)
176
  headers_chat = get_headers_chat(chat_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))
 
20
  )
21
  from api.models import ChatRequest
22
  from api.logger import (
23
+ log_generated_chat_id_with_referer,
24
  log_model_delay,
25
  log_http_error,
26
  log_request_error,
 
85
  # Process streaming response with headers from config.py
86
  async def process_streaming_response(request: ChatRequest):
87
  chat_id = generate_chat_id()
88
+
89
+ # Get referer URL only if model is in MODEL_REFERERS
90
+ referer_path = MODEL_REFERERS.get(request.model, "")
91
+ referer_url = f"{BASE_URL}{referer_path}" if referer_path else BASE_URL
92
+
93
+ # Log with chat ID, model, and referer URL (if present)
94
+ log_generated_chat_id_with_referer(chat_id, request.model, referer_url)
95
 
96
  agent_mode = AGENT_MODE.get(request.model, {})
97
  trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
98
  model_prefix = MODEL_PREFIXES.get(request.model, "")
 
 
 
 
99
 
100
  # Generate headers for API chat request with dynamic Referer
101
  headers_api_chat = get_headers_api_chat(referer_url)
 
162
  # Process non-streaming response with headers from config.py
163
  async def process_non_streaming_response(request: ChatRequest):
164
  chat_id = generate_chat_id()
 
 
 
 
 
165
 
166
+ # Get referer URL only if model is in MODEL_REFERERS
167
  referer_path = MODEL_REFERERS.get(request.model, "")
168
  referer_url = f"{BASE_URL}{referer_path}" if referer_path else BASE_URL
169
  chat_url = f"{referer_url}/chat/{chat_id}?model={request.model}"
170
 
171
+ # Log with chat ID, model, and referer URL (if present)
172
+ log_generated_chat_id_with_referer(chat_id, request.model, chat_url)
173
+
174
+ agent_mode = AGENT_MODE.get(request.model, {})
175
+ trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
176
+ model_prefix = MODEL_PREFIXES.get(request.model, "")
177
+
178
  # Generate headers for API chat request and chat request with dynamic Referer
179
  headers_api_chat = get_headers_api_chat(referer_url)
180
  headers_chat = get_headers_chat(chat_url, next_action=str(uuid.uuid4()), next_router_state_tree=json.dumps([""]))