refactor(xmlupload): optimize stash links (DEV-2847) #573

Nora-Olivia-Ammann · 2023-10-17T12:39:22Z

No description provided.

…ation-in-actual-upload

…tual-upload' of https://github.com/dasch-swiss/dsp-tools into wip/dev-2833-apply-optimized-stash-identification-in-actual-upload

…ation-in-actual-upload

…tual-upload' of https://github.com/dasch-swiss/dsp-tools into wip/dev-2833-apply-optimized-stash-identification-in-actual-upload

…ation-in-actual-upload

linear · 2023-10-19T05:56:20Z

DEV-2847 optimize current code

The runtime of the current code is not ideal and can be improved upon.

Some finer details, which are needed for a reliable production code are nor implemented.

After this the logic and the steps should be ready for integration into the production code.

…ation-in-actual-upload

…tual-upload' of https://github.com/dasch-swiss/dsp-tools into wip/dev-2847-apply-optimized-stash-identification-in-actual-upload

BalduinLandolt

Functionally looks good to me, thanks!
I added some "stylistic" remarks, feel free to apply or ignore them as you see fit.

But I'd like to re-review, once you're done with the modifications to the models.

src/dsp_tools/analyse_xml_data/extract_links_from_XML.py

src/dsp_tools/utils/xmlupload/create_upload_order_stash_circles.py

test/unittests/test_analyse_xml_data/test_extract_links_from_XML.py

BalduinLandolt

Some more details, but otherwise it looks good to me

src/dsp_tools/analyse_xml_data/extract_links_from_XML.py

src/dsp_tools/analyse_xml_data/models.py

src/dsp_tools/analyse_xml_data/extract_links_from_XML.py

Nora-Olivia-Ammann · 2023-10-19T14:21:31Z

But I'd like to re-review, once you're done with the modifications to the models.

Thanks!
The models though will not be redone. I removed the UploadResource model as the information about the stashes and upload order are now represented by a list and a dictionary respectively. In my opinion this separates the information semantically better and the results are easier to test.

linear · 2023-10-19T14:25:24Z

DEV-2833 apply optimized stash identification in actual upload

src/dsp_tools/analyse_xml_data/models.py

src/dsp_tools/analyse_xml_data/extract_links_from_XML.py

Update stash_models.py

4d4aa56

Nora-Olivia-Ammann self-assigned this Oct 17, 2023

Nora-Olivia-Ammann added 5 commits October 17, 2023 15:48

Update Test Data

1dff378

Add text string to model and update test

3f97c2c

update cost models

1fd8286

Update extract_links_from_XML.py

381cb4f

Update models.py

3b027aa

Nora-Olivia-Ammann marked this pull request as draft October 17, 2023 17:29

Nora-Olivia-Ammann added 13 commits October 18, 2023 10:23

Restructure Classes

fd84ac9

Merge branch 'main' into wip/dev-2833-apply-optimized-stash-identific…

6bfc860

…ation-in-actual-upload

Create create_upload_order_stash_circles.py

4ddf9bf

change node indices

ca112ca

Merge branch 'wip/dev-2833-apply-optimized-stash-identification-in-ac…

3050cf7

…tual-upload' of https://github.com/dasch-swiss/dsp-tools into wip/dev-2833-apply-optimized-stash-identification-in-actual-upload

Update extract_links_from_XML.py

2b12b41

Merge branch 'main' into wip/dev-2833-apply-optimized-stash-identific…

005dfe3

…ation-in-actual-upload

Merge branch 'wip/dev-2833-apply-optimized-stash-identification-in-ac…

4f39e80

…tual-upload' of https://github.com/dasch-swiss/dsp-tools into wip/dev-2833-apply-optimized-stash-identification-in-actual-upload

Update extract_links_from_XML.py

eb36f1e

Update extract_links_from_XML.py

8dabfeb

phantom link removal

7787679

Update extract_links_from_XML.py

9e29a20

Merge branch 'main' into wip/dev-2833-apply-optimized-stash-identific…

66def93

…ation-in-actual-upload

Nora-Olivia-Ammann changed the title ~~refactor(xmlupload): apply optimized stash identification in actual upload (DEV-2833)~~ refactor(xmlupload): apply optimized stash identification in actual upload (DEV-2847) Oct 19, 2023

Nora-Olivia-Ammann added 7 commits October 19, 2023 10:21

Update extract_links_from_XML.py

a68fe27

fix test

23eb6d1

add test

bc91de0

Merge branch 'main' into wip/dev-2833-apply-optimized-stash-identific…

004d8e6

…ation-in-actual-upload

remove print statements

8079619

Merge branch 'wip/dev-2833-apply-optimized-stash-identification-in-ac…

631221c

…tual-upload' of https://github.com/dasch-swiss/dsp-tools into wip/dev-2847-apply-optimized-stash-identification-in-actual-upload

Update extract_links_from_XML.py

ede4218

Nora-Olivia-Ammann marked this pull request as ready for review October 19, 2023 11:46

Update extract_links_from_XML.py

f5ce7d4

Nora-Olivia-Ammann requested review from BalduinLandolt and jnussbaum October 19, 2023 11:49

Nora-Olivia-Ammann changed the title ~~refactor(xmlupload): apply optimized stash identification in actual upload (DEV-2847)~~ refactor(xmlupload): optimized stash identification in diagnose code (DEV-2847) Oct 19, 2023

Update extract_links_from_XML.py

8c27ac7

BalduinLandolt reviewed Oct 19, 2023

View reviewed changes

remove resource stash info

011e385

BalduinLandolt approved these changes Oct 19, 2023

View reviewed changes

src/dsp_tools/analyse_xml_data/extract_links_from_XML.py Outdated Show resolved Hide resolved

src/dsp_tools/analyse_xml_data/extract_links_from_XML.py Outdated Show resolved Hide resolved

jnussbaum reviewed Oct 19, 2023

View reviewed changes

src/dsp_tools/analyse_xml_data/models.py Show resolved Hide resolved

jnussbaum reviewed Oct 19, 2023

View reviewed changes

src/dsp_tools/analyse_xml_data/extract_links_from_XML.py Outdated Show resolved Hide resolved

dasch-swiss deleted a comment from linear bot Oct 19, 2023

jnussbaum reviewed Oct 19, 2023

View reviewed changes

Nora-Olivia-Ammann added 9 commits October 19, 2023 16:34

comments update

bf1ff70

Update test_extract_links_from_XML.py

9104e66

Update test_extract_links_from_XML.py

506f30a

remove root

a87c554

Update extract_links_from_XML.py

1f13d11

Update models.py

fe7a875

remove unnecessary function

c71ef40

Update test_extract_links_from_XML.py

0f99f61

renaming files

6c9105b

Nora-Olivia-Ammann changed the title ~~refactor(xmlupload): optimized stash identification in diagnose code (DEV-2847)~~ refactor(xmlupload): optimize stash links (DEV-2847) Oct 20, 2023

docstrings

bf3d577

Nora-Olivia-Ammann merged commit 1d20fad into main Oct 20, 2023
6 checks passed

Nora-Olivia-Ammann deleted the wip/dev-2833-apply-optimized-stash-identification-in-actual-upload branch October 20, 2023 05:51

daschbot mentioned this pull request Oct 20, 2023

chore: release 5.0.3 #551

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(xmlupload): optimize stash links (DEV-2847) #573

refactor(xmlupload): optimize stash links (DEV-2847) #573

Nora-Olivia-Ammann commented Oct 17, 2023

linear bot commented Oct 19, 2023

BalduinLandolt left a comment

BalduinLandolt left a comment

Nora-Olivia-Ammann commented Oct 19, 2023

linear bot commented Oct 19, 2023

refactor(xmlupload): optimize stash links (DEV-2847) #573

refactor(xmlupload): optimize stash links (DEV-2847) #573

Conversation

Nora-Olivia-Ammann commented Oct 17, 2023

linear bot commented Oct 19, 2023

BalduinLandolt left a comment

Choose a reason for hiding this comment

BalduinLandolt left a comment

Choose a reason for hiding this comment

Nora-Olivia-Ammann commented Oct 19, 2023

linear bot commented Oct 19, 2023