Added logic to '_get_visit_list()' to generate correct URL to backend server if it is behind a proxy

tieneupin · tieneupin · commit d339cad6b388 · 2025-04-10T17:38:21.000+01:00
diff --git a/src/murfey/util/client.py b/src/murfey/util/client.py
@@ -71,8 +71,9 @@ def authorised_requests() -> tuple[Callable, Callable, Callable, Callable]:
 
 
 def _get_visit_list(api_base: ParseResult, instrument_name: str):
+    proxy_path = api_base.path.rstrip("/")
     get_visits_url = api_base._replace(
-        path=f"/instruments/{instrument_name}/visits_raw"
+        path=f"{proxy_path}/instruments/{instrument_name}/visits_raw"
     )
     server_reply = requests.get(get_visits_url.geturl())
     if server_reply.status_code != 200:

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,9 @@ def authorised_requests() -> tuple[Callable, Callable, Callable, Callable]:`
`71`	`71`
`72`	`72`
`73`	`73`	`def _get_visit_list(api_base: ParseResult, instrument_name: str):`
	`74`	`+ proxy_path = api_base.path.rstrip("/")`
`74`	`75`	`get_visits_url = api_base._replace(`
`75`		`- path=f"/instruments/{instrument_name}/visits_raw"`
	`76`	`+ path=f"{proxy_path}/instruments/{instrument_name}/visits_raw"`
`76`	`77`	`)`
`77`	`78`	`server_reply = requests.get(get_visits_url.geturl())`
`78`	`79`	`if server_reply.status_code != 200:`