monkey_patches an issue with Pydantic causing PageLinks validation to fail

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

@@ -2,4 +2,48 @@
 
 """
 
+
+def __monkey_patch_pydantic_url_regex() -> None:
+    # waiting for PR https://github.com/samuelcolvin/pydantic/pull/2512 to be released into
+    # pydantic main codebase
+
+    import pydantic
+
+    if pydantic.VERSION > "1.8.1":
+        raise RuntimeError(
+            (
+                "Please check that PR https://github.com/samuelcolvin/pydantic/pull/2512 "
+                "was merged. If already present in this version, remove this monkey_patch"
+            )
+        )
+
+    from typing import Pattern
+    from pydantic import networks
+    import re
+
+    def url_regex() -> Pattern[str]:
+        _url_regex_cache = networks._url_regex_cache  # pylint: disable=protected-access
+        if _url_regex_cache is None:
+            _url_regex_cache = re.compile(
+                r"(?:(?P<scheme>[a-z][a-z0-9+\-.]+)://)?"  # scheme https://tools.ietf.org/html/rfc3986#appendix-A
+                r"(?:(?P<user>[^\s:/]*)(?::(?P<password>[^\s/]*))?@)?"  # user info
+                r"(?:"
+                r"(?P<ipv4>(?:\d{1,3}\.){3}\d{1,3})(?=$|[/:#?])|"  # ipv4
+                r"(?P<ipv6>\[[A-F0-9]*:[A-F0-9:]+\])(?=$|[/:#?])|"  # ipv6
+                r"(?P<domain>[^\s/:?#]+)"  # domain, validation occurs later
+                r")?"
+                r"(?::(?P<port>\d+))?"  # port
+                r"(?P<path>/[^\s?#]*)?"  # path
+                r"(?:\?(?P<query>[^\s#]+))?"  # query
+                r"(?:#(?P<fragment>\S+))?",  # fragment
+                re.IGNORECASE,
+            )
+        return _url_regex_cache
+
+    networks.url_regex = url_regex
+
+
+__monkey_patch_pydantic_url_regex()
+
+
 __version__ = "0.1.0"

packages/service-library/tests/test_rest_pagination_utils.py

@@ -57,13 +57,28 @@ def test_empty_data_is_converted_to_list():
     assert model_instance.data == []
 
 
-def test_paginating_data():
+@pytest.mark.parametrize(
+    "base_url",
+    [
+        "http://site.com",
+        "http://site.com/",
+        "http://some/random/url.com",
+        "http://some/random/url.com/",
+        "http://s.s.s.s.subsite.site.com",
+        "http://s.s.s.s.subsite.site.com/",
+        "http://10.0.0.1.nip.io/",
+        "http://10.0.0.1.nip.io:8091/",
+        "http://10.0.0.1.nip.io",
+        "http://10.0.0.1.nip.io:8091",
+    ],
+)
+def test_paginating_data(base_url):
     # create random data
     total_number_of_data = 29
     limit = 9
     offset = 0
     partial_data = [range(9)]
-    request_url = URL("http://some/random/url.com?some=1&random=4&query=true")
+    request_url = URL(f"{base_url}?some=1&random=4&query=true")
 
     # first "call"
     model_instance: PageResponseLimitOffset = PageResponseLimitOffset.paginate_data(
@@ -75,11 +90,27 @@ def test_paginating_data():
         total=total_number_of_data, count=len(partial_data), limit=limit, offset=offset
     )
     assert model_instance.links == PageLinks(
-        self=f"http://some/random/url.com?some=1&random=4&query=true&offset={offset}&limit={limit}",
-        first=f"http://some/random/url.com?some=1&random=4&query=true&offset=0&limit={limit}",
+        self=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset={offset}&limit={limit}"
+            )
+        ),
+        first=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset=0&limit={limit}"
+            )
+        ),
         prev=None,
-        next=f"http://some/random/url.com?some=1&random=4&query=true&offset=9&limit={limit}",
-        last=f"http://some/random/url.com?some=1&random=4&query=true&offset=27&limit={limit}",
+        next=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset=9&limit={limit}"
+            )
+        ),
+        last=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset=27&limit={limit}"
+            )
+        ),
     )
 
     # next "call"s
@@ -100,11 +131,31 @@ def test_paginating_data():
             offset=offset + i * limit,
         )
         assert model_instance.links == PageLinks(
-            self=f"http://some/random/url.com?some=1&random=4&query=true&offset={offset + i*limit}&limit={limit}",
-            first=f"http://some/random/url.com?some=1&random=4&query=true&offset=0&limit={limit}",
-            prev=f"http://some/random/url.com?some=1&random=4&query=true&offset={offset + i*limit-limit}&limit={limit}",
-            next=f"http://some/random/url.com?some=1&random=4&query=true&offset={offset + i*limit+limit}&limit={limit}",
-            last=f"http://some/random/url.com?some=1&random=4&query=true&offset=27&limit={limit}",
+            self=str(
+                URL(base_url).with_query(
+                    f"some=1&random=4&query=true&offset={offset + i*limit}&limit={limit}"
+                )
+            ),
+            first=str(
+                URL(base_url).with_query(
+                    f"some=1&random=4&query=true&offset=0&limit={limit}"
+                )
+            ),
+            prev=str(
+                URL(base_url).with_query(
+                    f"some=1&random=4&query=true&offset={offset + i*limit-limit}&limit={limit}"
+                )
+            ),
+            next=str(
+                URL(base_url).with_query(
+                    f"some=1&random=4&query=true&offset={offset + i*limit+limit}&limit={limit}"
+                )
+            ),
+            last=str(
+                URL(base_url).with_query(
+                    f"some=1&random=4&query=true&offset=27&limit={limit}"
+                )
+            ),
         )
 
     # last "call"
@@ -124,9 +175,25 @@ def test_paginating_data():
         offset=offset + 3 * limit,
     )
     assert model_instance.links == PageLinks(
-        self=f"http://some/random/url.com?some=1&random=4&query=true&offset={offset+3*limit}&limit={limit}",
-        first=f"http://some/random/url.com?some=1&random=4&query=true&offset=0&limit={limit}",
-        prev=f"http://some/random/url.com?some=1&random=4&query=true&offset=18&limit={limit}",
+        self=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset={offset+3*limit}&limit={limit}"
+            )
+        ),
+        first=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset=0&limit={limit}"
+            )
+        ),
+        prev=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset=18&limit={limit}"
+            )
+        ),
         next=None,
-        last=f"http://some/random/url.com?some=1&random=4&query=true&offset=27&limit={limit}",
+        last=str(
+            URL(base_url).with_query(
+                f"some=1&random=4&query=true&offset=27&limit={limit}"
+            )
+        ),
     )