capsule result urls in api object #2905

thoniTUB · 2023-01-30T17:03:34Z

Provide descriptive information about result assets

…ollide with providers of a similar name

backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java

awildturtok · 2023-02-01T15:09:36Z

backend/src/main/java/com/bakdata/conquery/apiv1/execution/ExecutionStatus.java

@@ -49,7 +48,7 @@ public abstract class ExecutionStatus {
 	/**
 	 * The urls under from which the result of the execution can be downloaded as soon as it finished successfully.
 	 */
-	private List<URL> resultUrls = Collections.emptyList();
+	private List<ResultAsset> resultUrls = Collections.emptyList();


Bitte openapi spec anpassen

Ist angepasst :)

awildturtok · 2023-02-01T15:12:05Z

backend/src/main/java/com/bakdata/conquery/models/config/ArrowResultProvider.java

+				new ResultAsset("Arrow File", ResultArrowResource.getFileDownloadURL(uriBuilder.clone(), (ManagedExecution<?> & SingleTableResult) exec)),
+				new ResultAsset("Arrow Stream", ResultArrowResource.getStreamDownloadURL(uriBuilder.clone(), (ManagedExecution<?> & SingleTableResult) exec))


Müssten die nicht sogar lokalisiert sein?

Streng genommen ja, aber sie werden gerade nicht ausgegeben

awildturtok · 2023-02-01T15:13:45Z

backend/src/main/java/com/bakdata/conquery/resources/api/ResultCsvResource.java

@@ -30,7 +31,7 @@
 import lombok.extern.slf4j.Slf4j;

 @Slf4j
-@Path("result/")
+@Path("result/csv")


Api Änderung bitte in openapi eintragen, und ist das JupyEnd schon informiert über die Änderung?

Das muss ich noch klären, aber an sich bekommt es wie das Frontend die URL als dem ExecutionStatus und leitet sich die nicht selber her.

@MaxVonKnobloch ist das ein Problem aus Sicht der CqAPI wenn der Pfad sich hier ändert? Wie matched du momentan auf das Arrow-Format

@awildturtok ist noch nicht in OpenApi drinne ;)

awildturtok · 2023-02-01T15:14:44Z

backend/src/test/resources/tests/endpoints/apiEndpointInfo.json

+	  "method": "GET",
+	  "path": "/result/csv/{query}.csv",
+	  "clazz": "ResultCsvResource"
+  },
+	{
+		"method": "GET",
+		"path": "/result/xlsx/{query}.xlsx",
+		"clazz": "ResultExcelResource"
+	},
+	{
+		"method": "GET",
+		"path": "/result/arrow/{query}.arrs",
+		"clazz": "ResultArrowResource"
+	},
+	{
+		"method": "GET",
+		"path": "/result/arrow/{query}.arrf",
+		"clazz": "ResultArrowResource"
+	},
+	{
+		"method": "GET",
+		"path": "/result/parquet/{query}.parquet",
+		"clazz": "ResultParquetResource"
+	},


Mir ist nicht klar, warum du die Doppelung brauchst

Es ist hier nicht so offensichtlich, aber ich habs gemacht damit es einheitlich ist, denn der ExternalResultProvider mapped kann auch auf die Formate mappen und dann würde es einen Problem geben, so hat jetzt erstmal jeder Provider seinen Namespace

…ollide with providers of a similar name

Signed-off-by: Max Thonagel <[email protected]>

…ignment-patch Fix tooltip alignment with popperOptions using padding instead of skidding

…akdata/conquery into feature/result-assets-frontend

# Conflicts: # backend/src/main/java/com/bakdata/conquery/apiv1/QueryProcessor.java # backend/src/main/java/com/bakdata/conquery/io/result/ResultRender/ResultRendererProvider.java # backend/src/main/java/com/bakdata/conquery/io/result/ResultUtil.java # backend/src/main/java/com/bakdata/conquery/io/result/arrow/ResultArrowProcessor.java # backend/src/main/java/com/bakdata/conquery/io/result/excel/ResultExcelProcessor.java # backend/src/main/java/com/bakdata/conquery/models/config/ArrowResultProvider.java # backend/src/main/java/com/bakdata/conquery/models/config/CsvResultProvider.java # backend/src/main/java/com/bakdata/conquery/models/config/ExcelResultProvider.java # backend/src/main/java/com/bakdata/conquery/models/config/ParquetResultProvider.java # backend/src/main/java/com/bakdata/conquery/models/forms/managed/ManagedForm.java

Signed-off-by: Max Thonagel <[email protected]>

backend/src/test/java/com/bakdata/conquery/models/auth/oidc/JwtPkceVerifyingRealmTest.java

+	static void setup() throws NoSuchAlgorithmException {
+		// Generate a key pair
+		KeyPairGenerator keyGenerator = KeyPairGenerator.getInstance("RSA");
+		keyGenerator.initialize(1024);


Use new Label Request Format in Frontend

Co-authored-by: awildturtok <[email protected]>

Result Assets get Type from url and fix a truncation oversight

thoniTUB added 6 commits January 30, 2023 18:01

capsule result urls in api object

e138809

adds result provider to path so that an external provider would not c…

5061e82

…ollide with providers of a similar name

fix tests

ac48e18

generalize result name normalization

185f05b

adds NoSuchElementException->404 mapper

7f6a9ba

fix ResultNameTest

cbd8b21

thoniTUB marked this pull request as ready for review February 1, 2023 15:07

thoniTUB requested a review from awildturtok February 1, 2023 15:07

awildturtok reviewed Feb 1, 2023

View reviewed changes

thoniTUB and others added 15 commits February 1, 2023 16:35

adapt openapi.yaml

01cd6cc

switch to labels, switch internal type, mock api

1afd034

fix icons

515b94b

memorization and save selection to localstorage

873404f

fix format

6a3f907

fix spelling to correct capitalization

ddbfbb8

requested changes

e729176

Merge branch 'develop' into feature/result-assets-frontend

c21c831

capsule result urls in api object

bc0f6ef

adds result provider to path so that an external provider would not c…

7253089

…ollide with providers of a similar name

fix tests

fe61b42

generalize result name normalization

d39f3f7

adds NoSuchElementException->404 mapper

3b3404d

fix ResultNameTest

b153a71

adapt openapi.yaml

23a7f8a

thoniTUB force-pushed the feature/result-assets branch from 01cd6cc to 23a7f8a Compare February 16, 2023 12:58

thoniTUB and others added 5 commits February 20, 2023 10:35

capsule result urls in api object

9ae4826

switch to labels, switch internal type, mock api

610b421

fix icons

5593c3b

memorization and save selection to localstorage

506c293

fix format

83a6b7b

fabian-bizfactory and others added 10 commits February 20, 2023 10:35

fix spelling to correct capitalization

ab7515b

requested changes

5707f15

remove fqn from method signatures

9f7fba2

Signed-off-by: Max Thonagel <[email protected]>

Suggest adding popperOptions using padding instead of skidding

e508d54

Merge pull request #2944 from ingef/feature/result-assets-frontend-al…

9edecc9

…ignment-patch Fix tooltip alignment with popperOptions using padding instead of skidding

Merge branch 'feature/result-assets-frontend' of https://github.com/b…

9fb55b6

…akdata/conquery into feature/result-assets-frontend

adressed issues

aaba31b

fix format

190ba0e

changes from merge

33d6ac7

Signed-off-by: Max Thonagel <[email protected]>

thoniTUB requested a review from awildturtok February 27, 2023 12:08

fabian-bizfactory and others added 2 commits February 27, 2023 17:40

Merge branch 'feature/result-assets' into feature/result-assets-frontend

d2647ad

relax token leeway test timing constrain

a33da0a

Signed-off-by: Max Thonagel <[email protected]>

github-advanced-security bot found potential problems Feb 28, 2023

View reviewed changes

awildturtok approved these changes Mar 1, 2023

View reviewed changes

thoniTUB added 3 commits March 1, 2023 13:08

add long result label to mock

39c0465

dice if a too long result label should appear

320f8fb

Merge pull request #2931 from ingef/feature/result-assets-frontend

878d34f

Use new Label Request Format in Frontend

thoniTUB requested a review from Kadrian as a code owner March 1, 2023 12:55

thoniTUB and others added 6 commits March 1, 2023 13:56

Merge branch 'develop' into feature/result-assets

217a8ce

run prettier on src/js/api/types.ts

cf45fe9

fix result assets

b56ade2

Use … Symbol instead of ... for truncation

7e0836a

Co-authored-by: awildturtok <[email protected]>

Merge pull request #2966 from ingef/bug/result-assets-fix-ending

53918a7

Result Assets get Type from url and fix a truncation oversight

Merge branch 'develop' into feature/result-assets

8903b88

thoniTUB merged commit 64a735c into develop Mar 9, 2023

delete-merged-branch bot deleted the feature/result-assets branch March 9, 2023 08:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

capsule result urls in api object #2905

capsule result urls in api object #2905

thoniTUB commented Jan 30, 2023

awildturtok Feb 1, 2023

thoniTUB Feb 27, 2023

awildturtok Feb 1, 2023

thoniTUB Feb 1, 2023

awildturtok Feb 1, 2023

thoniTUB Feb 1, 2023

thoniTUB Feb 1, 2023

awildturtok Feb 1, 2023

thoniTUB Feb 1, 2023

		new ResultAsset("Arrow File", ResultArrowResource.getFileDownloadURL(uriBuilder.clone(), (ManagedExecution<?> & SingleTableResult) exec)),
		new ResultAsset("Arrow Stream", ResultArrowResource.getStreamDownloadURL(uriBuilder.clone(), (ManagedExecution<?> & SingleTableResult) exec))

capsule result urls in api object #2905

capsule result urls in api object #2905

Conversation

thoniTUB commented Jan 30, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment