Fix duplicate slash URL handling for 25.9

flow360/component/folder.py

@@ -197,7 +197,7 @@ def get_items(self):
                 "expandFields": ["contentInfo"],
             }
 
-            data = RestApi("/v2/items").get(params=payload)
+            data = RestApi("v2/items").get(params=payload)
             records = data.get("records", [])
             all_records.extend(records)
             total_record_count = data.get("total", 0)
@@ -265,7 +265,7 @@ def get_folder_tree(self):
             "page": 0,
             "size": 1000,
         }  # it assumes user will not have more than 1000 folders
-        data = RestApi("/v2/folders").get(params=payload)
+        data = RestApi("v2/folders").get(params=payload)
         folder_tree = self._build_folder_tree(data["records"])
         return folder_tree
 

flow360/component/simulation/folder.py

@@ -247,7 +247,7 @@ def get_items(self):
                 "expandFields": ["contentInfo"],
             }
 
-            data = RestApi("/v2/items").get(params=payload)
+            data = RestApi("v2/items").get(params=payload)
             records = data.get("records", [])
             all_records.extend(records)
             total_record_count = data.get("total", 0)
@@ -315,7 +315,7 @@ def get_folder_tree(self):
             "page": 0,
             "size": 1000,
         }  # it assumes user will not have more than 1000 folders
-        data = RestApi("/v2/folders").get(params=payload)
+        data = RestApi("v2/folders").get(params=payload)
         folder_tree = self._build_folder_tree(data["records"])
         return folder_tree
 

flow360/environment.py

@@ -73,23 +73,23 @@ def get_real_url(self, path: str):
         :param path:
         :return:
         """
-        return "/".join([self.web_api_endpoint, path])
+        return self.web_api_endpoint.rstrip("/") + "/" + path.lstrip("/")
 
     def get_portal_real_url(self, path: str):
         """
         Get the portal real url for the particular environment.
         :param path:
         :return:
         """
-        return "/".join([self.portal_web_api_endpoint, path])
+        return self.portal_web_api_endpoint.rstrip("/") + "/" + path.lstrip("/")
 
     def get_web_real_url(self, path: str):
         """
         Get the web real url for the particular environment.
         :param path:
         :return:
         """
-        return "/".join([self.web_url, path])
+        return self.web_url.rstrip("/") + "/" + path.lstrip("/")
 
     @classmethod
     def from_config(cls, env_config_name: str):

flow360/version.py

@@ -2,5 +2,5 @@
 version
 """
 
-__version__ = "25.9.8"
+__version__ = "25.9.9"
 __solver_version__ = "release-25.9"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flow360"
-version = "v25.9.8"
+version = "v25.9.9"
 description = "Flow360 Python Client"
 authors = ["Flexcompute <support@flexcompute.com>"]
 
@@ -10,7 +10,7 @@ pydantic = ">=2.8,<2.12"
 pytest = "^7.1.2"
 click = "^8.1.3"
 toml = "^0.10.2"
-requests = "^2.32.4"
+requests = ">=2.32.4,<2.33.0"
 boto3 = "^1.24.63"
 numpy = [
     { python = "^3.10", version = ">=2.0,<3.0.0" },

tests/test_current_flow360_version.py

@@ -2,4 +2,4 @@
 
 
 def test_version():
-    assert __version__ == "25.9.8"
+    assert __version__ == "25.9.9"

tests/test_environment.py

@@ -1,8 +1,44 @@
 from flow360 import Env
+from flow360.cloud.rest_api import RestApi
+from flow360.environment import EnvironmentConfig
 
 
 def test_version():
     Env.dev.active()
     print(Env.current)
     assert Env.current.name == "dev"
     Env.prod.active()
+
+
+def test_environment_urls_normalize_path_slashes():
+    env = EnvironmentConfig(
+        name="test",
+        domain="example.com",
+        web_api_endpoint="https://api.example.com/",
+        web_url="https://web.example.com/",
+        portal_web_api_endpoint="https://portal.example.com/",
+        apikey_profile="default",
+    )
+
+    for path in ("v2/folders", "/v2/folders"):
+        assert env.get_real_url(path) == "https://api.example.com/v2/folders"
+        assert env.get_portal_real_url(path) == "https://portal.example.com/v2/folders"
+        assert env.get_web_real_url(path) == "https://web.example.com/v2/folders"
+
+
+def test_rest_api_url_normalizes_with_environment():
+    env = EnvironmentConfig(
+        name="test",
+        domain="example.com",
+        web_api_endpoint="https://api.example.com",
+        web_url="https://web.example.com",
+        portal_web_api_endpoint="https://portal.example.com",
+        apikey_profile="default",
+    )
+
+    assert env.get_real_url(RestApi("/v2/folders")._url(None)) == (
+        "https://api.example.com/v2/folders"
+    )
+    assert env.get_real_url(RestApi("v2/folders")._url(None)) == (
+        "https://api.example.com/v2/folders"
+    )