Skip to content

fix(client): encode literal bucket path segments #156

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

Open
TimeToBuildBob wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix(client): encode literal bucket path segments #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4f4aac
fix(client): encode literal bucket path segments
TimeToBuildBob Oct 29, 2026
1d950c4
style(tests): match CI Black import spacing
TimeToBuildBob Oct 29, 2026
056237f
fix(ci): keep Python 3.9 tests on a supported Ubuntu runner
TimeToBuildBob Oct 29, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-latest, windows-latest, macOS-latest]
os: [ubuntu-24.04, windows-latest, macOS-latest]
python_version: [3.9]

steps:
Expand Down
28 changes: 16 additions & 12 deletions aw_client/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
Tuple,
Union,
)
from urllib.parse import urlsplit
from urllib.parse import quote, urlsplit

import persistqueue
import requests as req
Expand Down Expand Up @@ -262,7 +262,7 @@ def get_event(
bucket_id: str,
event_id: int,
) -> Optional[Event]:
endpoint = f"buckets/{bucket_id}/events/{event_id}"
endpoint = f"buckets/{quote(bucket_id, safe='')}/events/{event_id}"
try:
event = self._get(endpoint).json()
return Event(**event)
Expand All @@ -279,7 +279,7 @@ def get_events(
start: Optional[datetime] = None,
end: Optional[datetime] = None,
) -> List[Event]:
endpoint = f"buckets/{bucket_id}/events"
endpoint = f"buckets/{quote(bucket_id, safe='')}/events"

params = dict() # type: Dict[str, str]
if limit is not None:
Expand All @@ -293,7 +293,7 @@ def get_events(
return [Event(**event) for event in events]

def insert_event(self, bucket_id: str, event: Event) -> Optional[Event]:
endpoint = f"buckets/{bucket_id}/events"
endpoint = f"buckets/{quote(bucket_id, safe='')}/events"
data = [event.to_json_dict()]
response = self._post(endpoint, data)
if response.json():
Expand All @@ -303,15 +303,15 @@ def insert_event(self, bucket_id: str, event: Event) -> Optional[Event]:
def insert_events(
self, bucket_id: str, events: List[Event]
) -> Optional[List[Event]]:
endpoint = f"buckets/{bucket_id}/events"
endpoint = f"buckets/{quote(bucket_id, safe='')}/events"
data = [event.to_json_dict() for event in events]
response = self._post(endpoint, data)
if response.json():
return [Event(**e) for e in response.json()]
return None

def delete_event(self, bucket_id: str, event_id: int) -> None:
endpoint = f"buckets/{bucket_id}/events/{event_id}"
endpoint = f"buckets/{quote(bucket_id, safe='')}/events/{event_id}"
self._delete(endpoint)

def delete_events(self, bucket_id: str, event_ids: List[int]) -> int:
Expand All @@ -321,7 +321,7 @@ def delete_events(self, bucket_id: str, event_ids: List[int]) -> int:
Unknown and duplicate ids are ignored. Returns the number of events
that existed and were deleted.
"""
endpoint = f"buckets/{bucket_id}/events/delete"
endpoint = f"buckets/{quote(bucket_id, safe='')}/events/delete"
return int(self._post(endpoint, {"ids": list(event_ids)}).json())

def get_eventcount(
Expand All @@ -331,7 +331,7 @@ def get_eventcount(
start: Optional[datetime] = None,
end: Optional[datetime] = None,
) -> int:
endpoint = f"buckets/{bucket_id}/events/count"
endpoint = f"buckets/{quote(bucket_id, safe='')}/events/count"

params = dict() # type: Dict[str, str]
if start is not None:
Expand Down Expand Up @@ -363,7 +363,9 @@ def heartbeat(
the function will in that case always returns None.
"""

endpoint = f"buckets/{bucket_id}/heartbeat?pulsetime={pulsetime}"
endpoint = (
f"buckets/{quote(bucket_id, safe='')}/heartbeat?pulsetime={pulsetime}"
)
_commit_interval = commit_interval or self.commit_interval

if queued:
Expand Down Expand Up @@ -435,7 +437,7 @@ def create_bucket(self, bucket_id: str, event_type: str, queued=False):
self._warn_queue_before_connect()
self.request_queue.register_bucket(bucket_id, event_type)
else:
endpoint = f"buckets/{bucket_id}"
endpoint = f"buckets/{quote(bucket_id, safe='')}"
data = {
"client": self.client_name,
"hostname": self.client_hostname,
Expand All @@ -444,7 +446,9 @@ def create_bucket(self, bucket_id: str, event_type: str, queued=False):
self._post(endpoint, data)

def delete_bucket(self, bucket_id: str, force: bool = False):
self._delete(f"buckets/{bucket_id}" + ("?force=1" if force else ""))
self._delete(
f"buckets/{quote(bucket_id, safe='')}" + ("?force=1" if force else "")
)

# @deprecated
def setup_bucket(self, bucket_id: str, event_type: str):
Expand All @@ -456,7 +460,7 @@ def export_all(self) -> dict:
return self._get("export").json()

def export_bucket(self, bucket_id) -> dict:
return self._get(f"buckets/{bucket_id}/export").json()
return self._get(f"buckets/{quote(bucket_id, safe='')}/export").json()

def import_bucket(self, bucket: dict) -> None:
endpoint = "import"
Expand Down
Loading
Loading