use /.join instead of join in order to avoid windows compat problems

building_dao/building_generic.py

@@ -44,7 +44,7 @@ class BuildingGeneric:
     # ----------------- Building level ---------------------
     def post_building(self, payload) -> None:
         """Post a new building"""
-        res = self._req_with_retries("post", join(self.settings.base_url), json=payload)
+        res = self._req_with_retries("post", self.settings.base_url, json=payload)
         self._uid = res["id"]
         self.fetch()
 
@@ -59,14 +59,14 @@ class BuildingGeneric:
 
     def fetch(self) -> None:
         """Fetch the building document"""
-        self._building = self._req_with_retries("get", join(self.settings.base_url, self._uid))
+        self._building = self._req_with_retries("get", "/".join([self.settings.base_url, self._uid]))
 
     def update_building(self, payload) -> None:
         """
         Update ES doc with information at building level
         Note: the retries for conflict error are managed within BKC API
         """
-        self._req("put", join(self.settings.base_url, self._uid), json=payload)
+        self._req("put", "/".join([self.settings.base_url, self._uid]), json=payload)
 
     def update_status_history(self, status: str) -> None:
         """
@@ -83,7 +83,7 @@ class BuildingGeneric:
             "operation_history": operation_history
         }
 
-        self._req("put", join(self.settings.base_url, self._uid), json={**payload})
+        self._req("put", "/".join([self.settings.base_url, self._uid]), json={**payload})
 
     def register_error_for_building(self, error_code: str):
         """
@@ -91,7 +91,7 @@ class BuildingGeneric:
         Note: the retries for conflict error are managed within BKC API
         """
 
-        url = join(self.settings.base_url, self._uid, "errors")
+        url = "/".join([self.settings.base_url, self._uid, "errors"])
         payload = {"error_code": error_code}
         return self._req(method="put", url=url, json=payload)
 
@@ -100,7 +100,7 @@ class BuildingGeneric:
         body = {"metadata": payload}
         self._req_with_retries(
             "post",
-            join(self.settings.base_url, self._uid, "metadata", name),
+            "/".join([self.settings.base_url, self._uid, "metadata", name]),
             json=body,
         )
 
@@ -109,7 +109,7 @@ class BuildingGeneric:
         """Get roof image"""
 
         image = self._req_with_retries(
-            "get", join(self.settings.base_url, self._uid, "roof", "image", image_name)
+            "get", "/".join([self.settings.base_url, self._uid, "roof", "image", image_name])
         )
         return image["image"]
 
@@ -119,7 +119,7 @@ class BuildingGeneric:
         body = {"image": b64encode(image).decode()}
         self._req_with_retries(
             "post",
-            join(self.settings.base_url, self._uid, "roof", "image", image_name),
+            "/".join([self.settings.base_url, self._uid, "roof", "image", image_name]),
             json=body,
         )
 
@@ -128,7 +128,7 @@ class BuildingGeneric:
         body = {"metadata": payload}
         self._req_with_retries(
             "post",
-            join(self.settings.base_url, self._uid, "roof", "metadata", name),
+            "/".join([self.settings.base_url, self._uid, "roof", "metadata", name]),
             json=body,
         )
 
@@ -148,15 +148,14 @@ class BuildingGeneric:
 
         image = self._req_with_retries(
             "get",
-            join(self.settings.base_url, self._uid, "facade", facade_id, "image", image_name),
+            "/".join([self.settings.base_url, self._uid, "facade", facade_id, "image", image_name]),
         )
         return image["image"]
 
     def get_segmentation_vectors(self, facade_id: str, item: str):
         """Get segmentation vectors for the specified item (eg: door) from Hbase"""
-
         vectors = self._req_with_retries(
-            "get", join(self.settings.base_url, self._uid, "facade", facade_id, item, "vectors")
+            "get", "/".join([self.settings.base_url, self._uid, "facade", facade_id, item, "vectors"])
         )
         return vectors
 
@@ -168,7 +167,7 @@ class BuildingGeneric:
         body = {"image": b64encode(image).decode()}
         self._req_with_retries(
             "post",
-            join(self.settings.base_url, self._uid, "facade", facade_id, "image", image_name),
+            "/".join([self.settings.base_url, self._uid, "facade", facade_id, "image", image_name]),
             json=body,
         )
 
@@ -177,14 +176,14 @@ class BuildingGeneric:
         body = {"metadata": payload}
         self._req_with_retries(
             "post",
-            join(self.settings.base_url, self._uid, "facade", facade_id, "metadata", name),
+            "/".join([self.settings.base_url, self._uid, "facade", facade_id, "metadata", name]),
             json=body,
         )
 
     def register_error_for_facade(self, error_code: str, facade_id: str):
         """Add an error at facade level to ES doc"""
 
-        url = join(self.settings.base_url, self._uid, "facade", facade_id, "errors")
+        url = "/".join([self.settings.base_url, self._uid, "facade", facade_id, "errors"])
         payload = {"error_code": error_code}
         return self._force_update_with_version(payload=payload, url=url)
 
@@ -238,7 +237,7 @@ class BuildingGeneric:
             for f in self._building["facade"]
         ]
 
-        url = join(self.settings.base_url, self._uid)
+        url = "/".join([self.settings.base_url, self._uid])
         self._update_with_version({"facade": facade}, url=url)
         self.fetch()
 

building_dao/settings.py

@@ -13,6 +13,6 @@ class Settings:
         building_center_info = registry.get_info("building-knowledge-information-center")
 
         self.api_key = building_center_info["api_in"][registry.node_id]["key"]
-        self.base_url = "http://{}:{}/api/buildings/".format(
+        self.base_url = "http://{}:{}/api/buildings".format(
             building_center_info["service_addr"], building_center_info["service_port"]
         )