Skip to content

Make url building compatible with Windows #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bgaudin-lc merged 1 commit into from
Mar 25, 2026
Merged

Make url building compatible with Windows #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/main/brmcpserver/clients.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import urllib.request
import logging
import os
import json
from typing import List, Dict, Optional
from urllib.error import HTTPError
Expand Down Expand Up @@ -33,9 +32,14 @@ def __init__(self, api_key, api_endpoint):
'x-bronto-api-key': self.api_key
}

@staticmethod
def _url_join(base, path):
"""Join URL parts using forward slashes (os.path.join uses backslashes on Windows)."""
return base.rstrip('/') + '/' + path.lstrip('/')

def get_datasets(self):
url_path = 'logs'
request = urllib.request.Request(os.path.join(self.api_endpoint, url_path), headers=self.headers)
request = urllib.request.Request(BrontoClient._url_join(self.api_endpoint, url_path), headers=self.headers)
try:
with urllib.request.urlopen(request) as resp:
if resp.status != 200 and resp.status != 201:
Expand Down Expand Up @@ -87,7 +91,7 @@ def search(self, timestamp_start: int, timestamp_end: int, log_ids: list[str], w
"&".join([urllib.parse.urlencode({'groups': key}) for key in params.get("group_by_keys")])
)
url_params = url_params[:len(url_params) - 1] if url_params.endswith('&') else url_params
req_w_params = os.path.join(self.api_endpoint, url_path) + url_params
req_w_params = BrontoClient._url_join(self.api_endpoint, url_path) + url_params
request = urllib.request.Request(req_w_params, headers=self.headers)
try:
with urllib.request.urlopen(request) as resp:
Expand Down Expand Up @@ -143,7 +147,7 @@ def search_post(self, timestamp_start: int, timestamp_end: int, log_ids: list[st
'groups': group_by_keys,
'num_of_slices': 10
}
req_w_params = os.path.join(self.api_endpoint, url_path)
req_w_params = BrontoClient._url_join(self.api_endpoint, url_path)
request = urllib.request.Request(req_w_params, method='POST', data=json.dumps(params).encode(),
headers=self.headers)
try:
Expand Down Expand Up @@ -178,7 +182,7 @@ def search_post(self, timestamp_start: int, timestamp_end: int, log_ids: list[st

def get_top_keys(self, log_id) -> Dict[str, List[str]]:
url_path = f'top-keys?log_id={log_id}'
request = urllib.request.Request(os.path.join(self.api_endpoint, url_path), headers=self.headers)
request = urllib.request.Request(BrontoClient._url_join(self.api_endpoint, url_path), headers=self.headers)
try:
with urllib.request.urlopen(request) as resp:
if resp.status != 200 and resp.status != 201:
Expand Down Expand Up @@ -220,7 +224,7 @@ def get_top_keys(self, log_id) -> Dict[str, List[str]]:

def get_all_datasets_top_keys(self) -> Dict[str, List[str]]:
url_path = f'top-keys'
request = urllib.request.Request(os.path.join(self.api_endpoint, url_path), headers=self.headers)
request = urllib.request.Request(BrontoClient._url_join(self.api_endpoint, url_path), headers=self.headers)
try:
with urllib.request.urlopen(request) as resp:
if resp.status != 200 and resp.status != 201:
Expand Down Expand Up @@ -260,7 +264,7 @@ def get_all_datasets_top_keys(self) -> Dict[str, List[str]]:

def get_all_datasets_top_keys_and_values(self) -> Dict[str, Dict[str, List[str]]]:
url_path = f'top-keys'
request = urllib.request.Request(os.path.join(self.api_endpoint, url_path), headers=self.headers)
request = urllib.request.Request(BrontoClient._url_join(self.api_endpoint, url_path), headers=self.headers)
try:
with urllib.request.urlopen(request) as resp:
if resp.status != 200 and resp.status != 201:
Expand Down
Loading