mirror of
https://github.com/OPM/ResInsight.git
synced 2026-08-19 01:24:53 -05:00
Kristian Bendiksen
f8d180f48d
Surface gRPC failure context to Python script authors instead of silently returning sentinel values or raising bare gRPC errors. - RipsError now carries code/details/location and a from_rpc_error() helper. Existing single-arg construction stays valid. - Stop swallowing grpc.RpcError in case.__grid_count for non-NOT_FOUND failures and in instance._check_connection_and_version, so the underlying status is propagated. - pdmobject add_method decorator and _call_pdm_method_* attach code/details to the raised RipsError; existing message text is preserved so pytest match=... assertions keep working. - Instance.start_heartbeat / stop_heartbeat / check_alive provide an opt-in background ping that flips a sticky lost-connection flag and raises a readable RipsError from check_alive() if the server dies. - Server side: GetPdmObject in RiaGrpcAppService, RiaGrpcCaseService and RiaGrpcProjectService no longer return Status::OK with an empty reply when the underlying object is missing; they return NOT_FOUND / INTERNAL with a descriptive message. Other RiaGrpc*Service files audited and already return non-OK with text on error paths.
98 lines
4.4 KiB
C++
98 lines
4.4 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2019- Equinor ASA
|
|
//
|
|
// ResInsight is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
// FITNESS FOR A PARTICULAR PURPOSE.
|
|
//
|
|
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
|
// for more details.
|
|
//
|
|
//////////////////////////////////////////////////////////////////////////////////
|
|
#include "RiaGrpcAppService.h"
|
|
|
|
#include "RiaApplication.h"
|
|
#include "RiaGrpcCallbacks.h"
|
|
#include "RiaGrpcServer.h"
|
|
#include "RiaVersionInfo.h"
|
|
|
|
#include "ProjectDataModelCommands/CommandRouter/RimCommandRouter.h"
|
|
|
|
#include <QApplication>
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
grpc::Status RiaGrpcAppService::GetVersion( grpc::ServerContext* context, const rips::Empty* request, rips::Version* reply )
|
|
{
|
|
reply->set_major_version( QString( RESINSIGHT_MAJOR_VERSION ).toInt() );
|
|
reply->set_minor_version( QString( RESINSIGHT_MINOR_VERSION ).toInt() );
|
|
reply->set_patch_version( QString( RESINSIGHT_PATCH_VERSION ).toInt() );
|
|
return grpc::Status::OK;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
grpc::Status RiaGrpcAppService::Exit( grpc::ServerContext* context, const rips::Empty* request, rips::Empty* reply )
|
|
{
|
|
RiaGrpcServer::setReceivedExitRequest();
|
|
return grpc::Status::OK;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
grpc::Status
|
|
RiaGrpcAppService::GetRuntimeInfo( grpc::ServerContext* context, const rips::Empty* request, rips::RuntimeInfo* reply )
|
|
{
|
|
rips::ApplicationTypeEnum appType = rips::CONSOLE_APPLICATION;
|
|
if ( dynamic_cast<QApplication*>( RiaApplication::instance() ) )
|
|
{
|
|
appType = rips::GUI_APPLICATION;
|
|
}
|
|
reply->set_app_type( appType );
|
|
|
|
return grpc::Status::OK;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<RiaGrpcCallbackInterface*> RiaGrpcAppService::createCallbacks()
|
|
{
|
|
using Self = RiaGrpcAppService;
|
|
return { new RiaGrpcUnaryCallback<Self, rips::Empty, rips::Version>( this, &Self::GetVersion, &Self::RequestGetVersion ),
|
|
new RiaGrpcUnaryCallback<Self, rips::Empty, rips::Empty>( this, &Self::Exit, &Self::RequestExit ),
|
|
new RiaGrpcUnaryCallback<Self, rips::Empty, rips::RuntimeInfo>( this,
|
|
&Self::GetRuntimeInfo,
|
|
&Self::RequestGetRuntimeInfo ),
|
|
new RiaGrpcUnaryCallback<Self, rips::Empty, rips::PdmObject>( this,
|
|
&Self::GetPdmObject,
|
|
&Self::RequestGetPdmObject ) };
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
grpc::Status
|
|
RiaGrpcAppService::GetPdmObject( grpc::ServerContext* context, const rips::Empty* request, rips::PdmObject* reply )
|
|
{
|
|
auto* commandRouter = RiaApplication::instance()->commandRouter();
|
|
if ( commandRouter )
|
|
{
|
|
copyPdmObjectFromCafToRips( commandRouter, reply );
|
|
return grpc::Status::OK;
|
|
}
|
|
return grpc::Status( grpc::INTERNAL, "Command router is not available" );
|
|
}
|
|
|
|
static bool RiaGrpcAppInfoService_init =
|
|
RiaGrpcServiceFactory::instance()->registerCreator<RiaGrpcAppService>( typeid( RiaGrpcAppService ).hash_code() );
|