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

Align the search expression with sumo explorer #11797

Merged
merged 2 commits into from
Oct 24, 2024
Merged

Align the search expression with sumo explorer #11797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7e562
Align the search expression with sumo explorer
magnesj Oct 21, 2024
24b711c
Add support for increase of serial number when data is assigned to a …
magnesj Oct 23, 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
201 changes: 123 additions & 78 deletions ApplicationLibCode/Application/Tools/Cloud/RiaSumoConnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,27 +172,68 @@ void RiaSumoConnector::requestEnsembleByCasesId( const SumoCaseId& caseId )
{
requestTokenBlocking();

QString payloadTemplate = R"(
// See the following file for query definition
// https://github.com/equinor/fmu-sumo/blob/main/src/fmu/sumo/explorer/objects/case.py

{
"query": {
"bool": {
"filter": [
{"term":{"_sumo.parent_object.keyword":"%1"}}
]
}
},
"aggs": {
"aggs_columns": {
"terms": { "field": "fmu.iteration.name.keyword", "size": 5 }
}
},
"track_total_hits":true,
"size":20,
"from":0,
"_source": false
}
QString payloadTemplate = R"(

{
"query": {
"term": {
"fmu.case.uuid.keyword": "%1"
}
},
"aggs": {
"iteration_uuids": {
"terms": {
"field": "fmu.iteration.uuid.keyword",
"size": 100
}
},
"iteration_names": {
"terms": {
"field": "fmu.iteration.name.keyword",
"size": 100
}
},
"data_types": {
"terms": {
"field": "class.keyword",
"size": 100
}
},
"iterations": {
"terms": {
"field": "fmu.iteration.uuid.keyword",
"size": 100
},
"aggs": {
"iteration_name": {
"terms": {
"field": "fmu.iteration.name.keyword",
"size": 100
}
},
"numreal": {
"cardinality": {
"field": "fmu.realization.id"
}
},
"maxreal": {
"max": {
"field": "fmu.realization.id"
}
},
"minreal": {
"min": {
"field": "fmu.realization.id"
}
}
}
}
},
"size": 0
}
)";

QNetworkRequest m_networkRequest;
Expand All @@ -214,6 +255,45 @@ void RiaSumoConnector::requestEnsembleByCasesId( const SumoCaseId& caseId )
} );
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSumoConnector::parseEnsembleNames( QNetworkReply* reply, const SumoCaseId& caseId )
{
// See the following file for parsing of the reply
// https://github.com/equinor/fmu-sumo/blob/main/src/fmu/sumo/explorer/objects/case.py

QByteArray result = reply->readAll();
reply->deleteLater();

if ( reply->error() == QNetworkReply::NoError )
{
m_ensembleNames.clear();

QJsonDocument doc = QJsonDocument::fromJson( result );
QJsonObject jsonObj = doc.object();
QJsonObject aggregationsObject = jsonObj["aggregations"].toObject();
QJsonObject aggregationColumnsObject = aggregationsObject["iteration_names"].toObject();

QJsonArray bucketsArray = aggregationColumnsObject["buckets"].toArray();
foreach ( const QJsonValue& bucket, bucketsArray )
{
QJsonObject bucketObj = bucket.toObject();
auto ensembleName = bucketObj["key"].toString();

m_ensembleNames.push_back( { caseId, ensembleName } );
}

RiaLogging::debug( QString( "Ensemble count : %1" ).arg( m_ensembleNames.size() ) );
}
else
{
RiaLogging::error( QString( "Request ensemble names failed: : '%s'" ).arg( reply->errorString() ) );
}

magnesj marked this conversation as resolved.
Show resolved Hide resolved
emit ensembleNamesFinished();
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -720,42 +800,12 @@ void RiaSumoConnector::parseAssets( QNetworkReply* reply )
RiaLogging::info( QString( "Asset: %1" ).arg( a.name ) );
}
}
emit assetsFinished();
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSumoConnector::parseEnsembleNames( QNetworkReply* reply, const SumoCaseId& caseId )
{
QByteArray result = reply->readAll();
reply->deleteLater();

if ( reply->error() == QNetworkReply::NoError )
else
{
m_ensembleNames.clear();

QJsonDocument doc = QJsonDocument::fromJson( result );
QJsonObject jsonObj = doc.object();
auto keys_1 = jsonObj.keys();

auto aggregationsObject = jsonObj["aggregations"].toObject();

QJsonObject aggregationColumnsObject = aggregationsObject["aggs_columns"].toObject();
auto keys_2 = aggregationColumnsObject.keys();

QJsonArray bucketsArray = aggregationColumnsObject["buckets"].toArray();
foreach ( const QJsonValue& bucket, bucketsArray )
{
QJsonObject bucketObj = bucket.toObject();
auto keys_3 = bucketObj.keys();

auto ensembleName = bucketObj["key"].toString();
m_ensembleNames.push_back( { caseId, ensembleName } );
}
RiaLogging::error( QString( "Request assets failed: : '%s'" ).arg( reply->errorString() ) );
}

emit ensembleNamesFinished();
emit assetsFinished();
}

//--------------------------------------------------------------------------------------------------
Expand All @@ -768,33 +818,31 @@ void RiaSumoConnector::parseCases( QNetworkReply* reply )

if ( reply->error() == QNetworkReply::NoError )
{
QJsonDocument doc = QJsonDocument::fromJson( result );
QJsonObject jsonObj = doc.object();
QJsonObject rootHits = jsonObj["hits"].toObject();

QJsonArray hitsObjects = rootHits["hits"].toArray();
QJsonDocument doc = QJsonDocument::fromJson( result );
QJsonObject jsonObj = doc.object();
QJsonObject rootHits = jsonObj["hits"].toObject();
QJsonArray hitsObjects = rootHits["hits"].toArray();

m_cases.clear();

foreach ( const QJsonValue& value, hitsObjects )
{
QJsonObject resultObj = value.toObject();
auto keys_1 = resultObj.keys();

QJsonObject sourceObj = resultObj["_source"].toObject();
auto sourceKeys = sourceObj.keys();

QJsonObject fmuObj = sourceObj["fmu"].toObject();
auto fmuObjKeys = fmuObj.keys();

QJsonObject fmuCase = fmuObj["case"].toObject();
auto fmuCaseKeys = fmuCase.keys();
QJsonObject sourceObj = resultObj["_source"].toObject();
QJsonObject fmuObj = sourceObj["fmu"].toObject();
QJsonObject fmuCase = fmuObj["case"].toObject();

QString id = resultObj["_id"].toString();
QString kind = "";
QString fieldName = fmuCase["name"].toString();
m_cases.push_back( SumoCase{ SumoCaseId( id ), kind, fieldName } );
}

RiaLogging::debug( QString( "Case count : %1" ).arg( m_cases.size() ) );
}
else
{
RiaLogging::error( QString( "Request cases failed: : '%s'" ).arg( reply->errorString() ) );
}

emit casesFinished();
Expand Down Expand Up @@ -825,6 +873,10 @@ void RiaSumoConnector::parseVectorNames( QNetworkReply* reply, const SumoCaseId&
}
}
}
else
{
RiaLogging::error( QString( "Request vector names failed: : '%s'" ).arg( reply->errorString() ) );
}

emit vectorNamesFinished();
}
Expand All @@ -846,10 +898,8 @@ void RiaSumoConnector::parseRealizationNumbers( QNetworkReply* reply, const Sumo
for ( const auto& hit : hits )
{
QJsonObject resultObj = hit.toObject();
auto keys_1 = resultObj.keys();

auto val = resultObj.value( "key" );
auto intValue = val.toInt();
auto val = resultObj.value( "key" );
auto intValue = val.toInt();

auto realizationId = QString::number( intValue );
m_realizationIds.push_back( realizationId );
Expand Down Expand Up @@ -884,13 +934,8 @@ void RiaSumoConnector::parseBlobIds( QNetworkReply* reply,
foreach ( const QJsonValue& value, hitsObjects )
{
QJsonObject resultObj = value.toObject();
auto keys_1 = resultObj.keys();

QJsonObject sourceObj = resultObj["_source"].toObject();
auto sourceKeys = sourceObj.keys();

QJsonObject fmuObj = sourceObj["_sumo"].toObject();
auto fmuObjKeys = fmuObj.keys();
QJsonObject sourceObj = resultObj["_source"].toObject();
QJsonObject fmuObj = sourceObj["_sumo"].toObject();

auto blobName = fmuObj["blob_name"].toString();
m_blobUrl.push_back( blobName );
Expand Down
10 changes: 9 additions & 1 deletion ApplicationLibCode/FileInterface/RifSummaryReaderInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,20 @@ int RifSummaryReaderInterface::serialNumber() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface::RifSummaryReaderInterface()
void RifSummaryReaderInterface::increaseSerialNumber()
{
#pragma omp critical
m_serialNumber = m_nextSerialNumber++;
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface::RifSummaryReaderInterface()
{
increaseSerialNumber();
}

//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ class RifSummaryReaderInterface : public cvf::Object
int serialNumber() const;

protected:
void increaseSerialNumber();

std::set<RifEclipseSummaryAddress> m_allResultAddresses; // Result and error addresses
std::set<RifEclipseSummaryAddress> m_allErrorAddresses; // Error addresses

Expand Down
2 changes: 2 additions & 0 deletions ApplicationLibCode/ProjectDataModel/Summary/Sumo/RimSummaryCaseSumo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ void RimSummaryCaseSumo::setValues( const std::vector<time_t>& timeSteps,
{
m_timeSteps = timeSteps;
m_values[resultAddress] = values;

increaseSerialNumber();
}

//--------------------------------------------------------------------------------------------------
Expand Down