removed LegacyUrl

Author: Andrei Neagu

packages/service-library/src/servicelib/aiohttp/long_running_tasks/_server.py

@@ -6,8 +6,7 @@
 
 from aiohttp import web
 from common_library.json_serialization import json_dumps
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
-from pydantic import PositiveFloat, TypeAdapter
+from pydantic import AnyHttpUrl, PositiveFloat, TypeAdapter
 
 from ...aiohttp import status
 from ...long_running_tasks._models import TaskGet
@@ -68,13 +67,13 @@ async def start_long_running_task(
         ip_addr, port = request_.transport.get_extra_info(
             "sockname"
         )  # https://docs.python.org/3/library/asyncio-protocol.html#asyncio.BaseTransport.get_extra_info
-        status_url = TypeAdapter(AnyHttpUrlLegacy).validate_python(
+        status_url = TypeAdapter(AnyHttpUrl).validate_python(
             f"http://{ip_addr}:{port}{request_.app.router['get_task_status'].url_for(task_id=task_id)}"  # NOSONAR
         )
-        result_url = TypeAdapter(AnyHttpUrlLegacy).validate_python(
+        result_url = TypeAdapter(AnyHttpUrl).validate_python(
             f"http://{ip_addr}:{port}{request_.app.router['get_task_result'].url_for(task_id=task_id)}"  # NOSONAR
         )
-        abort_url = TypeAdapter(AnyHttpUrlLegacy).validate_python(
+        abort_url = TypeAdapter(AnyHttpUrl).validate_python(
             f"http://{ip_addr}:{port}{request_.app.router['cancel_and_delete_task'].url_for(task_id=task_id)}"  # NOSONAR
         )
         task_get = TaskGet(

packages/service-library/src/servicelib/fastapi/long_running_tasks/_client.py

@@ -4,10 +4,9 @@
 import warnings
 from typing import Any, Awaitable, Callable, Final
 
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
 from fastapi import FastAPI, status
 from httpx import AsyncClient, HTTPError
-from pydantic import PositiveFloat, TypeAdapter
+from pydantic import AnyHttpUrl, PositiveFloat, TypeAdapter
 from tenacity import RetryCallState
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
@@ -106,6 +105,9 @@ async def request_wrapper(zelf: "Client", *args, **kwargs) -> Any:
             with attempt:
                 return await request_func(zelf, *args, **kwargs)
 
+        msg = "Unexpected"
+        raise RuntimeError(msg)
+
     return request_wrapper
 
 
@@ -131,16 +133,17 @@ def _client_configuration(self) -> ClientConfiguration:
         return output
 
     def _get_url(self, path: str) -> str:
-        url = f"{self._base_url}{self._client_configuration.router_prefix}{path}"
-        return f"{TypeAdapter(AnyHttpUrlLegacy).validate_python(url)}"
+        url_path = f"{self._client_configuration.router_prefix}{path}".lstrip("/")
+        url = TypeAdapter(AnyHttpUrl).validate_python(f"{self._base_url}{url_path}")
+        return f"{url}"
 
     @retry_on_http_errors
     async def get_task_status(
-        self, task_id: TaskId, *, timeout: PositiveFloat | None = None
+        self, task_id: TaskId, *, timeout: PositiveFloat | None = None  # noqa: ASYNC109
     ) -> TaskStatus:
         timeout = timeout or self._client_configuration.default_timeout
         result = await self._async_client.get(
-            self._get_url(f"task/{task_id}"),
+            self._get_url(f"/task/{task_id}"),
             timeout=timeout,
         )
         if result.status_code != status.HTTP_200_OK:
@@ -155,11 +158,11 @@ async def get_task_status(
 
     @retry_on_http_errors
     async def get_task_result(
-        self, task_id: TaskId, *, timeout: PositiveFloat | None = None
+        self, task_id: TaskId, *, timeout: PositiveFloat | None = None  # noqa: ASYNC109
     ) -> Any | None:
         timeout = timeout or self._client_configuration.default_timeout
         result = await self._async_client.get(
-            self._get_url(f"task/{task_id}/result"),
+            self._get_url(f"/task/{task_id}/result"),
             timeout=timeout,
         )
         if result.status_code != status.HTTP_200_OK:
@@ -177,11 +180,11 @@ async def get_task_result(
 
     @retry_on_http_errors
     async def cancel_and_delete_task(
-        self, task_id: TaskId, *, timeout: PositiveFloat | None = None
+        self, task_id: TaskId, *, timeout: PositiveFloat | None = None  # noqa: ASYNC109
     ) -> None:
         timeout = timeout or self._client_configuration.default_timeout
         result = await self._async_client.delete(
-            self._get_url(f"task/{task_id}"),
+            self._get_url(f"/task/{task_id}"),
             timeout=timeout,
         )
 

packages/service-library/tests/fastapi/long_running_tasks/test_long_running_tasks_context_manager.py

@@ -4,12 +4,11 @@
 import asyncio
 from typing import AsyncIterable, Final
 
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
 import pytest
 from asgi_lifespan import LifespanManager
 from fastapi import APIRouter, Depends, FastAPI, status
 from httpx import AsyncClient
-from pydantic import PositiveFloat, TypeAdapter
+from pydantic import AnyHttpUrl, PositiveFloat, TypeAdapter
 from servicelib.fastapi.long_running_tasks._context_manager import _ProgressManager
 from servicelib.fastapi.long_running_tasks.client import (
     Client,
@@ -50,7 +49,8 @@ async def a_test_task(task_progress: TaskProgress) -> int:
 
 async def a_failing_test_task(task_progress: TaskProgress) -> None:
     await asyncio.sleep(TASK_SLEEP_INTERVAL)
-    raise RuntimeError("I am failing as requested")
+    msg = "I am failing as requested"
+    raise RuntimeError(msg)
 
 
 @pytest.fixture
@@ -101,7 +101,7 @@ async def test_task_result(
     assert result.status_code == status.HTTP_200_OK, result.text
     task_id = result.json()
 
-    url = TypeAdapter(AnyHttpUrlLegacy).validate_python("http://backgroud.testserver.io")
+    url = TypeAdapter(AnyHttpUrl).validate_python("http://backgroud.testserver.io/")
     client = Client(app=bg_task_app, async_client=async_client, base_url=url)
     async with periodic_task_result(
         client,
@@ -121,7 +121,7 @@ async def test_task_result_times_out(
     assert result.status_code == status.HTTP_200_OK, result.text
     task_id = result.json()
 
-    url = TypeAdapter(AnyHttpUrlLegacy).validate_python("http://backgroud.testserver.io")
+    url = TypeAdapter(AnyHttpUrl).validate_python("http://backgroud.testserver.io/")
     client = Client(app=bg_task_app, async_client=async_client, base_url=url)
     timeout = TASK_SLEEP_INTERVAL / 10
     with pytest.raises(TaskClientTimeoutError) as exec_info:
@@ -147,7 +147,7 @@ async def test_task_result_task_result_is_an_error(
     assert result.status_code == status.HTTP_200_OK, result.text
     task_id = result.json()
 
-    url = TypeAdapter(AnyHttpUrlLegacy).validate_python("http://backgroud.testserver.io")
+    url = TypeAdapter(AnyHttpUrl).validate_python("http://backgroud.testserver.io/")
     client = Client(app=bg_task_app, async_client=async_client, base_url=url)
     with pytest.raises(TaskClientResultError) as exec_info:
         async with periodic_task_result(
@@ -158,7 +158,7 @@ async def test_task_result_task_result_is_an_error(
         ):
             pass
     assert f"{exec_info.value}".startswith(f"Task {task_id} finished with exception:")
-    assert 'raise RuntimeError("I am failing as requested")' in f"{exec_info.value}"
+    assert "I am failing as requested" in f"{exec_info.value}"
     await _assert_task_removed(async_client, task_id, router_prefix)
 
 
@@ -186,13 +186,17 @@ async def progress_update(
         assert received == ("", None)
 
     for _ in range(repeat):
-        await progress_updater.update(mock_task_id, percent=TypeAdapter(ProgressPercent).validate_python(0.0))
+        await progress_updater.update(
+            mock_task_id, percent=TypeAdapter(ProgressPercent).validate_python(0.0)
+        )
         assert counter == 2
         assert received == ("", 0.0)
 
     for _ in range(repeat):
         await progress_updater.update(
-            mock_task_id, percent=TypeAdapter(ProgressPercent).validate_python(1.0), message="done"
+            mock_task_id,
+            percent=TypeAdapter(ProgressPercent).validate_python(1.0),
+            message="done",
         )
         assert counter == 3
         assert received == ("done", 1.0)

packages/service-library/tests/fastapi/test_http_client_thin.py

@@ -6,7 +6,6 @@
 
 import arrow
 import pytest
-from common_library.pydantic_networks_extension import AnyHttpUrlLegacy
 from httpx import (
     HTTPError,
     PoolTimeout,
@@ -16,7 +15,7 @@
     TransportError,
     codes,
 )
-from pydantic import TypeAdapter
+from pydantic import AnyHttpUrl, TypeAdapter
 from respx import MockRouter
 from servicelib.fastapi.http_client_thin import (
     BaseThinClient,
@@ -78,7 +77,7 @@ async def thick_client(request_timeout: int) -> AsyncIterable[FakeThickClient]:
 
 @pytest.fixture
 def test_url() -> str:
-    url = TypeAdapter(AnyHttpUrlLegacy).validate_python("http://missing-host:1111")
+    url = TypeAdapter(AnyHttpUrl).validate_python("http://missing-host:1111")
     return f"{url}"