Update requests_service.py
Browse files- requests_service.py +21 -21
requests_service.py
CHANGED
|
@@ -1,40 +1,42 @@
|
|
| 1 |
import requests
|
| 2 |
import os
|
|
|
|
| 3 |
|
|
|
|
|
|
|
| 4 |
ONYX_BASE_URL = "https://cloud.onyx.app/api"
|
| 5 |
-
# Token should be stored in HF Secrets as ONYX_API_KEY
|
| 6 |
-
ONYX_API_KEY = os.getenv("ONYX_API_KEY")
|
| 7 |
|
| 8 |
def get_headers():
|
|
|
|
|
|
|
| 9 |
return {
|
| 10 |
"Authorization": f"Bearer {ONYX_API_KEY}",
|
| 11 |
"Content-Type": "application/json"
|
| 12 |
}
|
| 13 |
|
| 14 |
-
def get_provider_mapping(m: str):
|
| 15 |
-
"""Maps model name to (Provider, Version)"""
|
| 16 |
-
if m == "gpt-5.2":
|
| 17 |
-
return "OpenAI", m
|
| 18 |
-
if m in ("claude-opus-4.5", "claude-sonnet-4.5"):
|
| 19 |
-
return "Anthropic", m
|
| 20 |
-
if m in ("gemini-3-pro-preview", "gemini-3-flash-preview"):
|
| 21 |
-
return "Google Vertex AI", m
|
| 22 |
-
return "OpenRouter", m
|
| 23 |
-
|
| 24 |
def create_onyx_session():
|
| 25 |
url = f"{ONYX_BASE_URL}/chat/create-chat-session"
|
| 26 |
-
|
|
|
|
|
|
|
| 27 |
try:
|
|
|
|
| 28 |
resp = requests.post(url, json=payload, headers=get_headers(), timeout=10)
|
| 29 |
-
|
| 30 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 31 |
return None
|
| 32 |
|
| 33 |
-
def send_onyx_message(message, model_name, session_id):
|
| 34 |
url = f"{ONYX_BASE_URL}/chat/send-chat-message"
|
| 35 |
-
provider, version = get_provider_mapping(model_name)
|
| 36 |
|
| 37 |
-
#
|
| 38 |
payload = {
|
| 39 |
"message": message,
|
| 40 |
"llm_override": {
|
|
@@ -44,9 +46,7 @@ def send_onyx_message(message, model_name, session_id):
|
|
| 44 |
},
|
| 45 |
"allowed_tool_ids": [],
|
| 46 |
"file_descriptors": [],
|
| 47 |
-
"internal_search_filters": {
|
| 48 |
-
"source_type": ["ingestion_api"]
|
| 49 |
-
},
|
| 50 |
"deep_research": False,
|
| 51 |
"origin": "unset",
|
| 52 |
"parent_message_id": None,
|
|
|
|
| 1 |
import requests
|
| 2 |
import os
|
| 3 |
+
import sys
|
| 4 |
|
| 5 |
+
# Fetch the key from HF Secrets
|
| 6 |
+
ONYX_API_KEY = os.getenv("PR_KEY")
|
| 7 |
ONYX_BASE_URL = "https://cloud.onyx.app/api"
|
|
|
|
|
|
|
| 8 |
|
| 9 |
def get_headers():
|
| 10 |
+
# If your key already starts with 'Bearer', this logic will break.
|
| 11 |
+
# This assumes ONYX_API_KEY is JUST the token.
|
| 12 |
return {
|
| 13 |
"Authorization": f"Bearer {ONYX_API_KEY}",
|
| 14 |
"Content-Type": "application/json"
|
| 15 |
}
|
| 16 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 17 |
def create_onyx_session():
|
| 18 |
url = f"{ONYX_BASE_URL}/chat/create-chat-session"
|
| 19 |
+
# Ensure persona_id is 0 (default) or a valid ID from your Onyx dashboard
|
| 20 |
+
payload = {"persona_id": 0, "description": "Hugging Face Bridge"}
|
| 21 |
+
|
| 22 |
try:
|
| 23 |
+
print(f"DEBUG: Attempting session create with key ending in ...{ONYX_API_KEY[-5:] if ONYX_API_KEY else 'NONE'}")
|
| 24 |
resp = requests.post(url, json=payload, headers=get_headers(), timeout=10)
|
| 25 |
+
|
| 26 |
+
if resp.status_code == 200:
|
| 27 |
+
return resp.json().get("id")
|
| 28 |
+
|
| 29 |
+
# This will print to your Hugging Face Logs
|
| 30 |
+
print(f"ONYX AUTH REJECTION: {resp.status_code} - {resp.text}", file=sys.stderr)
|
| 31 |
+
return None
|
| 32 |
+
except Exception as e:
|
| 33 |
+
print(f"CONNECTION ERROR: {str(e)}", file=sys.stderr)
|
| 34 |
return None
|
| 35 |
|
| 36 |
+
def send_onyx_message(message, model_name, session_id, provider, version):
|
| 37 |
url = f"{ONYX_BASE_URL}/chat/send-chat-message"
|
|
|
|
| 38 |
|
| 39 |
+
# EXACT payload structure you requested
|
| 40 |
payload = {
|
| 41 |
"message": message,
|
| 42 |
"llm_override": {
|
|
|
|
| 46 |
},
|
| 47 |
"allowed_tool_ids": [],
|
| 48 |
"file_descriptors": [],
|
| 49 |
+
"internal_search_filters": {"source_type": ["ingestion_api"]},
|
|
|
|
|
|
|
| 50 |
"deep_research": False,
|
| 51 |
"origin": "unset",
|
| 52 |
"parent_message_id": None,
|