feat(api-v1): Change API v1 file uploads to work like API v2 #1233

benjamingeer · 2019-02-28T16:16:03Z

This PR changes API v1 so that Knora and Sipi no longer need to share a filesystem (#535).

Change API v1 to use the same Sipi scripts as API v2.
Remove the API v1 Sipi scripts.
Change salsah1 to use upload.lua, sending it a JWT token.
Once Implement upload of text files in API v2 #1532 is done, fix KnoraSipiIntegrationV1ITSpec to use API v2 to create the XSLTransformation resource.
Update other API v1 tests.
Update API v1 docs.
Update release notes.

Needs #1532.
Resolves #535.

…ing).

tobiasschweizer · 2019-02-28T17:25:38Z

@benjamingeer I think for this PR the Python load test script has to be adapted.

Could you please instruct me how I have to adapt my import scripts for the v1 non GUI case?

benjamingeer · 2019-02-28T19:06:20Z

Could you please instruct me how I have to adapt my import scripts for the v1 non GUI case?

You’ll have to use v2. When this PR is done, there will be documentation. But I still have a lot of work left to do on it.

tobiasschweizer · 2019-03-01T06:01:17Z

Ok, can we coodinate that next week? Also with @SepidehAlassi. This will affect the BEOL import process. Also I won‘t work in the week of carnival.

tobiasschweizer · 2019-03-01T07:03:01Z

@benjamingeer Could I start using v2 next week? Then I could already adapt my import scripts (image file values, XSL transformations stored in Sipi).

benjamingeer · 2019-03-01T08:42:42Z

@tobiasschweizer This PR may take some time because it depends on PR #1206, which depends on work that Lukas is doing in Sipi. But you can switch to v2 now. The documentation on creating file values in v2 is here:

https://docs.knora.org/paradox/03-apis/api-v2/editing-values.html#creating-file-values

tobiasschweizer · 2019-03-01T08:43:31Z

@benjamingeer Ok, I will have a look at it next week. Thanks.

tobiasschweizer · 2019-03-01T13:12:22Z

Yes, the IRI of an XSL transformation representation can be referenced from a mapping as a default transformation. The XSLT file is stored in Sipi when creating the representation in Knora (v1).

benjamingeer · 2019-03-06T12:56:44Z

@tobiasschweizer It would be great if you could review this sometime in the next week. I can't finish it until #1206 is done, but in the meantime, you could try changing your import script to use new API v1 image upload procedure (no need to switch to v2 if you don't want to). I've updated the API v1 docs to explain how this works now.

tobiasschweizer · 2019-03-08T07:58:11Z

@benjamingeer I wanted to look at this PR this week but now I realize that I won't manage. I will look at it it when I am back to the office on Monday, March 18 (after carnival).

gfoo · 2019-03-08T10:24:40Z

docs/src/paradox/00-release-notes/next.md

+
+- MAJOR: Change API v1 file uploads to work like API v2 (@github[#1233](#1233)). To enable
+  Knora and Sipi tow work without sharing a filesystem, the procedure
+  for uploading files in API v1 has changed; see


tow work -> to work typo master has said :)

tobiasschweizer · 2019-03-18T14:39:04Z

@benjamingeer I can confirm that the new API v1 image upload procedure works.

Once it also supports XML files, I will try that too.

# Conflicts: # webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala

subotic · 2020-06-24T14:54:40Z

@benjamingeer I'm preparing a PR which should contain the necessary fix. If everything works out. I will publish a release candidate of SIPI today.

benjamingeer · 2020-06-24T14:55:35Z

@subotic Great news, thanks!

# Conflicts: # webapi/src/it/scala/org/knora/webapi/ITKnoraLiveSpec.scala # webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala # webapi/src/main/scala/org/knora/webapi/store/iiif/SipiConnector.scala # webapi/src/main/scala/org/knora/webapi/util/StringFormatter.scala # webapi/src/test/scala/org/knora/webapi/store/iiif/MockSipiConnector.scala

subotic · 2020-06-25T04:08:18Z

@benjamingeer I've bumped the SIpi version in this branch to the latest RC. Let me know if you need help.

subotic · 2020-06-25T07:05:41Z

@benjamingeer I've missed something when I changed the Sipi version. I will let you know when its done.

benjamingeer · 2020-06-25T08:02:53Z

@subotic Before I can work on this PR again, I need to do a new PR for https://dasch.myjetbrains.com/youtrack/issue/DSP-44.

# Conflicts: # sipi/scripts/convert_from_file.lua # vars.mk # webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiIntegrationV1ITSpec.scala # webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiScriptsV1ITSpec.scala # webapi/src/it/scala/org/knora/webapi/e2e/v2/KnoraSipiIntegrationV2ITSpec.scala # webapi/src/it/scala/org/knora/webapi/other/v1/DrawingsGodsV1ITSpec.scala

# Conflicts: # docker/knora-sipi.template.dockerfile # project/Dependencies.scala # sipi/docker-compose.yml # sipi/scripts/make_thumbnail.lua # vars.mk # webapi/src/it/scala/org/knora/webapi/e2e/v1/KnoraSipiScriptsV1ITSpec.scala # webapi/src/it/scala/org/knora/webapi/e2e/v2/KnoraSipiIntegrationV2ITSpec.scala # webapi/src/main/scala/org/knora/webapi/responders/v1/ValueUtilV1.scala

refactor (api-v1): Don't have Knora and Sipi share a filesystem (ongo…

2e9cbd1

…ing).

benjamingeer added bulk-import API/V1 Sipi labels Feb 28, 2019

benjamingeer self-assigned this Feb 28, 2019

benjamingeer mentioned this pull request Feb 28, 2019

Ben's PR history #571

Open

Benjamin Geer added 2 commits March 1, 2019 12:33

feature (api-v1): Make bulk import with v2-style file uploads.

00bdf43

test (api-v1): Fix integration test.

2694c04

Benjamin Geer added 7 commits March 1, 2019 16:25

fix (sipi): Remove debugging output.

cbca42e

Merge branch 'develop' into wip/535-sipi

b2b6b07

Merge branch 'develop' into wip/535-sipi

232291a

Merge branch 'develop' into wip/535-sipi

7d480cf

feature (api-v1): Change API v1 to use the same Sipi scripts as API v2.

4f5fed9

feature (sipi): Support cookie authentication in upload.lua.

a072e38

feature (sipi): Remove obsolete routes from Sipi configs.

663c0dd

benjamingeer changed the title ~~Don't require Knora and Sipi to share a filesystem~~ Change API v1 file uploads to work like API v2 Mar 6, 2019

refactor (salsah1): Use Sipi /upload route.

bd83b65

benjamingeer requested a review from tobiasschweizer March 6, 2019 12:52

benjamingeer added the breaking any breaking change label Mar 6, 2019

gfoo reviewed Mar 8, 2019

View reviewed changes

subotic and others added 11 commits April 17, 2020 21:54

triggering github-ci

946281a

ci: add debugging output

8b31606

build: bump sbt version

eb9d5b2

ci: add debugging output

7fdc5ff

ci: add debugging output

319ee8f

ci: add debugging output

b88a982

ci: add debugging output

0541ee1

Merge branch 'develop' into wip/535-sipi

ac3f02e

Merge branch 'develop' into wip/535-sipi

e2ae012

Merge branch 'develop' into wip/535-sipi

de9222b

# Conflicts: # webapi/src/main/scala/org/knora/webapi/routing/v1/ValuesRouteV1.scala

Merge branch 'develop' into wip/535-sipi

c0f1638

benjamingeer mentioned this pull request Jun 23, 2020

build: dockerize fuseki (dsp-30) #1653

Merged

7 tasks

Benjamin Geer and others added 2 commits June 24, 2020 18:24

build: bump sipi version

5fcf0c7

subotic and others added 3 commits June 25, 2020 10:39

build: bump sipi version

d208857

benjamingeer merged commit c9cd0ff into develop Jun 29, 2020

benjamingeer deleted the wip/535-sipi branch June 29, 2020 17:51

benjamingeer restored the wip/535-sipi branch June 29, 2020 17:51

This was referenced Jun 29, 2020

Revert "feat(api-v1): Change API v1 file uploads to work like API v2" #1665

Merged

feat(api-v1): Change API v1 file uploads to work like API v2 (PR 2) #1667

Closed

benjamingeer mentioned this pull request Sep 30, 2020

feat(api-v1): Change API v1 file uploads to work like API v2 (DSP-41, PR 3) #1722

Merged

8 tasks

benjamingeer deleted the wip/535-sipi branch October 1, 2020 12:52

kilchenmann mentioned this pull request Jan 8, 2021

feat!: New features and refactoring #1779

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(api-v1): Change API v1 file uploads to work like API v2 #1233

feat(api-v1): Change API v1 file uploads to work like API v2 #1233

benjamingeer commented Feb 28, 2019 •

edited

Loading

tobiasschweizer commented Feb 28, 2019

benjamingeer commented Feb 28, 2019

tobiasschweizer commented Mar 1, 2019

tobiasschweizer commented Mar 1, 2019

benjamingeer commented Mar 1, 2019

tobiasschweizer commented Mar 1, 2019

tobiasschweizer commented Mar 1, 2019 •

edited

Loading

benjamingeer commented Mar 6, 2019

tobiasschweizer commented Mar 8, 2019

gfoo Mar 8, 2019 •

edited

Loading

tobiasschweizer commented Mar 18, 2019

subotic commented Jun 24, 2020

benjamingeer commented Jun 24, 2020

subotic commented Jun 25, 2020

subotic commented Jun 25, 2020

benjamingeer commented Jun 25, 2020 •

edited

Loading

feat(api-v1): Change API v1 file uploads to work like API v2 #1233

feat(api-v1): Change API v1 file uploads to work like API v2 #1233

Conversation

benjamingeer commented Feb 28, 2019 • edited Loading

tobiasschweizer commented Feb 28, 2019

benjamingeer commented Feb 28, 2019

tobiasschweizer commented Mar 1, 2019

tobiasschweizer commented Mar 1, 2019

benjamingeer commented Mar 1, 2019

tobiasschweizer commented Mar 1, 2019

tobiasschweizer commented Mar 1, 2019 • edited Loading

benjamingeer commented Mar 6, 2019

tobiasschweizer commented Mar 8, 2019

gfoo Mar 8, 2019 • edited Loading

Choose a reason for hiding this comment

tobiasschweizer commented Mar 18, 2019

subotic commented Jun 24, 2020

benjamingeer commented Jun 24, 2020

subotic commented Jun 25, 2020

subotic commented Jun 25, 2020

benjamingeer commented Jun 25, 2020 • edited Loading

benjamingeer commented Feb 28, 2019 •

edited

Loading

tobiasschweizer commented Mar 1, 2019 •

edited

Loading

gfoo Mar 8, 2019 •

edited

Loading

benjamingeer commented Jun 25, 2020 •

edited

Loading