|
1 | 1 | use pyo3::{pyclass, pymethods, types::PyCFunction, IntoPy, Py, PyErr, PyObject, PyResult, Python};
|
2 | 2 | use teo::prelude::{handler::Group as TeoHandlerGroup, model::Field as TeoField, model::Property as TeoProperty, model::Relation as TeoRelation, request, Enum as TeoEnum, Member as TeoEnumMember, Middleware, Model as TeoModel, Namespace as TeoNamespace, Next};
|
3 | 3 |
|
4 |
| -use crate::{utils::{check_callable::check_callable, await_coroutine_if_needed::await_coroutine_if_needed_async_value}, object::{arguments::teo_args_to_py_args, value::teo_value_to_py_any}, model::{model::Model, field::field::Field, relation::relation::Relation, property::property::Property}, result::{IntoPyResultWithGil, IntoTeoPathResult, IntoTeoResult}, r#enum::{r#enum::Enum, member::member::EnumMember}, request::{Request, RequestCtx}, dynamic::py_ctx_object_from_teo_transaction_ctx, response::Response, handler::group::HandlerGroup}; |
| 4 | +use crate::{utils::{check_callable::check_callable, await_coroutine_if_needed::await_coroutine_if_needed_value_with_locals}, object::{arguments::teo_args_to_py_args, value::teo_value_to_py_any}, model::{model::Model, field::field::Field, relation::relation::Relation, property::property::Property}, result::{IntoPyResultWithGil, IntoTeoPathResult, IntoTeoResult}, r#enum::{r#enum::Enum, member::member::EnumMember}, request::{Request, RequestCtx}, dynamic::py_ctx_object_from_teo_transaction_ctx, response::Response, handler::group::HandlerGroup}; |
5 | 5 |
|
6 | 6 | #[pyclass]
|
7 | 7 | pub struct Namespace {
|
@@ -165,7 +165,7 @@ impl Namespace {
|
165 | 165 | let result = callback_owned.call1(py, (request, body, py_ctx))?;
|
166 | 166 | Ok::<PyObject, PyErr>(result)
|
167 | 167 | }).into_teo_path_result()?;
|
168 |
| - let awaited_result = await_coroutine_if_needed_async_value(result, main_thread_locals).await.into_teo_path_result()?; |
| 168 | + let awaited_result = await_coroutine_if_needed_value_with_locals(result, main_thread_locals).await.into_teo_path_result()?; |
169 | 169 | Python::with_gil(|py| {
|
170 | 170 | let response: Response = awaited_result.extract(py).into_teo_path_result()?;
|
171 | 171 | Ok(response.teo_response.clone())
|
@@ -231,7 +231,7 @@ impl Namespace {
|
231 | 231 | let coroutine = shared_result_function.call1(py, (py_ctx, py_next)).into_teo_result()?;
|
232 | 232 | Ok::<PyObject, teo::prelude::Error>(coroutine.into_py(py))
|
233 | 233 | })?;
|
234 |
| - let result = await_coroutine_if_needed_async_value(coroutine, main_thread_locals).await.into_teo_result()?; |
| 234 | + let result = await_coroutine_if_needed_value_with_locals(coroutine, main_thread_locals).await.into_teo_result()?; |
235 | 235 | Python::with_gil(|py| {
|
236 | 236 | let response: Response = result.extract(py).into_teo_result()?;
|
237 | 237 | Ok(response.teo_response)
|
|
0 commit comments