use anyhttpurl legacy

Author: giancarloromeo

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

@@ -4,9 +4,10 @@
 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 AnyHttpUrl, PositiveFloat, TypeAdapter
+from pydantic import PositiveFloat, TypeAdapter
 from tenacity import RetryCallState
 from tenacity.asyncio import AsyncRetrying
 from tenacity.retry import retry_if_exception_type
@@ -23,7 +24,7 @@
 
 DEFAULT_HTTP_REQUESTS_TIMEOUT: Final[PositiveFloat] = 15
 
-_ANY_HTTP_URL_ADAPTER: TypeAdapter[AnyHttpUrl] = TypeAdapter(AnyHttpUrl)
+_ANY_HTTP_URL_LEGACY_ADAPTER: TypeAdapter[AnyHttpUrlLegacy] = TypeAdapter(AnyHttpUrlLegacy)
 
 logger = logging.getLogger(__name__)
 
@@ -115,7 +116,7 @@ class Client:
     status, result and/or cancel of a long running task.
     """
 
-    def __init__(self, app: FastAPI, async_client: AsyncClient, base_url: AnyHttpUrl):
+    def __init__(self, app: FastAPI, async_client: AsyncClient, base_url: str):
         """
         `app`: used byt the `Client` to recover the `ClientConfiguration`
         `async_client`: an AsyncClient instance used by `Client`
@@ -130,8 +131,8 @@ def _client_configuration(self) -> ClientConfiguration:
         output: ClientConfiguration = self.app.state.long_running_client_configuration
         return output
 
-    def _get_url(self, path: str) -> AnyHttpUrl:
-        return _ANY_HTTP_URL_ADAPTER.validate_python(
+    def _get_url(self, path: str) -> str:
+        return _ANY_HTTP_URL_LEGACY_ADAPTER.validate_python(
             f"{self._base_url}{self._client_configuration.router_prefix}{path}",
         )
 
@@ -141,7 +142,7 @@ async def get_task_status(
     ) -> TaskStatus:
         timeout = timeout or self._client_configuration.default_timeout
         result = await self._async_client.get(
-            str(self._get_url(f"/task/{task_id}")),
+            self._get_url(f"/task/{task_id}"),
             timeout=timeout,
         )
         if result.status_code != status.HTTP_200_OK:
@@ -160,7 +161,7 @@ async def get_task_result(
     ) -> Any | None:
         timeout = timeout or self._client_configuration.default_timeout
         result = await self._async_client.get(
-            str(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:
@@ -182,7 +183,7 @@ async def cancel_and_delete_task(
     ) -> None:
         timeout = timeout or self._client_configuration.default_timeout
         result = await self._async_client.delete(
-            str(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,11 +4,12 @@
 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 AnyHttpUrl, PositiveFloat, TypeAdapter
+from pydantic import PositiveFloat, TypeAdapter
 from servicelib.fastapi.long_running_tasks._context_manager import _ProgressManager
 from servicelib.fastapi.long_running_tasks.client import (
     Client,
@@ -100,7 +101,7 @@ async def test_task_result(
     assert result.status_code == status.HTTP_200_OK, result.text
     task_id = result.json()
 
-    url = TypeAdapter(AnyHttpUrl).validate_python("http://backgroud.testserver.io")
+    url = TypeAdapter(AnyHttpUrlLegacy).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,
@@ -120,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(AnyHttpUrl).validate_python("http://backgroud.testserver.io")
+    url = TypeAdapter(AnyHttpUrlLegacy).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:
@@ -146,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(AnyHttpUrl).validate_python("http://backgroud.testserver.io")
+    url = TypeAdapter(AnyHttpUrlLegacy).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(
@@ -185,13 +186,13 @@ async def progress_update(
         assert received == ("", None)
 
     for _ in range(repeat):
-        await progress_updater.update(mock_task_id, percent=ProgressPercent(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=ProgressPercent(1.0), message="done"
+            mock_task_id, percent=TypeAdapter(ProgressPercent).validate_python(1.0), message="done"
         )
         assert counter == 3
         assert received == ("done", 1.0)