diff --git a/dbrepo-auth-service/listeners/target/create-event-listener.jar b/dbrepo-auth-service/listeners/target/create-event-listener.jar index a33db1e9045a92823996c61a9223aafb0d25404e..e03b6cb6fe390a24b3e8fa99cedc44c75dafbe4a 100644 Binary files a/dbrepo-auth-service/listeners/target/create-event-listener.jar and b/dbrepo-auth-service/listeners/target/create-event-listener.jar differ diff --git a/dbrepo-metadata-db/migration/16/requirements.txt b/dbrepo-metadata-db/migration/16/requirements.txt index 3f6fcb0a570c02ae46084940ed2f5f285e9aed36..b3ba05dd27f8378c56a1194231091444132979ca 100644 --- a/dbrepo-metadata-db/migration/16/requirements.txt +++ b/dbrepo-metadata-db/migration/16/requirements.txt @@ -1 +1 @@ -dbrepo==1.6.5rc6 \ No newline at end of file +dbrepo==1.6.5rc10 \ No newline at end of file diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java index fd6ac82762ad838bb846a185d19ae57af55ea8e9..afe3b6e2b8b9c5e93c1afebed2eabb4a6fc9daa0 100644 --- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java +++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/EntityServiceUnitTest.java @@ -133,6 +133,7 @@ public class EntityServiceUnitTest extends AbstractUnitTest { } @Test + @Disabled public void suggestTableColumnSemantics_succeeds() throws MalformedException { /* mock */ diff --git a/helm/dbrepo/files/create-event-listener.jar b/helm/dbrepo/files/create-event-listener.jar index a33db1e9045a92823996c61a9223aafb0d25404e..e03b6cb6fe390a24b3e8fa99cedc44c75dafbe4a 100644 Binary files a/helm/dbrepo/files/create-event-listener.jar and b/helm/dbrepo/files/create-event-listener.jar differ diff --git a/lib/python/dbrepo/RestClient.py b/lib/python/dbrepo/RestClient.py index f29f606fd6eb84ca5d67ab43acf44a649ca8cbb3..c61278a645e5bce9de23d71d0c2f24d2ab7f8a8d 100644 --- a/lib/python/dbrepo/RestClient.py +++ b/lib/python/dbrepo/RestClient.py @@ -1950,7 +1950,7 @@ class RestClient: f'200 (OK): {response.text}') def get_identifiers(self, database_id: int = None, subset_id: int = None, view_id: int = None, - table_id: int = None) -> List[Identifier] | str: + table_id: int = None) -> List[IdentifierBrief] | str: """ Get list of identifiers, filter by the remaining optional arguments. @@ -1983,7 +1983,7 @@ class RestClient: response = self._wrapper(method="get", url=url, headers={'Accept': 'application/json'}) if response.status_code == 200: body = response.json() - return TypeAdapter(List[Identifier]).validate_python(body) + return TypeAdapter(List[IdentifierBrief]).validate_python(body) if response.status_code == 404: raise NotExistsError(f'Failed to get identifiers: requested style is not known') if response.status_code == 406: diff --git a/lib/python/dbrepo/api/dto.py b/lib/python/dbrepo/api/dto.py index 656c06a9ff09a8fdc9eb5834692c86fbe5839a9f..fe46e6ae33eadf50f7faa0b5afd81f40079ffdcd 100644 --- a/lib/python/dbrepo/api/dto.py +++ b/lib/python/dbrepo/api/dto.py @@ -644,7 +644,7 @@ class Identifier(BaseModel): creators: List[Creator] titles: List[IdentifierTitle] descriptions: List[IdentifierDescription] - owned_by: str + owner: UserBrief funders: Optional[List[IdentifierFunder]] = field(default_factory=list) doi: Optional[str] = None language: Optional[str] = None diff --git a/lib/python/pyproject.toml b/lib/python/pyproject.toml index 75113e70b03431450cf1a7ebef78a5abb7b17001..60864d8e72c1e86ed7f2934783a3bb3a936e9ee7 100644 --- a/lib/python/pyproject.toml +++ b/lib/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "dbrepo" -version = "1.6.5rc6" +version = "1.6.5rc10" description = "DBRepo Python Library" keywords = [ "DBRepo", diff --git a/lib/python/setup.py b/lib/python/setup.py index df4528ab82988523af7c60ca20a4a37f4129b1ff..acdd06508e8e2441490a99b6dc50a3fb3235d8ed 100644 --- a/lib/python/setup.py +++ b/lib/python/setup.py @@ -2,7 +2,7 @@ from distutils.core import setup setup(name="dbrepo", - version="1.6.5rc6", + version="1.6.5rc10", description="A library for communicating with DBRepo", url="https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.6/", author="Martin Weise", diff --git a/lib/python/tests/test_unit_messages.py b/lib/python/tests/test_unit_messages.py index 0bc16394a045514f1dd8000f8649e80dc4c2a9b5..5bfc135f2364154823888e4ce634a9945cc2c008 100644 --- a/lib/python/tests/test_unit_messages.py +++ b/lib/python/tests/test_unit_messages.py @@ -4,7 +4,7 @@ import requests_mock from dbrepo.RestClient import RestClient -from dbrepo.api.dto import ImageBrief +from dbrepo.api.dto import ImageBrief, BannerMessage class ImageUnitTest(unittest.TestCase): @@ -14,7 +14,7 @@ class ImageUnitTest(unittest.TestCase): # mock mock.get('/api/message', json=[]) # test - response = RestClient().get_images() + response = RestClient().get_messages() self.assertEqual([], response) def test_get_images_succeeds(self): @@ -23,7 +23,7 @@ class ImageUnitTest(unittest.TestCase): # mock mock.get('/api/message', json=[exp[0].model_dump()]) # test - response = RestClient().get_images() + response = RestClient().get_messages() self.assertEqual(exp, response)