diff --git a/dbrepo-search-service/Pipfile.lock b/dbrepo-search-service/Pipfile.lock
index c76e5a360981bf59cfc3866b46b595f68141363b..d7ec90173d4934a8325bc42e1cd4149270b70903 100644
--- a/dbrepo-search-service/Pipfile.lock
+++ b/dbrepo-search-service/Pipfile.lock
@@ -216,7 +216,7 @@
"sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87",
"sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b"
],
- "markers": "platform_python_implementation != 'PyPy'",
+ "markers": "python_version >= '3.8'",
"version": "==1.17.1"
},
"charset-normalizer": {
@@ -602,7 +602,7 @@
"sha256:f406b22b7c9a9b4f8aa9d2ab13d6ae0ac3e85c9a809bd590ad53fed2bf70dc79",
"sha256:f6ff3b14f2df4c41660a7dec01045a045653998784bf8cfcb5a525bdffffbc8f"
],
- "markers": "python_version < '3.14' and (platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32'))))))",
+ "markers": "python_version >= '3.7'",
"version": "==3.1.1"
},
"gunicorn": {
@@ -739,11 +739,11 @@
},
"mistune": {
"hashes": [
- "sha256:b05198cf6d671b3deba6c87ec6cf0d4eb7b72c524636eddb6dbf13823b52cee1",
- "sha256:dbcac2f78292b9dc066cd03b7a3a26b62d85f8159f2ea5fd28e55df79908d667"
+ "sha256:02106ac2aa4f66e769debbfa028509a275069dcffce0dfa578edd7b991ee700a",
+ "sha256:e0740d635f515119f7d1feb6f9b192ee60f0cc649f80a8f944f905706a21654c"
],
"markers": "python_version >= '3.8'",
- "version": "==3.1.0"
+ "version": "==3.1.1"
},
"multidict": {
"hashes": [
@@ -901,7 +901,7 @@
"sha256:e9e82dcb3f2ebbc8cb5ce1102d5f1c5ed236bf8a11730fb45ba82e2841ec21df",
"sha256:ed6906f61834d687738d25988ae117683705636936cc605be0bb208b23df4d8f"
],
- "markers": "python_version == '3.11'",
+ "markers": "python_version >= '3.10'",
"version": "==2.2.2"
},
"opensearch-py": {
@@ -1585,7 +1585,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.9'",
"version": "==2.3.0"
},
"werkzeug": {
@@ -2009,7 +2009,7 @@
"sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df",
"sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d"
],
- "markers": "python_version >= '3.10'",
+ "markers": "python_version >= '3.9'",
"version": "==2.3.0"
}
}
diff --git a/dbrepo-search-service/init/Pipfile b/dbrepo-search-service/init/Pipfile
index 8ded635ab78a63a71e36787a2a91f48f61932b4c..b74ed7bc40da1da1c51c401b53a1da2676fb739e 100644
--- a/dbrepo-search-service/init/Pipfile
+++ b/dbrepo-search-service/init/Pipfile
@@ -9,7 +9,7 @@ opensearch-py = "~=2.2"
python-dotenv = "~=1.0"
testcontainers-opensearch = "*"
pytest = "*"
-dbrepo = {path = "./lib/dbrepo-1.6.2.tar.gz"}
+dbrepo = {path = "./lib/dbrepo-1.6.3.tar.gz"}
rdflib = "*"
[dev-packages]
diff --git a/dbrepo-search-service/init/Pipfile.lock b/dbrepo-search-service/init/Pipfile.lock
index ef08434670ef0b34b7eaf90cde228a75f57d81b5..583835bb681b0f3dc33f53383359eb7e0f5f670a 100644
--- a/dbrepo-search-service/init/Pipfile.lock
+++ b/dbrepo-search-service/init/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256": "39898ff53a7a701c750b2fc2bfe2d7f72704100e41a183feceb1d8bd09c71a00"
+ "sha256": "dac534d1eb6a0942c0e296c8a58491847c65d3ca23315039a3725591c86f694f"
},
"pipfile-spec": 6,
"requires": {
@@ -254,9 +254,10 @@
},
"dbrepo": {
"hashes": [
- "sha256:181e3da705d8f61ef26a743e0a445c5363b68c671c63f655791d340efdd7aac0"
+ "sha256:5626cbba65f39a016c0eeff905005dd10b854f47edc09de293c62b164d65635a"
],
- "path": "./lib/dbrepo-1.6.2.tar.gz"
+ "path": "./lib/dbrepo-1.6.3.tar.gz",
+ "version": "==1.6.3"
},
"docker": {
"hashes": [
@@ -278,7 +279,6 @@
"sha256:f69fcd559dc907ed196ab9df0e48471709175e696d6e698dd4dbe940f96ce66b"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
"version": "==2.3.3"
},
"frozenlist": {
@@ -643,7 +643,6 @@
"sha256:6598df0bc7a003294edd0ba88a331e0793acbb8c910c43edf398791e3b2eccda"
],
"index": "pypi",
- "markers": "python_version >= '3.8' and python_version < '4'",
"version": "==2.8.0"
},
"packaging": {
@@ -934,7 +933,6 @@
"sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
"version": "==8.3.4"
},
"python-dateutil": {
@@ -951,7 +949,6 @@
"sha256:f7b63ef50f1b690dddf550d03497b66d609393b40b564ed0d674909a68ebf16a"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
"version": "==1.0.1"
},
"pytz": {
@@ -967,7 +964,6 @@
"sha256:f3dcb4c106a8cd9e060d92f43d593d09ebc3d07adc244f4c7315856a12e383ee"
],
"index": "pypi",
- "markers": "python_full_version >= '3.8.1' and python_full_version < '4.0.0'",
"version": "==7.1.3"
},
"requests": {
@@ -998,7 +994,6 @@
"sha256:0bdf270b5b7f53915832f7c31dd2bd3ffdc20b534ea6b32231cc7003049bd0e1"
],
"index": "pypi",
- "markers": "python_version >= '3.7'",
"version": "==0.0.1rc1"
},
"tinydb": {
@@ -1290,7 +1285,6 @@
"sha256:fd34e7b3405f0cc7ab03d54a334c17a9e802897580d964bd8c2001f4b9fd488f"
],
"index": "pypi",
- "markers": "python_version >= '3.9'",
"version": "==7.6.10"
},
"iniconfig": {
@@ -1323,7 +1317,6 @@
"sha256:965370d062bce11e73868e0335abac31b4d3de0e82f4007408d242b4f8610761"
],
"index": "pypi",
- "markers": "python_version >= '3.8'",
"version": "==8.3.4"
}
}
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.2-py3-none-any.whl b/dbrepo-search-service/init/lib/dbrepo-1.6.2-py3-none-any.whl
deleted file mode 100644
index 256d325e8bdbdacd8c967d852c98e39d8d3b9eb9..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.2-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/init/lib/dbrepo-1.6.2.tar.gz b/dbrepo-search-service/init/lib/dbrepo-1.6.2.tar.gz
deleted file mode 100644
index ad4d6f9c5590836360d1a919f4be84b5cc5f9ade..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/init/lib/dbrepo-1.6.2.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.2-py3-none-any.whl b/dbrepo-search-service/lib/dbrepo-1.6.2-py3-none-any.whl
deleted file mode 100644
index 256d325e8bdbdacd8c967d852c98e39d8d3b9eb9..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.2-py3-none-any.whl and /dev/null differ
diff --git a/dbrepo-search-service/lib/dbrepo-1.6.2.tar.gz b/dbrepo-search-service/lib/dbrepo-1.6.2.tar.gz
deleted file mode 100644
index ad4d6f9c5590836360d1a919f4be84b5cc5f9ade..0000000000000000000000000000000000000000
Binary files a/dbrepo-search-service/lib/dbrepo-1.6.2.tar.gz and /dev/null differ
diff --git a/dbrepo-search-service/test/test_opensearch_client.py b/dbrepo-search-service/test/test_opensearch_client.py
index 9da77adfde53e155dddc36f364bea9d974964125..fb4aee94d08fc42f227e2d6b7398da98fe4aa8c7 100644
--- a/dbrepo-search-service/test/test_opensearch_client.py
+++ b/dbrepo-search-service/test/test_opensearch_client.py
@@ -2,7 +2,7 @@ import unittest
import opensearchpy
from dbrepo.api.dto import Database, Table, Column, ColumnType, Constraints, PrimaryKey, \
- TableMinimal, ColumnMinimal, ConceptBrief, UnitBrief, UserBrief, ContainerBrief, ImageBrief
+ ConceptBrief, UnitBrief, UserBrief, ContainerBrief, ImageBrief, TableBrief, ColumnBrief
from opensearchpy import NotFoundError
from app import app
@@ -57,10 +57,6 @@ class OpenSearchClientTest(unittest.TestCase):
def test_update_database_succeeds(self):
with app.app_context():
- # mock
- OpenSearchClient().update_database(database_id=req.id, data=req)
-
- # test
req.tables = [Table(id=1,
name="Test Table",
internal_name="test_table",
@@ -71,10 +67,19 @@ class OpenSearchClientTest(unittest.TestCase):
database_id=req.id,
constraints=Constraints(uniques=[], foreign_keys=[], checks=[],
primary_key=[PrimaryKey(id=1,
- table=TableMinimal(id=1,
- database_id=req.id),
- column=ColumnMinimal(id=1, table_id=1,
- database_id=req.id))]),
+ table=TableBrief(id=1,
+ database_id=req.id,
+ name="Test Table",
+ internal_name="test_table",
+ is_public=True,
+ is_schema_public=True,
+ is_versioned=True),
+ column=ColumnBrief(id=1,
+ name="ID",
+ database_id=req.id,
+ table_id=1,
+ internal_name="id",
+ type=ColumnType.BIGINT))]),
is_versioned=True,
owner=UserBrief(id="c6b71ef5-2d2f-48b2-9d79-b8f23a3a0502", username="foo"),
columns=[Column(id=1,
@@ -85,6 +90,10 @@ class OpenSearchClientTest(unittest.TestCase):
internal_name="id",
type=ColumnType.BIGINT,
is_null_allowed=False)])]
+ # mock
+ OpenSearchClient().update_database(database_id=req.id, data=req)
+
+ # test
database = OpenSearchClient().update_database(database_id=req.id, data=req)
self.assertEqual(1, database.id)
self.assertEqual("Test", database.name)