diff --git a/chart/docker-images.yaml b/chart/docker-images.yaml index 509e1adbf9..76614377a1 100644 --- a/chart/docker-images.yaml +++ b/chart/docker-images.yaml @@ -2,14 +2,14 @@ "dockerImage": { "reverseProxy": "docker.io/nginx:1.20", "jobs": { - "mongodbMigration": "huggingface/datasets-server-jobs-mongodb_migration:sha-0abd269" + "mongodbMigration": "huggingface/datasets-server-jobs-mongodb_migration:sha-05a1740" }, "services": { - "admin": "huggingface/datasets-server-services-admin:sha-0abd269", - "api": "huggingface/datasets-server-services-api:sha-0abd269" + "admin": "huggingface/datasets-server-services-admin:sha-05a1740", + "api": "huggingface/datasets-server-services-api:sha-05a1740" }, "workers": { - "datasets_based": "huggingface/datasets-server-workers-datasets_based:sha-0abd269" + "datasets_based": "huggingface/datasets-server-workers-datasets_based:sha-05a1740" } } } diff --git a/jobs/mongodb_migration/Dockerfile b/jobs/mongodb_migration/Dockerfile index ea7c97a679..2f3f7475c4 100644 --- a/jobs/mongodb_migration/Dockerfile +++ b/jobs/mongodb_migration/Dockerfile @@ -23,7 +23,7 @@ RUN pip install --no-cache-dir "poetry==$POETRY_VERSION" WORKDIR /src COPY jobs/mongodb_migration/poetry.lock ./jobs/mongodb_migration/poetry.lock COPY jobs/mongodb_migration/pyproject.toml ./jobs/mongodb_migration/pyproject.toml -COPY libs/libcommon/dist ./libs/libcommon/dist +COPY libs/libcommon ./libs/libcommon WORKDIR /src/jobs/mongodb_migration/ RUN poetry install --no-cache COPY jobs/mongodb_migration/src ./src diff --git a/jobs/mongodb_migration/poetry.lock b/jobs/mongodb_migration/poetry.lock index dc2e516b69..920e5bf474 100644 --- a/jobs/mongodb_migration/poetry.lock +++ b/jobs/mongodb_migration/poetry.lock @@ -308,21 +308,22 @@ version = "0.6.8" description = "Library for utils, common to all the services and workers" category = "main" optional = false -python-versions = "==3.9.15" +python-versions = "3.9.15" +develop = true [package.dependencies] -appdirs = ">=1.4.4,<2.0.0" -environs = ">=9.5.0,<10.0.0" -huggingface-hub = ">=0.11.0,<0.12.0" +appdirs = "^1.4.4" +environs = "^9.5.0" +huggingface-hub = "^0.11.0" mongo-types = "0.15.1" -mongoengine = ">=0.24.1,<0.25.0" -orjson = ">=3.6.4,<4.0.0" -psutil = ">=5.9.2,<6.0.0" -pymongo = {version = ">=3.13.0,<4.0.0", extras = ["srv"]} +mongoengine = "^0.24.1" +orjson = "^3.6.4" +psutil = "^5.9.2" +pymongo = {version = "^3.13.0", extras = ["srv"]} [package.source] -type = "file" -url = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl" +type = "directory" +url = "../../libs/libcommon" [[package]] name = "lockfile" @@ -877,7 +878,7 @@ python-versions = "*" [metadata] lock-version = "1.1" python-versions = "3.9.15" -content-hash = "9cc914c0fdedb940ea8057a97966e733540449cf038518036ef5708de22d2a2e" +content-hash = "fb2aa3c18a66fff5bdf26107bb6265120efb94a66e99ae8507aea1d6bc9def0c" [metadata.files] appdirs = [ @@ -1117,9 +1118,7 @@ isort = [ {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"}, {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"}, ] -libcommon = [ - {file = "libcommon-0.6.8-py3-none-any.whl", hash = "sha256:28ae018d0416b1ebdbb8fc238157eb01f84608cd3880d23e9a7eef1f73c46908"}, -] +libcommon = [] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, diff --git a/jobs/mongodb_migration/pyproject.toml b/jobs/mongodb_migration/pyproject.toml index e4a21a0e68..ddc39bda44 100644 --- a/jobs/mongodb_migration/pyproject.toml +++ b/jobs/mongodb_migration/pyproject.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [tool.poetry.dependencies] environs = "^9.5.0" -libcommon = { path = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl", develop = false } +libcommon = {path = "../../libs/libcommon", develop = true} python = "3.9.15" [tool.poetry.group.dev.dependencies] diff --git a/libs/libcommon/dist/libcommon-0.3.0-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.3.0-py3-none-any.whl deleted file mode 100644 index d379c2336b..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.0-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.0.tar.gz b/libs/libcommon/dist/libcommon-0.3.0.tar.gz deleted file mode 100644 index 2397271678..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.0.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.1-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.3.1-py3-none-any.whl deleted file mode 100644 index 22a2e7b714..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.1-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.1.tar.gz b/libs/libcommon/dist/libcommon-0.3.1.tar.gz deleted file mode 100644 index 69940fdf37..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.1.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.2-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.3.2-py3-none-any.whl deleted file mode 100644 index 5517358f89..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.2-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.2.tar.gz b/libs/libcommon/dist/libcommon-0.3.2.tar.gz deleted file mode 100644 index 5e78bfef2e..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.2.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.3-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.3.3-py3-none-any.whl deleted file mode 100644 index 8dd8d15db4..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.3-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.3.tar.gz b/libs/libcommon/dist/libcommon-0.3.3.tar.gz deleted file mode 100644 index b363e0c733..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.3.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.4-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.3.4-py3-none-any.whl deleted file mode 100644 index ad4f664549..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.4-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.3.4.tar.gz b/libs/libcommon/dist/libcommon-0.3.4.tar.gz deleted file mode 100644 index 12a032b8ca..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.3.4.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.0-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.4.0-py3-none-any.whl deleted file mode 100644 index 3d3caa5d76..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.0-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.0.tar.gz b/libs/libcommon/dist/libcommon-0.4.0.tar.gz deleted file mode 100644 index 5b80188542..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.0.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.1-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.4.1-py3-none-any.whl deleted file mode 100644 index 84ef4ebed4..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.1-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.1.tar.gz b/libs/libcommon/dist/libcommon-0.4.1.tar.gz deleted file mode 100644 index 2f4967b442..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.1.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.2-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.4.2-py3-none-any.whl deleted file mode 100644 index decc0817cf..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.2-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.2.tar.gz b/libs/libcommon/dist/libcommon-0.4.2.tar.gz deleted file mode 100644 index 7d41e1d1d1..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.2.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.3-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.4.3-py3-none-any.whl deleted file mode 100644 index f64d9d6035..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.3-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.4.3.tar.gz b/libs/libcommon/dist/libcommon-0.4.3.tar.gz deleted file mode 100644 index 870b19e352..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.4.3.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.0-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.0-py3-none-any.whl deleted file mode 100644 index ec1e021a2f..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.0-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.0.tar.gz b/libs/libcommon/dist/libcommon-0.5.0.tar.gz deleted file mode 100644 index ba90999753..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.0.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.1-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.1-py3-none-any.whl deleted file mode 100644 index c23d6a9972..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.1-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.1.tar.gz b/libs/libcommon/dist/libcommon-0.5.1.tar.gz deleted file mode 100644 index ba741fee8c..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.1.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.10-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.10-py3-none-any.whl deleted file mode 100644 index 2d75199a1d..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.10-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.10.tar.gz b/libs/libcommon/dist/libcommon-0.5.10.tar.gz deleted file mode 100644 index 90599cb7f7..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.10.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.11-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.11-py3-none-any.whl deleted file mode 100644 index 81bba9afe4..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.11-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.11.tar.gz b/libs/libcommon/dist/libcommon-0.5.11.tar.gz deleted file mode 100644 index 32af840e9e..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.11.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.2-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.2-py3-none-any.whl deleted file mode 100644 index 7e28167d52..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.2-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.2.tar.gz b/libs/libcommon/dist/libcommon-0.5.2.tar.gz deleted file mode 100644 index b5da8cc957..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.2.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.3-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.3-py3-none-any.whl deleted file mode 100644 index efa4b51079..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.3-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.3.tar.gz b/libs/libcommon/dist/libcommon-0.5.3.tar.gz deleted file mode 100644 index d28c2ff6b4..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.3.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.4-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.4-py3-none-any.whl deleted file mode 100644 index 5b508cbc91..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.4-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.4.tar.gz b/libs/libcommon/dist/libcommon-0.5.4.tar.gz deleted file mode 100644 index 828a1f8369..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.4.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.5-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.5-py3-none-any.whl deleted file mode 100644 index cec6376999..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.5-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.5.tar.gz b/libs/libcommon/dist/libcommon-0.5.5.tar.gz deleted file mode 100644 index 236fde04b7..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.5.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.6-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.6-py3-none-any.whl deleted file mode 100644 index de99fdc890..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.6-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.6.tar.gz b/libs/libcommon/dist/libcommon-0.5.6.tar.gz deleted file mode 100644 index 1f9b059f9e..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.6.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.7-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.7-py3-none-any.whl deleted file mode 100644 index a77d211ce9..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.7-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.7.tar.gz b/libs/libcommon/dist/libcommon-0.5.7.tar.gz deleted file mode 100644 index 843c381eb2..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.7.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.8-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.8-py3-none-any.whl deleted file mode 100644 index ca1c0248b7..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.8-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.8.tar.gz b/libs/libcommon/dist/libcommon-0.5.8.tar.gz deleted file mode 100644 index 3c12d1aafe..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.8.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.9-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.5.9-py3-none-any.whl deleted file mode 100644 index 74f3db820c..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.9-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.5.9.tar.gz b/libs/libcommon/dist/libcommon-0.5.9.tar.gz deleted file mode 100644 index d53f39e429..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.5.9.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.0-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.0-py3-none-any.whl deleted file mode 100644 index f4edf7eedb..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.0-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.0.tar.gz b/libs/libcommon/dist/libcommon-0.6.0.tar.gz deleted file mode 100644 index 5ce5b7395b..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.0.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.1-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.1-py3-none-any.whl deleted file mode 100644 index 7f2e2966e1..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.1-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.1.tar.gz b/libs/libcommon/dist/libcommon-0.6.1.tar.gz deleted file mode 100644 index c6ce3880b7..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.1.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.2-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.2-py3-none-any.whl deleted file mode 100644 index 8f4748dd4b..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.2-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.2.tar.gz b/libs/libcommon/dist/libcommon-0.6.2.tar.gz deleted file mode 100644 index 75a67342e7..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.2.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.3-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.3-py3-none-any.whl deleted file mode 100644 index d655f2a3da..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.3-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.3.tar.gz b/libs/libcommon/dist/libcommon-0.6.3.tar.gz deleted file mode 100644 index 05e8b2b78e..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.3.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.4-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.4-py3-none-any.whl deleted file mode 100644 index 281e35c4ce..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.4-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.4.tar.gz b/libs/libcommon/dist/libcommon-0.6.4.tar.gz deleted file mode 100644 index ed1c82ac34..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.4.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.5-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.5-py3-none-any.whl deleted file mode 100644 index 876ea6f79e..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.5-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.5.tar.gz b/libs/libcommon/dist/libcommon-0.6.5.tar.gz deleted file mode 100644 index 0b1a3ea80c..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.5.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.6-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.6-py3-none-any.whl deleted file mode 100644 index 3098e18b58..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.6-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.6.tar.gz b/libs/libcommon/dist/libcommon-0.6.6.tar.gz deleted file mode 100644 index 9b5ff70ac0..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.6.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.7-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.7-py3-none-any.whl deleted file mode 100644 index 64a5f2f556..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.7-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.7.tar.gz b/libs/libcommon/dist/libcommon-0.6.7.tar.gz deleted file mode 100644 index f9b60e788e..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.7.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl b/libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl deleted file mode 100644 index b0751216b9..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libcommon-0.6.8.tar.gz b/libs/libcommon/dist/libcommon-0.6.8.tar.gz deleted file mode 100644 index a63f5208cd..0000000000 Binary files a/libs/libcommon/dist/libcommon-0.6.8.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.0-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.0-py3-none-any.whl deleted file mode 100644 index adac44440c..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.0-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.0.tar.gz b/libs/libcommon/dist/libutils-0.1.0.tar.gz deleted file mode 100644 index f421b0794a..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.0.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.1-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.1-py3-none-any.whl deleted file mode 100644 index 80357c1cc6..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.1-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.1.tar.gz b/libs/libcommon/dist/libutils-0.1.1.tar.gz deleted file mode 100644 index 015488c2f3..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.1.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.10-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.10-py3-none-any.whl deleted file mode 100644 index 875f516bea..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.10-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.10.tar.gz b/libs/libcommon/dist/libutils-0.1.10.tar.gz deleted file mode 100644 index 223578fdb8..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.10.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.11-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.11-py3-none-any.whl deleted file mode 100644 index b0c9d3c38c..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.11-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.11.tar.gz b/libs/libcommon/dist/libutils-0.1.11.tar.gz deleted file mode 100644 index 2248ef9eae..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.11.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.2-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.2-py3-none-any.whl deleted file mode 100644 index f4dfb86559..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.2-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.2.tar.gz b/libs/libcommon/dist/libutils-0.1.2.tar.gz deleted file mode 100644 index 3d6577acde..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.2.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.3-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.3-py3-none-any.whl deleted file mode 100644 index 513bef32a7..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.3-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.3.tar.gz b/libs/libcommon/dist/libutils-0.1.3.tar.gz deleted file mode 100644 index 0aa95393e3..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.3.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.4-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.4-py3-none-any.whl deleted file mode 100644 index 8a3fbcd50a..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.4-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.4.tar.gz b/libs/libcommon/dist/libutils-0.1.4.tar.gz deleted file mode 100644 index 6df7e6844f..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.4.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.5-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.5-py3-none-any.whl deleted file mode 100644 index 1ef9723830..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.5-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.5.tar.gz b/libs/libcommon/dist/libutils-0.1.5.tar.gz deleted file mode 100644 index 0cf0f36f0f..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.5.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.6-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.6-py3-none-any.whl deleted file mode 100644 index 234314eb5c..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.6-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.6.tar.gz b/libs/libcommon/dist/libutils-0.1.6.tar.gz deleted file mode 100644 index 8fa0adafd6..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.6.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.7-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.7-py3-none-any.whl deleted file mode 100644 index cf005141d3..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.7-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.7.tar.gz b/libs/libcommon/dist/libutils-0.1.7.tar.gz deleted file mode 100644 index 4933617112..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.7.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.8-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.8-py3-none-any.whl deleted file mode 100644 index e52fdb3327..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.8-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.8.tar.gz b/libs/libcommon/dist/libutils-0.1.8.tar.gz deleted file mode 100644 index 5a7e2e6652..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.8.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.9-py3-none-any.whl b/libs/libcommon/dist/libutils-0.1.9-py3-none-any.whl deleted file mode 100644 index d00447c0bb..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.9-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.1.9.tar.gz b/libs/libcommon/dist/libutils-0.1.9.tar.gz deleted file mode 100644 index b948a7532a..0000000000 Binary files a/libs/libcommon/dist/libutils-0.1.9.tar.gz and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.2.0-py3-none-any.whl b/libs/libcommon/dist/libutils-0.2.0-py3-none-any.whl deleted file mode 100644 index ae55569027..0000000000 Binary files a/libs/libcommon/dist/libutils-0.2.0-py3-none-any.whl and /dev/null differ diff --git a/libs/libcommon/dist/libutils-0.2.0.tar.gz b/libs/libcommon/dist/libutils-0.2.0.tar.gz deleted file mode 100644 index f9ad20dee6..0000000000 Binary files a/libs/libcommon/dist/libutils-0.2.0.tar.gz and /dev/null differ diff --git a/services/admin/Dockerfile b/services/admin/Dockerfile index 344b510b6d..e249eaca62 100644 --- a/services/admin/Dockerfile +++ b/services/admin/Dockerfile @@ -23,7 +23,7 @@ RUN pip install --no-cache-dir "poetry==$POETRY_VERSION" WORKDIR /src COPY services/admin/poetry.lock ./services/admin/poetry.lock COPY services/admin/pyproject.toml ./services/admin/pyproject.toml -COPY libs/libcommon/dist ./libs/libcommon/dist +COPY libs/libcommon ./libs/libcommon WORKDIR /src/services/admin/ RUN poetry install --no-cache COPY services/admin/src ./src diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index b54b9aa46f..b5b1f19c25 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -355,21 +355,22 @@ version = "0.6.8" description = "Library for utils, common to all the services and workers" category = "main" optional = false -python-versions = "==3.9.15" +python-versions = "3.9.15" +develop = true [package.dependencies] -appdirs = ">=1.4.4,<2.0.0" -environs = ">=9.5.0,<10.0.0" -huggingface-hub = ">=0.11.0,<0.12.0" +appdirs = "^1.4.4" +environs = "^9.5.0" +huggingface-hub = "^0.11.0" mongo-types = "0.15.1" -mongoengine = ">=0.24.1,<0.25.0" -orjson = ">=3.6.4,<4.0.0" -psutil = ">=5.9.2,<6.0.0" -pymongo = {version = ">=3.13.0,<4.0.0", extras = ["srv"]} +mongoengine = "^0.24.1" +orjson = "^3.6.4" +psutil = "^5.9.2" +pymongo = {version = "^3.13.0", extras = ["srv"]} [package.source] -type = "file" -url = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl" +type = "directory" +url = "../../libs/libcommon" [[package]] name = "lockfile" @@ -992,7 +993,7 @@ python-versions = "*" [metadata] lock-version = "1.1" python-versions = "3.9.15" -content-hash = "ca56fd792b28501ba816d6bc44df28efacaf8ea43839c77d39c920c3c0e8913a" +content-hash = "95fb7ecb3a6c7b3afb6cebd2e90a1f51a56ff86f934b17b748b396347a8d26fc" [metadata.files] anyio = [ @@ -1248,9 +1249,7 @@ isort = [ {file = "isort-5.11.4-py3-none-any.whl", hash = "sha256:c033fd0edb91000a7f09527fe5c75321878f98322a77ddcc81adbd83724afb7b"}, {file = "isort-5.11.4.tar.gz", hash = "sha256:6db30c5ded9815d813932c04c2f85a360bcdd35fed496f4d8f35495ef0a261b6"}, ] -libcommon = [ - {file = "libcommon-0.6.8-py3-none-any.whl", hash = "sha256:28ae018d0416b1ebdbb8fc238157eb01f84608cd3880d23e9a7eef1f73c46908"}, -] +libcommon = [] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index b29afef448..8ea278cbf4 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [tool.poetry.dependencies] environs = "^9.5.0" -libcommon = { path = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl", develop = false } +libcommon = {path = "../../libs/libcommon", develop = true} python = "3.9.15" starlette = "^0.16.0" starlette-prometheus = "^0.9.0" diff --git a/services/api/Dockerfile b/services/api/Dockerfile index 4201e26e78..33654934ee 100644 --- a/services/api/Dockerfile +++ b/services/api/Dockerfile @@ -23,7 +23,7 @@ RUN pip install --no-cache-dir "poetry==$POETRY_VERSION" WORKDIR /src COPY services/api/poetry.lock ./services/api/poetry.lock COPY services/api/pyproject.toml ./services/api/pyproject.toml -COPY libs/libcommon/dist ./libs/libcommon/dist +COPY libs/libcommon ./libs/libcommon WORKDIR /src/services/api/ RUN poetry install --no-cache COPY services/api/src ./src diff --git a/services/api/poetry.lock b/services/api/poetry.lock index d48e8770ee..415b552ef3 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -371,21 +371,22 @@ version = "0.6.8" description = "Library for utils, common to all the services and workers" category = "main" optional = false -python-versions = "==3.9.15" +python-versions = "3.9.15" +develop = true [package.dependencies] -appdirs = ">=1.4.4,<2.0.0" -environs = ">=9.5.0,<10.0.0" -huggingface-hub = ">=0.11.0,<0.12.0" +appdirs = "^1.4.4" +environs = "^9.5.0" +huggingface-hub = "^0.11.0" mongo-types = "0.15.1" -mongoengine = ">=0.24.1,<0.25.0" -orjson = ">=3.6.4,<4.0.0" -psutil = ">=5.9.2,<6.0.0" -pymongo = {version = ">=3.13.0,<4.0.0", extras = ["srv"]} +mongoengine = "^0.24.1" +orjson = "^3.6.4" +psutil = "^5.9.2" +pymongo = {version = "^3.13.0", extras = ["srv"]} [package.source] -type = "file" -url = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl" +type = "directory" +url = "../../libs/libcommon" [[package]] name = "lockfile" @@ -1026,7 +1027,7 @@ watchdog = ["watchdog"] [metadata] lock-version = "1.1" python-versions = "3.9.15" -content-hash = "9fc9f9e46fd5dc0a83603f51225495b7d9b86ff64f6b1481d379a498fa44d522" +content-hash = "e813683c7834053c461b39218802e309a1b4d6c69b179772c179bbfa9be292e4" [metadata.files] anyio = [ @@ -1286,9 +1287,7 @@ jsonschema = [ {file = "jsonschema-4.17.3-py3-none-any.whl", hash = "sha256:a870ad254da1a8ca84b6a2905cac29d265f805acc57af304784962a2aa6508f6"}, {file = "jsonschema-4.17.3.tar.gz", hash = "sha256:0f864437ab8b6076ba6707453ef8f98a6a0d512a80e93f8abdb676f737ecb60d"}, ] -libcommon = [ - {file = "libcommon-0.6.8-py3-none-any.whl", hash = "sha256:28ae018d0416b1ebdbb8fc238157eb01f84608cd3880d23e9a7eef1f73c46908"}, -] +libcommon = [] lockfile = [ {file = "lockfile-0.12.2-py2.py3-none-any.whl", hash = "sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa"}, {file = "lockfile-0.12.2.tar.gz", hash = "sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 880a093ec2..26dccaea10 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" environs = "^9.5.0" huggingface-hub = "^0.11.0" jsonschema = "^4.16.0" -libcommon = { path = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl", develop = false } +libcommon = {path = "../../libs/libcommon", develop = true} python = "3.9.15" starlette = "^0.16.0" starlette-prometheus = "^0.9.0" diff --git a/tools/Python.mk b/tools/Python.mk index d03e020588..f950eac5c6 100644 --- a/tools/Python.mk +++ b/tools/Python.mk @@ -10,10 +10,6 @@ lock: poetry lock poetry install -.PHONY: build -build: - poetry build - # Check that source code meets quality standards + security .PHONY: quality quality: diff --git a/workers/datasets_based/Dockerfile b/workers/datasets_based/Dockerfile index 39ee8c95b7..a8718326ab 100644 --- a/workers/datasets_based/Dockerfile +++ b/workers/datasets_based/Dockerfile @@ -27,7 +27,7 @@ WORKDIR /src COPY workers/datasets_based/vendors ./workers/datasets_based/vendors/ COPY workers/datasets_based/poetry.lock ./workers/datasets_based/poetry.lock COPY workers/datasets_based/pyproject.toml ./workers/datasets_based/pyproject.toml -COPY libs/libcommon/dist ./libs/libcommon/dist +COPY libs/libcommon ./libs/libcommon WORKDIR /src/workers/datasets_based/ RUN poetry install --no-cache COPY workers/datasets_based/src ./src diff --git a/workers/datasets_based/poetry.lock b/workers/datasets_based/poetry.lock index cb5ced04a1..46ab4ca18e 100644 --- a/workers/datasets_based/poetry.lock +++ b/workers/datasets_based/poetry.lock @@ -877,21 +877,22 @@ version = "0.6.8" description = "Library for utils, common to all the services and workers" category = "main" optional = false -python-versions = "==3.9.15" +python-versions = "3.9.15" +develop = true [package.dependencies] -appdirs = ">=1.4.4,<2.0.0" -environs = ">=9.5.0,<10.0.0" -huggingface-hub = ">=0.11.0,<0.12.0" +appdirs = "^1.4.4" +environs = "^9.5.0" +huggingface-hub = "^0.11.0" mongo-types = "0.15.1" -mongoengine = ">=0.24.1,<0.25.0" -orjson = ">=3.6.4,<4.0.0" -psutil = ">=5.9.2,<6.0.0" -pymongo = {version = ">=3.13.0,<4.0.0", extras = ["srv"]} +mongoengine = "^0.24.1" +orjson = "^3.6.4" +psutil = "^5.9.2" +pymongo = {version = "^3.13.0", extras = ["srv"]} [package.source] -type = "file" -url = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl" +type = "directory" +url = "../../libs/libcommon" [[package]] name = "librosa" @@ -2479,7 +2480,7 @@ cffi = ["cffi (>=1.11)"] [metadata] lock-version = "1.1" python-versions = "3.9.15" -content-hash = "9f6679bc511c61a3619696cafabd8c404ca8cecee25d1e23ea7903daea4cca3e" +content-hash = "ef513d79226c862daee0ed3bd16d812090441ea0cd41d93e82f185dbe765b0a6" [metadata.files] absl-py = [ @@ -3382,9 +3383,7 @@ libclang = [ {file = "libclang-15.0.6.1-py2.py3-none-win_arm64.whl", hash = "sha256:687d8549c110c700fece58dd87727421d0710fdd111aa7eecb01faf8e3f50d4e"}, {file = "libclang-15.0.6.1.tar.gz", hash = "sha256:a1a8fe038af2962c787c5bac81bfa4b82bb8e279e61e70cc934c10f6e20c73ec"}, ] -libcommon = [ - {file = "libcommon-0.6.8-py3-none-any.whl", hash = "sha256:28ae018d0416b1ebdbb8fc238157eb01f84608cd3880d23e9a7eef1f73c46908"}, -] +libcommon = [] librosa = [ {file = "librosa-0.9.2-py3-none-any.whl", hash = "sha256:322a813e6d37af9fbc369e6a637dcf5fdc5c6925ce806a0d27c68de61a81350f"}, {file = "librosa-0.9.2.tar.gz", hash = "sha256:5b576b5efdce428e90bc988bdd5a953d12a727e5f931f30d74c53b63abbe3c89"}, diff --git a/workers/datasets_based/pyproject.toml b/workers/datasets_based/pyproject.toml index 072f7354de..9fee70834c 100644 --- a/workers/datasets_based/pyproject.toml +++ b/workers/datasets_based/pyproject.toml @@ -17,7 +17,7 @@ gdown = "^4.2.0" huggingface-hub = "^0.11.0" kenlm = { url = "https://github.com/kpu/kenlm/archive/master.zip" } kss = "^2.6.0" -libcommon = { path = "../../libs/libcommon/dist/libcommon-0.6.8-py3-none-any.whl", develop = false } +libcommon = {path = "../../libs/libcommon", develop = true} lm-dataformat = "^0.0.20" lxml = "^4.9.1" nlp = "^0.4.0"