google
diff --git a/‎src/google/adk/artifacts/gcs_artifact_service.py
Lines changed: 17 additions & 3 deletions b/‎src/google/adk/artifacts/gcs_artifact_service.py
Lines changed: 17 additions & 3 deletions
diff --git a/‎tests/unittests/artifacts/test_artifact_service.py
Lines changed: 2 additions & 2 deletions b/‎tests/unittests/artifacts/test_artifact_service.py
Lines changed: 2 additions & 2 deletions
@@ -151,15 +151,15 @@ async def list_artifact_keys(
         self.bucket, prefix=session_prefix
     )
     for blob in session_blobs:
-      _, _, _, filename, _ = blob.name.split("/")
+      filename = get_full_file_name_from_blob_name(blob.name)
       filenames.add(filename)
 
     user_namespace_prefix = f"{app_name}/{user_id}/user/"
     user_namespace_blobs = self.storage_client.list_blobs(
         self.bucket, prefix=user_namespace_prefix
     )
     for blob in user_namespace_blobs:
-      _, _, _, filename, _ = blob.name.split("/")
+      filename = get_full_file_name_from_blob_name(blob.name)
       filenames.add(filename)
 
     return sorted(list(filenames))
@@ -190,6 +190,20 @@ async def list_versions(
     blobs = self.storage_client.list_blobs(self.bucket, prefix=prefix)
     versions = []
     for blob in blobs:
-      _, _, _, _, version = blob.name.split("/")
+      version = get_version_from_blob_name(blob.name)
       versions.append(int(version))
     return versions
+
+def get_version_from_blob_name(blob_name: str) -> int:
+  name_parts = blob_name.split("/")
+  return int(name_parts[-1])
+
+def get_full_file_name_from_blob_name(blob_name: str) -> str:
+    """Gets the full file name even if it contains slashes."""
+    name_parts = blob_name.split("/")
+    # cut the well-known {app_name}/{user_id}/{session_id} or "user"/
+    name_parts = name_parts[3:]
+    # cut the version
+    name_parts = name_parts[:-1]
+    # all that's left is the full file name
+    return "/".join(name_parts)
@@ -222,7 +222,7 @@ async def test_list_keys(service_type):
   app_name = "app0"
   user_id = "user0"
   session_id = "123"
-  filename = "filename"
+  filename = "hierarchical/path/filename"
   filenames = [filename + str(i) for i in range(5)]
 
   for f in filenames:
@@ -253,7 +253,7 @@ async def test_list_versions(service_type):
   app_name = "app0"
   user_id = "user0"
   session_id = "123"
-  filename = "filename"
+  filename = "hierarchical/path/filename"
   versions = [
       types.Part.from_bytes(
           data=i.to_bytes(2, byteorder="big"), mime_type="text/plain"