Take www into account for prod, reuse uuid pattern

Author: eleftherioszisis

src/entitysdk/common.py

@@ -9,10 +9,13 @@
 from entitysdk.exception import EntitySDKError
 from entitysdk.typedef import DeploymentEnvironment
 
+UUID_RE = "[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}"
+
+
 VLAB_URL_PATTERN = re.compile(
-    r"^https:\/\/(?:(?P<staging>staging)\.)?openbraininstitute\.org"
-    r"\/app\/virtual-lab\/lab\/(?P<vlab>[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})"
-    r"\/project\/(?P<proj>[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})(?:\/.*)?$"
+    r"^https:\/\/(?P<env>staging|www)?\.openbraininstitute\.org"
+    rf"\/app\/virtual-lab\/lab\/(?P<vlab>{UUID_RE})"
+    rf"\/project\/(?P<proj>{UUID_RE})(?:\/.*)?$"
 )
 
 
@@ -31,11 +34,11 @@ def from_vlab_url(cls, url: str) -> Self:
         if not result:
             raise EntitySDKError(f"Badly formed vlab url: {url}")
 
-        env = (
-            DeploymentEnvironment.staging
-            if result.group("staging")
-            else DeploymentEnvironment.production
-        )
+        env = {
+            "www": DeploymentEnvironment.production,
+            "staging": DeploymentEnvironment.staging,
+        }[result.group("env")]
+
         vlab_id = UUID(result.group("vlab"))
         proj_id = UUID(result.group("proj"))
 

tests/unit/test_common.py

@@ -28,15 +28,15 @@
             ),
         ),
         (
-            f"https://openbraininstitute.org/app/virtual-lab/lab/{VLAB_ID}/project/{PROJ_ID}/home",
+            f"https://www.openbraininstitute.org/app/virtual-lab/lab/{VLAB_ID}/project/{PROJ_ID}/home",
             test_module.ProjectContext(
                 virtual_lab_id=VLAB_ID,
                 project_id=PROJ_ID,
                 environment=DeploymentEnvironment.production,
             ),
         ),
         (
-            f"https://openbraininstitute.org/app/virtual-lab/lab/{VLAB_ID}/project/{PROJ_ID}",
+            f"https://www.openbraininstitute.org/app/virtual-lab/lab/{VLAB_ID}/project/{PROJ_ID}",
             test_module.ProjectContext(
                 virtual_lab_id=VLAB_ID,
                 project_id=PROJ_ID,