mirror of
https://github.com/migatu/conjurer.git
synced 2026-07-21 01:02:10 +00:00
Michal Tuszowski
f3f07bc921
file_search_functions was the only bot-side service client that hardcoded the musician's LAN address and sent no auth header. Both musician endpoints it calls (/get_share_list, /get_share_links) run _authorize_request(), so the whole file-share feature 401'd on any deployment that set CONJURER_API_KEY - which the deployment guides instruct you to do - and the hardcoded IP made a musician on another host (the Proxmox/docker split) unreachable regardless. Use FILE_SERVICE_ADDRESS + service_headers() like music_functions does, add the two endpoint paths to constants alongside the existing ones, and set an explicit timeout so a wedged musician can't hang the calling cog. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
64 lines
1.9 KiB
Python
64 lines
1.9 KiB
Python
"""Bot-side client for the musician's share-list / share-link endpoints.
|
|
|
|
This module used to hardcode the musician's LAN address and send no auth
|
|
header, which broke the file-share feature in two ways:
|
|
|
|
* the musician's ``/get_share_list`` and ``/get_share_links`` both call
|
|
``_authorize_request()``, so every request 401'd on any deployment that set
|
|
``CONJURER_API_KEY`` — which the deployment guides tell you to do; and
|
|
* the hardcoded IP ignored ``CONJURER_FILE_SERVICE``, so a musician running on
|
|
another host (the Proxmox/docker split) was unreachable.
|
|
|
|
It now follows the same convention as the other service clients
|
|
(``music_functions``): address from ``constants``, shared auth headers, and an
|
|
explicit timeout so a wedged musician can't hang the bot.
|
|
"""
|
|
import requests
|
|
|
|
from constants import (
|
|
FILE_SERVICE_ADDRESS,
|
|
GET_SHARE_LINKS,
|
|
GET_SHARE_LIST,
|
|
service_headers,
|
|
)
|
|
|
|
SERVICE_HEADERS = service_headers()
|
|
REQUEST_TIMEOUT = 60
|
|
|
|
|
|
def find_matches(entries, keywords):
|
|
"""
|
|
Call the get_share_list endpoint.
|
|
entries: int (1-10)
|
|
keywords: list of strings
|
|
Returns: list of file paths
|
|
"""
|
|
payload = {'entries': entries, 'keywords': keywords}
|
|
response = requests.post(
|
|
f"{FILE_SERVICE_ADDRESS}{GET_SHARE_LIST}",
|
|
json=payload,
|
|
headers=SERVICE_HEADERS,
|
|
timeout=REQUEST_TIMEOUT,
|
|
)
|
|
response.raise_for_status()
|
|
data = response.json()
|
|
return data.get('files', [])
|
|
|
|
|
|
def publish(file_paths):
|
|
"""
|
|
Call the get_share_links endpoint.
|
|
file_paths: list of file path strings
|
|
Returns: list of published URLs
|
|
"""
|
|
payload = {'file_paths': file_paths}
|
|
response = requests.post(
|
|
f"{FILE_SERVICE_ADDRESS}{GET_SHARE_LINKS}",
|
|
json=payload,
|
|
headers=SERVICE_HEADERS,
|
|
timeout=REQUEST_TIMEOUT,
|
|
)
|
|
response.raise_for_status()
|
|
data = response.json()
|
|
return data.get('links', [])
|