dsp-tools 17.0.0.post26__py3-none-any.whl → 18.0.0__py3-none-any.whl

dsp_tools/resources/start-stack/docker-compose.yml

@@ -3,7 +3,7 @@ services:
   api:
     # on the verge of every deployment, update the "image" value from the "api" value of
     # https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
-    image: daschswiss/knora-api:v32.3.2
+    image: daschswiss/knora-api:v32.5.0
     depends_on:
       - sipi
       - db
@@ -28,7 +28,7 @@ services:
 
   sipi:
     # on the verge of every deployment, take the same tag as DSP-API
-    image: daschswiss/knora-sipi:v32.3.2
+    image: daschswiss/knora-sipi:v32.5.0
     ports:
       - "1024:1024"
     volumes:
@@ -41,29 +41,9 @@ services:
       - KNORA_WEBAPI_KNORA_API_EXTERNAL_PORT=3333
     command: --config=/sipi/config/sipi.docker-config.lua
 
-  app:
-    # on the verge of every deployment, update the "image" value from the "app" value of
-    # https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
-    image: daschswiss/dsp-app:v11.47.2
-    volumes:
-      - ./dsp-app-config.json:/public/config/config.prod.json
-    ports:
-      - "4200:4200"
-
-  db:
-    # on the verge of every deployment, update the "image" value from the "db" value of
-    # https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
-    image: daschswiss/apache-jena-fuseki:5.5.0-2
-    ports:
-      - "3030:3030"
-    environment:
-      - TZ=Europe/Zurich
-      - ADMIN_PASSWORD=test
-      - JVM_ARGS=-Xmx3G
-
   ingest:
     # on the verge of every deployment, take the same tag as DSP-API
-    image: daschswiss/dsp-ingest:v32.3.2
+    image: daschswiss/dsp-ingest:v32.5.0
     ports:
       - "3340:3340"
     volumes:
@@ -84,5 +64,25 @@ services:
       - DB_JDBC_URL=jdbc:sqlite:/opt/db/ingest.sqlite
       - DSP_API_URL=http://host.docker.internal:3333
 
+  app:
+    # on the verge of every deployment, update the "image" value from the "app" value of
+    # https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
+    image: daschswiss/dsp-app:v12.1.2
+    volumes:
+      - ./dsp-app-config.json:/public/config/config.prod.json
+    ports:
+      - "4200:4200"
+
+  db:
+    # on the verge of every deployment, update the "image" value from the "db" value of
+    # https://github.com/dasch-swiss/ops-deploy/blob/main/versions/RELEASE.json
+    image: daschswiss/apache-jena-fuseki:5.5.0-3
+    ports:
+      - "3030:3030"
+    environment:
+      - TZ=Europe/Zurich
+      - ADMIN_PASSWORD=test
+      - JVM_ARGS=-Xmx3G
+
 volumes:
   ingest-db:

dsp_tools/utils/ansi_colors.py

@@ -12,6 +12,8 @@ SEQUENCE_END = "m"
 # reset to the default setting of the console
 RESET_TO_DEFAULT = f"{SEQUENCE_START}0{SEQUENCE_END}"
 
+BOLD = f"{SEQUENCE_START}1{SEQUENCE_END}"  # 1 (bold) ; 32 (green)
+
 # If you want to change for example both the text color and the background color you can combine the sequences
 # for example: BACKGROUND_BOLD_MAGENTA + YELLOW -> magenta background with yellow text
 

{dsp_tools-17.0.0.post26.dist-info → dsp_tools-18.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dsp-tools
-Version: 17.0.0.post26
+Version: 18.0.0
 Summary: DSP-TOOLS is a Python package with a command line interface that helps you interact with a DaSCH service platform (DSP) server.
 Author: DaSCH - Swiss National Data and Service Center for the Humanities
 Author-email: DaSCH - Swiss National Data and Service Center for the Humanities <info@dasch.swiss>

{dsp_tools-17.0.0.post26.dist-info → dsp_tools-18.0.0.dist-info}/RECORD

@@ -1,9 +1,12 @@
 dsp_tools/__init__.py,sha256=XdzLhY_8FUFmPtUEawAvEA8apQ_jlgspb2HpmNjlDV8,158
 dsp_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/cli/args.py,sha256=tS16NvgIMdQuaDWb0cNC8TIK7wY-i4pQe7NFYrzt5Bo,694
-dsp_tools/cli/call_action.py,sha256=2yBnZqNPWy0swC-YTA_CvhPOMh0cKBUHgQXPFGfDpvU,13826
-dsp_tools/cli/create_parsers.py,sha256=zi0E7AHV25B_wXt_8Jcan0Tc6y7aG0vipS5rya5gP9s,17764
+dsp_tools/cli/args.py,sha256=qUoEQVULA3eaCkI1xSdEhEcM26rku0lejnjSnKoevGU,1038
+dsp_tools/cli/call_action.py,sha256=l6pmY1SckKMkh-Y0DW1Aij2IR_D91uoe078fsruXkIQ,3275
+dsp_tools/cli/call_action_files_only.py,sha256=T0A51uN4pClcLaDv_eREZMwEshAIlHMyEDPOOqZIOKg,2630
+dsp_tools/cli/call_action_with_network.py,sha256=nEP60rXWZy_z4tkz5ed6DDOEkHMkXVuyheeNZQogjFs,8556
+dsp_tools/cli/create_parsers.py,sha256=UgHp3_3siQoLe1GdFTLn2ya8Vjumf-NibT0Rd58UxuY,19567
 dsp_tools/cli/entry_point.py,sha256=gdexHqVDAy8_Atf0oUxvPVQyDGWUSUhio396U5Oc0RI,10331
+dsp_tools/cli/utils.py,sha256=57Bmv33A61YHcWDDm2zGOsjEuB_bV6p9FYIdN_42UBs,3072
 dsp_tools/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/clients/authentication_client.py,sha256=A9nTlOdUE4Ez0psWX6qXwuypNBAA2eSVfHIEPzRmoCs,267
 dsp_tools/clients/authentication_client_live.py,sha256=Bnc6-M2r_D8BNoZgKi5Rzc2vrz5RtRhwUNjJF3PrVTQ,1917
@@ -12,26 +15,34 @@ dsp_tools/clients/connection_live.py,sha256=Y0T-F93FFGnY2Z7qHhG56v3Ajg7U7ATq4QHI
 dsp_tools/clients/fuseki_metrics.py,sha256=Vy_aWOusnzlD0EnbyHZcTtPIpMEfRA_ihtYbysTq7sQ,2059
 dsp_tools/clients/legal_info_client.py,sha256=itDvGQf1VV1WiH2oHVcH1epSUSdJPRDwdRUvmCw8P4s,742
 dsp_tools/clients/legal_info_client_live.py,sha256=9nOe8Y-oQRHh4TkD2-tjdxLNNTonQ0i-P6UjCGgIBGA,5987
-dsp_tools/clients/metadata_client.py,sha256=Ozlnz8-_lgPHHKPXsRyLDx1ccvBPoIYLbAJcfYnKvXY,610
-dsp_tools/clients/metadata_client_live.py,sha256=LKaGCBZTAyJg0JHxrDOkcrb_Z3csNKXHEhKiWlVylis,1739
-dsp_tools/clients/ontology_client.py,sha256=bATGyI8YFFCl0yis9beJjGB1ZlJuO_GqYnlB-2ulv94,638
-dsp_tools/clients/ontology_client_live.py,sha256=8uWoRxwlCvUHQZYQsQ5XojAlpEAqzIhFNYROQfsNWf4,5367
+dsp_tools/clients/list_client.py,sha256=L1CcbUcmzwkJVKbrbXa7EB2myJ-sCchjZywwuPh2uS8,1118
+dsp_tools/clients/list_client_live.py,sha256=yoznKeBus0gAIERUIjZAbEqGU1CA4AzRRLO48JkrBMU,6198
+dsp_tools/clients/metadata_client.py,sha256=GD4uYXP3kEym59JAqSub61xXDZSmZaQ2lKRF1_MgYS0,623
+dsp_tools/clients/metadata_client_live.py,sha256=SLq2Ssob3TQaTx6PUblD-DeTimSLA4Y6woo6246Fca8,1863
+dsp_tools/clients/ontology_clients.py,sha256=juigGsfZ1uP42gtyEstDzaMfjeKcriS34mgYaFbJW-Y,989
+dsp_tools/clients/ontology_create_client_live.py,sha256=LOz3k2_ZiShEcdarhoscLFjsdMHG85mHGsbRuR7cq7Y,5386
+dsp_tools/clients/ontology_get_client_live.py,sha256=MeTqWVqTBW22wEebulv3R8fDsjvW2_dd-cs0Wqllxe8,2698
+dsp_tools/clients/project_client.py,sha256=1nsp-RLRTqD1ePk824R4XKbAKCWMYwiGR9uzA-0qRqg,243
+dsp_tools/clients/project_client_live.py,sha256=NTnw_DG37YKfAouDExccwt79QHFsT66oPyrY3MXtVSY,1115
 dsp_tools/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/create/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/create/communicate_problems.py,sha256=GdAOiUZevrYFhRINyDMhcbXdUqtGDKb2nEelhdfSFR0,885
 dsp_tools/commands/create/constants.py,sha256=ZzWNn_zh-0Oy0SJmGivQbcAnQTmwT0akNchZUppXgh0,276
 dsp_tools/commands/create/create_on_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/commands/create/create_on_server/cardinalities.py,sha256=QW0i6TSNmP-dGS2WSad1np9QHz41-A51ArspuAQZGJg,5260
+dsp_tools/commands/create/create_on_server/cardinalities.py,sha256=bp-3NokfyhpE5ddKTkib9imFpZiMyRKcN-pHK_DHyfo,5518
+dsp_tools/commands/create/create_on_server/lists.py,sha256=y_63BBpALfJKJ-wQfsgINEuevFnRolD07ZWt0Q4yFfA,6195
 dsp_tools/commands/create/create_on_server/mappers.py,sha256=Lu2DJAICOZu7WP_1UDvyvRAi0T9ZGO88kvx0UfI6v5I,564
+dsp_tools/commands/create/lists_only.py,sha256=pSgl0XykdguR9445QIAvDTTRbsBuicIxgjD-zFQQzD0,2079
 dsp_tools/commands/create/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/commands/create/models/input_problems.py,sha256=Oa8-fQy2FTtmfXzMVdhBE9Cs3PlOgTWga4XmK5QkM7s,665
+dsp_tools/commands/create/models/input_problems.py,sha256=mFww8a-sFBtWvSNxywiQTprTa-74jMkE45K2UqJxFEc,1169
 dsp_tools/commands/create/models/parsed_ontology.py,sha256=EUuD47SmWXyB74vGdxGwuvRzq1f4_YdciwYmqcEwqWc,815
-dsp_tools/commands/create/models/parsed_project.py,sha256=Gnl9gJEm5sNbccYG24cwT4doS-oqh_cywjbqk1V4wZQ,928
-dsp_tools/commands/create/models/rdf_ontology.py,sha256=TyXHmblr9j5XZFVqjLT516MrVYPgzjXWvTX4TckEPPk,361
-dsp_tools/commands/create/models/server_project_info.py,sha256=k5EVYo8ZJhMMB5XKja9Xl6CFQ_oLRFdRZPjMyj4XmO4,699
+dsp_tools/commands/create/models/parsed_project.py,sha256=wtUicIHhwv324noBNrC8qmA4P8zNzqqR7J04dOdbgo0,1166
+dsp_tools/commands/create/models/rdf_ontology.py,sha256=c51riv5ZwlIIblr9Wn7QStr4AjtO4Bo1-2bPMKSsTH8,226
+dsp_tools/commands/create/models/server_project_info.py,sha256=DtN0TChUh9hPSdt4ENgjJxRoI9CVcFe6NurgF-d5i_I,1134
 dsp_tools/commands/create/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+dsp_tools/commands/create/parsing/parse_lists.py,sha256=iL-ijELdAgk3BZ36dDugfX2vYo9u4cnHCQh9RyPHqdw,2074
 dsp_tools/commands/create/parsing/parse_ontology.py,sha256=4cqo2wa9wcLBszWXgPrixQgaHYPHfENQbF6dkeBVNiU,4268
-dsp_tools/commands/create/parsing/parse_project.py,sha256=CghB-pJ6RcllOP0jn8Hs50kRcxS2Q0iS8A_QNGbjzZU,4005
+dsp_tools/commands/create/parsing/parse_project.py,sha256=wYxy0EDcLMZ8Ie9ET9jc434tU75V7fWenDi9ROwDvoo,4828
 dsp_tools/commands/create/parsing/parsing_utils.py,sha256=X-ALTAwcQE8dBRiagb_O9D89d7WGvwnq77cNkNZDNpc,1563
 dsp_tools/commands/create/serialisation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/create/serialisation/ontology.py,sha256=NK4kjriHs7dt5fXNiIBc1z_mE9szI4YemJ--hkYYeCk,1581
@@ -65,7 +76,7 @@ dsp_tools/commands/ingest_xmlupload/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 dsp_tools/commands/ingest_xmlupload/bulk_ingest_client.py,sha256=i53VPo5bRf6FkGzEuQuZJIzHKO4_aJKkmz3jmIA5q3Y,7617
 dsp_tools/commands/ingest_xmlupload/create_resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/ingest_xmlupload/create_resources/apply_ingest_id.py,sha256=AM6nSDKQc0Oqrv2Z0Uyaz8ztcPJrUGnwN5tlpvBzaBg,2579
-dsp_tools/commands/ingest_xmlupload/create_resources/upload_xml.py,sha256=jCdie1HYomdzgUVpBryhsj_u0-appvANeoZ4w_0--78,7457
+dsp_tools/commands/ingest_xmlupload/create_resources/upload_xml.py,sha256=atfMF_8yaZ7qJ-ZzWLdLFlFEWvN3uiT3iqkINLUXxSQ,7796
 dsp_tools/commands/ingest_xmlupload/create_resources/user_information.py,sha256=wR6PGR2DQvPS0YXELzCJ70fvzQnFvIzek3VFWVPoZk0,4883
 dsp_tools/commands/ingest_xmlupload/ingest_files/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/ingest_xmlupload/ingest_files/ingest_files.py,sha256=ML_k_KyuNOYBcwy6nrqJ077vj72b_a04MbJRy95KPcA,2306
@@ -77,10 +88,9 @@ dsp_tools/commands/ingest_xmlupload/upload_files/upload_files.py,sha256=QXj58UiT
 dsp_tools/commands/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/project/create/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/project/create/parse_project.py,sha256=xYcFaUtKLZigxDZpD7O2JNueHmy_-Ar1iE2LJe97gos,4081
-dsp_tools/commands/project/create/project_create_all.py,sha256=GM1XjpRvGoT79wGO9VF27c8CBdV42dIOhcT3AdKSwzg,24888
-dsp_tools/commands/project/create/project_create_default_permissions.py,sha256=CygzQ4rFF6SYUCkSvrO6gkjpINWZh4wjq_2V0PExwso,5990
-dsp_tools/commands/project/create/project_create_lists.py,sha256=A9kKe4gVP1Ug869102bRXK5RraZUtGzv5cWyFfK_DEA,7963
-dsp_tools/commands/project/create/project_create_ontologies.py,sha256=Ie5WHTKg5S1bRCg3SmmbB1tjem3NwRrX3N32TeAWzyI,19465
+dsp_tools/commands/project/create/project_create_all.py,sha256=9Am3ZjFyKsHAwEAoNl3rCRaFviJDkIQ4AaOYFm_xJgc,25145
+dsp_tools/commands/project/create/project_create_default_permissions.py,sha256=4SPcyEIImW1ek_q94oLTtxndhkDNF_RNw13U_fKXsuM,6144
+dsp_tools/commands/project/create/project_create_ontologies.py,sha256=DlDXJvrdrPpVO6cYyC4DpllYUn8rgQpF6RbRToO7X-A,20067
 dsp_tools/commands/project/create/project_validate.py,sha256=H5TVvqO5V63roGEde1J0n21twkajy4AkVSDGmZb4Jp8,27443
 dsp_tools/commands/project/get/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/project/get/get.py,sha256=_5LxbSP5Fi0PyXODjvND3ZC9E_x91yk6Xb6tcldG5j0,6447
@@ -90,7 +100,7 @@ dsp_tools/commands/project/legacy_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 dsp_tools/commands/project/legacy_models/context.py,sha256=hT69iRVpT0RDySe_8LQofvryENuj1jiTgv1mqTMbS8U,12190
 dsp_tools/commands/project/legacy_models/group.py,sha256=iSfcGZK2w7Zn8Hs4r_GCosSTGqhQNOS1vget-Kw8Isc,8138
 dsp_tools/commands/project/legacy_models/helpers.py,sha256=pU5jUeeRZnEi9Y_fm0xAayBmpOAxvU8XD9CXwRSFNgA,850
-dsp_tools/commands/project/legacy_models/listnode.py,sha256=wqBps8RakCdg19n90yaqRQG4EtzY56eTbXspPA1Jnrs,14932
+dsp_tools/commands/project/legacy_models/listnode.py,sha256=7Uyf4p-SYB_3NXM4bU_1QpBbi3KZjLfeGwXMvS5aksk,13838
 dsp_tools/commands/project/legacy_models/model.py,sha256=AzxebBc5Y19kPFvsr4cPLWrKxZj6aGeT_te8NkgaRl4,247
 dsp_tools/commands/project/legacy_models/ontology.py,sha256=uXX0U4FVzx53GIjTyZhCN96oxdSc1Jaq-O818XrsSEc,12557
 dsp_tools/commands/project/legacy_models/project.py,sha256=TlC-DPvaIxCdhnO82s_92lcC8--JzO840cLzrmrG4Fo,12012
@@ -106,20 +116,19 @@ dsp_tools/commands/resume_xmlupload/resume_xmlupload.py,sha256=MibH5CwQ_nmSzkwJI
 dsp_tools/commands/start_stack.py,sha256=Dj3fBKVgiF4iEaShhFB8vkcOJdBs8vZMR7uuNDEeeBs,20383
 dsp_tools/commands/validate_data/CLAUDE.md,sha256=dQYFJtiayYh45kwrtFZWCVDMfPhkqSCTpQ7EUAuO6pc,7733
 dsp_tools/commands/validate_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/commands/validate_data/api_clients.py,sha256=8LFiCQMwS22gWXvGo7p4DDtI8YiHfgVLBlmiA9ASaeI,5322
 dsp_tools/commands/validate_data/constants.py,sha256=Xr9iPYG4kpcgzUSy3ARjKv7dgSuMBVf2R69Uj7trcx0,2509
 dsp_tools/commands/validate_data/mappers.py,sha256=lA4Zdt2PHb4nvcOTv63oIPTI5Xs-5J2GSr3S1cDlZkM,7749
 dsp_tools/commands/validate_data/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/commands/validate_data/models/api_responses.py,sha256=RrHwxyx1o2j9sVCwZktTTSnRXHeathNmQxk2RBxJ93E,920
-dsp_tools/commands/validate_data/models/input_problems.py,sha256=WZwM4LitbAuacCQIbwuo3hxaRvbC_iTZYH9lpozMc9I,3221
+dsp_tools/commands/validate_data/models/api_responses.py,sha256=_Zs96nAC3pPY0hkfoJMzhpBZy8V5R1-1J2iJkiKSN7I,753
+dsp_tools/commands/validate_data/models/input_problems.py,sha256=QwUHcqONqveQbXaedKqbpqjpYNHSJbn0zDag0iQrCJg,3323
 dsp_tools/commands/validate_data/models/rdf_like_data.py,sha256=1TccR7UwC5idgrny6CQoFd-lPGzx7BdI8sorqWxgCv0,3313
 dsp_tools/commands/validate_data/models/validation.py,sha256=okYFrLhaSQCGfa8A7gR6Wz-nv0xsmyN5LlNgSqfVfG4,2296
 dsp_tools/commands/validate_data/prepare_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/validate_data/prepare_data/get_rdf_like_data.py,sha256=sU_VmMAvvNsjKkld6Coc_HJLt32nzXOimvKRxIbte-o,11620
 dsp_tools/commands/validate_data/prepare_data/make_data_graph.py,sha256=TANm9WA_z-oPGkoMIR2BGZrHtAkizDlnK_5WDVxQRoQ,4098
-dsp_tools/commands/validate_data/prepare_data/prepare_data.py,sha256=2YLNbk4on0Qf6XE89guf168rsiqvSIibPiSG3laQR6A,7832
+dsp_tools/commands/validate_data/prepare_data/prepare_data.py,sha256=BcmAC8SLAmNS4kGrNOvMxpGQrWPJCVE1f1jDYRpSvYU,8320
 dsp_tools/commands/validate_data/process_validation_report/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/commands/validate_data/process_validation_report/get_user_validation_message.py,sha256=fKYeJa2kVbWbynU56shkz3_HoT7cwsLPQhbmVIcTS28,14623
+dsp_tools/commands/validate_data/process_validation_report/get_user_validation_message.py,sha256=W5VYJPs8J3VvJAaFDBGBuCQ3Xtonhn1iRUOxwgO7xV0,16148
 dsp_tools/commands/validate_data/process_validation_report/query_validation_result.py,sha256=ln7zOq0LgkaVIoTNv2O72Z0tK6WX0UrbwAph-n0tD3E,22299
 dsp_tools/commands/validate_data/process_validation_report/reformat_validation_results.py,sha256=YGJnYLHhmc_X4I6RqKDgnLClMo_bNVtzRZBER3uLWp8,6556
 dsp_tools/commands/validate_data/shacl_cli_validator.py,sha256=3PMFLwPgei76GI07lcboPrLYvjmYaHv7pg_dNvF2KlQ,2958
@@ -127,9 +136,9 @@ dsp_tools/commands/validate_data/sparql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 dsp_tools/commands/validate_data/sparql/cardinality_shacl.py,sha256=V45pljnAx6jvsE1VRDKMZjZ1HdmwoMUnPUCQrQIYHMU,7218
 dsp_tools/commands/validate_data/sparql/construct_shacl.py,sha256=pB8sHn8FiAEiweeIYHROUAJH0YeCk8NWbzEI98YuEIQ,3553
 dsp_tools/commands/validate_data/sparql/legal_info_shacl.py,sha256=2yhn5HfCJFJpOTB-3XNWfxP1KwW3zKxDfqPdhN_Sazg,1522
-dsp_tools/commands/validate_data/sparql/value_shacl.py,sha256=iEpBm4X-jARhGQU21VDK2KvOtMCHTXJzpm08Dda7x1w,13068
+dsp_tools/commands/validate_data/sparql/value_shacl.py,sha256=uUkOlrMCcqzuVYQTXwTJOJw4RGDTd00y3OtLP41nY2c,13044
 dsp_tools/commands/validate_data/utils.py,sha256=L3kpuhn46x-OHap9RnN9QwUQjFYpkQFlFXzFKQfy5ZE,1990
-dsp_tools/commands/validate_data/validate_data.py,sha256=M7jAzju7NLuCjZikCZk2uvZI00ZRJNvci5Vqfwo2wg0,12908
+dsp_tools/commands/validate_data/validate_data.py,sha256=GKQv0G2pDnB_5wbUghk12wcCWBsc5hoNySsxuQ81C5U,13498
 dsp_tools/commands/validate_data/validation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/commands/validate_data/validation/check_duplicate_files.py,sha256=8HU7GZkTMXj68WrVTXadtQujjEP_MvkOnQb4iVtEHt4,2228
 dsp_tools/commands/validate_data/validation/check_for_unknown_classes.py,sha256=Vhr1-nJzd3vzlwSoDJTljY-eFMpFLpTEy_zIEZb5MJs,2966
@@ -178,15 +187,15 @@ dsp_tools/commands/xmlupload/stash/stash_circular_references.py,sha256=EFcROk78B
 dsp_tools/commands/xmlupload/stash/stash_models.py,sha256=zIYKUyRIGY6SMiQRgA2AozyOKJwEwiq8nyXV06bEMiI,3300
 dsp_tools/commands/xmlupload/stash/upload_stashed_resptr_props.py,sha256=PTk-d9ZlSxMdrlE2gbd1k5WuHvROFn-e2pYhJJCi5sM,4212
 dsp_tools/commands/xmlupload/stash/upload_stashed_xml_texts.py,sha256=zMKUa2lx7zZ26bbL6uF-8vVypi8KKLgwBXqF-DADVV4,7460
-dsp_tools/commands/xmlupload/upload_config.py,sha256=7OraegsGMSUji_ySjrjp1LOF5NIY2Wt0HIqRGw6gWWI,2539
+dsp_tools/commands/xmlupload/upload_config.py,sha256=4PBjzGIly0yh9k9I8IDYRWo81U1Bfuh5h8XitdzsGQE,2598
 dsp_tools/commands/xmlupload/write_diagnostic_info.py,sha256=ODjCAdKZyxHYDUhpIVpdEwIzjP-2HFySrzWN6Tddb1A,1281
-dsp_tools/commands/xmlupload/xmlupload.py,sha256=8wO6Dg5DO8fM1CL_dw3VL1C2PrymSNxcDUMqxIYc0FE,22267
+dsp_tools/commands/xmlupload/xmlupload.py,sha256=q_xC9CEDSFb4lMmJoECKZrzTGfIWnAgBx0dnGuz33Oo,22373
 dsp_tools/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/config/logger_config.py,sha256=Bw2Gu5F2d8un_KNk0hvNtV7fvN2TlThqo6gSwqeccOU,2067
 dsp_tools/config/warnings_config.py,sha256=15_Lt227HLqhdn6v-zJbi1KG9Fo6Zi1_4fp_a-iY72w,1142
 dsp_tools/error/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/error/custom_warnings.py,sha256=7C2DscIz9k7IfM8uebIsKWPcWcSjwpDqbIRDaPw7bI8,1053
-dsp_tools/error/exceptions.py,sha256=jaKZE1aDWavHPIjYxc_upK9_tcPPEpaCd7PaIPuazNQ,5131
+dsp_tools/error/exceptions.py,sha256=CjP6zUqODKH5qw9XEo-v3gJcP3Pct0bZ-UbYrIahu-I,5321
 dsp_tools/error/problems.py,sha256=DotzVg3MYvMJmernd9tTBmDHoT1MOkHdiWVv8iMoFSk,265
 dsp_tools/error/xmllib_errors.py,sha256=DpYCsBIx_GmsBAUlfk2VMqtzD5IGMRbd2yXTcrJFHR4,549
 dsp_tools/error/xmllib_warnings.py,sha256=sS9jJXGJtQqCiJ9P2zCM5gpIhTpChbujQz_fPvxLm8g,1557
@@ -204,7 +213,7 @@ dsp_tools/resources/schema/properties-only.json,sha256=a2APFD6mTiaM15VMktN2eZr6L
 dsp_tools/resources/schema/resources-only.json,sha256=PCCaZZ1vGEZdgwFcx9iGvNYbQywH_vImG8sDqu_OVQ0,4207
 dsp_tools/resources/start-stack/docker-compose.override-host.j2,sha256=ev36TSCZ7xFpnb7Fcw-s3iQLJkweHhNP2k3golvqcbs,255
 dsp_tools/resources/start-stack/docker-compose.override.yml,sha256=YsoEIWH6U2-M9wV5MkHR_xGpIppP3SDB8xDVWcVg3no,213
-dsp_tools/resources/start-stack/docker-compose.yml,sha256=qG9v49wq7iIl3XtCHzHV1c2yIP3vP1wJrsjBLi3--yA,2945
+dsp_tools/resources/start-stack/docker-compose.yml,sha256=QxQe9F5ooWQsg3Rkg92hIqcF9GkBi-tl7zQA6Jfu1bM,2944
 dsp_tools/resources/start-stack/dsp-app-config.json,sha256=s1LZ81ch63mnQxQjldkaV7-3a_42xvxPmnuCvvPCB5c,584
 dsp_tools/resources/start-stack/dsp-app-config.override-host.j2,sha256=cVz6ybmJBcgF1FG7y6P4XjzbpMxqC6qKlrbcqAMOB2I,616
 dsp_tools/resources/validate_data/api-shapes-resource-cardinalities.ttl,sha256=xBG6zH9h6qakDeE7Yj28NmHvWpg-vYQ4k5e64WRdKn8,6861
@@ -212,7 +221,7 @@ dsp_tools/resources/validate_data/api-shapes.ttl,sha256=irPS80i3CEH4qUuokS5Y4jRs
 dsp_tools/resources/validate_data/shacl-cli-image.yml,sha256=xqjLfZOq1PbNFN9pfq4wN4Y1eSvkhHL6hbvY59uP2pM,125
 dsp_tools/resources/validate_data/validate-ontology.ttl,sha256=bPRUlPWJ4GQKzXWM3eKgs3pwcak-crDUeMp8g2j6xzU,4341
 dsp_tools/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dsp_tools/utils/ansi_colors.py,sha256=p2vq-wzfmE-wdDddvC26UcOA6Z1qhFTdzP0dPoW4sy0,1691
+dsp_tools/utils/ansi_colors.py,sha256=aCMfANQ8lNtuJ33WgjNkTegI26ISGq8MElrLXrJua4s,1759
 dsp_tools/utils/data_formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dsp_tools/utils/data_formats/date_util.py,sha256=VLNQnSsUX6NB1IY3Ry5KCxCLgHHYN0TSSBRn8hyXN-4,4714
 dsp_tools/utils/data_formats/iri_util.py,sha256=oFcc3gcikmgJOf7iMhT4tfdUQg9wE7lUW5aysfHjylM,1030
@@ -260,7 +269,7 @@ dsp_tools/xmllib/models/res.py,sha256=c3edvilYZVDmv2O6Z36sSkHXcuKPAJLfWVpStDTMuJ
 dsp_tools/xmllib/models/root.py,sha256=x8_vrDSJ1pZUJUL8LR460dZe4Cg57G_Hy-Zfr2S29dw,13562
 dsp_tools/xmllib/value_checkers.py,sha256=Yx3r6_WoZ5Lev8Orp8yDzd03JvP2GBmFNSFT2dzrycM,10712
 dsp_tools/xmllib/value_converters.py,sha256=WMYS5hd1VlrLLBXnf6pv9yYoPBsv_2MxOO6xv-QsRW4,29218
-dsp_tools-17.0.0.post26.dist-info/WHEEL,sha256=M6du7VZflc4UPsGphmOXHANdgk8zessdJG0DBUuoA-U,78
-dsp_tools-17.0.0.post26.dist-info/entry_points.txt,sha256=qjRfEbkeAwLU_AE2Q-l4Y9irPNmu4Wna-3bfRp1bqV4,62
-dsp_tools-17.0.0.post26.dist-info/METADATA,sha256=MVoGCBmqa_mR3gpWNETKJMEoBPX8YmBK0wOG_hr-UQs,4285
-dsp_tools-17.0.0.post26.dist-info/RECORD,,
+dsp_tools-18.0.0.dist-info/WHEEL,sha256=UH59_qNuDUAa1VxQvC6fxmbl24EMw6DOIlT1yp8oeuU,78
+dsp_tools-18.0.0.dist-info/entry_points.txt,sha256=qjRfEbkeAwLU_AE2Q-l4Y9irPNmu4Wna-3bfRp1bqV4,62
+dsp_tools-18.0.0.dist-info/METADATA,sha256=j79Vnn6Ab7AjQuCuUpihzCmWwGbUtdsb0Q8zxmTANc8,4278
+dsp_tools-18.0.0.dist-info/RECORD,,

{dsp_tools-17.0.0.post26.dist-info → dsp_tools-18.0.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.9.5
+Generator: uv 0.9.6
 Root-Is-Purelib: true
 Tag: py3-none-any

dsp_tools/commands/project/create/project_create_lists.py

@@ -1,200 +0,0 @@
-from typing import Any
-from typing import Optional
-from typing import Union
-
-from loguru import logger
-
-from dsp_tools.cli.args import ServerCredentials
-from dsp_tools.clients.authentication_client_live import AuthenticationClientLive
-from dsp_tools.clients.connection import Connection
-from dsp_tools.clients.connection_live import ConnectionLive
-from dsp_tools.commands.project.create.project_validate import validate_project
-from dsp_tools.commands.project.legacy_models.listnode import ListNode
-from dsp_tools.commands.project.legacy_models.project import Project
-from dsp_tools.error.exceptions import BaseError
-from dsp_tools.error.exceptions import InputError
-from dsp_tools.utils.json_parsing import parse_json_input
-
-
-def create_lists_on_server(
-    lists_to_create: list[dict[str, Any]],
-    con: Connection,
-    project_remote: Project,
-) -> tuple[dict[str, Any], bool]:
-    """
-    Creates the "lists" section of a JSON project definition on a DSP server.
-    If a list with the same name is already existing in this project on the DSP server, this list is skipped.
-    If a node or an entire list cannot be created, an error message is printed, but the process continues.
-
-    Args:
-        lists_to_create: "lists" section of a JSON project definition
-        con: connection to the DSP server
-        project_remote: representation of the project on the DSP server
-
-    Raises:
-        BaseError: if one of the lists to be created already exists on the DSP server, but it has no name
-
-    Returns:
-        tuple consisting of the IRIs of the list nodes and the success status (True if everything went well)
-    """
-
-    overall_success = True
-
-    # retrieve existing lists
-    try:
-        existing_lists = ListNode.getAllLists(con=con, project_iri=project_remote.iri)
-    except BaseError:
-        err_msg = "Unable to retrieve existing lists on DSP server. Cannot check if your lists are already existing."
-        print(f"WARNING: {err_msg}")
-        logger.exception(err_msg)
-        existing_lists = []
-        overall_success = False
-
-    current_project_lists: dict[str, Any] = {}
-    for new_lst in lists_to_create:
-        if existing_lst := [x for x in existing_lists if x.project == project_remote.iri and x.name == new_lst["name"]]:
-            existing_list_name = existing_lst[0].name
-            if not existing_list_name:
-                raise BaseError(f"Node {existing_lst[0]} has no name.")
-            current_project_lists[existing_list_name] = {
-                "id": existing_lst[0].iri,
-                "nodes": new_lst["nodes"],
-            }
-            print(f"    WARNING: List '{new_lst['name']}' already exists on the DSP server. Skipping...")
-            overall_success = False
-            continue
-
-        created_list, success = _create_list_node(con=con, project=project_remote, node=new_lst)
-        current_project_lists.update(created_list)
-        if not success:
-            overall_success = False
-        print(f"    Created list '{new_lst['name']}'.")
-
-    return current_project_lists, overall_success
-
-
-def _create_list_node(
-    con: Connection,
-    project: Project,
-    node: dict[str, Any],
-    parent_node: Optional[ListNode] = None,
-) -> tuple[dict[str, Any], bool]:
-    """
-    Creates a list node on the DSP server, recursively scanning through all its subnodes, creating them as well.
-    If a node cannot be created, an error message is printed, but the process continues.
-
-    Args:
-        con: connection to the DSP server
-        project: project that holds the list where this node should be added to
-        node: the node to be created
-        parent_node: parent node of the node to be created (optional)
-
-    Returns:
-        Returns a tuple consisting of a dict and a bool.
-        The dict contains the IRIs of the created list nodes,
-        nested according to their hierarchy structure,
-        i.e. ``{nodename: {"id": IRI, "nodes": {...}}}``.
-        The bool is True if all nodes could be created,
-        False if any node could not be created.
-
-    Raises:
-        BaseError: if the created node has no name
-    """
-    new_node: ListNode = ListNode(
-        con=con,
-        project=project,
-        label=node["labels"],
-        comments=node.get("comments"),
-        name=node["name"],
-        parent=parent_node,
-    )
-    try:
-        new_node = new_node.create()
-    except BaseError:
-        print(f"WARNING: Cannot create list node '{node['name']}'.")
-        logger.exception(f"Cannot create list node '{node['name']}'.")
-        return {}, False
-
-    # if node has child nodes, call the method recursively
-    if node.get("nodes"):
-        overall_success = True
-        subnode_list = []
-        for subnode in node["nodes"]:
-            created_subnode, success = _create_list_node(con=con, project=project, node=subnode, parent_node=new_node)
-            subnode_list.append(created_subnode)
-            if not success:
-                overall_success = False
-        if not new_node.name:
-            raise BaseError(f"Node {new_node} has no name.")
-        return {new_node.name: {"id": new_node.iri, "nodes": subnode_list}}, overall_success
-    else:
-        if not new_node.name:
-            raise BaseError(f"Node {new_node} has no name.")
-        return {new_node.name: {"id": new_node.iri}}, True
-
-
-def create_only_lists(
-    project_file_as_path_or_parsed: Union[str, dict[str, Any]],
-    creds: ServerCredentials,
-) -> tuple[dict[str, Any], bool]:
-    """
-    This function accepts a JSON project definition,
-    connects to a DSP server,
-    and uploads the "lists" section to the server.
-
-    The project must already exist on the DSP server.
-    If a list with the same name is already existing in this project on the DSP server, this list is skipped.
-
-    Args:
-        project_file_as_path_or_parsed: path to the JSON project definition, or parsed JSON object
-        creds: credentials to connect to the DSP server
-
-    Raises:
-        InputError:
-          - if the project cannot be read from the server
-          - if the connection to the DSP server cannot be established
-
-        BaseError:
-          - if the input is invalid
-          - if a problem occurred while trying to expand the Excel files
-          - if the JSON file is invalid according to the schema
-
-    Returns:
-        Returns a tuple consisting of a dict and a bool.
-        The dict contains the IRIs of the created list nodes,
-        nested according to their hierarchy structure,
-        i.e. ``{nodename: {"id": IRI, "nodes": {...}}}``.
-        If there are no lists in the project definition,
-        an empty dictionary is returned.
-        The bool indicates if everything went smoothly during the process.
-        If a warning or error occurred (e.g. one of the lists already exists,
-        or one of the nodes could not be created),
-        it is False.
-    """
-    project_definition = parse_json_input(project_file_as_path_or_parsed=project_file_as_path_or_parsed)
-    if not project_definition.get("project", {}).get("lists"):
-        return {}, True
-    validate_project(project_definition)
-    print("JSON project file is syntactically correct and passed validation.")
-
-    auth = AuthenticationClientLive(creds.server, creds.user, creds.password)
-    con = ConnectionLive(creds.server, auth)
-
-    # retrieve the project
-    shortcode = project_definition["project"]["shortcode"]
-    project_local = Project(con=con, shortcode=shortcode)
-    try:
-        project_remote = project_local.read()
-    except BaseError:
-        err_msg = f"Unable to create the lists: The project {shortcode} cannot be found on the DSP server."
-        logger.exception(err_msg)
-        raise InputError(err_msg) from None
-
-    # create new lists
-    current_project_lists, success = create_lists_on_server(
-        lists_to_create=project_definition["project"]["lists"],
-        con=con,
-        project_remote=project_remote,
-    )
-
-    return current_project_lists, success

dsp_tools/commands/validate_data/api_clients.py

@@ -1,124 +0,0 @@
-from dataclasses import dataclass
-from typing import Any
-from typing import cast
-from urllib.parse import quote_plus
-
-import requests
-
-from dsp_tools.commands.validate_data.models.api_responses import OneList
-from dsp_tools.commands.validate_data.models.api_responses import OneNode
-from dsp_tools.error.exceptions import InternalError
-from dsp_tools.utils.request_utils import RequestParameters
-from dsp_tools.utils.request_utils import log_request
-from dsp_tools.utils.request_utils import log_response
-
-
-@dataclass
-class OntologyClient:
-    api_url: str
-    shortcode: str
-
-    def get_knora_api(self) -> str:
-        url = f"{self.api_url}/ontology/knora-api/v2#"
-        headers = {"Accept": "text/turtle"}
-        timeout = 60
-        log_request(RequestParameters("GET", url, timeout=timeout, headers=headers))
-        response = requests.get(url=url, headers=headers, timeout=timeout)
-        log_response(response, include_response_content=False)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        return response.text
-
-    def get_ontologies(self) -> tuple[list[str], list[str]]:
-        """
-        Returns a list of project ontologies as a string in turtle format.
-        And a list of the ontology IRIs
-
-        Returns:
-            list of ontologies and IRIs
-        """
-        ontology_iris = self._get_ontology_iris()
-        ontologies = [self._get_one_ontology(x) for x in ontology_iris]
-        return ontologies, ontology_iris
-
-    def _get_ontology_iris(self) -> list[str]:
-        url = f"{self.api_url}/admin/projects/shortcode/{self.shortcode}"
-        timeout = 10
-        log_request(RequestParameters("GET", url, timeout=timeout))
-        response = requests.get(url=url, timeout=timeout)
-        log_response(response)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        response_json = cast(dict[str, Any], response.json())
-        if not (ontos := response_json.get("project", {}).get("ontologies")):
-            raise InternalError(f"The response from the API does not contain any ontologies.\nResponse:{response.text}")
-        output = cast(list[str], ontos)
-        return output
-
-    def _get_one_ontology(self, ontology_iri: str) -> str:
-        url = ontology_iri
-        headers = {"Accept": "text/turtle"}
-        timeout = 30
-        log_request(RequestParameters("GET", url, timeout=timeout, headers=headers))
-        response = requests.get(url=url, headers=headers, timeout=timeout)
-        log_response(response, include_response_content=False)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        return response.text
-
-
-@dataclass
-class ListClient:
-    """Client to request and reformat the lists of a project."""
-
-    api_url: str
-    shortcode: str
-
-    def get_lists(self) -> list[OneList]:
-        list_json = self._get_all_list_iris()
-        all_iris = self._extract_list_iris(list_json)
-        all_lists = [self._get_one_list(iri) for iri in all_iris]
-        return [self._reformat_one_list(lst) for lst in all_lists]
-
-    def _get_all_list_iris(self) -> dict[str, Any]:
-        url = f"{self.api_url}/admin/lists?projectShortcode={self.shortcode}"
-        timeout = 10
-        log_request(RequestParameters("GET", url, timeout))
-        response = requests.get(url=url, timeout=timeout)
-        log_response(response)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        json_response = cast(dict[str, Any], response.json())
-        return json_response
-
-    def _extract_list_iris(self, response_json: dict[str, Any]) -> list[str]:
-        return [x["id"] for x in response_json["lists"]]
-
-    def _get_one_list(self, list_iri: str) -> dict[str, Any]:
-        encoded_list_iri = quote_plus(list_iri)
-        url = f"{self.api_url}/admin/lists/{encoded_list_iri}"
-        timeout = 30
-        log_request(RequestParameters("GET", url, timeout))
-        response = requests.get(url=url, timeout=timeout)
-        log_response(response, include_response_content=False)
-        if not response.ok:
-            raise InternalError(f"Failed Request: {response.status_code} {response.text}")
-        response_json = cast(dict[str, Any], response.json())
-        return response_json
-
-    def _reformat_one_list(self, response_json: dict[str, Any]) -> OneList:
-        list_name = response_json["list"]["listinfo"]["name"]
-        list_id = response_json["list"]["listinfo"]["id"]
-        nodes = response_json["list"]["children"]
-        all_nodes = []
-        for child in nodes:
-            all_nodes.append(OneNode(child["name"], child["id"]))
-            if node_child := child.get("children"):
-                self._reformat_children(node_child, all_nodes)
-        return OneList(list_iri=list_id, list_name=list_name, nodes=all_nodes)
-
-    def _reformat_children(self, list_child: list[dict[str, Any]], current_nodes: list[OneNode]) -> None:
-        for child in list_child:
-            current_nodes.append(OneNode(child["name"], child["id"]))
-            if grand_child := child.get("children"):
-                self._reformat_children(grand_child, current_nodes)