openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-05 20:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use raw values for filesystem RPC batches

Browse Source
This commit is contained in:
jif-oai
2026-06-21 12:37:48 +02:00
parent 6eac4eab7e
commit 13c152aa46
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/exec-server/src/lib.rs
-1
View File
@@ -42,7 +42,6 @@ pub use codex_file_system::CopyOptions;
pub use codex_file_system::CreateDirectoryOptions;
pub use codex_file_system::ExecutorFileSystem;
pub use codex_file_system::ExecutorFileSystemFuture;
pub use codex_file_system::ExecutorRpcBatchResult;
pub use codex_file_system::FILE_READ_CHUNK_SIZE;
pub use codex_file_system::FileMetadata;
pub use codex_file_system::FileSystemReadStream;
codex-rs/exec-server/src/remote_file_system.rs
+2 -3
View File
@@ -9,7 +9,6 @@ use crate::CreateDirectoryOptions;
use crate::ExecServerError;
use crate::ExecutorFileSystem;
use crate::ExecutorFileSystemFuture;
use crate::ExecutorRpcBatchResult;
use crate::FileMetadata;
use crate::FileSystemReadStream;
use crate::FileSystemResult;
@@ -228,7 +227,7 @@ impl RemoteFileSystem {
async fn execute_rpc_batch(
&self,
calls: Vec<(String, serde_json::Value)>,
) -> FileSystemResult<Vec<ExecutorRpcBatchResult>> {
) -> FileSystemResult<Vec<FileSystemResult<serde_json::Value>>> {
let client = self.client.get().await.map_err(map_remote_error)?;
Ok(client
.call_batch(calls)
@@ -329,7 +328,7 @@ impl ExecutorFileSystem for RemoteFileSystem {
fn execute_rpc_batch<'a>(
&'a self,
calls: Vec<(String, serde_json::Value)>,
) -> ExecutorFileSystemFuture<'a, Vec<ExecutorRpcBatchResult>> {
) -> ExecutorFileSystemFuture<'a, Vec<FileSystemResult<serde_json::Value>>> {
Box::pin(RemoteFileSystem::execute_rpc_batch(self, calls))
}
}
codex-rs/file-system/src/lib.rs
+1 -3
View File
@@ -166,8 +166,6 @@ pub type FileSystemResult<T> = io::Result<T>;
pub type ExecutorFileSystemFuture<'a, T> =
Pin<Box<dyn Future<Output = FileSystemResult<T>> + Send + 'a>>;
pub type ExecutorRpcBatchResult = FileSystemResult<serde_json::Value>;
/// Stream of immutable chunks read from an [`ExecutorFileSystem`].
pub struct FileSystemReadStream {
inner: Pin<Box<dyn Stream<Item = FileSystemResult<Bytes>> + Send + 'static>>,
@@ -271,7 +269,7 @@ pub trait ExecutorFileSystem: Send + Sync {
fn execute_rpc_batch<'a>(
&'a self,
_requests: Vec<(String, serde_json::Value)>,
) -> ExecutorFileSystemFuture<'a, Vec<ExecutorRpcBatchResult>> {
) -> ExecutorFileSystemFuture<'a, Vec<FileSystemResult<serde_json::Value>>> {
Box::pin(async {
Err(io::Error::new(
io::ErrorKind::Unsupported,