Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

expose engine shutdown to adapter manager and push/pushpull adapters #312

Merged
merged 13 commits into from
Jul 25, 2024
Merged

expose engine shutdown to adapter manager and push/pushpull adapters #312

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3f2d7b1
Expose engine shutdown method for Python push-type adapters
AdamGlustein Jul 8, 2024
147133c
Expose engine shutdown method for Python push-type adapters
AdamGlustein Jul 8, 2024
84cc40d
passing exception to engine shutdown wip
argaj Jul 11, 2024
d096a88
Merge branch 'ag/expose-engine-shutdown' of https://github.com/Point7…
AdamGlustein Jul 11, 2024
4ddc99f
Create PythonPassthrough exception of proper type in the shutdown_eng…
AdamGlustein Jul 11, 2024
34a1db1
Add a test for traceback and update wiki
argaj Jul 12, 2024
6a7b202
assert function name in traceback, shutdown engine if not an exceptio…
argaj Jul 16, 2024
d076171
Merge branch 'main' of https://github.com/Point72/csp into ag/expose-…
argaj Jul 16, 2024
b0be488
Added shutdown on wrong type to PyEngine_shutdown
argaj Jul 17, 2024
ad58a75
clearer error msg, move creating exception logic to separate function…
argaj Jul 23, 2024
9c89a39
use PyObjectPtr, add space to error msg
argaj Jul 24, 2024
7388bff
Merge branch 'main' of https://github.com/Point72/csp into ag/expose-…
argaj Jul 24, 2024
52ee0e1
use METH_O in shutdown_engine
argaj Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions cpp/csp/python/PyAdapterManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,7 @@ static PyObject * PyAdapterManager_PyObject_shutdown_engine( PyAdapterManager_Py
if( !PyArg_ParseTuple( args, "O", &pyException ) )
argaj marked this conversation as resolved.
Show resolved Hide resolved
return NULL;

if( !PyExceptionInstance_Check( pyException ) )
{
std::string desc = "Expected Exception object as argument for shutdown_engine: got " + std::string( Py_TYPE( pyException ) -> tp_name );
self -> manager -> rootEngine() -> shutdown( std::make_exception_ptr( csp::Exception( "TypeError", desc ) ) );
}
else
self -> manager -> rootEngine() -> shutdown( std::make_exception_ptr( PythonPassthrough( pyException ) ) );
self -> manager -> rootEngine() -> shutdown( PyEngine_shutdownMakeException( pyException ) );

CSP_RETURN_NONE;
}
Expand Down
22 changes: 15 additions & 7 deletions cpp/csp/python/PyEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ class CSPIMPL_EXPORT PyEngine final: public PyObject
Engine * m_engine;
};

inline std::exception_ptr PyEngine_shutdownMakeException( PyObject * pyException )
argaj marked this conversation as resolved.
Show resolved Hide resolved
{
if( !PyExceptionInstance_Check( pyException ) )
{
PyObject* pyExceptionStr = PyObject_Str( pyException );
argaj marked this conversation as resolved.
Show resolved Hide resolved
std::string pyExceptionString = PyUnicode_AsUTF8( pyExceptionStr );
std::string desc = "Expected Exception object as argument for shutdown_engine: got " + pyExceptionString + "of type " + Py_TYPE( pyException ) -> tp_name;
argaj marked this conversation as resolved.
Show resolved Hide resolved
Py_DECREF(pyExceptionStr);
argaj marked this conversation as resolved.
Show resolved Hide resolved
return std::make_exception_ptr( csp::Exception( "TypeError", desc ) );
}
else
return std::make_exception_ptr( PythonPassthrough( pyException ) );
}

// Generic engine shutdown function for push-type adapters
template<typename T>
PyObject * PyEngine_shutdown( T * self, PyObject * args, PyObject * kwargs )
argaj marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -65,13 +79,7 @@ PyObject * PyEngine_shutdown( T * self, PyObject * args, PyObject * kwargs )
if( !PyArg_ParseTuple( args, "O", &pyException ) )
return NULL;

if( !PyExceptionInstance_Check( pyException ) )
{
std::string desc = "Expected Exception object as argument for shutdown_engine: got " + std::string( Py_TYPE( pyException ) -> tp_name );
self -> adapter -> rootEngine() -> shutdown( std::make_exception_ptr( csp::Exception( "TypeError", desc ) ) );
}
else
self -> adapter -> rootEngine() -> shutdown( std::make_exception_ptr( PythonPassthrough( pyException ) ) );
self -> adapter -> rootEngine() -> shutdown( PyEngine_shutdownMakeException( pyException ) );

CSP_RETURN_NONE;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/wiki/how-tos/Write-Realtime-Input-Adapters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,6 @@ def _run(self):
while self._running:
try:
requests.get(endpoint) # API call over a network, may fail
catch Exception as exc:
except Exception as exc:
self.shutdown_engine(exc)
```