fixed issue with get_image_name_and_tag

Author: Andrei Neagu

packages/service-library/src/servicelib/docker_utils.py

@@ -134,11 +134,17 @@ def get_image_complete_url(
 
 
 def get_image_name_and_tag(image_complete_url: URL) -> tuple[str, str]:
-    if "sha256" in f"{image_complete_url}":
-        parts = image_complete_url.path.split("@")
+    parent = f"{image_complete_url.parent}"
+    no_parent_image_url = f"{image_complete_url}".strip(parent)
+    if "sha256" in no_parent_image_url:
+        parts = no_parent_image_url.split("@")
+        to_split = parts[0]
     else:
-        parts = image_complete_url.path.split(":")
-    return parts[0].strip("/"), parts[1]
+        to_split = no_parent_image_url
+
+    parts = to_split.split(":")
+    image_name = parts[0].strip("/")
+    return f"{parent}/{image_name}".lstrip("/"), parts[1]
 
 
 @dataclass

packages/service-library/tests/test_docker_utils.py

@@ -2,7 +2,8 @@
 from datetime import datetime, timezone
 
 import pytest
-from servicelib.docker_utils import to_datetime
+from servicelib.docker_utils import get_image_name_and_tag, to_datetime
+from yarl import URL
 
 NOW = datetime.now(tz=timezone.utc)
 
@@ -41,3 +42,36 @@
 def test_to_datetime(docker_time: str, expected_datetime: datetime):
     received_datetime = to_datetime(docker_time)
     assert received_datetime == expected_datetime
+
+
+@pytest.mark.parametrize(
+    "image, expected_name, expected_tag",
+    [
+        ("my_image:latest", "my_image", "latest"),
+        ("my_image:1.1.1", "my_image", "1.1.1"),
+        ("my_image:latest@sha256:1234567890abcdef", "my_image", "latest"),
+        ("my_image:1.1.1@sha256:1234567890abcdef", "my_image", "1.1.1"),
+        ("docker.io/my_image:latest", "docker.io/my_image", "latest"),
+        ("docker.io/my_image:1.1.1", "docker.io/my_image", "1.1.1"),
+        (
+            "docker.io/my_image:1.1.1@sha256:1234567890abcdef",
+            "docker.io/my_image",
+            "1.1.1",
+        ),
+        ("registry:5000/my_image:1.1.1", "registry:5000/my_image", "1.1.1"),
+        (
+            "registry:5000/my_image:1.1.1@sha256:1234567890abcdef",
+            "registry:5000/my_image",
+            "1.1.1",
+        ),
+        (
+            "registry:5000/simcore/services/dynamic/jupyter-fenics:1.1.2",
+            "registry:5000/simcore/services/dynamic/jupyter-fenics",
+            "1.1.2",
+        ),
+    ],
+)
+def test_get_image_name_and_tag(image: str, expected_name: str, expected_tag: str):
+    name, tag = get_image_name_and_tag(URL(image))
+    assert name == expected_name
+    assert tag == expected_tag