Refactor duplicate code in DatasetteClient, closes #2307

pull/2100/merge
Simon Willison 2024-03-15 15:29:03 -07:00
rodzic 54f5604caf
commit eb8545c172
1 zmienionych plików z 11 dodań i 32 usunięć

Wyświetl plik

@ -1933,54 +1933,33 @@ class DatasetteClient:
path = f"http://localhost{path}" path = f"http://localhost{path}"
return path return path
async def get(self, path, **kwargs): async def _request(self, method, path, **kwargs):
async with httpx.AsyncClient( async with httpx.AsyncClient(
transport=httpx.ASGITransport(app=self.app), transport=httpx.ASGITransport(app=self.app),
cookies=kwargs.pop("cookies", None), cookies=kwargs.pop("cookies", None),
) as client: ) as client:
return await client.get(self._fix(path), **kwargs) return await getattr(client, method)(self._fix(path), **kwargs)
async def get(self, path, **kwargs):
return await self._request("get", path, **kwargs)
async def options(self, path, **kwargs): async def options(self, path, **kwargs):
async with httpx.AsyncClient( return await self._request("options", path, **kwargs)
transport=httpx.ASGITransport(app=self.app),
cookies=kwargs.pop("cookies", None),
) as client:
return await client.options(self._fix(path), **kwargs)
async def head(self, path, **kwargs): async def head(self, path, **kwargs):
async with httpx.AsyncClient( return await self._request("head", path, **kwargs)
transport=httpx.ASGITransport(app=self.app),
cookies=kwargs.pop("cookies", None),
) as client:
return await client.head(self._fix(path), **kwargs)
async def post(self, path, **kwargs): async def post(self, path, **kwargs):
async with httpx.AsyncClient( return await self._request("post", path, **kwargs)
transport=httpx.ASGITransport(app=self.app),
cookies=kwargs.pop("cookies", None),
) as client:
return await client.post(self._fix(path), **kwargs)
async def put(self, path, **kwargs): async def put(self, path, **kwargs):
async with httpx.AsyncClient( return await self._request("put", path, **kwargs)
transport=httpx.ASGITransport(app=self.app),
cookies=kwargs.pop("cookies", None),
) as client:
return await client.put(self._fix(path), **kwargs)
async def patch(self, path, **kwargs): async def patch(self, path, **kwargs):
async with httpx.AsyncClient( return await self._request("patch", path, **kwargs)
transport=httpx.ASGITransport(app=self.app),
cookies=kwargs.pop("cookies", None),
) as client:
return await client.patch(self._fix(path), **kwargs)
async def delete(self, path, **kwargs): async def delete(self, path, **kwargs):
async with httpx.AsyncClient( return await self._request("delete", path, **kwargs)
transport=httpx.ASGITransport(app=self.app),
cookies=kwargs.pop("cookies", None),
) as client:
return await client.delete(self._fix(path), **kwargs)
async def request(self, method, path, **kwargs): async def request(self, method, path, **kwargs):
avoid_path_rewrites = kwargs.pop("avoid_path_rewrites", None) avoid_path_rewrites = kwargs.pop("avoid_path_rewrites", None)