worker: bump core version

We now build against core commmit
6fa14a8d87b625cf90204a79a415e85c87acc465 (0.0.0.r1468.g6fa14a8d8) [1].

This is a commit after new normalization was adopted. Not *that* much
of the API was broken. Notable changes are that core now returns
core::type_details instead of a std::string. Also the
std::__cxx11::basic_string types are gone and replaced with a simple
std::string.

[1] automata-library@6fa14a8d

.gitlab-ci.yml

@@ -22,7 +22,7 @@ image: alpine:3.15
 build:worker:
   stage: build
-  image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/automata-library/cli:snapshot
+  image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/webui-client/core-snapshot:0.0.0.r1468.g6fa14a8d8
   before_script:
     - apk add --no-cache curl && curl https://alt.fit.cvut.cz/repo/alpine/alt-dev-repo.sh | sh
     - apk add --no-cache build-base cmake jsoncpp-dev pkgconf apr-dev spdlog-dev catch2 activemq-cpp-dev argparse
@@ -70,7 +70,7 @@ build:server:
 test:worker:
   stage: test
-  image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/automata-library/cli:snapshot
+  image: gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/webui-client/core-snapshot:0.0.0.r1468.g6fa14a8d8
   dependencies:
     - build:worker
   before_script:

CHANGELOG.md

@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [Unreleased]
+- Bump [core] version to ref [6fa14a8d87b625cf90204a79a415e85c87acc465](https://gitlab.fit.cvut.cz/algorithms-library-toolkit/automata-library/commit/6fa14a8d87b625cf90204a79a415e85c87acc465)
 - webui: Fixed a bug where AutomatonOutput failed to open [#48](https://gitlab.fit.cvut.cz/algorithms-library-toolkit/webui-client/issues/48)
 - webui: Nodes with verbose output from core are now visualized in another color than output boxes and their content is now printed in monospace font
 - webui: Added documentation button to algorithm boxes on canvas

webui/src/components/WebUI/Toolbar/AlgorithmDrawer.tsx

@@ -76,7 +76,7 @@ export const AlgorithmDrawer = () => {
 			handleButtonClick(
 				'inputString',
 				'string',
-				'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >',
+				'std:string',
 				[],
 				''
 			),

webui/src/reducers/algorithmData.ts

@@ -206,8 +206,7 @@ export const algorithmReducer = (
 				nodes: state.nodes.update(id, emptyNode, (node) => ({
 					...node,
 					name: 'string',
-					resultType:
-						'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >',
+					resultType: 'std::string',
 					nodeType: 'inputString',
 					value
 				})),

worker/Dockerfile

-ARG BASE_IMAGE=gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/automata-library/cli:snapshot
+ARG BASE_IMAGE=gitlab.fit.cvut.cz:5000/algorithms-library-toolkit/webui-client/core-snapshot:0.0.0.r1468.g6fa14a8d8
 #-----------------------------------------------------------------------------------------

worker/src/utils/alt.cpp

@@ -5,7 +5,7 @@
 std::string abstractValueToString(const std::shared_ptr<abstraction::Value>& val)
 {
-    std::shared_ptr<abstraction::OperationAbstraction> op = abstraction::Registry::getValuePrinterAbstraction(val->getType());
+    std::shared_ptr<abstraction::OperationAbstraction> op = abstraction::Registry::getValuePrinterAbstraction(val->getDeclaredType());
     ext::ostringstream oss;
     op->attachInput(val, 0);

worker/src/worker/introspection/introspect.cpp

@@ -20,10 +20,9 @@ Json::Value getAlgorithmOverloadJSON(const ext::tuple<abstraction::AlgorithmFull
     while (paramsIterator != params.cend() || paramsNamesIterator != paramsNames.cend()) {
         Json::Value paramJSON(Json::objectValue);
-        ;
         paramJSON["name"] = *paramsNamesIterator;
-        paramJSON["type"] = std::get<0>(*paramsIterator);
+        paramJSON["type"] = ext::to_string(std::get<0>(*paramsIterator));
         paramsJSON.append(paramJSON);
@@ -31,7 +30,7 @@ Json::Value getAlgorithmOverloadJSON(const ext::tuple<abstraction::AlgorithmFull
         ++paramsNamesIterator;
     }
-    overloadJSON["resultType"] = info.getResult().first;
+    overloadJSON["resultType"] = ext::to_string(info.getResult().first);
     overloadJSON["params"] = paramsJSON;
     if (auto docs = std::get<1>(overload)) {
         overloadJSON["docs"] = *docs;
@@ -85,13 +84,12 @@ Json::Value getCastsJSON()
 {
     Json::Value castsJSON(Json::objectValue);
-    for (const ext::tuple<std::string, std::string, bool>& castPair : abstraction::Registry::listCasts()) {
-        const auto& isExplicit = std::get<2>(castPair);
+    for (const auto& [toType, fromType, isExplicit] : abstraction::Registry::listCasts()) {
         if (isExplicit)
             continue;
-        const auto& from = std::get<1>(castPair);
-        const auto& to = std::get<0>(castPair);
+        auto from = ext::to_string(fromType);
+        auto to = ext::to_string(toType);
         if (castsJSON[from].isNull())
             castsJSON[from] = Json::Value(Json::arrayValue);

worker/test-src/evaluator/AlgorithmNodeTest.cpp

@@ -57,21 +57,32 @@ TEST_CASE("AlgorithmNode evaluate")
 TEST_CASE("AlgorithmNode multiple params evaluate")
 {
-    auto inputInt = std::make_shared<IntNode>("", 4, ext::vector<std::string>());
-    auto inputBool = std::make_shared<BoolNode>("", false, ext::vector<std::string>());
-    auto node = std::make_shared<AlgorithmNode>("", "string::generate::RandomStringFactory", ext::vector<std::string>());
+    auto alphabetSize = std::make_shared<IntNode>("", 4, ext::vector<std::string>());
+    auto randomizeAlphabet = std::make_shared<BoolNode>("", true, ext::vector<std::string>());
+    auto lowerCase = std::make_shared<BoolNode>("", false, ext::vector<std::string>());
+    auto randomAlphabet = std::make_shared<AlgorithmNode>("", "alphabet::generate::GenerateAlphabet", ext::vector<std::string>());
+
+    alphabetSize->createEdge(randomAlphabet, 0);
+    randomizeAlphabet->createEdge(randomAlphabet, 1);
+    lowerCase->createEdge(randomAlphabet, 2);
+
+    auto stringSize = std::make_shared<IntNode>("", 10, ext::vector<std::string>());
+    auto randomString = std::make_shared<AlgorithmNode>("", "string::generate::RandomStringFactory", ext::vector<std::string>());
     auto mockOutputNode = std::make_shared<AlgorithmTestNodeMock>();
-    inputInt->createEdge(node, 0);
-    inputInt->createEdge(node, 1);
-    inputBool->createEdge(node, 2);
-    inputBool->createEdge(node, 3);
+    stringSize->createEdge(randomString, 0);
+    randomAlphabet->createEdge(randomString, 1);
+    randomString->createEdge(mockOutputNode, 0);
     cli::Environment environment;
-    inputInt->evaluate(environment);
-    inputBool->evaluate(environment);
-    node->evaluate(environment);
+    alphabetSize->evaluate(environment);
+    randomizeAlphabet->evaluate(environment);
+    lowerCase->evaluate(environment);
+    randomAlphabet->evaluate(environment);
+    stringSize->evaluate(environment);
+    randomString->evaluate(environment);
     mockOutputNode->evaluate(environment);
     REQUIRE(mockOutputNode->getParams().size() == 1);
+    REQUIRE(abstractValueToString(mockOutputNode->getParams().at(0)).starts_with("(LinearString content"));
 }