diff --git a/src/dsp_tools/commands/xmlupload/ontology_client.py b/src/dsp_tools/commands/xmlupload/ontology_client.py index 850378cb8..ae076b1c7 100644 --- a/src/dsp_tools/commands/xmlupload/ontology_client.py +++ b/src/dsp_tools/commands/xmlupload/ontology_client.py @@ -60,7 +60,7 @@ def _get_ontology_names_from_server(self) -> None: onto_iris: list[str] = res["project"]["ontologies"] except KeyError as e: raise BaseError(f"Unexpected response from server: {res}") from e - onto_names: list[str] = [iri.split("/")[-1] for iri in onto_iris] + onto_names: list[str] = [iri.split("/")[-2] for iri in onto_iris] self.ontology_names = onto_names def _get_ontology_from_server(self, ontology_name: str) -> list[dict[str, Any]]: diff --git a/src/dsp_tools/resources/start-stack/docker-compose.yml b/src/dsp_tools/resources/start-stack/docker-compose.yml index e4876c5ce..4961b352d 100644 --- a/src/dsp_tools/resources/start-stack/docker-compose.yml +++ b/src/dsp_tools/resources/start-stack/docker-compose.yml @@ -7,7 +7,7 @@ services: app: # on the verge of every deployment (fortnightly), update the "image" value from the "app" value of # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json - image: daschswiss/dsp-app:v11.1.5 + image: daschswiss/dsp-app:v11.2.0 ports: - "4200:4200" networks: @@ -16,7 +16,7 @@ services: db: # on the verge of every deployment (fortnightly), update the "image" value from the "db" value of # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json - image: daschswiss/apache-jena-fuseki:2.1.2 + image: daschswiss/apache-jena-fuseki:2.1.4 ports: - "3030:3030" networks: @@ -28,7 +28,7 @@ services: sipi: # on the verge of every deployment (fortnightly), take the same tag as DSP-API - image: daschswiss/knora-sipi:v30.5.2 + image: daschswiss/knora-sipi:v30.7.0 ports: - "1024:1024" volumes: @@ -51,7 +51,7 @@ services: api: # on the verge of every deployment (fortnightly), update the "image" value from the "api" value of # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json - image: daschswiss/knora-api:v30.5.2 + image: daschswiss/knora-api:v30.7.0 depends_on: - sipi - db @@ -79,7 +79,7 @@ services: ingest: # on the verge of every deployment (fortnightly), update the "image" value from the "ingest" value of # https://github.com/dasch-swiss/ops-deploy/blob/main/roles/dsp-deploy/files/RELEASE.json - image: daschswiss/dsp-ingest:v0.3.3 + image: daschswiss/dsp-ingest:v0.6.0 ports: - "3340:3340" volumes: diff --git a/src/dsp_tools/resources/start-stack/start-stack-config.yml b/src/dsp_tools/resources/start-stack/start-stack-config.yml index a38428947..d74f93335 100644 --- a/src/dsp_tools/resources/start-stack/start-stack-config.yml +++ b/src/dsp_tools/resources/start-stack/start-stack-config.yml @@ -1,4 +1,4 @@ --- # take commit hash of latest DSP-API release from https://github.com/dasch-swiss/dsp-api/commits/main -DSP-API commit: 44e6bdc69db4b7357732c006802767787a534b1b +DSP-API commit: ffe1ce7c617d45bbedd703af1797bc92fe630a83 diff --git a/test/unittests/commands/xmlupload/test_check_consistency_with_ontology_high_level.py b/test/unittests/commands/xmlupload/test_check_consistency_with_ontology_high_level.py index a595bc4a1..320f183c4 100644 --- a/test/unittests/commands/xmlupload/test_check_consistency_with_ontology_high_level.py +++ b/test/unittests/commands/xmlupload/test_check_consistency_with_ontology_high_level.py @@ -27,7 +27,7 @@ class ConnectionMockWithResponses(ConnectionMockBase): get_responses: tuple[dict[str, Any], ...] = ( { "project": { - "ontologies": ["/testonto"], + "ontologies": ["http://0.0.0.0:3333/ontology/4123/testonto/v2"], } }, { diff --git a/test/unittests/commands/xmlupload/test_ontology_client.py b/test/unittests/commands/xmlupload/test_ontology_client.py index 520e677cd..cfbb9fe4b 100644 --- a/test/unittests/commands/xmlupload/test_ontology_client.py +++ b/test/unittests/commands/xmlupload/test_ontology_client.py @@ -176,10 +176,10 @@ def test_get_ontology_names_from_server() -> None: "logo": None, "longname": "Bernoulli-Euler Online", "ontologies": [ - "http://www.knora.org/ontology/0801/biblio", - "http://www.knora.org/ontology/0801/newton", - "http://www.knora.org/ontology/0801/leibniz", - "http://www.knora.org/ontology/0801/beol", + "http://api.dasch.swiss/ontology/0801/biblio/v2", + "http://api.dasch.swiss/ontology/0801/newton/v2", + "http://api.dasch.swiss/ontology/0801/leibniz/v2", + "http://api.dasch.swiss/ontology/0801/beol/v2", ], "selfjoin": False, "shortcode": "0801",