Merge

Cargo.toml

@@ -8,7 +8,7 @@ members = [
     "rust/auth",
     "rust/conn_pool",
     "rust/pgrust",
-    "rust/http",
+    "rust/gel-http",
     "rust/pyo3_util"
 ]
 resolver = "2"
@@ -22,7 +22,7 @@ tracing-subscriber = { version = "0.3.18", features = ["registry", "env-filter"]
 gel_auth = { path = "rust/auth" }
 conn_pool = { path = "rust/conn_pool" }
 pgrust = { path = "rust/pgrust" }
-http = { path = "rust/http" }
+gel-http = { path = "rust/gel-http" }
 pyo3_util = { path = "rust/pyo3_util" }
 
 [profile.release]

edb/server/_rust_native/Cargo.toml

@@ -17,7 +17,7 @@ tokio.workspace = true
 pyo3_util.workspace = true
 conn_pool = { workspace = true, features = [ "python_extension" ] }
 pgrust = { workspace = true, features = [ "python_extension" ] }
-http = { workspace = true, features = [ "python_extension" ] }
+gel-http = { workspace = true, features = [ "python_extension" ] }
 
 [lib]
 crate-type = ["lib", "cdylib"]

edb/server/_rust_native/src/lib.rs

@@ -33,7 +33,7 @@ fn _rust_native(py: Python, m: &Bound<PyModule>) -> PyResult<()> {
 
     add_child_module(py, m, "_conn_pool", conn_pool::python::_conn_pool)?;
     add_child_module(py, m, "_pg_rust", pgrust::python::_pg_rust)?;
-    add_child_module(py, m, "_http", http::python::_http)?;
+    add_child_module(py, m, "_http", gel_http::python::_gel_http)?;
 
     Ok(())
 }

edb/server/http.py

@@ -180,6 +180,7 @@ async def request(
         headers: HeaderType = None,
         data: bytes | str | dict[str, str] | None = None,
         json: Any | None = None,
+        cache: bool = False,
     ) -> tuple[int, bytearray, dict[str, str]]:
         self._ensure_task()
         path = self._process_path(path)
@@ -191,7 +192,9 @@ async def request(
         self._requests[id] = asyncio.Future()
         start_time = time.monotonic()
         try:
-            self._ensure_client()._request(id, path, method, data, headers_list)
+            self._ensure_client()._request(
+                id, path, method, data, headers_list, cache
+            )
             resp = await self._requests[id]
             if self._stat_callback:
                 status_code, body, headers = resp
@@ -217,9 +220,15 @@ async def request(
         finally:
             del self._requests[id]
 
-    async def get(self, path: str, *, headers: HeaderType = None) -> Response:
+    async def get(
+        self,
+        path: str,
+        *,
+        headers: HeaderType = None,
+        cache: bool = False,
+    ) -> Response:
         result = await self.request(
-            method="GET", path=path, data=None, headers=headers
+            method="GET", path=path, data=None, headers=headers, cache=cache
         )
         return Response.from_tuple(result)
 
@@ -387,12 +396,24 @@ def _process_path(self, path):
         return path
 
     async def request(
-        self, *, method, path, headers=None, data=None, json=None
+        self,
+        *,
+        method,
+        path,
+        headers=None,
+        data=None,
+        json=None,
+        cache=False,
     ):
         path = self._process_path(path)
         headers = self._process_headers(headers)
         return await self.http_client.request(
-            method=method, path=path, headers=headers, data=data, json=json
+            method=method,
+            path=path,
+            headers=headers,
+            data=data,
+            json=json,
+            cache=cache,
         )
 
     async def stream_sse(