1movmedia/pyworker
2
0
Fork 0
Code Pull Requests Activity

Addresses breaking change in core pyworker (#22)

Browse Source 
* Addresses breaking change in test_utils.py

Endpoint.get_endpoint_api_key() now requires instance

Moves the call to this function out of the APIClient and into main

* Ensure make_benchmark_payload has a value to calculate the workload

---------

Co-authored-by: Nader Arbabian <nader@vast.ai>
This commit is contained in:
Rob Ballantyne
2025-07-18 01:09:23 +01:00
committed by Nader Arbabian
parent be2aafdb1f
commit e0be45f39a
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
workers/openai/client.py
+19 -15
View File
@@ -28,24 +28,16 @@ class APIClient:
DEFAULT_TIMEOUT = 4
def __init__(
self, endpoint_group_name: str, api_key: str, server_url: str, instance: str
self,
endpoint_group_name: str,
api_key: str,
server_url: str,
endpoint_api_key: str,
):
self.endpoint_group_name = endpoint_group_name
self.api_key = api_key
self.server_url = server_url
self.instance = instance
self.endpoint_api_key = self._get_endpoint_api_key()
def _get_endpoint_api_key(self) -> Optional[str]:
"""Get the endpoint API key"""
endpoint_api_key = Endpoint.get_endpoint_api_key(
endpoint_name=self.endpoint_group_name,
account_api_key=self.api_key,
instance=self.instance,
)
if not endpoint_api_key:
log.error(f"Failed to get API key for endpoint {self.endpoint_group_name}")
return endpoint_api_key
self.endpoint_api_key = endpoint_api_key
def _get_worker_url(self, cost: int = DEFAULT_COST) -> Dict[str, Any]:
"""Get worker URL and auth data from routing service"""
@@ -554,12 +546,24 @@ def main():
sys.exit(1)
try:
endpoint_api_key = Endpoint.get_endpoint_api_key(
endpoint_name=args.endpoint_group_name,
account_api_key=args.api_key,
instance=args.instance,
)
if not endpoint_api_key:
log.error(
f"Could not retrieve API key for endpoint '{args.endpoint_group_name}'. Exiting."
)
sys.exit(1)
# Create the core API client
client = APIClient(
endpoint_group_name=args.endpoint_group_name,
api_key=args.api_key,
server_url=args.server_url,
instance=args.instance,
endpoint_api_key=endpoint_api_key,
)
# Create tool manager and demo (passing the model parameter)