From a3e414ad00f0182f0e936fe5135617cda48cfebd Mon Sep 17 00:00:00 2001 From: jfm Date: Thu, 30 Oct 2025 09:14:27 +0100 Subject: [PATCH] Fixed url handling --- src/rapt/client.py | 2 +- tests/test_fermentation_chamber.py | 12 ++++++------ tests/test_hydrometer.py | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/rapt/client.py b/src/rapt/client.py index 7a92877..2db9824 100644 --- a/src/rapt/client.py +++ b/src/rapt/client.py @@ -61,7 +61,7 @@ class Client(): async def get_json(self, url, parameters): headers = await self.get_auth_headers() logger.trace("HEADERS: " + str(headers)) - async with self.session.get(url, headers=headers, params=parameters) as response: + async with self.session.get(self.host+url, headers=headers, params=parameters) as response: response_json = await response.json() logger.trace(response.request_info.url) if response.status == 200: diff --git a/tests/test_fermentation_chamber.py b/tests/test_fermentation_chamber.py index 27b7cec..6ccf25e 100644 --- a/tests/test_fermentation_chamber.py +++ b/tests/test_fermentation_chamber.py @@ -15,7 +15,7 @@ async def client(aiohttp_client): async def test_get_fermentation_chambers(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/fermentationchambers/getfermentationchambers", payload=json_reader("./tests/json/get_fermentation_chambers_response.json")) + responses.get("https://api.rapt.io/api/fermentationchambers/getfermentationchambers", payload=json_reader("./tests/json/get_fermentation_chambers_response.json")) fermentation_chamber = FermentationChamber(client) ferms = await fermentation_chamber.get_fermentation_chambers() @@ -25,7 +25,7 @@ async def test_get_fermentation_chambers(client): async def test_get_fermentation_chambers_500(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/fermentationchambers/getfermentationchambers", status=500) + responses.get("https://api.rapt.io/api/fermentationchambers/getfermentationchambers", status=500) fermentation_chamber = FermentationChamber(client) ferms = await fermentation_chamber.get_fermentation_chambers() @@ -34,7 +34,7 @@ async def test_get_fermentation_chambers_500(client): async def test_get_fermentation_chamber(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/fermentationchambers/getfermentationchamber", payload=json_reader("./tests/json/get_fermentation_chamber_response.json")) + responses.get("https://api.rapt.io/api/fermentationchambers/getfermentationchamber", payload=json_reader("./tests/json/get_fermentation_chamber_response.json")) fermentation_chamber = FermentationChamber(client) ferms = await fermentation_chamber.get_fermentation_chamber("") @@ -43,7 +43,7 @@ async def test_get_fermentation_chamber(client): async def test_get_fermentation_chamber_500(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/fermentationchambers/getfermentationchamber", status=500) + responses.get("https://api.rapt.io/api/fermentationchambers/getfermentationchamber", status=500) fermentation_chamber = FermentationChamber(client) ferms = await fermentation_chamber.get_fermentation_chamber("") @@ -52,7 +52,7 @@ async def test_get_fermentation_chamber_500(client): async def test_get_telemetry(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/fermentationchambers/gettelemetry", payload=json_reader("./tests/json/get_fermentation_chamber_telemetry_response.json")) + responses.get("https://api.rapt.io/api/fermentationchambers/gettelemetry", payload=json_reader("./tests/json/get_fermentation_chamber_telemetry_response.json")) fermentation_chamber = FermentationChamber(client) telemetry = await fermentation_chamber.get_telemetry("", "", "", "") @@ -62,7 +62,7 @@ async def test_get_telemetry(client): async def test_get_telemetry_500(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/fermentationchambers/gettelemetry", status=500) + responses.get("https://api.rapt.io/api/fermentationchambers/gettelemetry", status=500) fermentation_chamber = FermentationChamber(client) telemetry = await fermentation_chamber.get_telemetry("", "", "", "") diff --git a/tests/test_hydrometer.py b/tests/test_hydrometer.py index 77d77b7..af09178 100644 --- a/tests/test_hydrometer.py +++ b/tests/test_hydrometer.py @@ -15,7 +15,7 @@ async def client(aiohttp_client): async def test_get_hydrometers(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/hydrometers/gethydrometers", payload=json_reader("./tests/json/get_hydrometers_response.json")) + responses.get("https://api.rapt.io/api/hydrometers/gethydrometers", payload=json_reader("./tests/json/get_hydrometers_response.json")) hydrometer = Hydrometer(client) hydros = await hydrometer.get_hydrometers() @@ -25,7 +25,7 @@ async def test_get_hydrometers(client): async def test_get_hydrometers_500(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/hydrometers/gethydrometers", status=500) + responses.get("https://api.rapt.io/api/hydrometers/gethydrometers", status=500) hydrometer = Hydrometer(client) hydros = await hydrometer.get_hydrometers() @@ -34,7 +34,7 @@ async def test_get_hydrometers_500(client): async def test_get_hydrometer(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/hydrometers/gethydrometer", payload=json_reader("./tests/json/get_hydrometer_response.json")) + responses.get("https://api.rapt.io/api/hydrometers/gethydrometer", payload=json_reader("./tests/json/get_hydrometer_response.json")) hydrometer = Hydrometer(client) hydros = await hydrometer.get_hydrometer("") @@ -43,7 +43,7 @@ async def test_get_hydrometer(client): async def test_get_hydrometer_500(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/hydrometers/gethydrometer", status=500) + responses.get("https://api.rapt.io/api/hydrometers/gethydrometer", status=500) hydrometer = Hydrometer(client) hydros = await hydrometer.get_hydrometer("") @@ -52,7 +52,7 @@ async def test_get_hydrometer_500(client): async def test_get_telemetry(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/hydrometers/gettelemetry", payload=json_reader("./tests/json/get_hydrometer_telemetry_response.json")) + responses.get("https://api.rapt.io/api/hydrometers/gettelemetry", payload=json_reader("./tests/json/get_hydrometer_telemetry_response.json")) hydrometer = Hydrometer(client) telemetry = await hydrometer.get_telemetry("", "", "", "") @@ -61,7 +61,7 @@ async def test_get_telemetry(client): async def test_get_telemetry_500(client): with aioresponses() as responses: responses.post("https://id.rapt.io/connect/token", payload=json_reader("./tests/json/token_response.json")) - responses.get("/api/hydrometers/gettelemetry", status=500) + responses.get("https://api.rapt.io/api/hydrometers/gettelemetry", status=500) hydrometer = Hydrometer(client) telemetry = await hydrometer.get_telemetry("", "", "", "")