Skip to content

Commit f31d7f1

Browse files
jakubnojakubno
committed
Rename result type internally
1 parent 273edcf commit f31d7f1

File tree

5 files changed

+34
-34
lines changed

5 files changed

+34
-34
lines changed

‎js/src/code-interpreter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class JupyterExtension {
8181
onStderr?: (msg: ProcessMessage) => Promise<void> | void
8282
onDisplayData?: (data: Result) => Promise<void> | void
8383
timeout?: number
84-
}
84+
} = {}
8585
): Promise<Execution> {
8686
kernelID = kernelID || (await this.defaultKernelID)
8787
const ws =

‎js/src/messaging.ts‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ export class Execution {
184184
* It's an internal class used by JupyterKernelWebSocket.
185185
*/
186186
class CellExecution {
187-
result: Execution
187+
execution: Execution
188188
onStdout?: (out: ProcessMessage) => Promise<void> | void
189189
onStderr?: (out: ProcessMessage) => Promise<void> | void
190190
onDisplayData?: (data: Result) => Promise<void> | void
@@ -195,7 +195,7 @@ class CellExecution {
195195
onStderr?: (out: ProcessMessage) => Promise<void> | void,
196196
onDisplayData?: (data: Result) => Promise<void> | void
197197
) {
198-
this.result = new Execution([], { stdout: [], stderr: [] })
198+
this.execution = new Execution([], { stdout: [], stderr: [] })
199199
this.onStdout = onStdout
200200
this.onStderr = onStderr
201201
this.onDisplayData = onDisplayData
@@ -260,16 +260,16 @@ export class JupyterKernelWebSocket {
260260
return
261261
}
262262

263-
const result = cell.result
263+
const execution = cell.execution
264264
if (message.msg_type == 'error') {
265-
result.error = new ExecutionError(
265+
execution.error = new ExecutionError(
266266
message.content.ename,
267267
message.content.evalue,
268268
message.content.traceback
269269
)
270270
} else if (message.msg_type == 'stream') {
271271
if (message.content.name == 'stdout') {
272-
result.logs.stdout.push(message.content.text)
272+
execution.logs.stdout.push(message.content.text)
273273
if (cell?.onStdout) {
274274
cell.onStdout(
275275
new ProcessMessage(
@@ -280,7 +280,7 @@ export class JupyterKernelWebSocket {
280280
)
281281
}
282282
} else if (message.content.name == 'stderr') {
283-
result.logs.stderr.push(message.content.text)
283+
execution.logs.stderr.push(message.content.text)
284284
if (cell?.onStderr) {
285285
cell.onStderr(
286286
new ProcessMessage(
@@ -292,28 +292,29 @@ export class JupyterKernelWebSocket {
292292
}
293293
}
294294
} else if (message.msg_type == 'display_data') {
295-
result.results.push(new Result(message.content.data, false))
295+
const result = new Result(message.content.data, false)
296+
execution.results.push(result)
296297
if (cell.onDisplayData) {
297-
cell.onDisplayData(new Result(message.content.data, false))
298+
cell.onDisplayData(result)
298299
}
299300
} else if (message.msg_type == 'execute_result') {
300-
result.results.push(new Result(message.content.data, true))
301+
execution.results.push(new Result(message.content.data, true))
301302
} else if (message.msg_type == 'status') {
302303
if (message.content.execution_state == 'idle') {
303304
if (cell.inputAccepted) {
304-
this.idAwaiter[parentMsgId](result)
305+
this.idAwaiter[parentMsgId](execution)
305306
}
306307
} else if (message.content.execution_state == 'error') {
307-
result.error = new ExecutionError(
308+
execution.error = new ExecutionError(
308309
message.content.ename,
309310
message.content.evalue,
310311
message.content.traceback
311312
)
312-
this.idAwaiter[parentMsgId](result)
313+
this.idAwaiter[parentMsgId](execution)
313314
}
314315
} else if (message.msg_type == 'execute_reply') {
315316
if (message.content.status == 'error') {
316-
result.error = new ExecutionError(
317+
execution.error = new ExecutionError(
317318
message.content.ename,
318319
message.content.evalue,
319320
message.content.traceback

‎js/tsup.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ export default defineConfig({
88
format: ['esm', 'cjs'],
99
clean: true,
1010
entry: {
11-
index: './src/index.ts',
11+
index: './src/index.ts'
1212
},
1313
esbuildOptions: (options) => {
1414
options.legalComments = 'none'
1515
return options
16-
},
16+
}
1717
})

‎js/vitest.config.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default defineConfig({
1010
bail: 1,
1111
server: {},
1212
deps: {
13-
interopDefault: true,
14-
},
15-
},
13+
interopDefault: true
14+
}
15+
}
1616
})

‎python/e2b_code_interpreter/messaging.py‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def __init__(
3737
on_display_data: Optional[Callable[[Dict[MIMEType, str]], None]] = None,
3838
):
3939
self.partial_result = Execution()
40-
self.result = Future()
40+
self.execution = Future()
4141
self.on_stdout = on_stdout
4242
self.on_stderr = on_stderr
4343
self.on_display_data = on_display_data
@@ -148,7 +148,7 @@ def send_execution_message(
148148
def get_result(
149149
self, message_id: str, timeout: Optional[float] = TIMEOUT
150150
) -> Execution:
151-
result = self._cells[message_id].result.result(timeout=timeout)
151+
result = self._cells[message_id].execution.result(timeout=timeout)
152152
logger.debug(f"Got result for message: {message_id}")
153153
del self._cells[message_id]
154154
return result
@@ -169,19 +169,19 @@ def _receive_message(self, data: dict):
169169
if not cell:
170170
return
171171

172-
result = cell.partial_result
172+
execution = cell.partial_result
173173

174174
if data["msg_type"] == "error":
175175
logger.debug(f"Cell {parent_msg_ig} finished execution with error")
176-
result.error = Error(
176+
execution.error = Error(
177177
name=data["content"]["ename"],
178178
value=data["content"]["evalue"],
179179
traceback_raw=data["content"]["traceback"],
180180
)
181181

182182
elif data["msg_type"] == "stream":
183183
if data["content"]["name"] == "stdout":
184-
result.logs.stdout.append(data["content"]["text"])
184+
execution.logs.stdout.append(data["content"]["text"])
185185
if cell.on_stdout:
186186
cell.on_stdout(
187187
ProcessMessage(
@@ -191,7 +191,7 @@ def _receive_message(self, data: dict):
191191
)
192192

193193
elif data["content"]["name"] == "stderr":
194-
result.logs.stderr.append(data["content"]["text"])
194+
execution.logs.stderr.append(data["content"]["text"])
195195
if cell.on_stderr:
196196
cell.on_stderr(
197197
ProcessMessage(
@@ -202,34 +202,33 @@ def _receive_message(self, data: dict):
202202
)
203203

204204
elif data["msg_type"] in "display_data":
205-
result.results.append(
206-
Result(is_main_result=False, data=data["content"]["data"])
207-
)
205+
result = Result(is_main_result=False, data=data["content"]["data"])
206+
execution.results.append(result)
208207
if cell.on_display_data:
209-
cell.on_display_data(data["content"]["data"])
208+
cell.on_display_data(result)
210209
elif data["msg_type"] == "execute_result":
211-
result.results.append(
210+
execution.results.append(
212211
Result(is_main_result=True, data=data["content"]["data"])
213212
)
214213
elif data["msg_type"] == "status":
215214
if data["content"]["execution_state"] == "idle":
216215
if cell.input_accepted:
217216
logger.debug(f"Cell {parent_msg_ig} finished execution")
218-
cell.result.set_result(result)
217+
cell.execution.set_result(execution)
219218

220219
elif data["content"]["execution_state"] == "error":
221220
logger.debug(f"Cell {parent_msg_ig} finished execution with error")
222-
result.error = Error(
221+
execution.error = Error(
223222
name=data["content"]["ename"],
224223
value=data["content"]["evalue"],
225224
traceback_raw=data["content"]["traceback"],
226225
)
227-
cell.result.set_result(result)
226+
cell.execution.set_result(execution)
228227

229228
elif data["msg_type"] == "execute_reply":
230229
if data["content"]["status"] == "error":
231230
logger.debug(f"Cell {parent_msg_ig} finished execution with error")
232-
result.error = Error(
231+
execution.error = Error(
233232
name=data["content"]["ename"],
234233
value=data["content"]["evalue"],
235234
traceback_raw=data["content"]["traceback"],

0 commit comments

Comments
 (0)