a

Author: daquinteroflex

tests/config/test_nexus_migration.py

@@ -343,3 +343,57 @@ def test_configure_nexus_loads_correctly(tmp_path):
     # Switch back to nexus
     new_manager.switch_profile("nexus")
     assert str(new_manager.web.api_endpoint) == "http://my-nexus.example.com/tidy3d-api"
+
+
+def test_nexus_url_derivation():
+    """Test that nexus URL derivation handles edge cases correctly."""
+    from urllib.parse import urlparse, urlunparse
+
+    test_cases = [
+        # (input_url, expected_api, expected_website, expected_s3)
+        (
+            "http://localhost",
+            "http://localhost/tidy3d-api",
+            "http://localhost/tidy3d",
+            "http://localhost:9000",
+        ),
+        (
+            "http://localhost/",
+            "http://localhost/tidy3d-api",
+            "http://localhost/tidy3d",
+            "http://localhost:9000",
+        ),
+        (
+            "http://localhost:8080",
+            "http://localhost:8080/tidy3d-api",
+            "http://localhost:8080/tidy3d",
+            "http://localhost:9000",
+        ),
+        (
+            "http://nexus.company.com",
+            "http://nexus.company.com/tidy3d-api",
+            "http://nexus.company.com/tidy3d",
+            "http://nexus.company.com:9000",
+        ),
+        (
+            "https://nexus.company.com/",
+            "https://nexus.company.com/tidy3d-api",
+            "https://nexus.company.com/tidy3d",
+            "https://nexus.company.com:9000",
+        ),
+    ]
+
+    for nexus_url, expected_api, expected_website, expected_s3 in test_cases:
+        # Replicate the logic from configure_fn
+        base_url = nexus_url.rstrip("/")
+        api_endpoint = f"{base_url}/tidy3d-api"
+        website_endpoint = f"{base_url}/tidy3d"
+
+        parsed = urlparse(nexus_url)
+        hostname = parsed.hostname or parsed.netloc.split(":")[0]
+        s3_netloc = f"{hostname}:9000"
+        s3_endpoint = urlunparse((parsed.scheme, s3_netloc, "", "", "", ""))
+
+        assert api_endpoint == expected_api, f"Failed for {nexus_url}: api_endpoint"
+        assert website_endpoint == expected_website, f"Failed for {nexus_url}: website_endpoint"
+        assert s3_endpoint == expected_s3, f"Failed for {nexus_url}: s3_endpoint"

tidy3d/web/cli/app.py

@@ -8,6 +8,7 @@
 import shutil
 import ssl
 from typing import Any
+from urllib.parse import urlparse, urlunparse
 
 import click
 import requests
@@ -165,9 +166,17 @@ def configure_fn(
 
     # If nexus_url is provided, derive endpoints from it automatically
     if nexus_url:
-        api_endpoint = f"{nexus_url}/tidy3d-api"
-        website_endpoint = f"{nexus_url}/tidy3d"
-        s3_endpoint = f"{nexus_url}:9000"
+        # Strip trailing slashes for clean URLs
+        base_url = nexus_url.rstrip("/")
+        api_endpoint = f"{base_url}/tidy3d-api"
+        website_endpoint = f"{base_url}/tidy3d"
+
+        # For S3 endpoint, replace any existing port with 9000
+        parsed = urlparse(nexus_url)
+        # Reconstruct netloc with port 9000 (remove any existing port)
+        hostname = parsed.hostname or parsed.netloc.split(":")[0]
+        s3_netloc = f"{hostname}:9000"
+        s3_endpoint = urlunparse((parsed.scheme, s3_netloc, "", "", "", ""))
 
     # Check if any Nexus options are provided
     has_nexus_config = any(