diff --git a/src/dsp_tools/commands/xmlupload/ontology_client.py b/src/dsp_tools/commands/xmlupload/ontology_client.py index 09a8ff67d..60c47a2ba 100644 --- a/src/dsp_tools/commands/xmlupload/ontology_client.py +++ b/src/dsp_tools/commands/xmlupload/ontology_client.py @@ -1,5 +1,4 @@ from dataclasses import dataclass, field -from pathlib import Path from typing import Any, Protocol from dsp_tools.commands.xmlupload.models.ontology_lookup_models import OntoInfo, extract_classes_properties_from_onto @@ -17,7 +16,6 @@ class OntologyClient(Protocol): con: Connection shortcode: str default_ontology: str - save_location: Path ontology_names: list[str] = field(default_factory=list) def get_all_ontologies_from_server(self) -> dict[str, OntoInfo]: @@ -34,7 +32,6 @@ class OntologyClientLive: con: Connection shortcode: str default_ontology: str - save_location: Path ontology_names: list[str] = field(default_factory=list) def get_all_ontologies_from_server(self) -> dict[str, OntoInfo]: diff --git a/src/dsp_tools/commands/xmlupload/xmlupload.py b/src/dsp_tools/commands/xmlupload/xmlupload.py index 6c524a7c9..b7f57b3e6 100644 --- a/src/dsp_tools/commands/xmlupload/xmlupload.py +++ b/src/dsp_tools/commands/xmlupload/xmlupload.py @@ -92,7 +92,6 @@ def xmlupload( con=con, shortcode=shortcode, default_ontology=default_ontology, - save_location=config.diagnostics.save_location, ) do_xml_consistency_check_with_ontology(onto_client=ontology_client, root=root) 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 f0b8f7fa6..ed75f0b02 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 @@ -1,6 +1,5 @@ import re from dataclasses import dataclass -from pathlib import Path from test.unittests.commands.xmlupload.connection_mock import ConnectionMockBase from typing import Any @@ -66,7 +65,6 @@ def test_error_on_nonexistent_shortcode() -> None: con=con, shortcode="9999", default_ontology="foo", - save_location=Path("bar"), ) with pytest.raises(UserError, match="A project with shortcode 9999 could not be found on the DSP server"): do_xml_consistency_check_with_ontology(ontology_client, root) @@ -83,7 +81,6 @@ def test_error_on_nonexistent_onto_name() -> None: con=con, shortcode="4124", default_ontology="notexistingfantasyonto", - save_location=Path("bar"), ) expected = re.escape( "\nSome property and/or class type(s) used in the XML are unknown.\n" diff --git a/test/unittests/commands/xmlupload/test_ontology_client.py b/test/unittests/commands/xmlupload/test_ontology_client.py index 01df52114..168ba2fb4 100644 --- a/test/unittests/commands/xmlupload/test_ontology_client.py +++ b/test/unittests/commands/xmlupload/test_ontology_client.py @@ -1,5 +1,4 @@ from dataclasses import dataclass -from pathlib import Path from test.unittests.commands.xmlupload.connection_mock import ConnectionMockBase from typing import Any @@ -39,7 +38,7 @@ def test_get_ontology_names_from_server() -> None: } } con = ConnectionMock(response) - onto_client = OntologyClientLive(con, "0801", "beol", Path("")) + onto_client = OntologyClientLive(con, "0801", "beol") onto_client._get_ontology_names_from_server() assert unordered(onto_client.ontology_names) == ["biblio", "newton", "leibniz", "beol"] @@ -58,7 +57,7 @@ def test_get_ontology_from_server() -> None: "@context": {}, } con = ConnectionMock(response) - onto_client = OntologyClientLive(con, "0801", "beol", Path("")) + onto_client = OntologyClientLive(con, "0801", "beol") res_graph = onto_client._get_ontology_from_server("beol") assert unordered(res_graph) == [{"resource_class": ["Information"]}, {"property": ["Information"]}] @@ -77,6 +76,6 @@ def test_get_knora_api_from_server() -> None: "@context": {}, } con = ConnectionMock(response) - onto_client = OntologyClientLive(con, "", "", Path("")) + onto_client = OntologyClientLive(con, "", "") res_graph = onto_client.get_knora_api_ontology_from_server() assert unordered(res_graph) == [{"resource_class": ["Information"]}, {"property": ["Information"]}]