From 19e1462e65995291be39081dfcbc0cd0dd588b6f Mon Sep 17 00:00:00 2001
From: rudolfix <rudolfix@rudolfix.org>
Date: Thu, 23 May 2024 17:04:25 +0200
Subject: [PATCH] detects a path param in the right-most path segment (#1394)

---
 dlt/sources/helpers/rest_client/detector.py     |  8 ++++++--
 .../helpers/rest_client/test_detector.py        | 17 ++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/dlt/sources/helpers/rest_client/detector.py b/dlt/sources/helpers/rest_client/detector.py
index d004ca173c..19a1e83a82 100644
--- a/dlt/sources/helpers/rest_client/detector.py
+++ b/dlt/sources/helpers/rest_client/detector.py
@@ -1,5 +1,6 @@
 import re
-from typing import List, Dict, Any, Tuple, Union, Optional, Callable, Iterable
+from pathlib import PurePosixPath
+from typing import List, Dict, Any, Tuple, Union, Callable, Iterable
 from urllib.parse import urlparse
 
 from requests import Response
@@ -47,7 +48,10 @@
 
 def single_entity_path(path: str) -> bool:
     """Checks if path ends with path param indicating that single object is returned"""
-    return re.search(r"\{([a-zA-Z_][a-zA-Z0-9_]*)\}/?$", path) is not None
+    # get last path segment
+    name = PurePosixPath(path).name
+    # alphabet for a name taken from https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.3.md#fixed-fields-6
+    return re.search(r"\{([a-zA-Z0-9\.\-_]+)\}", name) is not None
 
 
 def matches_any_pattern(key: str, patterns: Iterable[str]) -> bool:
diff --git a/tests/sources/helpers/rest_client/test_detector.py b/tests/sources/helpers/rest_client/test_detector.py
index f01f9409a1..6511b472fb 100644
--- a/tests/sources/helpers/rest_client/test_detector.py
+++ b/tests/sources/helpers/rest_client/test_detector.py
@@ -406,16 +406,20 @@ def test_find_paginator(test_case) -> None:
     [
         "/users/{user_id}",
         "/api/v1/products/{product_id}/",
-        # those are not valid paths
-        # "/api/v1/products/{product_id}//",
-        # "/api/v1/products/{product_id}?param1=value1",
-        # "/api/v1/products/{product_id}#section",
-        # "/api/v1/products/{product_id}/#section",
+        "/api/v1/products/{product_id}//",
+        "/api/v1/products/{product_id}?param1=value1",
+        "/api/v1/products/{product_id}#section",
+        "/api/v1/products/{product_id}.json",
+        "/api/v1/products/{product_id}.json/",
+        "/api/v1/products/{product_id}_data",
+        "/api/v1/products/{product_id}_data?param=true",
         "/users/{user_id}/posts/{post_id}",
         "/users/{user_id}/posts/{post_id}/comments/{comment_id}",
         "{entity}",
         "/{entity}",
         "/{user_123}",
+        "/users/{user-id}",
+        "/users/{123}",
     ],
 )
 def test_single_entity_path_valid(path):
@@ -430,8 +434,7 @@ def test_single_entity_path_valid(path):
         "/users/{user_id}/details",
         "/",
         "/{}",
-        "/users/{123}",
-        "/users/{user-id}",
+        "/api/v1/products/{product_id}/#section",
         "/users/{user id}",
         "/users/{user_id}/{",  # Invalid ending
     ],