hash
stringlengths
40
40
authorName
stringclasses
42 values
authorEmail
stringclasses
41 values
date
timestamp[ms]date
2021-07-26 09:52:55
2025-07-18 10:19:56
subject
stringlengths
11
116
diff
stringlengths
0
987k
5aa30a677af989b1c8b30f7c8a60c30ab1a78c09
Sylvain Lesage
2022-07-22T21:21:57
fix: 🐛 remove the conflict for the admin domain bw dev and prod (#460)
diff --git a/infra/charts/datasets-server/env/dev.yaml b/infra/charts/datasets-server/env/dev.yaml index 073f2360..0a607328 100644 --- a/infra/charts/datasets-server/env/dev.yaml +++ b/infra/charts/datasets-server/env/dev.yaml @@ -16 +16,2 @@ monitoring: -apiDomain: "datasets-server.us.dev.moon.huggingface.tech" +adminDomain: "admin-datasets-server-dev.us.dev.moon.huggingface.tech" +apiDomain: "datasets-server-dev.us.dev.moon.huggingface.tech" diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 093317b4..19e440be 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -43 +43 @@ monitoring: -adminDomain: "datasets-server-admin.us.dev.moon.huggingface.tech" +adminDomain: "admin-datasets-server.us.dev.moon.huggingface.tech" diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index b01e67cc..cb1feaa2 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -32,2 +32,2 @@ monitoring: -adminDomain: "datasets-server-admin.us.dev.moon.huggingface.tech" -apiDomain: "datasets-server.us.dev.moon.huggingface.tech" +# adminDomain: "admin-datasets-server-dev.us.dev.moon.huggingface.tech" +# apiDomain: "datasets-server-dev.us.dev.moon.huggingface.tech"
9bf5df470b87a536cb1efab3c0dbd7c3b6c1a9ee
Sylvain Lesage
2022-07-22T20:22:38
feat: 🎸 move two technical endpoints from api to admin (#457)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index e3e15b70..e0968abe 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,2 +3,2 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-bfe2900", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-bfe2900", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-640cc19", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-640cc19", diff --git a/infra/charts/datasets-server/templates/admin/_container.tpl b/infra/charts/datasets-server/templates/admin/_container.tpl index 56fe6150..e1e639e8 100644 --- a/infra/charts/datasets-server/templates/admin/_container.tpl +++ b/infra/charts/datasets-server/templates/admin/_container.tpl @@ -13,0 +14,2 @@ + - name: MAX_AGE_SHORT_SECONDS + value: {{ .Values.admin.maxAgeShortSeconds | quote }} diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 36d750ce..b01e67cc 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -302,0 +303,2 @@ admin: + # Number of seconds to set in the `max-age` header on technical endpoints + maxAgeShortSeconds: "10" diff --git a/services/admin/.env.example b/services/admin/.env.example index 551882ff..ae4c3eee 100644 --- a/services/admin/.env.example +++ b/services/admin/.env.example @@ -15,0 +16,3 @@ +# Number of seconds to set in the `max-age` header on technical endpoints +# MAX_AGE_SHORT_SECONDS=10 + diff --git a/services/admin/README.md b/services/admin/README.md index 9cfb908e..2029319c 100644 --- a/services/admin/README.md +++ b/services/admin/README.md @@ -20,0 +21 @@ Set environment variables to configure the following aspects: +- `MAX_AGE_SHORT_SECONDS`: number of seconds to set in the `max-age` header on technical endpoints. Defaults to `10` (10 seconds). @@ -52,0 +54,81 @@ The admin service provides technical endpoints: +- `/cache-reports`: give detailed reports on the content of the cache +- `/pending-jobs`: give the pending jobs, classed by queue and status (waiting or started) + +### /cache-reports + +> Give detailed reports on the content of the cache + +Example: https://datasets-server.huggingface.co/cache-reports + +Method: `GET` + +Parameters: none + +Responses: + +- `200`: JSON content which the dataset cache reports, with the following structure: + +```json +{ + "/splits-next": [{ "dataset": "sent_comp", "status": "200", "error": null }], + "/first-rows": [ + { + "dataset": "sent_comp", + "config": "default", + "split": "validation", + "status": "400", + "error": { + "message": "Cannot get the first rows for the split.", + "cause_exception": "FileNotFoundError", + } + }, + { + "dataset": "sent_comp", + "config": "default", + "split": "test", + "status": "500", + "error": { + "message": "Internal error.", + } + } + ] + }, + "created_at": "2022-01-20T14:40:27Z" +} +``` + +### /pending-jobs + +> Give the pending jobs, classed by queue and status (waiting or started) + +Example: https://datasets-server.huggingface.co/pending-jobs + +Method: `GET` + +Parameters: none + +Responses: + +- `200`: JSON content with the jobs by queue and status, with the following structure: + +```json +{ + "/splits": { + "waiting": [], + "started": [] + }, + "/rows": { + "waiting": [], + "started": [] + }, + "/splits-next": { + "waiting": [], + "started": [] + }, + "/first-rows": { + "waiting": [], + "started": [] + }, + "created_at": "2022-01-20T13:59:03Z" +} +``` diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 7441552c..ba894246 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.12" +version = "0.1.13" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.13-py3-none-any.whl" @@ -1201 +1201 @@ python-versions = "3.9.6" -content-hash = "1e908640008bbf07ffe683fd4ef625eee95bd94f92641acd16892303cdf6f022" +content-hash = "cc0c0464697e5587964afd0f8ef0d208376dc2b16c71e2a9abfc54f71ebb5f19" @@ -1471 +1471 @@ libcache = [ - {file = "libcache-0.1.12-py3-none-any.whl", hash = "sha256:67b13eaf7e2fd98a9d52a72acd5d8e8a9b4943416b1a6b66bfd2ea9a921f4e60"}, + {file = "libcache-0.1.13-py3-none-any.whl", hash = "sha256:14595ef4c75207f51f999c8473e43831dbe2c1567b775bf043aa86974e76aed1"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 040ded92..d39ee440 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.13-py3-none-any.whl", develop = false } diff --git a/services/admin/src/admin/app.py b/services/admin/src/admin/app.py index 8db17216..8e0fd500 100644 --- a/services/admin/src/admin/app.py +++ b/services/admin/src/admin/app.py @@ -20,0 +21 @@ from admin.prometheus import Prometheus +from admin.routes.cache_reports import cache_reports_endpoint @@ -21,0 +23 @@ from admin.routes.healthcheck import healthcheck_endpoint +from admin.routes.pending_jobs import pending_jobs_endpoint @@ -33,0 +36,4 @@ def create_app() -> Starlette: + # used by https://observablehq.com/@huggingface/quality-assessment-of-datasets-loading + Route("/cache-reports", endpoint=cache_reports_endpoint), + # used in a browser tab to monitor the queue + Route("/pending-jobs", endpoint=pending_jobs_endpoint), diff --git a/services/admin/src/admin/config.py b/services/admin/src/admin/config.py index 4e93f40f..e4d5d8b9 100644 --- a/services/admin/src/admin/config.py +++ b/services/admin/src/admin/config.py @@ -11,0 +12 @@ from admin.constants import ( + DEFAULT_MAX_AGE_SHORT_SECONDS, @@ -24,0 +26 @@ LOG_LEVEL = get_str_value(d=os.environ, key="LOG_LEVEL", default=DEFAULT_LOG_LEV +MAX_AGE_SHORT_SECONDS = get_int_value(d=os.environ, key="MAX_AGE_SHORT_SECONDS", default=DEFAULT_MAX_AGE_SHORT_SECONDS) diff --git a/services/admin/src/admin/constants.py b/services/admin/src/admin/constants.py index 6d6418fc..26307303 100644 --- a/services/admin/src/admin/constants.py +++ b/services/admin/src/admin/constants.py @@ -5,0 +6 @@ DEFAULT_LOG_LEVEL: str = "INFO" +DEFAULT_MAX_AGE_SHORT_SECONDS: int = 10 # 10 seconds diff --git a/services/admin/src/admin/routes/_utils.py b/services/admin/src/admin/routes/_utils.py new file mode 100644 index 00000000..9f55980f --- /dev/null +++ b/services/admin/src/admin/routes/_utils.py @@ -0,0 +1,14 @@ +from typing import Any + +from libutils.utils import orjson_dumps +from starlette.responses import JSONResponse, Response + + +class OrjsonResponse(JSONResponse): + def render(self, content: Any) -> bytes: + return orjson_dumps(content) + + +def get_response(content: Any, status_code: int = 200, max_age: int = 0) -> Response: + headers = {"Cache-Control": f"max-age={max_age}"} if max_age > 0 else {"Cache-Control": "no-store"} + return OrjsonResponse(content, status_code=status_code, headers=headers) diff --git a/services/api/src/api/routes/cache_reports.py b/services/admin/src/admin/routes/cache_reports.py similarity index 87% rename from services/api/src/api/routes/cache_reports.py rename to services/admin/src/admin/routes/cache_reports.py index dfd03ab2..51f48e14 100644 --- a/services/api/src/api/routes/cache_reports.py +++ b/services/admin/src/admin/routes/cache_reports.py @@ -11,2 +11,2 @@ from starlette.responses import Response -from api.config import MAX_AGE_SHORT_SECONDS -from api.routes._utils import get_response +from admin.config import MAX_AGE_SHORT_SECONDS +from admin.routes._utils import get_response diff --git a/services/api/src/api/routes/pending_jobs.py b/services/admin/src/admin/routes/pending_jobs.py similarity index 90% rename from services/api/src/api/routes/pending_jobs.py rename to services/admin/src/admin/routes/pending_jobs.py index d46603e2..baa23ae6 100644 --- a/services/api/src/api/routes/pending_jobs.py +++ b/services/admin/src/admin/routes/pending_jobs.py @@ -13,2 +13,2 @@ from starlette.responses import Response -from api.config import MAX_AGE_SHORT_SECONDS -from api.routes._utils import get_response +from admin.config import MAX_AGE_SHORT_SECONDS +from admin.routes._utils import get_response diff --git a/services/admin/tests/test_app.py b/services/admin/tests/test_app.py index 48acd4b9..9618efdf 100644 --- a/services/admin/tests/test_app.py +++ b/services/admin/tests/test_app.py @@ -53,0 +54,18 @@ def test_metrics(client: TestClient) -> None: + + +def test_pending_jobs(client: TestClient) -> None: + response = client.get("/pending-jobs") + assert response.status_code == 200 + json = response.json() + for e in ["/splits", "/rows", "/splits-next", "/first-rows"]: + assert json[e] == {"waiting": [], "started": []} + assert "created_at" in json + + +def test_cache_reports(client: TestClient) -> None: + response = client.get("/cache-reports") + assert response.status_code == 200 + json = response.json() + assert json["/splits-next"] == [] + assert json["/first-rows"] == [] + assert "created_at" in json diff --git a/services/api/README.md b/services/api/README.md index 09e0bdcc..e8656d64 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -58,43 +57,0 @@ Responses: -### /cache-reports - -> Give detailed reports on the content of the cache - -Example: https://datasets-server.huggingface.co/cache-reports - -Method: `GET` - -Parameters: none - -Responses: - -- `200`: JSON content which the dataset cache reports, with the following structure: - -```json -{ - "/splits-next": [{ "dataset": "sent_comp", "status": "200", "error": null }], - "/first-rows": [ - { - "dataset": "sent_comp", - "config": "default", - "split": "validation", - "status": "400", - "error": { - "message": "Cannot get the first rows for the split.", - "cause_exception": "FileNotFoundError", - } - }, - { - "dataset": "sent_comp", - "config": "default", - "split": "test", - "status": "500", - "error": { - "message": "Internal error.", - } - } - ] - }, - "created_at": "2022-01-20T14:40:27Z" -} -``` - @@ -144,36 +100,0 @@ Responses: -### /pending-jobs - -> Give the pending jobs, classed by queue and status (waiting or started) - -Example: https://datasets-server.huggingface.co/pending-jobs - -Method: `GET` - -Parameters: none - -Responses: - -- `200`: JSON content with the jobs by queue and status, with the following structure: - -```json -{ - "/splits": { - "waiting": [], - "started": [] - }, - "/rows": { - "waiting": [], - "started": [] - }, - "/splits-next": { - "waiting": [], - "started": [] - }, - "/first-rows": { - "waiting": [], - "started": [] - }, - "created_at": "2022-01-20T13:59:03Z" -} -``` - diff --git a/services/api/src/api/app.py b/services/api/src/api/app.py index dd1bad3a..1895ad86 100644 --- a/services/api/src/api/app.py +++ b/services/api/src/api/app.py @@ -26 +25,0 @@ from api.prometheus import Prometheus -from api.routes.cache_reports import cache_reports_endpoint @@ -29 +27,0 @@ from api.routes.healthcheck import healthcheck_endpoint -from api.routes.pending_jobs import pending_jobs_endpoint @@ -64,4 +61,0 @@ def create_app() -> Starlette: - # only used by https://observablehq.com/@huggingface/quality-assessment-of-datasets-loading - Route("/cache-reports", endpoint=cache_reports_endpoint), - # used in a browser tab to monitor the queue - Route("/pending-jobs", endpoint=pending_jobs_endpoint), diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index 60ca464e..45e45e18 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -400,20 +399,0 @@ def test_metrics(client: TestClient) -> None: - - -def test_pending_jobs(client: TestClient) -> None: - response = client.get("/pending-jobs") - assert response.status_code == 200 - json = response.json() - for e in ["/splits", "/rows", "/splits-next", "/first-rows"]: - assert json[e] == {"waiting": [], "started": []} - assert "created_at" in json - - -def test_cache_reports(client: TestClient) -> None: - response = client.get("/cache-reports") - assert response.status_code == 200 - json = response.json() - assert json["/splits-next"] == [{"dataset": "acronym_identification", "error": None, "status": "200"}] - assert json["/first-rows"] == [ - {"dataset": "acronym_identification", "config": "default", "split": "train", "status": "200", "error": None} - ] - assert "created_at" in json
39243767d97fba78b6ec8a28d02b538b89dc7a3a
Sylvain Lesage
2022-07-22T19:36:26
feat: 🎸 update docker images (#456)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index edad860d..e3e15b70 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,2 +3,2 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-b9b0a95", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-b9b0a95", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-bfe2900", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-bfe2900",
bfe290023ce524c79dafe0a0d2278d594ea3b8ba
Sylvain Lesage
2022-07-22T19:29:26
Improve technical routes response (#454)
diff --git a/libs/libcache/dist/libcache-0.1.13-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.13-py3-none-any.whl new file mode 100644 index 00000000..838d9345 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.13-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.13.tar.gz b/libs/libcache/dist/libcache-0.1.13.tar.gz new file mode 100644 index 00000000..8c25b4f7 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.13.tar.gz differ diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 1791137e..b35ce55f 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.12" +version = "0.1.13" diff --git a/libs/libcache/src/libcache/simple_cache.py b/libs/libcache/src/libcache/simple_cache.py index 36a57331..90612f98 100644 --- a/libs/libcache/src/libcache/simple_cache.py +++ b/libs/libcache/src/libcache/simple_cache.py @@ -5 +5 @@ from datetime import datetime, timezone -from typing import Dict, Generic, List, Optional, Tuple, Type, TypedDict, TypeVar +from typing import Dict, Generic, List, Optional, Tuple, Type, TypedDict, TypeVar, Union @@ -199,0 +200,3 @@ def get_valid_dataset_names() -> List[str]: +# /pending-jobs endpoint + + @@ -226,0 +230,60 @@ def get_first_rows_responses_count_by_status() -> CountByHTTPStatus: +# /cache-reports endpoints + + +class _ErrorReport(TypedDict): + message: str + + +class ErrorReport(_ErrorReport, total=False): + cause_exception: str + + +class SplitsResponseReport(TypedDict): + dataset: str + status: str + error: Optional[ErrorReport] + + +class FirstRowsResponseReport(TypedDict): + dataset: str + config: str + split: str + status: str + error: Optional[ErrorReport] + + +def get_error(object: Union[SplitsResponse, FirstRowsResponse]) -> Optional[ErrorReport]: + if object.http_status == HTTPStatus.OK: + return None + if "message" not in object.response: + raise ValueError("Missing message in error response") + report: ErrorReport = {"message": object.response["message"]} + if "cause_exception" in object.response: + report["cause_exception"] = object.response["cause_exception"] + return report + + +def get_splits_response_reports() -> List[SplitsResponseReport]: + return [ + { + "dataset": response.dataset_name, + "status": response.http_status.value, + "error": get_error(response), + } + for response in SplitsResponse.objects() + ] + + +def get_first_rows_response_reports() -> List[FirstRowsResponseReport]: + return [ + { + "dataset": response.dataset_name, + "config": response.config_name, + "split": response.split_name, + "status": response.http_status.value, + "error": get_error(response), + } + for response in FirstRowsResponse.objects() + ] + + diff --git a/libs/libcache/tests/test_simple_cache.py b/libs/libcache/tests/test_simple_cache.py index 84c6a1a2..70dcea4f 100644 --- a/libs/libcache/tests/test_simple_cache.py +++ b/libs/libcache/tests/test_simple_cache.py @@ -11,0 +12 @@ from libcache.simple_cache import ( + get_first_rows_response_reports, @@ -13,0 +15 @@ from libcache.simple_cache import ( + get_splits_response_reports, @@ -189,0 +192,89 @@ def test_count_by_status() -> None: + + +def test_reports() -> None: + assert get_splits_response_reports() == [] + upsert_splits_response( + "a", + {"key": "value"}, + HTTPStatus.OK, + ) + upsert_splits_response( + "b", + { + "status_code": 400, + "message": "Cannot get the split names for the dataset.", + "cause_exception": "FileNotFoundError", + "cause_message": ( + "Couldn't find a dataset script at /src/services/worker/wikimedia/timit_asr/timit_asr.py or any data" + " file in the same directory. Couldn't find 'wikimedia/timit_asr' on the Hugging Face Hub either:" + " FileNotFoundError: Dataset 'wikimedia/timit_asr' doesn't exist on the Hub. If the repo is private," + " make sure you are authenticated with `use_auth_token=True` after logging in with `huggingface-cli" + " login`." + ), + "cause_traceback": [ + "Traceback (most recent call last):\n", + ' File "/src/services/worker/src/worker/models/dataset.py", line 17, in' + " get_dataset_split_full_names\n for config_name in get_dataset_config_names(dataset_name," + " use_auth_token=hf_token)\n", + ' File "/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py", line 289, in' + " get_dataset_config_names\n dataset_module = dataset_module_factory(\n", + ' File "/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py", line 1242, in' + " dataset_module_factory\n raise FileNotFoundError(\n", + "FileNotFoundError: Couldn't find a dataset script at" + " /src/services/worker/wikimedia/timit_asr/timit_asr.py or any data file in the same directory." + " Couldn't find 'wikimedia/timit_asr' on the Hugging Face Hub either: FileNotFoundError: Dataset" + " 'wikimedia/timit_asr' doesn't exist on the Hub. If the repo is private, make sure you are" + " authenticated with `use_auth_token=True` after logging in with `huggingface-cli login`.\n", + ], + }, + HTTPStatus.BAD_REQUEST, + ) + upsert_splits_response( + "c", + { + "status_code": 500, + "message": "cannot write mode RGBA as JPEG", + }, + HTTPStatus.INTERNAL_SERVER_ERROR, + { + "status_code": 500, + "message": "cannot write mode RGBA as JPEG", + "cause_exception": "FileNotFoundError", + "cause_message": ( + "Couldn't find a dataset script at /src/services/worker/wikimedia/timit_asr/timit_asr.py or any data" + " file in the same directory. Couldn't find 'wikimedia/timit_asr' on the Hugging Face Hub either:" + " FileNotFoundError: Dataset 'wikimedia/timit_asr' doesn't exist on the Hub. If the repo is private," + " make sure you are authenticated with `use_auth_token=True` after logging in with `huggingface-cli" + " login`." + ), + "cause_traceback": [ + "Traceback (most recent call last):\n", + ' File "/src/services/worker/src/worker/models/dataset.py", line 17, in' + " get_dataset_split_full_names\n for config_name in get_dataset_config_names(dataset_name," + " use_auth_token=hf_token)\n", + ' File "/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py", line 289, in' + " get_dataset_config_names\n dataset_module = dataset_module_factory(\n", + ' File "/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py", line 1242, in' + " dataset_module_factory\n raise FileNotFoundError(\n", + "FileNotFoundError: Couldn't find a dataset script at" + " /src/services/worker/wikimedia/timit_asr/timit_asr.py or any data file in the same directory." + " Couldn't find 'wikimedia/timit_asr' on the Hugging Face Hub either: FileNotFoundError: Dataset" + " 'wikimedia/timit_asr' doesn't exist on the Hub. If the repo is private, make sure you are" + " authenticated with `use_auth_token=True` after logging in with `huggingface-cli login`.\n", + ], + }, + ) + assert get_splits_response_reports() == [ + {"dataset": "a", "error": None, "status": "200"}, + { + "dataset": "b", + "error": { + "cause_exception": "FileNotFoundError", + "message": "Cannot get the split names for the dataset.", + }, + "status": "400", + }, + {"dataset": "c", "error": {"message": "cannot write mode RGBA as JPEG"}, "status": "500"}, + ] + + assert get_first_rows_response_reports() == [] diff --git a/services/admin/src/admin/scripts/refresh_cache.py b/services/admin/src/admin/scripts/refresh_cache.py index 95c37a66..e390de88 100644 --- a/services/admin/src/admin/scripts/refresh_cache.py +++ b/services/admin/src/admin/scripts/refresh_cache.py @@ -16 +16 @@ def get_hf_dataset_names(): - return [str(dataset.id) for dataset in list_datasets(full=True)] + return [str(dataset.id) for dataset in list_datasets(full=False)] diff --git a/services/admin/src/admin/scripts/warm_cache.py b/services/admin/src/admin/scripts/warm_cache.py index 84299d53..c24b6b12 100644 --- a/services/admin/src/admin/scripts/warm_cache.py +++ b/services/admin/src/admin/scripts/warm_cache.py @@ -26 +26 @@ def get_hf_dataset_names(): - return [str(dataset.id) for dataset in list_datasets(full=True)] + return [str(dataset.id) for dataset in list_datasets(full=False)] diff --git a/services/api/README.md b/services/api/README.md index 47998f2d..09e0bdcc 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -74,17 +74,2 @@ Responses: - "datasets": { - "empty": [], - "error": [], - "stale": [], - "valid": [{ "dataset": "sent_comp", "status": "VALID", "error": null }] - }, - "splits": { - "empty": [ - { - "dataset": "sent_comp", - "config": "default", - "split": "train", - "status": "EMPTY", - "error": null - } - ], - "error": [ + "/splits-next": [{ "dataset": "sent_comp", "status": "200", "error": null }], + "/first-rows": [ @@ -95 +80 @@ Responses: - "status": "error", + "status": "400", @@ -97,2 +81,0 @@ Responses: - "status_code": 400, - "exception": "Status400Error", @@ -101,15 +84,9 @@ Responses: - "cause_message": "[Errno 2] No such file or directory: 'https://github.com/google-research-datasets/sentence-compression/raw/master/data/comp-data.eval.json.gz'", - "cause_traceback": [ - "Traceback (most recent call last):\n", - " File \"/home/slesage/hf/datasets-server/src/datasets_server/models/row.py\", line 61, in get_rows\n rows = extract_rows(dataset_name, config_name, split_name, num_rows, hf_token)\n", - " File \"/home/slesage/hf/datasets-server/src/datasets_server/models/row.py\", line 32, in decorator\n return func(*args, **kwargs)\n", - " File \"/home/slesage/hf/datasets-server/src/datasets_server/models/row.py\", line 55, in extract_rows\n return list(iterable_dataset.take(num_rows))\n", - " File \"/home/slesage/hf/datasets-server/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 341, in __iter__\n for key, example in self._iter():\n", - " File \"/home/slesage/hf/datasets-server/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 338, in _iter\n yield from ex_iterable\n", - " File \"/home/slesage/hf/datasets-server/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 273, in __iter__\n yield from islice(self.ex_iterable, self.n)\n", - " File \"/home/slesage/hf/datasets-server/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 78, in __iter__\n for key, example in self.generate_examples_fn(**self.kwargs):\n", - " File \"/home/slesage/.cache/huggingface/modules/datasets_modules/datasets/sent_comp/512501fef5db888ec620cb9e4943420ea7c7c244c60de9222fb50bca1232f4b5/sent_comp.py\", line 136, in _generate_examples\n with gzip.open(filepath, mode=\"rt\", encoding=\"utf-8\") as f:\n", - " File \"/home/slesage/.pyenv/versions/3.9.6/lib/python3.9/gzip.py\", line 58, in open\n binary_file = GzipFile(filename, gz_mode, compresslevel)\n", - " File \"/home/slesage/.pyenv/versions/3.9.6/lib/python3.9/gzip.py\", line 173, in __init__\n fileobj = self.myfileobj = builtins.open(filename, mode or 'rb')\n", - "FileNotFoundError: [Errno 2] No such file or directory: 'https://github.com/google-research-datasets/sentence-compression/raw/master/data/comp-data.eval.json.gz'\n" - ] + } + }, + { + "dataset": "sent_comp", + "config": "default", + "split": "test", + "status": "500", + "error": { + "message": "Internal error.", @@ -118,3 +95 @@ Responses: - ], - "stale": [], - "valid": [] + ] @@ -126,2 +100,0 @@ Responses: -Beware: a "dataset" is considered valid if it has fetched correctly the configs and splits. The splits themselves can have errors (ie: the rows or columns might have errors) - @@ -171 +144 @@ Responses: -### /hf-datasets-count-by-cache-status +### /pending-jobs @@ -173 +146 @@ Responses: -> Give statistics about the datasets of the hub +> Give the pending jobs, classed by queue and status (waiting or started) @@ -175 +148 @@ Responses: -Example: https://datasets-server.huggingface.co/hf-datasets-count-by-cache-status +Example: https://datasets-server.huggingface.co/pending-jobs @@ -183 +156 @@ Responses: -- `200`: JSON content which gives statistics about the status of the public datasets of the Hub, split by canonical or community, with the following structure: +- `200`: JSON content with the jobs by queue and status, with the following structure: @@ -187,37 +160 @@ Responses: - "canonical": { - "valid": 0, - "error": 0, - "missing": 1 - }, - "community": { - "valid": 0, - "error": 0, - "missing": 1 - }, - "created_at": "2022-01-20T13:52:05Z" -} -``` - -The meaning is the following: - -- "valid": the list of splits and the 100 first rows of every split are available (maybe stale) -- "error": the list of splits could not be fetched, or the rows could not be fetched for some splits -- "missing": the list of splits is missing, or the rows are missing for some splits - -### /queue-dump - -> Give the queue entries, classed by status - -Example: https://datasets-server.huggingface.co/queue-dump - -Method: `GET` - -Parameters: none - -Responses: - -- `200`: JSON content which the queue content, by status, with the following structure: - -```json -{ - "datasets": { + "/splits": { @@ -225,12 +162 @@ Responses: - "started": [], - "success": [ - { - "dataset_name": "glue", - "status": "SUCCESS", - "created_at": "2022-01-20T13:48:06.705000", - "started_at": "2022-01-20T13:48:21.615000", - "finished_at": "2022-01-20T13:48:27.898000" - } - ], - "error": [], - "cancelled": [] + "started": [] @@ -238 +164 @@ Responses: - "splits": { + "/rows": { @@ -240,14 +166 @@ Responses: - "started": [], - "success": [], - "error": [], - "cancelled": [ - { - "dataset_name": "glue", - "config_name": "cola", - "split_name": "test", - "status": "CANCELLED", - "created_at": "2022-01-20T13:48:27.846000", - "started_at": null, - "finished_at": "2022-01-20T13:51:51.411000" - } - ] + "started": [] @@ -255,21 +168 @@ Responses: - "created_at": "2022-01-20T13:59:03Z" -} -``` - -### /queue-dump-waiting-started - -> Give the queue entries, classed by status, only for "waiting" and "started" statuses - -Example: https://datasets-server.huggingface.co/queue-dump-waiting-started - -Method: `GET` - -Parameters: none - -Responses: - -- `200`: JSON content which the queue content, by status, with the following structure: - -```json -{ - "datasets": { + "/splits-next": { @@ -279 +172 @@ Responses: - "splits": { + "/first-rows": { @@ -327,98 +219,0 @@ for model in ${MODELS[@]}; do curl -X POST https://datasets-server.huggingface.c -### /refresh-split - -> Refresh the cache of rows and columns of a split - -Example: https://datasets-server.huggingface.co/refresh-split - -Method: `POST` - -Body: - -```json -{ - "dataset": "glue", - "config": "ax", - "split": "test" -} -``` - -Responses: - -- `200`: JSON content with the following structure: - - ```json - { - "status": "ok" - } - ``` - -- `400`: the payload is erroneous, or a 400 error raised during the cache operation -- `500`: application error - -### /hf_datasets - -> Lists the HuggingFace [datasets](https://huggingface.co/docs/datasets/loading_datasets.html#selecting-a-configuration): canonical and community - -Example: https://datasets-server.huggingface.co/hf_datasets - -Method: `GET` - -Parameters: none - -Responses: - -- `200`: JSON content with the following structure: - - ```json - { - "datasets": [ - { - "id": "acronym_identification", - "tags": [ - "annotations_creators:expert-generated", - "language_creators:found", - "languages:en", - "licenses:mit", - "multilinguality:monolingual", - "size_categories:10K<n<100K", - "source_datasets:original", - "task_categories:structure-prediction", - "task_ids:structure-prediction-other-acronym-identification" - ], - "citation": "@inproceedings{veyseh-et-al-2020-what,\n title={{What Does This Acronym Mean? Introducing a New Dataset for Acronym Identification and Disambiguation}},\n author={Amir Pouran Ben Veyseh and Franck Dernoncourt and Quan Hung Tran and Thien Huu Nguyen},\n year={2020},\n booktitle={Proceedings of COLING},\n link={https://arxiv.org/pdf/2010.14678v1.pdf}\n}", - "description": "Acronym identification training and development sets for the acronym identification task at SDU@AAAI-21.", - "paperswithcode_id": "acronym-identification", - "downloads": 5174 - }, - { - "id": "aeslc", - "tags": ["languages:en"], - "citation": "@misc{zhang2019email,\n title={This Email Could Save Your Life: Introducing the Task of Email Subject Line Generation},\n author={Rui Zhang and Joel Tetreault},\n year={2019},\n eprint={1906.03497},\n archivePrefix={arXiv},\n primaryClass={cs.CL}\n}", - "description": "A collection of email messages of employees in the Enron Corporation.\n\nThere are two features:\n - email_body: email body text.\n - subject_line: email subject text.", - "paperswithcode_id": "aeslc", - "downloads": 3053 - }, - { - "id": "afrikaans_ner_corpus", - "tags": [ - "annotations_creators:expert-generated", - "language_creators:expert-generated", - "languages:af", - "licenses:other-Creative Commons Attribution 2.5 South Africa License", - "multilinguality:monolingual", - "size_categories:1K<n<10K", - "source_datasets:original", - "task_categories:structure-prediction", - "task_ids:named-entity-recognition" - ], - "citation": "@inproceedings{afrikaans_ner_corpus,\n author = {\tGerhard van Huyssteen and\n Martin Puttkammer and\n E.B. Trollip and\n J.C. Liversage and\n Roald Eiselen},\n title = {NCHLT Afrikaans Named Entity Annotated Corpus},\n booktitle = {Eiselen, R. 2016. Government domain named entity recognition for South African languages. Proceedings of the 10th Language Resource and Evaluation Conference, Portorož, Slovenia.},\n year = {2016},\n url = {https://repo.sadilar.org/handle/20.500.12185/299},\n}", - "description": "Named entity annotated data from the NCHLT Text Resource Development: Phase II Project, annotated with PERSON, LOCATION, ORGANISATION and MISCELLANEOUS tags.", - "paperswithcode_id": null, - "downloads": 229 - } - ] - } - ``` - -- `500`: application error - diff --git a/services/api/poetry.lock b/services/api/poetry.lock index e272aff3..3f43c0ab 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.12" +version = "0.1.13" @@ -469 +469 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.13-py3-none-any.whl" @@ -1200 +1200 @@ python-versions = "3.9.6" -content-hash = "f7fdfbfc797d2bd226d55686bd86e72a4a869259a3b61e25de312b72ef2d5361" +content-hash = "d4be102f2a8409c78e84c7b8923669e16c36ea51b2c90796f0df95f67e576855" @@ -1470 +1470 @@ libcache = [ - {file = "libcache-0.1.12-py3-none-any.whl", hash = "sha256:67b13eaf7e2fd98a9d52a72acd5d8e8a9b4943416b1a6b66bfd2ea9a921f4e60"}, + {file = "libcache-0.1.13-py3-none-any.whl", hash = "sha256:14595ef4c75207f51f999c8473e43831dbe2c1567b775bf043aa86974e76aed1"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 748f32dc..36846bdd 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.13-py3-none-any.whl", develop = false } diff --git a/services/api/src/api/app.py b/services/api/src/api/app.py index d19e5cf0..dd1bad3a 100644 --- a/services/api/src/api/app.py +++ b/services/api/src/api/app.py @@ -0,0 +1,2 @@ +from typing import List + @@ -9 +11 @@ from starlette.middleware.gzip import GZipMiddleware -from starlette.routing import Mount, Route +from starlette.routing import BaseRoute, Mount, Route @@ -27,9 +29 @@ from api.routes.healthcheck import healthcheck_endpoint -from api.routes.hf_datasets import ( - hf_datasets_count_by_cache_status_endpoint, - hf_datasets_endpoint, -) -from api.routes.queue_dump import ( - queue_dump_endpoint, - queue_dump_waiting_started_endpoint, -) -from api.routes.refresh_split import refresh_split_endpoint +from api.routes.pending_jobs import pending_jobs_endpoint @@ -51,4 +45 @@ def create_app() -> Starlette: - routes = [ - Mount("/assets", app=StaticFiles(directory=init_assets_dir(ASSETS_DIRECTORY), check_dir=True), name="assets"), - Route("/cache-reports", endpoint=cache_reports_endpoint), - Route("/first-rows", endpoint=first_rows_endpoint), + documented: List[BaseRoute] = [ @@ -56,7 +47,5 @@ def create_app() -> Starlette: - Route("/hf_datasets", endpoint=hf_datasets_endpoint), - Route("/hf-datasets-count-by-cache-status", endpoint=hf_datasets_count_by_cache_status_endpoint), - Route("/is-valid", endpoint=is_valid_endpoint), - Route("/metrics", endpoint=prometheus.endpoint), - Route("/queue-dump-waiting-started", endpoint=queue_dump_waiting_started_endpoint), - Route("/queue-dump", endpoint=queue_dump_endpoint), - Route("/refresh-split", endpoint=refresh_split_endpoint, methods=["POST"]), + Route("/valid", endpoint=valid_datasets_endpoint), + Route("/first-rows", endpoint=first_rows_endpoint), + Route("/splits-next", endpoint=splits_endpoint_next), + ] + to_deprecate: List[BaseRoute] = [ @@ -65,2 +54,7 @@ def create_app() -> Starlette: - Route("/splits-next", endpoint=splits_endpoint_next), - Route("/valid", endpoint=valid_datasets_endpoint), + ] + to_document: List[BaseRoute] = [ + # called by https://github.com/huggingface/model-evaluator + Route("/is-valid", endpoint=is_valid_endpoint), + ] + to_protect: List[BaseRoute] = [ + # called by the Hub webhooks @@ -67,0 +62,10 @@ def create_app() -> Starlette: + # called by Prometheus + Route("/metrics", endpoint=prometheus.endpoint), + # only used by https://observablehq.com/@huggingface/quality-assessment-of-datasets-loading + Route("/cache-reports", endpoint=cache_reports_endpoint), + # used in a browser tab to monitor the queue + Route("/pending-jobs", endpoint=pending_jobs_endpoint), + ] + for_development_only: List[BaseRoute] = [ + # it can only be accessed in development. In production the reverse-proxy serves the assets + Mount("/assets", app=StaticFiles(directory=init_assets_dir(ASSETS_DIRECTORY), check_dir=True), name="assets"), @@ -68,0 +73 @@ def create_app() -> Starlette: + routes: List[BaseRoute] = documented + to_deprecate + to_document + to_protect + for_development_only diff --git a/services/api/src/api/hf_dataset.py b/services/api/src/api/hf_dataset.py deleted file mode 100644 index f202d638..00000000 --- a/services/api/src/api/hf_dataset.py +++ /dev/null @@ -1,35 +0,0 @@ -import logging -from typing import List, TypedDict, Union - -from huggingface_hub import list_datasets # type: ignore - -logger = logging.getLogger(__name__) - - -class HFDataset(TypedDict): - id: str - tags: List[str] - citation: Union[str, None] - description: Union[str, None] - paperswithcode_id: Union[str, None] - downloads: Union[int, None] - - -def get_hf_datasets() -> List[HFDataset]: - # If an exception is raised, we let it propagate - datasets = list_datasets(full=True) - return [ - { - "id": str(dataset.id), - "tags": [str(tag) for tag in getattr(dataset, "tags", [])], - "citation": getattr(dataset, "citation", None), - "description": getattr(dataset, "description", None), - "paperswithcode_id": getattr(dataset, "paperswithcode_id", None), - "downloads": getattr(dataset, "downloads", None), - } - for dataset in datasets - ] - - -def get_hf_dataset_names() -> List[str]: - return [d["id"] for d in get_hf_datasets()] diff --git a/services/api/src/api/routes/cache_reports.py b/services/api/src/api/routes/cache_reports.py index d7d2911f..dfd03ab2 100644 --- a/services/api/src/api/routes/cache_reports.py +++ b/services/api/src/api/routes/cache_reports.py @@ -4 +4,4 @@ import time -from libcache.cache import get_datasets_reports_by_status, get_splits_reports_by_status +from libcache.simple_cache import ( + get_first_rows_response_reports, + get_splits_response_reports, +) @@ -17,2 +20,2 @@ async def cache_reports_endpoint(_: Request) -> Response: - "datasets": get_datasets_reports_by_status(), - "splits": get_splits_reports_by_status(), + "/splits-next": get_splits_response_reports(), + "/first-rows": get_first_rows_response_reports(), diff --git a/services/api/src/api/routes/hf_datasets.py b/services/api/src/api/routes/hf_datasets.py deleted file mode 100644 index b1dd57e9..00000000 --- a/services/api/src/api/routes/hf_datasets.py +++ /dev/null @@ -1,33 +0,0 @@ -import logging - -from libcache.cache import get_datasets_count_by_cache_status -from starlette.requests import Request -from starlette.responses import Response - -from api.config import MAX_AGE_LONG_SECONDS -from api.hf_dataset import get_hf_datasets -from api.routes._utils import get_response - -logger = logging.getLogger(__name__) - - -async def hf_datasets_endpoint(_: Request) -> Response: - logger.info("/hf-datasets") - content = {"datasets": get_hf_datasets()} - return get_response(content, 200, MAX_AGE_LONG_SECONDS) - - -def is_community(dataset_name: str) -> bool: - return "/" in dataset_name - - -async def hf_datasets_count_by_cache_status_endpoint(_: Request) -> Response: - logger.info("/hf-datasets-count-by-cache-status") - dataset_names = get_hf_datasets() - canonical = [x["id"] for x in dataset_names if not is_community(x["id"])] - community = [x["id"] for x in dataset_names if is_community(x["id"])] - content = { - "canonical": get_datasets_count_by_cache_status(canonical), - "community": get_datasets_count_by_cache_status(community), - } - return get_response(content, 200, MAX_AGE_LONG_SECONDS) diff --git a/services/api/src/api/routes/pending_jobs.py b/services/api/src/api/routes/pending_jobs.py new file mode 100644 index 00000000..d46603e2 --- /dev/null +++ b/services/api/src/api/routes/pending_jobs.py @@ -0,0 +1,31 @@ +import logging +import time + +from libqueue.queue import ( + get_dataset_dump_by_status, + get_first_rows_dump_by_status, + get_split_dump_by_status, + get_splits_dump_by_status, +) +from starlette.requests import Request +from starlette.responses import Response + +from api.config import MAX_AGE_SHORT_SECONDS +from api.routes._utils import get_response + +logger = logging.getLogger(__name__) + + +async def pending_jobs_endpoint(_: Request) -> Response: + logger.info("/pending-jobs") + return get_response( + { + "/splits": get_dataset_dump_by_status(waiting_started=True), + "/rows": get_split_dump_by_status(waiting_started=True), + "/splits-next": get_splits_dump_by_status(waiting_started=True), + "/first-rows": get_first_rows_dump_by_status(waiting_started=True), + "created_at": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()), + }, + 200, + MAX_AGE_SHORT_SECONDS, + ) diff --git a/services/api/src/api/routes/queue_dump.py b/services/api/src/api/routes/queue_dump.py deleted file mode 100644 index 2a6c59c9..00000000 --- a/services/api/src/api/routes/queue_dump.py +++ /dev/null @@ -1,37 +0,0 @@ -import logging -import time - -from libqueue.queue import get_dataset_dump_by_status, get_split_dump_by_status -from starlette.requests import Request -from starlette.responses import Response - -from api.config import MAX_AGE_SHORT_SECONDS -from api.routes._utils import get_response - -logger = logging.getLogger(__name__) - - -async def queue_dump_endpoint(_: Request) -> Response: - logger.info("/queue-dump") - return get_response( - { - "datasets": get_dataset_dump_by_status(), - "splits": get_split_dump_by_status(), - "created_at": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()), - }, - 200, - MAX_AGE_SHORT_SECONDS, - ) - - -async def queue_dump_waiting_started_endpoint(_: Request) -> Response: - logger.info("/queue-dump-waiting-started") - return get_response( - { - "datasets": get_dataset_dump_by_status(waiting_started=True), - "splits": get_split_dump_by_status(waiting_started=True), - "created_at": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()), - }, - 200, - MAX_AGE_SHORT_SECONDS, - ) diff --git a/services/api/src/api/routes/refresh_split.py b/services/api/src/api/routes/refresh_split.py deleted file mode 100644 index 64c8d9c5..00000000 --- a/services/api/src/api/routes/refresh_split.py +++ /dev/null @@ -1,60 +0,0 @@ -import logging -from typing import Any, TypedDict - -from libqueue.queue import add_split_job -from starlette.requests import Request -from starlette.responses import Response - -from api.routes._utils import get_response - -logger = logging.getLogger(__name__) - - -class RefreshSplitPayload(TypedDict): - """ - Payload from a refresh-split call. - """ - - dataset: str - config: str - split: str - - -def extract_key(json: Any, key: str) -> str: - if key in json and isinstance(json[key], str) and json[key].strip(): - return json[key] - raise Exception(f"invalid {key}") - - -def parse_payload(json: Any) -> RefreshSplitPayload: - return { - "dataset": extract_key(json, "dataset"), - "config": extract_key(json, "config"), - "split": extract_key(json, "split"), - } - - -def process_payload(payload: RefreshSplitPayload) -> None: - dataset_name = payload["dataset"] - config_name = payload["config"] - split_name = payload["split"] - logger.debug(f"webhook: refresh split {dataset_name} - {config_name} - {split_name} ") - add_split_job(dataset_name, config_name, split_name) - - -async def refresh_split_endpoint(request: Request) -> Response: - try: - json = await request.json() - except Exception: - content = {"status": "error", "error": "the body could not be parsed as a JSON"} - return get_response(content, 400) - logger.info(f"/refresh-split: {json}") - try: - payload = parse_payload(json) - except Exception: - content = {"status": "error", "error": "the JSON payload is invalid"} - return get_response(content, 400) - - process_payload(payload) - content = {"status": "ok"} - return get_response(content, 200) diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index 8ccb3873..60ca464e 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -110,8 +109,0 @@ def test_get_healthcheck(client: TestClient) -> None: -def test_get_hf_datasets(client: TestClient) -> None: - response = client.get("/hf_datasets") - assert response.status_code == 200 - json = response.json() - datasets = json["datasets"] - assert len(datasets) > 1000 - - @@ -407,0 +400,20 @@ def test_metrics(client: TestClient) -> None: + + +def test_pending_jobs(client: TestClient) -> None: + response = client.get("/pending-jobs") + assert response.status_code == 200 + json = response.json() + for e in ["/splits", "/rows", "/splits-next", "/first-rows"]: + assert json[e] == {"waiting": [], "started": []} + assert "created_at" in json + + +def test_cache_reports(client: TestClient) -> None: + response = client.get("/cache-reports") + assert response.status_code == 200 + json = response.json() + assert json["/splits-next"] == [{"dataset": "acronym_identification", "error": None, "status": "200"}] + assert json["/first-rows"] == [ + {"dataset": "acronym_identification", "config": "default", "split": "train", "status": "200", "error": None} + ] + assert "created_at" in json diff --git a/services/api/tests/test_hf_dataset.py b/services/api/tests/test_hf_dataset.py deleted file mode 100644 index 28512c24..00000000 --- a/services/api/tests/test_hf_dataset.py +++ /dev/null @@ -1,21 +0,0 @@ -from api.hf_dataset import get_hf_datasets - - -# get_dataset_names -def test_get_dataset_items() -> None: - dataset_items = get_hf_datasets() - assert len(dataset_items) > 1000 - glue_datasets = [dataset for dataset in dataset_items if dataset["id"] == "glue"] - assert len(glue_datasets) == 1 - glue = glue_datasets[0] - assert glue["id"] == "glue" - assert len(glue["tags"]) > 5 - assert "task_categories:text-classification" in glue["tags"] - assert glue["citation"] is not None - assert glue["citation"].startswith("@inproceedings") - assert glue["description"] is not None - assert glue["description"].startswith("GLUE, the General Language") - assert glue["paperswithcode_id"] is not None - assert glue["paperswithcode_id"] == "glue" - assert glue["downloads"] is not None - assert glue["downloads"] > 500000
21804f75d5bb0c788e34da9995eb5beaba4dff0b
Sylvain Lesage
2022-07-22T13:49:37
fix: 🐛 increase cpu limit for split worker, and reduce per ds (#453)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 20922509..093317b4 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -154 +154 @@ worker: - maxJobsPerDataset: 5 + maxJobsPerDataset: 3 @@ -167 +167 @@ worker: - cpu: 1 + cpu: 2 @@ -173 +173 @@ worker: - maxJobsPerDataset: 5 + maxJobsPerDataset: 3
080b5d880b5f299fb9d559f3d328368370018290
Sylvain Lesage
2022-07-22T13:15:49
fix: 🐛 add cpu for the first-rows worker (#452)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index e3c1eeb9..20922509 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -148 +148 @@ worker: - cpu: 1 + cpu: 2
94de3196cef304c2e62abcf2176664d6b56f3e7f
Sylvain Lesage
2022-07-21T20:12:13
docs: ✏️ nit (#449)
diff --git a/infra/charts/datasets-server/static-files/openapi.json b/infra/charts/datasets-server/static-files/openapi.json index a3d5384f..5f21d5b2 100644 --- a/infra/charts/datasets-server/static-files/openapi.json +++ b/infra/charts/datasets-server/static-files/openapi.json @@ -1972 +1972 @@ - "summary": "First rows of a split (will soon replace /rows)", + "summary": "First rows of a split (experimental)",
7f2344f25118e6a51f4fc3ab5c829264f6295c59
Sylvain Lesage
2022-07-21T20:08:57
docs: ✏️ multiple fixes on the openapi spec (#448)
diff --git a/infra/charts/datasets-server/static-files/openapi.json b/infra/charts/datasets-server/static-files/openapi.json index 3f1fe850..a3d5384f 100644 --- a/infra/charts/datasets-server/static-files/openapi.json +++ b/infra/charts/datasets-server/static-files/openapi.json @@ -129 +129 @@ - "columns": { + "features": { @@ -173 +173 @@ - "$ref": "#/components/schemas/FeatureType" + "$ref": "#/components/schemas/Feature" @@ -177 +177 @@ - "FeatureType": { + "Feature": { @@ -179,4 +179,4 @@ - { "$ref": "#/components/schemas/ValueFeatureType" }, - { "$ref": "#/components/schemas/ClassLabelFeatureType" }, - { "$ref": "#/components/schemas/ArrayXDFeatureType" }, - { "$ref": "#/components/schemas/TranslationFeatureType" }, + { "$ref": "#/components/schemas/ValueFeature" }, + { "$ref": "#/components/schemas/ClassLabelFeature" }, + { "$ref": "#/components/schemas/ArrayXDFeature" }, + { "$ref": "#/components/schemas/TranslationFeature" }, @@ -184 +184 @@ - "$ref": "#/components/schemas/TranslationVariableLanguagesFeatureType" + "$ref": "#/components/schemas/TranslationVariableLanguagesFeature" @@ -187 +187 @@ - "$ref": "#/components/schemas/SequenceFeatureType" + "$ref": "#/components/schemas/SequenceFeature" @@ -190 +190 @@ - "$ref": "#/components/schemas/DictFeatureType" + "$ref": "#/components/schemas/DictFeature" @@ -193 +193 @@ - "$ref": "#/components/schemas/ListFeatureType" + "$ref": "#/components/schemas/ListFeature" @@ -196 +196 @@ - "$ref": "#/components/schemas/AudioFeatureType" + "$ref": "#/components/schemas/AudioFeature" @@ -199 +199 @@ - "$ref": "#/components/schemas/ImageFeatureType" + "$ref": "#/components/schemas/ImageFeature" @@ -203 +203 @@ - "ValueFeatureType": { + "ValueFeature": { @@ -249 +249 @@ - "ClassLabelFeatureType": { + "ClassLabelFeature": { @@ -273 +273 @@ - "ArrayXDFeatureType": { + "ArrayXDFeature": { @@ -295 +295 @@ - "TranslationFeatureType": { + "TranslationFeature": { @@ -316 +316 @@ - "TranslationVariableLanguagesFeatureType": { + "TranslationVariableLanguagesFeature": { @@ -340 +340 @@ - "SequenceFeatureType": { + "SequenceFeature": { @@ -357 +357 @@ - "$ref": "#/components/schemas/DictFeatureType" + "$ref": "#/components/schemas/DictFeature" @@ -361 +361 @@ - "DictFeatureType": { + "DictFeature": { @@ -364 +364 @@ - "$ref": "#/components/schemas/FeatureType" + "$ref": "#/components/schemas/Feature" @@ -367 +367 @@ - "ListFeatureType": { + "ListFeature": { @@ -370 +370 @@ - "$ref": "#/components/schemas/DictFeatureType" + "$ref": "#/components/schemas/DictFeature" @@ -373 +373 @@ - "AudioFeatureType": { + "AudioFeature": { @@ -397 +397 @@ - "ImageFeatureType": { + "ImageFeature": { @@ -689,9 +689,12 @@ - "type": "object", - "properties": { - "src": { - "type": "string", - "format": "uri" - }, - "type": { - "type": "string", - "enum": ["audio/wav", "audio/mpeg"] + "type": "array", + "items": { + "type": "object", + "properties": { + "src": { + "type": "string", + "format": "uri" + }, + "type": { + "type": "string", + "enum": ["audio/wav", "audio/mpeg"] + } @@ -724 +727 @@ - "summary": "List of splits (will soon be replaced with /splits-next)", + "summary": "List of splits", @@ -937,217 +939,0 @@ - "/splits-next": { - "get": { - "summary": "List of splits (will soon replace /splits)", - "description": "The list of splits of a dataset.", - "externalDocs": { - "description": "See Splits (Hub docs)", - "url": "https://huggingface.co/docs/datasets-server/splits" - }, - "operationId": "listSplits", - "parameters": [ - { - "name": "dataset", - "in": "query", - "description": "The identifier of the dataset on the Hub.", - "required": true, - "schema": { "type": "string" }, - "examples": { - "glue": { "summary": "a canonical dataset", "value": "glue" }, - "Helsinki-NLP/tatoeba_mt": { - "summary": "a namespaced dataset", - "value": "Helsinki-NLP/tatoeba_mt" - } - } - } - ], - "responses": { - "200": { - "description": "A list of splits.</br>Beware: the response is not paginated.", - "headers": { - "Cache-Control": { "$ref": "#/components/headers/Cache-Control" }, - "Access-Control-Allow-Origin": { - "$ref": "#/components/headers/Access-Control-Allow-Origin" - } - }, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/SplitsResponse" - }, - "examples": { - "duorc": { - "summary": "duorc: two configs, six splits", - "value": { - "splits": [ - { - "dataset": "duorc", - "config": "SelfRC", - "split": "train", - "num_bytes": 239852925, - "num_examples": 60721 - }, - { - "dataset": "duorc", - "config": "SelfRC", - "split": "validation", - "num_bytes": 51662575, - "num_examples": 12961 - }, - { - "dataset": "duorc", - "config": "SelfRC", - "split": "test", - "num_bytes": 49142766, - "num_examples": 12559 - }, - { - "dataset": "duorc", - "config": "ParaphraseRC", - "split": "train", - "num_bytes": 496683105, - "num_examples": 69524 - }, - { - "dataset": "duorc", - "config": "ParaphraseRC", - "split": "validation", - "num_bytes": 106510545, - "num_examples": 15591 - }, - { - "dataset": "duorc", - "config": "ParaphraseRC", - "split": "test", - "num_bytes": 115215816, - "num_examples": 15857 - } - ] - } - }, - "emotion": { - "summary": "emotion: one config, three splits", - "value": { - "splits": [ - { - "dataset": "emotion", - "config": "default", - "split": "train", - "num_bytes": 1741541, - "num_examples": 16000 - }, - { - "dataset": "emotion", - "config": "default", - "split": "validation", - "num_bytes": 214699, - "num_examples": 2000 - }, - { - "dataset": "emotion", - "config": "default", - "split": "test", - "num_bytes": 217177, - "num_examples": 2000 - } - ] - } - } - } - } - } - }, - "400": { - "description": "The dataset has some issue that prevents extracting the list of splits.<br/>The error response should give insights to help fix the issue.<br/>The client should not retry the request, because the response will not change until the dataset is fixed.", - "headers": { - "Cache-Control": { - "$ref": "#/components/headers/Cache-Control" - }, - "Access-Control-Allow-Origin": { - "$ref": "#/components/headers/Access-Control-Allow-Origin" - } - }, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Status400ErrorContent" - }, - "examples": { - "TypeError": { - "summary": "SplitsNotFoundError", - "value": { - "status_code": 400, - "message": "Cannot get the split names for the dataset.", - "cause_exception": "SplitsNotFoundError", - "cause_message": "The split names could not be parsed from the dataset config.", - "cause_traceback": [ - "Traceback (most recent call last):\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 354, in get_dataset_config_info\n for split_generator in builder._split_generators(\n", - " File \"/tmp/modules-cache/datasets_modules/datasets/timit_asr/43f9448dd5db58e95ee48a277f466481b151f112ea53e27f8173784da9254fb2/timit_asr.py\", line 117, in _split_generators\n data_dir = os.path.abspath(os.path.expanduser(dl_manager.manual_dir))\n", - " File \"/usr/local/lib/python3.9/posixpath.py\", line 231, in expanduser\n path = os.fspath(path)\n", - "TypeError: expected str, bytes or os.PathLike object, not NoneType\n", - "\nThe above exception was the direct cause of the following exception:\n\n", - "Traceback (most recent call last):\n", - " File \"/src/services/worker/src/worker/models/dataset.py\", line 15, in get_dataset_split_full_names\n return [\n", - " File \"/src/services/worker/src/worker/models/dataset.py\", line 18, in <listcomp>\n for split_name in get_dataset_split_names(dataset_name, config_name, use_auth_token=hf_token)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 404, in get_dataset_split_names\n info = get_dataset_config_info(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 359, in get_dataset_config_info\n raise SplitsNotFoundError(\"The split names could not be parsed from the dataset config.\") from err\n", - "datasets.inspect.SplitsNotFoundError: The split names could not be parsed from the dataset config.\n" - ] - } - }, - "FileNotFoundError": { - "summary": "FileNotFoundError", - "value": { - "status_code": 400, - "message": "Cannot get the split names for the dataset.", - "cause_exception": "FileNotFoundError", - "cause_message": "Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.", - "cause_traceback": [ - "Traceback (most recent call last):\n", - " File \"/src/services/worker/src/worker/models/dataset.py\", line 17, in get_dataset_split_full_names\n for config_name in get_dataset_config_names(dataset_name, use_auth_token=hf_token)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 289, in get_dataset_config_names\n dataset_module = dataset_module_factory(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1242, in dataset_module_factory\n raise FileNotFoundError(\n", - "FileNotFoundError: Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.\n" - ] - } - } - } - } - } - }, - "500": { - "description": "The server encountered an error, or the response still hasn't been generated (the process is asynchronous). The client should retry after a time, in particular in the case of the response still being processed. If the error does not vanish, it's possibly due to a bug in the API software and should be reported.", - "headers": { - "Cache-Control": { - "$ref": "#/components/headers/Cache-Control" - }, - "Access-Control-Allow-Origin": { - "$ref": "#/components/headers/Access-Control-Allow-Origin" - } - }, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/Status500ErrorContent" - }, - "examples": { - "not-ready": { - "summary": "the response is not ready yet.", - "value": { - "status_code": 500, - "message": "The list of splits is not ready yet. Please retry later." - } - }, - "internal": { - "summary": "internal error", - "value": { - "status_code": 500, - "message": "Unexpected error." - } - } - } - } - } - } - } - } - }, @@ -1156 +942 @@ - "summary": "First rows of a split (soon deprecated)", + "summary": "First rows of a split", @@ -1920 +1706 @@ - "/first-rows": { + "/valid": { @@ -1922,2 +1708,2 @@ - "summary": "First rows of a split (will soon replace /rows)", - "description": "The list of the 100 first rows of a dataset split.", + "summary": " Valid datasets", + "description": "The list of the Hub datasets that work without an error (for /splits and /rows).", @@ -1925,2 +1711,2 @@ - "description": "See First rows (Hub docs)", - "url": "https://huggingface.co/docs/datasets-server/rows" + "description": "See Valid datasets (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/valid" @@ -1928,19 +1714,283 @@ - "operationId": "listRows", - "parameters": [ - { - "name": "dataset", - "in": "query", - "description": "The identifier of the dataset on the Hub.", - "required": true, - "schema": { "type": "string" }, - "examples": { - "glue": { "summary": "a canonical dataset", "value": "glue" }, - "Helsinki-NLP/tatoeba_mt": { - "summary": "a namespaced dataset", - "value": "Helsinki-NLP/tatoeba_mt" - } - } - }, - { - "name": "config", - "in": "query", + "operationId": "listValidDatasets", + "parameters": [], + "responses": { + "200": { + "description": "The valid datasets.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ValidResponse" + }, + "examples": { + "valid": { + "summary": "list of datasets", + "value": { + "valid": [ + "0n1xus/codexglue", + "0n1xus/pytorrent-standalone", + "0x7194633/rupile", + "51la5/keyword-extraction", + "AHussain0418/day2_data" + ], + "created_at": "2022-06-28T16:04:24Z" + } + } + } + } + } + } + } + } + }, + "/splits-next": { + "get": { + "summary": "List of splits (experimental)", + "description": "The list of splits of a dataset.", + "externalDocs": { + "description": "See Splits (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/splits" + }, + "operationId": "listSplitsNext", + "parameters": [ + { + "name": "dataset", + "in": "query", + "description": "The identifier of the dataset on the Hub.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "glue": { "summary": "a canonical dataset", "value": "glue" }, + "Helsinki-NLP/tatoeba_mt": { + "summary": "a namespaced dataset", + "value": "Helsinki-NLP/tatoeba_mt" + } + } + } + ], + "responses": { + "200": { + "description": "A list of splits.</br>Beware: the response is not paginated.", + "headers": { + "Cache-Control": { "$ref": "#/components/headers/Cache-Control" }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SplitsResponse" + }, + "examples": { + "duorc": { + "summary": "duorc: two configs, six splits", + "value": { + "splits": [ + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "num_bytes": 239852925, + "num_examples": 60721 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "validation", + "num_bytes": 51662575, + "num_examples": 12961 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "test", + "num_bytes": 49142766, + "num_examples": 12559 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "train", + "num_bytes": 496683105, + "num_examples": 69524 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "validation", + "num_bytes": 106510545, + "num_examples": 15591 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "test", + "num_bytes": 115215816, + "num_examples": 15857 + } + ] + } + }, + "emotion": { + "summary": "emotion: one config, three splits", + "value": { + "splits": [ + { + "dataset": "emotion", + "config": "default", + "split": "train", + "num_bytes": 1741541, + "num_examples": 16000 + }, + { + "dataset": "emotion", + "config": "default", + "split": "validation", + "num_bytes": 214699, + "num_examples": 2000 + }, + { + "dataset": "emotion", + "config": "default", + "split": "test", + "num_bytes": 217177, + "num_examples": 2000 + } + ] + } + } + } + } + } + }, + "400": { + "description": "The dataset has some issue that prevents extracting the list of splits.<br/>The error response should give insights to help fix the issue.<br/>The client should not retry the request, because the response will not change until the dataset is fixed.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Status400ErrorContent" + }, + "examples": { + "TypeError": { + "summary": "SplitsNotFoundError", + "value": { + "status_code": 400, + "message": "Cannot get the split names for the dataset.", + "cause_exception": "SplitsNotFoundError", + "cause_message": "The split names could not be parsed from the dataset config.", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 354, in get_dataset_config_info\n for split_generator in builder._split_generators(\n", + " File \"/tmp/modules-cache/datasets_modules/datasets/timit_asr/43f9448dd5db58e95ee48a277f466481b151f112ea53e27f8173784da9254fb2/timit_asr.py\", line 117, in _split_generators\n data_dir = os.path.abspath(os.path.expanduser(dl_manager.manual_dir))\n", + " File \"/usr/local/lib/python3.9/posixpath.py\", line 231, in expanduser\n path = os.fspath(path)\n", + "TypeError: expected str, bytes or os.PathLike object, not NoneType\n", + "\nThe above exception was the direct cause of the following exception:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 15, in get_dataset_split_full_names\n return [\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 18, in <listcomp>\n for split_name in get_dataset_split_names(dataset_name, config_name, use_auth_token=hf_token)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 404, in get_dataset_split_names\n info = get_dataset_config_info(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 359, in get_dataset_config_info\n raise SplitsNotFoundError(\"The split names could not be parsed from the dataset config.\") from err\n", + "datasets.inspect.SplitsNotFoundError: The split names could not be parsed from the dataset config.\n" + ] + } + }, + "FileNotFoundError": { + "summary": "FileNotFoundError", + "value": { + "status_code": 400, + "message": "Cannot get the split names for the dataset.", + "cause_exception": "FileNotFoundError", + "cause_message": "Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 17, in get_dataset_split_full_names\n for config_name in get_dataset_config_names(dataset_name, use_auth_token=hf_token)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 289, in get_dataset_config_names\n dataset_module = dataset_module_factory(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1242, in dataset_module_factory\n raise FileNotFoundError(\n", + "FileNotFoundError: Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.\n" + ] + } + } + } + } + } + }, + "500": { + "description": "The server encountered an error, or the response still hasn't been generated (the process is asynchronous). The client should retry after a time, in particular in the case of the response still being processed. If the error does not vanish, it's possibly due to a bug in the API software and should be reported.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Status500ErrorContent" + }, + "examples": { + "not-ready": { + "summary": "the response is not ready yet.", + "value": { + "status_code": 500, + "message": "The list of splits is not ready yet. Please retry later." + } + }, + "internal": { + "summary": "internal error", + "value": { + "status_code": 500, + "message": "Unexpected error." + } + } + } + } + } + } + } + } + }, + "/first-rows": { + "get": { + "summary": "First rows of a split (will soon replace /rows)", + "description": "The list of the 100 first rows of a dataset split.", + "externalDocs": { + "description": "See First rows (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/rows" + }, + "operationId": "listFirstRows", + "parameters": [ + { + "name": "dataset", + "in": "query", + "description": "The identifier of the dataset on the Hub.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "glue": { "summary": "a canonical dataset", "value": "glue" }, + "Helsinki-NLP/tatoeba_mt": { + "summary": "a namespaced dataset", + "value": "Helsinki-NLP/tatoeba_mt" + } + } + }, + { + "name": "config", + "in": "query", @@ -2773,47 +2822,0 @@ - }, - "/valid": { - "get": { - "summary": " Valid datasets", - "description": "The list of the Hub datasets that work without an error (for /splits and /rows).", - "externalDocs": { - "description": "See Valid datasets (Hub docs)", - "url": "https://huggingface.co/docs/datasets-server/valid" - }, - "operationId": "listValidDatasets", - "parameters": [], - "responses": { - "200": { - "description": "The valid datasets.", - "headers": { - "Cache-Control": { - "$ref": "#/components/headers/Cache-Control" - }, - "Access-Control-Allow-Origin": { - "$ref": "#/components/headers/Access-Control-Allow-Origin" - } - }, - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ValidResponse" - }, - "examples": { - "valid": { - "summary": "list of datasets", - "value": { - "valid": [ - "0n1xus/codexglue", - "0n1xus/pytorrent-standalone", - "0x7194633/rupile", - "51la5/keyword-extraction", - "AHussain0418/day2_data" - ], - "created_at": "2022-06-28T16:04:24Z" - } - } - } - } - } - } - } - }
b8913d6ea61a78712e32a4e6738281fe5ae919c2
Sylvain Lesage
2022-07-21T19:50:39
Add two endpoints to openapi (#445)
diff --git a/infra/charts/datasets-server/static-files/openapi.json b/infra/charts/datasets-server/static-files/openapi.json index 0dd43a9c..3f1fe850 100644 --- a/infra/charts/datasets-server/static-files/openapi.json +++ b/infra/charts/datasets-server/static-files/openapi.json @@ -67,0 +68,33 @@ + "Status400ErrorContent": { + "type": "object", + "required": ["status_code", "message"], + "properties": { + "status_code": { + "type": "integer" + }, + "message": { + "type": "string" + }, + "cause_exception": { + "type": "string" + }, + "cause_message": { + "type": "string" + }, + "cause_traceback": { + "type": "string" + } + } + }, + "Status500ErrorContent": { + "type": "object", + "required": ["status_code", "message"], + "properties": { + "status_code": { + "type": "integer" + }, + "message": { + "type": "string" + } + } + }, @@ -91,0 +125,14 @@ + "FirstRowsResponse": { + "type": "object", + "required": ["features", "rows"], + "properties": { + "columns": { + "type": "array", + "items": { "$ref": "#/components/schemas/FeatureItem" } + }, + "rows": { + "type": "array", + "items": { "$ref": "#/components/schemas/FirstRowItem" } + } + } + }, @@ -105,0 +153,262 @@ + "FeatureItem": { + "type": "object", + "required": ["dataset", "config", "split", "idx", "name", "type"], + "properties": { + "dataset": { + "type": "string" + }, + "config": { + "type": "string" + }, + "split": { + "type": "string" + }, + "idx": { + "type": "integer" + }, + "name": { + "type": "string" + }, + "type": { + "$ref": "#/components/schemas/FeatureType" + } + } + }, + "FeatureType": { + "oneOf": [ + { "$ref": "#/components/schemas/ValueFeatureType" }, + { "$ref": "#/components/schemas/ClassLabelFeatureType" }, + { "$ref": "#/components/schemas/ArrayXDFeatureType" }, + { "$ref": "#/components/schemas/TranslationFeatureType" }, + { + "$ref": "#/components/schemas/TranslationVariableLanguagesFeatureType" + }, + { + "$ref": "#/components/schemas/SequenceFeatureType" + }, + { + "$ref": "#/components/schemas/DictFeatureType" + }, + { + "$ref": "#/components/schemas/ListFeatureType" + }, + { + "$ref": "#/components/schemas/AudioFeatureType" + }, + { + "$ref": "#/components/schemas/ImageFeatureType" + } + ] + }, + "ValueFeatureType": { + "type": "object", + "required": ["id", "_type", "dtype"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["Value"] + }, + "dtype": { + "type": "string", + "enum": [ + "null", + "bool", + "int8", + "int16", + "int32", + "int64", + "uint8", + "uint16", + "uint32", + "uint64", + "float16", + "float32 (alias float)", + "float64 (alias double)", + "time32[(s|ms)]", + "time64[(us|ns)]", + "timestamp[(s|ms|us|ns)]", + "timestamp[(s|ms|us|ns), tz=(tzstring)]", + "date32", + "date64", + "duration[(s|ms|us|ns)]", + "decimal128(precision, scale)", + "decimal256(precision, scale)", + "binary", + "large_binary", + "string", + "large_string" + ] + } + } + }, + "ClassLabelFeatureType": { + "type": "object", + "required": ["id", "_type", "num_classes", "names"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["ClassLabel"] + }, + "num_classes": { + "type": "integer" + }, + "names": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "ArrayXDFeatureType": { + "type": "object", + "required": ["id", "_type", "shape"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["Array2D", "Array3D", "Array4D", "Array5D"] + }, + "shape": { + "type": "array", + "items": { + "type": "integer", + "nullable": true + } + } + } + }, + "TranslationFeatureType": { + "type": "object", + "required": ["id", "_type", "languages"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["Translation"] + }, + "languages": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "TranslationVariableLanguagesFeatureType": { + "type": "object", + "required": ["id", "_type", "num_languages", "languages"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["TranslationVariableLanguages"] + }, + "num_languages": { + "type": "integer" + }, + "languages": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "SequenceFeatureType": { + "type": "object", + "required": ["id", "_type", "length", "feature"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["Sequence"] + }, + "length": { + "type": "integer" + }, + "feature": { + "$ref": "#/components/schemas/DictFeatureType" + } + } + }, + "DictFeatureType": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/FeatureType" + } + }, + "ListFeatureType": { + "type": "array", + "items": { + "$ref": "#/components/schemas/DictFeatureType" + } + }, + "AudioFeatureType": { + "type": "object", + "required": ["id", "_type", "sampling_rate", "mono", "decode"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["Audio"] + }, + "sampling_rate": { + "type": "number" + }, + "mono": { + "type": "boolean" + }, + "decode": { + "type": "boolean" + } + } + }, + "ImageFeatureType": { + "type": "object", + "required": ["id", "_type", "decode"], + "properties": { + "id": { + "type": "string", + "nullable": true, + "enum": [null] + }, + "_type": { + "type": "string", + "enum": ["Image"] + }, + "decode": { + "type": "boolean" + } + } + }, @@ -228 +537 @@ - "ValidResponse": { + "FirstRowItem": { @@ -230 +539,8 @@ - "required": ["valid", "created_at"], + "required": [ + "dataset", + "config", + "split", + "row_idx", + "row", + "truncated_cells" + ], @@ -232 +548,19 @@ - "valid": { + "dataset": { + "type": "string" + }, + "config": { + "type": "string" + }, + "split": { + "type": "string" + }, + "row_idx": { + "type": "integer" + }, + "row": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Cell" + } + }, + "truncated_cells": { @@ -235,4 +568,0 @@ - }, - "created_at": { - "type": "string", - "format": "date-time" @@ -241,14 +571,10 @@ - } - } - }, - "paths": { - "/splits": { - "get": { - "summary": "List of splits", - "description": "The list of splits of a dataset.", - "externalDocs": { - "description": "See Splits (Hub docs)", - "url": "https://huggingface.co/docs/datasets-server/splits" - }, - "operationId": "listSplits", - "parameters": [ + }, + "Cell": { + "oneOf": [ + { "$ref": "#/components/schemas/ValueCell" }, + { "$ref": "#/components/schemas/ClassLabelCell" }, + { "$ref": "#/components/schemas/Array2DCell" }, + { "$ref": "#/components/schemas/Array3DCell" }, + { "$ref": "#/components/schemas/Array4DCell" }, + { "$ref": "#/components/schemas/Array5DCell" }, + { "$ref": "#/components/schemas/TranslationCell" }, @@ -256,12 +582,16 @@ - "name": "dataset", - "in": "query", - "description": "The identifier of the dataset on the Hub.", - "required": true, - "schema": { "type": "string" }, - "examples": { - "glue": { "summary": "a canonical dataset", "value": "glue" }, - "Helsinki-NLP/tatoeba_mt": { - "summary": "a namespaced dataset", - "value": "Helsinki-NLP/tatoeba_mt" - } - } + "$ref": "#/components/schemas/TranslationVariableLanguagesCell" + }, + { + "$ref": "#/components/schemas/SequenceCell" + }, + { + "$ref": "#/components/schemas/DictCell" + }, + { + "$ref": "#/components/schemas/ListCell" + }, + { + "$ref": "#/components/schemas/AudioCell" + }, + { + "$ref": "#/components/schemas/ImageCell" @@ -268,0 +599,8 @@ + ] + }, + "ValueCell": { + "oneOf": [ + { "type": "boolean" }, + { "type": "integer" }, + { "type": "number" }, + { "type": "string" } @@ -270,11 +608,150 @@ - "responses": { - "200": { - "description": "A list of splits.</br>Beware: the response is not paginated.", - "headers": { - "Cache-Control": { "$ref": "#/components/headers/Cache-Control" }, - "Access-Control-Allow-Origin": { - "$ref": "#/components/headers/Access-Control-Allow-Origin" - } - }, - "content": { - "application/json": { + "nullable": true + }, + "ClassLabelCell": { + "type": "integer" + }, + "Array2DCell": { + "type": "array", + "items": { + "type": "array", + "items": { + "type": "number" + } + } + }, + "Array3DCell": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Array2DCell" + } + }, + "Array4DCell": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Array3DCell" + } + }, + "Array5DCell": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Array4DCell" + } + }, + "TranslationCell": { + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "TranslationVariableLanguagesCell": { + "type": "object", + "required": ["language", "translation"], + "properties": { + "language": { + "type": "array", + "items": { + "type": "string" + } + }, + "translation": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "SequenceCell": { + "oneOf": [ + { "$ref": "#/components/schemas/ListCell" }, + { "$ref": "#/components/schemas/DictionaryOfListsCell" } + ] + }, + "ListCell": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Cell" + } + }, + "DictionaryOfListsCell": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/ListCell" + } + }, + "DictCell": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Cell" + } + }, + "AudioCell": { + "type": "object", + "properties": { + "src": { + "type": "string", + "format": "uri" + }, + "type": { + "type": "string", + "enum": ["audio/wav", "audio/mpeg"] + } + } + }, + "ImageCell": { + "type": "string", + "format": "uri" + }, + "ValidResponse": { + "type": "object", + "required": ["valid", "created_at"], + "properties": { + "valid": { + "type": "array", + "items": { "type": "string" } + }, + "created_at": { + "type": "string", + "format": "date-time" + } + } + } + } + }, + "paths": { + "/splits": { + "get": { + "summary": "List of splits (will soon be replaced with /splits-next)", + "description": "The list of splits of a dataset.", + "externalDocs": { + "description": "See Splits (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/splits" + }, + "operationId": "listSplits", + "parameters": [ + { + "name": "dataset", + "in": "query", + "description": "The identifier of the dataset on the Hub.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "glue": { "summary": "a canonical dataset", "value": "glue" }, + "Helsinki-NLP/tatoeba_mt": { + "summary": "a namespaced dataset", + "value": "Helsinki-NLP/tatoeba_mt" + } + } + } + ], + "responses": { + "200": { + "description": "A list of splits.</br>Beware: the response is not paginated.", + "headers": { + "Cache-Control": { "$ref": "#/components/headers/Cache-Control" }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { @@ -398,5 +875,933 @@ - " File \"/src/services/worker/src/worker/models/dataset.py\", line 16, in get_dataset_split_full_names\n return [\n", - " File \"/src/services/worker/src/worker/models/dataset.py\", line 21, in <listcomp>\n for split_name in get_dataset_split_names(dataset_name, config_name, use_auth_token=hf_token)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 404, in get_dataset_split_names\n info = get_dataset_config_info(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 359, in get_dataset_config_info\n raise SplitsNotFoundError(\"The split names could not be parsed from the dataset config.\") from err\n", - "datasets.inspect.SplitsNotFoundError: The split names could not be parsed from the dataset config.\n" + " File \"/src/services/worker/src/worker/models/dataset.py\", line 16, in get_dataset_split_full_names\n return [\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 21, in <listcomp>\n for split_name in get_dataset_split_names(dataset_name, config_name, use_auth_token=hf_token)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 404, in get_dataset_split_names\n info = get_dataset_config_info(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 359, in get_dataset_config_info\n raise SplitsNotFoundError(\"The split names could not be parsed from the dataset config.\") from err\n", + "datasets.inspect.SplitsNotFoundError: The split names could not be parsed from the dataset config.\n" + ] + } + }, + "FileNotFoundError": { + "summary": "FileNotFoundError", + "value": { + "status_code": 400, + "exception": "Status400Error", + "message": "Cannot get the split names for the dataset.", + "cause_exception": "FileNotFoundError", + "cause_message": "Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 18, in get_dataset_split_full_names\n for config_name in get_dataset_config_names(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 289, in get_dataset_config_names\n dataset_module = dataset_module_factory(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1189, in dataset_module_factory\n raise FileNotFoundError(\n", + "FileNotFoundError: Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.\n" + ] + } + } + } + } + } + }, + "500": { + "description": "The server encountered an error.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/StatusErrorContent" + }, + "examples": { + "mongo": { + "summary": "internal error", + "value": { + "status_code": 500, + "exception": "Status500Error", + "message": "Tried to save duplicate unique keys (E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }, full error: {'index': 0, 'code': 11000, 'keyPattern': {'dataset_name': 1, 'config_name': 1, 'split_name': 1}, 'keyValue': {'dataset_name': 'csebuetnlp/xlsum', 'config_name': 'chinese_traditional', 'split_name': 'test'}, 'errmsg': 'E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }'})", + "cause_exception": "Status500Error", + "cause_message": "Tried to save duplicate unique keys (E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }, full error: {'index': 0, 'code': 11000, 'keyPattern': {'dataset_name': 1, 'config_name': 1, 'split_name': 1}, 'keyValue': {'dataset_name': 'csebuetnlp/xlsum', 'config_name': 'chinese_traditional', 'split_name': 'test'}, 'errmsg': 'E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }'})" + } + } + } + } + } + } + } + } + }, + "/splits-next": { + "get": { + "summary": "List of splits (will soon replace /splits)", + "description": "The list of splits of a dataset.", + "externalDocs": { + "description": "See Splits (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/splits" + }, + "operationId": "listSplits", + "parameters": [ + { + "name": "dataset", + "in": "query", + "description": "The identifier of the dataset on the Hub.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "glue": { "summary": "a canonical dataset", "value": "glue" }, + "Helsinki-NLP/tatoeba_mt": { + "summary": "a namespaced dataset", + "value": "Helsinki-NLP/tatoeba_mt" + } + } + } + ], + "responses": { + "200": { + "description": "A list of splits.</br>Beware: the response is not paginated.", + "headers": { + "Cache-Control": { "$ref": "#/components/headers/Cache-Control" }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SplitsResponse" + }, + "examples": { + "duorc": { + "summary": "duorc: two configs, six splits", + "value": { + "splits": [ + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "num_bytes": 239852925, + "num_examples": 60721 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "validation", + "num_bytes": 51662575, + "num_examples": 12961 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "test", + "num_bytes": 49142766, + "num_examples": 12559 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "train", + "num_bytes": 496683105, + "num_examples": 69524 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "validation", + "num_bytes": 106510545, + "num_examples": 15591 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "test", + "num_bytes": 115215816, + "num_examples": 15857 + } + ] + } + }, + "emotion": { + "summary": "emotion: one config, three splits", + "value": { + "splits": [ + { + "dataset": "emotion", + "config": "default", + "split": "train", + "num_bytes": 1741541, + "num_examples": 16000 + }, + { + "dataset": "emotion", + "config": "default", + "split": "validation", + "num_bytes": 214699, + "num_examples": 2000 + }, + { + "dataset": "emotion", + "config": "default", + "split": "test", + "num_bytes": 217177, + "num_examples": 2000 + } + ] + } + } + } + } + } + }, + "400": { + "description": "The dataset has some issue that prevents extracting the list of splits.<br/>The error response should give insights to help fix the issue.<br/>The client should not retry the request, because the response will not change until the dataset is fixed.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Status400ErrorContent" + }, + "examples": { + "TypeError": { + "summary": "SplitsNotFoundError", + "value": { + "status_code": 400, + "message": "Cannot get the split names for the dataset.", + "cause_exception": "SplitsNotFoundError", + "cause_message": "The split names could not be parsed from the dataset config.", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 354, in get_dataset_config_info\n for split_generator in builder._split_generators(\n", + " File \"/tmp/modules-cache/datasets_modules/datasets/timit_asr/43f9448dd5db58e95ee48a277f466481b151f112ea53e27f8173784da9254fb2/timit_asr.py\", line 117, in _split_generators\n data_dir = os.path.abspath(os.path.expanduser(dl_manager.manual_dir))\n", + " File \"/usr/local/lib/python3.9/posixpath.py\", line 231, in expanduser\n path = os.fspath(path)\n", + "TypeError: expected str, bytes or os.PathLike object, not NoneType\n", + "\nThe above exception was the direct cause of the following exception:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 15, in get_dataset_split_full_names\n return [\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 18, in <listcomp>\n for split_name in get_dataset_split_names(dataset_name, config_name, use_auth_token=hf_token)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 404, in get_dataset_split_names\n info = get_dataset_config_info(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 359, in get_dataset_config_info\n raise SplitsNotFoundError(\"The split names could not be parsed from the dataset config.\") from err\n", + "datasets.inspect.SplitsNotFoundError: The split names could not be parsed from the dataset config.\n" + ] + } + }, + "FileNotFoundError": { + "summary": "FileNotFoundError", + "value": { + "status_code": 400, + "message": "Cannot get the split names for the dataset.", + "cause_exception": "FileNotFoundError", + "cause_message": "Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 17, in get_dataset_split_full_names\n for config_name in get_dataset_config_names(dataset_name, use_auth_token=hf_token)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 289, in get_dataset_config_names\n dataset_module = dataset_module_factory(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1242, in dataset_module_factory\n raise FileNotFoundError(\n", + "FileNotFoundError: Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.\n" + ] + } + } + } + } + } + }, + "500": { + "description": "The server encountered an error, or the response still hasn't been generated (the process is asynchronous). The client should retry after a time, in particular in the case of the response still being processed. If the error does not vanish, it's possibly due to a bug in the API software and should be reported.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/Status500ErrorContent" + }, + "examples": { + "not-ready": { + "summary": "the response is not ready yet.", + "value": { + "status_code": 500, + "message": "The list of splits is not ready yet. Please retry later." + } + }, + "internal": { + "summary": "internal error", + "value": { + "status_code": 500, + "message": "Unexpected error." + } + } + } + } + } + } + } + } + }, + "/rows": { + "get": { + "summary": "First rows of a split (soon deprecated)", + "description": "The list of the 100 first rows of a dataset split.", + "externalDocs": { + "description": "See First rows (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/rows" + }, + "operationId": "listRows", + "parameters": [ + { + "name": "dataset", + "in": "query", + "description": "The identifier of the dataset on the Hub.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "glue": { "summary": "a canonical dataset", "value": "glue" }, + "Helsinki-NLP/tatoeba_mt": { + "summary": "a namespaced dataset", + "value": "Helsinki-NLP/tatoeba_mt" + } + } + }, + { + "name": "config", + "in": "query", + "description": "The dataset configuration (or subset).", + "required": true, + "schema": { "type": "string" }, + "examples": { + "cola": { + "summary": "a subset of the glue dataset", + "value": "cola" + }, + "yangdong/ecqa": { + "summary": "the default configuration given by the 🤗 Datasets library", + "value": "yangdong--ecqa" + } + } + }, + { + "name": "split", + "in": "query", + "description": "The split name.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "train": { + "summary": "train split", + "value": "train" + }, + "test": { + "summary": "test split", + "value": "test" + }, + "validation": { + "summary": "validation split", + "value": "validation" + } + } + } + ], + "responses": { + "200": { + "description": "The columns, and the 100 first rows of the split.</br>Note: the response can be truncated (less rows, or truncated cell contents): see examples.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RowsResponse" + }, + "examples": { + "cola": { + "summary": "text, and label column (only 3 rows are shown for brevity)", + "value": { + "columns": [ + { + "dataset": "glue", + "config": "cola", + "split": "train", + "column_idx": 0, + "column": { "name": "sentence", "type": "STRING" } + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "column_idx": 1, + "column": { + "name": "label", + "type": "CLASS_LABEL", + "labels": ["unacceptable", "acceptable"] + } + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "column_idx": 2, + "column": { "name": "idx", "type": "INT" } + } + ], + "rows": [ + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 0, + "row": { + "sentence": "Our friends won't buy this analysis, let alone the next one we propose.", + "label": 1, + "idx": 0 + }, + "truncated_cells": [] + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 1, + "row": { + "sentence": "One more pseudo generalization and I'm giving up.", + "label": 1, + "idx": 1 + }, + "truncated_cells": [] + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 2, + "row": { + "sentence": "One more pseudo generalization or I'm giving up.", + "label": 1, + "idx": 2 + }, + "truncated_cells": [] + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 3, + "row": { + "sentence": "The more we study verbs, the crazier they get.", + "label": 1, + "idx": 3 + }, + "truncated_cells": [] + } + ] + } + }, + "truncated": { + "summary": "truncated cells due to the response size (has a timestamp column)", + "value": { + "columns": [ + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 0, + "column": { + "name": "start", + "type": "TIMESTAMP", + "tz": null, + "unit": "s" + } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 1, + "column": { "name": "target", "type": "JSON" } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 2, + "column": { + "name": "feat_static_cat", + "type": "JSON" + } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 3, + "column": { + "name": "feat_dynamic_real", + "type": "JSON" + } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 4, + "column": { "name": "item_id", "type": "STRING" } + } + ], + "rows": [ + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 0, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 1, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 2, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 3, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 4, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 5, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 6, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 7, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 8, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 9, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + } + ] + } + }, + "image": { + "summary": "a column with images (only 3 rows are shown for brevity)", + "value": { + "columns": [ + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "column_idx": 0, + "column": { + "name": "imageA", + "type": "RELATIVE_IMAGE_URL" + } + }, + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "column_idx": 1, + "column": { + "name": "imageB", + "type": "RELATIVE_IMAGE_URL" + } + } + ], + "rows": [ + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "row_idx": 0, + "row": { + "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageA/image.jpg", + "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageB/image.jpg" + }, + "truncated_cells": [] + }, + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "row_idx": 1, + "row": { + "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageA/image.jpg", + "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageB/image.jpg" + }, + "truncated_cells": [] + }, + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "row_idx": 2, + "row": { + "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageA/image.jpg", + "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageB/image.jpg" + }, + "truncated_cells": [] + } + ] + } + }, + "audio": { + "summary": "a column with audio files (only 3 rows are shown for brevity)", + "value": { + "columns": [ + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 0, + "column": { "name": "client_id", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 1, + "column": { "name": "path", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 2, + "column": { + "name": "audio", + "type": "AUDIO_RELATIVE_SOURCES" + } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 3, + "column": { "name": "sentence", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 4, + "column": { "name": "up_votes", "type": "INT" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 5, + "column": { "name": "down_votes", "type": "INT" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 6, + "column": { "name": "age", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 7, + "column": { "name": "gender", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 8, + "column": { "name": "accent", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 9, + "column": { "name": "locale", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 10, + "column": { "name": "segment", "type": "STRING" } + } + ], + "rows": [ + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "row_idx": 0, + "row": { + "client_id": "04960d53cc851eeb6d93f21a09e09ab36fe16943acb226ced1211d7250ab2f1b9a1d655c1cc03d50006e396010851ad52d4c53f49dd77b080b01c4230704c68d", + "path": null, + "audio": [ + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.mp3", + "type": "audio/mpeg" + }, + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.wav", + "type": "audio/wav" + } + ], + "sentence": "Why does Melissandre look like she wants to consume Jon Snow on the ride up the wall?", + "up_votes": 2, + "down_votes": 0, + "age": "fourties", + "gender": "male", + "accent": "United States English", + "locale": "en", + "segment": "" + }, + "truncated_cells": [] + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "row_idx": 1, + "row": { + "client_id": "f9f1f96bae1390dfe61ff298abb90975c079e913c712d57d97307ed797469eac446abb149daaad24cacffcc24e1e3275fefeb97f977eb74ce2233e0e5c1d437e", + "path": null, + "audio": [ + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.mp3", + "type": "audio/mpeg" + }, + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.wav", + "type": "audio/wav" + } + ], + "sentence": "\"I'm getting them for twelve dollars a night.\"", + "up_votes": 2, + "down_votes": 0, + "age": "", + "gender": "", + "accent": "", + "locale": "en", + "segment": "" + }, + "truncated_cells": [] + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "row_idx": 2, + "row": { + "client_id": "a6c7706a220eeea7ee3687c1122fe7ac17962d2449d25b6db37cc41cdaace442683e11945b6f581e73941c3083cd4eecfafc938840459cd8c571dae7774ee687", + "path": null, + "audio": [ + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.mp3", + "type": "audio/mpeg" + }, + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.wav", + "type": "audio/wav" + } + ], + "sentence": "Tower of strength", + "up_votes": 2, + "down_votes": 0, + "age": "", + "gender": "", + "accent": "", + "locale": "en", + "segment": "" + }, + "truncated_cells": [] + } + ] + } + } + } + } + } + }, + "400": { + "description": "The dataset has some issue that prevents extracting the list of rows.<br/>The error response should give insights to help fix the issue.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/StatusErrorContent" + }, + "examples": { + "NonMatchingCheckError": { + "summary": "NonMatchingCheckError", + "value": { + "status_code": 400, + "exception": "Status400Error", + "message": "Cannot get the first rows for the split.", + "cause_exception": "NonMatchingChecksumError", + "cause_message": "Checksums didn't match for dataset source files:\n['https://gitlab.com/bigirqu/ArCOV-19/-/archive/master/ArCOV-19-master.zip']", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 180, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 40, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 599, in __iter__\n for key, example in self._iter():\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 579, in _iter\n yield from ex_iterable\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 110, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", + " File \"/cache/modules/datasets_modules/datasets/ar_cov19/818d9b774f4b70542b6807e6ddb6db32c916aafeba4fbdcd228ec79d21edaeab/ar_cov19.py\", line 131, in _generate_examples\n for fname in sorted(glob.glob(os.path.join(data_dir, \"ArCOV-19-master/dataset/all_tweets/2020-*\"))):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/streaming.py\", line 67, in wrapper\n return function(*args, use_auth_token=use_auth_token, **kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 500, in xglob\n fs, *_ = fsspec.get_fs_token_paths(urlpath, storage_options=storage_options)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/core.py\", line 632, in get_fs_token_paths\n fs = filesystem(protocol, **inkwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/registry.py\", line 262, in filesystem\n return cls(**storage_options)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/spec.py\", line 76, in __call__\n obj = super().__call__(*args, **kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/zip.py\", line 58, in __init__\n self.zip = zipfile.ZipFile(self.fo)\n", + " File \"/usr/local/lib/python3.9/zipfile.py\", line 1257, in __init__\n self._RealGetContents()\n", + " File \"/usr/local/lib/python3.9/zipfile.py\", line 1320, in _RealGetContents\n endrec = _EndRecData(fp)\n", + " File \"/usr/local/lib/python3.9/zipfile.py\", line 263, in _EndRecData\n fpin.seek(0, 2)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 684, in seek\n raise ValueError(\"Cannot seek streaming HTTP file\")\n", + "ValueError: Cannot seek streaming HTTP file\n", + "\nDuring handling of the above exception, another exception occurred:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 183, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 27, in get_rows\n dataset = load_dataset(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1679, in load_dataset\n builder_instance.download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 704, in download_and_prepare\n self._download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1221, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 775, in _download_and_prepare\n verify_checksums(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/info_utils.py\", line 40, in verify_checksums\n raise NonMatchingChecksumError(error_msg + str(bad_urls))\n", + "datasets.utils.info_utils.NonMatchingChecksumError: Checksums didn't match for dataset source files:\n['https://gitlab.com/bigirqu/ArCOV-19/-/archive/master/ArCOV-19-master.zip']\n" @@ -411 +1816 @@ - "message": "Cannot get the split names for the dataset.", + "message": "Cannot get the first rows for the split.", @@ -413 +1818 @@ - "cause_message": "Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.", + "cause_message": "Couldn't find file at https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz", @@ -416,4 +1821,41 @@ - " File \"/src/services/worker/src/worker/models/dataset.py\", line 18, in get_dataset_split_full_names\n for config_name in get_dataset_config_names(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 289, in get_dataset_config_names\n dataset_module = dataset_module_factory(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1189, in dataset_module_factory\n raise FileNotFoundError(\n", - "FileNotFoundError: Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.\n" + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 391, in _info\n await _file_info(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 772, in _file_info\n r.raise_for_status()\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/aiohttp/client_reqrep.py\", line 1004, in raise_for_status\n raise ClientResponseError(\n", + "aiohttp.client_exceptions.ClientResponseError: 404, message='Not Found', url=URL('https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz')\n", + "\nThe above exception was the direct cause of the following exception:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 180, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 40, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 599, in __iter__\n for key, example in self._iter():\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 579, in _iter\n yield from ex_iterable\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 110, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", + " File \"/cache/modules/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 123, in _generate_examples\n for path, f in files:\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 732, in __iter__\n yield from self.generator(*self.args, **self.kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 759, in _iter_from_urlpath\n with xopen(urlpath, \"rb\", use_auth_token=use_auth_token) as f:\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 439, in xopen\n file_obj = fsspec.open(file, mode=mode, *args, **kwargs).open()\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/core.py\", line 141, in open\n out = self.__enter__()\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/core.py\", line 104, in __enter__\n f = self.fs.open(self.path, mode=mode)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/spec.py\", line 1037, in open\n f = self._open(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 340, in _open\n size = size or self.info(path, **kwargs)[\"size\"]\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/asyn.py\", line 86, in wrapper\n return sync(self.loop, func, *args, **kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/asyn.py\", line 66, in sync\n raise return_result\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/asyn.py\", line 26, in _runner\n result[0] = await coro\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 404, in _info\n raise FileNotFoundError(url) from exc\n", + "FileNotFoundError: https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz\n", + "\nDuring handling of the above exception, another exception occurred:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 183, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 27, in get_rows\n dataset = load_dataset(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1679, in load_dataset\n builder_instance.download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 704, in download_and_prepare\n self._download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1221, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 771, in _download_and_prepare\n split_generators = self._split_generators(dl_manager, **split_generators_kwargs)\n", + " File \"/cache/modules/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 95, in _split_generators\n archive = dl_manager.download(my_urls)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/download_manager.py\", line 309, in download\n downloaded_path_or_paths = map_nested(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/py_utils.py\", line 348, in map_nested\n return function(data_struct)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/download_manager.py\", line 335, in _download\n return cached_path(url_or_filename, download_config=download_config)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/file_utils.py\", line 185, in cached_path\n output_path = get_from_cache(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/file_utils.py\", line 530, in get_from_cache\n raise FileNotFoundError(f\"Couldn't find file at {url}\")\n", + "FileNotFoundError: Couldn't find file at https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz\n" @@ -448,3 +1890,21 @@ - "message": "Tried to save duplicate unique keys (E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }, full error: {'index': 0, 'code': 11000, 'keyPattern': {'dataset_name': 1, 'config_name': 1, 'split_name': 1}, 'keyValue': {'dataset_name': 'csebuetnlp/xlsum', 'config_name': 'chinese_traditional', 'split_name': 'test'}, 'errmsg': 'E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }'})", - "cause_exception": "Status500Error", - "cause_message": "Tried to save duplicate unique keys (E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }, full error: {'index': 0, 'code': 11000, 'keyPattern': {'dataset_name': 1, 'config_name': 1, 'split_name': 1}, 'keyValue': {'dataset_name': 'csebuetnlp/xlsum', 'config_name': 'chinese_traditional', 'split_name': 'test'}, 'errmsg': 'E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }'})" + "message": "could not store the rows/ cache entry.", + "cause_exception": "DocumentTooLarge", + "cause_message": "'update' command document too large", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libcache/cache.py\", line 245, in upsert_split\n DbSplit.objects(dataset_name=dataset_name, config_name=config_name, split_name=split_name).upsert_one(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/mongoengine/queryset/base.py\", line 606, in upsert_one\n atomic_update = self.update(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/mongoengine/queryset/base.py\", line 578, in update\n result = update_func(query, update, upsert=upsert)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 1028, in update_one\n self._update_retryable(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 877, in _update_retryable\n return self.__database.client._retryable_write(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1552, in _retryable_write\n return self._retry_with_session(retryable, func, s, None)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1438, in _retry_with_session\n return self._retry_internal(retryable, func, session, bulk)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1470, in _retry_internal\n return func(session, sock_info, retryable)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 869, in _update\n return self._update(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 838, in _update\n result = sock_info.command(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/pool.py\", line 726, in command\n self._raise_connection_failure(error)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/pool.py\", line 710, in command\n return command(self, dbname, spec, secondary_ok,\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/network.py\", line 136, in command\n message._raise_document_too_large(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/message.py\", line 1140, in _raise_document_too_large\n raise DocumentTooLarge(\"%r command document too large\" % (operation,))\n", + "pymongo.errors.DocumentTooLarge: 'update' command document too large\n" + ] @@ -460 +1920 @@ - "/rows": { + "/first-rows": { @@ -462 +1922 @@ - "summary": "First rows of a split", + "summary": "First rows of a split (will soon replace /rows)", @@ -525 +1985 @@ - "description": "The columns, and the 100 first rows of the split.</br>Note: the response can be truncated (less rows, or truncated cell contents): see examples.", + "description": "The <a href='https://huggingface.co/docs/datasets/about_dataset_features'>features</a>, and the 100 first rows of the split.</br>Note: the response can be truncated (less rows, or truncated cell contents): see examples.", @@ -537 +1997 @@ - "$ref": "#/components/schemas/RowsResponse" + "$ref": "#/components/schemas/FirstRowsResponse" @@ -543 +2003 @@ - "columns": [ + "features": [ @@ -548,2 +2008,7 @@ - "column_idx": 0, - "column": { "name": "sentence", "type": "STRING" } + "idx": 0, + "name": "sentence", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -555,5 +2020,7 @@ - "column_idx": 1, - "column": { - "name": "label", - "type": "CLASS_LABEL", - "labels": ["unacceptable", "acceptable"] + "idx": 1, + "name": "label", + "type": { + "num_classes": 2, + "names": ["unacceptable", "acceptable"], + "id": null, + "_type": "ClassLabel" @@ -566,2 +2033,7 @@ - "column_idx": 2, - "column": { "name": "idx", "type": "INT" } + "idx": 2, + "name": "idx", + "type": { + "dtype": "int32", + "id": null, + "_type": "Value" + } @@ -625 +2097 @@ - "columns": [ + "features": [ @@ -630,6 +2102,6 @@ - "column_idx": 0, - "column": { - "name": "start", - "type": "TIMESTAMP", - "tz": null, - "unit": "s" + "idx": 0, + "name": "start", + "type": { + "dtype": "timestamp[s]", + "id": null, + "_type": "Value" @@ -642,2 +2114,12 @@ - "column_idx": 1, - "column": { "name": "target", "type": "JSON" } + "idx": 1, + "name": "target", + "type": { + "feature": { + "dtype": "float32", + "id": null, + "_type": "Value" + }, + "length": -1, + "id": null, + "_type": "Sequence" + } @@ -649,4 +2131,11 @@ - "column_idx": 2, - "column": { - "name": "feat_static_cat", - "type": "JSON" + "idx": 2, + "name": "feat_static_cat", + "type": { + "feature": { + "dtype": "uint64", + "id": null, + "_type": "Value" + }, + "length": -1, + "id": null, + "_type": "Sequence" @@ -659,4 +2148,16 @@ - "column_idx": 3, - "column": { - "name": "feat_dynamic_real", - "type": "JSON" + "idx": 3, + "name": "feat_dynamic_real", + "type": { + "feature": { + "feature": { + "dtype": "float32", + "id": null, + "_type": "Value" + }, + "length": -1, + "id": null, + "_type": "Sequence" + }, + "length": -1, + "id": null, + "_type": "Sequence" @@ -669,2 +2170,7 @@ - "column_idx": 4, - "column": { "name": "item_id", "type": "STRING" } + "idx": 4, + "name": "item_id", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -680 +2186 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -694 +2200 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -708 +2214 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -722 +2228 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -736 +2242 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -750 +2256 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -764 +2270 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -778 +2284 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -792 +2298 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -806 +2312 @@ - "start": 1467331200.0, + "start": "2016-07-01T00:00:00", @@ -820 +2326 @@ - "columns": [ + "features": [ @@ -825,4 +2331,6 @@ - "column_idx": 0, - "column": { - "name": "imageA", - "type": "RELATIVE_IMAGE_URL" + "idx": 0, + "name": "imageA", + "type": { + "decode": true, + "id": null, + "_type": "Image" @@ -835,4 +2343,6 @@ - "column_idx": 1, - "column": { - "name": "imageB", - "type": "RELATIVE_IMAGE_URL" + "idx": 1, + "name": "imageB", + "type": { + "decode": true, + "id": null, + "_type": "Image" @@ -849,2 +2359,2 @@ - "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageA/image.jpg", - "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageB/image.jpg" + "imageA": "https://datasets-server.us.dev.moon.huggingface.tech/assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageA/image.jpg", + "imageB": "https://datasets-server.us.dev.moon.huggingface.tech/assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageB/image.jpg" @@ -860,2 +2370,2 @@ - "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageA/image.jpg", - "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageB/image.jpg" + "imageA": "https://datasets-server.us.dev.moon.huggingface.tech/assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageA/image.jpg", + "imageB": "https://datasets-server.us.dev.moon.huggingface.tech/assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageB/image.jpg" @@ -871,2 +2381,2 @@ - "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageA/image.jpg", - "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageB/image.jpg" + "imageA": "https://datasets-server.us.dev.moon.huggingface.tech/assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageA/image.jpg", + "imageB": "https://datasets-server.us.dev.moon.huggingface.tech/assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageB/image.jpg" @@ -882 +2392 @@ - "columns": [ + "features": [ @@ -887,2 +2397,7 @@ - "column_idx": 0, - "column": { "name": "client_id", "type": "STRING" } + "idx": 0, + "name": "client_id", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -894,2 +2409,7 @@ - "column_idx": 1, - "column": { "name": "path", "type": "STRING" } + "idx": 1, + "name": "path", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -901,4 +2421,8 @@ - "column_idx": 2, - "column": { - "name": "audio", - "type": "AUDIO_RELATIVE_SOURCES" + "idx": 2, + "name": "audio", + "type": { + "sampling_rate": 48000, + "mono": true, + "decode": true, + "id": null, + "_type": "Audio" @@ -911,2 +2435,7 @@ - "column_idx": 3, - "column": { "name": "sentence", "type": "STRING" } + "idx": 3, + "name": "sentence", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -918,2 +2447,7 @@ - "column_idx": 4, - "column": { "name": "up_votes", "type": "INT" } + "idx": 4, + "name": "up_votes", + "type": { + "dtype": "int64", + "id": null, + "_type": "Value" + } @@ -925,2 +2459,7 @@ - "column_idx": 5, - "column": { "name": "down_votes", "type": "INT" } + "idx": 5, + "name": "down_votes", + "type": { + "dtype": "int64", + "id": null, + "_type": "Value" + } @@ -932,2 +2471,7 @@ - "column_idx": 6, - "column": { "name": "age", "type": "STRING" } + "idx": 6, + "name": "age", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -939,2 +2483,7 @@ - "column_idx": 7, - "column": { "name": "gender", "type": "STRING" } + "idx": 7, + "name": "gender", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -946,2 +2495,7 @@ - "column_idx": 8, - "column": { "name": "accent", "type": "STRING" } + "idx": 8, + "name": "accent", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -953,2 +2507,7 @@ - "column_idx": 9, - "column": { "name": "locale", "type": "STRING" } + "idx": 9, + "name": "locale", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -960,2 +2519,7 @@ - "column_idx": 10, - "column": { "name": "segment", "type": "STRING" } + "idx": 10, + "name": "segment", + "type": { + "dtype": "string", + "id": null, + "_type": "Value" + } @@ -975 +2539 @@ - "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.mp3", + "src": "https://datasets-server.us.dev.moon.huggingface.tech/assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.mp3", @@ -979 +2543 @@ - "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.wav", + "src": "https://datasets-server.us.dev.moon.huggingface.tech/assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.wav", @@ -1004 +2568 @@ - "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.mp3", + "src": "https://datasets-server.us.dev.moon.huggingface.tech/assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.mp3", @@ -1008 +2572 @@ - "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.wav", + "src": "https://datasets-server.us.dev.moon.huggingface.tech/assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.wav", @@ -1033 +2597 @@ - "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.mp3", + "src": "https://datasets-server.us.dev.moon.huggingface.tech/assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.mp3", @@ -1037 +2601 @@ - "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.wav", + "src": "https://datasets-server.us.dev.moon.huggingface.tech/assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.wav", @@ -1060 +2624 @@ - "description": "The dataset has some issue that prevents extracting the list of rows.<br/>The error response should give insights to help fix the issue.", + "description": "The dataset has some issue that prevents extracting the list of features, or the list of rows.<br/>The error response should give insights to help fix the issue.<br/>The client should not retry the request, because the response will not change until the dataset is fixed.", @@ -1072 +2636 @@ - "$ref": "#/components/schemas/StatusErrorContent" + "$ref": "#/components/schemas/Status400ErrorContent" @@ -1079,2 +2643 @@ - "exception": "Status400Error", - "message": "Cannot get the first rows for the split.", + "message": "Cannot load the dataset split (in normal download mode) to extract the first rows.", @@ -1085 +2648 @@ - " File \"/src/services/worker/src/worker/models/split.py\", line 180, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", + " File \"/src/services/worker/src/worker/models/first_rows.py\", line 214, in get_first_rows\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", @@ -1087,5 +2650,5 @@ - " File \"/src/services/worker/src/worker/models/row.py\", line 40, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 599, in __iter__\n for key, example in self._iter():\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 579, in _iter\n yield from ex_iterable\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 110, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", - " File \"/cache/modules/datasets_modules/datasets/ar_cov19/818d9b774f4b70542b6807e6ddb6db32c916aafeba4fbdcd228ec79d21edaeab/ar_cov19.py\", line 131, in _generate_examples\n for fname in sorted(glob.glob(os.path.join(data_dir, \"ArCOV-19-master/dataset/all_tweets/2020-*\"))):\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 39, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 718, in __iter__\n for key, example in self._iter():\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 708, in _iter\n yield from ex_iterable\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 112, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", + " File \"/tmp/modules-cache/datasets_modules/datasets/ar_cov19/818d9b774f4b70542b6807e6ddb6db32c916aafeba4fbdcd228ec79d21edaeab/ar_cov19.py\", line 131, in _generate_examples\n for fname in sorted(glob.glob(os.path.join(data_dir, \"ArCOV-19-master/dataset/all_tweets/2020-*\"))):\n", @@ -1105 +2668 @@ - " File \"/src/services/worker/src/worker/models/split.py\", line 183, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", + " File \"/src/services/worker/src/worker/models/first_rows.py\", line 221, in get_first_rows\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", @@ -1108 +2671 @@ - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1679, in load_dataset\n builder_instance.download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1732, in load_dataset\n builder_instance.download_and_prepare(\n", @@ -1110 +2673 @@ - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1221, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1227, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", @@ -1121,2 +2684 @@ - "exception": "Status400Error", - "message": "Cannot get the first rows for the split.", + "message": "Cannot load the dataset split (in normal download mode) to extract the first rows.", @@ -1133 +2695 @@ - " File \"/src/services/worker/src/worker/models/split.py\", line 180, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", + " File \"/src/services/worker/src/worker/models/first_rows.py\", line 214, in get_first_rows\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", @@ -1135,5 +2697,5 @@ - " File \"/src/services/worker/src/worker/models/row.py\", line 40, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 599, in __iter__\n for key, example in self._iter():\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 579, in _iter\n yield from ex_iterable\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 110, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", - " File \"/cache/modules/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 123, in _generate_examples\n for path, f in files:\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 39, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 718, in __iter__\n for key, example in self._iter():\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 708, in _iter\n yield from ex_iterable\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 112, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", + " File \"/tmp/modules-cache/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 123, in _generate_examples\n for path, f in files:\n", @@ -1154 +2716 @@ - " File \"/src/services/worker/src/worker/models/split.py\", line 183, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", + " File \"/src/services/worker/src/worker/models/first_rows.py\", line 221, in get_first_rows\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", @@ -1157 +2719 @@ - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1679, in load_dataset\n builder_instance.download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1732, in load_dataset\n builder_instance.download_and_prepare(\n", @@ -1159 +2721 @@ - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1221, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1227, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", @@ -1161 +2723 @@ - " File \"/cache/modules/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 95, in _split_generators\n archive = dl_manager.download(my_urls)\n", + " File \"/tmp/modules-cache/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 95, in _split_generators\n archive = dl_manager.download(my_urls)\n", @@ -1176 +2738 @@ - "description": "The server encountered an error.", + "description": "The server encountered an error, or the response still hasn't been generated (the process is asynchronous). The client should retry after a time, in particular in the case of the response still being processed. If the error does not vanish, it's possibly due to a bug in the API software and should be reported.", @@ -1188 +2750 @@ - "$ref": "#/components/schemas/StatusErrorContent" + "$ref": "#/components/schemas/Status500ErrorContent" @@ -1191 +2753,8 @@ - "mongo": { + "not-ready": { + "summary": "the response is not ready yet.", + "value": { + "status_code": 500, + "message": "The list of the first rows is not ready yet. Please retry later." + } + }, + "internal": { @@ -1195,22 +2764 @@ - "exception": "Status500Error", - "message": "could not store the rows/ cache entry.", - "cause_exception": "DocumentTooLarge", - "cause_message": "'update' command document too large", - "cause_traceback": [ - "Traceback (most recent call last):\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libcache/cache.py\", line 245, in upsert_split\n DbSplit.objects(dataset_name=dataset_name, config_name=config_name, split_name=split_name).upsert_one(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/mongoengine/queryset/base.py\", line 606, in upsert_one\n atomic_update = self.update(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/mongoengine/queryset/base.py\", line 578, in update\n result = update_func(query, update, upsert=upsert)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 1028, in update_one\n self._update_retryable(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 877, in _update_retryable\n return self.__database.client._retryable_write(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1552, in _retryable_write\n return self._retry_with_session(retryable, func, s, None)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1438, in _retry_with_session\n return self._retry_internal(retryable, func, session, bulk)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1470, in _retry_internal\n return func(session, sock_info, retryable)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 869, in _update\n return self._update(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 838, in _update\n result = sock_info.command(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/pool.py\", line 726, in command\n self._raise_connection_failure(error)\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/pool.py\", line 710, in command\n return command(self, dbname, spec, secondary_ok,\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/network.py\", line 136, in command\n message._raise_document_too_large(\n", - " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/message.py\", line 1140, in _raise_document_too_large\n raise DocumentTooLarge(\"%r command document too large\" % (operation,))\n", - "pymongo.errors.DocumentTooLarge: 'update' command document too large\n" - ] + "message": "Unexpected error."
01521ec0a31e3e9a5b0fa88757ce659d2ae163bd
Sylvain Lesage
2022-07-21T14:39:51
404 improve error messages (#444)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 11bb3d22..edad860d 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,2 +3,2 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-9e66a36", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-c05b21f", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-b9b0a95", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-b9b0a95", @@ -7,4 +7,4 @@ - "datasets": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54", - "firstRows": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54", - "splits": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54", - "splitsNext": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54" + "datasets": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-52a3066", + "firstRows": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-52a3066", + "splits": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-52a3066", + "splitsNext": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-52a3066" diff --git a/libs/libcache/dist/libcache-0.1.11-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.11-py3-none-any.whl new file mode 100644 index 00000000..8bbd564d Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.11-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.11.tar.gz b/libs/libcache/dist/libcache-0.1.11.tar.gz new file mode 100644 index 00000000..58df8bf1 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.11.tar.gz differ diff --git a/libs/libcache/dist/libcache-0.1.12-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.12-py3-none-any.whl new file mode 100644 index 00000000..9a05486f Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.12-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.12.tar.gz b/libs/libcache/dist/libcache-0.1.12.tar.gz new file mode 100644 index 00000000..ec870f81 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.12.tar.gz differ diff --git a/libs/libcache/poetry.lock b/libs/libcache/poetry.lock index 2d86434f..e3d16c1c 100644 --- a/libs/libcache/poetry.lock +++ b/libs/libcache/poetry.lock @@ -5 +5 @@ description = "High level compatibility layer for multiple asynchronous event lo -category = "main" +category = "dev" @@ -50 +50 @@ name = "azure-core" -version = "1.24.1" +version = "1.24.2" @@ -52 +52 @@ description = "Microsoft Azure Core Library for Python" -category = "main" +category = "dev" @@ -65 +65 @@ description = "Microsoft Azure Identity Library for Python" -category = "main" +category = "dev" @@ -78 +78 @@ name = "azure-storage-blob" -version = "12.12.0" +version = "12.13.0" @@ -80 +80 @@ description = "Microsoft Azure Blob Storage Client Library for Python" -category = "main" +category = "dev" @@ -134 +134 @@ description = "Python package for providing Mozilla's CA Bundle." -category = "main" +category = "dev" @@ -140 +140 @@ name = "cffi" -version = "1.15.0" +version = "1.15.1" @@ -142 +142 @@ description = "Foreign Function Interface for Python calling C code." -category = "main" +category = "dev" @@ -153 +153 @@ description = "The Real First Universal Charset Detector. Open, modern and activ -category = "main" +category = "dev" @@ -175 +175 @@ description = "Cross-platform colored terminal text." -category = "main" +category = "dev" @@ -192 +192 @@ name = "cryptography" -version = "37.0.2" +version = "37.0.4" @@ -194 +194 @@ description = "cryptography is a package which provides cryptographic recipes an -category = "main" +category = "dev" @@ -225 +225 @@ description = "Pythonic argument parser, that will make you smile" -category = "main" +category = "dev" @@ -249 +249 @@ description = "Python utilities used by Deep Procedural Intelligence" -category = "main" +category = "dev" @@ -268 +268 @@ description = "Transport classes and utilities shared among Python Elastic clien -category = "main" +category = "dev" @@ -281 +281 @@ name = "elasticsearch" -version = "8.2.2" +version = "8.3.1" @@ -283 +283 @@ description = "Python client for Elasticsearch" -category = "main" +category = "dev" @@ -311 +311 @@ description = "This library contains various utils to parse GitHub repositories -category = "main" +category = "dev" @@ -331 +331 @@ description = "Clean single-source support for Python 3 and 2" -category = "main" +category = "dev" @@ -339 +339 @@ description = "Git Object Database" -category = "main" +category = "dev" @@ -350 +350 @@ description = "GitPython is a python library used to interact with Git repositor -category = "main" +category = "dev" @@ -361 +361 @@ description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" +category = "dev" @@ -377 +377 @@ description = "An ISO 8601 date/time/duration parser and formatter" -category = "main" +category = "dev" @@ -400 +400 @@ name = "libutils" -version = "0.1.2" +version = "0.1.4" @@ -402 +402 @@ description = "Library for utils" -category = "main" +category = "dev" @@ -413 +413 @@ type = "file" -url = "../libutils/dist/libutils-0.1.2-py3-none-any.whl" +url = "../libutils/dist/libutils-0.1.4-py3-none-any.whl" @@ -446 +446 @@ description = "The Microsoft Authentication Library (MSAL) for Python library en -category = "main" +category = "dev" @@ -459 +459 @@ description = "Microsoft Authentication Library extensions (MSAL EX) provides a -category = "main" +category = "dev" @@ -474 +474 @@ description = "AutoRest swagger generator Python client runtime." -category = "main" +category = "dev" @@ -514 +514 @@ name = "numpy" -version = "1.22.4" +version = "1.23.1" @@ -516 +516 @@ description = "NumPy is the fundamental package for array computing with Python. -category = "main" +category = "dev" @@ -524 +524 @@ description = "A generic, spec-compliant, thorough implementation of the OAuth r -category = "main" +category = "dev" @@ -535 +535 @@ name = "orjson" -version = "3.7.2" +version = "3.7.8" @@ -537 +537 @@ description = "Fast, correct Python JSON library supporting dataclasses, datetim -category = "main" +category = "dev" @@ -554 +554 @@ name = "pandas" -version = "1.4.2" +version = "1.4.3" @@ -556 +556 @@ description = "Powerful data structures for data analysis, time series, and stat -category = "main" +category = "dev" @@ -625 +625 @@ name = "portalocker" -version = "2.4.0" +version = "2.5.1" @@ -627 +627 @@ description = "Wraps the portalocker recipe for easy usage" -category = "main" +category = "dev" @@ -637 +637 @@ redis = ["redis"] -tests = ["pytest (>=5.4.1)", "pytest-cov (>=2.8.1)", "sphinx (>=3.0.3)", "pytest-mypy (>=0.8.0)", "redis"] +tests = ["pytest (>=5.4.1)", "pytest-cov (>=2.8.1)", "pytest-timeout (>=2.1.0)", "sphinx (>=3.0.3)", "pytest-mypy (>=0.8.0)", "redis"] @@ -659 +659 @@ description = "C parser in Python" -category = "main" +category = "dev" @@ -675 +675 @@ description = "Python interface to Hive" -category = "main" +category = "dev" @@ -694 +694 @@ description = "JSON Web Token implementation in Python" -category = "main" +category = "dev" @@ -778 +778 @@ name = "python-arango" -version = "7.3.4" +version = "7.4.1" @@ -780 +780 @@ description = "Python Driver for ArangoDB" -category = "main" +category = "dev" @@ -791 +791 @@ urllib3 = ">=1.26.0" -dev = ["black (>=22.3.0)", "flake8 (>=4.0.1)", "isort (>=5.10.1)", "mypy (>=0.942)", "mock", "pre-commit (>=2.17.0)", "pytest (>=7.1.1)", "pytest-cov (>=3.0.0)", "sphinx", "sphinx-rtd-theme", "types-pkg-resources", "types-requests"] +dev = ["black (>=22.3.0)", "flake8 (>=4.0.1)", "isort (>=5.10.1)", "mypy (>=0.942)", "mock", "pre-commit (>=2.17.0)", "pytest (>=7.1.1)", "pytest-cov (>=3.0.0)", "sphinx", "sphinx-rtd-theme", "types-pkg-resources", "types-requests", "types-setuptools"] @@ -797 +797 @@ description = "Extensions to the standard Python datetime module" -category = "main" +category = "dev" @@ -808 +808 @@ description = "World timezone definitions, modern and historical" -category = "main" +category = "dev" @@ -816 +816 @@ description = "Python for Window Extensions" -category = "main" +category = "dev" @@ -830 +830 @@ name = "regex" -version = "2022.6.2" +version = "2022.7.9" @@ -832 +832 @@ description = "Alternative regular expression module, to replace re." -category = "main" +category = "dev" @@ -840 +840 @@ description = "Python HTTP for Humans." -category = "main" +category = "dev" @@ -858 +858 @@ description = "OAuthlib authentication support for Requests." -category = "main" +category = "dev" @@ -873 +873 @@ description = "A utility belt for advanced users of python-requests" -category = "main" +category = "dev" @@ -898 +898 @@ description = "SentencePiece python wrapper" -category = "main" +category = "dev" @@ -906 +906 @@ description = "A Python library of set similarity search algorithms" -category = "main" +category = "dev" @@ -920 +920 @@ description = "Python 2 and 3 compatibility utilities" -category = "main" +category = "dev" @@ -928 +928 @@ description = "A pure Python implementation of a sliding window memory map manag -category = "main" +category = "dev" @@ -936 +936 @@ description = "Sniff out which async library your code is running under" -category = "main" +category = "dev" @@ -944 +944 @@ description = "The little ASGI library that shines." -category = "main" +category = "dev" @@ -993 +993 @@ description = "Fast, Extensible Progress Meter" -category = "main" +category = "dev" @@ -1010 +1010 @@ description = "Python bindings to the Tree-sitter parsing library" -category = "main" +category = "dev" @@ -1026 +1026 @@ description = "Backported and Experimental Type Hints for Python 3.7+" -category = "main" +category = "dev" @@ -1034 +1034 @@ description = "HTTP library with thread-safe connection pooling, file post, and -category = "main" +category = "dev" @@ -1046 +1046 @@ python-versions = "3.9.6" -content-hash = "9365f519efd0cf59fd0e21f88b4bbbd1ac1c78258d1ca994f1efb3b4820e0359" +content-hash = "b45e654e62ce957eb711db3133609c1f20efff1f52eeae20293f2269d31d5389" @@ -1065,4 +1065 @@ attrs = [ -azure-core = [ - {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, - {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, -] +azure-core = [] @@ -1073,4 +1070 @@ azure-identity = [ -azure-storage-blob = [ - {file = "azure-storage-blob-12.12.0.zip", hash = "sha256:f6daf07d1ca86d189ae15c9b1859dff5b7127bf24a07a4bbe41e0b81e01d62f7"}, - {file = "azure_storage_blob-12.12.0-py3-none-any.whl", hash = "sha256:1eac4c364309ccc193c80ee26c78d25dfbf10926b1309095a448a7a0388526eb"}, -] +azure-storage-blob = [] @@ -1110,52 +1104 @@ certifi = [ -cffi = [ - {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, - {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, - {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, - {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, - {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, - {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, - {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, - {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, - {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, - {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, - {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, - {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, - {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, - {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, - {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, - {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, - {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, -] +cffi = [] @@ -1217,24 +1160 @@ coverage = [ -cryptography = [ - {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181"}, - {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178"}, - {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a"}, - {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15"}, - {file = "cryptography-37.0.2-cp36-abi3-win32.whl", hash = "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0"}, - {file = "cryptography-37.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d"}, - {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9"}, - {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452"}, - {file = "cryptography-37.0.2.tar.gz", hash = "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e"}, -] +cryptography = [] @@ -1260,4 +1180 @@ elastic-transport = [ -elasticsearch = [ - {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, - {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, -] +elasticsearch = [] @@ -1300 +1217 @@ libutils = [ - {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, + {file = "libutils-0.1.4-py3-none-any.whl", hash = "sha256:d695e4e8e2d6bbc7bac832dce6493f350783701ecdc2e2c72cd7232d15067952"}, @@ -1354,24 +1271 @@ mypy-extensions = [ -numpy = [ - {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, - {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, - {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, - {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, - {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, - {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, - {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, - {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, - {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, - {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, - {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, - {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, - {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, - {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, - {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, - {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, - {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, - {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, - {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, - {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, - {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, - {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, -] +numpy = [] @@ -1382,35 +1276 @@ oauthlib = [ -orjson = [ - {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, - {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, - {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, - {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, - {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, - {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, - {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, - {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, - {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, - {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, - {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, - {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, - {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, - {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, - {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, - {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, - {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, -] +orjson = [] @@ -1421,23 +1281 @@ packaging = [ -pandas = [ - {file = "pandas-1.4.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:be67c782c4f1b1f24c2f16a157e12c2693fd510f8df18e3287c77f33d124ed07"}, - {file = "pandas-1.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5a206afa84ed20e07603f50d22b5f0db3fb556486d8c2462d8bc364831a4b417"}, - {file = "pandas-1.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0010771bd9223f7afe5f051eb47c4a49534345dfa144f2f5470b27189a4dd3b5"}, - {file = "pandas-1.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3228198333dd13c90b6434ddf61aa6d57deaca98cf7b654f4ad68a2db84f8cfe"}, - {file = "pandas-1.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b79af3a69e5175c6fa7b4e046b21a646c8b74e92c6581a9d825687d92071b51"}, - {file = "pandas-1.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:5586cc95692564b441f4747c47c8a9746792e87b40a4680a2feb7794defb1ce3"}, - {file = "pandas-1.4.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:061609334a8182ab500a90fe66d46f6f387de62d3a9cb9aa7e62e3146c712167"}, - {file = "pandas-1.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b8134651258bce418cb79c71adeff0a44090c98d955f6953168ba16cc285d9f7"}, - {file = "pandas-1.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:df82739e00bb6daf4bba4479a40f38c718b598a84654cbd8bb498fd6b0aa8c16"}, - {file = "pandas-1.4.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:385c52e85aaa8ea6a4c600a9b2821181a51f8be0aee3af6f2dcb41dafc4fc1d0"}, - {file = "pandas-1.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:295872bf1a09758aba199992c3ecde455f01caf32266d50abc1a073e828a7b9d"}, - {file = "pandas-1.4.2-cp38-cp38-win32.whl", hash = "sha256:95c1e422ced0199cf4a34385ff124b69412c4bc912011ce895582bee620dfcaa"}, - {file = "pandas-1.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:5c54ea4ef3823108cd4ec7fb27ccba4c3a775e0f83e39c5e17f5094cb17748bc"}, - {file = "pandas-1.4.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c072c7f06b9242c855ed8021ff970c0e8f8b10b35e2640c657d2a541c5950f59"}, - {file = "pandas-1.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f549097993744ff8c41b5e8f2f0d3cbfaabe89b4ae32c8c08ead6cc535b80139"}, - {file = "pandas-1.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ff08a14ef21d94cdf18eef7c569d66f2e24e0bc89350bcd7d243dd804e3b5eb2"}, - {file = "pandas-1.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c5bf555b6b0075294b73965adaafb39cf71c312e38c5935c93d78f41c19828a"}, - {file = "pandas-1.4.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51649ef604a945f781105a6d2ecf88db7da0f4868ac5d45c51cb66081c4d9c73"}, - {file = "pandas-1.4.2-cp39-cp39-win32.whl", hash = "sha256:d0d4f13e4be7ce89d7057a786023c461dd9370040bdb5efa0a7fe76b556867a0"}, - {file = "pandas-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:09d8be7dd9e1c4c98224c4dfe8abd60d145d934e9fc1f5f411266308ae683e6a"}, - {file = "pandas-1.4.2.tar.gz", hash = "sha256:92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12"}, -] +pandas = [] @@ -1464,4 +1302 @@ poetryup = [ -portalocker = [ - {file = "portalocker-2.4.0-py2.py3-none-any.whl", hash = "sha256:b092f48e1e30a234ab3dd1cfd44f2f235e8a41f4e310e463fc8d6798d1c3c235"}, - {file = "portalocker-2.4.0.tar.gz", hash = "sha256:a648ad761b8ea27370cb5915350122cd807b820d2193ed5c9cc28f163df637f4"}, -] +portalocker = [] @@ -1612,4 +1447 @@ pytest-cov = [ -python-arango = [ - {file = "python-arango-7.3.4.tar.gz", hash = "sha256:0725a453d46996396e4740e84ead32b36186e853a545044411fb7f624a1b71b3"}, - {file = "python_arango-7.3.4-py3-none-any.whl", hash = "sha256:e5e433b18bec8295e3e92a10f249de327b1a980e7ab9b1c38a5e5482b1e144e9"}, -] +python-arango = [] @@ -1675,76 +1507 @@ pyyaml = [ -regex = [ - {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, - {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, - {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, - {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, - {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, - {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, - {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, - {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, - {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, - {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, - {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, - {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, - {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, - {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, - {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, - {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, - {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, - {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, - {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, -] +regex = [] diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 01286dc5..1791137e 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.10" +version = "0.1.12" @@ -9 +8,0 @@ appdirs = "^1.4.4" -libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } @@ -19,0 +19 @@ isort = "^5.9.3" +libutils = { path = "../../libs/libutils/dist/libutils-0.1.4-py3-none-any.whl", develop = false } diff --git a/libs/libcache/tests/_utils.py b/libs/libcache/tests/_utils.py index 25debb96..8e973b35 100644 --- a/libs/libcache/tests/_utils.py +++ b/libs/libcache/tests/_utils.py @@ -3,2 +2,0 @@ import os -from libutils.utils import get_str_value - @@ -7,0 +6,8 @@ DEFAULT_MONGO_URL: str = "mongodb://localhost:27017" + +def get_str_value(d: os._Environ[str], key: str, default: str) -> str: + if key not in d: + return default + value = str(d.get(key)).strip() + return value or default + + diff --git a/libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl new file mode 100644 index 00000000..666e222f Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.9.tar.gz b/libs/libqueue/dist/libqueue-0.1.9.tar.gz new file mode 100644 index 00000000..096a6816 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.9.tar.gz differ diff --git a/libs/libqueue/poetry.lock b/libs/libqueue/poetry.lock index 708dcecf..049ae560 100644 --- a/libs/libqueue/poetry.lock +++ b/libs/libqueue/poetry.lock @@ -1,17 +0,0 @@ -[[package]] -name = "anyio" -version = "3.6.1" -description = "High level compatibility layer for multiple asynchronous event loop implementations" -category = "main" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -idna = ">=2.8" -sniffio = ">=1.1" - -[package.extras] -doc = ["packaging", "sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "contextlib2", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] -trio = ["trio (>=0.16)"] - @@ -40,41 +22,0 @@ tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (> -[[package]] -name = "azure-core" -version = "1.24.1" -description = "Microsoft Azure Core Library for Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -requests = ">=2.18.4" -six = ">=1.11.0" -typing-extensions = ">=4.0.1" - -[[package]] -name = "azure-identity" -version = "1.10.0" -description = "Microsoft Azure Identity Library for Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -azure-core = ">=1.11.0,<2.0.0" -cryptography = ">=2.5" -msal = ">=1.12.0,<2.0.0" -msal-extensions = ">=0.3.0,<2.0.0" -six = ">=1.12.0" - -[[package]] -name = "azure-storage-blob" -version = "12.12.0" -description = "Microsoft Azure Blob Storage Client Library for Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -azure-core = ">=1.23.1,<2.0.0" -cryptography = ">=2.1.4" -msrest = ">=0.6.21" - @@ -126 +68 @@ description = "Python package for providing Mozilla's CA Bundle." -category = "main" +category = "dev" @@ -130,11 +71,0 @@ python-versions = ">=3.6" -[[package]] -name = "cffi" -version = "1.15.0" -description = "Foreign Function Interface for Python calling C code." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -pycparser = "*" - @@ -145 +76 @@ description = "The Real First Universal Charset Detector. Open, modern and activ -category = "main" +category = "dev" @@ -167 +98 @@ description = "Cross-platform colored terminal text." -category = "main" +category = "dev" @@ -182,19 +112,0 @@ toml = ["tomli"] -[[package]] -name = "cryptography" -version = "37.0.2" -description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -cffi = ">=1.12" - -[package.extras] -docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] -docstest = ["pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] -pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] -sdist = ["setuptools_rust (>=0.11.4)"] -ssh = ["bcrypt (>=3.1.5)"] -test = ["pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] - @@ -213,8 +124,0 @@ IDNA = ["idna (>=2.1)"] -[[package]] -name = "docopt" -version = "0.6.2" -description = "Pythonic argument parser, that will make you smile" -category = "main" -optional = false -python-versions = "*" - @@ -237,49 +140,0 @@ pipenv = ["pipenv"] -[[package]] -name = "dpu-utils" -version = "0.6.1" -description = "Python utilities used by Deep Procedural Intelligence" -category = "main" -optional = false -python-versions = ">=3.6.1" - -[package.dependencies] -azure-identity = "*" -azure-storage-blob = "*" -cffi = "*" -docopt = "*" -numpy = "*" -regex = "*" -sentencepiece = "*" -SetSimilaritySearch = "*" -tqdm = "*" - -[[package]] -name = "elastic-transport" -version = "8.1.2" -description = "Transport classes and utilities shared among Python Elastic client libraries" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -certifi = "*" -urllib3 = ">=1.26.2,<2" - -[package.extras] -develop = ["pytest", "pytest-cov", "pytest-mock", "pytest-asyncio", "pytest-httpserver", "trustme", "mock", "requests", "aiohttp"] - -[[package]] -name = "elasticsearch" -version = "8.2.2" -description = "Python client for Elasticsearch" -category = "main" -optional = false -python-versions = ">=3.6, <4" - -[package.dependencies] -elastic-transport = ">=8,<9" - -[package.extras] -async = ["aiohttp (>=3,<4)"] -requests = ["requests (>=2.4.0,<3.0.0)"] - @@ -299,28 +153,0 @@ pyflakes = ">=2.3.0,<2.4.0" -[[package]] -name = "function-parser" -version = "0.0.3" -description = "This library contains various utils to parse GitHub repositories into function definition and docstring pairs. It is based on tree-sitter to parse code into ASTs and apply heuristics to parse metadata in more details. Currently, it supports 6 languages: Python, Java, Go, Php, Ruby, and Javascript. It also parses function calls and links them with their definitions for Python." -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -docopt = "*" -dpu-utils = "*" -elasticsearch = "*" -gitpython = "*" -pandas = "*" -pyhive = "*" -python-arango = "*" -requests = "*" -tqdm = "*" -tree-sitter = "0.0.5" - -[[package]] -name = "future" -version = "0.18.2" -description = "Clean single-source support for Python 3 and 2" -category = "main" -optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" - @@ -331 +158 @@ description = "Git Object Database" -category = "main" +category = "dev" @@ -342 +169 @@ description = "GitPython is a python library used to interact with Git repositor -category = "main" +category = "dev" @@ -353 +180 @@ description = "Internationalized Domain Names in Applications (IDNA)" -category = "main" +category = "dev" @@ -365,11 +191,0 @@ python-versions = "*" -[[package]] -name = "isodate" -version = "0.6.1" -description = "An ISO 8601 date/time/duration parser and formatter" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -six = "*" - @@ -390,17 +205,0 @@ plugins = ["setuptools"] -[[package]] -name = "libutils" -version = "0.1.2" -description = "Library for utils" -category = "main" -optional = false -python-versions = "==3.9.6" - -[package.dependencies] -function-parser = ">=0.0.3,<0.0.4" -orjson = ">=3.6.4,<4.0.0" -starlette = ">=0.16.0,<0.17.0" - -[package.source] -type = "file" -url = "../libutils/dist/libutils-0.1.2-py3-none-any.whl" - @@ -434,46 +232,0 @@ pymongo = ">=3.4,<5.0" -[[package]] -name = "msal" -version = "1.18.0" -description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -cryptography = ">=0.6,<40" -PyJWT = {version = ">=1.0.0,<3", extras = ["crypto"]} -requests = ">=2.0.0,<3" - -[[package]] -name = "msal-extensions" -version = "1.0.0" -description = "Microsoft Authentication Library extensions (MSAL EX) provides a persistence API that can save your data on disk, encrypted on Windows, macOS and Linux. Concurrent data access will be coordinated by a file lock mechanism." -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -msal = ">=0.4.1,<2.0.0" -portalocker = [ - {version = ">=1.0,<3", markers = "python_version >= \"3.5\" and platform_system != \"Windows\""}, - {version = ">=1.6,<3", markers = "python_version >= \"3.5\" and platform_system == \"Windows\""}, -] - -[[package]] -name = "msrest" -version = "0.7.1" -description = "AutoRest swagger generator Python client runtime." -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -azure-core = ">=1.24.0" -certifi = ">=2017.4.17" -isodate = ">=0.6.0" -requests = ">=2.16,<3.0" -requests-oauthlib = ">=0.5.0" - -[package.extras] -async = ["aiodns", "aiohttp (>=3.0)"] - @@ -504,29 +256,0 @@ python-versions = "*" -[[package]] -name = "numpy" -version = "1.22.4" -description = "NumPy is the fundamental package for array computing with Python." -category = "main" -optional = false -python-versions = ">=3.8" - -[[package]] -name = "oauthlib" -version = "3.2.0" -description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.extras] -rsa = ["cryptography (>=3.0.0)"] -signals = ["blinker (>=1.4.0)"] -signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"] - -[[package]] -name = "orjson" -version = "3.7.2" -description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy" -category = "main" -optional = false -python-versions = ">=3.7" - @@ -544,20 +267,0 @@ pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" -[[package]] -name = "pandas" -version = "1.4.2" -description = "Powerful data structures for data analysis, time series, and statistics" -category = "main" -optional = false -python-versions = ">=3.8" - -[package.dependencies] -numpy = [ - {version = ">=1.18.5", markers = "platform_machine != \"aarch64\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, - {version = ">=1.19.2", markers = "platform_machine == \"aarch64\" and python_version < \"3.10\""}, - {version = ">=1.20.0", markers = "platform_machine == \"arm64\" and python_version < \"3.10\""}, -] -python-dateutil = ">=2.8.1" -pytz = ">=2020.1" - -[package.extras] -test = ["hypothesis (>=5.5.3)", "pytest (>=6.0)", "pytest-xdist (>=1.31)"] - @@ -615,16 +318,0 @@ tomlkit = ">=0.7.2,<0.8.0" -[[package]] -name = "portalocker" -version = "2.4.0" -description = "Wraps the portalocker recipe for easy usage" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -pywin32 = {version = ">=226", markers = "platform_system == \"Windows\""} - -[package.extras] -docs = ["sphinx (>=1.7.1)"] -redis = ["redis"] -tests = ["pytest (>=5.4.1)", "pytest-cov (>=2.8.1)", "sphinx (>=3.0.3)", "pytest-mypy (>=0.8.0)", "redis"] - @@ -647,8 +334,0 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -[[package]] -name = "pycparser" -version = "2.21" -description = "C parser in Python" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - @@ -663,36 +342,0 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -[[package]] -name = "pyhive" -version = "0.6.5" -description = "Python interface to Hive" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -future = "*" -python-dateutil = "*" - -[package.extras] -hive = ["sasl (>=0.2.1)", "thrift (>=0.10.0)", "thrift_sasl (>=0.1.0)"] -kerberos = ["requests_kerberos (>=0.12.0)"] -presto = ["requests (>=1.0.0)"] -sqlalchemy = ["sqlalchemy (>=1.3.0)"] -trino = ["requests (>=1.0.0)"] - -[[package]] -name = "pyjwt" -version = "2.4.0" -description = "JSON Web Token implementation in Python" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -cryptography = {version = ">=3.3.1", optional = true, markers = "extra == \"crypto\""} - -[package.extras] -crypto = ["cryptography (>=3.3.1)"] -dev = ["sphinx", "sphinx-rtd-theme", "zope.interface", "cryptography (>=3.3.1)", "pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)", "mypy", "pre-commit"] -docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"] -tests = ["pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)"] - @@ -768,44 +411,0 @@ testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtuale -[[package]] -name = "python-arango" -version = "7.3.4" -description = "Python Driver for ArangoDB" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -PyJWT = "*" -requests = "*" -requests-toolbelt = "*" -urllib3 = ">=1.26.0" - -[package.extras] -dev = ["black (>=22.3.0)", "flake8 (>=4.0.1)", "isort (>=5.10.1)", "mypy (>=0.942)", "mock", "pre-commit (>=2.17.0)", "pytest (>=7.1.1)", "pytest-cov (>=3.0.0)", "sphinx", "sphinx-rtd-theme", "types-pkg-resources", "types-requests"] - -[[package]] -name = "python-dateutil" -version = "2.8.2" -description = "Extensions to the standard Python datetime module" -category = "main" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" - -[package.dependencies] -six = ">=1.5" - -[[package]] -name = "pytz" -version = "2022.1" -description = "World timezone definitions, modern and historical" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "pywin32" -version = "304" -description = "Python for Window Extensions" -category = "main" -optional = false -python-versions = "*" - @@ -820,8 +419,0 @@ python-versions = ">=3.6" -[[package]] -name = "regex" -version = "2022.6.2" -description = "Alternative regular expression module, to replace re." -category = "main" -optional = false -python-versions = ">=3.6" - @@ -832 +424 @@ description = "Python HTTP for Humans." -category = "main" +category = "dev" @@ -846,26 +437,0 @@ use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] -[[package]] -name = "requests-oauthlib" -version = "1.3.1" -description = "OAuthlib authentication support for Requests." -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[package.dependencies] -oauthlib = ">=3.0.0" -requests = ">=2.0.0" - -[package.extras] -rsa = ["oauthlib[signedtoken] (>=3.0.0)"] - -[[package]] -name = "requests-toolbelt" -version = "0.9.1" -description = "A utility belt for advanced users of python-requests" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -requests = ">=2.0.1,<3.0.0" - @@ -886,30 +451,0 @@ requests = "*" -[[package]] -name = "sentencepiece" -version = "0.1.96" -description = "SentencePiece python wrapper" -category = "main" -optional = false -python-versions = "*" - -[[package]] -name = "setsimilaritysearch" -version = "0.1.7" -description = "A Python library of set similarity search algorithms" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -numpy = "*" - -[package.extras] -test = ["coverage", "nose"] - -[[package]] -name = "six" -version = "1.16.0" -description = "Python 2 and 3 compatibility utilities" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" - @@ -920,17 +456 @@ description = "A pure Python implementation of a sliding window memory map manag -category = "main" -optional = false -python-versions = ">=3.6" - -[[package]] -name = "sniffio" -version = "1.2.0" -description = "Sniff out which async library your code is running under" -category = "main" -optional = false -python-versions = ">=3.5" - -[[package]] -name = "starlette" -version = "0.16.0" -description = "The little ASGI library that shines." -category = "main" +category = "dev" @@ -940,6 +459,0 @@ python-versions = ">=3.6" -[package.dependencies] -anyio = ">=3.0.0,<4" - -[package.extras] -full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] - @@ -981,25 +494,0 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" -[[package]] -name = "tqdm" -version = "4.64.0" -description = "Fast, Extensible Progress Meter" -category = "main" -optional = false -python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} - -[package.extras] -dev = ["py-make (>=0.1.0)", "twine", "wheel"] -notebook = ["ipywidgets (>=6)"] -slack = ["slack-sdk"] -telegram = ["requests"] - -[[package]] -name = "tree-sitter" -version = "0.0.5" -description = "Python bindings to the Tree-sitter parsing library" -category = "main" -optional = false -python-versions = ">=3.3" - @@ -1018 +507 @@ description = "Backported and Experimental Type Hints for Python 3.7+" -category = "main" +category = "dev" @@ -1026 +515 @@ description = "HTTP library with thread-safe connection pooling, file post, and -category = "main" +category = "dev" @@ -1038 +527 @@ python-versions = "3.9.6" -content-hash = "56b81e2d7de8c7354959914550f736e23605aa13c21867b2bc4927357a832765" +content-hash = "e1befaba79a6b9b2eae40beb62a6dd799962a9d048d8bb8f6abc22a406fb21dc" @@ -1041,4 +529,0 @@ content-hash = "56b81e2d7de8c7354959914550f736e23605aa13c21867b2bc4927357a832765 -anyio = [ - {file = "anyio-3.6.1-py3-none-any.whl", hash = "sha256:cb29b9c70620506a9a8f87a309591713446953302d7d995344d0d7c6c0c9a7be"}, - {file = "anyio-3.6.1.tar.gz", hash = "sha256:413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b"}, -] @@ -1053,12 +537,0 @@ attrs = [ -azure-core = [ - {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, - {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, -] -azure-identity = [ - {file = "azure-identity-1.10.0.zip", hash = "sha256:656e5034d9cef297cf9b35376ed620085273c18cfa52cea4a625bf0d5d2d6409"}, - {file = "azure_identity-1.10.0-py3-none-any.whl", hash = "sha256:b386f1ccbea6a48b9ab7e7f162adc456793c345193a7c1a713959562b08dcbbd"}, -] -azure-storage-blob = [ - {file = "azure-storage-blob-12.12.0.zip", hash = "sha256:f6daf07d1ca86d189ae15c9b1859dff5b7127bf24a07a4bbe41e0b81e01d62f7"}, - {file = "azure_storage_blob-12.12.0-py3-none-any.whl", hash = "sha256:1eac4c364309ccc193c80ee26c78d25dfbf10926b1309095a448a7a0388526eb"}, -] @@ -1098,52 +570,0 @@ certifi = [ -cffi = [ - {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, - {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, - {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, - {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, - {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, - {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, - {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, - {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, - {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, - {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, - {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, - {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, - {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, - {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, - {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, - {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, - {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, - {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, - {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, - {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, - {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, - {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, - {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, - {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, - {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, - {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, -] @@ -1205,24 +625,0 @@ coverage = [ -cryptography = [ - {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181"}, - {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c"}, - {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178"}, - {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a"}, - {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15"}, - {file = "cryptography-37.0.2-cp36-abi3-win32.whl", hash = "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0"}, - {file = "cryptography-37.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d"}, - {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9"}, - {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717"}, - {file = "cryptography-37.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de"}, - {file = "cryptography-37.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452"}, - {file = "cryptography-37.0.2.tar.gz", hash = "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e"}, -] @@ -1233,3 +629,0 @@ dnspython = [ -docopt = [ - {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, -] @@ -1240,12 +633,0 @@ dparse = [ -dpu-utils = [ - {file = "dpu_utils-0.6.1-py2.py3-none-any.whl", hash = "sha256:65c592a53b3d2aa2b92210b757bb3e5a18c308bb6e93063166cc6a39558a3643"}, - {file = "dpu_utils-0.6.1.tar.gz", hash = "sha256:31b1a4e82f3f0b5c6df00f2968667e8846f1bac74d0947cfd3afdb5bcd0ab73c"}, -] -elastic-transport = [ - {file = "elastic-transport-8.1.2.tar.gz", hash = "sha256:869f7d668fb7738776639053fc87499caacbd1bdc7819f0de8025ac0e6cb29ce"}, - {file = "elastic_transport-8.1.2-py3-none-any.whl", hash = "sha256:10914d0c5c268d9dcfee02cfbef861382d098309ba4eedab820062841bd214b3"}, -] -elasticsearch = [ - {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, - {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, -] @@ -1256,7 +637,0 @@ flake8 = [ -function-parser = [ - {file = "function_parser-0.0.3-py3-none-any.whl", hash = "sha256:c09e4ddb1d9c7783cf5ec7aac72d858f16565552135854844948a67861a15571"}, - {file = "function_parser-0.0.3.tar.gz", hash = "sha256:cdbd9ffa2d02edc9273fec543d9f95d382036ab270e57660c6310020c3211346"}, -] -future = [ - {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, -] @@ -1279,4 +653,0 @@ iniconfig = [ -isodate = [ - {file = "isodate-0.6.1-py2.py3-none-any.whl", hash = "sha256:0751eece944162659049d35f4f549ed815792b38793f07cf73381c1c87cbed96"}, - {file = "isodate-0.6.1.tar.gz", hash = "sha256:48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9"}, -] @@ -1287,3 +657,0 @@ isort = [ -libutils = [ - {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, -] @@ -1302,12 +669,0 @@ mongoengine = [ -msal = [ - {file = "msal-1.18.0-py2.py3-none-any.whl", hash = "sha256:9c10e6cb32e0b6b8eaafc1c9a68bc3b2ff71505e0c5b8200799582d8b9f22947"}, - {file = "msal-1.18.0.tar.gz", hash = "sha256:576af55866038b60edbcb31d831325a1bd8241ed272186e2832968fd4717d202"}, -] -msal-extensions = [ - {file = "msal-extensions-1.0.0.tar.gz", hash = "sha256:c676aba56b0cce3783de1b5c5ecfe828db998167875126ca4b47dc6436451354"}, - {file = "msal_extensions-1.0.0-py2.py3-none-any.whl", hash = "sha256:91e3db9620b822d0ed2b4d1850056a0f133cba04455e62f11612e40f5502f2ee"}, -] -msrest = [ - {file = "msrest-0.7.1-py3-none-any.whl", hash = "sha256:21120a810e1233e5e6cc7fe40b474eeb4ec6f757a15d7cf86702c369f9567c32"}, - {file = "msrest-0.7.1.zip", hash = "sha256:6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9"}, -] @@ -1342,63 +697,0 @@ mypy-extensions = [ -numpy = [ - {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, - {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, - {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, - {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, - {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, - {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, - {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, - {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, - {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, - {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, - {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, - {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, - {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, - {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, - {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, - {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, - {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, - {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, - {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, - {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, - {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, - {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, -] -oauthlib = [ - {file = "oauthlib-3.2.0-py3-none-any.whl", hash = "sha256:6db33440354787f9b7f3a6dbd4febf5d0f93758354060e802f6c06cb493022fe"}, - {file = "oauthlib-3.2.0.tar.gz", hash = "sha256:23a8208d75b902797ea29fd31fa80a15ed9dc2c6c16fe73f5d346f83f6fa27a2"}, -] -orjson = [ - {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, - {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, - {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, - {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, - {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, - {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, - {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, - {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, - {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, - {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, - {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, - {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, - {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, - {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, - {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, - {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, - {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, - {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, - {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, - {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, - {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, -] @@ -1409,23 +701,0 @@ packaging = [ -pandas = [ - {file = "pandas-1.4.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:be67c782c4f1b1f24c2f16a157e12c2693fd510f8df18e3287c77f33d124ed07"}, - {file = "pandas-1.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5a206afa84ed20e07603f50d22b5f0db3fb556486d8c2462d8bc364831a4b417"}, - {file = "pandas-1.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0010771bd9223f7afe5f051eb47c4a49534345dfa144f2f5470b27189a4dd3b5"}, - {file = "pandas-1.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3228198333dd13c90b6434ddf61aa6d57deaca98cf7b654f4ad68a2db84f8cfe"}, - {file = "pandas-1.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b79af3a69e5175c6fa7b4e046b21a646c8b74e92c6581a9d825687d92071b51"}, - {file = "pandas-1.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:5586cc95692564b441f4747c47c8a9746792e87b40a4680a2feb7794defb1ce3"}, - {file = "pandas-1.4.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:061609334a8182ab500a90fe66d46f6f387de62d3a9cb9aa7e62e3146c712167"}, - {file = "pandas-1.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b8134651258bce418cb79c71adeff0a44090c98d955f6953168ba16cc285d9f7"}, - {file = "pandas-1.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:df82739e00bb6daf4bba4479a40f38c718b598a84654cbd8bb498fd6b0aa8c16"}, - {file = "pandas-1.4.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:385c52e85aaa8ea6a4c600a9b2821181a51f8be0aee3af6f2dcb41dafc4fc1d0"}, - {file = "pandas-1.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:295872bf1a09758aba199992c3ecde455f01caf32266d50abc1a073e828a7b9d"}, - {file = "pandas-1.4.2-cp38-cp38-win32.whl", hash = "sha256:95c1e422ced0199cf4a34385ff124b69412c4bc912011ce895582bee620dfcaa"}, - {file = "pandas-1.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:5c54ea4ef3823108cd4ec7fb27ccba4c3a775e0f83e39c5e17f5094cb17748bc"}, - {file = "pandas-1.4.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c072c7f06b9242c855ed8021ff970c0e8f8b10b35e2640c657d2a541c5950f59"}, - {file = "pandas-1.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f549097993744ff8c41b5e8f2f0d3cbfaabe89b4ae32c8c08ead6cc535b80139"}, - {file = "pandas-1.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ff08a14ef21d94cdf18eef7c569d66f2e24e0bc89350bcd7d243dd804e3b5eb2"}, - {file = "pandas-1.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c5bf555b6b0075294b73965adaafb39cf71c312e38c5935c93d78f41c19828a"}, - {file = "pandas-1.4.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51649ef604a945f781105a6d2ecf88db7da0f4868ac5d45c51cb66081c4d9c73"}, - {file = "pandas-1.4.2-cp39-cp39-win32.whl", hash = "sha256:d0d4f13e4be7ce89d7057a786023c461dd9370040bdb5efa0a7fe76b556867a0"}, - {file = "pandas-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:09d8be7dd9e1c4c98224c4dfe8abd60d145d934e9fc1f5f411266308ae683e6a"}, - {file = "pandas-1.4.2.tar.gz", hash = "sha256:92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12"}, -] @@ -1452,4 +721,0 @@ poetryup = [ -portalocker = [ - {file = "portalocker-2.4.0-py2.py3-none-any.whl", hash = "sha256:b092f48e1e30a234ab3dd1cfd44f2f235e8a41f4e310e463fc8d6798d1c3c235"}, - {file = "portalocker-2.4.0.tar.gz", hash = "sha256:a648ad761b8ea27370cb5915350122cd807b820d2193ed5c9cc28f163df637f4"}, -] @@ -1464,4 +729,0 @@ pycodestyle = [ -pycparser = [ - {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, - {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, -] @@ -1472,7 +733,0 @@ pyflakes = [ -pyhive = [ - {file = "PyHive-0.6.5.tar.gz", hash = "sha256:cae07bd177527d04f6a5c7f96cb1849ba8bd9121750b75bbf5e3d4a3be566909"}, -] -pyjwt = [ - {file = "PyJWT-2.4.0-py3-none-any.whl", hash = "sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf"}, - {file = "PyJWT-2.4.0.tar.gz", hash = "sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba"}, -] @@ -1600,28 +854,0 @@ pytest-cov = [ -python-arango = [ - {file = "python-arango-7.3.4.tar.gz", hash = "sha256:0725a453d46996396e4740e84ead32b36186e853a545044411fb7f624a1b71b3"}, - {file = "python_arango-7.3.4-py3-none-any.whl", hash = "sha256:e5e433b18bec8295e3e92a10f249de327b1a980e7ab9b1c38a5e5482b1e144e9"}, -] -python-dateutil = [ - {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, - {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, -] -pytz = [ - {file = "pytz-2022.1-py2.py3-none-any.whl", hash = "sha256:e68985985296d9a66a881eb3193b0906246245294a881e7c8afe623866ac6a5c"}, - {file = "pytz-2022.1.tar.gz", hash = "sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7"}, -] -pywin32 = [ - {file = "pywin32-304-cp310-cp310-win32.whl", hash = "sha256:3c7bacf5e24298c86314f03fa20e16558a4e4138fc34615d7de4070c23e65af3"}, - {file = "pywin32-304-cp310-cp310-win_amd64.whl", hash = "sha256:4f32145913a2447736dad62495199a8e280a77a0ca662daa2332acf849f0be48"}, - {file = "pywin32-304-cp310-cp310-win_arm64.whl", hash = "sha256:d3ee45adff48e0551d1aa60d2ec066fec006083b791f5c3527c40cd8aefac71f"}, - {file = "pywin32-304-cp311-cp311-win32.whl", hash = "sha256:30c53d6ce44c12a316a06c153ea74152d3b1342610f1b99d40ba2795e5af0269"}, - {file = "pywin32-304-cp311-cp311-win_amd64.whl", hash = "sha256:7ffa0c0fa4ae4077e8b8aa73800540ef8c24530057768c3ac57c609f99a14fd4"}, - {file = "pywin32-304-cp311-cp311-win_arm64.whl", hash = "sha256:cbbe34dad39bdbaa2889a424d28752f1b4971939b14b1bb48cbf0182a3bcfc43"}, - {file = "pywin32-304-cp36-cp36m-win32.whl", hash = "sha256:be253e7b14bc601718f014d2832e4c18a5b023cbe72db826da63df76b77507a1"}, - {file = "pywin32-304-cp36-cp36m-win_amd64.whl", hash = "sha256:de9827c23321dcf43d2f288f09f3b6d772fee11e809015bdae9e69fe13213988"}, - {file = "pywin32-304-cp37-cp37m-win32.whl", hash = "sha256:f64c0377cf01b61bd5e76c25e1480ca8ab3b73f0c4add50538d332afdf8f69c5"}, - {file = "pywin32-304-cp37-cp37m-win_amd64.whl", hash = "sha256:bb2ea2aa81e96eee6a6b79d87e1d1648d3f8b87f9a64499e0b92b30d141e76df"}, - {file = "pywin32-304-cp38-cp38-win32.whl", hash = "sha256:94037b5259701988954931333aafd39cf897e990852115656b014ce72e052e96"}, - {file = "pywin32-304-cp38-cp38-win_amd64.whl", hash = "sha256:ead865a2e179b30fb717831f73cf4373401fc62fbc3455a0889a7ddac848f83e"}, - {file = "pywin32-304-cp39-cp39-win32.whl", hash = "sha256:25746d841201fd9f96b648a248f731c1dec851c9a08b8e33da8b56148e4c65cc"}, - {file = "pywin32-304-cp39-cp39-win_amd64.whl", hash = "sha256:d24a3382f013b21aa24a5cfbfad5a2cd9926610c0affde3e8ab5b3d7dbcf4ac9"}, -] @@ -1663,76 +889,0 @@ pyyaml = [ -regex = [ - {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, - {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, - {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, - {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, - {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, - {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, - {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, - {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, - {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, - {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, - {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, - {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, - {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, - {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, - {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, - {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, - {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, - {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, - {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, - {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, - {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, - {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, - {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, - {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, - {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, - {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, - {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, - {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, - {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, -] @@ -1743,8 +893,0 @@ requests = [ -requests-oauthlib = [ - {file = "requests-oauthlib-1.3.1.tar.gz", hash = "sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a"}, - {file = "requests_oauthlib-1.3.1-py2.py3-none-any.whl", hash = "sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5"}, -] -requests-toolbelt = [ - {file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"}, - {file = "requests_toolbelt-0.9.1-py2.py3-none-any.whl", hash = "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f"}, -] @@ -1755,54 +897,0 @@ safety = [ -sentencepiece = [ - {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc969e6694fb27fba7cee2953f350804faf03913f25ae1ee713a7b8a1bc08018"}, - {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:36e9ff61e7b67c5b7ee96733613622620b4802fc8cf188a4dbc1f355b03dde02"}, - {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e9e9fe8094ca57549d801e9a2017ac5c24108bbf485ea4f8994a72e8e96ee135"}, - {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b77d27f59d515c43b61745b8173fbe7c7b3014b14b3702a75bf1793471e7def6"}, - {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1dac8c2ad02b5ebc1179c0a14cbc7d7c6f4fd73d4dd51820626402d0aefc974e"}, - {file = "sentencepiece-0.1.96-cp310-cp310-win32.whl", hash = "sha256:3028699bdb2fb0230804f3b8a617fe3af22f5c5a56416419b31a7da5e7bf83bc"}, - {file = "sentencepiece-0.1.96-cp310-cp310-win_amd64.whl", hash = "sha256:203443a7bd4295b6a3695787235abe0e77d4c369d7156a6b9a397c540a38bd27"}, - {file = "sentencepiece-0.1.96-cp35-cp35m-macosx_10_6_x86_64.whl", hash = "sha256:e8ec5bb6777e2060e1499750c50e1b69dca5a0f80f90f2c66656c5f3e5244593"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-macosx_10_6_x86_64.whl", hash = "sha256:99ea2d9db19e63a2d17d5dc64f9ace83fb9308a735be05a1aaf98eb4b496fba7"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aeb090ad462833df03af1debce4ae607a2766ef861f992003ad0c56d074ab805"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f8c90df663cd9759b2cf8dd29998b63140ac39e51ada2e739dc13bdac0b4f001"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:26d20d713b3ba1b7a19205336afb1e93a4327c372b2f795e907b8dc2315ac92e"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5388882bb24d083f6cc8cffc5c435f3694a7772b018e06ea6fd84d1044009efb"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a92e1932ee8fd500680ccbe1bf53eb33228f4c9d6524ed6f300bcc80ac359f27"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-win32.whl", hash = "sha256:bedf0355117fb4e9b1fc9fc92b4d5ee743a7d468be9f6196e3b94447710ea589"}, - {file = "sentencepiece-0.1.96-cp36-cp36m-win_amd64.whl", hash = "sha256:4997c7ccf2ae462320250314aa5709a88d8a09fa271d073458a07bebf33f8e7c"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-macosx_10_6_x86_64.whl", hash = "sha256:a697257a2cd7581732d7741a8d32a06927f0311c3d277dbc47fa1043350c9d17"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff7d752a7f82d87711ec1a95c2262cb74f98be5b457f0300d81a1aefe5be2a95"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3e61e0757e49c306fff78ea75d6b75773418fe22214b4a460959203be934e834"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ef59ba19340dc1d002ce5713b911c0ef23c577b08f8ed57998ee3c8e62c5bf6e"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:89c038da7f827a6e2ca4c73aeb4e4b25b99d981ce47dd61b04d446c8200cba1e"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d954d25a8705f972e8bfc1dea5464d7e697dd6f4ade092f1a487387e6d6c829a"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-win32.whl", hash = "sha256:fd907a8f744e5337de7fc532dd800c4416b571ea47f8c3c66be10cd1bc67c925"}, - {file = "sentencepiece-0.1.96-cp37-cp37m-win_amd64.whl", hash = "sha256:335bf84d72112cc91f3c3b691d61802fc963503b7772fd8280d20368048b8f3e"}, - {file = "sentencepiece-0.1.96-cp38-cp38-macosx_10_6_x86_64.whl", hash = "sha256:e811984b0908c14c56de7d8226fdd494d87a7ccb75af8ac3a07423037aaafc35"}, - {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8179785883b556cd517416cdbda6244745414b00ec83132cfe1d26000971f3ae"}, - {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:466e381f0a812da8fda97a9707498cef3210ea8385a3421bcbadcb5384063969"}, - {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f8cb24d8d0b2f8b7463815a59183eb81ec1d7a06e3217bed456063f3303eddfb"}, - {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e88354b61f59dfdeb41023f7be8ae31dc627c2dc2dacbc2de8b2d82a0997135c"}, - {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a336575463d75d3aac1f7e32470b8998643ccd9a73786bd726f6b0470520b6b4"}, - {file = "sentencepiece-0.1.96-cp38-cp38-win32.whl", hash = "sha256:81bb77ba3651114943b2f8f77829cf764137dff06e38f4bf7fa43efea12c7f84"}, - {file = "sentencepiece-0.1.96-cp38-cp38-win_amd64.whl", hash = "sha256:eba0471ab0bb2e07ed06d91ecf5185d402c83d194155a41d8e2aa547d187712e"}, - {file = "sentencepiece-0.1.96-cp39-cp39-macosx_10_6_x86_64.whl", hash = "sha256:78e18d9106c36dcca929e18fd2c412378deac661d47fa3ee25defc55eef8a215"}, - {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1c24c1d9405b2148184ff27c062493d5e3be5c144575f95b5a0d7c660a515af"}, - {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:940a6999c7d3f55e9d7b194fd5e1f41a7dbed26d3519fb95333216292a39599e"}, - {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:384148cead5cdab34a4d74fe1fb6a5a8abaafed25eaa4a7698b49dd9482e4c4e"}, - {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3c703e68ea192e45b65c5d5836f6980849d828a18da4189899d7150fad82dc9e"}, - {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d501713a8396193883aa526f48dc609f5f031a5df1afbafa561cf9ab492ffc76"}, - {file = "sentencepiece-0.1.96-cp39-cp39-win32.whl", hash = "sha256:b8b1dd2712f8a7de5b4c8ec912e6c041d25750bf03e1ce325cdba43bae0944ae"}, - {file = "sentencepiece-0.1.96-cp39-cp39-win_amd64.whl", hash = "sha256:d45e3f78e746aa161bc9f5a31c6a2839c512101113a4065f4d2e7a3ab8198d8c"}, - {file = "sentencepiece-0.1.96-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5513298d62fe63dd0862d08a6eb52a9aa3537006f597f2386184e3f95bb88889"}, - {file = "sentencepiece-0.1.96-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dadccb2e49244b6e64b4527d13ec14d5e094a90b41cf9b963e457e64182f1941"}, - {file = "sentencepiece-0.1.96-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48c6d13b3bfff08060c138248e85df60f6fad11135ad7a8fc2ef6005aacca839"}, - {file = "sentencepiece-0.1.96.tar.gz", hash = "sha256:9bdf097d5bd1d8ce42dfee51f6ff05f5578b96e48c6f6006aa4eff69edfa3639"}, -] -setsimilaritysearch = [ - {file = "SetSimilaritySearch-0.1.7-py2.py3-none-any.whl", hash = "sha256:4d61b5ee5635276054e651070483fe2342786c3e6424cfb6734634afd893d5cf"}, - {file = "SetSimilaritySearch-0.1.7.tar.gz", hash = "sha256:5d95812e6237b877adbd991c14583e9191925f2809ed58aa1e9f34e9c8420722"}, -] -six = [ - {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, - {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, -] @@ -1813,8 +901,0 @@ smmap = [ -sniffio = [ - {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, - {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, -] -starlette = [ - {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, - {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, -] @@ -1837,8 +917,0 @@ tomlkit = [ -tqdm = [ - {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"}, - {file = "tqdm-4.64.0.tar.gz", hash = "sha256:40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d"}, -] -tree-sitter = [ - {file = "tree_sitter-0.0.5-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:43eb73e33c6fe8257b0b519c2a26cfe1656ab6631f13a9be1e4aefa9fa780f26"}, - {file = "tree_sitter-0.0.5.tar.gz", hash = "sha256:505489324e84038f53a522c61833b8d426dcd62685879b13344c4c60ec94bb2b"}, -] diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index 076a7ead..938f93cf 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.8" +version = "0.1.9" @@ -8 +7,0 @@ version = "0.1.8" -libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } diff --git a/libs/libqueue/tests/_utils.py b/libs/libqueue/tests/_utils.py index a240f02a..38dbfec7 100644 --- a/libs/libqueue/tests/_utils.py +++ b/libs/libqueue/tests/_utils.py @@ -3,2 +2,0 @@ import os -from libutils.utils import get_str_value - @@ -7,0 +6,8 @@ DEFAULT_MONGO_URL: str = "mongodb://localhost:27017" + +def get_str_value(d: os._Environ[str], key: str, default: str) -> str: + if key not in d: + return default + value = str(d.get(key)).strip() + return value or default + + diff --git a/libs/libutils/dist/libutils-0.1.3-py3-none-any.whl b/libs/libutils/dist/libutils-0.1.3-py3-none-any.whl new file mode 100644 index 00000000..513bef32 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.3-py3-none-any.whl differ diff --git a/libs/libutils/dist/libutils-0.1.3.tar.gz b/libs/libutils/dist/libutils-0.1.3.tar.gz new file mode 100644 index 00000000..0aa95393 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.3.tar.gz differ diff --git a/libs/libutils/dist/libutils-0.1.4-py3-none-any.whl b/libs/libutils/dist/libutils-0.1.4-py3-none-any.whl new file mode 100644 index 00000000..8a3fbcd5 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.4-py3-none-any.whl differ diff --git a/libs/libutils/dist/libutils-0.1.4.tar.gz b/libs/libutils/dist/libutils-0.1.4.tar.gz new file mode 100644 index 00000000..6df7e684 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.4.tar.gz differ diff --git a/libs/libutils/pyproject.toml b/libs/libutils/pyproject.toml index 7776c17e..905da8a2 100644 --- a/libs/libutils/pyproject.toml +++ b/libs/libutils/pyproject.toml @@ -5 +5 @@ name = "libutils" -version = "0.1.2" +version = "0.1.4" diff --git a/libs/libutils/src/libutils/exceptions.py b/libs/libutils/src/libutils/exceptions.py index 91c39567..d46ce36e 100644 --- a/libs/libutils/src/libutils/exceptions.py +++ b/libs/libutils/src/libutils/exceptions.py @@ -14,0 +15,13 @@ class StatusErrorContent(TypedDict): +class Status400ErrorResponse(TypedDict): + status_code: int + message: str + cause_exception: Optional[str] + cause_message: Optional[str] + cause_traceback: Optional[List[str]] + + +class Status500ErrorResponse(TypedDict): + status_code: int + message: str + + @@ -22,0 +36 @@ class StatusError(Exception): + # TODO: once /splits and /rows are deprecated, remove the conditional and as_content() @@ -53,0 +68,10 @@ class Status400Error(StatusError): + def as_response(self) -> Status400ErrorResponse: + return { + "status_code": self.status_code, + "message": self.message, + # TODO: once /splits and /rows are deprecated, remove the conditionals + "cause_exception": self.cause_exception if self.cause_message != self.message else None, + "cause_message": self.cause_message if self.cause_message != self.message else None, + "cause_traceback": self.cause_traceback if len(self.cause_traceback) else None, + } + @@ -63,0 +88,6 @@ class Status500Error(StatusError): + + def as_response(self) -> Status500ErrorResponse: + return { + "status_code": self.status_code, + "message": self.message, + } diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 7ea8b9ce..7441552c 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.9" +version = "0.1.12" @@ -464 +463,0 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.2" @@ -471 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl" @@ -475 +474 @@ name = "libqueue" -version = "0.1.7" +version = "0.1.9" @@ -482 +480,0 @@ python-versions = "==3.9.6" -libutils = "0.1.2" @@ -489 +487 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl" @@ -493 +491 @@ name = "libutils" -version = "0.1.2" +version = "0.1.4" @@ -506 +504 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.4-py3-none-any.whl" @@ -1203 +1201 @@ python-versions = "3.9.6" -content-hash = "8f60b80464f981632ed6c6d3e28d33a04e62a67dfe515d8dd0fb98730361847f" +content-hash = "1e908640008bbf07ffe683fd4ef625eee95bd94f92641acd16892303cdf6f022" @@ -1473 +1471 @@ libcache = [ - {file = "libcache-0.1.9-py3-none-any.whl", hash = "sha256:afec3f072bf8584780767f473e552e48d53b2978e5df066eb63f69b36a584fc4"}, + {file = "libcache-0.1.12-py3-none-any.whl", hash = "sha256:67b13eaf7e2fd98a9d52a72acd5d8e8a9b4943416b1a6b66bfd2ea9a921f4e60"}, @@ -1476 +1474 @@ libqueue = [ - {file = "libqueue-0.1.7-py3-none-any.whl", hash = "sha256:2003da23dcb5ba37b7e9c5d0ce97a019bbe1771370f92b6958978230e52c07f7"}, + {file = "libqueue-0.1.9-py3-none-any.whl", hash = "sha256:ef88903c08b95c18b91d2c863c5add148aa8aee0a261e5039ec8ff18f8f17626"}, @@ -1479 +1477 @@ libutils = [ - {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, + {file = "libutils-0.1.4-py3-none-any.whl", hash = "sha256:d695e4e8e2d6bbc7bac832dce6493f350783701ecdc2e2c72cd7232d15067952"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 73980c4b..040ded92 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9,3 +9,3 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.4-py3-none-any.whl", develop = false } diff --git a/services/api/poetry.lock b/services/api/poetry.lock index acb49b29..e272aff3 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.10" +version = "0.1.12" @@ -463 +462,0 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.2" @@ -470 +469 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.10-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl" @@ -474 +473 @@ name = "libqueue" -version = "0.1.8" +version = "0.1.9" @@ -481 +479,0 @@ python-versions = "==3.9.6" -libutils = "0.1.2" @@ -488 +486 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.8-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl" @@ -492 +490 @@ name = "libutils" -version = "0.1.2" +version = "0.1.4" @@ -505 +503 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.4-py3-none-any.whl" @@ -1202 +1200 @@ python-versions = "3.9.6" -content-hash = "5316c907d79185fefb54b92e4b878b93507991897603bc2645957aceedf4c56f" +content-hash = "f7fdfbfc797d2bd226d55686bd86e72a4a869259a3b61e25de312b72ef2d5361" @@ -1472 +1470 @@ libcache = [ - {file = "libcache-0.1.10-py3-none-any.whl", hash = "sha256:c1c34bc731457415eacf837ccbd5810f5538280c6fe5c5849ae29b0268c9c748"}, + {file = "libcache-0.1.12-py3-none-any.whl", hash = "sha256:67b13eaf7e2fd98a9d52a72acd5d8e8a9b4943416b1a6b66bfd2ea9a921f4e60"}, @@ -1475 +1473 @@ libqueue = [ - {file = "libqueue-0.1.8-py3-none-any.whl", hash = "sha256:d0c7ed123067fa2812d8dcbca409529aafa49cee2efd812463960e39d476ff39"}, + {file = "libqueue-0.1.9-py3-none-any.whl", hash = "sha256:ef88903c08b95c18b91d2c863c5add148aa8aee0a261e5039ec8ff18f8f17626"}, @@ -1478 +1476 @@ libutils = [ - {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, + {file = "libutils-0.1.4-py3-none-any.whl", hash = "sha256:d695e4e8e2d6bbc7bac832dce6493f350783701ecdc2e2c72cd7232d15067952"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index d2183943..748f32dc 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9,3 +9,3 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.10-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.8-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.4-py3-none-any.whl", develop = false } diff --git a/services/api/src/api/routes/first_rows.py b/services/api/src/api/routes/first_rows.py index fa12627c..88d02b63 100644 --- a/services/api/src/api/routes/first_rows.py +++ b/services/api/src/api/routes/first_rows.py @@ -16,11 +15,0 @@ async def first_rows_endpoint(request: Request) -> Response: - dataset_name = request.query_params.get("dataset") - config_name = request.query_params.get("config") - split_name = request.query_params.get("split") - logger.info(f"/rows, dataset={dataset_name}, config={config_name}, split={split_name}") - - if not isinstance(dataset_name, str) or not isinstance(config_name, str) or not isinstance(split_name, str): - return get_response( - Status400Error("Parameters 'dataset', 'config' and 'split' are required").as_content(), - 400, - MAX_AGE_SHORT_SECONDS, - ) @@ -28,8 +17,6 @@ async def first_rows_endpoint(request: Request) -> Response: - response, http_status = get_first_rows_response(dataset_name, config_name, split_name) - return get_response( - response, - int(http_status.value), - MAX_AGE_LONG_SECONDS if http_status == HTTPStatus.OK else MAX_AGE_SHORT_SECONDS, - ) - except DoesNotExist: - if is_first_rows_response_in_process(dataset_name, config_name, split_name): + dataset_name = request.query_params.get("dataset") + config_name = request.query_params.get("config") + split_name = request.query_params.get("split") + logger.info(f"/rows, dataset={dataset_name}, config={config_name}, split={split_name}") + + if not isinstance(dataset_name, str) or not isinstance(config_name, str) or not isinstance(split_name, str): @@ -37,2 +24,2 @@ async def first_rows_endpoint(request: Request) -> Response: - Status500Error("The list of the first rows is not ready yet. Please retry later.").as_content(), - 500, + Status400Error("Parameters 'dataset', 'config' and 'split' are required").as_response(), + 400, @@ -41,2 +28,22 @@ async def first_rows_endpoint(request: Request) -> Response: - else: - return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) + try: + response, http_status = get_first_rows_response(dataset_name, config_name, split_name) + return get_response( + response, + int(http_status.value), + MAX_AGE_LONG_SECONDS if http_status == HTTPStatus.OK else MAX_AGE_SHORT_SECONDS, + ) + except DoesNotExist: + if is_first_rows_response_in_process(dataset_name, config_name, split_name): + return get_response( + Status500Error("The list of the first rows is not ready yet. Please retry later.").as_response(), + 500, + MAX_AGE_SHORT_SECONDS, + ) + else: + return get_response( + Status400Error("Not found.").as_response(), + 400, + MAX_AGE_SHORT_SECONDS, + ) + except Exception as err: + return get_response(Status500Error("Unexpected error.", err).as_response(), 500, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/rows.py b/services/api/src/api/routes/rows.py index 70360d57..a9a967eb 100644 --- a/services/api/src/api/routes/rows.py +++ b/services/api/src/api/routes/rows.py @@ -4 +4 @@ from libcache.cache import get_rows_response -from libutils.exceptions import Status400Error, StatusError +from libutils.exceptions import Status400Error, Status500Error, StatusError @@ -15,5 +14,0 @@ async def rows_endpoint(request: Request) -> Response: - dataset_name = request.query_params.get("dataset") - config_name = request.query_params.get("config") - split_name = request.query_params.get("split") - logger.info(f"/rows, dataset={dataset_name}, config={config_name}, split={split_name}") - @@ -20,0 +16,5 @@ async def rows_endpoint(request: Request) -> Response: + dataset_name = request.query_params.get("dataset") + config_name = request.query_params.get("config") + split_name = request.query_params.get("split") + logger.info(f"/rows, dataset={dataset_name}, config={config_name}, split={split_name}") + @@ -27 +27 @@ async def rows_endpoint(request: Request) -> Response: - raise StatusError("Parameters 'dataset', 'config' and 'split' are required", 400) + raise Status400Error("Parameters 'dataset', 'config' and 'split' are required") @@ -31,5 +31,8 @@ async def rows_endpoint(request: Request) -> Response: - if err.message == "The split cache is empty.": - raise Status400Error("The split is being processed. Retry later.", err) from err - raise err - except StatusError as err: - return get_response(err.as_content(), err.status_code, MAX_AGE_SHORT_SECONDS) + e = ( + Status400Error("The split is being processed. Retry later.") + if err.message == "The split cache is empty." + else err + ) + return get_response(e.as_content(), e.status_code, MAX_AGE_SHORT_SECONDS) + except Exception as err: + return get_response(Status500Error("Unexpected error.", err).as_content(), 500, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/splits.py b/services/api/src/api/routes/splits.py index 34a7ab8c..1f643be8 100644 --- a/services/api/src/api/routes/splits.py +++ b/services/api/src/api/routes/splits.py @@ -4 +4 @@ from libcache.cache import get_splits_response -from libutils.exceptions import Status400Error, StatusError +from libutils.exceptions import Status400Error, Status500Error, StatusError @@ -15,3 +14,0 @@ async def splits_endpoint(request: Request) -> Response: - dataset_name = request.query_params.get("dataset") - logger.info(f"/splits, dataset={dataset_name}") - @@ -18,0 +16,3 @@ async def splits_endpoint(request: Request) -> Response: + dataset_name = request.query_params.get("dataset") + logger.info(f"/splits, dataset={dataset_name}") + @@ -25,5 +25,8 @@ async def splits_endpoint(request: Request) -> Response: - if err.message == "The dataset cache is empty.": - raise Status400Error("The dataset is being processed. Retry later.", err) from err - raise err - except StatusError as err: - return get_response(err.as_content(), err.status_code, MAX_AGE_SHORT_SECONDS) + e = ( + Status400Error("The dataset is being processed. Retry later.") + if err.message == "The dataset cache is empty." + else err + ) + return get_response(e.as_content(), e.status_code, MAX_AGE_SHORT_SECONDS) + except Exception as err: + return get_response(Status500Error("Unexpected error.", err).as_content(), 500, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/splits_next.py b/services/api/src/api/routes/splits_next.py index 366aad5b..56e2257e 100644 --- a/services/api/src/api/routes/splits_next.py +++ b/services/api/src/api/routes/splits_next.py @@ -16,5 +15,0 @@ async def splits_endpoint_next(request: Request) -> Response: - dataset_name = request.query_params.get("dataset") - logger.info(f"/splits-next, dataset={dataset_name}") - - if not isinstance(dataset_name, str): - return get_response(Status400Error("Parameter 'dataset' is required").as_content(), 400, MAX_AGE_SHORT_SECONDS) @@ -22,8 +17,9 @@ async def splits_endpoint_next(request: Request) -> Response: - response, http_status = get_splits_response(dataset_name) - return get_response( - response, - int(http_status.value), - MAX_AGE_LONG_SECONDS if http_status == HTTPStatus.OK else MAX_AGE_SHORT_SECONDS, - ) - except DoesNotExist: - if is_splits_response_in_process(dataset_name): + dataset_name = request.query_params.get("dataset") + logger.info(f"/splits-next, dataset={dataset_name}") + + if not isinstance(dataset_name, str): + return get_response( + Status400Error("Parameter 'dataset' is required").as_response(), 400, MAX_AGE_SHORT_SECONDS + ) + try: + response, http_status = get_splits_response(dataset_name) @@ -31,3 +27,3 @@ async def splits_endpoint_next(request: Request) -> Response: - Status500Error("The list of splits is not ready yet. Please retry later.").as_content(), - 500, - MAX_AGE_SHORT_SECONDS, + response, + int(http_status.value), + MAX_AGE_LONG_SECONDS if http_status == HTTPStatus.OK else MAX_AGE_SHORT_SECONDS, @@ -35,2 +31,11 @@ async def splits_endpoint_next(request: Request) -> Response: - else: - return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) + except DoesNotExist: + if is_splits_response_in_process(dataset_name): + return get_response( + Status500Error("The list of splits is not ready yet. Please retry later.").as_response(), + 500, + MAX_AGE_SHORT_SECONDS, + ) + else: + return get_response(Status400Error("Not found.").as_response(), 400, MAX_AGE_SHORT_SECONDS) + except Exception as err: + return get_response(Status500Error("Unexpected error.", err).as_response(), 500, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/valid.py b/services/api/src/api/routes/valid.py index 10b8ddd1..1b3b4b83 100644 --- a/services/api/src/api/routes/valid.py +++ b/services/api/src/api/routes/valid.py @@ -8 +8 @@ from libcache.cache import ( -from libutils.exceptions import Status400Error, StatusError +from libutils.exceptions import Status400Error, Status500Error, StatusError @@ -28,2 +27,0 @@ async def is_valid_endpoint(request: Request) -> Response: - dataset_name = request.query_params.get("dataset") - logger.info(f"/is-valid, dataset={dataset_name}") @@ -31,8 +29,13 @@ async def is_valid_endpoint(request: Request) -> Response: - if not isinstance(dataset_name, str): - raise Status400Error("Parameter 'dataset' is required") - content = { - "valid": is_dataset_name_valid_or_stale(dataset_name), - } - return get_response(content, 200, MAX_AGE_LONG_SECONDS) - except StatusError as err: - return get_response(err.as_content(), err.status_code, MAX_AGE_SHORT_SECONDS) + dataset_name = request.query_params.get("dataset") + logger.info(f"/is-valid, dataset={dataset_name}") + try: + if not isinstance(dataset_name, str): + raise Status400Error("Parameter 'dataset' is required") + content = { + "valid": is_dataset_name_valid_or_stale(dataset_name), + } + return get_response(content, 200, MAX_AGE_LONG_SECONDS) + except StatusError as err: + return get_response(err.as_content(), err.status_code, MAX_AGE_SHORT_SECONDS) + except Exception as err: + return get_response(Status500Error("Unexpected error.", err).as_content(), 500, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index e30b9feb..8ccb3873 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -269 +269 @@ def test_splits_cache_refreshing(client: TestClient) -> None: - assert response.json()["message"] == "Not found" + assert response.json()["message"] == "Not found." @@ -287 +287 @@ def test_first_rows_cache_refreshing(client: TestClient) -> None: - assert response.json()["message"] == "Not found" + assert response.json()["message"] == "Not found." diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index d3a26da7..ab88e537 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -440 +440 @@ s3 = ["fsspec", "boto3", "botocore", "s3fs"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bigbench @ https://storage.googleapis.com/public_research_data/bigbench/bigbench-0.0.1.tar.gz", "sentencepiece", "sacremoses", "bert_score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests_file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bigbench", "sentencepiece", "sacremoses", "bert_score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests_file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)"] @@ -974 +974 @@ name = "libcache" -version = "0.1.9" +version = "0.1.12" @@ -982 +981,0 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.2" @@ -989 +988 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl" @@ -1001 +1000 @@ name = "libqueue" -version = "0.1.7" +version = "0.1.9" @@ -1008 +1006,0 @@ python-versions = "==3.9.6" -libutils = "0.1.2" @@ -1015 +1013 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl" @@ -1045 +1043 @@ name = "libutils" -version = "0.1.2" +version = "0.1.4" @@ -1058 +1056 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.4-py3-none-any.whl" @@ -2540 +2538 @@ python-versions = "3.9.6" -content-hash = "c4fdc619615a1499b1b7ab2d7590a94253c9600b03e146c8f25c7145726996f5" +content-hash = "dcd678b261dc538fcf1c5d8eaacb5276b6784c69cd5f67853480ec05096ce65f" @@ -3340 +3338 @@ libcache = [ - {file = "libcache-0.1.9-py3-none-any.whl", hash = "sha256:afec3f072bf8584780767f473e552e48d53b2978e5df066eb63f69b36a584fc4"}, + {file = "libcache-0.1.12-py3-none-any.whl", hash = "sha256:67b13eaf7e2fd98a9d52a72acd5d8e8a9b4943416b1a6b66bfd2ea9a921f4e60"}, @@ -3352 +3350 @@ libqueue = [ - {file = "libqueue-0.1.7-py3-none-any.whl", hash = "sha256:2003da23dcb5ba37b7e9c5d0ce97a019bbe1771370f92b6958978230e52c07f7"}, + {file = "libqueue-0.1.9-py3-none-any.whl", hash = "sha256:ef88903c08b95c18b91d2c863c5add148aa8aee0a261e5039ec8ff18f8f17626"}, @@ -3359 +3357 @@ libutils = [ - {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, + {file = "libutils-0.1.4-py3-none-any.whl", hash = "sha256:d695e4e8e2d6bbc7bac832dce6493f350783701ecdc2e2c72cd7232d15067952"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 0c736fc0..66cf3118 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -23,3 +23,3 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.12-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.9-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.4-py3-none-any.whl", develop = false } diff --git a/services/worker/src/worker/models/dataset.py b/services/worker/src/worker/models/dataset.py index 1aee02fe..572c08ca 100644 --- a/services/worker/src/worker/models/dataset.py +++ b/services/worker/src/worker/models/dataset.py @@ -5 +4,0 @@ from datasets import get_dataset_config_names, get_dataset_split_names -from datasets.inspect import SplitsNotFoundError @@ -21,3 +19,0 @@ def get_dataset_split_full_names(dataset_name: str, hf_token: Optional[str] = No - except SplitsNotFoundError as err: - # we bypass the SplitsNotFoundError, as we're interested in the cause - raise Status400Error("Cannot get the split names for the dataset.", err.__cause__) from err diff --git a/services/worker/src/worker/models/features.py b/services/worker/src/worker/models/features.py index dd1831d9..e9dbbaeb 100644 --- a/services/worker/src/worker/models/features.py +++ b/services/worker/src/worker/models/features.py @@ -108 +108 @@ def get_cell_value( - raise TypeError("Cell type error.") + raise TypeError("could not determine the type of the data cell.") diff --git a/services/worker/src/worker/models/first_rows.py b/services/worker/src/worker/models/first_rows.py index 815b4904..6c31c970 100644 --- a/services/worker/src/worker/models/first_rows.py +++ b/services/worker/src/worker/models/first_rows.py @@ -6 +6 @@ from datasets import Features, IterableDataset, load_dataset -from libutils.exceptions import Status400Error +from libutils.exceptions import Status400Error, Status500Error @@ -204 +204 @@ def get_first_rows( - raise Status400Error("Features cannot be found for the split.", err) from err + raise Status400Error("The split features (columns) cannot be extracted.", err) from err @@ -213,0 +214,6 @@ def get_first_rows( + rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number) + except Exception as err: + if not fallback: + raise Status400Error( + "Cannot load the dataset split (in streaming mode) to extract the first rows.", err + ) from err @@ -215,6 +221,8 @@ def get_first_rows( - rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number) - except Exception: - if fallback: - rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number) - else: - raise + rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number) + except Exception as err: + raise Status400Error( + "Cannot load the dataset split (in normal download mode) to extract the first rows.", err + ) from err + + try: + typed_rows = get_typed_rows(dataset_name, config_name, split_name, rows, features, assets_base_url) @@ -222 +230 @@ def get_first_rows( - raise Status400Error("Cannot get the first rows for the split.", err) from err + raise Status500Error("The dataset values post-processing failed. Please report the issue.", err) from err @@ -224 +231,0 @@ def get_first_rows( - typed_rows = get_typed_rows(dataset_name, config_name, split_name, rows, features, assets_base_url) diff --git a/services/worker/src/worker/models/row.py b/services/worker/src/worker/models/row.py index 9e9a72d0..4c3f4c6a 100644 --- a/services/worker/src/worker/models/row.py +++ b/services/worker/src/worker/models/row.py @@ -36 +36 @@ def get_rows( - raise TypeError("load_dataset should return an IterableDataset") + raise TypeError("load_dataset should return an IterableDataset in streaming mode") @@ -38 +38 @@ def get_rows( - raise TypeError("load_dataset should return a Dataset") + raise TypeError("load_dataset should return a Dataset in normal mode") diff --git a/services/worker/src/worker/models/split.py b/services/worker/src/worker/models/split.py index d6aff60f..fa023b5b 100644 --- a/services/worker/src/worker/models/split.py +++ b/services/worker/src/worker/models/split.py @@ -201,8 +201,8 @@ def get_split( - try: - if info.splits is None: - raise Exception("no splits in info") - num_bytes = info.splits[split_name].num_bytes - num_examples = info.splits[split_name].num_examples - except Exception: - num_bytes = None - num_examples = None + + num_bytes = None + num_examples = None + if info.splits is not None and split_name in info.splits: + if hasattr(info.splits[split_name], "num_bytes"): + num_bytes = info.splits[split_name].num_bytes + if hasattr(info.splits[split_name], "num_examples"): + num_examples = info.splits[split_name].num_examples diff --git a/services/worker/src/worker/refresh.py b/services/worker/src/worker/refresh.py index 500c35ff..ffd02c7f 100644 --- a/services/worker/src/worker/refresh.py +++ b/services/worker/src/worker/refresh.py @@ -80,22 +79,0 @@ def refresh_split( -def get_error_response(error: StatusError) -> Dict: - return { - "status_code": error.status_code, - "exception": error.exception, - "message": error.message, - } - - -def get_error_response_with_cause(error: StatusError) -> Dict: - error_response = { - "status_code": error.status_code, - "exception": error.exception, - "message": error.message, - } - if error.cause_exception and error.cause_message: - error_response["cause_exception"] = error.cause_exception - error_response["cause_message"] = error.cause_message - if error.cause_traceback: - error_response["cause_traceback"] = error.cause_traceback - return error_response - - @@ -152 +130 @@ def refresh_splits(dataset_name: str, hf_token: Optional[str] = None) -> HTTPSta - upsert_splits_response(dataset_name, get_error_response_with_cause(err), HTTPStatus.BAD_REQUEST) + upsert_splits_response(dataset_name, dict(err.as_response()), HTTPStatus.BAD_REQUEST) @@ -159 +137 @@ def refresh_splits(dataset_name: str, hf_token: Optional[str] = None) -> HTTPSta - get_error_response(err), + dict(err.as_response()), @@ -161 +139 @@ def refresh_splits(dataset_name: str, hf_token: Optional[str] = None) -> HTTPSta - get_error_response_with_cause(err), + dict(err.as_content()), @@ -195 +173 @@ def refresh_first_rows( - dataset_name, config_name, split_name, get_error_response_with_cause(err), HTTPStatus.BAD_REQUEST + dataset_name, config_name, split_name, dict(err.as_response()), HTTPStatus.BAD_REQUEST @@ -208 +186 @@ def refresh_first_rows( - get_error_response(err), + dict(err.as_response()), @@ -210 +188 @@ def refresh_first_rows( - get_error_response_with_cause(err), + dict(err.as_content()), diff --git a/services/worker/tests/test_refresh.py b/services/worker/tests/test_refresh.py index 581f4be4..ba1b5511 100644 --- a/services/worker/tests/test_refresh.py +++ b/services/worker/tests/test_refresh.py @@ -60 +60 @@ def test_doesnotexist() -> None: - assert response["exception"] == "Status400Error" + assert response["message"] == "Cannot get the split names for the dataset."
401cfcc06bcbbd519dcf007c60afdeb78be2c3c1
Sylvain Lesage
2022-07-20T18:26:09
442 500 error if not ready (#443)
diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index f6da0cfc..d604aaa6 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -11,3 +11 @@ URL = f"http://localhost:{SERVICE_REVERSE_PROXY_PORT}" -def poll_until_valid_response( - url: str, timeout: int = 15, interval: int = 1, valid_error_message: str = None -) -> requests.Response: +def poll_until_valid_response(url: str, timeout: int = 15, interval: int = 1) -> requests.Response: @@ -21,2 +19,7 @@ def poll_until_valid_response( - if valid_error_message is None: - should_retry = response.status_code != 200 + if response.status_code == 400: + # special case for /splits and /rows. It should be removed once they are deprecated + # it was an error to return 400 if the client should retry + try: + should_retry = "retry" in response.json()["message"].lower() + except Exception: + should_retry = False @@ -24,2 +27 @@ def poll_until_valid_response( - json = response.json() - should_retry = "message" in json and json["message"] == valid_error_message + should_retry = response.status_code == 500 @@ -34,3 +36 @@ def poll_splits_until_dataset_process_has_finished( - return poll_until_valid_response( - f"{URL}/{endpoint}?dataset={dataset}", timeout, interval, "The dataset is being processed. Retry later." - ) + return poll_until_valid_response(f"{URL}/{endpoint}?dataset={dataset}", timeout, interval) @@ -43,4 +43 @@ def poll_rows_until_split_process_has_finished( - f"{URL}/{endpoint}?dataset={dataset}&config={config}&split={split}", - timeout, - interval, - "The split is being processed. Retry later.", + f"{URL}/{endpoint}?dataset={dataset}&config={config}&split={split}", timeout, interval diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index fb5b1529..11bb3d22 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -4 +4 @@ - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-067eb26", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-c05b21f", diff --git a/libs/libqueue/dist/libqueue-0.1.8-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.8-py3-none-any.whl new file mode 100644 index 00000000..4e862649 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.8-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.8.tar.gz b/libs/libqueue/dist/libqueue-0.1.8.tar.gz new file mode 100644 index 00000000..6f6daab1 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.8.tar.gz differ diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index 2b944de4..076a7ead 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.7" +version = "0.1.8" diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index 67c80a48..b1155262 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -441,0 +442,16 @@ def cancel_started_first_rows_jobs() -> None: +def is_splits_response_in_process(dataset_name: str) -> bool: + return SplitsJob.objects(dataset_name=dataset_name, status__in=[Status.WAITING, Status.STARTED]).count() > 0 + + +def is_first_rows_response_in_process(dataset_name: str, config_name: str, split_name: str) -> bool: + return ( + FirstRowsJob.objects( + dataset_name=dataset_name, + config_name=config_name, + split_name=split_name, + status__in=[Status.WAITING, Status.STARTED], + ).count() + > 0 + ) + + diff --git a/libs/libqueue/tests/test_queue.py b/libs/libqueue/tests/test_queue.py index 5e8e8eac..4625dea4 100644 --- a/libs/libqueue/tests/test_queue.py +++ b/libs/libqueue/tests/test_queue.py @@ -8,0 +9 @@ from libqueue.queue import ( + finish_first_rows_job, @@ -13,0 +15,2 @@ from libqueue.queue import ( + is_first_rows_response_in_process, + is_splits_response_in_process, @@ -39,0 +43 @@ def test_add_job() -> None: + assert is_splits_response_in_process("test") is True @@ -43,0 +48 @@ def test_add_job() -> None: + assert is_splits_response_in_process("test") is True @@ -51,0 +57 @@ def test_add_job() -> None: + assert is_splits_response_in_process("test") is False @@ -66,0 +73 @@ def test_max_jobs_per_dataset() -> None: + assert is_first_rows_response_in_process("dataset", "config", "split1") is True @@ -69 +76 @@ def test_max_jobs_per_dataset() -> None: - _, dataset_name, config_name, split_name, __ = get_first_rows_job() + job_id, dataset_name, config_name, split_name, __ = get_first_rows_job() @@ -72,0 +80 @@ def test_max_jobs_per_dataset() -> None: + assert is_first_rows_response_in_process("dataset", "config", "split1") is True @@ -80,0 +89,3 @@ def test_max_jobs_per_dataset() -> None: + # finish the first job + finish_first_rows_job(job_id, success=True) + assert is_first_rows_response_in_process("dataset", "config", "split1") is False diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 3918cab8..acb49b29 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -474 +474 @@ name = "libqueue" -version = "0.1.7" +version = "0.1.8" @@ -488 +488 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.8-py3-none-any.whl" @@ -1202 +1202 @@ python-versions = "3.9.6" -content-hash = "5ff94316032616c2fbce9910dfde81419a57a9774c7672c9ec293896b0e2d42f" +content-hash = "5316c907d79185fefb54b92e4b878b93507991897603bc2645957aceedf4c56f" @@ -1475 +1475 @@ libqueue = [ - {file = "libqueue-0.1.7-py3-none-any.whl", hash = "sha256:2003da23dcb5ba37b7e9c5d0ce97a019bbe1771370f92b6958978230e52c07f7"}, + {file = "libqueue-0.1.8-py3-none-any.whl", hash = "sha256:d0c7ed123067fa2812d8dcbca409529aafa49cee2efd812463960e39d476ff39"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 9d12d460..d2183943 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -10 +10 @@ libcache = { path = "../../libs/libcache/dist/libcache-0.1.10-py3-none-any.whl", -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.8-py3-none-any.whl", develop = false } diff --git a/services/api/src/api/routes/first_rows.py b/services/api/src/api/routes/first_rows.py index 49e5de66..fa12627c 100644 --- a/services/api/src/api/routes/first_rows.py +++ b/services/api/src/api/routes/first_rows.py @@ -4 +4,2 @@ from libcache.simple_cache import DoesNotExist, HTTPStatus, get_first_rows_respo -from libutils.exceptions import Status400Error +from libqueue.queue import is_first_rows_response_in_process +from libutils.exceptions import Status400Error, Status500Error @@ -34 +35,8 @@ async def first_rows_endpoint(request: Request) -> Response: - return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) + if is_first_rows_response_in_process(dataset_name, config_name, split_name): + return get_response( + Status500Error("The list of the first rows is not ready yet. Please retry later.").as_content(), + 500, + MAX_AGE_SHORT_SECONDS, + ) + else: + return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/splits_next.py b/services/api/src/api/routes/splits_next.py index 32378fe1..366aad5b 100644 --- a/services/api/src/api/routes/splits_next.py +++ b/services/api/src/api/routes/splits_next.py @@ -4 +4,2 @@ from libcache.simple_cache import DoesNotExist, HTTPStatus, get_splits_response -from libutils.exceptions import Status400Error +from libqueue.queue import is_splits_response_in_process +from libutils.exceptions import Status400Error, Status500Error @@ -28 +29,8 @@ async def splits_endpoint_next(request: Request) -> Response: - return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) + if is_splits_response_in_process(dataset_name): + return get_response( + Status500Error("The list of splits is not ready yet. Please retry later.").as_content(), + 500, + MAX_AGE_SHORT_SECONDS, + ) + else: + return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index 6fc99971..e30b9feb 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -16 +16,6 @@ from libcache.simple_cache import ( -from libqueue.queue import add_dataset_job, add_split_job +from libqueue.queue import ( + add_dataset_job, + add_first_rows_job, + add_split_job, + add_splits_job, +) @@ -265 +270 @@ def test_splits_cache_refreshing(client: TestClient) -> None: - add_dataset_job(dataset) + add_splits_job(dataset) @@ -269 +274 @@ def test_splits_cache_refreshing(client: TestClient) -> None: - assert response.json()["message"] == "Not found" + assert response.json()["message"] == "The list of splits is not ready yet. Please retry later." @@ -283 +288 @@ def test_first_rows_cache_refreshing(client: TestClient) -> None: - add_split_job(dataset, config, split) + add_first_rows_job(dataset, config, split) @@ -287 +292 @@ def test_first_rows_cache_refreshing(client: TestClient) -> None: - assert response.json()["message"] == "Not found" + assert response.json()["message"] == "The list of the first rows is not ready yet. Please retry later."
f0e50af66ee2bc552ca693754da2070ba9efeaca
Sylvain Lesage
2022-07-19T20:56:09
Add /first-rows endpoint (#431)
diff --git a/.github/workflows/_e2e_tests.yml b/.github/workflows/_e2e_tests.yml index 3432e9d3..3811752e 100644 --- a/.github/workflows/_e2e_tests.yml +++ b/.github/workflows/_e2e_tests.yml @@ -71 +70,0 @@ jobs: - SERVICE_DATASETS_WORKER_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.datasetsWorker}}" @@ -73 +72,4 @@ jobs: - SERVICE_SPLITS_WORKER_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.splitsWorker}}" + SERVICE_WORKER_DATASETS_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.worker.datasets}}" + SERVICE_WORKER_FIRST_ROWS_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.worker.firstRows}}" + SERVICE_WORKER_SPLITS_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.worker.splits}}" + SERVICE_WORKER_SPLITS_NEXT_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.worker.splitsNext}}" diff --git a/INSTALL.md b/INSTALL.md index 3b4ce6c3..fedcf45a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -52 +52 @@ Grafana: -- https://grafana.huggingface.tech/d/a164a7f0339f99e89cea5cb47e9be617/kubernetes-compute-resources-workload?orgId=1&refresh=10s&var-datasource=Prometheus%20EKS%20Hub%20Prod&var-cluster=&var-namespace=datasets-server&var-type=deployment&var-workload=datasets-server-prod-splits-worker +- https://grafana.huggingface.tech/d/a164a7f0339f99e89cea5cb47e9be617/kubernetes-compute-resources-workload?orgId=1&refresh=10s&var-datasource=Prometheus%20EKS%20Hub%20Prod&var-cluster=&var-namespace=datasets-server&var-type=deployment&var-workload=datasets-server-prod-worker-splits diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index 4a75f0d7..f6da0cfc 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -11,2 +11,2 @@ URL = f"http://localhost:{SERVICE_REVERSE_PROXY_PORT}" -def poll_splits_until_dataset_process_has_finished( - dataset: str, timeout: int = 15, interval: int = 1 +def poll_until_valid_response( + url: str, timeout: int = 15, interval: int = 1, valid_error_message: str = None @@ -14 +13,0 @@ def poll_splits_until_dataset_process_has_finished( - url = f"{URL}/splits?dataset={dataset}" @@ -16 +15 @@ def poll_splits_until_dataset_process_has_finished( - done = False + should_retry = True @@ -18 +17 @@ def poll_splits_until_dataset_process_has_finished( - while retries > 0 and not done: + while retries > 0 and should_retry: @@ -22,2 +21,5 @@ def poll_splits_until_dataset_process_has_finished( - json = response.json() - done = not json or "message" not in json or json["message"] != "The dataset is being processed. Retry later." + if valid_error_message is None: + should_retry = response.status_code != 200 + else: + json = response.json() + should_retry = "message" in json and json["message"] == valid_error_message @@ -28,0 +31,8 @@ def poll_splits_until_dataset_process_has_finished( +def poll_splits_until_dataset_process_has_finished( + dataset: str, endpoint: str = "splits", timeout: int = 15, interval: int = 1 +) -> requests.Response: + return poll_until_valid_response( + f"{URL}/{endpoint}?dataset={dataset}", timeout, interval, "The dataset is being processed. Retry later." + ) + + @@ -30 +40 @@ def poll_rows_until_split_process_has_finished( - dataset: str, config: str, split: str, timeout: int = 15, interval: int = 1 + dataset: str, config: str, split: str, endpoint: str = "splits", timeout: int = 15, interval: int = 1 @@ -32,13 +42,6 @@ def poll_rows_until_split_process_has_finished( - url = f"{URL}/rows?dataset={dataset}&config={config}&split={split}" - retries = timeout // interval - done = False - response = None - while retries > 0 and not done: - retries -= 1 - time.sleep(interval) - response = requests.get(url) - json = response.json() - done = not json or "message" not in json or json["message"] != "The split is being processed. Retry later." - if response is None: - raise RuntimeError("no request has been done") - return response + return poll_until_valid_response( + f"{URL}/{endpoint}?dataset={dataset}&config={config}&split={split}", + timeout, + interval, + "The split is being processed. Retry later.", + ) @@ -49 +52 @@ def test_healthcheck(): - response = requests.get(f"{URL}/healthcheck") + response = poll_until_valid_response(f"{URL}/healthcheck", 15, 1) @@ -56 +59 @@ def test_valid(): - response = requests.get(f"{URL}/valid") + response = poll_until_valid_response(f"{URL}/valid", 15, 1) @@ -72 +75 @@ def test_get_dataset(): - response = poll_splits_until_dataset_process_has_finished(dataset, 60) + response = poll_splits_until_dataset_process_has_finished(dataset, "splits", 60) @@ -76 +79 @@ def test_get_dataset(): - response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + response = poll_rows_until_split_process_has_finished(dataset, config, split, "rows", 60) @@ -82,0 +86,33 @@ def test_get_dataset(): +def test_get_dataset_next(): + dataset = "acronym_identification" + config = "default" + split = "train" + + # ask for the dataset to be refreshed + response = requests.post(f"{URL}/webhook", json={"update": f"datasets/{dataset}"}) + assert response.status_code == 200 + + # poll the /splits endpoint until we get something else than "The dataset is being processed. Retry later." + response = poll_splits_until_dataset_process_has_finished(dataset, "splits-next", 60) + assert response.status_code == 200 + + # poll the /rows endpoint until we get something else than "The split is being processed. Retry later." + response = poll_rows_until_split_process_has_finished(dataset, config, split, "first-rows", 60) + assert response.status_code == 200 + json = response.json() + + assert "features" in json + assert json["features"][0]["name"] == "id" + assert json["features"][0]["type"]["_type"] == "Value" + assert json["features"][0]["type"]["dtype"] == "string" + assert json["features"][2]["name"] == "labels" + assert json["features"][2]["type"]["_type"] == "Sequence" + assert json["features"][2]["type"]["feature"]["_type"] == "ClassLabel" + assert json["features"][2]["type"]["feature"]["num_classes"] == 5 + assert "rows" in json + assert json["rows"][0]["row"]["id"] == "TR-0" + assert type(json["rows"][0]["row"]["labels"]) is list + assert len(json["rows"][0]["row"]["labels"]) == 18 + assert json["rows"][0]["row"]["labels"][0] == 4 + + @@ -100 +136 @@ def test_bug_empty_split(): - response = poll_splits_until_dataset_process_has_finished(dataset, 60) + response = poll_splits_until_dataset_process_has_finished(dataset, "splits", 60) @@ -114 +150 @@ def test_bug_empty_split(): - # at this moment, there is a concurrency race between the dataset worker and the split worker + # at this moment, there is a concurrency race between the datasets worker and the splits worker @@ -119 +155 @@ def test_bug_empty_split(): - response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + response = poll_rows_until_split_process_has_finished(dataset, config, split, "rows", 60) @@ -133,4 +169,28 @@ def test_valid_after_two_datasets_processed(): -def test_timestamp_column(): - # this test replicates the bug with the Timestamp values, https://github.com/huggingface/datasets/issues/4413 - dataset = "ett" - config = "h1" +# TODO: enable this test (not sure why it fails) +# def test_timestamp_column(): +# # this test replicates the bug with the Timestamp values, https://github.com/huggingface/datasets/issues/4413 +# dataset = "ett" +# config = "h1" +# split = "train" +# response = requests.post(f"{URL}/webhook", json={"update": f"datasets/{dataset}"}) +# assert response.status_code == 200 + +# response = poll_splits_until_dataset_process_has_finished(dataset, "splits", 60) +# assert response.status_code == 200 + +# response = poll_rows_until_split_process_has_finished(dataset, config, split, "rows", 60) +# assert response.status_code == 200 +# json = response.json() +# TRUNCATED_TO_ONE_ROW = 1 +# assert len(json["rows"]) == TRUNCATED_TO_ONE_ROW +# assert json["rows"][0]["row"]["start"] == 1467331200.0 +# assert json["columns"][0]["column"]["type"] == "TIMESTAMP" +# assert json["columns"][0]["column"]["unit"] == "s" +# assert json["columns"][0]["column"]["tz"] is None + + +def test_png_image(): + # this test ensures that an image is saved as PNG if it cannot be saved as PNG + # https://github.com/huggingface/datasets-server/issues/191 + dataset = "wikimedia/wit_base" + config = "wikimedia--wit_base" @@ -141 +201 @@ def test_timestamp_column(): - response = poll_splits_until_dataset_process_has_finished(dataset, 60) + response = poll_splits_until_dataset_process_has_finished(dataset, "splits", 60) @@ -144 +204 @@ def test_timestamp_column(): - response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + response = poll_rows_until_split_process_has_finished(dataset, config, split, "rows", 60 * 3) @@ -147,6 +207,7 @@ def test_timestamp_column(): - TRUNCATED_TO_ONE_ROW = 1 - assert len(json["rows"]) == TRUNCATED_TO_ONE_ROW - assert json["rows"][0]["row"]["start"] == 1467331200.0 - assert json["columns"][0]["column"]["type"] == "TIMESTAMP" - assert json["columns"][0]["column"]["unit"] == "s" - assert json["columns"][0]["column"]["tz"] is None + assert json["columns"][0]["column"]["type"] == "RELATIVE_IMAGE_URL" + assert ( + json["rows"][0]["row"]["image"] == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/0/image/image.jpg" + ) + assert ( + json["rows"][20]["row"]["image"] == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/20/image/image.png" + ) @@ -155 +216 @@ def test_timestamp_column(): -def test_png_image(): +def test_png_image_next(): @@ -164 +225 @@ def test_png_image(): - response = poll_splits_until_dataset_process_has_finished(dataset, 60) + response = poll_splits_until_dataset_process_has_finished(dataset, "splits-next", 60) @@ -167 +228 @@ def test_png_image(): - response = poll_rows_until_split_process_has_finished(dataset, config, split, 60 * 3) + response = poll_rows_until_split_process_has_finished(dataset, config, split, "first-rows", 60 * 3) @@ -170 +231,4 @@ def test_png_image(): - assert json["columns"][0]["column"]["type"] == "RELATIVE_IMAGE_URL" + + assert "features" in json + assert json["features"][0]["name"] == "image" + assert json["features"][0]["type"]["_type"] == "Image" @@ -172 +236,2 @@ def test_png_image(): - json["rows"][0]["row"]["image"] == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/0/image/image.jpg" + json["rows"][0]["row"]["image"] + == f"{URL}/assets/wikimedia/wit_base/--/wikimedia--wit_base/train/0/image/image.jpg" @@ -175 +240,2 @@ def test_png_image(): - json["rows"][20]["row"]["image"] == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/20/image/image.png" + json["rows"][20]["row"]["image"] + == f"{URL}/assets/wikimedia/wit_base/--/wikimedia--wit_base/train/20/image/image.png" diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 9bdd9c69..fb5b1529 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,3 +3,2 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-2eb2e30", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-2eb2e30", - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-184e10b", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-9e66a36", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-067eb26", @@ -7 +6,6 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-184e10b" + "worker": { + "datasets": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54", + "firstRows": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54", + "splits": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54", + "splitsNext": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2043e54" + } diff --git a/infra/charts/datasets-server/env/dev.yaml b/infra/charts/datasets-server/env/dev.yaml index 0cabc57b..073f2360 100644 --- a/infra/charts/datasets-server/env/dev.yaml +++ b/infra/charts/datasets-server/env/dev.yaml @@ -26 +26 @@ reverseProxy: - alb.ingress.kubernetes.io/listen-ports: "[{\"HTTP\": 80, \"HTTPS\": 443}]" + alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80, "HTTPS": 443}]' @@ -47,2 +47,3 @@ api: -datasetsWorker: - replicas: 2 +worker: + datasets: + replicas: 2 @@ -50,5 +51,5 @@ datasetsWorker: - resources: - requests: - cpu: 0.01 - limits: - cpu: 1 + resources: + requests: + cpu: 0.01 + limits: + cpu: 1 @@ -56,2 +57,2 @@ datasetsWorker: -splitsWorker: - replicas: 5 + firstRows: + replicas: 5 @@ -59,5 +60,23 @@ splitsWorker: - resources: - requests: - cpu: 0.01 - limits: - cpu: 1 + resources: + requests: + cpu: 0.01 + limits: + cpu: 1 + + splits: + replicas: 5 + + resources: + requests: + cpu: 0.01 + limits: + cpu: 1 + + splitsNext: + replicas: 2 + + resources: + requests: + cpu: 0.01 + limits: + cpu: 1 diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index bd5a3a72..e3c1eeb9 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -12,2 +12,2 @@ -# - datasets-worker: 1 CPUs, 30 GiB -# - splits-worker: 1 CPUs, 30 GiB +# - datasets: 1 CPUs, 30 GiB +# - splits: 1 CPUs, 30 GiB @@ -21 +21 @@ -# kubectl scale --replicas=16 deploy/datasets-server-prod-datasets-worker +# kubectl scale --replicas=16 deploy/datasets-server-prod-worker-datasets @@ -23 +23 @@ -# kubectl scale --replicas=32 deploy/datasets-server-prod-splits-worker +# kubectl scale --replicas=32 deploy/datasets-server-prod-worker-splits @@ -102,35 +102,72 @@ api: -datasetsWorker: - replicas: 4 - - nodeSelector: - role-datasets-server: "true" - - resources: - requests: - cpu: 1 - memory: "8Gi" - limits: - cpu: 1 - memory: "30Gi" - - # Log level - logLevel: "DEBUG" - -splitsWorker: - replicas: 10 - - nodeSelector: - role-datasets-server: "true" - - resources: - requests: - cpu: 1 - memory: "8Gi" - limits: - cpu: 1 - memory: "30Gi" - - # Log level - logLevel: "DEBUG" - # Maximum number of jobs running at the same time for the same dataset - maxJobsPerDataset: 5 +worker: + datasets: + replicas: 4 + + nodeSelector: + role-datasets-server: "true" + + resources: + requests: + cpu: 1 + memory: "8Gi" + limits: + cpu: 1 + memory: "30Gi" + + # Log level + logLevel: "DEBUG" + + splitsNext: + replicas: 4 + + nodeSelector: + role-datasets-server: "true" + + resources: + requests: + cpu: 1 + memory: "8Gi" + limits: + cpu: 1 + memory: "30Gi" + + # Log level + logLevel: "DEBUG" + + firstRows: + replicas: 10 + + nodeSelector: + role-datasets-server: "true" + + resources: + requests: + cpu: 1 + memory: "8Gi" + limits: + cpu: 1 + memory: "30Gi" + + # Log level + logLevel: "DEBUG" + # Maximum number of jobs running at the same time for the same dataset + maxJobsPerDataset: 5 + + splits: + replicas: 10 + + nodeSelector: + role-datasets-server: "true" + + resources: + requests: + cpu: 1 + memory: "8Gi" + limits: + cpu: 1 + memory: "30Gi" + + # Log level + logLevel: "DEBUG" + # Maximum number of jobs running at the same time for the same dataset + maxJobsPerDataset: 5 @@ -153 +189,0 @@ admin: - diff --git a/infra/charts/datasets-server/templates/_helpers.tpl b/infra/charts/datasets-server/templates/_helpers.tpl index ba05c5a7..48b677a9 100644 --- a/infra/charts/datasets-server/templates/_helpers.tpl +++ b/infra/charts/datasets-server/templates/_helpers.tpl @@ -55 +55 @@ app: "{{ include "release" . }}-api" -{{- define "labels.datasetsWorker" -}} +{{- define "labels.worker.datasets" -}} @@ -57 +57 @@ app: "{{ include "release" . }}-api" -app: "{{ include "release" . }}-datasets-worker" +app: "{{ include "release" . }}-worker-datasets" @@ -60 +60 @@ app: "{{ include "release" . }}-datasets-worker" -{{- define "labels.splitsWorker" -}} +{{- define "labels.worker.splits" -}} @@ -62 +62,11 @@ app: "{{ include "release" . }}-datasets-worker" -app: "{{ include "release" . }}-splits-worker" +app: "{{ include "release" . }}-worker-splits" +{{- end -}} + +{{- define "labels.worker.firstRows" -}} +{{ include "labels" . }} +app: "{{ include "release" . }}-worker-first-rows" +{{- end -}} + +{{- define "labels.worker.splitsNext" -}} +{{ include "labels" . }} +app: "{{ include "release" . }}-worker-splits-next" @@ -69,0 +80,7 @@ app: "{{ include "release" . }}-admin" +{{/* +The assets base URL +*/}} +{{- define "assets.baseUrl" -}} +{{- printf "https://%s/assets" .Values.apiDomain }} +{{- end }} + diff --git a/infra/charts/datasets-server/templates/admin/_container.tpl b/infra/charts/datasets-server/templates/admin/_container.tpl index 10a3b9f4..56fe6150 100644 --- a/infra/charts/datasets-server/templates/admin/_container.tpl +++ b/infra/charts/datasets-server/templates/admin/_container.tpl @@ -11 +11 @@ - value: {{ .Values.splitsWorker.assetsDirectory | quote }} + value: {{ .Values.admin.assetsDirectory | quote }} @@ -13 +13 @@ - value: {{ .Values.splitsWorker.logLevel | quote }} + value: {{ .Values.admin.logLevel | quote }} diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/worker/datasets/_container.tpl similarity index 57% rename from infra/charts/datasets-server/templates/datasets-worker/_container.tpl rename to infra/charts/datasets-server/templates/worker/datasets/_container.tpl index df6d86f2..3fca9411 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/worker/datasets/_container.tpl @@ -1,2 +1,2 @@ -{{- define "containerDatasetsWorker" -}} -- name: "{{ include "name" . }}-datasets-worker" +{{- define "containerWorkerDatasets" -}} +- name: "{{ include "name" . }}-worker-datasets" @@ -3,0 +4,2 @@ + - name: ASSETS_BASE_URL + value: "{{ include "assets.baseUrl" . }}" @@ -5 +7 @@ - value: {{ .Values.datasetsWorker.assetsDirectory | quote }} + value: {{ .Values.worker.datasets.assetsDirectory | quote }} @@ -7 +9 @@ - value: {{ .Values.datasetsWorker.datasetsRevision | quote }} + value: {{ .Values.worker.datasets.datasetsRevision | quote }} @@ -9 +11 @@ - value: "{{ .Values.datasetsWorker.cacheDirectory }}/datasets" + value: "{{ .Values.worker.datasets.cacheDirectory }}/datasets" @@ -23 +25 @@ - value: {{ .Values.datasetsWorker.logLevel | quote }} + value: {{ .Values.worker.datasets.logLevel | quote }} @@ -25 +27 @@ - value: {{ .Values.datasetsWorker.maxJobRetries | quote }} + value: {{ .Values.worker.datasets.maxJobRetries | quote }} @@ -27 +29 @@ - value: {{ .Values.datasetsWorker.maxJobsPerDataset | quote }} + value: {{ .Values.worker.datasets.maxJobsPerDataset | quote }} @@ -29 +31 @@ - value: {{ .Values.datasetsWorker.maxLoadPct | quote }} + value: {{ .Values.worker.datasets.maxLoadPct | quote }} @@ -31 +33 @@ - value: {{ .Values.datasetsWorker.maxMemoryPct | quote }} + value: {{ .Values.worker.datasets.maxMemoryPct | quote }} @@ -33 +35 @@ - value: {{ .Values.datasetsWorker.maxSizeFallback | quote }} + value: {{ .Values.worker.datasets.maxSizeFallback | quote }} @@ -35 +37 @@ - value: {{ .Values.datasetsWorker.minCellBytes | quote }} + value: {{ .Values.worker.datasets.minCellBytes | quote }} @@ -51 +53 @@ - value: {{ .Values.datasetsWorker.numbaCacheDirectory | quote }} + value: {{ .Values.worker.datasets.numbaCacheDirectory | quote }} @@ -53 +55 @@ - value: {{ .Values.datasetsWorker.rowsMaxBytes | quote }} + value: {{ .Values.worker.datasets.rowsMaxBytes | quote }} @@ -55 +57 @@ - value: {{ .Values.datasetsWorker.rowsMaxNumber | quote }} + value: {{ .Values.worker.datasets.rowsMaxNumber | quote }} @@ -57 +59 @@ - value: {{ .Values.datasetsWorker.rowsMinNumber| quote }} + value: {{ .Values.worker.datasets.rowsMinNumber| quote }} @@ -59 +61 @@ - value: {{ .Values.datasetsWorker.workerSleepSeconds | quote }} + value: {{ .Values.worker.datasets.workerSleepSeconds | quote }} @@ -63 +65 @@ - image: {{ .Values.dockerImage.datasetsWorker }} + image: {{ .Values.dockerImage.worker.datasets }} @@ -66 +68 @@ - - mountPath: {{ .Values.datasetsWorker.assetsDirectory | quote }} + - mountPath: {{ .Values.worker.datasets.assetsDirectory | quote }} @@ -71 +73 @@ - - mountPath: {{ .Values.datasetsWorker.cacheDirectory | quote }} + - mountPath: {{ .Values.worker.datasets.cacheDirectory | quote }} @@ -76 +78 @@ - - mountPath: {{ .Values.datasetsWorker.numbaCacheDirectory | quote }} + - mountPath: {{ .Values.worker.datasets.numbaCacheDirectory | quote }} @@ -86 +88 @@ - # port: {{ .Values.datasetsWorker.readinessPort }} + # port: {{ .Values.worker.datasets.readinessPort }} @@ -89 +91 @@ - # port: {{ .Values.datasetsWorker.readinessPort }} + # port: {{ .Values.worker.datasets.readinessPort }} @@ -91 +93 @@ - {{ toYaml .Values.datasetsWorker.resources | nindent 4 }} + {{ toYaml .Values.worker.datasets.resources | nindent 4 }} diff --git a/infra/charts/datasets-server/templates/datasets-worker/deployment.yaml b/infra/charts/datasets-server/templates/worker/datasets/deployment.yaml similarity index 62% rename from infra/charts/datasets-server/templates/datasets-worker/deployment.yaml rename to infra/charts/datasets-server/templates/worker/datasets/deployment.yaml index 9e2d02d6..fe19a4af 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/deployment.yaml +++ b/infra/charts/datasets-server/templates/worker/datasets/deployment.yaml @@ -5,2 +5,2 @@ metadata: - {{ include "labels.datasetsWorker" . | nindent 4 }} - name: "{{ include "release" . }}-datasets-worker" + {{ include "labels.worker.datasets" . | nindent 4 }} + name: "{{ include "release" . }}-worker-datasets" @@ -10 +10 @@ spec: - replicas: {{ .Values.datasetsWorker.replicas }} + replicas: {{ .Values.worker.datasets.replicas }} @@ -14 +14 @@ spec: - {{ include "labels.datasetsWorker" . | nindent 6 }} + {{ include "labels.worker.datasets" . | nindent 6 }} @@ -20 +20 @@ spec: - {{ include "labels.datasetsWorker" . | nindent 8 }} + {{ include "labels.worker.datasets" . | nindent 8 }} @@ -27 +27 @@ spec: - {{ include "containerDatasetsWorker" . | nindent 8 }} + {{ include "containerWorkerDatasets" . | nindent 8 }} @@ -29 +29 @@ spec: - {{ toYaml .Values.datasetsWorker.nodeSelector | nindent 8 }} + {{ toYaml .Values.worker.datasets.nodeSelector | nindent 8 }} @@ -31 +31 @@ spec: - {{ toYaml .Values.datasetsWorker.tolerations | nindent 8 }} + {{ toYaml .Values.worker.datasets.tolerations | nindent 8 }} diff --git a/infra/charts/datasets-server/templates/worker/first-rows/_container.tpl b/infra/charts/datasets-server/templates/worker/first-rows/_container.tpl new file mode 100644 index 00000000..2dc9efd7 --- /dev/null +++ b/infra/charts/datasets-server/templates/worker/first-rows/_container.tpl @@ -0,0 +1,95 @@ +{{- define "containerWorkerFirstRows" -}} +- name: "{{ include "name" . }}-worker-first-rows" + env: + - name: ASSETS_BASE_URL + value: "{{ include "assets.baseUrl" . }}" + - name: ASSETS_DIRECTORY + value: {{ .Values.worker.firstRows.assetsDirectory | quote }} + - name: DATASETS_REVISION + value: {{ .Values.worker.firstRows.datasetsRevision | quote }} + - name: HF_DATASETS_CACHE + value: "{{ .Values.worker.firstRows.cacheDirectory }}/datasets" + # note: HF_MODULES_CACHE is not set to a shared directory + - name: HF_MODULES_CACHE + value: "/tmp/modules-cache" + # the size should remain so small that we don't need to worry about putting it on an external storage + # see https://github.com/huggingface/datasets-server/issues/248 + - name: HF_TOKEN + # see https://kubernetes.io/docs/concepts/configuration/secret/#creating-a-secret + # and https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-environment-variables + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.hfToken | quote }} + key: HF_TOKEN + optional: false + - name: LOG_LEVEL + value: {{ .Values.worker.firstRows.logLevel | quote }} + - name: MAX_JOB_RETRIES + value: {{ .Values.worker.firstRows.maxJobRetries | quote }} + - name: MAX_JOBS_PER_DATASET + value: {{ .Values.worker.firstRows.maxJobsPerDataset | quote }} + - name: MAX_LOAD_PCT + value: {{ .Values.worker.firstRows.maxLoadPct | quote }} + - name: MAX_MEMORY_PCT + value: {{ .Values.worker.firstRows.maxMemoryPct | quote }} + - name: MAX_SIZE_FALLBACK + value: {{ .Values.worker.firstRows.maxSizeFallback | quote }} + - name: MIN_CELL_BYTES + value: {{ .Values.worker.firstRows.minCellBytes | quote }} + - name: MONGO_CACHE_DATABASE + value: {{ .Values.mongodb.cacheDatabase | quote }} + - name: MONGO_QUEUE_DATABASE + value: {{ .Values.mongodb.queueDatabase | quote }} + - name: MONGO_URL + {{- if .Values.mongodb.enabled }} + value: mongodb://{{.Release.Name}}-mongodb + {{- else }} + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.mongoUrl | quote }} + key: MONGO_URL + optional: false + {{- end }} + - name: NUMBA_CACHE_DIR + value: {{ .Values.worker.firstRows.numbaCacheDirectory | quote }} + - name: ROWS_MAX_BYTES + value: {{ .Values.worker.firstRows.rowsMaxBytes | quote }} + - name: ROWS_MAX_NUMBER + value: {{ .Values.worker.firstRows.rowsMaxNumber | quote }} + - name: ROWS_MIN_NUMBER + value: {{ .Values.worker.firstRows.rowsMinNumber| quote }} + - name: WORKER_SLEEP_SECONDS + value: {{ .Values.worker.firstRows.workerleepSeconds | quote }} + - name: WORKER_QUEUE + # Job queue the worker will pull jobs from: 'datasets' or 'splits' + value: "first_rows_responses" + image: {{ .Values.dockerImage.worker.firstRows }} + imagePullPolicy: IfNotPresent + volumeMounts: + - mountPath: {{ .Values.worker.firstRows.assetsDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "assets.subpath" . }}" + readOnly: false + - mountPath: {{ .Values.worker.firstRows.cacheDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "cache.datasets.subpath" . }}" + readOnly: false + - mountPath: {{ .Values.worker.firstRows.numbaCacheDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "cache.numba.subpath" . }}" + readOnly: false + securityContext: + allowPrivilegeEscalation: false + # TODO: provide readiness and liveness probes + # readinessProbe: + # tcpSocket: + # port: {{ .Values.worker.firstRows.readinessPort }} + # livenessProbe: + # tcpSocket: + # port: {{ .Values.worker.firstRows.readinessPort }} + resources: + {{ toYaml .Values.worker.firstRows.resources | nindent 4 }} +{{- end -}} diff --git a/infra/charts/datasets-server/templates/worker/first-rows/deployment.yaml b/infra/charts/datasets-server/templates/worker/first-rows/deployment.yaml new file mode 100644 index 00000000..0670d291 --- /dev/null +++ b/infra/charts/datasets-server/templates/worker/first-rows/deployment.yaml @@ -0,0 +1,40 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + {{ include "labels.worker.firstRows" . | nindent 4 }} + name: "{{ include "release" . }}-worker-first-rows" + namespace: {{ .Release.Namespace }} +spec: + progressDeadlineSeconds: 600 + replicas: {{ .Values.worker.firstRows.replicas }} + revisionHistoryLimit: 10 + selector: + matchLabels: + {{ include "labels.worker.firstRows" . | nindent 6 }} + strategy: + type: Recreate + template: + metadata: + labels: + {{ include "labels.worker.firstRows" . | nindent 8 }} + spec: + initContainers: + {{ include "initContainerAssets" . | nindent 8 }} + {{ include "initContainerCache" . | nindent 8 }} + {{ include "initContainerNumbaCache" . | nindent 8 }} + containers: + {{ include "containerWorkerFirstRows" . | nindent 8 }} + nodeSelector: + {{ toYaml .Values.worker.firstRows.nodeSelector | nindent 8 }} + tolerations: + {{ toYaml .Values.worker.firstRows.tolerations | nindent 8 }} + volumes: + - name: nfs + nfs: + server: {{ .Values.storage.nfs.server }} + path: {{ .Values.storage.nfs.path }} + securityContext: + runAsUser: {{ .Values.uid }} + runAsGroup: {{ .Values.gid }} + runAsNonRoot: true diff --git a/infra/charts/datasets-server/templates/worker/splits-next/_container.tpl b/infra/charts/datasets-server/templates/worker/splits-next/_container.tpl new file mode 100644 index 00000000..a5cbf677 --- /dev/null +++ b/infra/charts/datasets-server/templates/worker/splits-next/_container.tpl @@ -0,0 +1,94 @@ +{{- define "containerWorkerSplitsNext" -}} +- name: "{{ include "name" . }}-worker-splits-next" + env: + - name: ASSETS_BASE_URL + value: "{{ include "assets.baseUrl" . }}" + - name: ASSETS_DIRECTORY + value: {{ .Values.worker.splitsNext.assetsDirectory | quote }} + - name: DATASETS_REVISION + value: {{ .Values.worker.splitsNext.datasetsRevision | quote }} + - name: HF_DATASETS_CACHE + value: "{{ .Values.worker.splitsNext.cacheDirectory }}/datasets" + - name: HF_MODULES_CACHE + value: "/tmp/modules-cache" + # the size should remain so small that we don't need to worry about putting it on an external storage + # see https://github.com/huggingface/datasets-server/issues/248 + - name: HF_TOKEN + # see https://kubernetes.io/docs/concepts/configuration/secret/#creating-a-secret + # and https://kubernetes.io/docs/concepts/configuration/secret/#using-secrets-as-environment-variables + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.hfToken | quote }} + key: HF_TOKEN + optional: false + - name: LOG_LEVEL + value: {{ .Values.worker.splitsNext.logLevel | quote }} + - name: MAX_JOB_RETRIES + value: {{ .Values.worker.splitsNext.maxJobRetries | quote }} + - name: MAX_JOBS_PER_DATASET + value: {{ .Values.worker.splitsNext.maxJobsPerDataset | quote }} + - name: MAX_LOAD_PCT + value: {{ .Values.worker.splitsNext.maxLoadPct | quote }} + - name: MAX_MEMORY_PCT + value: {{ .Values.worker.splitsNext.maxMemoryPct | quote }} + - name: MAX_SIZE_FALLBACK + value: {{ .Values.worker.splitsNext.maxSizeFallback | quote }} + - name: MIN_CELL_BYTES + value: {{ .Values.worker.splitsNext.minCellBytes | quote }} + - name: MONGO_CACHE_DATABASE + value: {{ .Values.mongodb.cacheDatabase | quote }} + - name: MONGO_QUEUE_DATABASE + value: {{ .Values.mongodb.queueDatabase | quote }} + - name: MONGO_URL + {{- if .Values.mongodb.enabled }} + value: mongodb://{{.Release.Name}}-mongodb + {{- else }} + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.mongoUrl | quote }} + key: MONGO_URL + optional: false + {{- end }} + - name: NUMBA_CACHE_DIR + value: {{ .Values.worker.splitsNext.numbaCacheDirectory | quote }} + - name: ROWS_MAX_BYTES + value: {{ .Values.worker.splitsNext.rowsMaxBytes | quote }} + - name: ROWS_MAX_NUMBER + value: {{ .Values.worker.splitsNext.rowsMaxNumber | quote }} + - name: ROWS_MIN_NUMBER + value: {{ .Values.worker.splitsNext.rowsMinNumber| quote }} + - name: WORKER_SLEEP_SECONDS + value: {{ .Values.worker.splitsNext.workerleepSeconds | quote }} + - name: WORKER_QUEUE + # Job queue the worker will pull jobs from: 'datasets' or 'splits' + value: "splits_responses" + image: {{ .Values.dockerImage.worker.splitsNext }} + imagePullPolicy: IfNotPresent + volumeMounts: + - mountPath: {{ .Values.worker.splitsNext.assetsDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "assets.subpath" . }}" + readOnly: false + - mountPath: {{ .Values.worker.splitsNext.cacheDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "cache.datasets.subpath" . }}" + readOnly: false + - mountPath: {{ .Values.worker.splitsNext.numbaCacheDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "cache.numba.subpath" . }}" + readOnly: false + securityContext: + allowPrivilegeEscalation: false + # TODO: provide readiness and liveness probes + # readinessProbe: + # tcpSocket: + # port: {{ .Values.worker.splitsNext.readinessPort }} + # livenessProbe: + # tcpSocket: + # port: {{ .Values.worker.splitsNext.readinessPort }} + resources: + {{ toYaml .Values.worker.splitsNext.resources | nindent 4 }} +{{- end -}} diff --git a/infra/charts/datasets-server/templates/worker/splits-next/deployment.yaml b/infra/charts/datasets-server/templates/worker/splits-next/deployment.yaml new file mode 100644 index 00000000..5063b62c --- /dev/null +++ b/infra/charts/datasets-server/templates/worker/splits-next/deployment.yaml @@ -0,0 +1,40 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + {{ include "labels.worker.splitsNext" . | nindent 4 }} + name: "{{ include "release" . }}-worker-splits-next" + namespace: {{ .Release.Namespace }} +spec: + progressDeadlineSeconds: 600 + replicas: {{ .Values.worker.splitsNext.replicas }} + revisionHistoryLimit: 10 + selector: + matchLabels: + {{ include "labels.worker.splitsNext" . | nindent 6 }} + strategy: + type: Recreate + template: + metadata: + labels: + {{ include "labels.worker.splitsNext" . | nindent 8 }} + spec: + initContainers: + {{ include "initContainerAssets" . | nindent 8 }} + {{ include "initContainerCache" . | nindent 8 }} + {{ include "initContainerNumbaCache" . | nindent 8 }} + containers: + {{ include "containerWorkerSplitsNext" . | nindent 8 }} + nodeSelector: + {{ toYaml .Values.worker.splitsNext.nodeSelector | nindent 8 }} + tolerations: + {{ toYaml .Values.worker.splitsNext.tolerations | nindent 8 }} + volumes: + - name: nfs + nfs: + server: {{ .Values.storage.nfs.server }} + path: {{ .Values.storage.nfs.path }} + securityContext: + runAsUser: {{ .Values.uid }} + runAsGroup: {{ .Values.gid }} + runAsNonRoot: true diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/worker/splits/_container.tpl similarity index 59% rename from infra/charts/datasets-server/templates/splits-worker/_container.tpl rename to infra/charts/datasets-server/templates/worker/splits/_container.tpl index 106da368..a8c0a621 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/worker/splits/_container.tpl @@ -1,2 +1,2 @@ -{{- define "containerSplitsWorker" -}} -- name: "{{ include "name" . }}-splits-worker" +{{- define "containerWorkerSplits" -}} +- name: "{{ include "name" . }}-worker-splits" @@ -3,0 +4,2 @@ + - name: ASSETS_BASE_URL + value: "{{ include "assets.baseUrl" . }}" @@ -5 +7 @@ - value: {{ .Values.splitsWorker.assetsDirectory | quote }} + value: {{ .Values.worker.splits.assetsDirectory | quote }} @@ -7 +9 @@ - value: {{ .Values.splitsWorker.datasetsRevision | quote }} + value: {{ .Values.worker.splits.datasetsRevision | quote }} @@ -9 +11 @@ - value: "{{ .Values.splitsWorker.cacheDirectory }}/datasets" + value: "{{ .Values.worker.splits.cacheDirectory }}/datasets" @@ -24 +26 @@ - value: {{ .Values.splitsWorker.logLevel | quote }} + value: {{ .Values.worker.splits.logLevel | quote }} @@ -26 +28 @@ - value: {{ .Values.splitsWorker.maxJobRetries | quote }} + value: {{ .Values.worker.splits.maxJobRetries | quote }} @@ -28 +30 @@ - value: {{ .Values.splitsWorker.maxJobsPerDataset | quote }} + value: {{ .Values.worker.splits.maxJobsPerDataset | quote }} @@ -30 +32 @@ - value: {{ .Values.splitsWorker.maxLoadPct | quote }} + value: {{ .Values.worker.splits.maxLoadPct | quote }} @@ -32 +34 @@ - value: {{ .Values.splitsWorker.maxMemoryPct | quote }} + value: {{ .Values.worker.splits.maxMemoryPct | quote }} @@ -34 +36 @@ - value: {{ .Values.splitsWorker.maxSizeFallback | quote }} + value: {{ .Values.worker.splits.maxSizeFallback | quote }} @@ -36 +38 @@ - value: {{ .Values.splitsWorker.minCellBytes | quote }} + value: {{ .Values.worker.splits.minCellBytes | quote }} @@ -52 +54 @@ - value: {{ .Values.splitsWorker.numbaCacheDirectory | quote }} + value: {{ .Values.worker.splits.numbaCacheDirectory | quote }} @@ -54 +56 @@ - value: {{ .Values.splitsWorker.rowsMaxBytes | quote }} + value: {{ .Values.worker.splits.rowsMaxBytes | quote }} @@ -56 +58 @@ - value: {{ .Values.splitsWorker.rowsMaxNumber | quote }} + value: {{ .Values.worker.splits.rowsMaxNumber | quote }} @@ -58 +60 @@ - value: {{ .Values.splitsWorker.rowsMinNumber| quote }} + value: {{ .Values.worker.splits.rowsMinNumber| quote }} @@ -60 +62 @@ - value: {{ .Values.splitsWorker.workerSleepSeconds | quote }} + value: {{ .Values.worker.splits.workerSleepSeconds | quote }} @@ -64 +66 @@ - image: {{ .Values.dockerImage.splitsWorker }} + image: {{ .Values.dockerImage.worker.splits }} @@ -67 +69 @@ - - mountPath: {{ .Values.splitsWorker.assetsDirectory | quote }} + - mountPath: {{ .Values.worker.splits.assetsDirectory | quote }} @@ -72 +74 @@ - - mountPath: {{ .Values.splitsWorker.cacheDirectory | quote }} + - mountPath: {{ .Values.worker.splits.cacheDirectory | quote }} @@ -77 +79 @@ - - mountPath: {{ .Values.splitsWorker.numbaCacheDirectory | quote }} + - mountPath: {{ .Values.worker.splits.numbaCacheDirectory | quote }} @@ -87 +89 @@ - # port: {{ .Values.splitsWorker.readinessPort }} + # port: {{ .Values.worker.splits.readinessPort }} @@ -90 +92 @@ - # port: {{ .Values.splitsWorker.readinessPort }} + # port: {{ .Values.worker.splits.readinessPort }} @@ -92 +94 @@ - {{ toYaml .Values.splitsWorker.resources | nindent 4 }} + {{ toYaml .Values.worker.splits.resources | nindent 4 }} diff --git a/infra/charts/datasets-server/templates/splits-worker/deployment.yaml b/infra/charts/datasets-server/templates/worker/splits/deployment.yaml similarity index 63% rename from infra/charts/datasets-server/templates/splits-worker/deployment.yaml rename to infra/charts/datasets-server/templates/worker/splits/deployment.yaml index 3532a69e..ebc724b1 100644 --- a/infra/charts/datasets-server/templates/splits-worker/deployment.yaml +++ b/infra/charts/datasets-server/templates/worker/splits/deployment.yaml @@ -5,2 +5,2 @@ metadata: - {{ include "labels.splitsWorker" . | nindent 4 }} - name: "{{ include "release" . }}-splits-worker" + {{ include "labels.worker.splits" . | nindent 4 }} + name: "{{ include "release" . }}-worker-splits" @@ -10 +10 @@ spec: - replicas: {{ .Values.splitsWorker.replicas }} + replicas: {{ .Values.worker.splits.replicas }} @@ -14 +14 @@ spec: - {{ include "labels.splitsWorker" . | nindent 6 }} + {{ include "labels.worker.splits" . | nindent 6 }} @@ -20 +20 @@ spec: - {{ include "labels.splitsWorker" . | nindent 8 }} + {{ include "labels.worker.splits" . | nindent 8 }} @@ -27 +27 @@ spec: - {{ include "containerSplitsWorker" . | nindent 8 }} + {{ include "containerWorkerSplits" . | nindent 8 }} @@ -29 +29 @@ spec: - {{ toYaml .Values.splitsWorker.nodeSelector | nindent 8 }} + {{ toYaml .Values.worker.splits.nodeSelector | nindent 8 }} @@ -31 +31 @@ spec: - {{ toYaml .Values.splitsWorker.tolerations | nindent 8 }} + {{ toYaml .Values.worker.splits.tolerations | nindent 8 }} diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 9f03e60a..36d750ce 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -15,5 +15,6 @@ dockerImage: - admin: '' - api: '' - datasetsWorker: '' - reverseProxy: '' - splitsWorker: '' + admin: "" + api: "" + reverseProxy: "" + worker: + datasets: "" + splits: "" @@ -41 +42 @@ reverseProxy: - annotations: { } + annotations: {} @@ -44 +45 @@ reverseProxy: - annotations: { } + annotations: {} @@ -69 +70 @@ api: - + @@ -72 +73 @@ api: - annotations: { } + annotations: {} @@ -75,2 +76,2 @@ api: - annotations: { } - + annotations: {} + @@ -80 +81 @@ api: - limits: + limits: @@ -99 +100 @@ api: - maxAgeShortSeconds: "10" + maxAgeShortSeconds: "10" @@ -100,0 +102,3 @@ api: +worker: + datasets: + replicas: 1 @@ -102,10 +106,7 @@ api: -datasetsWorker: - replicas: 1 - - resources: - requests: - cpu: 1 - limits: - cpu: 1 - nodeSelector: {} - tolerations: [] + resources: + requests: + cpu: 1 + limits: + cpu: 1 + nodeSelector: {} + tolerations: [] @@ -113,43 +114,32 @@ datasetsWorker: - # Directory of assets (audio files and images that will be served for the web) - assetsDirectory: "/assets" - # Directory of the "datasets" library cache (for the datasets, not the modules) - cacheDirectory: "/cache" - # Git reference for the canonical datasets on https://github.com/huggingface/datasets - datasetsRevision: "master" - # User Access Token (see https://huggingface.co/settings/token, only the `read` role is required) - hfToken: "" - # Log level - logLevel: "INFO" - # Max number of job retries (for 500 errors) for the same job - maxJobRetries: 3 - # Maximum number of jobs running at the same time for the same dataset - maxJobsPerDataset: 1 - # Max CPU load (%) - if reached, sleeps until it comes back under the limit - maxLoadPct: 0 - # Max memory (RAM + SWAP) (%) - if reached, sleeps until it comes back under the limit - maxMemoryPct: 0 - # Max size (in bytes) of the dataset to fallback in normal mode if streaming fails - maxSizeFallback: "100_000_000" - # Min size of a cell in the /rows endpoint response in bytes - minCellBytes: 100 - # Directory of the "numba" library cache - numbaCacheDirectory: "/numba-cache" - # Max size of the /rows endpoint response in bytes - rowMaxBytes: "1_000_000" - # Max number of rows in the /rows endpoint response - rowsMaxNumber: 100 - # Min number of rows in the /rows endpoint response - rowsMinNumber: 10 - # Number of seconds a worker will sleep before trying to process a new job - workerSleepSeconds: 15 - -splitsWorker: - replicas: 1 - - resources: - requests: - cpu: 1 - limits: - cpu: 1 - nodeSelector: {} - tolerations: [] + # Directory of assets (audio files and images that will be served for the web) + assetsDirectory: "/assets" + # Directory of the "datasets" library cache (for the datasets, not the modules) + cacheDirectory: "/cache" + # Git reference for the canonical datasets on https://github.com/huggingface/datasets + datasetsRevision: "master" + # User Access Token (see https://huggingface.co/settings/token, only the `read` role is required) + hfToken: "" + # Log level + logLevel: "INFO" + # Max number of job retries (for 500 errors) for the same job + maxJobRetries: 3 + # Maximum number of jobs running at the same time for the same dataset + maxJobsPerDataset: 1 + # Max CPU load (%) - if reached, sleeps until it comes back under the limit + maxLoadPct: 0 + # Max memory (RAM + SWAP) (%) - if reached, sleeps until it comes back under the limit + maxMemoryPct: 0 + # Max size (in bytes) of the dataset to fallback in normal mode if streaming fails + maxSizeFallback: "100_000_000" + # Min size of a cell in the /rows endpoint response in bytes + minCellBytes: 100 + # Directory of the "numba" library cache + numbaCacheDirectory: "/numba-cache" + # Max size of the /rows endpoint response in bytes + rowMaxBytes: "1_000_000" + # Max number of rows in the /rows endpoint response + rowsMaxNumber: 100 + # Min number of rows in the /rows endpoint response + rowsMinNumber: 10 + # Number of seconds a worker will sleep before trying to process a new job + workerSleepSeconds: 15 @@ -157,30 +147,96 @@ splitsWorker: - # Directory of assets (audio files and images that will be served for the web) - assetsDirectory: "/assets" - # Directory of the "datasets" library cache (for the datasets, not the modules) - cacheDirectory: "/cache" - # Git reference for the canonical datasets on https://github.com/huggingface/datasets - datasetsRevision: "master" - # Log level - logLevel: "INFO" - # Max number of job retries (for 500 errors) for the same job - maxJobRetries: 3 - # Maximum number of jobs running at the same time for the same dataset - maxJobsPerDataset: 1 - # Max CPU load (%) - if reached, sleeps until it comes back under the limit - maxLoadPct: 0 - # Max memory (RAM + SWAP) (%) - if reached, sleeps until it comes back under the limit - maxMemoryPct: 0 - # Max size (in bytes) of the dataset to fallback in normal mode if streaming fails - maxSizeFallback: "100_000_000" - # Min size of a cell in the /rows endpoint response in bytes - minCellBytes: 100 - # Directory of the "numba" library cache - numbaCacheDirectory: "/numba-cache" - # Max size of the /rows endpoint response in bytes - rowMaxBytes: "1_000_000" - # Max number of rows in the /rows endpoint response - rowsMaxNumber: 100 - # Min number of rows in the /rows endpoint response - rowsMinNumber: 10 - # Number of seconds a worker will sleep before trying to process a new job - workerSleepSeconds: 15 + firstRows: + replicas: 1 + + resources: + requests: + cpu: 1 + limits: + cpu: 1 + nodeSelector: {} + tolerations: [] + + # Directory of assets (audio files and images that will be served for the web) + assetsDirectory: "/assets" + # Directory of the "datasets" library cache (for the datasets, not the modules) + cacheDirectory: "/cache" + # Git reference for the canonical datasets on https://github.com/huggingface/datasets + datasetsRevision: "master" + # User Access Token (see https://huggingface.co/settings/token, only the `read` role is required) + hfToken: "" + # Log level + logLevel: "INFO" + # Max number of job retries (for 500 errors) for the same job + maxJobRetries: 3 + # Maximum number of jobs running at the same time for the same dataset + maxJobsPerDataset: 1 + # Max CPU load (%) - if reached, sleeps until it comes back under the limit + maxLoadPct: 0 + # Max memory (RAM + SWAP) (%) - if reached, sleeps until it comes back under the limit + maxMemoryPct: 0 + # Max size (in bytes) of the dataset to fallback in normal mode if streaming fails + maxSizeFallback: "100_000_000" + # Min size of a cell in the /rows endpoint response in bytes + minCellBytes: 100 + # Directory of the "numba" library cache + numbaCacheDirectory: "/numba-cache" + # Max size of the /rows endpoint response in bytes + rowMaxBytes: "1_000_000" + # Max number of rows in the /rows endpoint response + rowsMaxNumber: 100 + # Min number of rows in the /rows endpoint response + rowsMinNumber: 10 + # Number of seconds a worker will sleep before trying to process a new job + workerSleepSeconds: 15 + + splitsNext: + replicas: 1 + + resources: + requests: + cpu: 1 + limits: + cpu: 1 + nodeSelector: {} + tolerations: [] + + # Directory of assets (audio files and images that will be served for the web) + assetsDirectory: "/assets" + # Directory of the "datasets" library cache (for the datasets, not the modules) + cacheDirectory: "/cache" + # Git reference for the canonical datasets on https://github.com/huggingface/datasets + datasetsRevision: "master" + # Log level + logLevel: "INFO" + # Max number of job retries (for 500 errors) for the same job + maxJobRetries: 3 + # Maximum number of jobs running at the same time for the same dataset + maxJobsPerDataset: 1 + # Max CPU load (%) - if reached, sleeps until it comes back under the limit + maxLoadPct: 0 + # Max memory (RAM + SWAP) (%) - if reached, sleeps until it comes back under the limit + maxMemoryPct: 0 + # Max size (in bytes) of the dataset to fallback in normal mode if streaming fails + maxSizeFallback: "100_000_000" + # Min size of a cell in the /rows endpoint response in bytes + minCellBytes: 100 + # Directory of the "numba" library cache + numbaCacheDirectory: "/numba-cache" + # Max size of the /rows endpoint response in bytes + rowMaxBytes: "1_000_000" + # Max number of rows in the /rows endpoint response + rowsMaxNumber: 100 + # Min number of rows in the /rows endpoint response + rowsMinNumber: 10 + # Number of seconds a worker will sleep before trying to process a new job + workerSleepSeconds: 15 + + splits: + replicas: 1 + + resources: + requests: + cpu: 1 + limits: + cpu: 1 + nodeSelector: {} + tolerations: [] @@ -187,0 +244,30 @@ splitsWorker: + # Directory of assets (audio files and images that will be served for the web) + assetsDirectory: "/assets" + # Directory of the "datasets" library cache (for the datasets, not the modules) + cacheDirectory: "/cache" + # Git reference for the canonical datasets on https://github.com/huggingface/datasets + datasetsRevision: "master" + # Log level + logLevel: "INFO" + # Max number of job retries (for 500 errors) for the same job + maxJobRetries: 3 + # Maximum number of jobs running at the same time for the same dataset + maxJobsPerDataset: 1 + # Max CPU load (%) - if reached, sleeps until it comes back under the limit + maxLoadPct: 0 + # Max memory (RAM + SWAP) (%) - if reached, sleeps until it comes back under the limit + maxMemoryPct: 0 + # Max size (in bytes) of the dataset to fallback in normal mode if streaming fails + maxSizeFallback: "100_000_000" + # Min size of a cell in the /rows endpoint response in bytes + minCellBytes: 100 + # Directory of the "numba" library cache + numbaCacheDirectory: "/numba-cache" + # Max size of the /rows endpoint response in bytes + rowMaxBytes: "1_000_000" + # Max number of rows in the /rows endpoint response + rowsMaxNumber: 100 + # Min number of rows in the /rows endpoint response + rowsMinNumber: 10 + # Number of seconds a worker will sleep before trying to process a new job + workerSleepSeconds: 15 @@ -194 +280 @@ admin: - annotations: { } + annotations: {} @@ -197 +283 @@ admin: - annotations: { } + annotations: {} diff --git a/libs/libcache/dist/libcache-0.1.10-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.10-py3-none-any.whl new file mode 100644 index 00000000..fbc94769 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.10-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.10.tar.gz b/libs/libcache/dist/libcache-0.1.10.tar.gz new file mode 100644 index 00000000..70624903 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.10.tar.gz differ diff --git a/libs/libcache/dist/libcache-0.1.9-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.9-py3-none-any.whl new file mode 100644 index 00000000..ad88a698 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.9-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.9.tar.gz b/libs/libcache/dist/libcache-0.1.9.tar.gz new file mode 100644 index 00000000..03e3adc7 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.9.tar.gz differ diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 009514b7..01286dc5 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.8" +version = "0.1.10" diff --git a/libs/libcache/src/libcache/simple_cache.py b/libs/libcache/src/libcache/simple_cache.py new file mode 100644 index 00000000..36a57331 --- /dev/null +++ b/libs/libcache/src/libcache/simple_cache.py @@ -0,0 +1,234 @@ +import enum +import logging +import types +from datetime import datetime, timezone +from typing import Dict, Generic, List, Optional, Tuple, Type, TypedDict, TypeVar + +from mongoengine import Document, DoesNotExist, connect +from mongoengine.fields import ( + BooleanField, + DateTimeField, + DictField, + EnumField, + StringField, +) +from mongoengine.queryset.queryset import QuerySet + +# START monkey patching ### hack ### +# see https://github.com/sbdchd/mongo-types#install +U = TypeVar("U", bound=Document) + + +def no_op(self, x): # type: ignore + return self + + +QuerySet.__class_getitem__ = types.MethodType(no_op, QuerySet) + + +logger = logging.getLogger(__name__) + + +class QuerySetManager(Generic[U]): + def __get__(self, instance: object, cls: Type[U]) -> QuerySet[U]: + return QuerySet(cls, cls._get_collection()) + + +# END monkey patching ### hack ### + + +def connect_to_cache(database, host) -> None: + connect(database, alias="cache", host=host) + + +# subset of https://docs.python.org/3/library/http.html#http.HTTPStatus +class HTTPStatus(enum.Enum): + OK = "200" + BAD_REQUEST = "400" + INTERNAL_SERVER_ERROR = "500" + + +def get_datetime() -> datetime: + return datetime.now(timezone.utc) + + +# cache of the /splits endpoint +class SplitsResponse(Document): + dataset_name = StringField(required=True, unique=True) + http_status = EnumField(HTTPStatus, required=True) + response = DictField(required=True) # can be an error or a valid content. Not important here. + details = DictField(required=False) # can be a detailed error when we don't want to put it in the response. + stale = BooleanField(required=False, default=False) + updated_at = DateTimeField(default=get_datetime) + + meta = { + "collection": "splitsResponse", + "db_alias": "cache", + "indexes": ["dataset_name", "http_status", "stale"], + } + objects = QuerySetManager["SplitsResponse"]() + + +# cache of the /first-rows endpoint +class FirstRowsResponse(Document): + dataset_name = StringField(required=True, unique_with=["config_name", "split_name"]) + config_name = StringField(required=True) + split_name = StringField(required=True) + http_status = EnumField(HTTPStatus, required=True) + response = DictField(required=True) # can be an error or a valid content. Not important here. + details = DictField(required=False) # can be a detailed error when we don't want to put it in the response. + stale = BooleanField(required=False, default=False) + updated_at = DateTimeField(default=get_datetime) + + meta = { + "collection": "firstRowsResponse", + "db_alias": "cache", + "indexes": [ + ("dataset_name", "config_name", "split_name"), + ("dataset_name", "http_status"), + ("http_status", "dataset_name"), + # ^ this index (reversed) is used for the "distinct" command to get the names of the valid datasets + ], + } + objects = QuerySetManager["FirstRowsResponse"]() + + +AnyResponse = TypeVar("AnyResponse", SplitsResponse, FirstRowsResponse) + +# TODO: add logger.debug for each operation? + + +# /splits endpoint +# Note: we let the exceptions throw (ie DocumentTooLarge): it's the responsibility of the caller to manage them +def upsert_splits_response( + dataset_name: str, response: Dict, http_status: HTTPStatus, details: Optional[Dict] = None +) -> None: + SplitsResponse.objects(dataset_name=dataset_name).upsert_one( + http_status=http_status, + response=response, + stale=False, + details=details, + updated_at=get_datetime(), + ) + + +def delete_splits_responses(dataset_name: str): + SplitsResponse.objects(dataset_name=dataset_name).delete() + + +def mark_splits_responses_as_stale(dataset_name: str): + SplitsResponse.objects(dataset_name=dataset_name).update(stale=True, updated_at=get_datetime()) + + +# Note: we let the exceptions throw (ie DoesNotExist): it's the responsibility of the caller to manage them +def get_splits_response(dataset_name: str) -> Tuple[Dict, HTTPStatus]: + split_response = SplitsResponse.objects(dataset_name=dataset_name).get() + return split_response.response, split_response.http_status + + +# /first-rows endpoint +# Note: we let the exceptions throw (ie DocumentTooLarge): it's the responsibility of the caller to manage them +def upsert_first_rows_response( + dataset_name: str, + config_name: str, + split_name: str, + response: Dict, + http_status: HTTPStatus, + details: Optional[Dict] = None, +) -> None: + FirstRowsResponse.objects(dataset_name=dataset_name, config_name=config_name, split_name=split_name).upsert_one( + http_status=http_status, response=response, stale=False, details=details, updated_at=get_datetime() + ) + + +def delete_first_rows_responses( + dataset_name: str, config_name: Optional[str] = None, split_name: Optional[str] = None +): + objects = ( + FirstRowsResponse.objects(dataset_name=dataset_name) + if config_name is None + else FirstRowsResponse.objects(dataset_name=dataset_name, config_name=config_name, split_name=split_name) + ) + objects.delete() + + +def mark_first_rows_responses_as_stale( + dataset_name: str, config_name: Optional[str] = None, split_name: Optional[str] = None +): + objects = ( + FirstRowsResponse.objects(dataset_name=dataset_name) + if config_name is None + else FirstRowsResponse.objects(dataset_name=dataset_name, config_name=config_name, split_name=split_name) + ) + objects.update(stale=True, updated_at=get_datetime()) + + +# Note: we let the exceptions throw (ie DoesNotExist): it's the responsibility of the caller to manage them +def get_first_rows_response(dataset_name: str, config_name: str, split_name: str) -> Tuple[Dict, HTTPStatus]: + first_rows_response = FirstRowsResponse.objects( + dataset_name=dataset_name, config_name=config_name, split_name=split_name + ).get() + return first_rows_response.response, first_rows_response.http_status + + +def get_dataset_first_rows_response_splits(dataset_name: str) -> List[Tuple[str, str, str]]: + return [ + (firstRowResponse.dataset_name, firstRowResponse.config_name, firstRowResponse.split_name) + for firstRowResponse in FirstRowsResponse.objects(dataset_name=dataset_name).only( + "dataset_name", "config_name", "split_name" + ) + ] + + +# /valid endpoint + + +def get_valid_dataset_names() -> List[str]: + # a dataset is considered valid if: + # - the /splits response is valid + candidate_dataset_names = set(SplitsResponse.objects(http_status=HTTPStatus.OK).distinct("dataset_name")) + # - at least one of the /first-rows responses is valid + candidate_dataset_names_in_first_rows = set( + FirstRowsResponse.objects(http_status=HTTPStatus.OK).distinct("dataset_name") + ) + + candidate_dataset_names.intersection_update(candidate_dataset_names_in_first_rows) + # note that the list is sorted alphabetically for consistency + return sorted(candidate_dataset_names) + + +class CountByHTTPStatus(TypedDict): + OK: int + BAD_REQUEST: int + INTERNAL_SERVER_ERROR: int + + +def get_entries_count_by_status(entries: QuerySet[AnyResponse]) -> CountByHTTPStatus: + # ensure that all the statuses are present, even if equal to zero + # note: we repeat the values instead of looping on Status because we don't know how to get the types right in mypy + # result: CountByStatus = {s.value: entries(status=s.value).count() for s in Status} # <- doesn't work in mypy + # see https://stackoverflow.com/a/67292548/7351594 + return { + "OK": entries(http_status=HTTPStatus.OK.value).count(), + "BAD_REQUEST": entries(http_status=HTTPStatus.BAD_REQUEST.value).count(), + "INTERNAL_SERVER_ERROR": entries(http_status=HTTPStatus.INTERNAL_SERVER_ERROR).count(), + } + + +def get_splits_responses_count_by_status() -> CountByHTTPStatus: + # TODO: take the splits statuses into account? + return get_entries_count_by_status(SplitsResponse.objects) + + +def get_first_rows_responses_count_by_status() -> CountByHTTPStatus: + return get_entries_count_by_status(FirstRowsResponse.objects) + + +# only for the tests +def _clean_database() -> None: + SplitsResponse.drop_collection() # type: ignore + FirstRowsResponse.drop_collection() # type: ignore + + +# explicit re-export +__all__ = ["DoesNotExist"] diff --git a/libs/libcache/tests/test_simple_cache.py b/libs/libcache/tests/test_simple_cache.py new file mode 100644 index 00000000..84c6a1a2 --- /dev/null +++ b/libs/libcache/tests/test_simple_cache.py @@ -0,0 +1,189 @@ +import pytest +from pymongo.errors import DocumentTooLarge + +from libcache.simple_cache import ( + DoesNotExist, + HTTPStatus, + _clean_database, + connect_to_cache, + delete_first_rows_responses, + delete_splits_responses, + get_first_rows_response, + get_first_rows_responses_count_by_status, + get_splits_response, + get_splits_responses_count_by_status, + get_valid_dataset_names, + mark_first_rows_responses_as_stale, + mark_splits_responses_as_stale, + upsert_first_rows_response, + upsert_splits_response, +) + +from ._utils import MONGO_CACHE_DATABASE, MONGO_URL + + [email protected](autouse=True, scope="module") +def safe_guard() -> None: + if "test" not in MONGO_CACHE_DATABASE: + raise ValueError("Test must be launched on a test mongo database") + + [email protected](autouse=True, scope="module") +def client() -> None: + connect_to_cache(database=MONGO_CACHE_DATABASE, host=MONGO_URL) + + [email protected](autouse=True) +def clean_mongo_database() -> None: + _clean_database() + + +def test_upsert_splits_response() -> None: + dataset_name = "test_dataset" + response = {"splits": [{"dataset_name": dataset_name, "config_name": "test_config", "split_name": "test_split"}]} + upsert_splits_response(dataset_name, response, HTTPStatus.OK) + response1, http_status = get_splits_response(dataset_name) + assert http_status == HTTPStatus.OK + assert response1 == response + + # ensure it's idempotent + upsert_splits_response(dataset_name, response, HTTPStatus.OK) + (response2, _) = get_splits_response(dataset_name) + assert response2 == response1 + + mark_splits_responses_as_stale(dataset_name) + # we don't have access to the stale field + # we also don't have access to the updated_at field + + delete_splits_responses(dataset_name) + with pytest.raises(DoesNotExist): + get_splits_response(dataset_name) + + mark_splits_responses_as_stale(dataset_name) + with pytest.raises(DoesNotExist): + get_splits_response(dataset_name) + + +def test_upsert_first_rows_response() -> None: + dataset_name = "test_dataset" + config_name = "test_config" + split_name = "test_split" + response = {"key": "value"} + upsert_first_rows_response(dataset_name, config_name, split_name, response, HTTPStatus.OK) + response1, http_status = get_first_rows_response(dataset_name, config_name, split_name) + assert http_status == HTTPStatus.OK + assert response1 == response + + # ensure it's idempotent + upsert_first_rows_response(dataset_name, config_name, split_name, response, HTTPStatus.OK) + (response2, _) = get_first_rows_response(dataset_name, config_name, split_name) + assert response2 == response1 + + mark_first_rows_responses_as_stale(dataset_name) + mark_first_rows_responses_as_stale(dataset_name, config_name, split_name) + # we don't have access to the stale field + # we also don't have access to the updated_at field + + upsert_first_rows_response(dataset_name, config_name, "test_split2", response, HTTPStatus.OK) + delete_first_rows_responses(dataset_name, config_name, "test_split2") + get_first_rows_response(dataset_name, config_name, split_name) + + delete_first_rows_responses(dataset_name) + with pytest.raises(DoesNotExist): + get_first_rows_response(dataset_name, config_name, split_name) + + mark_first_rows_responses_as_stale(dataset_name) + mark_first_rows_responses_as_stale(dataset_name, config_name, split_name) + with pytest.raises(DoesNotExist): + get_first_rows_response(dataset_name, config_name, split_name) + + +def test_big_row() -> None: + # https://github.com/huggingface/datasets-server/issues/197 + dataset_name = "test_dataset" + config_name = "test_config" + split_name = "test_split" + big_response = {"content": "a" * 100_000_000} + with pytest.raises(DocumentTooLarge): + upsert_first_rows_response(dataset_name, config_name, split_name, big_response, HTTPStatus.OK) + + +def test_valid() -> None: + assert get_valid_dataset_names() == [] + + upsert_splits_response( + "test_dataset", + {"key": "value"}, + HTTPStatus.OK, + ) + + assert get_valid_dataset_names() == [] + + upsert_first_rows_response( + "test_dataset", + "test_config", + "test_split", + { + "key": "value", + }, + HTTPStatus.OK, + ) + + assert get_valid_dataset_names() == ["test_dataset"] + + upsert_splits_response( + "test_dataset2", + {"key": "value"}, + HTTPStatus.OK, + ) + + assert get_valid_dataset_names() == ["test_dataset"] + + upsert_first_rows_response( + "test_dataset2", + "test_config2", + "test_split2", + { + "key": "value", + }, + HTTPStatus.BAD_REQUEST, + ) + + assert get_valid_dataset_names() == ["test_dataset"] + + upsert_first_rows_response( + "test_dataset2", + "test_config2", + "test_split3", + { + "key": "value", + }, + HTTPStatus.OK, + ) + + assert get_valid_dataset_names() == ["test_dataset", "test_dataset2"] + + +def test_count_by_status() -> None: + assert get_splits_responses_count_by_status() == {"OK": 0, "BAD_REQUEST": 0, "INTERNAL_SERVER_ERROR": 0} + + upsert_splits_response( + "test_dataset2", + {"key": "value"}, + HTTPStatus.OK, + ) + + assert get_splits_responses_count_by_status() == {"OK": 1, "BAD_REQUEST": 0, "INTERNAL_SERVER_ERROR": 0} + assert get_first_rows_responses_count_by_status() == {"OK": 0, "BAD_REQUEST": 0, "INTERNAL_SERVER_ERROR": 0} + + upsert_first_rows_response( + "test_dataset", + "test_config", + "test_split", + { + "key": "value", + }, + HTTPStatus.OK, + ) + + assert get_first_rows_responses_count_by_status() == {"OK": 1, "BAD_REQUEST": 0, "INTERNAL_SERVER_ERROR": 0} diff --git a/libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl new file mode 100644 index 00000000..e7b52949 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.7.tar.gz b/libs/libqueue/dist/libqueue-0.1.7.tar.gz new file mode 100644 index 00000000..6c40d134 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.7.tar.gz differ diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index de165fae..2b944de4 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.6" +version = "0.1.7" diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index fa74f01d..67c80a48 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -4 +4 @@ import types -from datetime import datetime +from datetime import datetime, timezone @@ -31,0 +32,4 @@ logger = logging.getLogger(__name__) +# TODO: DRY and use the template method pattern to separate the specifics of each queue +# (the list of arguments of a job) from the logics (status, retries, etc.) +# (https://roadmap.sh/guides/design-patterns-for-humans#-template-method) + @@ -58,0 +63,10 @@ class SplitJobDict(JobDict): +class SplitsJobDict(JobDict): + dataset_name: str + + +class FirstRowsJobDict(JobDict): + dataset_name: str + config_name: str + split_name: str + + @@ -153 +167,62 @@ class SplitJob(Document): -AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJob +class SplitsJob(Document): + meta = { + "collection": "splits_jobs", + "db_alias": "queue", + "indexes": ["status", ("dataset_name", "status")], + } + dataset_name = StringField(required=True) + created_at = DateTimeField(required=True) + started_at = DateTimeField() + finished_at = DateTimeField() + status = EnumField(Status, default=Status.WAITING) + retries = IntField(required=False, default=0) + + def to_dict(self) -> SplitsJobDict: + return { + "dataset_name": self.dataset_name, + "status": self.status.value, + "created_at": self.created_at, + "started_at": self.started_at, + "finished_at": self.finished_at, + "retries": self.retries, + } + + def to_id(self) -> str: + return f"SplitsJob[{self.dataset_name}]" + + objects = QuerySetManager["SplitsJob"]() + + +class FirstRowsJob(Document): + meta = { + "collection": "first_rows_jobs", + "db_alias": "queue", + "indexes": [ + "status", + ("dataset_name", "status"), + ("dataset_name", "config_name", "split_name", "status"), + ], + } + dataset_name = StringField(required=True) + config_name = StringField(required=True) + split_name = StringField(required=True) + status = EnumField(Status, default=Status.WAITING) + created_at = DateTimeField(required=True) + started_at = DateTimeField() + finished_at = DateTimeField() + retries = IntField(required=False, default=0) + + def to_dict(self) -> FirstRowsJobDict: + return { + "dataset_name": self.dataset_name, + "config_name": self.config_name, + "split_name": self.split_name, + "status": self.status.value, + "created_at": self.created_at, + "started_at": self.started_at, + "finished_at": self.finished_at, + "retries": self.retries, + } + + def to_id(self) -> str: + return f"FirstRowsJob[{self.dataset_name}, {self.config_name}, {self.split_name}]" @@ -154,0 +230 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ + objects = QuerySetManager["FirstRowsJob"]() @@ -156,4 +231,0 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# TODO: add priority (webhook: 5, warming: 3, refresh: 1) -# TODO: add status (valid/error/stale) to the finished jobs -# TODO: limit the size of the queue? remove the oldest if room is needed? -# TODO: how to avoid deadlocks (a worker has taken the job, but never finished)? stale, hours @@ -161,5 +233 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# enqueue -# dequeue -# peek -# is full -# is empty +AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob, SplitsJob, FirstRowsJob) @@ -175,0 +244,4 @@ class JobNotFound(Exception): +def get_datetime() -> datetime: + return datetime.now(timezone.utc) + + @@ -188 +260 @@ def add_dataset_job(dataset_name: str, retries: Optional[int] = 0) -> None: - DatasetJob(dataset_name=dataset_name, created_at=datetime.utcnow(), status=Status.WAITING, retries=retries), + DatasetJob(dataset_name=dataset_name, created_at=get_datetime(), status=Status.WAITING, retries=retries), @@ -199 +271,22 @@ def add_split_job(dataset_name: str, config_name: str, split_name: str, retries: - created_at=datetime.utcnow(), + created_at=get_datetime(), + status=Status.WAITING, + retries=retries, + ), + ) + + +def add_splits_job(dataset_name: str, retries: Optional[int] = 0) -> None: + add_job( + SplitsJob.objects(dataset_name=dataset_name), + SplitsJob(dataset_name=dataset_name, created_at=get_datetime(), status=Status.WAITING, retries=retries), + ) + + +def add_first_rows_job(dataset_name: str, config_name: str, split_name: str, retries: Optional[int] = 0) -> None: + add_job( + FirstRowsJob.objects(dataset_name=dataset_name, config_name=config_name, split_name=split_name), + FirstRowsJob( + dataset_name=dataset_name, + config_name=config_name, + split_name=split_name, + created_at=get_datetime(), @@ -246 +339 @@ def start_job(jobs: QuerySet[AnyJob], max_jobs_per_dataset: Optional[int] = None - next_waiting_job.update(started_at=datetime.utcnow(), status=Status.STARTED) + next_waiting_job.update(started_at=get_datetime(), status=Status.STARTED) @@ -264,0 +358,15 @@ def get_split_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str, +def get_splits_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str, int]: + job = start_job(SplitsJob.objects, max_jobs_per_dataset) + # ^ max_jobs_per_dataset is not very useful for the SplitsJob queue + # since only one job per dataset can exist anyway + # It's here for consistency and safeguard + return str(job.pk), job.dataset_name, job.retries + # ^ job.pk is the id. job.id is not recognized by mypy + + +def get_first_rows_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str, str, str, int]: + job = start_job(FirstRowsJob.objects, max_jobs_per_dataset) + return str(job.pk), job.dataset_name, job.config_name, job.split_name, job.retries + # ^ job.pk is the id. job.id is not recognized by mypy + + @@ -280 +388 @@ def finish_started_job(jobs: QuerySet[AnyJob], job_id: str, success: bool) -> No - job.update(finished_at=datetime.utcnow(), status=status) + job.update(finished_at=get_datetime(), status=status) @@ -290,0 +399,8 @@ def finish_split_job(job_id: str, success: bool) -> None: +def finish_splits_job(job_id: str, success: bool) -> None: + finish_started_job(SplitsJob.objects, job_id, success) + + +def finish_first_rows_job(job_id: str, success: bool) -> None: + finish_started_job(FirstRowsJob.objects, job_id, success) + + @@ -293,0 +410,2 @@ def clean_database() -> None: + SplitsJob.drop_collection() # type: ignore + FirstRowsJob.drop_collection() # type: ignore @@ -298 +416 @@ def cancel_started_dataset_jobs() -> None: - job.update(finished_at=datetime.utcnow(), status=Status.CANCELLED) + job.update(finished_at=get_datetime(), status=Status.CANCELLED) @@ -304 +422 @@ def cancel_started_split_jobs() -> None: - job.update(finished_at=datetime.utcnow(), status=Status.CANCELLED) + job.update(finished_at=get_datetime(), status=Status.CANCELLED) @@ -309,0 +428,14 @@ def cancel_started_split_jobs() -> None: +def cancel_started_splits_jobs() -> None: + for job in get_started(SplitsJob.objects): + job.update(finished_at=get_datetime(), status=Status.CANCELLED) + add_splits_job(dataset_name=job.dataset_name, retries=job.retries) + + +def cancel_started_first_rows_jobs() -> None: + for job in get_started(FirstRowsJob.objects): + job.update(finished_at=get_datetime(), status=Status.CANCELLED) + add_first_rows_job( + dataset_name=job.dataset_name, config_name=job.config_name, split_name=job.split_name, retries=job.retries + ) + + @@ -334,0 +467,8 @@ def get_split_jobs_count_by_status() -> CountByStatus: +def get_splits_jobs_count_by_status() -> CountByStatus: + return get_jobs_count_by_status(SplitsJob.objects) + + +def get_first_rows_jobs_count_by_status() -> CountByStatus: + return get_jobs_count_by_status(FirstRowsJob.objects) + + @@ -359,0 +500,8 @@ def get_split_dump_by_status(waiting_started: bool = False) -> DumpByStatus: + + +def get_splits_dump_by_status(waiting_started: bool = False) -> DumpByStatus: + return get_dump_by_status(SplitsJob.objects, waiting_started) + + +def get_first_rows_dump_by_status(waiting_started: bool = False) -> DumpByStatus: + return get_dump_by_status(FirstRowsJob.objects, waiting_started) diff --git a/libs/libqueue/tests/test_queue.py b/libs/libqueue/tests/test_queue.py index 1204ce50..5e8e8eac 100644 --- a/libs/libqueue/tests/test_queue.py +++ b/libs/libqueue/tests/test_queue.py @@ -5,2 +5,2 @@ from libqueue.queue import ( - add_dataset_job, - add_split_job, + add_first_rows_job, + add_splits_job, @@ -9,5 +9,5 @@ from libqueue.queue import ( - finish_dataset_job, - get_dataset_job, - get_dataset_jobs_count_by_status, - get_split_job, - get_split_jobs_count_by_status, + finish_splits_job, + get_first_rows_job, + get_first_rows_jobs_count_by_status, + get_splits_job, + get_splits_jobs_count_by_status, @@ -37 +37 @@ def test_add_job() -> None: - add_dataset_job("test") + add_splits_job("test") @@ -39 +39 @@ def test_add_job() -> None: - add_dataset_job("test") + add_splits_job("test") @@ -41 +41 @@ def test_add_job() -> None: - job_id, dataset_name, retries = get_dataset_job() + job_id, dataset_name, retries = get_splits_job() @@ -45 +45 @@ def test_add_job() -> None: - add_dataset_job("test") + add_splits_job("test") @@ -48 +48 @@ def test_add_job() -> None: - get_dataset_job() + get_splits_job() @@ -50 +50 @@ def test_add_job() -> None: - finish_dataset_job(job_id, success=True) + finish_splits_job(job_id, success=True) @@ -53 +53 @@ def test_add_job() -> None: - get_dataset_job() + get_splits_job() @@ -55 +55 @@ def test_add_job() -> None: - add_dataset_job("test", retries=5) + add_splits_job("test", retries=5) @@ -57 +57 @@ def test_add_job() -> None: - job_id, dataset_name, retries = get_dataset_job() + job_id, dataset_name, retries = get_splits_job() @@ -60 +60 @@ def test_add_job() -> None: - finish_dataset_job(other_job_id, success=True) + finish_splits_job(other_job_id, success=True) @@ -62 +62 @@ def test_add_job() -> None: - finish_dataset_job(job_id, success=True) + finish_splits_job(job_id, success=True) @@ -66,4 +66,4 @@ def test_max_jobs_per_dataset() -> None: - add_split_job("dataset", "config", "split1") - add_split_job("dataset", "config", "split2") - add_split_job("dataset", "config", "split3") - _, dataset_name, config_name, split_name, __ = get_split_job() + add_first_rows_job("dataset", "config", "split1") + add_first_rows_job("dataset", "config", "split2") + add_first_rows_job("dataset", "config", "split3") + _, dataset_name, config_name, split_name, __ = get_first_rows_job() @@ -74 +74 @@ def test_max_jobs_per_dataset() -> None: - get_split_job(0) + get_first_rows_job(0) @@ -76,2 +76,2 @@ def test_max_jobs_per_dataset() -> None: - get_split_job(1) - _, dataset_name, config_name, split_name, __ = get_split_job(2) + get_first_rows_job(1) + _, dataset_name, config_name, split_name, __ = get_first_rows_job(2) @@ -80 +80 @@ def test_max_jobs_per_dataset() -> None: - get_split_job(2) + get_first_rows_job(2) @@ -84 +84 @@ def test_count_by_status() -> None: - assert get_dataset_jobs_count_by_status() == { + assert get_splits_jobs_count_by_status() == { @@ -92 +92 @@ def test_count_by_status() -> None: - add_dataset_job("test_dataset") + add_splits_job("test_dataset") @@ -94 +94 @@ def test_count_by_status() -> None: - assert get_dataset_jobs_count_by_status() == {"waiting": 1, "started": 0, "success": 0, "error": 0, "cancelled": 0} + assert get_splits_jobs_count_by_status() == {"waiting": 1, "started": 0, "success": 0, "error": 0, "cancelled": 0} @@ -96 +96 @@ def test_count_by_status() -> None: - assert get_split_jobs_count_by_status() == { + assert get_first_rows_jobs_count_by_status() == { @@ -104 +104 @@ def test_count_by_status() -> None: - add_split_job("test_dataset", "test_config", "test_split") + add_first_rows_job("test_dataset", "test_config", "test_split") @@ -106 +106,7 @@ def test_count_by_status() -> None: - assert get_split_jobs_count_by_status() == {"waiting": 1, "started": 0, "success": 0, "error": 0, "cancelled": 0} + assert get_first_rows_jobs_count_by_status() == { + "waiting": 1, + "started": 0, + "success": 0, + "error": 0, + "cancelled": 0, + } diff --git a/services/admin/Makefile b/services/admin/Makefile index 43a33b98..af45ed4a 100644 --- a/services/admin/Makefile +++ b/services/admin/Makefile @@ -28,0 +29,8 @@ cancel-started-dataset-jobs: +.PHONY: cancel-started-splits-jobs +cancel-started-splits-jobs: + poetry run python src/admin/scripts/cancel_started_splits_jobs.py + +.PHONY: cancel-started-first-rows-jobs +cancel-started-first-rows-jobs: + poetry run python src/admin/scripts/cancel_started_first_rows_jobs.py + diff --git a/services/admin/README.md b/services/admin/README.md index 8e66d8fd..9cfb908e 100644 --- a/services/admin/README.md +++ b/services/admin/README.md @@ -42,0 +43,2 @@ The scripts: +- `cancel-started-splits-jobs`: cancel all the started splits/ jobs (stop the workers before!) +- `cancel-started-first-rows-jobs`: cancel all the started first-rows/ jobs (stop the workers before!) diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 87f68084..7ea8b9ce 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.8" +version = "0.1.9" @@ -471 +471 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl" @@ -475 +475 @@ name = "libqueue" -version = "0.1.6" +version = "0.1.7" @@ -489 +489 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl" @@ -1203 +1203 @@ python-versions = "3.9.6" -content-hash = "bf5d7c51a7a1702a1800d7988cde63986bb6420138fb56624f2d4ef6725fc2ad" +content-hash = "8f60b80464f981632ed6c6d3e28d33a04e62a67dfe515d8dd0fb98730361847f" @@ -1473 +1473 @@ libcache = [ - {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:42399a1d94bcfd96a7acde10cbfc9f9a46bcbb1133a534b28c9743f1b68f9243"}, + {file = "libcache-0.1.9-py3-none-any.whl", hash = "sha256:afec3f072bf8584780767f473e552e48d53b2978e5df066eb63f69b36a584fc4"}, @@ -1476 +1476 @@ libqueue = [ - {file = "libqueue-0.1.6-py3-none-any.whl", hash = "sha256:23a03ce67a8d3dd8609e24b2e0f9aba9718d9b69dc642559b1a13c1421dd5537"}, + {file = "libqueue-0.1.7-py3-none-any.whl", hash = "sha256:2003da23dcb5ba37b7e9c5d0ce97a019bbe1771370f92b6958978230e52c07f7"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index eed83581..73980c4b 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9,2 +9,2 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl", develop = false } diff --git a/services/admin/src/admin/prometheus.py b/services/admin/src/admin/prometheus.py index e51f6f1f..3b375e6e 100644 --- a/services/admin/src/admin/prometheus.py +++ b/services/admin/src/admin/prometheus.py @@ -4,0 +5,4 @@ from libcache.cache import get_datasets_count_by_status, get_splits_count_by_sta +from libcache.simple_cache import ( + get_first_rows_responses_count_by_status, + get_splits_responses_count_by_status, +) @@ -6,0 +11 @@ from libqueue.queue import ( + get_first_rows_jobs_count_by_status, @@ -7,0 +13 @@ from libqueue.queue import ( + get_splits_jobs_count_by_status, @@ -51,0 +58,4 @@ class Prometheus: + for status, total in get_splits_jobs_count_by_status().items(): + self.metrics["queue_jobs_total"].labels(queue="splits/", status=status).set(total) + for status, total in get_first_rows_jobs_count_by_status().items(): + self.metrics["queue_jobs_total"].labels(queue="first-rows/", status=status).set(total) @@ -55,0 +66,4 @@ class Prometheus: + for status, total in get_splits_responses_count_by_status().items(): + self.metrics["cache_entries_total"].labels(cache="splits/", status=status).set(total) + for status, total in get_first_rows_responses_count_by_status().items(): + self.metrics["cache_entries_total"].labels(cache="first-rows/", status=status).set(total) diff --git a/services/admin/src/admin/scripts/cancel_started_first_rows_jobs.py b/services/admin/src/admin/scripts/cancel_started_first_rows_jobs.py new file mode 100644 index 00000000..e1b03f63 --- /dev/null +++ b/services/admin/src/admin/scripts/cancel_started_first_rows_jobs.py @@ -0,0 +1,13 @@ +import logging + +from libqueue.queue import cancel_started_first_rows_jobs, connect_to_queue +from libutils.logger import init_logger + +from admin.config import LOG_LEVEL, MONGO_QUEUE_DATABASE, MONGO_URL + +if __name__ == "__main__": + init_logger(LOG_LEVEL, "cancel_started_first_rows_jobs") + logger = logging.getLogger("cancel_started_first_rows_jobs") + connect_to_queue(MONGO_QUEUE_DATABASE, MONGO_URL) + cancel_started_first_rows_jobs() + logger.info("all the started jobs in the first_rows/ queue have been cancelled and re-enqueued") diff --git a/services/admin/src/admin/scripts/cancel_started_splits_jobs.py b/services/admin/src/admin/scripts/cancel_started_splits_jobs.py new file mode 100644 index 00000000..d7aac5d4 --- /dev/null +++ b/services/admin/src/admin/scripts/cancel_started_splits_jobs.py @@ -0,0 +1,13 @@ +import logging + +from libqueue.queue import cancel_started_splits_jobs, connect_to_queue +from libutils.logger import init_logger + +from admin.config import LOG_LEVEL, MONGO_QUEUE_DATABASE, MONGO_URL + +if __name__ == "__main__": + init_logger(LOG_LEVEL, "cancel_started_splits_jobs") + logger = logging.getLogger("cancel_started_splits_jobs") + connect_to_queue(MONGO_QUEUE_DATABASE, MONGO_URL) + cancel_started_splits_jobs() + logger.info("all the started jobs in the splits/ queue have been cancelled and re-enqueued") diff --git a/services/admin/src/admin/scripts/refresh_cache.py b/services/admin/src/admin/scripts/refresh_cache.py index 9b17a3f1..95c37a66 100644 --- a/services/admin/src/admin/scripts/refresh_cache.py +++ b/services/admin/src/admin/scripts/refresh_cache.py @@ -6 +6 @@ from huggingface_hub import list_datasets # type: ignore -from libqueue.queue import add_dataset_job, connect_to_queue +from libqueue.queue import add_dataset_job, add_splits_job, connect_to_queue @@ -21,0 +22 @@ def refresh_datasets_cache(dataset_names: List[str]) -> None: + # don't mark the cache entries as stale, because it's manually triggered @@ -22,0 +24 @@ def refresh_datasets_cache(dataset_names: List[str]) -> None: + add_splits_job(dataset_name) diff --git a/services/admin/src/admin/scripts/warm_cache.py b/services/admin/src/admin/scripts/warm_cache.py index 24892d11..84299d53 100644 --- a/services/admin/src/admin/scripts/warm_cache.py +++ b/services/admin/src/admin/scripts/warm_cache.py @@ -32,0 +33 @@ def warm_cache(dataset_names: List[str]) -> None: + # don't mark the cache entries as stale, because it's manually triggered @@ -39,0 +41 @@ def warm_cache(dataset_names: List[str]) -> None: + # don't mark the cache entries as stale, because it's manually triggered @@ -47,0 +50,5 @@ def warm_cache(dataset_names: List[str]) -> None: + # TODO? also warm splits/ and first-rows/ caches. For now, there are no methods to + # get access to the stale status, and there is no more logic relation between both cache, + # so: we should have to read the splits/ cache responses to know which first-rows/ to + # refresh. It seems a bit too much, and this script is not really used anymore. + diff --git a/services/admin/tests/test_app.py b/services/admin/tests/test_app.py index d6973dcd..48acd4b9 100644 --- a/services/admin/tests/test_app.py +++ b/services/admin/tests/test_app.py @@ -48 +48,5 @@ def test_metrics(client: TestClient) -> None: - # assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics + assert 'queue_jobs_total{queue="splits/",status="success"}' in metrics + assert 'queue_jobs_total{queue="first-rows/",status="started"}' in metrics + assert 'cache_entries_total{cache="datasets",status="valid"}' in metrics + assert 'cache_entries_total{cache="splits/",status="BAD_REQUEST"}' in metrics + assert 'cache_entries_total{cache="first-rows/",status="INTERNAL_SERVER_ERROR"}' in metrics diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 5007df27..3918cab8 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.8" +version = "0.1.10" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.10-py3-none-any.whl" @@ -474 +474 @@ name = "libqueue" -version = "0.1.6" +version = "0.1.7" @@ -488 +488 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl" @@ -1202 +1202 @@ python-versions = "3.9.6" -content-hash = "8156ee01736958f5cce646740853f7d4d5767be75def3be021ff17df67fefe43" +content-hash = "5ff94316032616c2fbce9910dfde81419a57a9774c7672c9ec293896b0e2d42f" @@ -1472 +1472 @@ libcache = [ - {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:42399a1d94bcfd96a7acde10cbfc9f9a46bcbb1133a534b28c9743f1b68f9243"}, + {file = "libcache-0.1.10-py3-none-any.whl", hash = "sha256:c1c34bc731457415eacf837ccbd5810f5538280c6fe5c5849ae29b0268c9c748"}, @@ -1475 +1475 @@ libqueue = [ - {file = "libqueue-0.1.6-py3-none-any.whl", hash = "sha256:23a03ce67a8d3dd8609e24b2e0f9aba9718d9b69dc642559b1a13c1421dd5537"}, + {file = "libqueue-0.1.7-py3-none-any.whl", hash = "sha256:2003da23dcb5ba37b7e9c5d0ce97a019bbe1771370f92b6958978230e52c07f7"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index c5a720cd..9d12d460 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9,2 +9,2 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.10-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl", develop = false } diff --git a/services/api/src/api/app.py b/services/api/src/api/app.py index c8d330d3..d19e5cf0 100644 --- a/services/api/src/api/app.py +++ b/services/api/src/api/app.py @@ -24,0 +25 @@ from api.routes.cache_reports import cache_reports_endpoint +from api.routes.first_rows import first_rows_endpoint @@ -36,0 +38 @@ from api.routes.splits import splits_endpoint +from api.routes.splits_next import splits_endpoint_next @@ -51,0 +54 @@ def create_app() -> Starlette: + Route("/first-rows", endpoint=first_rows_endpoint), @@ -61,0 +65 @@ def create_app() -> Starlette: + Route("/splits-next", endpoint=splits_endpoint_next), diff --git a/services/api/src/api/routes/first_rows.py b/services/api/src/api/routes/first_rows.py new file mode 100644 index 00000000..49e5de66 --- /dev/null +++ b/services/api/src/api/routes/first_rows.py @@ -0,0 +1,34 @@ +import logging + +from libcache.simple_cache import DoesNotExist, HTTPStatus, get_first_rows_response +from libutils.exceptions import Status400Error +from starlette.requests import Request +from starlette.responses import Response + +from api.config import MAX_AGE_LONG_SECONDS, MAX_AGE_SHORT_SECONDS +from api.routes._utils import get_response + +logger = logging.getLogger(__name__) + + +async def first_rows_endpoint(request: Request) -> Response: + dataset_name = request.query_params.get("dataset") + config_name = request.query_params.get("config") + split_name = request.query_params.get("split") + logger.info(f"/rows, dataset={dataset_name}, config={config_name}, split={split_name}") + + if not isinstance(dataset_name, str) or not isinstance(config_name, str) or not isinstance(split_name, str): + return get_response( + Status400Error("Parameters 'dataset', 'config' and 'split' are required").as_content(), + 400, + MAX_AGE_SHORT_SECONDS, + ) + try: + response, http_status = get_first_rows_response(dataset_name, config_name, split_name) + return get_response( + response, + int(http_status.value), + MAX_AGE_LONG_SECONDS if http_status == HTTPStatus.OK else MAX_AGE_SHORT_SECONDS, + ) + except DoesNotExist: + return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/splits_next.py b/services/api/src/api/routes/splits_next.py new file mode 100644 index 00000000..32378fe1 --- /dev/null +++ b/services/api/src/api/routes/splits_next.py @@ -0,0 +1,28 @@ +import logging + +from libcache.simple_cache import DoesNotExist, HTTPStatus, get_splits_response +from libutils.exceptions import Status400Error +from starlette.requests import Request +from starlette.responses import Response + +from api.config import MAX_AGE_LONG_SECONDS, MAX_AGE_SHORT_SECONDS +from api.routes._utils import get_response + +logger = logging.getLogger(__name__) + + +async def splits_endpoint_next(request: Request) -> Response: + dataset_name = request.query_params.get("dataset") + logger.info(f"/splits-next, dataset={dataset_name}") + + if not isinstance(dataset_name, str): + return get_response(Status400Error("Parameter 'dataset' is required").as_content(), 400, MAX_AGE_SHORT_SECONDS) + try: + response, http_status = get_splits_response(dataset_name) + return get_response( + response, + int(http_status.value), + MAX_AGE_LONG_SECONDS if http_status == HTTPStatus.OK else MAX_AGE_SHORT_SECONDS, + ) + except DoesNotExist: + return get_response(Status400Error("Not found").as_content(), 400, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/webhook.py b/services/api/src/api/routes/webhook.py index 5541218f..61fdccc2 100644 --- a/services/api/src/api/routes/webhook.py +++ b/services/api/src/api/routes/webhook.py @@ -5 +5,7 @@ from libcache.cache import create_or_mark_dataset_as_stale, delete_dataset_cache -from libqueue.queue import add_dataset_job +from libcache.simple_cache import ( + delete_first_rows_responses, + delete_splits_responses, + mark_first_rows_responses_as_stale, + mark_splits_responses_as_stale, +) +from libqueue.queue import add_dataset_job, add_splits_job @@ -51,0 +58,4 @@ def try_to_update(id: Optional[str]) -> None: + # new implementation for the /splits endpoint + mark_splits_responses_as_stale(dataset_name) + mark_first_rows_responses_as_stale(dataset_name) + add_splits_job(dataset_name) @@ -58,0 +69,3 @@ def try_to_delete(id: Optional[str]) -> None: + # new implementation for the /splits endpoint + delete_splits_responses(dataset_name) + delete_first_rows_responses(dataset_name) diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index 2c984ea0..6fc99971 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -8,0 +9,7 @@ from libcache.cache import ( +from libcache.simple_cache import ( + HTTPStatus, + mark_first_rows_responses_as_stale, + mark_splits_responses_as_stale, + upsert_first_rows_response, + upsert_splits_response, +) @@ -253,0 +261,46 @@ def test_split_cache_refreshing(client: TestClient) -> None: +def test_splits_cache_refreshing(client: TestClient) -> None: + dataset = "acronym_identification" + response = client.get("/splits-next", params={"dataset": dataset}) + assert response.json()["message"] == "Not found" + add_dataset_job(dataset) + mark_splits_responses_as_stale(dataset) + # ^ has no effect for the moment (no entry for the dataset, and anyway: no way to know the value of the stale flag) + response = client.get("/splits-next", params={"dataset": dataset}) + assert response.json()["message"] == "Not found" + # simulate the worker + upsert_splits_response(dataset, {"key": "value"}, HTTPStatus.OK) + response = client.get("/splits-next", params={"dataset": dataset}) + assert response.json()["key"] == "value" + assert response.status_code == 200 + + +def test_first_rows_cache_refreshing(client: TestClient) -> None: + dataset = "acronym_identification" + config = "default" + split = "train" + response = client.get("/first-rows", params={"dataset": dataset, "config": config, "split": split}) + assert response.json()["message"] == "Not found" + add_split_job(dataset, config, split) + mark_first_rows_responses_as_stale(dataset, config, split) + # ^ has no effect for the moment (no entry for the split, and anyway: no way to know the value of the stale flag) + response = client.get("/first-rows", params={"dataset": dataset, "config": config, "split": split}) + assert response.json()["message"] == "Not found" + # simulate the worker + upsert_first_rows_response(dataset, config, split, {"key": "value"}, HTTPStatus.OK) + response = client.get("/first-rows", params={"dataset": dataset, "config": config, "split": split}) + assert response.json()["key"] == "value" + assert response.status_code == 200 + + +# def test_split_cache_refreshing(client: TestClient) -> None: +# dataset = "acronym_identification" +# config = "default" +# split = "train" +# response = client.get("/rows", params={"dataset": dataset, "config": config, "split": split}) +# assert response.json()["message"] == "The split does not exist." +# add_split_job(dataset, config, split) +# create_or_mark_split_as_stale({"dataset_name": dataset, "config_name": config, "split_name": split}, 0) +# response = client.get("/rows", params={"dataset": dataset, "config": config, "split": split}) +# assert response.json()["message"] == "The split is being processed. Retry later." + + diff --git a/services/worker/.env.example b/services/worker/.env.example index 950a17db..63e8370b 100644 --- a/services/worker/.env.example +++ b/services/worker/.env.example @@ -0,0 +1,3 @@ +# Assets base URL +# ASSETS_BASE_URL=assets + diff --git a/services/worker/INSTALL.md b/services/worker/INSTALL.md index 631419a5..0d9fb8b2 100644 --- a/services/worker/INSTALL.md +++ b/services/worker/INSTALL.md @@ -74 +74 @@ Deploy the datasets workers with: -pm2 start --name datasets-worker make -- -C /home/hf/datasets-server/services/worker/ datasets-worker +pm2 start --name worker-datasets make -- -C /home/hf/datasets-server/services/worker/ worker-datasets @@ -80 +80 @@ Deploy the splits workers with: -pm2 start --name splits-worker make -- -C /home/hf/datasets-server/services/worker/ splits-worker +pm2 start --name worker-splits make -- -C /home/hf/datasets-server/services/worker/ worker-splits @@ -156,2 +156,2 @@ Restart -pm2 restart datasets-worker -pm2 restart splits-worker +pm2 restart worker-datasets +pm2 restart worker-splits diff --git a/services/worker/Makefile b/services/worker/Makefile index 854706f8..075bfeeb 100644 --- a/services/worker/Makefile +++ b/services/worker/Makefile @@ -20,8 +19,0 @@ run: - -.PHONY: datasets-worker -datasets-worker: - WORKER_QUEUE=datasets poetry run python src/worker/main.py - -.PHONY: splits-worker -splits-worker: - WORKER_QUEUE=splits poetry run python src/worker/main.py diff --git a/services/worker/README.md b/services/worker/README.md index 8d3b3c86..60375e63 100644 --- a/services/worker/README.md +++ b/services/worker/README.md @@ -14 +14 @@ Launch the worker to preprocess the datasets queue: -make datasets-worker +WORKER_QUEUE=datasets make run @@ -20 +20,13 @@ Launch the worker to preprocess the splits queue: -make splits-worker +WORKER_QUEUE=splits make run +``` + +Launch the worker to preprocess the splits-next/ responses: + +```bash +WORKER_QUEUE=splits_responses make run +``` + +Launch the worker to preprocess the first-rows/ responses: + +```bash +WORKER_QUEUE=first_rows_responses make run @@ -24,0 +37 @@ Set environment variables to configure the following aspects: +- `ASSETS_BASE_URL`: base URL for the assets files. It should be set accordingly to the datasets-server domain, eg https://datasets-server.huggingface.co/assets. Defaults to `assets`. @@ -44 +57 @@ Set environment variables to configure the following aspects: -- `WORKER_QUEUE`: name of the queue the worker will pull jobs from. It can be equal to `datasets` or `splits`. The `datasets` jobs should be a lot faster than the `splits` ones, so that we should need a lot more workers for `splits` than for `datasets`. Note that this environment variable is already set to the appropriate value in `make datasets-worker` and `make splits-worker`. Defaults to `datasets`. +- `WORKER_QUEUE`: name of the queue the worker will pull jobs from. It can be equal to `datasets`, `splits`, `splits_responses` or `first_rows_responses`. The `datasets` and `splits_responses` jobs should be a lot faster than the `splits` or `first_rows_responses` ones, so that we should need a lot more workers for `splits`/`first_rows_responses` than for `datasets`/`splits_responses`. Defaults to `datasets`. @@ -50 +63 @@ For example: -LOG_LEVEL=DEBUG make datasets-worker +LOG_LEVEL=DEBUG WORKER_QUEUE=datasets make run diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index 0f10aef1..d3a26da7 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -408,2 +408,2 @@ name = "datasets" -version = "2.3.2" -description = "HuggingFace community-driven open-source library of datasets" +version = "2.3.3.dev0" +description = "" @@ -412,0 +413 @@ python-versions = "*" +develop = false @@ -432 +432,0 @@ xxhash = "*" -apache-beam = ["apache-beam (>=2.26.0)"] @@ -434,5 +434,2 @@ audio = ["librosa"] -benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "transformers (==3.0.2)"] -dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] -docs = ["s3fs"] -quality = ["black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)"] -s3 = ["fsspec", "boto3", "botocore", "s3fs"] +vision = ["Pillow (>=6.2.1)"] +apache-beam = ["apache-beam (>=2.26.0)"] @@ -441 +437,0 @@ tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] @@ -443 +439,11 @@ torch = ["torch"] -vision = ["Pillow (>=6.2.1)"] +s3 = ["fsspec", "boto3", "botocore", "s3fs"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bigbench @ https://storage.googleapis.com/public_research_data/bigbench/bigbench-0.0.1.tar.gz", "sentencepiece", "sacremoses", "bert_score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests_file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)"] +quality = ["black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)"] +benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "transformers (==3.0.2)"] +docs = ["s3fs"] + +[package.source] +type = "git" +url = "https://github.com/huggingface/datasets.git" +reference = "7e514c312fcc1d4b8f8e297df5549f669bfb30f8" +resolved_reference = "7e514c312fcc1d4b8f8e297df5549f669bfb30f8" @@ -968 +974 @@ name = "libcache" -version = "0.1.8" +version = "0.1.9" @@ -983 +989 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl" @@ -995 +1001 @@ name = "libqueue" -version = "0.1.6" +version = "0.1.7" @@ -1009 +1015 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl" @@ -2534 +2540 @@ python-versions = "3.9.6" -content-hash = "f4a610f87a510885605ef7e025e9e5d52994617d35f151a4007a846298d3dbc3" +content-hash = "c4fdc619615a1499b1b7ab2d7590a94253c9600b03e146c8f25c7145726996f5" @@ -3042,4 +3048 @@ cryptography = [ -datasets = [ - {file = "datasets-2.3.2-py3-none-any.whl", hash = "sha256:479d63940c31e01dba578a8a072fee45215a081c66f6d46659add84bc3e518ad"}, - {file = "datasets-2.3.2.tar.gz", hash = "sha256:d21c90473f2f83fd3f395c1c3e9a46ae0deeec0f987608bbf9ee33d935b9fcbe"}, -] +datasets = [] @@ -3337 +3340 @@ libcache = [ - {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:42399a1d94bcfd96a7acde10cbfc9f9a46bcbb1133a534b28c9743f1b68f9243"}, + {file = "libcache-0.1.9-py3-none-any.whl", hash = "sha256:afec3f072bf8584780767f473e552e48d53b2978e5df066eb63f69b36a584fc4"}, @@ -3349 +3352 @@ libqueue = [ - {file = "libqueue-0.1.6-py3-none-any.whl", hash = "sha256:23a03ce67a8d3dd8609e24b2e0f9aba9718d9b69dc642559b1a13c1421dd5537"}, + {file = "libqueue-0.1.7-py3-none-any.whl", hash = "sha256:2003da23dcb5ba37b7e9c5d0ce97a019bbe1771370f92b6958978230e52c07f7"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 43fe083b..0c736fc0 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -14 +14,6 @@ conllu = "^4.4.1" -datasets = { extras = ["audio", "vision"], version = "^2.3.2" } +#datasets = { extras = ["audio", "vision"], version = "^2.3.2" } +# branch on main for: a) timestamp cast to datetime, b) features with inference in streaming mode: IterableDataset._resolve_features() +datasets = { git = "https://github.com/huggingface/datasets.git", rev = "7e514c312fcc1d4b8f8e297df5549f669bfb30f8", extras = [ + "audio", + "vision", +] } @@ -18,2 +23,2 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.9-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.7-py3-none-any.whl", develop = false } diff --git a/services/worker/src/worker/config.py b/services/worker/src/worker/config.py index 48240c13..04064e96 100644 --- a/services/worker/src/worker/config.py +++ b/services/worker/src/worker/config.py @@ -7,0 +8 @@ from worker.constants import ( + DEFAULT_ASSETS_BASE_URL, @@ -30,0 +32 @@ load_dotenv() +ASSETS_BASE_URL = get_str_value(d=os.environ, key="ASSETS_BASE_URL", default=DEFAULT_ASSETS_BASE_URL) diff --git a/services/worker/src/worker/constants.py b/services/worker/src/worker/constants.py index c7b702ce..05d3018e 100644 --- a/services/worker/src/worker/constants.py +++ b/services/worker/src/worker/constants.py @@ -2,0 +3 @@ from typing import Optional +DEFAULT_ASSETS_BASE_URL: str = "assets" diff --git a/services/worker/src/worker/main.py b/services/worker/src/worker/main.py index 5e0ff44e..a4c4df58 100644 --- a/services/worker/src/worker/main.py +++ b/services/worker/src/worker/main.py @@ -6,0 +7 @@ from libcache.cache import connect_to_cache +from libcache.simple_cache import HTTPStatus @@ -9,0 +11 @@ from libqueue.queue import ( + add_first_rows_job, @@ -10,0 +13 @@ from libqueue.queue import ( + add_splits_job, @@ -12,0 +16 @@ from libqueue.queue import ( + finish_first_rows_job, @@ -13,0 +18 @@ from libqueue.queue import ( + finish_splits_job, @@ -14,0 +20 @@ from libqueue.queue import ( + get_first_rows_job, @@ -15,0 +22 @@ from libqueue.queue import ( + get_splits_job, @@ -21,0 +29 @@ from worker.config import ( + ASSETS_BASE_URL, @@ -39 +47,6 @@ from worker.config import ( -from worker.refresh import refresh_dataset_split_full_names, refresh_split +from worker.refresh import ( + refresh_dataset, + refresh_first_rows, + refresh_split, + refresh_splits, +) @@ -48 +61 @@ def process_next_dataset_job() -> bool: - logger.debug(f"job assigned: {job_id} for dataset: {dataset_name}") + logger.debug(f"job assigned: {job_id} for dataset={dataset_name}") @@ -52,3 +64,0 @@ def process_next_dataset_job() -> bool: - except Exception as err: - logger.debug(f"unknown exception: {err}") - raise @@ -59,2 +69,2 @@ def process_next_dataset_job() -> bool: - logger.info(f"compute dataset '{dataset_name}'") - split_full_names = refresh_dataset_split_full_names(dataset_name=dataset_name, hf_token=HF_TOKEN) + logger.info(f"compute dataset={dataset_name}") + refresh_dataset(dataset_name=dataset_name, hf_token=HF_TOKEN) @@ -62,7 +71,0 @@ def process_next_dataset_job() -> bool: - for split_full_name in split_full_names: - add_split_job( - split_full_name["dataset_name"], - split_full_name["config_name"], - split_full_name["split_name"], - retries=0, - ) @@ -76 +79 @@ def process_next_dataset_job() -> bool: - logger.debug(f"job finished with {result}: {job_id} for dataset: {dataset_name}") + logger.debug(f"job finished with {result}: {job_id} for dataset={dataset_name}") @@ -79 +82 @@ def process_next_dataset_job() -> bool: - logger.debug(f"job re-enqueued (retries: {retries}) for dataset: {dataset_name}") + logger.debug(f"job re-enqueued (retries: {retries}) for dataset={dataset_name}") @@ -89,4 +92 @@ def process_next_split_job() -> bool: - logger.debug( - f"job assigned: {job_id} for split '{split_name}' from dataset '{dataset_name}' with config" - f" '{config_name}'" - ) + logger.debug(f"job assigned: {job_id} for dataset={dataset_name} config={config_name} split={split_name}") @@ -96,3 +95,0 @@ def process_next_split_job() -> bool: - except Exception as err: - logger.debug(f"unknown exception: {err}") - raise @@ -103 +100 @@ def process_next_split_job() -> bool: - logger.info(f"compute split '{split_name}' from dataset '{dataset_name}' with config '{config_name}'") + logger.info(f"compute dataset={dataset_name} config={config_name} split={split_name}") @@ -123,2 +120 @@ def process_next_split_job() -> bool: - f"job finished with {result}: {job_id} for split '{split_name}' from dataset '{dataset_name}' with" - f" config '{config_name}'" + f"job finished with {result}: {job_id} for dataset={dataset_name} config={config_name} split={split_name}" @@ -129,2 +125,75 @@ def process_next_split_job() -> bool: - f"job re-enqueued (retries: {retries}) for split '{split_name}' from dataset '{dataset_name}' with" - f" config '{config_name}'" + f"job re-enqueued (retries: {retries}) for" + f" dataset={dataset_name} config={config_name} split={split_name}" + ) + return True + + +def process_next_splits_job() -> bool: + logger = logging.getLogger("datasets_server.worker") + logger.debug("try to process a splits/ job") + + try: + job_id, dataset_name, retries = get_splits_job(MAX_JOBS_PER_DATASET) + logger.debug(f"job assigned: {job_id} for dataset={dataset_name}") + except EmptyQueue: + logger.debug("no job in the queue") + return False + + success = False + retry = False + try: + logger.info(f"compute dataset={dataset_name}") + http_status = refresh_splits(dataset_name=dataset_name, hf_token=HF_TOKEN) + success = http_status == HTTPStatus.OK + if http_status == HTTPStatus.INTERNAL_SERVER_ERROR and retries < MAX_JOB_RETRIES: + retry = True + finally: + finish_splits_job(job_id, success=success) + result = "success" if success else "error" + logger.debug(f"job finished with {result}: {job_id} for dataset={dataset_name}") + if retry: + add_splits_job(dataset_name, retries=retries + 1) + logger.debug(f"job re-enqueued (retries: {retries}) for dataset={dataset_name}") + return True + + +def process_next_first_rows_job() -> bool: + logger = logging.getLogger("datasets_server.worker") + logger.debug("try to process a first-rows job") + + try: + job_id, dataset_name, config_name, split_name, retries = get_first_rows_job(MAX_JOBS_PER_DATASET) + logger.debug(f"job assigned: {job_id} for dataset={dataset_name} config={config_name} split={split_name}") + except EmptyQueue: + logger.debug("no job in the queue") + return False + + success = False + retry = False + try: + logger.info(f"compute dataset={dataset_name} config={config_name} split={split_name}") + http_status = refresh_first_rows( + dataset_name=dataset_name, + config_name=config_name, + split_name=split_name, + assets_base_url=ASSETS_BASE_URL, + hf_token=HF_TOKEN, + max_size_fallback=MAX_SIZE_FALLBACK, + rows_max_bytes=ROWS_MAX_BYTES, + rows_max_number=ROWS_MAX_NUMBER, + rows_min_number=ROWS_MIN_NUMBER, + ) + success = http_status == HTTPStatus.OK + if http_status == HTTPStatus.INTERNAL_SERVER_ERROR and retries < MAX_JOB_RETRIES: + retry = True + finally: + finish_first_rows_job(job_id, success=success) + result = "success" if success else "error" + logger.debug( + f"job finished with {result}: {job_id} for dataset={dataset_name} config={config_name} split={split_name}" + ) + if retry: + add_first_rows_job(dataset_name, config_name, split_name, retries=retries + 1) + logger.debug( + f"job re-enqueued (retries: {retries}) for" + f" dataset={dataset_name} config={config_name} split={split_name}" @@ -137,0 +207,2 @@ def process_next_job() -> bool: + elif WORKER_QUEUE == "first_rows_responses": + return process_next_first_rows_job() @@ -139,0 +211,2 @@ def process_next_job() -> bool: + elif WORKER_QUEUE == "splits_responses": + return process_next_splits_job() diff --git a/services/worker/src/worker/models/asset.py b/services/worker/src/worker/models/asset.py index 826f36b6..e512d514 100644 --- a/services/worker/src/worker/models/asset.py +++ b/services/worker/src/worker/models/asset.py @@ -27,10 +26,0 @@ def create_asset_dir(dataset: str, config: str, split: str, row_idx: int, column -def create_asset_file( - dataset: str, config: str, split: str, row_idx: int, column: str, filename: str, data: bytes -) -> str: - dir_path, url_dir_path = create_asset_dir(dataset, config, split, row_idx, column) - file_path = os.path.join(dir_path, filename) - with open(file_path, "wb") as f: - f.write(data) - return f"assets/{url_dir_path}/{filename}" - - @@ -38 +28,8 @@ def create_image_file( - dataset: str, config: str, split: str, row_idx: int, column: str, filename: str, image: Image.Image + dataset: str, + config: str, + split: str, + row_idx: int, + column: str, + filename: str, + image: Image.Image, + assets_base_url: str, @@ -43 +40 @@ def create_image_file( - return f"assets/{url_dir_path}/{filename}" + return f"{assets_base_url}/{url_dir_path}/{filename}" @@ -52 +49,8 @@ def create_audio_files( - dataset: str, config: str, split: str, row_idx: int, column: str, array: ndarray, sampling_rate: int + dataset: str, + config: str, + split: str, + row_idx: int, + column: str, + array: ndarray, + sampling_rate: int, + assets_base_url: str, @@ -63,2 +67,2 @@ def create_audio_files( - {"src": f"assets/{url_dir_path}/{mp3_filename}", "type": "audio/mpeg"}, - {"src": f"assets/{url_dir_path}/{wav_filename}", "type": "audio/wav"}, + {"src": f"{assets_base_url}/{url_dir_path}/{mp3_filename}", "type": "audio/mpeg"}, + {"src": f"{assets_base_url}/{url_dir_path}/{wav_filename}", "type": "audio/wav"}, diff --git a/services/worker/src/worker/models/column/audio.py b/services/worker/src/worker/models/column/audio.py index 33a940fc..6ec04637 100644 --- a/services/worker/src/worker/models/column/audio.py +++ b/services/worker/src/worker/models/column/audio.py @@ -57 +57,3 @@ class AudioColumn(CommonColumn): - return create_audio_files(dataset_name, config_name, split_name, row_idx, self.name, array, sampling_rate) + return create_audio_files( + dataset_name, config_name, split_name, row_idx, self.name, array, sampling_rate, "assets" + ) diff --git a/services/worker/src/worker/models/column/image.py b/services/worker/src/worker/models/column/image.py index a3fe4f9e..c0bf7402 100644 --- a/services/worker/src/worker/models/column/image.py +++ b/services/worker/src/worker/models/column/image.py @@ -48 +48 @@ class ImageColumn(CommonColumn): - dataset_name, config_name, split_name, row_idx, self.name, f"image{ext}", value + dataset_name, config_name, split_name, row_idx, self.name, f"image{ext}", value, "assets" diff --git a/services/worker/src/worker/models/column/image_array2d.py b/services/worker/src/worker/models/column/image_array2d.py index ea069f22..5529cfff 100644 --- a/services/worker/src/worker/models/column/image_array2d.py +++ b/services/worker/src/worker/models/column/image_array2d.py @@ -60 +60 @@ class ImageArray2DColumn(CommonColumn): - return create_image_file(dataset_name, config_name, split_name, row_idx, self.name, filename, image) + return create_image_file(dataset_name, config_name, split_name, row_idx, self.name, filename, image, "assets") diff --git a/services/worker/src/worker/models/column/image_array3d.py b/services/worker/src/worker/models/column/image_array3d.py index dc95efae..a547d10f 100644 --- a/services/worker/src/worker/models/column/image_array3d.py +++ b/services/worker/src/worker/models/column/image_array3d.py @@ -61 +61 @@ class ImageArray3DColumn(CommonColumn): - return create_image_file(dataset_name, config_name, split_name, row_idx, self.name, filename, image) + return create_image_file(dataset_name, config_name, split_name, row_idx, self.name, filename, image, "assets") diff --git a/services/worker/src/worker/models/features.py b/services/worker/src/worker/models/features.py new file mode 100644 index 00000000..dd1831d9 --- /dev/null +++ b/services/worker/src/worker/models/features.py @@ -0,0 +1,108 @@ +from typing import Any + +from datasets import ( + Array2D, + Array3D, + Array4D, + Array5D, + Audio, + ClassLabel, + Image, + Sequence, + Translation, + TranslationVariableLanguages, + Value, +) +from numpy import ndarray # type:ignore +from PIL import Image as PILImage # type: ignore + +from worker.models.asset import create_audio_files, create_image_file + + +def image( + dataset_name: str, + config_name: str, + split_name: str, + row_idx: int, + value: Any, + featureName: str, + assets_base_url: str, +) -> Any: + if value is None: + return None + if not isinstance(value, PILImage.Image): + raise TypeError("image cell must be a PIL image") + # attempt to generate one of the supported formats; if unsuccessful, throw an error + for ext in [".jpg", ".png"]: + try: + return create_image_file( + dataset_name, config_name, split_name, row_idx, featureName, f"image{ext}", value, assets_base_url + ) + except OSError: + # if wrong format, try the next one, see https://github.com/huggingface/datasets-server/issues/191 + # OSError: cannot write mode P as JPEG + # OSError: cannot write mode RGBA as JPEG + continue + raise ValueError("Image cannot be written as JPEG or PNG") + + +def audio( + dataset_name: str, + config_name: str, + split_name: str, + row_idx: int, + value: Any, + featureName: str, + assets_base_url: str, +) -> Any: + if value is None: + return None + try: + array = value["array"] + sampling_rate = value["sampling_rate"] + except Exception as e: + raise TypeError("audio cell must contain 'array' and 'sampling_rate' fields") from e + if type(array) != ndarray: + raise TypeError("'array' field must be a numpy.ndarray") + if type(sampling_rate) != int: + raise TypeError("'sampling_rate' field must be an integer") + # this function can raise, we don't catch it + return create_audio_files( + dataset_name, config_name, split_name, row_idx, featureName, array, sampling_rate, assets_base_url + ) + + +# should we return both the value (as given by datasets) and the additional contents (audio files, image files)? +# in the case of the images or audio, if the value contains the raw data, it would take too much space and would +# trigger the response truncation -> less rows would be viewable +def get_cell_value( + dataset_name: str, + config_name: str, + split_name: str, + row_idx: int, + cell: Any, + featureName: str, + fieldType: Any, + assets_base_url: str, +) -> Any: + if isinstance(fieldType, Image): + return image(dataset_name, config_name, split_name, row_idx, cell, featureName, assets_base_url) + elif isinstance(fieldType, Audio): + return audio(dataset_name, config_name, split_name, row_idx, cell, featureName, assets_base_url) + elif ( + isinstance(fieldType, Value) + or isinstance(fieldType, ClassLabel) + or isinstance(fieldType, Array2D) + or isinstance(fieldType, Array3D) + or isinstance(fieldType, Array4D) + or isinstance(fieldType, Array5D) + or isinstance(fieldType, Translation) + or isinstance(fieldType, TranslationVariableLanguages) + or isinstance(fieldType, Sequence) # TODO: what if it's a Sequence of Audio or Image? -> JSON for now + or isinstance(fieldType, list) # TODO: what if it's a list of Audio or Image? -> JSON for now + or isinstance(fieldType, dict) # TODO: what if it's a dict of Audio or Image? -> JSON for now + ): + # TODO: check the type? + return cell + else: + raise TypeError("Cell type error.") diff --git a/services/worker/src/worker/models/first_rows.py b/services/worker/src/worker/models/first_rows.py new file mode 100644 index 00000000..815b4904 --- /dev/null +++ b/services/worker/src/worker/models/first_rows.py @@ -0,0 +1,231 @@ +import logging +import sys +from typing import Any, Dict, List, Optional + +from datasets import Features, IterableDataset, load_dataset +from libutils.exceptions import Status400Error +from libutils.types import RowItem +from libutils.utils import orjson_dumps + +from worker.config import MIN_CELL_BYTES +from worker.models.features import get_cell_value +from worker.models.info import get_info +from worker.models.row import Row, get_rows + +logger = logging.getLogger(__name__) + + +def get_size_in_bytes(obj: Any): + return sys.getsizeof(orjson_dumps(obj)) + # ^^ every row is transformed here in a string, because it corresponds to + # the size the row will contribute in the JSON response to /rows endpoint. + # The size of the string is measured in bytes. + # An alternative would have been to look at the memory consumption (pympler) but it's + # less related to what matters here (size of the JSON, number of characters in the + # dataset viewer table on the hub) + + +def truncate_cell(cell: Any, min_cell_bytes: int) -> str: + return orjson_dumps(cell)[:min_cell_bytes].decode("utf8", "ignore") + + +# Mutates row_item, and returns it anyway +def truncate_row_item(row_item: RowItem) -> RowItem: + row = {} + for column_name, cell in row_item["row"].items(): + # for now: all the cells, but the smallest ones, are truncated + cell_bytes = get_size_in_bytes(cell) + if cell_bytes > MIN_CELL_BYTES: + row_item["truncated_cells"].append(column_name) + row[column_name] = truncate_cell(cell, MIN_CELL_BYTES) + else: + row[column_name] = cell + row_item["row"] = row + return row_item + + +# Mutates row_items, and returns them anyway +def truncate_row_items(row_items: List[RowItem], rows_max_bytes: int) -> List[RowItem]: + # compute the current size + rows_bytes = sum(get_size_in_bytes(row_item) for row_item in row_items) + + # Loop backwards, so that the last rows are truncated first + for row_item in reversed(row_items): + if rows_bytes < rows_max_bytes: + break + previous_size = get_size_in_bytes(row_item) + row_item = truncate_row_item(row_item) + new_size = get_size_in_bytes(row_item) + rows_bytes += new_size - previous_size + row_idx = row_item["row_idx"] + logger.debug(f"the size of the rows is now ({rows_bytes}) after truncating row idx={row_idx}") + return row_items + + +def to_row_item(dataset_name: str, config_name: str, split_name: str, row_idx: int, row: Row) -> RowItem: + return { + "dataset": dataset_name, + "config": config_name, + "split": split_name, + "row_idx": row_idx, + "row": row, + "truncated_cells": [], + } + + +# in JSON, dicts do not carry any order, so we need to return a list +# +# > An object is an *unordered* collection of zero or more name/value pairs, where a name is a string and a value +# is a string, number, boolean, null, object, or array. +# > An array is an *ordered* sequence of zero or more values. +# > The terms "object" and "array" come from the conventions of JavaScript. +# from https://stackoverflow.com/a/7214312/7351594 / https://www.rfc-editor.org/rfc/rfc7159.html +def to_features_list(dataset_name: str, config_name: str, split_name: str, features: Features) -> List[Dict]: + features_dict = features.to_dict() + return [ + { + "dataset": dataset_name, + "config": config_name, + "split": split_name, + "idx": idx, + "name": name, + "type": features_dict[name], + } + for idx, name in enumerate(features) + ] + + +def create_truncated_row_items( + dataset_name: str, + config_name: str, + split_name: str, + rows: List[Row], + rows_max_bytes: Optional[int] = None, + rows_min_number: Optional[int] = None, +) -> List[RowItem]: + row_items = [] + rows_bytes = 0 + if rows_min_number is None: + rows_min_number = 0 + else: + logger.debug(f"min number of rows in the response: '{rows_min_number}'") + if rows_max_bytes is not None: + logger.debug(f"max number of bytes in the response: '{rows_max_bytes}'") + + # two restrictions must be enforced: + # - at least rows_min_number rows + # - at most rows_max_bytes bytes + # To enforce this: + # 1. first get the first rows_min_number rows + for row_idx, row in enumerate(rows[:rows_min_number]): + row_item = to_row_item(dataset_name, config_name, split_name, row_idx, row) + if rows_max_bytes is not None: + rows_bytes += get_size_in_bytes(row_item) + row_items.append(row_item) + + # 2. if the total is over the bytes limit, truncate the values, iterating backwards starting + # from the last rows, until getting under the threshold + if rows_max_bytes is not None and rows_bytes >= rows_max_bytes: + logger.debug( + f"the size of the first {rows_min_number} rows ({rows_bytes}) is above the max number of bytes" + f" ({rows_max_bytes}), they will be truncated" + ) + return truncate_row_items(row_items, rows_max_bytes) + + # 3. else: add the remaining rows until the end, or until the bytes threshold + for idx, row in enumerate(rows[rows_min_number:]): + row_idx = rows_min_number + idx + row_item = to_row_item(dataset_name, config_name, split_name, row_idx, row) + if rows_max_bytes is not None: + rows_bytes += get_size_in_bytes(row_item) + if rows_bytes >= rows_max_bytes: + logger.debug( + f"the rows in the split have been truncated to {row_idx} row(s) to keep the size" + f" ({rows_bytes}) under the limit ({rows_max_bytes})" + ) + break + row_items.append(row_item) + return row_items + + +def get_typed_rows( + dataset_name: str, config_name: str, split_name: str, rows: List[Row], features: Features, assets_base_url: str +) -> List[Row]: + return [ + { + featureName: get_cell_value( + dataset_name, + config_name, + split_name, + row_idx, + row[featureName], + featureName, + fieldType, + assets_base_url, + ) + for (featureName, fieldType) in features.items() + } + for row_idx, row in enumerate(rows) + ] + + +def get_first_rows( + dataset_name: str, + config_name: str, + split_name: str, + assets_base_url: str, + hf_token: Optional[str] = None, + max_size_fallback: Optional[int] = None, + rows_max_bytes: Optional[int] = None, + rows_max_number: Optional[int] = None, + rows_min_number: Optional[int] = None, +) -> Dict: + logger.info(f"get first-rows for dataset={dataset_name} config={config_name} split={split_name}") + + # features + info = get_info(dataset_name, config_name, hf_token) + if not info.features: + try: + # https://github.com/huggingface/datasets/blob/f5826eff9b06ab10dba1adfa52543341ef1e6009/src/datasets/iterable_dataset.py#L1255 + iterable_dataset = load_dataset( + dataset_name, + name=config_name, + split=split_name, + streaming=True, + use_auth_token=hf_token, + ) + if not isinstance(iterable_dataset, IterableDataset): + raise TypeError("load_dataset should return an IterableDataset") + iterable_dataset = iterable_dataset._resolve_features() + if not isinstance(iterable_dataset, IterableDataset): + raise TypeError("load_dataset should return an IterableDataset") + features = iterable_dataset.features + except Exception as err: + raise Status400Error("Features cannot be found for the split.", err) from err + else: + features = info.features + + # rows + fallback = ( + max_size_fallback is not None and info.size_in_bytes is not None and info.size_in_bytes < max_size_fallback + ) + + try: + try: + rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number) + except Exception: + if fallback: + rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number) + else: + raise + except Exception as err: + raise Status400Error("Cannot get the first rows for the split.", err) from err + + typed_rows = get_typed_rows(dataset_name, config_name, split_name, rows, features, assets_base_url) + row_items = create_truncated_row_items( + dataset_name, config_name, split_name, typed_rows, rows_max_bytes, rows_min_number + ) + return { + "features": to_features_list(dataset_name, config_name, split_name, features), + "rows": row_items, + } diff --git a/services/worker/src/worker/refresh.py b/services/worker/src/worker/refresh.py index 54b0ca47..500c35ff 100644 --- a/services/worker/src/worker/refresh.py +++ b/services/worker/src/worker/refresh.py @@ -2 +2 @@ import logging -from typing import List, Optional +from typing import Dict, List, Optional @@ -10,2 +10,9 @@ from libcache.cache import ( -from libutils.exceptions import Status500Error, StatusError -from libutils.types import SplitFullName +from libcache.simple_cache import ( + HTTPStatus, + delete_first_rows_responses, + get_dataset_first_rows_response_splits, + upsert_first_rows_response, + upsert_splits_response, +) +from libqueue.queue import add_first_rows_job, add_split_job +from libutils.exceptions import Status400Error, Status500Error, StatusError @@ -13,0 +21,2 @@ from worker.models.dataset import get_dataset_split_full_names +from worker.models.first_rows import get_first_rows +from worker.models.info import DatasetInfo, get_info @@ -19 +28 @@ logger = logging.getLogger(__name__) -def refresh_dataset_split_full_names(dataset_name: str, hf_token: Optional[str] = None) -> List[SplitFullName]: +def refresh_dataset(dataset_name: str, hf_token: Optional[str] = None) -> None: @@ -23,2 +32,5 @@ def refresh_dataset_split_full_names(dataset_name: str, hf_token: Optional[str] - logger.debug(f"dataset '{dataset_name}' is valid, cache updated") - return split_full_names + logger.debug(f"dataset={dataset_name} is valid, cache updated") + for split_full_name in split_full_names: + add_split_job( + split_full_name["dataset_name"], split_full_name["config_name"], split_full_name["split_name"] + ) @@ -27 +39 @@ def refresh_dataset_split_full_names(dataset_name: str, hf_token: Optional[str] - logger.debug(f"dataset '{dataset_name}' had error, cache updated") + logger.debug(f"dataset={dataset_name} had error, cache updated") @@ -31 +43 @@ def refresh_dataset_split_full_names(dataset_name: str, hf_token: Optional[str] - logger.debug(f"dataset '{dataset_name}' had error, cache updated") + logger.debug(f"dataset={dataset_name} had error, cache updated") @@ -57,3 +69 @@ def refresh_split( - logger.debug( - f"split '{split_name}' from dataset '{dataset_name}' in config '{config_name}' is valid, cache updated" - ) + logger.debug(f"dataset={dataset_name} config={config_name} split={split_name} is valid, cache updated") @@ -62,3 +72 @@ def refresh_split( - logger.debug( - f"split '{split_name}' from dataset '{dataset_name}' in config '{config_name}' had error, cache updated" - ) + logger.debug(f"dataset={dataset_name} config={config_name} split={split_name} had error, cache updated") @@ -67,0 +76,67 @@ def refresh_split( + logger.debug(f"dataset={dataset_name} config={config_name} split={split_name} had error, cache updated") + raise + + +def get_error_response(error: StatusError) -> Dict: + return { + "status_code": error.status_code, + "exception": error.exception, + "message": error.message, + } + + +def get_error_response_with_cause(error: StatusError) -> Dict: + error_response = { + "status_code": error.status_code, + "exception": error.exception, + "message": error.message, + } + if error.cause_exception and error.cause_message: + error_response["cause_exception"] = error.cause_exception + error_response["cause_message"] = error.cause_message + if error.cause_traceback: + error_response["cause_traceback"] = error.cause_traceback + return error_response + + +def refresh_splits(dataset_name: str, hf_token: Optional[str] = None) -> HTTPStatus: + try: + split_full_names = get_dataset_split_full_names(dataset_name, hf_token) + # get the number of bytes and examples for each split + config_info: Dict[str, DatasetInfo] = {} + splits: List[Dict] = [] + for split_full_name in split_full_names: + try: + dataset = split_full_name["dataset_name"] + config = split_full_name["config_name"] + split = split_full_name["split_name"] + if config not in config_info: + config_info[config] = get_info( + dataset_name=split_full_name["dataset_name"], + config_name=split_full_name["config_name"], + hf_token=hf_token, + ) + info = config_info[config] + num_bytes = info.splits[split].num_bytes if info.splits else None + num_examples = info.splits[split].num_examples if info.splits else None + except Exception: + num_bytes = None + num_examples = None + splits.append( + { + "dataset_name": dataset, + "config_name": config, + "split_name": split, + "num_bytes": num_bytes, + "num_examples": num_examples, + } + ) + response = {"splits": splits} + upsert_splits_response(dataset_name, response, HTTPStatus.OK) + logger.debug(f"dataset={dataset_name} is valid, cache updated") + + splits_in_cache = get_dataset_first_rows_response_splits(dataset_name) + new_splits = [(s["dataset_name"], s["config_name"], s["split_name"]) for s in split_full_names] + splits_to_delete = [s for s in splits_in_cache if s not in new_splits] + for d, c, s in splits_to_delete: + delete_first_rows_responses(d, c, s) @@ -69 +144,2 @@ def refresh_split( - f"split '{split_name}' from dataset '{dataset_name}' in config '{config_name}' had error, cache updated" + f"{len(splits_to_delete)} 'first-rows' responses deleted from the cache for obsolete splits of" + f" dataset={dataset_name}" @@ -71 +147,70 @@ def refresh_split( - raise + for d, c, s in new_splits: + add_first_rows_job(d, c, s) + logger.debug(f"{len(new_splits)} 'first-rows' jobs added for the splits of dataset={dataset_name}") + return HTTPStatus.OK + except Status400Error as err: + upsert_splits_response(dataset_name, get_error_response_with_cause(err), HTTPStatus.BAD_REQUEST) + logger.debug(f"splits response for dataset={dataset_name} had BAD_REQUEST error, cache updated") + return HTTPStatus.BAD_REQUEST + except Exception as err: + err = err if isinstance(err, Status500Error) else Status500Error(str(err)) + upsert_splits_response( + dataset_name, + get_error_response(err), + HTTPStatus.INTERNAL_SERVER_ERROR, + get_error_response_with_cause(err), + ) + logger.debug(f"splits response for dataset={dataset_name} had INTERNAL_SERVER_ERROR error, cache updated") + return HTTPStatus.INTERNAL_SERVER_ERROR + + +def refresh_first_rows( + dataset_name: str, + config_name: str, + split_name: str, + assets_base_url: str, + hf_token: Optional[str] = None, + max_size_fallback: Optional[int] = None, + rows_max_bytes: Optional[int] = None, + rows_max_number: Optional[int] = None, + rows_min_number: Optional[int] = None, +) -> HTTPStatus: + try: + response = get_first_rows( + dataset_name, + config_name, + split_name, + assets_base_url=assets_base_url, + hf_token=hf_token, + max_size_fallback=max_size_fallback, + rows_max_bytes=rows_max_bytes, + rows_max_number=rows_max_number, + rows_min_number=rows_min_number, + ) + upsert_first_rows_response(dataset_name, config_name, split_name, response, HTTPStatus.OK) + logger.debug(f"dataset={dataset_name} config={config_name} split={split_name} is valid, cache updated") + return HTTPStatus.OK + except Status400Error as err: + upsert_first_rows_response( + dataset_name, config_name, split_name, get_error_response_with_cause(err), HTTPStatus.BAD_REQUEST + ) + logger.debug( + f"first-rows response for dataset={dataset_name} config={config_name} split={split_name} had BAD_REQUEST" + " error, cache updated" + ) + return HTTPStatus.BAD_REQUEST + except Exception as err: + err = err if isinstance(err, Status500Error) else Status500Error(str(err)) + upsert_first_rows_response( + dataset_name, + config_name, + split_name, + get_error_response(err), + HTTPStatus.INTERNAL_SERVER_ERROR, + get_error_response_with_cause(err), + ) + logger.debug( + f"first-rows response for dataset={dataset_name} config={config_name} split={split_name} had" + " INTERNAL_SERVER_ERROR error, cache updated" + ) + return HTTPStatus.INTERNAL_SERVER_ERROR diff --git a/services/worker/tests/_utils.py b/services/worker/tests/_utils.py index 0c459acd..9b96c9a2 100644 --- a/services/worker/tests/_utils.py +++ b/services/worker/tests/_utils.py @@ -4,0 +5 @@ from libutils.utils import get_int_value, get_str_value +DEFAULT_ASSETS_BASE_URL: str = "http://localhost/assets" @@ -10,0 +12 @@ DEFAULT_ROWS_MAX_NUMBER: int = 5 +ASSETS_BASE_URL = get_str_value(d=os.environ, key="ASSETS_BASE_URL", default=DEFAULT_ASSETS_BASE_URL) diff --git a/services/worker/tests/conftest.py b/services/worker/tests/conftest.py new file mode 100644 index 00000000..d32d3562 --- /dev/null +++ b/services/worker/tests/conftest.py @@ -0,0 +1,8 @@ +import os + +import pytest + + [email protected](scope="session") +def config(): + return {"image_file": os.path.join(os.path.dirname(__file__), "models", "data", "test_image_rgb.jpg")} diff --git a/services/worker/tests/docker-compose.yml b/services/worker/tests/docker-compose.yml deleted file mode 100644 index 48720980..00000000 --- a/services/worker/tests/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: "3.9" -services: - mongodb-test: - image: mongo - volumes: - - mongo-test:/data/db:rw - ports: - - 27019:27017 -volumes: - mongo-test: diff --git a/services/worker/tests/models/data/test_image_rgb.jpg b/services/worker/tests/models/data/test_image_rgb.jpg new file mode 100644 index 00000000..e131e8ec Binary files /dev/null and b/services/worker/tests/models/data/test_image_rgb.jpg differ diff --git a/services/worker/tests/models/test_features.py b/services/worker/tests/models/test_features.py new file mode 100644 index 00000000..def249c9 --- /dev/null +++ b/services/worker/tests/models/test_features.py @@ -0,0 +1,271 @@ +import datetime +from zoneinfo import ZoneInfo + +import numpy as np +import pandas as pd # type: ignore +import pyarrow as pa # type: ignore +import pytest +from datasets import ( + Array2D, + Array3D, + Array4D, + Array5D, + Audio, + ClassLabel, + Dataset, + Features, + Image, + Sequence, + Translation, + TranslationVariableLanguages, + Value, +) + +from worker.models.features import get_cell_value + +from .._utils import ASSETS_BASE_URL + +# we need to know the correspondence between the feature type and the cell value, in order to: +# - document the API +# - implement the client on the Hub (dataset viewer) + + +# see https://github.com/huggingface/datasets/blob/a5192964dc4b76ee5c03593c11ee56f29bbd688d/... +# src/datasets/features/features.py#L1469 +# ``FieldType`` can be one of the following: +# - a :class:`datasets.Value` feature specifies a single typed value, e.g. ``int64`` or ``string`` [email protected]( + "input_value,input_dtype,output_value,output_dtype", + [ + # null + (None, None, None, "null"), + # bool + (False, pd.BooleanDtype(), False, "bool"), + # int8 + (-7, pd.Int8Dtype(), -7, "int8"), + # int16 + (-7, pd.Int16Dtype(), -7, "int16"), + # int32 + (-7, pd.Int32Dtype(), -7, "int32"), + # int64 + (-7, pd.Int64Dtype(), -7, "int64"), + # uint8 + (7, pd.UInt8Dtype(), 7, "uint8"), + # uint16 + (7, pd.UInt16Dtype(), 7, "uint16"), + # uint32 + (7, pd.UInt32Dtype(), 7, "uint32"), + # uint64 + (7, pd.UInt64Dtype(), 7, "uint64"), + # float16 + (-3.14, np.float16, np.float16(-3.14), "float16"), + # ^ TODO: is it a datasets bug? + # float32 (alias float) + (-3.14, np.float32, np.float32(-3.14), "float32"), + # ^ TODO: is it a datasets bug? + # float64 (alias double) + (-3.14, np.float64, -3.14, "float64"), + # time32[(s|ms)] + # TODO + # time64[(us|ns)] + # (time(1, 1, 1), None, datetime.datetime(1, 1, 1), "time64[us]"), + # ^ TODO: add after https://github.com/huggingface/datasets/issues/4620 is fixed + # timestamp[(s|ms|us|ns)] + (pd.Timestamp(2020, 1, 1), None, datetime.datetime(2020, 1, 1, 0, 0), "timestamp[ns]"), + ( + pd.Timestamp(1513393355.5, unit="s"), + None, + datetime.datetime(2017, 12, 16, 3, 2, 35, 500000), + "timestamp[ns]", + ), + ( + pd.Timestamp(1513393355500, unit="ms"), + None, + datetime.datetime(2017, 12, 16, 3, 2, 35, 500000), + "timestamp[ns]", + ), + # timestamp[(s|ms|us|ns), tz=(tzstring)] + ( + pd.Timestamp(year=2020, month=1, day=1, tz="US/Pacific"), + None, + datetime.datetime(2020, 1, 1, 0, 0, tzinfo=ZoneInfo("US/Pacific")), + "timestamp[ns, tz=US/Pacific]", + ), + # date32 + # TODO + # date64 + # TODO + # duration[(s|ms|us|ns)] + # TODO + # decimal128(precision, scale) + # TODO + # decimal256(precision, scale) + # TODO + # binary + # TODO + # large_binary + # TODO + # string + ("a string", pd.StringDtype(), "a string", "string"), + # large_string + # TODO + ], +) +def test_value(input_value, input_dtype, output_value, output_dtype) -> None: + if input_dtype == "datetime64[ns]": + a = pa.array( + [ + datetime.datetime(2022, 7, 4, 3, 2, 1), + ], + type=pa.date64(), + ) + dataset = Dataset.from_buffer(a.to_buffer()) + else: + df = pd.DataFrame({"feature_name": [input_value]}, dtype=input_dtype) + dataset = Dataset.from_pandas(df) + feature = dataset.features["feature_name"] + assert feature._type == "Value" + assert feature.dtype == output_dtype + value = get_cell_value( + "dataset", "config", "split", 7, dataset[0]["feature_name"], "feature_name", feature, ASSETS_BASE_URL + ) + assert value == output_value + + [email protected]("config") [email protected]( + "get_data_tuple", + [ + # (input value, input feature, output value, output _type) + # - a :class:`datasets.ClassLabel` feature specifies a field with a predefined set of classes + # which can have labels associated to them and will be stored as integers in the dataset + lambda config: ("positive", ClassLabel(names=["negative", "positive"]), 1, "ClassLabel"), + # - a python :obj:`dict` which specifies that the field is a nested field containing a mapping of sub-fields + # to sub-fields features. It's possible to have nested fields of nested fields in an arbitrary manner + lambda config: ( + {"a": 0}, + None, + {"a": 0}, + {"a": Value(dtype="int64", id=None)}, + ), + # - a python :obj:`list` or a :class:`datasets.Sequence` specifies that the field contains a list of objects. + # The python :obj:`list` or :class:`datasets.Sequence` should be provided with a single sub-feature as an + # example of the feature type hosted in this list + # <Tip> + # A :class:`datasets.Sequence` with a internal dictionary feature will be automatically converted into a + # dictionary of lists. This behavior is implemented to have a compatilbity layer with the TensorFlow Datasets + # library but may be un-wanted in some cases. If you don't want this behavior, you can use a python + # :obj:`list` instead of the :class:`datasets.Sequence`. + # </Tip> + lambda config: ( + [{"a": 0}], + None, + [{"a": 0}], + [{"a": Value(dtype="int64", id=None)}], + ), + lambda config: ( + [0], + None, + [0], + "Sequence", + ), + lambda config: ( + [{"a": 0}], + Sequence(feature={"a": Value(dtype="int64")}), + {"a": [0]}, + "Sequence", + ), + # lambda config: ( + # [ + # {"array": [0.1, 0.2, 0.3], "sampling_rate": 16_000}, + # ], + # Sequence(feature=Audio()), + # # ^ corner case: an Audio in a Sequence + # [{"path": None, "array": np.array([0.09997559, 0.19998169, 0.29998779]), "sampling_rate": 16_000}], + # "Sequence", + # ), + # - a :class:`Array2D`, :class:`Array3D`, :class:`Array4D` or :class:`Array5D` feature for multidimensional + # arrays + lambda config: ( + np.zeros((2, 2)), + Array2D(shape=(2, 2), dtype="float32"), + [[0.0, 0.0], [0.0, 0.0]], + "Array2D", + ), + lambda config: ( + np.zeros((2, 2, 2)), + Array3D(shape=(2, 2, 2), dtype="float32"), + [[[0.0, 0.0], [0.0, 0.0]], [[0.0, 0.0], [0.0, 0.0]]], + "Array3D", + ), + lambda config: ( + np.zeros((1, 1, 1, 1)), + Array4D(shape=(1, 1, 1, 1), dtype="int32"), + [[[[0]]]], + "Array4D", + ), + lambda config: ( + np.zeros((1, 1, 1, 1, 1)), + Array5D(shape=(1, 1, 1, 1, 1), dtype="int32"), + [[[[[0]]]]], + "Array5D", + ), + # - an :class:`Audio` feature to store the absolute path to an audio file or a dictionary with the relative + # path to an audio file ("path" key) and its bytes content ("bytes" key). This feature extracts the audio + # data. + lambda config: ( + {"array": [0.1, 0.2, 0.3], "sampling_rate": 16_000}, + Audio(), + [ + { + "src": "http://localhost/assets/dataset/--/config/split/7/feature_name/audio.mp3", + "type": "audio/mpeg", + }, + { + "src": "http://localhost/assets/dataset/--/config/split/7/feature_name/audio.wav", + "type": "audio/wav", + }, + ], + "Audio", + ), + # - an :class:`Image` feature to store the absolute path to an image file, an :obj:`np.ndarray` object, a + # :obj:`PIL.Image.Image` object or a dictionary with the relative path to an image file ("path" key) and + # its bytes content ("bytes" key). This feature extracts the image data. + lambda config: ( + {"path": config["image_file"]}, + Image(), + "http://localhost/assets/dataset/--/config/split/7/feature_name/image.jpg", + "Image", + ), + # - :class:`datasets.Translation` and :class:`datasets.TranslationVariableLanguages`, the two features + # specific to Machine Translation + lambda config: ( + {"en": "the cat", "fr": "le chat"}, + Translation(languages=["en", "fr"]), + {"en": "the cat", "fr": "le chat"}, + "Translation", + ), + lambda config: ( + {"en": "the cat", "fr": ["le chat", "la chatte"]}, + TranslationVariableLanguages(languages=["en", "fr"]), + {"language": ["en", "fr", "fr"], "translation": ["the cat", "la chatte", "le chat"]}, + "TranslationVariableLanguages", + ), + ], +) +def test_others(config, get_data_tuple) -> None: + (input_value, input_feature, output_value, output__type) = get_data_tuple(config) + if input_feature is None: + dataset = Dataset.from_dict({"feature_name": [input_value]}) + else: + features = Features({"feature_name": input_feature}) + dataset = Dataset.from_dict({"feature_name": [input_value]}, features) + feature = dataset.features["feature_name"] + if type(output__type) in [list, dict]: + assert feature == output__type + else: + assert feature._type == output__type + value = get_cell_value( + "dataset", "config", "split", 7, dataset[0]["feature_name"], "feature_name", feature, ASSETS_BASE_URL + ) + assert value == output_value diff --git a/services/worker/tests/models/test_first_rows.py b/services/worker/tests/models/test_first_rows.py new file mode 100644 index 00000000..8512adbd --- /dev/null +++ b/services/worker/tests/models/test_first_rows.py @@ -0,0 +1,37 @@ +from worker.models.first_rows import get_first_rows + +from .._utils import ASSETS_BASE_URL + + +def test_first_rows() -> None: + response = get_first_rows("common_voice", "tr", "train", rows_max_number=1, assets_base_url=ASSETS_BASE_URL) + + assert response["features"][0]["idx"] == 0 + assert response["features"][0]["name"] == "client_id" + assert response["features"][0]["type"]["_type"] == "Value" + assert response["features"][0]["type"]["dtype"] == "string" + + assert response["features"][2]["name"] == "audio" + assert response["features"][2]["type"]["_type"] == "Audio" + assert response["features"][2]["type"]["sampling_rate"] == 48000 + + assert response["rows"][0]["row_idx"] == 0 + assert response["rows"][0]["row"]["client_id"].startswith("54fc2d015c27a057b") + assert response["rows"][0]["row"]["audio"] == [ + {"src": f"{ASSETS_BASE_URL}/common_voice/--/tr/train/0/audio/audio.mp3", "type": "audio/mpeg"}, + {"src": f"{ASSETS_BASE_URL}/common_voice/--/tr/train/0/audio/audio.wav", "type": "audio/wav"}, + ] + + +def test_no_features() -> None: + response = get_first_rows( + "severo/fix-401", "severo--fix-401", "train", rows_max_number=1, assets_base_url=ASSETS_BASE_URL + ) + + assert response["features"][1]["idx"] == 1 + assert response["features"][1]["name"] == "area_mean" + assert response["features"][1]["type"]["_type"] == "Value" + assert response["features"][1]["type"]["dtype"] == "float64" + + assert response["rows"][0]["row_idx"] == 0 + assert response["rows"][0]["row"]["area_mean"] == 1001.0 diff --git a/services/worker/tests/models/test_split.py b/services/worker/tests/models/test_split.py index 76894794..fd68c4e2 100644 --- a/services/worker/tests/models/test_split.py +++ b/services/worker/tests/models/test_split.py @@ -1 +1 @@ -import pandas # type: ignore +# import pandas # type: ignore @@ -134 +134 @@ def test_fallback() -> None: -def test_timestamp() -> None: +# def test_timestamp() -> None: @@ -136 +136 @@ def test_timestamp() -> None: - ROWS_MAX_NUMBER = 1 +# ROWS_MAX_NUMBER = 1 @@ -138,21 +138,21 @@ def test_timestamp() -> None: - split = get_split( - "ett", - "h1", - "train", - HF_TOKEN, - rows_max_number=ROWS_MAX_NUMBER, - ) - assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER - assert split["rows_response"]["rows"][0]["row"]["start"] == 1467331200.0 - assert split["rows_response"]["columns"][0]["column"]["type"] == "TIMESTAMP" - assert split["rows_response"]["columns"][0]["column"]["unit"] == "s" - assert split["rows_response"]["columns"][0]["column"]["tz"] is None - # check - assert ( - pandas.Timestamp( - split["rows_response"]["rows"][0]["row"]["start"], - unit=split["rows_response"]["columns"][0]["column"]["unit"], - tz=split["rows_response"]["columns"][0]["column"]["tz"], - ).isoformat() - == "2016-07-01T00:00:00" - ) +# split = get_split( +# "ett", +# "h1", +# "train", +# HF_TOKEN, +# rows_max_number=ROWS_MAX_NUMBER, +# ) +# assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER +# assert split["rows_response"]["rows"][0]["row"]["start"] == 1467331200.0 +# assert split["rows_response"]["columns"][0]["column"]["type"] == "TIMESTAMP" +# assert split["rows_response"]["columns"][0]["column"]["unit"] == "s" +# assert split["rows_response"]["columns"][0]["column"]["tz"] is None +# # check +# assert ( +# pandas.Timestamp( +# split["rows_response"]["rows"][0]["row"]["start"], +# unit=split["rows_response"]["columns"][0]["column"]["unit"], +# tz=split["rows_response"]["columns"][0]["column"]["tz"], +# ).isoformat() +# == "2016-07-01T00:00:00" +# ) diff --git a/services/worker/tests/test_main.py b/services/worker/tests/test_main.py index 1d548ba9..978350d8 100644 --- a/services/worker/tests/test_main.py +++ b/services/worker/tests/test_main.py @@ -4 +4 @@ from libcache.cache import connect_to_cache -from libqueue.queue import add_dataset_job, add_split_job +from libqueue.queue import add_dataset_job, add_split_job, add_splits_job @@ -8 +8,5 @@ from libqueue.queue import connect_to_queue -from worker.main import process_next_dataset_job, process_next_split_job +from worker.main import ( + process_next_dataset_job, + process_next_split_job, + process_next_splits_job, +) @@ -35,0 +40,4 @@ def test_process_next_dataset_job(): + add_splits_job("acronym_identification") + result = process_next_splits_job() + assert result is True + diff --git a/services/worker/tests/test_refresh.py b/services/worker/tests/test_refresh.py index 180f76bf..581f4be4 100644 --- a/services/worker/tests/test_refresh.py +++ b/services/worker/tests/test_refresh.py @@ -2,5 +2,7 @@ import pytest -from libcache.cache import ( - DbDataset, - clean_database, - connect_to_cache, - get_rows_response, +from libcache.cache import DbDataset +from libcache.cache import clean_database as clean_cache_database +from libcache.cache import connect_to_cache, get_rows_response +from libcache.cache import get_splits_response as old_get_splits_response +from libcache.simple_cache import ( + HTTPStatus, + get_first_rows_response, @@ -8,0 +11,2 @@ from libcache.cache import ( +from libqueue.queue import clean_database as clean_queue_database +from libqueue.queue import connect_to_queue @@ -11 +15,6 @@ from libutils.exceptions import Status400Error -from worker.refresh import refresh_dataset_split_full_names, refresh_split +from worker.refresh import ( + refresh_dataset, + refresh_first_rows, + refresh_split, + refresh_splits, +) @@ -13 +22,6 @@ from worker.refresh import refresh_dataset_split_full_names, refresh_split -from ._utils import MONGO_CACHE_DATABASE, MONGO_URL +from ._utils import ( + ASSETS_BASE_URL, + MONGO_CACHE_DATABASE, + MONGO_QUEUE_DATABASE, + MONGO_URL, +) @@ -24,0 +39 @@ def client() -> None: + connect_to_queue(database=MONGO_QUEUE_DATABASE, host=MONGO_URL) @@ -29 +44,2 @@ def clean_mongo_database() -> None: - clean_database() + clean_cache_database() + clean_queue_database() @@ -35 +51 @@ def test_doesnotexist() -> None: - refresh_dataset_split_full_names(dataset_name) + refresh_dataset(dataset_name) @@ -39,0 +56,6 @@ def test_doesnotexist() -> None: + assert refresh_splits(dataset_name) == HTTPStatus.BAD_REQUEST + response, http_status = get_splits_response(dataset_name) + assert http_status == HTTPStatus.BAD_REQUEST + assert response["status_code"] == 400 + assert response["exception"] == "Status400Error" + @@ -41 +63 @@ def test_doesnotexist() -> None: -def test_config_error() -> None: +def test_e2e_examples() -> None: @@ -44 +66 @@ def test_config_error() -> None: - refresh_dataset_split_full_names(dataset_name) + refresh_dataset(dataset_name) @@ -48 +70 @@ def test_config_error() -> None: - splits_response, error, status_code = get_splits_response(dataset_name) + splits_response, error, status_code = old_get_splits_response(dataset_name) @@ -54,0 +77,13 @@ def test_config_error() -> None: + assert refresh_splits(dataset_name) == HTTPStatus.OK + response, _ = get_splits_response(dataset_name) + assert len(response["splits"]) == 1 + assert response["splits"][0]["num_bytes"] is None + assert response["splits"][0]["num_examples"] is None + + dataset_name = "acronym_identification" + assert refresh_splits(dataset_name) == HTTPStatus.OK + response, _ = get_splits_response(dataset_name) + assert len(response["splits"]) == 3 + assert response["splits"][0]["num_bytes"] == 7792803 + assert response["splits"][0]["num_examples"] == 14006 + @@ -59 +94 @@ def test_large_document() -> None: - refresh_dataset_split_full_names(dataset_name) + refresh_dataset(dataset_name) @@ -62,0 +98,4 @@ def test_large_document() -> None: + assert refresh_splits(dataset_name) == HTTPStatus.OK + _, http_status = get_splits_response(dataset_name) + assert http_status == HTTPStatus.OK + @@ -70 +108,0 @@ def test_column_order() -> None: - print(rows_response["columns"]) @@ -74,0 +113,23 @@ def test_column_order() -> None: + + +def test_first_rows() -> None: + http_status = refresh_first_rows("common_voice", "tr", "train", ASSETS_BASE_URL) + response, cached_http_status = get_first_rows_response("common_voice", "tr", "train") + assert http_status == HTTPStatus.OK + assert cached_http_status == HTTPStatus.OK + + assert response["features"][0]["idx"] == 0 + assert response["features"][0]["name"] == "client_id" + assert response["features"][0]["type"]["_type"] == "Value" + assert response["features"][0]["type"]["dtype"] == "string" + + assert response["features"][2]["name"] == "audio" + assert response["features"][2]["type"]["_type"] == "Audio" + assert response["features"][2]["type"]["sampling_rate"] == 48000 + + assert response["rows"][0]["row_idx"] == 0 + assert response["rows"][0]["row"]["client_id"].startswith("54fc2d015c27a057b") + assert response["rows"][0]["row"]["audio"] == [ + {"src": f"{ASSETS_BASE_URL}/common_voice/--/tr/train/0/audio/audio.mp3", "type": "audio/mpeg"}, + {"src": f"{ASSETS_BASE_URL}/common_voice/--/tr/train/0/audio/audio.wav", "type": "audio/wav"}, + ] diff --git a/tools/DockerRemoteImages.mk b/tools/DockerRemoteImages.mk index 1ba50393..723142fb 100644 --- a/tools/DockerRemoteImages.mk +++ b/tools/DockerRemoteImages.mk @@ -3 +2,0 @@ export SERVICE_API_DOCKER_IMAGE := $(shell jq -r '.dockerImage.api' ${DOCKER_IMA -export SERVICE_DATASETS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.datasetsWorker' ${DOCKER_IMAGES}) @@ -5 +4,4 @@ export SERVICE_REVERSE_PROXY_DOCKER_IMAGE := $(shell jq -r '.dockerImage.reverse -export SERVICE_SPLITS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.splitsWorker' ${DOCKER_IMAGES}) +export SERVICE_WORKER_DATASETS_DOCKER_IMAGE := $(shell jq -r '.dockerImage.worker.datasets' ${DOCKER_IMAGES}) +export SERVICE_WORKER_FIRST_ROWS_DOCKER_IMAGE := $(shell jq -r '.dockerImage.worker.firstRows' ${DOCKER_IMAGES}) +export SERVICE_WORKER_SPLITS_DOCKER_IMAGE := $(shell jq -r '.dockerImage.worker.splits' ${DOCKER_IMAGES}) +export SERVICE_WORKER_SPLITS_NEXT_DOCKER_IMAGE := $(shell jq -r '.dockerImage.worker.splitsNext' ${DOCKER_IMAGES}) diff --git a/tools/docker-compose-datasets-server-from-local-code.yml b/tools/docker-compose-datasets-server-from-local-code.yml index 540f2b8a..da729f3f 100644 --- a/tools/docker-compose-datasets-server-from-local-code.yml +++ b/tools/docker-compose-datasets-server-from-local-code.yml @@ -43 +43 @@ services: - datasets-worker: + worker-datasets: @@ -50,0 +51 @@ services: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets" @@ -59 +60 @@ services: - splits-worker: + worker-first-rows: @@ -66,0 +68,35 @@ services: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets" + ASSETS_DIRECTORY: "/assets" + HF_DATASETS_CACHE: "/datasets-cache" + MONGO_URL: "mongodb://mongodb" + WORKER_QUEUE: "first_rows_responses" + depends_on: + mongodb: + condition: service_started + restart: always + worker-splits-next: + build: + context: .. + dockerfile: ./services/worker/Dockerfile + volumes: + - assets:/assets:rw + - datasets-cache:/datasets-cache:rw + environment: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets" + ASSETS_DIRECTORY: "/assets" + HF_DATASETS_CACHE: "/datasets-cache" + MONGO_URL: "mongodb://mongodb" + WORKER_QUEUE: "splits_responses" + depends_on: + mongodb: + condition: service_started + restart: always + worker-splits: + build: + context: .. + dockerfile: ./services/worker/Dockerfile + volumes: + - assets:/assets:rw + - datasets-cache:/datasets-cache:rw + environment: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets" diff --git a/tools/docker-compose-datasets-server-from-remote-images.yml b/tools/docker-compose-datasets-server-from-remote-images.yml index 3a101450..c3988312 100644 --- a/tools/docker-compose-datasets-server-from-remote-images.yml +++ b/tools/docker-compose-datasets-server-from-remote-images.yml @@ -42,2 +42,2 @@ services: - datasets-worker: - image: ${SERVICE_DATASETS_WORKER_DOCKER_IMAGE?SERVICE_DATASETS_WORKER_DOCKER_IMAGE env var must be provided} + worker-datasets: + image: ${SERVICE_WORKER_DATASETS_DOCKER_IMAGE?SERVICE_WORKER_DATASETS_DOCKER_IMAGE env var must be provided} @@ -47,0 +48 @@ services: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets" @@ -56,2 +57,2 @@ services: - splits-worker: - image: ${SERVICE_SPLITS_WORKER_DOCKER_IMAGE?SERVICE_SPLITS_WORKER_DOCKER_IMAGE env var must be provided} + worker-first-rows: + image: ${SERVICE_WORKER_FIRST_ROWS_DOCKER_IMAGE?SERVICE_WORKER_FIRST_ROWS_DOCKER_IMAGE env var must be provided} @@ -61,0 +63,31 @@ services: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets" + ASSETS_DIRECTORY: "/assets" + HF_DATASETS_CACHE: "/datasets-cache" + MONGO_URL: "mongodb://mongodb" + WORKER_SLEEP_SECONDS: "1" + WORKER_QUEUE: "first_rows_responses" + depends_on: + - mongodb + restart: always + worker-splits-next: + image: ${SERVICE_WORKER_SPLITS_NEXT_DOCKER_IMAGE?SERVICE_WORKER_SPLITS_NEXT_DOCKER_IMAGE env var must be provided} + volumes: + - assets:/assets:rw + - datasets-cache:/datasets-cache:rw + environment: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets" + ASSETS_DIRECTORY: "/assets" + HF_DATASETS_CACHE: "/datasets-cache" + MONGO_URL: "mongodb://mongodb" + WORKER_SLEEP_SECONDS: "1" + WORKER_QUEUE: "splits_responses" + depends_on: + - mongodb + restart: always + worker-splits: + image: ${SERVICE_WORKER_SPLITS_DOCKER_IMAGE?SERVICE_WORKER_SPLITS_DOCKER_IMAGE env var must be provided} + volumes: + - assets:/assets:rw + - datasets-cache:/datasets-cache:rw + environment: + ASSETS_BASE_URL: "http://localhost:${SERVICE_REVERSE_PROXY_PORT-8000}/assets"
f130e05a7ecc5e6ff274e9374d5db3a938d79cb4
Julien Chaumond
2022-07-19T20:26:40
wording tweak (#433)
diff --git a/docs/source/index.mdx b/docs/source/index.mdx index 612bc37d..af92adab 100644 --- a/docs/source/index.mdx +++ b/docs/source/index.mdx @@ -7 +7 @@ The 🤗 Datasets server gives access to the contents, metadata and basic statis -The API has originally been developed to provide data to the [Dataset viewer](https://huggingface.co/docs/hub/datasets-viewer) on the Hub. Indeed, the information about the datasets cannot be extracted live, and must be preprocessed and stored beforehand in order to later be accessed quickly on the Hub. +The API has originally been developed to provide data to the [Dataset viewer](https://huggingface.co/docs/hub/datasets-viewer) on the Hub. Because of the large volume of data, the information about the datasets cannot be extracted on-the-fly, and must be preprocessed and stored beforehand in order to later be accessed quickly on the Hub. @@ -9 +9 @@ The API has originally been developed to provide data to the [Dataset viewer](ht -We decided to make the API public to give programmatic access to the information about datasets. +We decided to make the API public to provide programmatic access to the information about datasets.
b1050d7e8fa03036479564d8547a9b267c064909
Sylvain Lesage
2022-06-29T09:18:12
feat: 🎸 publish openapi.json from the reverse proxy (#426)
diff --git a/docs/source/api_reference.mdx b/docs/source/api_reference.mdx index e84fb081..b614fccc 100644 --- a/docs/source/api_reference.mdx +++ b/docs/source/api_reference.mdx @@ -15,0 +16,6 @@ It provides the following endpoints: + +## OpenAPI specification + +The OpenAPI (fka Swagger) specification is published at https://datasets-server.huggingface.co/openapi.json. + +You can explore it with ReDoc at https://redocly.github.io/redoc/?url=https://datasets-server.huggingface.co/openapi.json. diff --git a/infra/charts/datasets-server/nginx-templates/default.conf.template b/infra/charts/datasets-server/nginx-templates/default.conf.template index cf6951d4..75d6d24c 100644 --- a/infra/charts/datasets-server/nginx-templates/default.conf.template +++ b/infra/charts/datasets-server/nginx-templates/default.conf.template @@ -14,0 +15,4 @@ server { + location /openapi.json { + alias /static-files/openapi.json; + } + diff --git a/docs/openapi.json b/infra/charts/datasets-server/static-files/openapi.json similarity index 100% rename from docs/openapi.json rename to infra/charts/datasets-server/static-files/openapi.json diff --git a/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl b/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl index 3af33f68..039173ee 100644 --- a/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl +++ b/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl @@ -26,0 +27,4 @@ + - name: static-files + mountPath: /static-files + mountPropagation: None + readOnly: true diff --git a/infra/charts/datasets-server/templates/reverse-proxy/configMap.yaml b/infra/charts/datasets-server/templates/reverse-proxy/configMap.yaml index a8f5da22..d8c32caf 100644 --- a/infra/charts/datasets-server/templates/reverse-proxy/configMap.yaml +++ b/infra/charts/datasets-server/templates/reverse-proxy/configMap.yaml @@ -10,0 +11,2 @@ data: + openapi.json: |- + {{ .Files.Get .Values.reverseProxy.openapiFile | nindent 4 }} diff --git a/infra/charts/datasets-server/templates/reverse-proxy/deployment.yaml b/infra/charts/datasets-server/templates/reverse-proxy/deployment.yaml index 7b4f7461..b261d011 100644 --- a/infra/charts/datasets-server/templates/reverse-proxy/deployment.yaml +++ b/infra/charts/datasets-server/templates/reverse-proxy/deployment.yaml @@ -45,0 +46,8 @@ spec: + - name: static-files + configMap: + name: "{{ include "release" . }}-reverse-proxy" + defaultMode: 420 + optional: false + items: + - key: "openapi.json" + path: "openapi.json" diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index a64782d7..9f03e60a 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -63,0 +64 @@ reverseProxy: + openapiFile: "static-files/openapi.json" diff --git a/services/reverse-proxy/README.md b/services/reverse-proxy/README.md index d8e83bf9..1df83dbf 100644 --- a/services/reverse-proxy/README.md +++ b/services/reverse-proxy/README.md @@ -31,0 +32 @@ The image requires three directories to be mounted (from volumes): +- `/staticfiles` (read-only): the directory that contains the static files (`openapi.json`). diff --git a/tools/docker-compose-datasets-server-from-local-code.yml b/tools/docker-compose-datasets-server-from-local-code.yml index d75ec9ad..540f2b8a 100644 --- a/tools/docker-compose-datasets-server-from-local-code.yml +++ b/tools/docker-compose-datasets-server-from-local-code.yml @@ -8,0 +9 @@ services: + - ../infra/charts/datasets-server/static-files/openapi.json:/static-files/openapi.json:ro diff --git a/tools/docker-compose-datasets-server-from-remote-images.yml b/tools/docker-compose-datasets-server-from-remote-images.yml index 953f845f..3a101450 100644 --- a/tools/docker-compose-datasets-server-from-remote-images.yml +++ b/tools/docker-compose-datasets-server-from-remote-images.yml @@ -8,0 +9 @@ services: + - ../infra/charts/datasets-server/static-files/openapi.json:/static-files/openapi.json:ro
667c07be9d7fc0f4482ad05cb32043bc1d559243
Sylvain Lesage
2022-06-28T16:19:22
Create the OpenAPI spec (#424)
diff --git a/docs/openapi.json b/docs/openapi.json new file mode 100644 index 00000000..0dd43a9c --- /dev/null +++ b/docs/openapi.json @@ -0,0 +1,1274 @@ +{ + "openapi": "3.0.2", + "info": { + "title": "Datasets server API", + "description": "The 🤗 Datasets server API gives access to the contents, metadata and basic statistics of the Hugging Face Hub datasets.", + "contact": { + "name": "API Support", + "email": "[email protected]" + }, + "version": "1.0" + }, + "servers": [ + { + "url": "https://datasets-server.huggingface.co", + "description": "Production server" + } + ], + "components": { + "headers": { + "Cache-Control": { + "description": "Directives that control caching in browsers and shared caches. This directive is used internally for caching the responses: the API will serve the same response until the cache has expired.", + "schema": { "type": "string" }, + "examples": { + "no-cache": { "summary": "No cache.", "value": "no-cache" }, + "max-age": { "summary": "Cache TTL.", "value": "max-age=120" } + }, + "required": true + }, + "Access-Control-Allow-Origin": { + "description": "Indicates whether the response can be shared with requesting code from the given origin.", + "schema": { "type": "string" }, + "example": "*", + "required": true + } + }, + "schemas": { + "SplitsResponse": { + "type": "object", + "required": ["splits"], + "properties": { + "splits": { + "type": "array", + "items": { "$ref": "#/components/schemas/SplitItem" } + } + } + }, + "SplitItem": { + "type": "object", + "required": ["dataset", "config", "split"], + "properties": { + "dataset": { + "type": "string" + }, + "config": { + "type": "string" + }, + "split": { + "type": "string" + }, + "num_bytes": { + "type": "integer" + }, + "num_examples": { + "type": "integer" + } + } + }, + "StatusErrorContent": { + "type": "object", + "required": ["status_code", "exception", "message"], + "properties": { + "status_code": { + "type": "integer" + }, + "exception": { + "type": "string" + }, + "message": { + "type": "string" + }, + "cause_exception": { + "type": "string" + }, + "cause_message": { + "type": "string" + }, + "cause_traceback": { + "type": "string" + } + } + }, + "RowsResponse": { + "type": "object", + "required": ["columns", "rows"], + "properties": { + "columns": { + "type": "array", + "items": { "$ref": "#/components/schemas/ColumnItem" } + }, + "rows": { + "type": "array", + "items": { "$ref": "#/components/schemas/RowItem" } + } + } + }, + "ColumnItem": { + "type": "object", + "required": ["dataset", "config", "split", "column_idx", "column"], + "properties": { + "dataset": { + "type": "string" + }, + "config": { + "type": "string" + }, + "split": { + "type": "string" + }, + "column_idx": { + "type": "integer" + }, + "column": { + "$ref": "#/components/schemas/ColumnDict" + } + } + }, + "ColumnDict": { + "oneOf": [ + { "$ref": "#/components/schemas/CommonColumnDict" }, + { "$ref": "#/components/schemas/ClassLabelColumnDict" }, + { "$ref": "#/components/schemas/TimestampColumnDict" } + ], + "discriminator": { + "propertyName": "type" + } + }, + "CommonColumnDict": { + "type": "object", + "required": ["name", "type"], + "properties": { + "name": { + "type": "string" + }, + "type": { "$ref": "#/components/schemas/CommonColumnType" } + } + }, + "CommonColumnType": { + "type": "string", + "enum": [ + "JSON", + "BOOL", + "INT", + "FLOAT", + "STRING", + "IMAGE_URL", + "RELATIVE_IMAGE_URL", + "AUDIO_RELATIVE_SOURCES" + ] + }, + "ClassLabelColumnDict": { + "type": "object", + "required": ["name", "type", "labels"], + "properties": { + "name": { + "type": "string" + }, + "type": { "$ref": "#/components/schemas/ClassLabelColumnType" }, + "labels": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "ClassLabelColumnType": { + "type": "string", + "enum": ["CLASS_LABEL"] + }, + "TimestampColumnDict": { + "type": "object", + "required": ["name", "type", "unit", "tz"], + "properties": { + "name": { + "type": "string" + }, + "type": { "$ref": "#/components/schemas/TimestampColumnType" }, + "unit": { "type": "string" }, + "tz": { "type": "string", "nullable": true } + } + }, + "TimestampColumnType": { + "type": "string", + "enum": ["TIMESTAMP"] + }, + "RowItem": { + "type": "object", + "required": [ + "dataset", + "config", + "split", + "row_idx", + "row", + "truncated_cells" + ], + "properties": { + "dataset": { + "type": "string" + }, + "config": { + "type": "string" + }, + "split": { + "type": "string" + }, + "row_idx": { + "type": "integer" + }, + "row": { + "type": "object" + }, + "truncated_cells": { + "type": "array", + "items": { "type": "string" } + } + } + }, + "ValidResponse": { + "type": "object", + "required": ["valid", "created_at"], + "properties": { + "valid": { + "type": "array", + "items": { "type": "string" } + }, + "created_at": { + "type": "string", + "format": "date-time" + } + } + } + } + }, + "paths": { + "/splits": { + "get": { + "summary": "List of splits", + "description": "The list of splits of a dataset.", + "externalDocs": { + "description": "See Splits (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/splits" + }, + "operationId": "listSplits", + "parameters": [ + { + "name": "dataset", + "in": "query", + "description": "The identifier of the dataset on the Hub.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "glue": { "summary": "a canonical dataset", "value": "glue" }, + "Helsinki-NLP/tatoeba_mt": { + "summary": "a namespaced dataset", + "value": "Helsinki-NLP/tatoeba_mt" + } + } + } + ], + "responses": { + "200": { + "description": "A list of splits.</br>Beware: the response is not paginated.", + "headers": { + "Cache-Control": { "$ref": "#/components/headers/Cache-Control" }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/SplitsResponse" + }, + "examples": { + "duorc": { + "summary": "duorc: two configs, six splits", + "value": { + "splits": [ + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "num_bytes": 239852925, + "num_examples": 60721 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "validation", + "num_bytes": 51662575, + "num_examples": 12961 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "test", + "num_bytes": 49142766, + "num_examples": 12559 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "train", + "num_bytes": 496683105, + "num_examples": 69524 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "validation", + "num_bytes": 106510545, + "num_examples": 15591 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "test", + "num_bytes": 115215816, + "num_examples": 15857 + } + ] + } + }, + "emotion": { + "summary": "emotion: one config, three splits", + "value": { + "splits": [ + { + "dataset": "emotion", + "config": "default", + "split": "train", + "num_bytes": 1741541, + "num_examples": 16000 + }, + { + "dataset": "emotion", + "config": "default", + "split": "validation", + "num_bytes": 214699, + "num_examples": 2000 + }, + { + "dataset": "emotion", + "config": "default", + "split": "test", + "num_bytes": 217177, + "num_examples": 2000 + } + ] + } + } + } + } + } + }, + "400": { + "description": "The dataset has some issue that prevents extracting the list of splits.<br/>The error response should give insights to help fix the issue.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/StatusErrorContent" + }, + "examples": { + "TypeError": { + "summary": "TypeError", + "value": { + "status_code": 400, + "exception": "Status400Error", + "message": "Cannot get the split names for the dataset.", + "cause_exception": "TypeError", + "cause_message": "expected str, bytes or os.PathLike object, not NoneType", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 354, in get_dataset_config_info\n for split_generator in builder._split_generators(\n", + " File \"/cache/modules/datasets_modules/datasets/superb/b8183f71eabe8c559d7f3f528ab37a6a21ad1ee088fd3423574cecad8b3ec67e/superb.py\", line 427, in _split_generators\n manual_dir = os.path.abspath(os.path.expanduser(dl_manager.manual_dir))\n", + " File \"/usr/local/lib/python3.9/posixpath.py\", line 231, in expanduser\n path = os.fspath(path)\n", + "TypeError: expected str, bytes or os.PathLike object, not NoneType\n", + "\nThe above exception was the direct cause of the following exception:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 16, in get_dataset_split_full_names\n return [\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 21, in <listcomp>\n for split_name in get_dataset_split_names(dataset_name, config_name, use_auth_token=hf_token)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 404, in get_dataset_split_names\n info = get_dataset_config_info(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 359, in get_dataset_config_info\n raise SplitsNotFoundError(\"The split names could not be parsed from the dataset config.\") from err\n", + "datasets.inspect.SplitsNotFoundError: The split names could not be parsed from the dataset config.\n" + ] + } + }, + "FileNotFoundError": { + "summary": "FileNotFoundError", + "value": { + "status_code": 400, + "exception": "Status400Error", + "message": "Cannot get the split names for the dataset.", + "cause_exception": "FileNotFoundError", + "cause_message": "Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/dataset.py\", line 18, in get_dataset_split_full_names\n for config_name in get_dataset_config_names(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/inspect.py\", line 289, in get_dataset_config_names\n dataset_module = dataset_module_factory(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1189, in dataset_module_factory\n raise FileNotFoundError(\n", + "FileNotFoundError: Couldn't find a dataset script at /src/services/worker/akhaliq/test/test.py or any data file in the same directory. Couldn't find 'akhaliq/test' on the Hugging Face Hub either: FileNotFoundError: The dataset repository at 'akhaliq/test' doesn't contain any data file.\n" + ] + } + } + } + } + } + }, + "500": { + "description": "The server encountered an error.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/StatusErrorContent" + }, + "examples": { + "mongo": { + "summary": "internal error", + "value": { + "status_code": 500, + "exception": "Status500Error", + "message": "Tried to save duplicate unique keys (E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }, full error: {'index': 0, 'code': 11000, 'keyPattern': {'dataset_name': 1, 'config_name': 1, 'split_name': 1}, 'keyValue': {'dataset_name': 'csebuetnlp/xlsum', 'config_name': 'chinese_traditional', 'split_name': 'test'}, 'errmsg': 'E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }'})", + "cause_exception": "Status500Error", + "cause_message": "Tried to save duplicate unique keys (E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }, full error: {'index': 0, 'code': 11000, 'keyPattern': {'dataset_name': 1, 'config_name': 1, 'split_name': 1}, 'keyValue': {'dataset_name': 'csebuetnlp/xlsum', 'config_name': 'chinese_traditional', 'split_name': 'test'}, 'errmsg': 'E11000 duplicate key error collection: datasets_server_cache.splits index: dataset_name_1_config_name_1_split_name_1 dup key: { dataset_name: \"csebuetnlp/xlsum\", config_name: \"chinese_traditional\", split_name: \"test\" }'})" + } + } + } + } + } + } + } + } + }, + "/rows": { + "get": { + "summary": "First rows of a split", + "description": "The list of the 100 first rows of a dataset split.", + "externalDocs": { + "description": "See First rows (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/rows" + }, + "operationId": "listRows", + "parameters": [ + { + "name": "dataset", + "in": "query", + "description": "The identifier of the dataset on the Hub.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "glue": { "summary": "a canonical dataset", "value": "glue" }, + "Helsinki-NLP/tatoeba_mt": { + "summary": "a namespaced dataset", + "value": "Helsinki-NLP/tatoeba_mt" + } + } + }, + { + "name": "config", + "in": "query", + "description": "The dataset configuration (or subset).", + "required": true, + "schema": { "type": "string" }, + "examples": { + "cola": { + "summary": "a subset of the glue dataset", + "value": "cola" + }, + "yangdong/ecqa": { + "summary": "the default configuration given by the 🤗 Datasets library", + "value": "yangdong--ecqa" + } + } + }, + { + "name": "split", + "in": "query", + "description": "The split name.", + "required": true, + "schema": { "type": "string" }, + "examples": { + "train": { + "summary": "train split", + "value": "train" + }, + "test": { + "summary": "test split", + "value": "test" + }, + "validation": { + "summary": "validation split", + "value": "validation" + } + } + } + ], + "responses": { + "200": { + "description": "The columns, and the 100 first rows of the split.</br>Note: the response can be truncated (less rows, or truncated cell contents): see examples.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RowsResponse" + }, + "examples": { + "cola": { + "summary": "text, and label column (only 3 rows are shown for brevity)", + "value": { + "columns": [ + { + "dataset": "glue", + "config": "cola", + "split": "train", + "column_idx": 0, + "column": { "name": "sentence", "type": "STRING" } + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "column_idx": 1, + "column": { + "name": "label", + "type": "CLASS_LABEL", + "labels": ["unacceptable", "acceptable"] + } + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "column_idx": 2, + "column": { "name": "idx", "type": "INT" } + } + ], + "rows": [ + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 0, + "row": { + "sentence": "Our friends won't buy this analysis, let alone the next one we propose.", + "label": 1, + "idx": 0 + }, + "truncated_cells": [] + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 1, + "row": { + "sentence": "One more pseudo generalization and I'm giving up.", + "label": 1, + "idx": 1 + }, + "truncated_cells": [] + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 2, + "row": { + "sentence": "One more pseudo generalization or I'm giving up.", + "label": 1, + "idx": 2 + }, + "truncated_cells": [] + }, + { + "dataset": "glue", + "config": "cola", + "split": "train", + "row_idx": 3, + "row": { + "sentence": "The more we study verbs, the crazier they get.", + "label": 1, + "idx": 3 + }, + "truncated_cells": [] + } + ] + } + }, + "truncated": { + "summary": "truncated cells due to the response size (has a timestamp column)", + "value": { + "columns": [ + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 0, + "column": { + "name": "start", + "type": "TIMESTAMP", + "tz": null, + "unit": "s" + } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 1, + "column": { "name": "target", "type": "JSON" } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 2, + "column": { + "name": "feat_static_cat", + "type": "JSON" + } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 3, + "column": { + "name": "feat_dynamic_real", + "type": "JSON" + } + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "column_idx": 4, + "column": { "name": "item_id", "type": "STRING" } + } + ], + "rows": [ + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 0, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 1, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 2, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 3, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 4, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 5, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 6, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 7, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 8, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 9, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + } + ] + } + }, + "image": { + "summary": "a column with images (only 3 rows are shown for brevity)", + "value": { + "columns": [ + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "column_idx": 0, + "column": { + "name": "imageA", + "type": "RELATIVE_IMAGE_URL" + } + }, + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "column_idx": 1, + "column": { + "name": "imageB", + "type": "RELATIVE_IMAGE_URL" + } + } + ], + "rows": [ + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "row_idx": 0, + "row": { + "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageA/image.jpg", + "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/0/imageB/image.jpg" + }, + "truncated_cells": [] + }, + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "row_idx": 1, + "row": { + "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageA/image.jpg", + "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/1/imageB/image.jpg" + }, + "truncated_cells": [] + }, + { + "dataset": "huggan/horse2zebra", + "config": "huggan--horse2zebra-aligned", + "split": "train", + "row_idx": 2, + "row": { + "imageA": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageA/image.jpg", + "imageB": "assets/huggan/horse2zebra/--/huggan--horse2zebra-aligned/train/2/imageB/image.jpg" + }, + "truncated_cells": [] + } + ] + } + }, + "audio": { + "summary": "a column with audio files (only 3 rows are shown for brevity)", + "value": { + "columns": [ + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 0, + "column": { "name": "client_id", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 1, + "column": { "name": "path", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 2, + "column": { + "name": "audio", + "type": "AUDIO_RELATIVE_SOURCES" + } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 3, + "column": { "name": "sentence", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 4, + "column": { "name": "up_votes", "type": "INT" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 5, + "column": { "name": "down_votes", "type": "INT" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 6, + "column": { "name": "age", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 7, + "column": { "name": "gender", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 8, + "column": { "name": "accent", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 9, + "column": { "name": "locale", "type": "STRING" } + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "column_idx": 10, + "column": { "name": "segment", "type": "STRING" } + } + ], + "rows": [ + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "row_idx": 0, + "row": { + "client_id": "04960d53cc851eeb6d93f21a09e09ab36fe16943acb226ced1211d7250ab2f1b9a1d655c1cc03d50006e396010851ad52d4c53f49dd77b080b01c4230704c68d", + "path": null, + "audio": [ + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.mp3", + "type": "audio/mpeg" + }, + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/0/audio/audio.wav", + "type": "audio/wav" + } + ], + "sentence": "Why does Melissandre look like she wants to consume Jon Snow on the ride up the wall?", + "up_votes": 2, + "down_votes": 0, + "age": "fourties", + "gender": "male", + "accent": "United States English", + "locale": "en", + "segment": "" + }, + "truncated_cells": [] + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "row_idx": 1, + "row": { + "client_id": "f9f1f96bae1390dfe61ff298abb90975c079e913c712d57d97307ed797469eac446abb149daaad24cacffcc24e1e3275fefeb97f977eb74ce2233e0e5c1d437e", + "path": null, + "audio": [ + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.mp3", + "type": "audio/mpeg" + }, + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/1/audio/audio.wav", + "type": "audio/wav" + } + ], + "sentence": "\"I'm getting them for twelve dollars a night.\"", + "up_votes": 2, + "down_votes": 0, + "age": "", + "gender": "", + "accent": "", + "locale": "en", + "segment": "" + }, + "truncated_cells": [] + }, + { + "dataset": "mozilla-foundation/common_voice_9_0", + "config": "en", + "split": "train", + "row_idx": 2, + "row": { + "client_id": "a6c7706a220eeea7ee3687c1122fe7ac17962d2449d25b6db37cc41cdaace442683e11945b6f581e73941c3083cd4eecfafc938840459cd8c571dae7774ee687", + "path": null, + "audio": [ + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.mp3", + "type": "audio/mpeg" + }, + { + "src": "assets/mozilla-foundation/common_voice_9_0/--/en/train/2/audio/audio.wav", + "type": "audio/wav" + } + ], + "sentence": "Tower of strength", + "up_votes": 2, + "down_votes": 0, + "age": "", + "gender": "", + "accent": "", + "locale": "en", + "segment": "" + }, + "truncated_cells": [] + } + ] + } + } + } + } + } + }, + "400": { + "description": "The dataset has some issue that prevents extracting the list of rows.<br/>The error response should give insights to help fix the issue.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/StatusErrorContent" + }, + "examples": { + "NonMatchingCheckError": { + "summary": "NonMatchingCheckError", + "value": { + "status_code": 400, + "exception": "Status400Error", + "message": "Cannot get the first rows for the split.", + "cause_exception": "NonMatchingChecksumError", + "cause_message": "Checksums didn't match for dataset source files:\n['https://gitlab.com/bigirqu/ArCOV-19/-/archive/master/ArCOV-19-master.zip']", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 180, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 40, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 599, in __iter__\n for key, example in self._iter():\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 579, in _iter\n yield from ex_iterable\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 110, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", + " File \"/cache/modules/datasets_modules/datasets/ar_cov19/818d9b774f4b70542b6807e6ddb6db32c916aafeba4fbdcd228ec79d21edaeab/ar_cov19.py\", line 131, in _generate_examples\n for fname in sorted(glob.glob(os.path.join(data_dir, \"ArCOV-19-master/dataset/all_tweets/2020-*\"))):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/streaming.py\", line 67, in wrapper\n return function(*args, use_auth_token=use_auth_token, **kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 500, in xglob\n fs, *_ = fsspec.get_fs_token_paths(urlpath, storage_options=storage_options)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/core.py\", line 632, in get_fs_token_paths\n fs = filesystem(protocol, **inkwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/registry.py\", line 262, in filesystem\n return cls(**storage_options)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/spec.py\", line 76, in __call__\n obj = super().__call__(*args, **kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/zip.py\", line 58, in __init__\n self.zip = zipfile.ZipFile(self.fo)\n", + " File \"/usr/local/lib/python3.9/zipfile.py\", line 1257, in __init__\n self._RealGetContents()\n", + " File \"/usr/local/lib/python3.9/zipfile.py\", line 1320, in _RealGetContents\n endrec = _EndRecData(fp)\n", + " File \"/usr/local/lib/python3.9/zipfile.py\", line 263, in _EndRecData\n fpin.seek(0, 2)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 684, in seek\n raise ValueError(\"Cannot seek streaming HTTP file\")\n", + "ValueError: Cannot seek streaming HTTP file\n", + "\nDuring handling of the above exception, another exception occurred:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 183, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 27, in get_rows\n dataset = load_dataset(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1679, in load_dataset\n builder_instance.download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 704, in download_and_prepare\n self._download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1221, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 775, in _download_and_prepare\n verify_checksums(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/info_utils.py\", line 40, in verify_checksums\n raise NonMatchingChecksumError(error_msg + str(bad_urls))\n", + "datasets.utils.info_utils.NonMatchingChecksumError: Checksums didn't match for dataset source files:\n['https://gitlab.com/bigirqu/ArCOV-19/-/archive/master/ArCOV-19-master.zip']\n" + ] + } + }, + "FileNotFoundError": { + "summary": "FileNotFoundError", + "value": { + "status_code": 400, + "exception": "Status400Error", + "message": "Cannot get the first rows for the split.", + "cause_exception": "FileNotFoundError", + "cause_message": "Couldn't find file at https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 391, in _info\n await _file_info(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 772, in _file_info\n r.raise_for_status()\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/aiohttp/client_reqrep.py\", line 1004, in raise_for_status\n raise ClientResponseError(\n", + "aiohttp.client_exceptions.ClientResponseError: 404, message='Not Found', url=URL('https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz')\n", + "\nThe above exception was the direct cause of the following exception:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 180, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 40, in get_rows\n rows_plus_one = list(itertools.islice(dataset, rows_max_number + 1))\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 599, in __iter__\n for key, example in self._iter():\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 579, in _iter\n yield from ex_iterable\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/iterable_dataset.py\", line 110, in __iter__\n yield from self.generate_examples_fn(**self.kwargs)\n", + " File \"/cache/modules/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 123, in _generate_examples\n for path, f in files:\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 732, in __iter__\n yield from self.generator(*self.args, **self.kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 759, in _iter_from_urlpath\n with xopen(urlpath, \"rb\", use_auth_token=use_auth_token) as f:\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/streaming_download_manager.py\", line 439, in xopen\n file_obj = fsspec.open(file, mode=mode, *args, **kwargs).open()\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/core.py\", line 141, in open\n out = self.__enter__()\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/core.py\", line 104, in __enter__\n f = self.fs.open(self.path, mode=mode)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/spec.py\", line 1037, in open\n f = self._open(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 340, in _open\n size = size or self.info(path, **kwargs)[\"size\"]\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/asyn.py\", line 86, in wrapper\n return sync(self.loop, func, *args, **kwargs)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/asyn.py\", line 66, in sync\n raise return_result\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/asyn.py\", line 26, in _runner\n result[0] = await coro\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/fsspec/implementations/http.py\", line 404, in _info\n raise FileNotFoundError(url) from exc\n", + "FileNotFoundError: https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz\n", + "\nDuring handling of the above exception, another exception occurred:\n\n", + "Traceback (most recent call last):\n", + " File \"/src/services/worker/src/worker/models/split.py\", line 183, in get_split\n rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libutils/utils.py\", line 82, in decorator\n return func(*args, **kwargs)\n", + " File \"/src/services/worker/src/worker/models/row.py\", line 27, in get_rows\n dataset = load_dataset(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/load.py\", line 1679, in load_dataset\n builder_instance.download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 704, in download_and_prepare\n self._download_and_prepare(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 1221, in _download_and_prepare\n super()._download_and_prepare(dl_manager, verify_infos, check_duplicate_keys=verify_infos)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/builder.py\", line 771, in _download_and_prepare\n split_generators = self._split_generators(dl_manager, **split_generators_kwargs)\n", + " File \"/cache/modules/datasets_modules/datasets/atomic/c0f0ec7d10713c41dfc87f0cf17f936b122d22e19216051217c99134d38f6d7b/atomic.py\", line 95, in _split_generators\n archive = dl_manager.download(my_urls)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/download_manager.py\", line 309, in download\n downloaded_path_or_paths = map_nested(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/py_utils.py\", line 348, in map_nested\n return function(data_struct)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/download/download_manager.py\", line 335, in _download\n return cached_path(url_or_filename, download_config=download_config)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/file_utils.py\", line 185, in cached_path\n output_path = get_from_cache(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/datasets/utils/file_utils.py\", line 530, in get_from_cache\n raise FileNotFoundError(f\"Couldn't find file at {url}\")\n", + "FileNotFoundError: Couldn't find file at https://homes.cs.washington.edu/~msap/atomic/data/atomic_data.tgz\n" + ] + } + } + } + } + } + }, + "500": { + "description": "The server encountered an error.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/StatusErrorContent" + }, + "examples": { + "mongo": { + "summary": "internal error", + "value": { + "status_code": 500, + "exception": "Status500Error", + "message": "could not store the rows/ cache entry.", + "cause_exception": "DocumentTooLarge", + "cause_message": "'update' command document too large", + "cause_traceback": [ + "Traceback (most recent call last):\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/libcache/cache.py\", line 245, in upsert_split\n DbSplit.objects(dataset_name=dataset_name, config_name=config_name, split_name=split_name).upsert_one(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/mongoengine/queryset/base.py\", line 606, in upsert_one\n atomic_update = self.update(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/mongoengine/queryset/base.py\", line 578, in update\n result = update_func(query, update, upsert=upsert)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 1028, in update_one\n self._update_retryable(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 877, in _update_retryable\n return self.__database.client._retryable_write(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1552, in _retryable_write\n return self._retry_with_session(retryable, func, s, None)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1438, in _retry_with_session\n return self._retry_internal(retryable, func, session, bulk)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/mongo_client.py\", line 1470, in _retry_internal\n return func(session, sock_info, retryable)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 869, in _update\n return self._update(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/collection.py\", line 838, in _update\n result = sock_info.command(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/pool.py\", line 726, in command\n self._raise_connection_failure(error)\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/pool.py\", line 710, in command\n return command(self, dbname, spec, secondary_ok,\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/network.py\", line 136, in command\n message._raise_document_too_large(\n", + " File \"/src/services/worker/.venv/lib/python3.9/site-packages/pymongo/message.py\", line 1140, in _raise_document_too_large\n raise DocumentTooLarge(\"%r command document too large\" % (operation,))\n", + "pymongo.errors.DocumentTooLarge: 'update' command document too large\n" + ] + } + } + } + } + } + } + } + } + }, + "/valid": { + "get": { + "summary": " Valid datasets", + "description": "The list of the Hub datasets that work without an error (for /splits and /rows).", + "externalDocs": { + "description": "See Valid datasets (Hub docs)", + "url": "https://huggingface.co/docs/datasets-server/valid" + }, + "operationId": "listValidDatasets", + "parameters": [], + "responses": { + "200": { + "description": "The valid datasets.", + "headers": { + "Cache-Control": { + "$ref": "#/components/headers/Cache-Control" + }, + "Access-Control-Allow-Origin": { + "$ref": "#/components/headers/Access-Control-Allow-Origin" + } + }, + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ValidResponse" + }, + "examples": { + "valid": { + "summary": "list of datasets", + "value": { + "valid": [ + "0n1xus/codexglue", + "0n1xus/pytorrent-standalone", + "0x7194633/rupile", + "51la5/keyword-extraction", + "AHussain0418/day2_data" + ], + "created_at": "2022-06-28T16:04:24Z" + } + } + } + } + } + } + } + } + } + } +}
5860f15a06c7ef6c1f8452a142263706d35e68e8
Sylvain Lesage
2022-06-28T08:40:52
feat: 🎸 add basis for the docs (#421)
diff --git a/.github/workflows/build_documentation.yml b/.github/workflows/build_documentation.yml new file mode 100644 index 00000000..96d610c1 --- /dev/null +++ b/.github/workflows/build_documentation.yml @@ -0,0 +1,18 @@ +name: Build documentation + +on: + push: + branches: + - main + - doc-builder* + - v*-release + +jobs: + build: + uses: huggingface/doc-builder/.github/workflows/build_main_documentation.yml@main + with: + commit_sha: ${{ github.sha }} + package: datasets-server + additional_args: --not_python_module + secrets: + token: ${{ secrets.HUGGINGFACE_PUSH }} diff --git a/.github/workflows/build_pr_documentation.yml b/.github/workflows/build_pr_documentation.yml new file mode 100644 index 00000000..351abfe1 --- /dev/null +++ b/.github/workflows/build_pr_documentation.yml @@ -0,0 +1,17 @@ +name: Build PR Documentation + +on: + pull_request: + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +jobs: + build: + uses: huggingface/doc-builder/.github/workflows/build_pr_documentation.yml@main + with: + commit_sha: ${{ github.event.pull_request.head.sha }} + pr_number: ${{ github.event.number }} + package: datasets-server + additional_args: --not_python_module diff --git a/.github/workflows/delete_doc_comment.yml b/.github/workflows/delete_doc_comment.yml new file mode 100644 index 00000000..e42b2ee0 --- /dev/null +++ b/.github/workflows/delete_doc_comment.yml @@ -0,0 +1,13 @@ +name: Delete dev documentation + +on: + pull_request: + types: [ closed ] + + +jobs: + delete: + uses: huggingface/doc-builder/.github/workflows/delete_doc_comment.yml@main + with: + pr_number: ${{ github.event.number }} + package: datasets-server diff --git a/docs/.python-version b/docs/.python-version new file mode 100644 index 00000000..1635d0f5 --- /dev/null +++ b/docs/.python-version @@ -0,0 +1 @@ +3.9.6 diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 00000000..78667b42 --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,13 @@ +BUILD_DIR?=~/tmp/doc-datasets-server + +.PHONY: install +install: + poetry install + +.PHONY: build +build: + poetry run doc-builder build datasets-server source/ --build_dir $(BUILD_DIR) --not_python_module + +.PHONY: preview +preview: + poetry run doc-builder preview datasets-server source/ --not_python_module diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 00000000..cc621e9c --- /dev/null +++ b/docs/README.md @@ -0,0 +1,80 @@ +<!--- +Copyright 2022 The HuggingFace Team. All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +--> + +# Generate the documentation + +To generate the documentation, you first have to build it. Several packages are necessary to build the doc, +you can install them with the following command, in this directory: + +```bash +make install +``` + +--- + +**NOTE** + +You only need to generate the documentation to inspect it locally (if you're planning changes and want to +check how they look like before committing for instance). You don't have to commit the built documentation. + +--- + +## Preview the documentation + +Once you have setup the `doc-builder` and additional packages, you can preview the documentation by typing the +following command: + +```bash +make preview +``` + +The documentation is available at http://localhost:3000/. + +## Build the documentation + +To build the documentation, launch: + +```bash +BUILD_DIR=/tmp/doc-datasets-server/ make build +``` + +You can adapt the `BUILD_DIR` environment variable to set any temporary folder that you prefer. This command will create it and generate +the MDX files that will be rendered as the documentation on the main website. You can inspect them in your favorite +Markdown editor. + +--- + +**NOTE** + +It's not possible to see locally how the final documentation will look like for now. Once you have opened a PR, you +will see a bot add a comment to a link where the documentation with your changes lives. + +--- + +## Adding a new element to the navigation bar + +Accepted files are Markdown (.md or .mdx). + +Create a file with its extension and put it in the source directory. You can then link it to the toc-tree by putting +the filename without the extension in the [`_toctree.yml`](https://github.com/huggingface/datasets-server/blob/main/docs/source/_toctree.yml) file. + +## Adding an image + +Due to the rapidly growing repository, it is important to make sure that no files that would significantly weigh down the repository are added. This includes images, videos and other non-text files. We prefer to leverage a hf.co hosted `dataset` like +the ones hosted on [`hf-internal-testing`](https://huggingface.co/hf-internal-testing) in which to place these files and reference +them by URL. We recommend putting them in the following dataset: [huggingface/documentation-images](https://huggingface.co/datasets/huggingface/documentation-images). +If an external contribution, feel free to add the images to your PR and ask a Hugging Face member to migrate your images +to this dataset. diff --git a/docs/poetry.lock b/docs/poetry.lock new file mode 100644 index 00000000..0bb72faa --- /dev/null +++ b/docs/poetry.lock @@ -0,0 +1,538 @@ +[[package]] +name = "attrs" +version = "21.4.0" +description = "Classes Without Boilerplate" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.extras] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] +docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] +tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"] + +[[package]] +name = "black" +version = "22.3.0" +description = "The uncompromising code formatter." +category = "main" +optional = false +python-versions = ">=3.6.2" + +[package.dependencies] +click = ">=8.0.0" +mypy-extensions = ">=0.4.3" +pathspec = ">=0.9.0" +platformdirs = ">=2" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""} + +[package.extras] +colorama = ["colorama (>=0.4.3)"] +d = ["aiohttp (>=3.7.4)"] +jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] +uvloop = ["uvloop (>=0.15.2)"] + +[[package]] +name = "click" +version = "8.1.3" +description = "Composable command line interface toolkit" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + +[[package]] +name = "colorama" +version = "0.4.5" +description = "Cross-platform colored terminal text." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "fastjsonschema" +version = "2.15.3" +description = "Fastest Python implementation of JSON schema" +category = "main" +optional = false +python-versions = "*" + +[package.extras] +devel = ["colorama", "jsonschema", "json-spec", "pylint", "pytest", "pytest-benchmark", "pytest-cache", "validictory"] + +[[package]] +name = "flake8" +version = "4.0.1" +description = "the modular source code checker: pep8 pyflakes and co" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +mccabe = ">=0.6.0,<0.7.0" +pycodestyle = ">=2.8.0,<2.9.0" +pyflakes = ">=2.4.0,<2.5.0" + +[[package]] +name = "hf-doc-builder" +version = "0.3.0" +description = "Doc building utility" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +black = {version = ">=22.0,<23.0", optional = true, markers = "extra == \"quality\""} +flake8 = {version = ">=3.8.3", optional = true, markers = "extra == \"quality\""} +isort = {version = ">=5.5.4", optional = true, markers = "extra == \"quality\""} +nbformat = "*" +packaging = "*" +pyyaml = "*" +tqdm = "*" + +[package.extras] +all = ["pytest", "pytest-xdist", "torch", "transformers", "tokenizers", "black (>=22.0,<23.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)"] +dev = ["pytest", "pytest-xdist", "torch", "transformers", "tokenizers", "black (>=22.0,<23.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)"] +quality = ["black (>=22.0,<23.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)"] +testing = ["pytest", "pytest-xdist", "torch", "transformers", "tokenizers"] +transformers = ["transformers"] + +[[package]] +name = "isort" +version = "5.10.1" +description = "A Python utility / library to sort Python imports." +category = "main" +optional = false +python-versions = ">=3.6.1,<4.0" + +[package.extras] +pipfile_deprecated_finder = ["pipreqs", "requirementslib"] +requirements_deprecated_finder = ["pipreqs", "pip-api"] +colors = ["colorama (>=0.4.3,<0.5.0)"] +plugins = ["setuptools"] + +[[package]] +name = "jsonschema" +version = "4.6.0" +description = "An implementation of JSON Schema validation for Python" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +attrs = ">=17.4.0" +pyrsistent = ">=0.14.0,<0.17.0 || >0.17.0,<0.17.1 || >0.17.1,<0.17.2 || >0.17.2" + +[package.extras] +format = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3987", "uri-template", "webcolors (>=1.11)"] +format-nongpl = ["fqdn", "idna", "isoduration", "jsonpointer (>1.13)", "rfc3339-validator", "rfc3986-validator (>0.1.0)", "uri-template", "webcolors (>=1.11)"] + +[[package]] +name = "jupyter-core" +version = "4.10.0" +description = "Jupyter core package. A base package on which Jupyter projects rely." +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +pywin32 = {version = ">=1.0", markers = "sys_platform == \"win32\" and platform_python_implementation != \"PyPy\""} +traitlets = "*" + +[package.extras] +test = ["ipykernel", "pre-commit", "pytest", "pytest-cov", "pytest-timeout"] + +[[package]] +name = "mccabe" +version = "0.6.1" +description = "McCabe checker, plugin for flake8" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "mypy-extensions" +version = "0.4.3" +description = "Experimental type system extensions for programs checked with the mypy typechecker." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "nbformat" +version = "5.4.0" +description = "The Jupyter Notebook format" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +fastjsonschema = "*" +jsonschema = ">=2.6" +jupyter-core = "*" +traitlets = ">=5.1" + +[package.extras] +test = ["check-manifest", "testpath", "pytest", "pre-commit"] + +[[package]] +name = "packaging" +version = "21.3" +description = "Core utilities for Python packages" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" + +[[package]] +name = "pathspec" +version = "0.9.0" +description = "Utility library for gitignore style pattern matching of file paths." +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" + +[[package]] +name = "platformdirs" +version = "2.5.2" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"] +test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"] + +[[package]] +name = "pycodestyle" +version = "2.8.0" +description = "Python style guide checker" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "pyflakes" +version = "2.4.0" +description = "passive checker of Python programs" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pyparsing" +version = "3.0.9" +description = "pyparsing module - Classes and methods to define and execute parsing grammars" +category = "main" +optional = false +python-versions = ">=3.6.8" + +[package.extras] +diagrams = ["railroad-diagrams", "jinja2"] + +[[package]] +name = "pyrsistent" +version = "0.18.1" +description = "Persistent/Functional/Immutable data structures" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "pywin32" +version = "304" +description = "Python for Window Extensions" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "pyyaml" +version = "6.0" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "tqdm" +version = "4.64.0" +description = "Fast, Extensible Progress Meter" +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + +[package.extras] +dev = ["py-make (>=0.1.0)", "twine", "wheel"] +notebook = ["ipywidgets (>=6)"] +slack = ["slack-sdk"] +telegram = ["requests"] + +[[package]] +name = "traitlets" +version = "5.3.0" +description = "" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +test = ["pre-commit", "pytest"] + +[[package]] +name = "typing-extensions" +version = "4.2.0" +description = "Backported and Experimental Type Hints for Python 3.7+" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "watchdog" +version = "2.1.9" +description = "Filesystem events monitoring" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.extras] +watchmedo = ["PyYAML (>=3.10)"] + +[metadata] +lock-version = "1.1" +python-versions = "3.9.6" +content-hash = "c604ab0487eae9671f12cfba89dc09542868ff1302fc5c9e4c1be27a8e29b578" + +[metadata.files] +attrs = [ + {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, + {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, +] +black = [ + {file = "black-22.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09"}, + {file = "black-22.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb"}, + {file = "black-22.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a"}, + {file = "black-22.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968"}, + {file = "black-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"}, + {file = "black-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce"}, + {file = "black-22.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82"}, + {file = "black-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b"}, + {file = "black-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015"}, + {file = "black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b"}, + {file = "black-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a"}, + {file = "black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163"}, + {file = "black-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464"}, + {file = "black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0"}, + {file = "black-22.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176"}, + {file = "black-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0"}, + {file = "black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20"}, + {file = "black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a"}, + {file = "black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad"}, + {file = "black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21"}, + {file = "black-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265"}, + {file = "black-22.3.0-py3-none-any.whl", hash = "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72"}, + {file = "black-22.3.0.tar.gz", hash = "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79"}, +] +click = [ + {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, + {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, +] +colorama = [ + {file = "colorama-0.4.5-py2.py3-none-any.whl", hash = "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da"}, + {file = "colorama-0.4.5.tar.gz", hash = "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"}, +] +fastjsonschema = [ + {file = "fastjsonschema-2.15.3-py3-none-any.whl", hash = "sha256:ddb0b1d8243e6e3abb822bd14e447a89f4ab7439342912d590444831fa00b6a0"}, + {file = "fastjsonschema-2.15.3.tar.gz", hash = "sha256:0a572f0836962d844c1fc435e200b2e4f4677e4e6611a2e3bdd01ba697c275ec"}, +] +flake8 = [ + {file = "flake8-4.0.1-py2.py3-none-any.whl", hash = "sha256:479b1304f72536a55948cb40a32dce8bb0ffe3501e26eaf292c7e60eb5e0428d"}, + {file = "flake8-4.0.1.tar.gz", hash = "sha256:806e034dda44114815e23c16ef92f95c91e4c71100ff52813adf7132a6ad870d"}, +] +hf-doc-builder = [ + {file = "hf-doc-builder-0.3.0.tar.gz", hash = "sha256:d9a632c8afd01debc24e47f215505a4ec5bbee86f8ec04781b32b3d54d2de266"}, + {file = "hf_doc_builder-0.3.0-py3-none-any.whl", hash = "sha256:d6a91d3e248d6b227a5314d146d8a4c421f1cd0d411216d13c7461703ca9263c"}, +] +isort = [ + {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, + {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, +] +jsonschema = [ + {file = "jsonschema-4.6.0-py3-none-any.whl", hash = "sha256:1c92d2db1900b668201f1797887d66453ab1fbfea51df8e4b46236689c427baf"}, + {file = "jsonschema-4.6.0.tar.gz", hash = "sha256:9d6397ba4a6c0bf0300736057f649e3e12ecbc07d3e81a0dacb72de4e9801957"}, +] +jupyter-core = [ + {file = "jupyter_core-4.10.0-py3-none-any.whl", hash = "sha256:e7f5212177af7ab34179690140f188aa9bf3d322d8155ed972cbded19f55b6f3"}, + {file = "jupyter_core-4.10.0.tar.gz", hash = "sha256:a6de44b16b7b31d7271130c71a6792c4040f077011961138afed5e5e73181aec"}, +] +mccabe = [ + {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, + {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, +] +mypy-extensions = [ + {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, + {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, +] +nbformat = [ + {file = "nbformat-5.4.0-py3-none-any.whl", hash = "sha256:0d6072aaec95dddc39735c144ee8bbc6589c383fb462e4058abc855348152dad"}, + {file = "nbformat-5.4.0.tar.gz", hash = "sha256:44ba5ca6acb80c5d5a500f1e5b83ede8cbe364d5a495c4c8cf60aaf1ba656501"}, +] +packaging = [ + {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, + {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, +] +pathspec = [ + {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"}, + {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"}, +] +platformdirs = [ + {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"}, + {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"}, +] +pycodestyle = [ + {file = "pycodestyle-2.8.0-py2.py3-none-any.whl", hash = "sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20"}, + {file = "pycodestyle-2.8.0.tar.gz", hash = "sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f"}, +] +pyflakes = [ + {file = "pyflakes-2.4.0-py2.py3-none-any.whl", hash = "sha256:3bb3a3f256f4b7968c9c788781e4ff07dce46bdf12339dcda61053375426ee2e"}, + {file = "pyflakes-2.4.0.tar.gz", hash = "sha256:05a85c2872edf37a4ed30b0cce2f6093e1d0581f8c19d7393122da7e25b2b24c"}, +] +pyparsing = [ + {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, + {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, +] +pyrsistent = [ + {file = "pyrsistent-0.18.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:df46c854f490f81210870e509818b729db4488e1f30f2a1ce1698b2295a878d1"}, + {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5d45866ececf4a5fff8742c25722da6d4c9e180daa7b405dc0a2a2790d668c26"}, + {file = "pyrsistent-0.18.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4ed6784ceac462a7d6fcb7e9b663e93b9a6fb373b7f43594f9ff68875788e01e"}, + {file = "pyrsistent-0.18.1-cp310-cp310-win32.whl", hash = "sha256:e4f3149fd5eb9b285d6bfb54d2e5173f6a116fe19172686797c056672689daf6"}, + {file = "pyrsistent-0.18.1-cp310-cp310-win_amd64.whl", hash = "sha256:636ce2dc235046ccd3d8c56a7ad54e99d5c1cd0ef07d9ae847306c91d11b5fec"}, + {file = "pyrsistent-0.18.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e92a52c166426efbe0d1ec1332ee9119b6d32fc1f0bbfd55d5c1088070e7fc1b"}, + {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d7a096646eab884bf8bed965bad63ea327e0d0c38989fc83c5ea7b8a87037bfc"}, + {file = "pyrsistent-0.18.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cdfd2c361b8a8e5d9499b9082b501c452ade8bbf42aef97ea04854f4a3f43b22"}, + {file = "pyrsistent-0.18.1-cp37-cp37m-win32.whl", hash = "sha256:7ec335fc998faa4febe75cc5268a9eac0478b3f681602c1f27befaf2a1abe1d8"}, + {file = "pyrsistent-0.18.1-cp37-cp37m-win_amd64.whl", hash = "sha256:6455fc599df93d1f60e1c5c4fe471499f08d190d57eca040c0ea182301321286"}, + {file = "pyrsistent-0.18.1-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:fd8da6d0124efa2f67d86fa70c851022f87c98e205f0594e1fae044e7119a5a6"}, + {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7bfe2388663fd18bd8ce7db2c91c7400bf3e1a9e8bd7d63bf7e77d39051b85ec"}, + {file = "pyrsistent-0.18.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0e3e1fcc45199df76053026a51cc59ab2ea3fc7c094c6627e93b7b44cdae2c8c"}, + {file = "pyrsistent-0.18.1-cp38-cp38-win32.whl", hash = "sha256:b568f35ad53a7b07ed9b1b2bae09eb15cdd671a5ba5d2c66caee40dbf91c68ca"}, + {file = "pyrsistent-0.18.1-cp38-cp38-win_amd64.whl", hash = "sha256:d1b96547410f76078eaf66d282ddca2e4baae8964364abb4f4dcdde855cd123a"}, + {file = "pyrsistent-0.18.1-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:f87cc2863ef33c709e237d4b5f4502a62a00fab450c9e020892e8e2ede5847f5"}, + {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6bc66318fb7ee012071b2792024564973ecc80e9522842eb4e17743604b5e045"}, + {file = "pyrsistent-0.18.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:914474c9f1d93080338ace89cb2acee74f4f666fb0424896fcfb8d86058bf17c"}, + {file = "pyrsistent-0.18.1-cp39-cp39-win32.whl", hash = "sha256:1b34eedd6812bf4d33814fca1b66005805d3640ce53140ab8bbb1e2651b0d9bc"}, + {file = "pyrsistent-0.18.1-cp39-cp39-win_amd64.whl", hash = "sha256:e24a828f57e0c337c8d8bb9f6b12f09dfdf0273da25fda9e314f0b684b415a07"}, + {file = "pyrsistent-0.18.1.tar.gz", hash = "sha256:d4d61f8b993a7255ba714df3aca52700f8125289f84f704cf80916517c46eb96"}, +] +pywin32 = [ + {file = "pywin32-304-cp310-cp310-win32.whl", hash = "sha256:3c7bacf5e24298c86314f03fa20e16558a4e4138fc34615d7de4070c23e65af3"}, + {file = "pywin32-304-cp310-cp310-win_amd64.whl", hash = "sha256:4f32145913a2447736dad62495199a8e280a77a0ca662daa2332acf849f0be48"}, + {file = "pywin32-304-cp310-cp310-win_arm64.whl", hash = "sha256:d3ee45adff48e0551d1aa60d2ec066fec006083b791f5c3527c40cd8aefac71f"}, + {file = "pywin32-304-cp311-cp311-win32.whl", hash = "sha256:30c53d6ce44c12a316a06c153ea74152d3b1342610f1b99d40ba2795e5af0269"}, + {file = "pywin32-304-cp311-cp311-win_amd64.whl", hash = "sha256:7ffa0c0fa4ae4077e8b8aa73800540ef8c24530057768c3ac57c609f99a14fd4"}, + {file = "pywin32-304-cp311-cp311-win_arm64.whl", hash = "sha256:cbbe34dad39bdbaa2889a424d28752f1b4971939b14b1bb48cbf0182a3bcfc43"}, + {file = "pywin32-304-cp36-cp36m-win32.whl", hash = "sha256:be253e7b14bc601718f014d2832e4c18a5b023cbe72db826da63df76b77507a1"}, + {file = "pywin32-304-cp36-cp36m-win_amd64.whl", hash = "sha256:de9827c23321dcf43d2f288f09f3b6d772fee11e809015bdae9e69fe13213988"}, + {file = "pywin32-304-cp37-cp37m-win32.whl", hash = "sha256:f64c0377cf01b61bd5e76c25e1480ca8ab3b73f0c4add50538d332afdf8f69c5"}, + {file = "pywin32-304-cp37-cp37m-win_amd64.whl", hash = "sha256:bb2ea2aa81e96eee6a6b79d87e1d1648d3f8b87f9a64499e0b92b30d141e76df"}, + {file = "pywin32-304-cp38-cp38-win32.whl", hash = "sha256:94037b5259701988954931333aafd39cf897e990852115656b014ce72e052e96"}, + {file = "pywin32-304-cp38-cp38-win_amd64.whl", hash = "sha256:ead865a2e179b30fb717831f73cf4373401fc62fbc3455a0889a7ddac848f83e"}, + {file = "pywin32-304-cp39-cp39-win32.whl", hash = "sha256:25746d841201fd9f96b648a248f731c1dec851c9a08b8e33da8b56148e4c65cc"}, + {file = "pywin32-304-cp39-cp39-win_amd64.whl", hash = "sha256:d24a3382f013b21aa24a5cfbfad5a2cd9926610c0affde3e8ab5b3d7dbcf4ac9"}, +] +pyyaml = [ + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, +] +tomli = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] +tqdm = [ + {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"}, + {file = "tqdm-4.64.0.tar.gz", hash = "sha256:40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d"}, +] +traitlets = [ + {file = "traitlets-5.3.0-py3-none-any.whl", hash = "sha256:65fa18961659635933100db8ca120ef6220555286949774b9cfc106f941d1c7a"}, + {file = "traitlets-5.3.0.tar.gz", hash = "sha256:0bb9f1f9f017aa8ec187d8b1b2a7a6626a2a1d877116baba52a129bfa124f8e2"}, +] +typing-extensions = [ + {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, + {file = "typing_extensions-4.2.0.tar.gz", hash = "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"}, +] +watchdog = [ + {file = "watchdog-2.1.9-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a735a990a1095f75ca4f36ea2ef2752c99e6ee997c46b0de507ba40a09bf7330"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b17d302850c8d412784d9246cfe8d7e3af6bcd45f958abb2d08a6f8bedf695d"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ee3e38a6cc050a8830089f79cbec8a3878ec2fe5160cdb2dc8ccb6def8552658"}, + {file = "watchdog-2.1.9-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64a27aed691408a6abd83394b38503e8176f69031ca25d64131d8d640a307591"}, + {file = "watchdog-2.1.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:195fc70c6e41237362ba720e9aaf394f8178bfc7fa68207f112d108edef1af33"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bfc4d351e6348d6ec51df007432e6fe80adb53fd41183716017026af03427846"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8250546a98388cbc00c3ee3cc5cf96799b5a595270dfcfa855491a64b86ef8c3"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:117ffc6ec261639a0209a3252546b12800670d4bf5f84fbd355957a0595fe654"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:97f9752208f5154e9e7b76acc8c4f5a58801b338de2af14e7e181ee3b28a5d39"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:247dcf1df956daa24828bfea5a138d0e7a7c98b1a47cf1fa5b0c3c16241fcbb7"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:226b3c6c468ce72051a4c15a4cc2ef317c32590d82ba0b330403cafd98a62cfd"}, + {file = "watchdog-2.1.9-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d9820fe47c20c13e3c9dd544d3706a2a26c02b2b43c993b62fcd8011bcc0adb3"}, + {file = "watchdog-2.1.9-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:70af927aa1613ded6a68089a9262a009fbdf819f46d09c1a908d4b36e1ba2b2d"}, + {file = "watchdog-2.1.9-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ed80a1628cee19f5cfc6bb74e173f1b4189eb532e705e2a13e3250312a62e0c9"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_aarch64.whl", hash = "sha256:9f05a5f7c12452f6a27203f76779ae3f46fa30f1dd833037ea8cbc2887c60213"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_armv7l.whl", hash = "sha256:255bb5758f7e89b1a13c05a5bceccec2219f8995a3a4c4d6968fe1de6a3b2892"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_i686.whl", hash = "sha256:d3dda00aca282b26194bdd0adec21e4c21e916956d972369359ba63ade616153"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_ppc64.whl", hash = "sha256:186f6c55abc5e03872ae14c2f294a153ec7292f807af99f57611acc8caa75306"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:083171652584e1b8829581f965b9b7723ca5f9a2cd7e20271edf264cfd7c1412"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_s390x.whl", hash = "sha256:b530ae007a5f5d50b7fbba96634c7ee21abec70dc3e7f0233339c81943848dc1"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_x86_64.whl", hash = "sha256:4f4e1c4aa54fb86316a62a87b3378c025e228178d55481d30d857c6c438897d6"}, + {file = "watchdog-2.1.9-py3-none-win32.whl", hash = "sha256:5952135968519e2447a01875a6f5fc8c03190b24d14ee52b0f4b1682259520b1"}, + {file = "watchdog-2.1.9-py3-none-win_amd64.whl", hash = "sha256:7a833211f49143c3d336729b0020ffd1274078e94b0ae42e22f596999f50279c"}, + {file = "watchdog-2.1.9-py3-none-win_ia64.whl", hash = "sha256:ad576a565260d8f99d97f2e64b0f97a48228317095908568a9d5c786c829d428"}, + {file = "watchdog-2.1.9.tar.gz", hash = "sha256:43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609"}, +] diff --git a/docs/poetry.toml b/docs/poetry.toml new file mode 100644 index 00000000..ab1033bd --- /dev/null +++ b/docs/poetry.toml @@ -0,0 +1,2 @@ +[virtualenvs] +in-project = true diff --git a/docs/pyproject.toml b/docs/pyproject.toml new file mode 100644 index 00000000..2038e729 --- /dev/null +++ b/docs/pyproject.toml @@ -0,0 +1,14 @@ +[tool.poetry] +authors = ["Sylvain Lesage <[email protected]>"] +description = "Documentation for datasets-server" +name = "datasets-server-doc" +version = "0.1.0" + +[tool.poetry.dependencies] +hf-doc-builder = { extras = ["quality"], version = "0.3.0" } +python = "3.9.6" +watchdog = "^2.1.9" + +[build-system] +build-backend = "poetry.core.masonry.api" +requires = ["poetry-core>=1.0.0"] diff --git a/docs/source/_toctree.yml b/docs/source/_toctree.yml new file mode 100644 index 00000000..1653de13 --- /dev/null +++ b/docs/source/_toctree.yml @@ -0,0 +1,13 @@ + +- sections: + - local: index + title: 🤗 Datasets server + - local: splits + title: Splits + - local: rows + title: First rows + - local: valid + title: Valid datasets + - local: api_reference + title: API reference + title: Get started diff --git a/docs/source/api_reference.mdx b/docs/source/api_reference.mdx new file mode 100644 index 00000000..e84fb081 --- /dev/null +++ b/docs/source/api_reference.mdx @@ -0,0 +1,15 @@ +# API reference + +The base URL of the REST API is + + ``` + https://datasets-server.huggingface.co + ``` + +It provides the following endpoints: + +| Endpoint | Description | Query parameters | +| --- | --- | --- | +| /splits GET | Get the list of configurations and splits of a dataset. | `dataset`: name of the dataset | +| /rows GET | Get the first rows of a dataset split. | - `dataset`: name of the dataset<br>- `config`: name of the config<br>- `split`: name of the split | +| /valid GET | Get the list of datasets hosted in the Hub and supported by the datasets server. | | diff --git a/docs/source/index.mdx b/docs/source/index.mdx new file mode 100644 index 00000000..612bc37d --- /dev/null +++ b/docs/source/index.mdx @@ -0,0 +1,10 @@ +# Datasets server + +The 🤗 Datasets server gives access to the contents, metadata and basic statistics of the [Hugging Face Hub datasets](https://huggingface.co/datasets) via a REST API. + +## History + +The API has originally been developed to provide data to the [Dataset viewer](https://huggingface.co/docs/hub/datasets-viewer) on the Hub. Indeed, the information about the datasets cannot be extracted live, and must be preprocessed and stored beforehand in order to later be accessed quickly on the Hub. + +We decided to make the API public to give programmatic access to the information about datasets. + diff --git a/docs/source/rows.mdx b/docs/source/rows.mdx new file mode 100644 index 00000000..22dd075d --- /dev/null +++ b/docs/source/rows.mdx @@ -0,0 +1,148 @@ +# First rows + +The endpoint `/rows` provides the columns and the first rows of a dataset [split](./splits): + + ``` + https://datasets-server.huggingface.co/rows?dataset={dataset_name}&config={config_name}&split={split_name} + ``` + +The first 100 rows, or all the rows if the split contains less than 100 rows, are returned. The list of columns contain the data type. + +For example, here are the columns and the first rows of the `duorc` / `SelfRC` train split. + +https://datasets-server.huggingface.co/rows?dataset=duorc&config=SelfRC&split=train + +```json +{ + "columns": [ + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "column_idx": 0, + "column": { "name": "plot_id", "type": "STRING" } + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "column_idx": 1, + "column": { "name": "plot", "type": "STRING" } + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "column_idx": 2, + "column": { "name": "title", "type": "STRING" } + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "column_idx": 3, + "column": { "name": "question_id", "type": "STRING" } + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "column_idx": 4, + "column": { "name": "question", "type": "STRING" } + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "column_idx": 5, + "column": { "name": "answers", "type": "JSON" } + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "column_idx": 6, + "column": { "name": "no_answer", "type": "BOOL" } + } + ], + "rows": [ + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "row_idx": 0, + "row": { + "plot_id": "/m/03vyhn", + "plot": "200 years in the future, Mars has been colonized by a high-tech company.\nMelanie Ballard (Natasha Henstridge) arrives by train to a Mars mining camp which has cut all communication links with the company headquarters. She's not alone, as she is with a group of fellow police officers. They find the mining camp deserted except for a person in the prison, Desolation Williams (Ice Cube), who seems to laugh about them because they are all going to die. They were supposed to take Desolation to headquarters, but decide to explore first to find out what happened.They find a man inside an encapsulated mining car, who tells them not to open it. However, they do and he tries to kill them. One of the cops witnesses strange men with deep scarred and heavily tattooed faces killing the remaining survivors. The cops realise they need to leave the place fast.Desolation explains that the miners opened a kind of Martian construction in the soil which unleashed red dust. Those who breathed that dust became violent psychopaths who started to build weapons and kill the uninfected. They changed genetically, becoming distorted but much stronger.The cops and Desolation leave the prison with difficulty, and devise a plan to kill all the genetically modified ex-miners on the way out. However, the plan goes awry, and only Melanie and Desolation reach headquarters alive. Melanie realises that her bosses won't ever believe her. However, the red dust eventually arrives to headquarters, and Melanie and Desolation need to fight once again.", + "title": "Ghosts of Mars", + "question_id": "b440de7d-9c3f-841c-eaec-a14bdff950d1", + "question": "How did the police arrive at the Mars mining camp?", + "answers": ["They arrived by train."], + "no_answer": false + }, + "truncated_cells": [] + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "row_idx": 1, + "row": { + "plot_id": "/m/03vyhn", + "plot": "200 years in the future, Mars has been colonized by a high-tech company.\nMelanie Ballard (Natasha Henstridge) arrives by train to a Mars mining camp which has cut all communication links with the company headquarters. She's not alone, as she is with a group of fellow police officers. They find the mining camp deserted except for a person in the prison, Desolation Williams (Ice Cube), who seems to laugh about them because they are all going to die. They were supposed to take Desolation to headquarters, but decide to explore first to find out what happened.They find a man inside an encapsulated mining car, who tells them not to open it. However, they do and he tries to kill them. One of the cops witnesses strange men with deep scarred and heavily tattooed faces killing the remaining survivors. The cops realise they need to leave the place fast.Desolation explains that the miners opened a kind of Martian construction in the soil which unleashed red dust. Those who breathed that dust became violent psychopaths who started to build weapons and kill the uninfected. They changed genetically, becoming distorted but much stronger.The cops and Desolation leave the prison with difficulty, and devise a plan to kill all the genetically modified ex-miners on the way out. However, the plan goes awry, and only Melanie and Desolation reach headquarters alive. Melanie realises that her bosses won't ever believe her. However, the red dust eventually arrives to headquarters, and Melanie and Desolation need to fight once again.", + "title": "Ghosts of Mars", + "question_id": "a9f95c0d-121f-3ca9-1595-d497dc8bc56c", + "question": "Who has colonized Mars 200 years in the future?", + "answers": [ + "A high-tech company has colonized Mars 200 years in the future." + ], + "no_answer": false + }, + "truncated_cells": [] + }, + ... +``` + +## Truncated responses + +When the response size for 100 rows is too big, the last rows are removed until the response size is under 1MB. + +If even the first rows generate a response that does not fit within the limit, the content of the cells themselves is truncated and converted to a string. In this case, the truncated cells are listed in the `truncated_cells` field. + +See for example the [`ett`](https://huggingface.co/datasets/ett/viewer/m2/test) dataset: only 10 rows are returned, and the content of two of the columns are truncated. + +https://datasets-server.huggingface.co/rows?dataset=ett&config=m2&split=test + +```json + ... + "rows": [ + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 0, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + }, + { + "dataset": "ett", + "config": "m2", + "split": "test", + "row_idx": 1, + "row": { + "start": 1467331200.0, + "target": "[38.6619987487793,38.222999572753906,37.34400177001953,37.124000549316406,37.124000549316406,36.9039", + "feat_static_cat": [0], + "feat_dynamic_real": "[[41.130001068115234,39.62200164794922,38.86800003051758,35.518001556396484,37.52799987792969,37.611", + "item_id": "OT" + }, + "truncated_cells": ["target", "feat_dynamic_real"] + } + ... +``` diff --git a/docs/source/splits.mdx b/docs/source/splits.mdx new file mode 100644 index 00000000..a00e75e0 --- /dev/null +++ b/docs/source/splits.mdx @@ -0,0 +1,69 @@ +# Splits + +A dataset generally contains multiple *[splits](https://huggingface.co/docs/datasets/load_hub#splits)*, a specific subset of a dataset like `train` and `test`. The dataset can also contain *[configurations](https://huggingface.co/docs/datasets/load_hub#configurations)*, a sub-dataset of the larger dataset. + +See the [documentation](https://huggingface.co/docs/datasets) of the [🤗 Datasets](https://github.com/huggingface/datasets) library to read more in depth about the concepts. + +To get the list of splits and configurations of a dataset: + + ``` + https://datasets-server.huggingface.co/splits?dataset={dataset_name} + ``` + +<Tip warning={true}> + Currently, the API only returns rows of the <a href="https://huggingface.co/docs/datasets/stream">"streamable" datasets</a>. By loading a dataset in streaming mode, the first rows can be extracted without downloading the whole dataset. +</Tip> + + +For example, the [duorc](https://huggingface.co/datasets/duorc) dataset has six splits and two configurations: + +https://datasets-server.huggingface.co/splits?dataset=duorc + +```json +{ + "splits": [ + { + "dataset": "duorc", + "config": "SelfRC", + "split": "train", + "num_bytes": 239852925, + "num_examples": 60721 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "validation", + "num_bytes": 51662575, + "num_examples": 12961 + }, + { + "dataset": "duorc", + "config": "SelfRC", + "split": "test", + "num_bytes": 49142766, + "num_examples": 12559 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "train", + "num_bytes": 496683105, + "num_examples": 69524 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "validation", + "num_bytes": 106510545, + "num_examples": 15591 + }, + { + "dataset": "duorc", + "config": "ParaphraseRC", + "split": "test", + "num_bytes": 115215816, + "num_examples": 15857 + } + ] +} +``` diff --git a/docs/source/valid.mdx b/docs/source/valid.mdx new file mode 100644 index 00000000..e955e5ae --- /dev/null +++ b/docs/source/valid.mdx @@ -0,0 +1,25 @@ +# Valid datasets + +An error may be returned if an issue occurs during extraction of the [splits](./splits) or first [rows](./rows) of some datasets. + +The `/valid` endpoints gives the list of the Hub datasets that work without an error: + + ``` + https://datasets-server.huggingface.co/valid + ``` + +The response looks like: + +https://datasets-server.huggingface.co/valid + +```json +{ + "valid": [ + "0n1xus/codexglue", + "0n1xus/pytorrent-standalone", + "0x7194633/rupile", + "51la5/keyword-extraction", + ... + ] +} +```
f2f57064bf40f21b134a8d0f74418b695434a711
Sylvain Lesage
2022-06-23T15:14:10
fix: 🐛 set the modules cache inside /tmp (#418)
diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl index 8b6001e1..df6d86f2 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl @@ -10,3 +10,3 @@ - # note: HF_MODULES_CACHE is not set to a shared directory - # we let "datasets" find a directory by itself: we want a different cache for the modules for each worker - # and the size should remain so small that we don't need to worry about putting it on an external storage + - name: HF_MODULES_CACHE + value: "/tmp/modules-cache" + # the size should remain so small that we don't need to worry about putting it on an external storage diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/splits-worker/_container.tpl index bec258b0..106da368 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/splits-worker/_container.tpl @@ -11,2 +11,3 @@ - # we let "datasets" find a directory by itself: we want a different cache for the modules for each worker - # and the size should remain so small that we don't need to worry about putting it on an external storage + - name: HF_MODULES_CACHE + value: "/tmp/modules-cache" + # the size should remain so small that we don't need to worry about putting it on an external storage
ec95bbc0810bfc36767a3b41d27bcd1f57ac6af5
Sylvain Lesage
2022-06-23T10:18:56
Don't share the cache for the datasets modules (#414)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index c8feb88a..9bdd9c69 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -5 +5 @@ - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2eb2e30", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-184e10b", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2eb2e30" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-184e10b" diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl index 06eeaeba..8b6001e1 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl @@ -10,2 +10,4 @@ - - name: HF_MODULES_CACHE - value: "{{ .Values.datasetsWorker.cacheDirectory }}/modules" + # note: HF_MODULES_CACHE is not set to a shared directory + # we let "datasets" find a directory by itself: we want a different cache for the modules for each worker + # and the size should remain so small that we don't need to worry about putting it on an external storage + # see https://github.com/huggingface/datasets-server/issues/248 diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/splits-worker/_container.tpl index 1db1da39..bec258b0 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/splits-worker/_container.tpl @@ -10,2 +10,4 @@ - - name: HF_MODULES_CACHE - value: "{{ .Values.splitsWorker.cacheDirectory }}/modules" + # note: HF_MODULES_CACHE is not set to a shared directory + # we let "datasets" find a directory by itself: we want a different cache for the modules for each worker + # and the size should remain so small that we don't need to worry about putting it on an external storage + # see https://github.com/huggingface/datasets-server/issues/248 diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 1aad9851..a64782d7 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -114 +114 @@ datasetsWorker: - # Directory of the "datasets" library cache (both for modules and datasets) + # Directory of the "datasets" library cache (for the datasets, not the modules) @@ -158 +158 @@ splitsWorker: - # Directory of the "datasets" library cache (both for modules and datasets) + # Directory of the "datasets" library cache (for the datasets, not the modules) diff --git a/services/worker/src/worker/models/dataset.py b/services/worker/src/worker/models/dataset.py index 3b8d0565..1aee02fe 100644 --- a/services/worker/src/worker/models/dataset.py +++ b/services/worker/src/worker/models/dataset.py @@ -4 +4 @@ from typing import List, Optional -from datasets import DownloadMode, get_dataset_config_names, get_dataset_split_names +from datasets import get_dataset_config_names, get_dataset_split_names @@ -18,3 +18 @@ def get_dataset_split_full_names(dataset_name: str, hf_token: Optional[str] = No - for config_name in get_dataset_config_names( - dataset_name, download_mode=DownloadMode.FORCE_REDOWNLOAD, use_auth_token=hf_token - ) + for config_name in get_dataset_config_names(dataset_name, use_auth_token=hf_token) diff --git a/services/worker/src/worker/models/info.py b/services/worker/src/worker/models/info.py index 19e12be8..5e2e148a 100644 --- a/services/worker/src/worker/models/info.py +++ b/services/worker/src/worker/models/info.py @@ -4 +4 @@ from typing import Any, Dict, Optional -from datasets import DatasetInfo, DownloadMode, get_dataset_config_info +from datasets import DatasetInfo, get_dataset_config_info @@ -18 +17,0 @@ def get_info(dataset_name: str, config_name: str, hf_token: Optional[str] = None - download_mode=DownloadMode.FORCE_REDOWNLOAD, diff --git a/services/worker/src/worker/models/row.py b/services/worker/src/worker/models/row.py index b83c59aa..9e9a72d0 100644 --- a/services/worker/src/worker/models/row.py +++ b/services/worker/src/worker/models/row.py @@ -5 +5 @@ from typing import Any, Dict, List, Optional -from datasets import Dataset, DownloadMode, IterableDataset, load_dataset +from datasets import Dataset, IterableDataset, load_dataset @@ -32 +31,0 @@ def get_rows( - download_mode=DownloadMode.FORCE_REDOWNLOAD, diff --git a/tools/docker-compose-datasets-server-from-local-code.yml b/tools/docker-compose-datasets-server-from-local-code.yml index e22300b7..d75ec9ad 100644 --- a/tools/docker-compose-datasets-server-from-local-code.yml +++ b/tools/docker-compose-datasets-server-from-local-code.yml @@ -47,0 +48 @@ services: + - datasets-cache:/datasets-cache:rw @@ -49,0 +51 @@ services: + HF_DATASETS_CACHE: "/datasets-cache" @@ -61,0 +64 @@ services: + - datasets-cache:/datasets-cache:rw @@ -63,0 +67 @@ services: + HF_DATASETS_CACHE: "/datasets-cache" @@ -96,0 +101 @@ volumes: + datasets-cache: diff --git a/tools/docker-compose-datasets-server-from-remote-images.yml b/tools/docker-compose-datasets-server-from-remote-images.yml index 46c2c9f0..953f845f 100644 --- a/tools/docker-compose-datasets-server-from-remote-images.yml +++ b/tools/docker-compose-datasets-server-from-remote-images.yml @@ -44,0 +45 @@ services: + - datasets-cache:/datasets-cache:rw @@ -46,0 +48 @@ services: + HF_DATASETS_CACHE: "/datasets-cache" @@ -56,0 +59 @@ services: + - datasets-cache:/datasets-cache:rw @@ -58,0 +62 @@ services: + HF_DATASETS_CACHE: "/datasets-cache" @@ -88,0 +93 @@ volumes: + datasets-cache:
7dc1ebc6650fe02b2f006a2e661aad7e11dfd8ba
Sylvain Lesage
2022-06-22T06:48:28
Fix stale (#411)
diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index 3f3df896..4a75f0d7 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -88,2 +88,2 @@ def test_bug_empty_split(): - # - the dataset is processed again, and the splits are marked as STALLED - # - as STALLED, they are thus returned with an empty content, instead of an error message + # - the dataset is processed again, and the splits are marked as STALE + # - they are thus returned with an empty content, instead of an error message @@ -167 +167 @@ def test_png_image(): - response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + response = poll_rows_until_split_process_has_finished(dataset, config, split, 60 * 3) diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index dfaa08ae..c8feb88a 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,3 +3,3 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-3327d8f", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-9592dc1", - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-bbb12fe", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-2eb2e30", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-2eb2e30", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2eb2e30", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-bbb12fe" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-2eb2e30" diff --git a/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl new file mode 100644 index 00000000..6ae05135 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.8.tar.gz b/libs/libcache/dist/libcache-0.1.8.tar.gz new file mode 100644 index 00000000..57229dd2 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.8.tar.gz differ diff --git a/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py b/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py index 03ac0f60..5e4ee4e6 100644 --- a/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py +++ b/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py @@ -9 +8,0 @@ from pymongo import MongoClient -from libcache.cache import Status @@ -137 +136 @@ splits_coll.update_many({}, {"$set": {"rows_response": get_empty_rows_response() -for split in splits_coll.find({"status": {"$in": [Status.VALID.value, Status.STALLED.value]}}): +for split in splits_coll.find({"status": {"$in": ["valid", "stalled"]}}): diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index b6231873..009514b7 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index 4e946c8e..5fb0731b 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -63 +63,2 @@ class Status(enum.Enum): - STALLED = "stalled" + STALE = "stale" + DEPRECATED_STALLED = "stalled" @@ -221 +222 @@ def upsert_dataset(dataset_name: str, new_split_full_names: List[SplitFullName]) - create_or_mark_split_as_stalled(split_full_name, split_idx) + create_or_mark_split_as_stale(split_full_name, split_idx) @@ -301 +302 @@ def create_empty_dataset(dataset_name: str): -def create_or_mark_dataset_as_stalled(dataset_name: str): +def create_or_mark_dataset_as_stale(dataset_name: str): @@ -304 +305 @@ def create_or_mark_dataset_as_stalled(dataset_name: str): - mark_dataset_as_stalled(dataset_name) + mark_dataset_as_stale(dataset_name) @@ -309,3 +310,3 @@ def create_or_mark_dataset_as_stalled(dataset_name: str): -def mark_dataset_as_stalled(dataset_name: str): - DbDataset.objects(dataset_name=dataset_name).update(status=Status.STALLED) - logger.debug(f"marked dataset '{dataset_name}' as stalled") +def mark_dataset_as_stale(dataset_name: str): + DbDataset.objects(dataset_name=dataset_name).update(status=Status.STALE) + logger.debug(f"marked dataset '{dataset_name}' as stale") @@ -314 +315 @@ def mark_dataset_as_stalled(dataset_name: str): -def create_or_mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): +def create_or_mark_split_as_stale(split_full_name: SplitFullName, split_idx: int): @@ -327 +328 @@ def create_or_mark_split_as_stalled(split_full_name: SplitFullName, split_idx: i - mark_split_as_stalled(split_full_name, split_idx) + mark_split_as_stale(split_full_name, split_idx) @@ -332 +333 @@ def create_or_mark_split_as_stalled(split_full_name: SplitFullName, split_idx: i -def mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): +def mark_split_as_stale(split_full_name: SplitFullName, split_idx: int): @@ -337 +338 @@ def mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): - status=Status.STALLED, split_idx=split_idx + status=Status.STALE, split_idx=split_idx @@ -339 +340 @@ def mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): - logger.debug(f"dataset '{dataset_name}': marked split {split_name} in config {config_name} as stalled") + logger.debug(f"dataset '{dataset_name}': marked split {split_name} in config {config_name} as stale") @@ -345 +346,3 @@ def list_split_full_names_to_refresh(dataset_name: str): - for split in DbSplit.objects(dataset_name=dataset_name, status__in=[Status.EMPTY, Status.STALLED]) + for split in DbSplit.objects( + dataset_name=dataset_name, status__in=[Status.EMPTY, Status.STALE, Status.DEPRECATED_STALLED] + ) @@ -355 +358 @@ def should_dataset_be_refreshed(dataset_name: str) -> bool: - return dataset.status in [Status.STALLED, Status.EMPTY] + return dataset.status in [Status.STALE, Status.DEPRECATED_STALLED, Status.EMPTY] @@ -417,2 +420,2 @@ def get_rows_response( -def is_dataset_valid_or_stalled(dataset: DbDataset) -> bool: - if dataset.status not in [Status.VALID, Status.STALLED]: +def is_dataset_valid_or_stale(dataset: DbDataset) -> bool: + if dataset.status not in [Status.VALID, Status.STALE, Status.DEPRECATED_STALLED]: @@ -422 +425 @@ def is_dataset_valid_or_stalled(dataset: DbDataset) -> bool: - return any(split.status in [Status.VALID, Status.STALLED] for split in splits) + return any(split.status in [Status.VALID, Status.STALE, Status.DEPRECATED_STALLED] for split in splits) @@ -425 +428 @@ def is_dataset_valid_or_stalled(dataset: DbDataset) -> bool: -def is_dataset_name_valid_or_stalled(dataset_name: str) -> bool: +def is_dataset_name_valid_or_stale(dataset_name: str) -> bool: @@ -428 +431 @@ def is_dataset_name_valid_or_stalled(dataset_name: str) -> bool: - return is_dataset_valid_or_stalled(dataset) + return is_dataset_valid_or_stale(dataset) @@ -467 +470 @@ def get_datasets_count_by_cache_status(dataset_names: List[str]) -> CountByCache -def get_valid_or_stalled_dataset_names() -> List[str]: +def get_valid_or_stale_dataset_names() -> List[str]: @@ -469 +472 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - # - the dataset is valid or stalled + # - the dataset is valid or stale @@ -471 +474 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - DbDataset.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") + DbDataset.objects(status__in=[Status.VALID, Status.STALE, Status.DEPRECATED_STALLED]).distinct("dataset_name") @@ -473 +476 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - # - at least one of its splits is valid or stalled + # - at least one of its splits is valid or stale @@ -475 +478 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - DbSplit.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") + DbSplit.objects(status__in=[Status.VALID, Status.STALE, Status.DEPRECATED_STALLED]).distinct("dataset_name") @@ -491 +494 @@ class CountByStatus(TypedDict): - stalled: int + stale: int @@ -503 +506 @@ def get_entries_count_by_status(entries: QuerySet[AnyDb]) -> CountByStatus: - "stalled": entries(status=Status.STALLED.value).count(), + "stale": entries(status__in=[Status.STALE, Status.DEPRECATED_STALLED]).count(), @@ -530 +533 @@ def get_datasets_reports_with_error() -> List[DatasetCacheReport]: -def get_datasets_reports_with_status(status: Status) -> List[DatasetCacheReport]: +def get_datasets_reports_with_status(status_name: str, status_list: List[Status]) -> List[DatasetCacheReport]: @@ -532,2 +535,2 @@ def get_datasets_reports_with_status(status: Status) -> List[DatasetCacheReport] - {"dataset": d.dataset_name, "status": status.value, "error": None} - for d in DbDataset.objects(status=status).only("dataset_name") + {"dataset": d.dataset_name, "status": status_name, "error": None} + for d in DbDataset.objects(status__in=status_list).only("dataset_name") @@ -540 +543 @@ class DatasetCacheReportsByStatus(TypedDict): - stalled: List[DatasetCacheReport] + stale: List[DatasetCacheReport] @@ -547 +550 @@ def get_datasets_reports_by_status() -> DatasetCacheReportsByStatus: - "empty": get_datasets_reports_with_status(Status.EMPTY), + "empty": get_datasets_reports_with_status("empty", [Status.EMPTY]), @@ -549,2 +552,2 @@ def get_datasets_reports_by_status() -> DatasetCacheReportsByStatus: - "stalled": get_datasets_reports_with_status(Status.STALLED), - "valid": get_datasets_reports_with_status(Status.VALID), + "stale": get_datasets_reports_with_status("stale", [Status.STALE, Status.DEPRECATED_STALLED]), + "valid": get_datasets_reports_with_status("valid", [Status.VALID]), @@ -575 +578 @@ def get_splits_reports_with_error() -> List[SplitCacheReport]: -def get_splits_reports_with_status(status: Status) -> List[SplitCacheReport]: +def get_splits_reports_with_status(status_name: str, status_list: List[Status]) -> List[SplitCacheReport]: @@ -581 +584 @@ def get_splits_reports_with_status(status: Status) -> List[SplitCacheReport]: - "status": status.value, + "status": status_name, @@ -584 +587 @@ def get_splits_reports_with_status(status: Status) -> List[SplitCacheReport]: - for d in DbSplit.objects(status=status).only("dataset_name", "config_name", "split_name") + for d in DbSplit.objects(status__in=status_list).only("dataset_name", "config_name", "split_name") @@ -591 +594 @@ class SplitCacheReportsByStatus(TypedDict): - stalled: List[SplitCacheReport] + stale: List[SplitCacheReport] @@ -597 +600 @@ def get_splits_reports_by_status() -> SplitCacheReportsByStatus: - "empty": list(get_splits_reports_with_status(Status.EMPTY)), + "empty": list(get_splits_reports_with_status("empty", [Status.EMPTY])), @@ -599,2 +602,2 @@ def get_splits_reports_by_status() -> SplitCacheReportsByStatus: - "stalled": get_splits_reports_with_status(Status.STALLED), - "valid": get_splits_reports_with_status(Status.VALID), + "stale": get_splits_reports_with_status("stale", [Status.STALE, Status.DEPRECATED_STALLED]), + "valid": get_splits_reports_with_status("valid", [Status.VALID]), diff --git a/libs/libcache/tests/test_cache.py b/libs/libcache/tests/test_cache.py index 357e4cc7..e99a0f6b 100644 --- a/libs/libcache/tests/test_cache.py +++ b/libs/libcache/tests/test_cache.py @@ -18 +18 @@ from libcache.cache import ( - get_valid_or_stalled_dataset_names, + get_valid_or_stale_dataset_names, @@ -108 +108 @@ def test_valid() -> None: - assert get_valid_or_stalled_dataset_names() == [] + assert get_valid_or_stale_dataset_names() == [] @@ -114 +114 @@ def test_valid() -> None: - assert get_valid_or_stalled_dataset_names() == [] + assert get_valid_or_stale_dataset_names() == [] @@ -128 +128 @@ def test_valid() -> None: - assert get_valid_or_stalled_dataset_names() == ["test_dataset"] + assert get_valid_or_stale_dataset_names() == ["test_dataset"] @@ -138 +138 @@ def test_valid() -> None: - assert get_valid_or_stalled_dataset_names() == ["test_dataset"] + assert get_valid_or_stale_dataset_names() == ["test_dataset"] @@ -142 +142 @@ def test_valid() -> None: - assert get_valid_or_stalled_dataset_names() == ["test_dataset"] + assert get_valid_or_stale_dataset_names() == ["test_dataset"] @@ -156 +156 @@ def test_valid() -> None: - assert get_valid_or_stalled_dataset_names() == ["test_dataset", "test_dataset2"] + assert get_valid_or_stale_dataset_names() == ["test_dataset", "test_dataset2"] @@ -160 +160 @@ def test_count_by_status() -> None: - assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 0} + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 0} @@ -166,2 +166,2 @@ def test_count_by_status() -> None: - assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} - assert get_splits_count_by_status() == {"empty": 1, "error": 0, "stalled": 0, "valid": 0} + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 1} + assert get_splits_count_by_status() == {"empty": 1, "error": 0, "stale": 0, "valid": 0} @@ -181 +181 @@ def test_count_by_status() -> None: - assert get_splits_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} + assert get_splits_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 1} diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index d11a7a72..fa74f01d 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -157 +157 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# TODO: add status (valid/error/stalled) to the finished jobs +# TODO: add status (valid/error/stale) to the finished jobs @@ -159 +159 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# TODO: how to avoid deadlocks (a worker has taken the job, but never finished)? stalled, hours +# TODO: how to avoid deadlocks (a worker has taken the job, but never finished)? stale, hours diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 8bbcd34f..87f68084 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" @@ -471 +471 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" @@ -1203 +1203 @@ python-versions = "3.9.6" -content-hash = "d692d8c053f9c2477d0cae5715326f3f39afe69ecf7959538b82a783d5fac6ce" +content-hash = "bf5d7c51a7a1702a1800d7988cde63986bb6420138fb56624f2d4ef6725fc2ad" @@ -1473 +1473 @@ libcache = [ - {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, + {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:42399a1d94bcfd96a7acde10cbfc9f9a46bcbb1133a534b28c9743f1b68f9243"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 4d2579e0..eed83581 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } diff --git a/services/api/README.md b/services/api/README.md index 1c1e0301..47998f2d 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -77 +77 @@ Responses: - "stalled": [], + "stale": [], @@ -119 +119 @@ Responses: - "stalled": [], + "stale": [], @@ -130 +130 @@ Beware: a "dataset" is considered valid if it has fetched correctly the configs -> Give the list of the valid datasets. Here, a dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stalled cache entries are considered valid. +> Give the list of the valid datasets. Here, a dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stale cache entries are considered valid. @@ -151 +151 @@ Responses: -> Tells if a dataset is valid. A dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stalled cache entries are considered valid. +> Tells if a dataset is valid. A dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stale cache entries are considered valid. @@ -203 +203 @@ The meaning is the following: -- "valid": the list of splits and the 100 first rows of every split are available (maybe stalled) +- "valid": the list of splits and the 100 first rows of every split are available (maybe stale) @@ -638 +638 @@ cache_entries_total{cache="datasets",status="error"} 0.0 -cache_entries_total{cache="datasets",status="stalled"} 0.0 +cache_entries_total{cache="datasets",status="stale"} 0.0 @@ -642 +642 @@ cache_entries_total{cache="splits",status="error"} 0.0 -cache_entries_total{cache="splits",status="stalled"} 0.0 +cache_entries_total{cache="splits",status="stale"} 0.0 diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 91253fa1..5007df27 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" @@ -1202 +1202 @@ python-versions = "3.9.6" -content-hash = "8bd13b68a6f58fba46b9ae50db3226f2722efc408bb5b5a037f877918ba6b79c" +content-hash = "8156ee01736958f5cce646740853f7d4d5767be75def3be021ff17df67fefe43" @@ -1472 +1472 @@ libcache = [ - {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, + {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:42399a1d94bcfd96a7acde10cbfc9f9a46bcbb1133a534b28c9743f1b68f9243"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index ed248694..c5a720cd 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } diff --git a/services/api/src/api/routes/valid.py b/services/api/src/api/routes/valid.py index 9005bf57..10b8ddd1 100644 --- a/services/api/src/api/routes/valid.py +++ b/services/api/src/api/routes/valid.py @@ -5,2 +5,2 @@ from libcache.cache import ( - get_valid_or_stalled_dataset_names, - is_dataset_name_valid_or_stalled, + get_valid_or_stale_dataset_names, + is_dataset_name_valid_or_stale, @@ -21 +21 @@ async def valid_datasets_endpoint(_: Request) -> Response: - "valid": get_valid_or_stalled_dataset_names(), + "valid": get_valid_or_stale_dataset_names(), @@ -34 +34 @@ async def is_valid_endpoint(request: Request) -> Response: - "valid": is_dataset_name_valid_or_stalled(dataset_name), + "valid": is_dataset_name_valid_or_stale(dataset_name), diff --git a/services/api/src/api/routes/webhook.py b/services/api/src/api/routes/webhook.py index 7ac030c6..5541218f 100644 --- a/services/api/src/api/routes/webhook.py +++ b/services/api/src/api/routes/webhook.py @@ -4 +4 @@ from typing import Any, Optional, TypedDict -from libcache.cache import create_or_mark_dataset_as_stalled, delete_dataset_cache +from libcache.cache import create_or_mark_dataset_as_stale, delete_dataset_cache @@ -50 +50 @@ def try_to_update(id: Optional[str]) -> None: - create_or_mark_dataset_as_stalled(dataset_name) + create_or_mark_dataset_as_stale(dataset_name) diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index fc2b3c88..2c984ea0 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -6,2 +6,2 @@ from libcache.cache import ( - create_or_mark_dataset_as_stalled, - create_or_mark_split_as_stalled, + create_or_mark_dataset_as_stale, + create_or_mark_split_as_stale, @@ -47 +47 @@ def clean_mongo_databases() -> None: -# assert "stalled" in datasets +# assert "stale" in datasets @@ -237 +237 @@ def test_dataset_cache_refreshing(client: TestClient) -> None: - create_or_mark_dataset_as_stalled(dataset) + create_or_mark_dataset_as_stale(dataset) @@ -249 +249 @@ def test_split_cache_refreshing(client: TestClient) -> None: - create_or_mark_split_as_stalled({"dataset_name": dataset, "config_name": config, "split_name": split}, 0) + create_or_mark_split_as_stale({"dataset_name": dataset, "config_name": config, "split_name": split}, 0) diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index eaf5f1ab..0f10aef1 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -435 +435 @@ benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "tr -dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] +dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] @@ -441 +441 @@ tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] @@ -931,0 +932 @@ url = "https://github.com/kpu/kenlm/archive/master.zip" + @@ -967 +968 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" @@ -982 +983 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" @@ -2533 +2534 @@ python-versions = "3.9.6" -content-hash = "e2fd4945bfc7f1d30e1ca624a7724e9bf4ce24090358032c221ddde90adfcd18" +content-hash = "f4a610f87a510885605ef7e025e9e5d52994617d35f151a4007a846298d3dbc3" @@ -3336 +3337 @@ libcache = [ - {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, + {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:42399a1d94bcfd96a7acde10cbfc9f9a46bcbb1133a534b28c9743f1b68f9243"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 624c798b..43fe083b 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -18 +18 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false }
0744f26d676b1c247c121587a5f7359f8afff25e
Mario Šaško
2022-06-21T16:24:53
Fallback to other image formats if JPEG generation fails (#410)
diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index 2ec22257..3f3df896 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -152,0 +153,24 @@ def test_timestamp_column(): + + +def test_png_image(): + # this test ensures that an image is saved as PNG if it cannot be saved as PNG + # https://github.com/huggingface/datasets-server/issues/191 + dataset = "wikimedia/wit_base" + config = "wikimedia--wit_base" + split = "train" + response = requests.post(f"{URL}/webhook", json={"update": f"datasets/{dataset}"}) + assert response.status_code == 200 + + response = poll_splits_until_dataset_process_has_finished(dataset, 60) + assert response.status_code == 200 + + response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + assert response.status_code == 200 + json = response.json() + assert json["columns"][0]["column"]["type"] == "RELATIVE_IMAGE_URL" + assert ( + json["rows"][0]["row"]["image"] == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/0/image/image.jpg" + ) + assert ( + json["rows"][20]["row"]["image"] == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/20/image/image.png" + ) diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 65c1d20d..dfaa08ae 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -5 +5 @@ - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-bbb12fe", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-bbb12fe" diff --git a/services/worker/src/worker/models/column/image.py b/services/worker/src/worker/models/column/image.py index 3ae9a51d..a3fe4f9e 100644 --- a/services/worker/src/worker/models/column/image.py +++ b/services/worker/src/worker/models/column/image.py @@ -44,2 +44,12 @@ class ImageColumn(CommonColumn): - # this function can raise, we don't catch it - return create_image_file(dataset_name, config_name, split_name, row_idx, self.name, "image.jpg", value) + # attempt to generate one of the supported formats; if unsuccessful, throw an error + for ext in [".jpg", ".png"]: + try: + return create_image_file( + dataset_name, config_name, split_name, row_idx, self.name, f"image{ext}", value + ) + except OSError: + # if wrong format, try the next one, see https://github.com/huggingface/datasets-server/issues/191 + # OSError: cannot write mode P as JPEG + # OSError: cannot write mode RGBA as JPEG + continue + raise ValueError("Image cannot be written as JPEG or PNG") diff --git a/services/worker/tests/models/test_split.py b/services/worker/tests/models/test_split.py index 8ad12f02..76894794 100644 --- a/services/worker/tests/models/test_split.py +++ b/services/worker/tests/models/test_split.py @@ -160,0 +161,50 @@ def test_timestamp() -> None: +def test_image() -> None: + # see https://github.com/huggingface/datasets-server/issues/191 + split = get_split( + "wikimedia/wit_base", + "wikimedia--wit_base", + "train", + HF_TOKEN, + rows_max_number=21, + ) + assert split["rows_response"]["columns"][0]["column"]["type"] == "RELATIVE_IMAGE_URL" + assert ( + split["rows_response"]["rows"][0]["row"]["image"] + == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/0/image/image.jpg" + ) + assert ( + split["rows_response"]["rows"][20]["row"]["image"] + == "assets/wikimedia/wit_base/--/wikimedia--wit_base/train/20/image/image.png" + ) + + split = get_split( + "Chris1/GTA5", + "Chris1--GTA5", + "train", + HF_TOKEN, + rows_max_number=1, + ) + assert split["rows_response"]["columns"][0]["column"]["type"] == "RELATIVE_IMAGE_URL" + assert split["rows_response"]["columns"][1]["column"]["type"] == "RELATIVE_IMAGE_URL" + assert ( + split["rows_response"]["rows"][0]["row"]["image"] + == "assets/Chris1/GTA5/--/Chris1--GTA5/train/0/image/image.jpg" + ) + assert ( + split["rows_response"]["rows"][0]["row"]["semantic_segmentation"] + == "assets/Chris1/GTA5/--/Chris1--GTA5/train/0/semantic_segmentation/image.png" + ) + + split = get_split( + "huggan/few-shot-skulls", + "huggan--few-shot-skulls", + "train", + HF_TOKEN, + rows_max_number=52, + ) + assert ( + split["rows_response"]["rows"][51]["row"]["image"] + == "assets/huggan/few-shot-skulls/--/huggan--few-shot-skulls/train/51/image/image.png" + ) + +
827caa5c75ef39662de5e977c8185acf00df3a3c
Sylvain Lesage
2022-06-21T14:57:06
Revert two commits (#409)
diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index b0ce690a..2ec22257 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -88,2 +88,2 @@ def test_bug_empty_split(): - # - the dataset is processed again, and the splits are marked as STALE - # - they are thus returned with an empty content, instead of an error message + # - the dataset is processed again, and the splits are marked as STALLED + # - as STALLED, they are thus returned with an empty content, instead of an error message diff --git a/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl deleted file mode 100644 index 9f4cbbee..00000000 Binary files a/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl and /dev/null differ diff --git a/libs/libcache/dist/libcache-0.1.8.tar.gz b/libs/libcache/dist/libcache-0.1.8.tar.gz deleted file mode 100644 index ead7cee3..00000000 Binary files a/libs/libcache/dist/libcache-0.1.8.tar.gz and /dev/null differ diff --git a/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py b/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py index 5e4ee4e6..03ac0f60 100644 --- a/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py +++ b/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py @@ -8,0 +9 @@ from pymongo import MongoClient +from libcache.cache import Status @@ -136 +137 @@ splits_coll.update_many({}, {"$set": {"rows_response": get_empty_rows_response() -for split in splits_coll.find({"status": {"$in": ["valid", "stalled"]}}): +for split in splits_coll.find({"status": {"$in": [Status.VALID.value, Status.STALLED.value]}}): diff --git a/libs/libcache/migrations/20220621_cache_rename_stalled_into_stale.py b/libs/libcache/migrations/20220621_cache_rename_stalled_into_stale.py deleted file mode 100644 index 86375c2f..00000000 --- a/libs/libcache/migrations/20220621_cache_rename_stalled_into_stale.py +++ /dev/null @@ -1,10 +0,0 @@ -from pymongo import MongoClient - -from ._utils import MONGO_CACHE_DATABASE, MONGO_URL - -client = MongoClient(MONGO_URL) -db = client[MONGO_CACHE_DATABASE] - -# migrate -db.datasets.update_many({"status": "stalled"}, {"$set": {"status": "stale"}}) -db.splits.update_many({"status": "stalled"}, {"$set": {"status": "stale"}}) diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 009514b7..b6231873 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.8" +version = "0.1.7" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index 331e5211..4e946c8e 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -63 +63 @@ class Status(enum.Enum): - STALE = "stale" + STALLED = "stalled" @@ -310,2 +310,2 @@ def mark_dataset_as_stalled(dataset_name: str): - DbDataset.objects(dataset_name=dataset_name).update(status=Status.STALE) - logger.debug(f"marked dataset '{dataset_name}' as stale") + DbDataset.objects(dataset_name=dataset_name).update(status=Status.STALLED) + logger.debug(f"marked dataset '{dataset_name}' as stalled") @@ -337 +337 @@ def mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): - status=Status.STALE, split_idx=split_idx + status=Status.STALLED, split_idx=split_idx @@ -339 +339 @@ def mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): - logger.debug(f"dataset '{dataset_name}': marked split {split_name} in config {config_name} as stale") + logger.debug(f"dataset '{dataset_name}': marked split {split_name} in config {config_name} as stalled") @@ -345 +345 @@ def list_split_full_names_to_refresh(dataset_name: str): - for split in DbSplit.objects(dataset_name=dataset_name, status__in=[Status.EMPTY, Status.STALE]) + for split in DbSplit.objects(dataset_name=dataset_name, status__in=[Status.EMPTY, Status.STALLED]) @@ -355 +355 @@ def should_dataset_be_refreshed(dataset_name: str) -> bool: - return dataset.status in [Status.STALE, Status.EMPTY] + return dataset.status in [Status.STALLED, Status.EMPTY] @@ -418 +418 @@ def is_dataset_valid_or_stalled(dataset: DbDataset) -> bool: - if dataset.status not in [Status.VALID, Status.STALE]: + if dataset.status not in [Status.VALID, Status.STALLED]: @@ -422 +422 @@ def is_dataset_valid_or_stalled(dataset: DbDataset) -> bool: - return any(split.status in [Status.VALID, Status.STALE] for split in splits) + return any(split.status in [Status.VALID, Status.STALLED] for split in splits) @@ -469,3 +469,5 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - # - the dataset is valid or stale - candidate_dataset_names = set(DbDataset.objects(status__in=[Status.VALID, Status.STALE]).distinct("dataset_name")) - # - at least one of its splits is valid or stale + # - the dataset is valid or stalled + candidate_dataset_names = set( + DbDataset.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") + ) + # - at least one of its splits is valid or stalled @@ -473 +475 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - DbSplit.objects(status__in=[Status.VALID, Status.STALE]).distinct("dataset_name") + DbSplit.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") @@ -489 +491 @@ class CountByStatus(TypedDict): - stale: int + stalled: int @@ -501 +503 @@ def get_entries_count_by_status(entries: QuerySet[AnyDb]) -> CountByStatus: - "stale": entries(status=Status.STALE.value).count(), + "stalled": entries(status=Status.STALLED.value).count(), @@ -538 +540 @@ class DatasetCacheReportsByStatus(TypedDict): - stale: List[DatasetCacheReport] + stalled: List[DatasetCacheReport] @@ -547 +549 @@ def get_datasets_reports_by_status() -> DatasetCacheReportsByStatus: - "stale": get_datasets_reports_with_status(Status.STALE), + "stalled": get_datasets_reports_with_status(Status.STALLED), @@ -589 +591 @@ class SplitCacheReportsByStatus(TypedDict): - stale: List[SplitCacheReport] + stalled: List[SplitCacheReport] @@ -597 +599 @@ def get_splits_reports_by_status() -> SplitCacheReportsByStatus: - "stale": get_splits_reports_with_status(Status.STALE), + "stalled": get_splits_reports_with_status(Status.STALLED), diff --git a/libs/libcache/tests/test_cache.py b/libs/libcache/tests/test_cache.py index 2421753e..357e4cc7 100644 --- a/libs/libcache/tests/test_cache.py +++ b/libs/libcache/tests/test_cache.py @@ -160 +160 @@ def test_count_by_status() -> None: - assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 0} + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 0} @@ -166,2 +166,2 @@ def test_count_by_status() -> None: - assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 1} - assert get_splits_count_by_status() == {"empty": 1, "error": 0, "stale": 0, "valid": 0} + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} + assert get_splits_count_by_status() == {"empty": 1, "error": 0, "stalled": 0, "valid": 0} @@ -181 +181 @@ def test_count_by_status() -> None: - assert get_splits_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 1} + assert get_splits_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index fa74f01d..d11a7a72 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -157 +157 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# TODO: add status (valid/error/stale) to the finished jobs +# TODO: add status (valid/error/stalled) to the finished jobs @@ -159 +159 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# TODO: how to avoid deadlocks (a worker has taken the job, but never finished)? stale, hours +# TODO: how to avoid deadlocks (a worker has taken the job, but never finished)? stalled, hours diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index f9311862..8bbcd34f 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.8" +version = "0.1.7" @@ -471 +471 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" @@ -1203 +1203 @@ python-versions = "3.9.6" -content-hash = "bf5d7c51a7a1702a1800d7988cde63986bb6420138fb56624f2d4ef6725fc2ad" +content-hash = "d692d8c053f9c2477d0cae5715326f3f39afe69ecf7959538b82a783d5fac6ce" @@ -1473 +1473 @@ libcache = [ - {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:e788928611f73e1964a5a3b923ccd60754732625b2d50887c72e5c5b1829dc1a"}, + {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index eed83581..4d2579e0 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } diff --git a/services/api/README.md b/services/api/README.md index 47998f2d..1c1e0301 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -77 +77 @@ Responses: - "stale": [], + "stalled": [], @@ -119 +119 @@ Responses: - "stale": [], + "stalled": [], @@ -130 +130 @@ Beware: a "dataset" is considered valid if it has fetched correctly the configs -> Give the list of the valid datasets. Here, a dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stale cache entries are considered valid. +> Give the list of the valid datasets. Here, a dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stalled cache entries are considered valid. @@ -151 +151 @@ Responses: -> Tells if a dataset is valid. A dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stale cache entries are considered valid. +> Tells if a dataset is valid. A dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stalled cache entries are considered valid. @@ -203 +203 @@ The meaning is the following: -- "valid": the list of splits and the 100 first rows of every split are available (maybe stale) +- "valid": the list of splits and the 100 first rows of every split are available (maybe stalled) @@ -638 +638 @@ cache_entries_total{cache="datasets",status="error"} 0.0 -cache_entries_total{cache="datasets",status="stale"} 0.0 +cache_entries_total{cache="datasets",status="stalled"} 0.0 @@ -642 +642 @@ cache_entries_total{cache="splits",status="error"} 0.0 -cache_entries_total{cache="splits",status="stale"} 0.0 +cache_entries_total{cache="splits",status="stalled"} 0.0 diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 9b585550..91253fa1 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.8" +version = "0.1.7" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" @@ -1202 +1202 @@ python-versions = "3.9.6" -content-hash = "8156ee01736958f5cce646740853f7d4d5767be75def3be021ff17df67fefe43" +content-hash = "8bd13b68a6f58fba46b9ae50db3226f2722efc408bb5b5a037f877918ba6b79c" @@ -1472 +1472 @@ libcache = [ - {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:e788928611f73e1964a5a3b923ccd60754732625b2d50887c72e5c5b1829dc1a"}, + {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index c5a720cd..ed248694 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index 669f1645..fc2b3c88 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -47 +47 @@ def clean_mongo_databases() -> None: -# assert "stale" in datasets +# assert "stalled" in datasets diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index c969e04f..eaf5f1ab 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -932 +931,0 @@ url = "https://github.com/kpu/kenlm/archive/master.zip" - @@ -968 +967 @@ name = "libcache" -version = "0.1.8" +version = "0.1.7" @@ -983 +982 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" @@ -2534 +2533 @@ python-versions = "3.9.6" -content-hash = "f4a610f87a510885605ef7e025e9e5d52994617d35f151a4007a846298d3dbc3" +content-hash = "e2fd4945bfc7f1d30e1ca624a7724e9bf4ce24090358032c221ddde90adfcd18" @@ -3337 +3336 @@ libcache = [ - {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:e788928611f73e1964a5a3b923ccd60754732625b2d50887c72e5c5b1829dc1a"}, + {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 43fe083b..624c798b 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -18 +18 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false }
8f745fae870eb4ac481be6dab0458d9b4829ddfe
Sylvain Lesage
2022-06-21T13:30:30
feat: 🎸 revert docker images to previous state (#408)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 5d2db0c2..65c1d20d 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,3 +3,3 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-881b941", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-881b941", - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-881b941", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-3327d8f", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-9592dc1", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-881b941" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f"
426bb0cc16c804ec2da263ef8be23228ad36ecf6
Sylvain Lesage
2022-06-21T11:53:06
fix: 🐛 rename "stalled" into "stale" (#406)
diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index 2ec22257..b0ce690a 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -88,2 +88,2 @@ def test_bug_empty_split(): - # - the dataset is processed again, and the splits are marked as STALLED - # - as STALLED, they are thus returned with an empty content, instead of an error message + # - the dataset is processed again, and the splits are marked as STALE + # - they are thus returned with an empty content, instead of an error message diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 65c1d20d..5d2db0c2 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,3 +3,3 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-3327d8f", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-9592dc1", - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-881b941", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-881b941", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-881b941", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-881b941" diff --git a/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl new file mode 100644 index 00000000..9f4cbbee Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.8-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.8.tar.gz b/libs/libcache/dist/libcache-0.1.8.tar.gz new file mode 100644 index 00000000..ead7cee3 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.8.tar.gz differ diff --git a/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py b/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py index 03ac0f60..5e4ee4e6 100644 --- a/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py +++ b/libs/libcache/migrations/20220408_cache_remove_dbrow_dbcolumn.py @@ -9 +8,0 @@ from pymongo import MongoClient -from libcache.cache import Status @@ -137 +136 @@ splits_coll.update_many({}, {"$set": {"rows_response": get_empty_rows_response() -for split in splits_coll.find({"status": {"$in": [Status.VALID.value, Status.STALLED.value]}}): +for split in splits_coll.find({"status": {"$in": ["valid", "stalled"]}}): diff --git a/libs/libcache/migrations/20220621_cache_rename_stalled_into_stale.py b/libs/libcache/migrations/20220621_cache_rename_stalled_into_stale.py new file mode 100644 index 00000000..86375c2f --- /dev/null +++ b/libs/libcache/migrations/20220621_cache_rename_stalled_into_stale.py @@ -0,0 +1,10 @@ +from pymongo import MongoClient + +from ._utils import MONGO_CACHE_DATABASE, MONGO_URL + +client = MongoClient(MONGO_URL) +db = client[MONGO_CACHE_DATABASE] + +# migrate +db.datasets.update_many({"status": "stalled"}, {"$set": {"status": "stale"}}) +db.splits.update_many({"status": "stalled"}, {"$set": {"status": "stale"}}) diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index b6231873..009514b7 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index 4e946c8e..331e5211 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -63 +63 @@ class Status(enum.Enum): - STALLED = "stalled" + STALE = "stale" @@ -310,2 +310,2 @@ def mark_dataset_as_stalled(dataset_name: str): - DbDataset.objects(dataset_name=dataset_name).update(status=Status.STALLED) - logger.debug(f"marked dataset '{dataset_name}' as stalled") + DbDataset.objects(dataset_name=dataset_name).update(status=Status.STALE) + logger.debug(f"marked dataset '{dataset_name}' as stale") @@ -337 +337 @@ def mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): - status=Status.STALLED, split_idx=split_idx + status=Status.STALE, split_idx=split_idx @@ -339 +339 @@ def mark_split_as_stalled(split_full_name: SplitFullName, split_idx: int): - logger.debug(f"dataset '{dataset_name}': marked split {split_name} in config {config_name} as stalled") + logger.debug(f"dataset '{dataset_name}': marked split {split_name} in config {config_name} as stale") @@ -345 +345 @@ def list_split_full_names_to_refresh(dataset_name: str): - for split in DbSplit.objects(dataset_name=dataset_name, status__in=[Status.EMPTY, Status.STALLED]) + for split in DbSplit.objects(dataset_name=dataset_name, status__in=[Status.EMPTY, Status.STALE]) @@ -355 +355 @@ def should_dataset_be_refreshed(dataset_name: str) -> bool: - return dataset.status in [Status.STALLED, Status.EMPTY] + return dataset.status in [Status.STALE, Status.EMPTY] @@ -418 +418 @@ def is_dataset_valid_or_stalled(dataset: DbDataset) -> bool: - if dataset.status not in [Status.VALID, Status.STALLED]: + if dataset.status not in [Status.VALID, Status.STALE]: @@ -422 +422 @@ def is_dataset_valid_or_stalled(dataset: DbDataset) -> bool: - return any(split.status in [Status.VALID, Status.STALLED] for split in splits) + return any(split.status in [Status.VALID, Status.STALE] for split in splits) @@ -469,5 +469,3 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - # - the dataset is valid or stalled - candidate_dataset_names = set( - DbDataset.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") - ) - # - at least one of its splits is valid or stalled + # - the dataset is valid or stale + candidate_dataset_names = set(DbDataset.objects(status__in=[Status.VALID, Status.STALE]).distinct("dataset_name")) + # - at least one of its splits is valid or stale @@ -475 +473 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - DbSplit.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") + DbSplit.objects(status__in=[Status.VALID, Status.STALE]).distinct("dataset_name") @@ -491 +489 @@ class CountByStatus(TypedDict): - stalled: int + stale: int @@ -503 +501 @@ def get_entries_count_by_status(entries: QuerySet[AnyDb]) -> CountByStatus: - "stalled": entries(status=Status.STALLED.value).count(), + "stale": entries(status=Status.STALE.value).count(), @@ -540 +538 @@ class DatasetCacheReportsByStatus(TypedDict): - stalled: List[DatasetCacheReport] + stale: List[DatasetCacheReport] @@ -549 +547 @@ def get_datasets_reports_by_status() -> DatasetCacheReportsByStatus: - "stalled": get_datasets_reports_with_status(Status.STALLED), + "stale": get_datasets_reports_with_status(Status.STALE), @@ -591 +589 @@ class SplitCacheReportsByStatus(TypedDict): - stalled: List[SplitCacheReport] + stale: List[SplitCacheReport] @@ -599 +597 @@ def get_splits_reports_by_status() -> SplitCacheReportsByStatus: - "stalled": get_splits_reports_with_status(Status.STALLED), + "stale": get_splits_reports_with_status(Status.STALE), diff --git a/libs/libcache/tests/test_cache.py b/libs/libcache/tests/test_cache.py index 357e4cc7..2421753e 100644 --- a/libs/libcache/tests/test_cache.py +++ b/libs/libcache/tests/test_cache.py @@ -160 +160 @@ def test_count_by_status() -> None: - assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 0} + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 0} @@ -166,2 +166,2 @@ def test_count_by_status() -> None: - assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} - assert get_splits_count_by_status() == {"empty": 1, "error": 0, "stalled": 0, "valid": 0} + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 1} + assert get_splits_count_by_status() == {"empty": 1, "error": 0, "stale": 0, "valid": 0} @@ -181 +181 @@ def test_count_by_status() -> None: - assert get_splits_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} + assert get_splits_count_by_status() == {"empty": 0, "error": 0, "stale": 0, "valid": 1} diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index d11a7a72..fa74f01d 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -157 +157 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# TODO: add status (valid/error/stalled) to the finished jobs +# TODO: add status (valid/error/stale) to the finished jobs @@ -159 +159 @@ AnyJob = TypeVar("AnyJob", DatasetJob, SplitJob) # Must be DatasetJob or SplitJ -# TODO: how to avoid deadlocks (a worker has taken the job, but never finished)? stalled, hours +# TODO: how to avoid deadlocks (a worker has taken the job, but never finished)? stale, hours diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 8bbcd34f..f9311862 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" @@ -471 +471 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" @@ -1203 +1203 @@ python-versions = "3.9.6" -content-hash = "d692d8c053f9c2477d0cae5715326f3f39afe69ecf7959538b82a783d5fac6ce" +content-hash = "bf5d7c51a7a1702a1800d7988cde63986bb6420138fb56624f2d4ef6725fc2ad" @@ -1473 +1473 @@ libcache = [ - {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, + {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:e788928611f73e1964a5a3b923ccd60754732625b2d50887c72e5c5b1829dc1a"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 4d2579e0..eed83581 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } diff --git a/services/api/README.md b/services/api/README.md index 1c1e0301..47998f2d 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -77 +77 @@ Responses: - "stalled": [], + "stale": [], @@ -119 +119 @@ Responses: - "stalled": [], + "stale": [], @@ -130 +130 @@ Beware: a "dataset" is considered valid if it has fetched correctly the configs -> Give the list of the valid datasets. Here, a dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stalled cache entries are considered valid. +> Give the list of the valid datasets. Here, a dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stale cache entries are considered valid. @@ -151 +151 @@ Responses: -> Tells if a dataset is valid. A dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stalled cache entries are considered valid. +> Tells if a dataset is valid. A dataset is considered valid if `/splits` returns a valid response, and if `/rows` returns a valid response for _at least one split_. Note that stale cache entries are considered valid. @@ -203 +203 @@ The meaning is the following: -- "valid": the list of splits and the 100 first rows of every split are available (maybe stalled) +- "valid": the list of splits and the 100 first rows of every split are available (maybe stale) @@ -638 +638 @@ cache_entries_total{cache="datasets",status="error"} 0.0 -cache_entries_total{cache="datasets",status="stalled"} 0.0 +cache_entries_total{cache="datasets",status="stale"} 0.0 @@ -642 +642 @@ cache_entries_total{cache="splits",status="error"} 0.0 -cache_entries_total{cache="splits",status="stalled"} 0.0 +cache_entries_total{cache="splits",status="stale"} 0.0 diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 91253fa1..9b585550 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" @@ -1202 +1202 @@ python-versions = "3.9.6" -content-hash = "8bd13b68a6f58fba46b9ae50db3226f2722efc408bb5b5a037f877918ba6b79c" +content-hash = "8156ee01736958f5cce646740853f7d4d5767be75def3be021ff17df67fefe43" @@ -1472 +1472 @@ libcache = [ - {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, + {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:e788928611f73e1964a5a3b923ccd60754732625b2d50887c72e5c5b1829dc1a"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index ed248694..c5a720cd 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false } diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index fc2b3c88..669f1645 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -47 +47 @@ def clean_mongo_databases() -> None: -# assert "stalled" in datasets +# assert "stale" in datasets diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index eaf5f1ab..c969e04f 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -931,0 +932 @@ url = "https://github.com/kpu/kenlm/archive/master.zip" + @@ -967 +968 @@ name = "libcache" -version = "0.1.7" +version = "0.1.8" @@ -982 +983 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl" @@ -2533 +2534 @@ python-versions = "3.9.6" -content-hash = "e2fd4945bfc7f1d30e1ca624a7724e9bf4ce24090358032c221ddde90adfcd18" +content-hash = "f4a610f87a510885605ef7e025e9e5d52994617d35f151a4007a846298d3dbc3" @@ -3336 +3337 @@ libcache = [ - {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, + {file = "libcache-0.1.8-py3-none-any.whl", hash = "sha256:e788928611f73e1964a5a3b923ccd60754732625b2d50887c72e5c5b1829dc1a"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 624c798b..43fe083b 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -18 +18 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.8-py3-none-any.whl", develop = false }
fa5521cc7981f1fbbbed9e5b826bb1f8e4ca9bc3
Sylvain Lesage
2022-06-21T09:01:31
feat: 🎸 increase the log verbosity to help debug (#405)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 27347242..bd5a3a72 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -98,0 +99,2 @@ api: + # Log level + logLevel: "DEBUG" @@ -113,0 +116,3 @@ datasetsWorker: + # Log level + logLevel: "DEBUG" + @@ -144,0 +150 @@ admin: + appNumWorkers: "1" @@ -148 +153,0 @@ admin: - appNumWorkers: "1"
f99e108d7b4fd43498545a4a25d313f7bcd8f258
Sylvain Lesage
2022-06-16T17:39:46
feat: use new cache locations (to have empty ones) (#385)
diff --git a/infra/charts/datasets-server/templates/_helpers.tpl b/infra/charts/datasets-server/templates/_helpers.tpl index ef13e577..ba05c5a7 100644 --- a/infra/charts/datasets-server/templates/_helpers.tpl +++ b/infra/charts/datasets-server/templates/_helpers.tpl @@ -84,2 +84,2 @@ The cache/ subpath in the NFS -{{- define "cache.subpath" -}} -{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "cache" }} +{{- define "cache.datasets.subpath" -}} +{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "cache-datasets-2" }} @@ -93,2 +93,2 @@ The numba-cache/ subpath in the NFS -{{- define "numba.cache.subpath" -}} -{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "numba-cache" }} +{{- define "cache.numba.subpath" -}} +{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "cache-numba-2" }} @@ -102,2 +102,2 @@ The nginx-cache/ subpath in the NFS -{{- define "nginx.cache.subpath" -}} -{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "nginx-cache" }} +{{- define "cache.nginx.subpath" -}} +{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "cache-nginx-2" }} diff --git a/infra/charts/datasets-server/templates/_initContainerCache.tpl b/infra/charts/datasets-server/templates/_initContainerCache.tpl index baeae66a..92c26e23 100644 --- a/infra/charts/datasets-server/templates/_initContainerCache.tpl +++ b/infra/charts/datasets-server/templates/_initContainerCache.tpl @@ -12 +12 @@ - subPath: "{{ include "cache.subpath" . }}" + subPath: "{{ include "cache.datasets.subpath" . }}" diff --git a/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl b/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl index 6b4de3e6..09bdd172 100644 --- a/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl +++ b/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl @@ -12 +12 @@ - subPath: "{{ include "numba.cache.subpath" . }}" + subPath: "{{ include "cache.numba.subpath" . }}" diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl index 4224fd32..06eeaeba 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl @@ -72 +72 @@ - subPath: "{{ include "cache.subpath" . }}" + subPath: "{{ include "cache.datasets.subpath" . }}" @@ -77 +77 @@ - subPath: "{{ include "numba.cache.subpath" . }}" + subPath: "{{ include "cache.numba.subpath" . }}" diff --git a/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl b/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl index 3fdc928a..3af33f68 100644 --- a/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl +++ b/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl @@ -35 +35 @@ - subPath: "{{ include "nginx.cache.subpath" . }}" + subPath: "{{ include "cache.nginx.subpath" . }}" diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/splits-worker/_container.tpl index d8e1b2d9..1db1da39 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/splits-worker/_container.tpl @@ -72 +72 @@ - subPath: "{{ include "cache.subpath" . }}" + subPath: "{{ include "cache.datasets.subpath" . }}" @@ -77 +77 @@ - subPath: "{{ include "numba.cache.subpath" . }}" + subPath: "{{ include "cache.numba.subpath" . }}"
96dc3b1901f8a1ab4493177a29d65006730acacd
Sylvain Lesage
2022-06-16T15:41:11
feat: 🎸 adjust the prod resources (#383)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index f4c1699a..27347242 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -2,2 +2,4 @@ -# the nodes are 4 t3.2xlarge instances (8 vCPUs, 32 GiB), ie: -# 32 vCPUs and 128 GiB RAM are available (but no more than 8 cpus or 32 GiB for each pod) +# the nodes are up to 20 t3.2xlarge instances (8 vCPUs, 32 GiB), with autoscale +# (see https://github.com/huggingface/infra/pull/239/files) +# this means that we can get up to: +# 160 vCPUs and 640 GiB RAM are available (but no more than 8 cpus or 32 GiB for each pod) @@ -9,4 +11,5 @@ -# this lets 25 CPUs, and 123 GiB for the workers -# we will over-commit the resources by a factor 4 in order to get more workers -# available in case of burst of jobs (most of the jobs don't require much resources) -# so: 100 CPUs and 492 GiB RAM +# and for the workers: +# - datasets-worker: 1 CPUs, 30 GiB +# - splits-worker: 1 CPUs, 30 GiB +# We set the requested RAM to 8 GiB per worker, in order to trigger the autoscale. We should be able to +# launch 3 worker pods per node, taking the sidecars into account, it means 60 pods @@ -14,2 +17,7 @@ -# - datasets-worker: 4 workers -> 6 CPUs, 30 GiB -# - splits-worker: 12 workers -> 6 CPUs, 30 GiB +# Being optimistic about not all the pods having to increase their memory usage to 30 GiB at the same time, +# ie over-committing a bit, we can set up to 60 workers (dataset + split). +# +# For now, we have to scale manually with: +# kubectl scale --replicas=16 deploy/datasets-server-prod-datasets-worker +# or +# kubectl scale --replicas=32 deploy/datasets-server-prod-splits-worker @@ -70 +78 @@ reverseProxy: - cpu: 0.1 + cpu: 1 @@ -84 +92 @@ api: - cpu: 0.25 + cpu: 1 @@ -100,2 +108,2 @@ datasetsWorker: - cpu: 0.01 - memory: "1Gi" + cpu: 1 + memory: "8Gi" @@ -103 +111 @@ datasetsWorker: - cpu: 6 + cpu: 1 @@ -114,2 +122,2 @@ splitsWorker: - cpu: 0.01 - memory: "1Gi" + cpu: 1 + memory: "8Gi" @@ -117 +125 @@ splitsWorker: - cpu: 6 + cpu: 1 @@ -133 +141 @@ admin: - cpu: 0.01 + cpu: 1
2913352de8db0683264b2e62b496c31f27826f8f
Sylvain Lesage
2022-06-16T12:36:05
feat: 🎸 upgrade datasets (and dependencies) (#381)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 745ae9c0..65c1d20d 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -5 +5 @@ - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-3f61bbe", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-3f61bbe" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-4af5c4f" diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 5ec9dfb2..f4c1699a 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -24,2 +24,2 @@ storage: - server: "svm-0adb40782285e2ec6.fs-0220b222fb471f3b9.fsx.us-east-1.amazonaws.com" - # https://us-east-1.console.aws.amazon.com/fsx/home?region=us-east-1#file-system-details/fs-0220b222fb471f3b9 + server: "svm-0bd5fa426547fca22.fs-02050b8d555063cde.fsx.us-east-1.amazonaws.com" + # https://us-east-1.console.aws.amazon.com/fsx/home?region=us-east-1#file-system-details/fs-02050b8d555063cde diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index 7c42c1dc..eaf5f1ab 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -297 +297 @@ name = "certifi" -version = "2022.5.18.1" +version = "2022.6.15" @@ -408 +408 @@ name = "datasets" -version = "2.3.1" +version = "2.3.2" @@ -536 +536 @@ name = "elasticsearch" -version = "8.2.2" +version = "8.2.3" @@ -2533 +2533 @@ python-versions = "3.9.6" -content-hash = "30492acd03b58eb3ac5cd9a67be9d17aa8938eceb76c0a8e6a146ed8c0dea5ae" +content-hash = "e2fd4945bfc7f1d30e1ca624a7724e9bf4ce24090358032c221ddde90adfcd18" @@ -2824,2 +2824,2 @@ certifi = [ - {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, - {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, + {file = "certifi-2022.6.15-py3-none-any.whl", hash = "sha256:fe86415d55e84719d75f8b69414f6438ac3547d2078ab91b67e779ef69378412"}, + {file = "certifi-2022.6.15.tar.gz", hash = "sha256:84c85a9078b11105f04f3036a9482ae10e4621616db313fe045dd24743a0820d"}, @@ -3042,2 +3042,2 @@ datasets = [ - {file = "datasets-2.3.1-py3-none-any.whl", hash = "sha256:e66eeddf7a7786c3a071d0e702d6d62169a66366c9fdb4b1d640d8fa6ed5ad93"}, - {file = "datasets-2.3.1.tar.gz", hash = "sha256:250e5de053d99ac5cdc129c2a0c35c1a022361c774f1c40cbe1c4fa847fecfd6"}, + {file = "datasets-2.3.2-py3-none-any.whl", hash = "sha256:479d63940c31e01dba578a8a072fee45215a081c66f6d46659add84bc3e518ad"}, + {file = "datasets-2.3.2.tar.gz", hash = "sha256:d21c90473f2f83fd3f395c1c3e9a46ae0deeec0f987608bbf9ee33d935b9fcbe"}, @@ -3072,2 +3072,2 @@ elasticsearch = [ - {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, - {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, + {file = "elasticsearch-8.2.3-py3-none-any.whl", hash = "sha256:c0e1f72f09c41cbf61e9e953d016440e8873f38749297c0b8a2b2fcfe2aaaaf7"}, + {file = "elasticsearch-8.2.3.tar.gz", hash = "sha256:b48629c109cf1467ef0c4fce7345615cb1bb8955f30e3a013fc8e640e7720076"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 819a1866..624c798b 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -14 +14 @@ conllu = "^4.4.1" -datasets = { extras = ["audio", "vision"], version = "^2.3.1" } +datasets = { extras = ["audio", "vision"], version = "^2.3.2" }
e341e7bef94897d2082fa8621614cd2bd759352b
Sylvain Lesage
2022-06-15T13:50:21
fix: 🐛 fix the log name (#377)
diff --git a/services/admin/src/admin/scripts/refresh_cache.py b/services/admin/src/admin/scripts/refresh_cache.py index 74b50c34..9b17a3f1 100644 --- a/services/admin/src/admin/scripts/refresh_cache.py +++ b/services/admin/src/admin/scripts/refresh_cache.py @@ -20 +20 @@ def refresh_datasets_cache(dataset_names: List[str]) -> None: - logger = logging.getLogger("warm_cache") + logger = logging.getLogger("refresh_cache") @@ -27,2 +27,2 @@ if __name__ == "__main__": - init_logger(LOG_LEVEL, "warm_cache") - logger = logging.getLogger("warm_cache") + init_logger(LOG_LEVEL, "refresh_cache") + logger = logging.getLogger("refresh_cache")
3991247fcc3b8f60fe3b3fc7a5d387443235038e
Sylvain Lesage
2022-06-15T13:44:00
feat: 🎸 upgrade datasets to 2.3.1 (#375)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index f973bd70..745ae9c0 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3 +3 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-9592dc1", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-3327d8f", @@ -5 +5 @@ - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-a7d745e", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-3f61bbe", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-a7d745e" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-3f61bbe" diff --git a/services/admin/Makefile b/services/admin/Makefile index 03c30abf..43a33b98 100644 --- a/services/admin/Makefile +++ b/services/admin/Makefile @@ -28,0 +29,4 @@ cancel-started-dataset-jobs: +.PHONY: refresh-cache +refresh-cache: + poetry run python src/admin/scripts/refresh_cache.py + diff --git a/services/admin/src/admin/scripts/refresh_cache.py b/services/admin/src/admin/scripts/refresh_cache.py new file mode 100644 index 00000000..74b50c34 --- /dev/null +++ b/services/admin/src/admin/scripts/refresh_cache.py @@ -0,0 +1,31 @@ +import logging +from typing import List + +from dotenv import load_dotenv +from huggingface_hub import list_datasets # type: ignore +from libqueue.queue import add_dataset_job, connect_to_queue +from libutils.logger import init_logger + +from admin.config import LOG_LEVEL, MONGO_QUEUE_DATABASE, MONGO_URL + +# Load environment variables defined in .env, if any +load_dotenv() + + +def get_hf_dataset_names(): + return [str(dataset.id) for dataset in list_datasets(full=True)] + + +def refresh_datasets_cache(dataset_names: List[str]) -> None: + logger = logging.getLogger("warm_cache") + for dataset_name in dataset_names: + add_dataset_job(dataset_name) + logger.info(f"added a job to refresh '{dataset_name}'") + + +if __name__ == "__main__": + init_logger(LOG_LEVEL, "warm_cache") + logger = logging.getLogger("warm_cache") + connect_to_queue(MONGO_QUEUE_DATABASE, MONGO_URL) + refresh_datasets_cache(get_hf_dataset_names()) + logger.info("all the datasets of the Hub have been added to the queue to refresh the cache") diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index 1e613d4a..7c42c1dc 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -408 +408 @@ name = "datasets" -version = "2.2.2" +version = "2.3.1" @@ -416 +416 @@ aiohttp = "*" -dill = "<0.3.5" +dill = "<0.3.6" @@ -435 +435 @@ benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "tr -dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] +dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] @@ -441 +441 @@ tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore (==1.4.2)", "boto3 (==1.17.106)", "botocore (==1.20.106)", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "sentencepiece", "sacremoses", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "scikit-learn", "scipy", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] @@ -722 +722 @@ name = "google-auth" -version = "2.7.0" +version = "2.8.0" @@ -1474 +1474 @@ name = "proto-plus" -version = "1.20.5" +version = "1.20.6" @@ -1481 +1481 @@ python-versions = ">=3.6" -protobuf = ">=3.19.0,<4.0.0dev" +protobuf = ">=3.19.0,<5.0.0dev" @@ -2533 +2533 @@ python-versions = "3.9.6" -content-hash = "3fb305c5bd498a5db5f99f351c87024e2e8bdb828924741d6653311ceb129d06" +content-hash = "30492acd03b58eb3ac5cd9a67be9d17aa8938eceb76c0a8e6a146ed8c0dea5ae" @@ -3042,2 +3042,2 @@ datasets = [ - {file = "datasets-2.2.2-py3-none-any.whl", hash = "sha256:77caa6a0dfa534ed2f65043e357fcf13d7728ef8f0c352d6db072a7aaa2f3cdf"}, - {file = "datasets-2.2.2.tar.gz", hash = "sha256:995664a20d976681593ccd56a58bfb9eb2f91fc1014bd22ef046d953999c3009"}, + {file = "datasets-2.3.1-py3-none-any.whl", hash = "sha256:e66eeddf7a7786c3a071d0e702d6d62169a66366c9fdb4b1d640d8fa6ed5ad93"}, + {file = "datasets-2.3.1.tar.gz", hash = "sha256:250e5de053d99ac5cdc129c2a0c35c1a022361c774f1c40cbe1c4fa847fecfd6"}, @@ -3194,2 +3194,2 @@ google-auth = [ - {file = "google-auth-2.7.0.tar.gz", hash = "sha256:8a954960f852d5f19e6af14dd8e75c20159609e85d8db37e4013cc8c3824a7e1"}, - {file = "google_auth-2.7.0-py2.py3-none-any.whl", hash = "sha256:df549a1433108801b11bdcc0e312eaf0d5f0500db42f0523e4d65c78722e8475"}, + {file = "google-auth-2.8.0.tar.gz", hash = "sha256:819b70140d05501739e1387291d39f0de3b4dff3b00ae4aff8e7a05369957f89"}, + {file = "google_auth-2.8.0-py2.py3-none-any.whl", hash = "sha256:9b1da39ab8731c3061f36fefde9f8bb902dbee9eb28e3a67e8cfa7dc1be76227"}, @@ -3790,2 +3790,2 @@ proto-plus = [ - {file = "proto-plus-1.20.5.tar.gz", hash = "sha256:81794eb1be333c67986333948df70ebb8cdf538e039f8cfa92fd2a9d7176d405"}, - {file = "proto_plus-1.20.5-py3-none-any.whl", hash = "sha256:fa29fec8a91cf178bc1d8bf9263769421d2dba7787eae42b67235676e211c158"}, + {file = "proto-plus-1.20.6.tar.gz", hash = "sha256:449b4537e83f4776bd69051c4d776db8ffe3f9d0641f1e87b06c116eb94c90e9"}, + {file = "proto_plus-1.20.6-py3-none-any.whl", hash = "sha256:c6c43c3fcfc360fdab46b47e2e9e805ff56e13169f9f2e45caf88b6b593215ab"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 39c7109e..819a1866 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -14 +14 @@ conllu = "^4.4.1" -datasets = { extras = ["audio", "vision"], version = "^2.2.2" } +datasets = { extras = ["audio", "vision"], version = "^2.3.1" } diff --git a/services/worker/tests/models/test_split.py b/services/worker/tests/models/test_split.py index bb9cac4b..8ad12f02 100644 --- a/services/worker/tests/models/test_split.py +++ b/services/worker/tests/models/test_split.py @@ -104,8 +104,10 @@ def test_get_split() -> None: -def test_gated() -> None: - dataset_name = "severo/dummy_gated" - config_name = "severo--embellishments" - split_name = "train" - split = get_split(dataset_name, config_name, split_name, HF_TOKEN, rows_max_number=ROWS_MAX_NUMBER) - - assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER - assert split["rows_response"]["rows"][0]["row"]["year"] == "1855" +# disabled since the dataset has a problem unrelated to the gated status +# see https://github.com/huggingface/datasets-server/pull/375#issuecomment-1156425010 +# def test_gated() -> None: +# dataset_name = "severo/dummy_gated" +# config_name = "severo--embellishments" +# split_name = "train" +# split = get_split(dataset_name, config_name, split_name, HF_TOKEN, rows_max_number=ROWS_MAX_NUMBER) + +# assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER +# assert split["rows_response"]["rows"][0]["row"]["year"] == "1855"
c76882775286848f669f3abc4f2f6ba95ad133cf
Sylvain Lesage
2022-06-14T15:38:08
Add timestamp type (#374)
diff --git a/Makefile b/Makefile index e1426a51..4398c265 100644 --- a/Makefile +++ b/Makefile @@ -17,0 +18 @@ DOCKER_IMAGES := ./infra/charts/datasets-server/docker-images.yaml +include tools/DockerRemoteImages.mk diff --git a/e2e/Makefile b/e2e/Makefile index c116bf82..333d081e 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -13,0 +14 @@ include ../tools/Python.mk +include ../tools/DockerRemoteImages.mk diff --git a/e2e/poetry.lock b/e2e/poetry.lock index e03f8449..c2d2a593 100644 --- a/e2e/poetry.lock +++ b/e2e/poetry.lock @@ -66 +66 @@ name = "certifi" -version = "2021.10.8" +version = "2022.5.18.1" @@ -70 +70 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -236 +236 @@ name = "pbr" -version = "5.8.1" +version = "5.9.0" @@ -303 +303 @@ name = "pyparsing" -version = "3.0.8" +version = "3.0.9" @@ -343 +343 @@ name = "requests" -version = "2.27.1" +version = "2.28.0" @@ -347 +347 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" @@ -351,2 +351,2 @@ certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" @@ -356 +356 @@ urllib3 = ">=1.21.1,<1.27" -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -489,2 +489,2 @@ certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, @@ -573,2 +573,2 @@ pbr = [ - {file = "pbr-5.8.1-py2.py3-none-any.whl", hash = "sha256:27108648368782d07bbf1cb468ad2e2eeef29086affd14087a6d04b7de8af4ec"}, - {file = "pbr-5.8.1.tar.gz", hash = "sha256:66bc5a34912f408bb3925bf21231cb6f59206267b7f63f3503ef865c1a292e25"}, + {file = "pbr-5.9.0-py2.py3-none-any.whl", hash = "sha256:e547125940bcc052856ded43be8e101f63828c2d94239ffbe2b327ba3d5ccf0a"}, + {file = "pbr-5.9.0.tar.gz", hash = "sha256:e8dca2f4b43560edef58813969f52a56cef023146cbb8931626db80e6c1c4308"}, @@ -601,2 +601,2 @@ pyparsing = [ - {file = "pyparsing-3.0.8-py3-none-any.whl", hash = "sha256:ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06"}, - {file = "pyparsing-3.0.8.tar.gz", hash = "sha256:7bf433498c016c4314268d95df76c81b842a4cb2b276fa3312cfb1e1d85f6954"}, + {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, + {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, @@ -644,2 +644,2 @@ requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index 8400140e..2ec22257 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -1 +0,0 @@ -# import pytest @@ -130 +129 @@ def test_valid_after_two_datasets_processed(): - # at this moment no dataset has been processed + # at this moment various datasets have been processed @@ -131,0 +131,22 @@ def test_valid_after_two_datasets_processed(): + + +def test_timestamp_column(): + # this test replicates the bug with the Timestamp values, https://github.com/huggingface/datasets/issues/4413 + dataset = "ett" + config = "h1" + split = "train" + response = requests.post(f"{URL}/webhook", json={"update": f"datasets/{dataset}"}) + assert response.status_code == 200 + + response = poll_splits_until_dataset_process_has_finished(dataset, 60) + assert response.status_code == 200 + + response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + assert response.status_code == 200 + json = response.json() + TRUNCATED_TO_ONE_ROW = 1 + assert len(json["rows"]) == TRUNCATED_TO_ONE_ROW + assert json["rows"][0]["row"]["start"] == 1467331200.0 + assert json["columns"][0]["column"]["type"] == "TIMESTAMP" + assert json["columns"][0]["column"]["unit"] == "s" + assert json["columns"][0]["column"]["tz"] is None diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index bd86c663..f973bd70 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,3 +3,3 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-7bf1008", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-be3e543", - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-7bf1008", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-9592dc1", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-9592dc1", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-a7d745e", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-7bf1008" + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-a7d745e" diff --git a/libs/libcache/dist/libcache-0.1.7-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.7-py3-none-any.whl new file mode 100644 index 00000000..bc5f3e32 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.7-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.7.tar.gz b/libs/libcache/dist/libcache-0.1.7.tar.gz new file mode 100644 index 00000000..5c67ceec Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.7.tar.gz differ diff --git a/libs/libcache/poetry.lock b/libs/libcache/poetry.lock index 0eebf46d..2d86434f 100644 --- a/libs/libcache/poetry.lock +++ b/libs/libcache/poetry.lock @@ -50 +50 @@ name = "azure-core" -version = "1.24.0" +version = "1.24.1" @@ -181 +181 @@ name = "coverage" -version = "6.4" +version = "6.4.1" @@ -281 +281 @@ name = "elasticsearch" -version = "8.2.0" +version = "8.2.2" @@ -400 +400 @@ name = "libutils" -version = "0.1.1" +version = "0.1.2" @@ -413 +413 @@ type = "file" -url = "../libutils/dist/libutils-0.1.1-py3-none-any.whl" +url = "../libutils/dist/libutils-0.1.2-py3-none-any.whl" @@ -444 +444 @@ name = "msal" -version = "1.17.0" +version = "1.18.0" @@ -451 +451 @@ python-versions = "*" -cryptography = ">=0.6,<39" +cryptography = ">=0.6,<40" @@ -472 +472 @@ name = "msrest" -version = "0.6.21" +version = "0.7.1" @@ -476 +476 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -478,0 +479 @@ python-versions = "*" +azure-core = ">=1.24.0" @@ -485 +486 @@ requests-oauthlib = ">=0.5.0" -async = ["aiohttp (>=3.0)", "aiodns"] +async = ["aiodns", "aiohttp (>=3.0)"] @@ -534 +535 @@ name = "orjson" -version = "3.6.8" +version = "3.7.2" @@ -829 +830 @@ name = "regex" -version = "2022.4.24" +version = "2022.6.2" @@ -837 +838 @@ name = "requests" -version = "2.27.1" +version = "2.28.0" @@ -841 +842 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" @@ -845,2 +846,2 @@ certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" @@ -850 +851 @@ urllib3 = ">=1.21.1,<1.27" -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -1045 +1046 @@ python-versions = "3.9.6" -content-hash = "0e1d424c125b2c6d58846771e420eef7a20d8aac60e0dcf92c9cdf6f4a2efaa6" +content-hash = "9365f519efd0cf59fd0e21f88b4bbbd1ac1c78258d1ca994f1efb3b4820e0359" @@ -1065,2 +1066,2 @@ azure-core = [ - {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, - {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, + {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, + {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, @@ -1174,41 +1175,41 @@ coverage = [ - {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, - {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, - {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, - {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, - {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, - {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, - {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, - {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, - {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, - {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, - {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, - {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, - {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, - {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, - {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, - {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, - {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"}, + {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"}, + {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"}, + {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"}, + {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"}, + {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"}, + {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"}, + {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"}, + {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"}, + {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"}, + {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"}, + {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"}, @@ -1260,2 +1261,2 @@ elasticsearch = [ - {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, - {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, + {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, + {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, @@ -1299 +1300 @@ libutils = [ - {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, + {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, @@ -1314,2 +1315,2 @@ msal = [ - {file = "msal-1.17.0-py2.py3-none-any.whl", hash = "sha256:5a52d78e70d2c451e267c1e8c2342e4c06f495c75c859aeafd9260d3974f09fe"}, - {file = "msal-1.17.0.tar.gz", hash = "sha256:04e3cb7bb75c51f56d290381f23056207df1f3eb594ed03d38551f3b16d2a36e"}, + {file = "msal-1.18.0-py2.py3-none-any.whl", hash = "sha256:9c10e6cb32e0b6b8eaafc1c9a68bc3b2ff71505e0c5b8200799582d8b9f22947"}, + {file = "msal-1.18.0.tar.gz", hash = "sha256:576af55866038b60edbcb31d831325a1bd8241ed272186e2832968fd4717d202"}, @@ -1322,2 +1323,2 @@ msrest = [ - {file = "msrest-0.6.21-py2.py3-none-any.whl", hash = "sha256:c840511c845330e96886011a236440fafc2c9aff7b2df9c0a92041ee2dee3782"}, - {file = "msrest-0.6.21.tar.gz", hash = "sha256:72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8"}, + {file = "msrest-0.7.1-py3-none-any.whl", hash = "sha256:21120a810e1233e5e6cc7fe40b474eeb4ec6f757a15d7cf86702c369f9567c32"}, + {file = "msrest-0.7.1.zip", hash = "sha256:6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9"}, @@ -1382,32 +1383,33 @@ orjson = [ - {file = "orjson-3.6.8-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:3a287a650458de2211db03681b71c3e5cb2212b62f17a39df8ad99fc54855d0f"}, - {file = "orjson-3.6.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5204e25c12cea58e524fc82f7c27ed0586f592f777b33075a92ab7b3eb3687c2"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77e8386393add64f959c044e0fb682364fd0e611a6f477aa13f0e6a733bd6a28"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:279f2d2af393fdf8601020744cb206b91b54ad60fb8401e0761819c7bda1f4e4"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:c31c9f389be7906f978ed4192eb58a4b74a37ad60556a0b88ddc47c576697770"}, - {file = "orjson-3.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0db5c5a0c5b89f092d52f6e5a3701660a9d6ffa9e2968b3ce17c2bc4f5eb0414"}, - {file = "orjson-3.6.8-cp310-none-win_amd64.whl", hash = "sha256:eb22485847b9a0c4bbedc668df860126ac931edbed1d456cf41a59f3cb961ed8"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:1a5fe569310bc819279bd4d5f2c349910b104ed3207936246dd5d5e0b085e74a"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:ccb356a47ab1067cd3549847e9db1d279a63fe0482d315b3ffd6e7abef35ef77"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ab29c069c222248ce302a25855b4e1664f9436e8ae5a131fb0859daf31676d2b"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d2b5e4cba9e774ac011071d9d27760f97f4b8cd46003e971d122e712f971345"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:c311ec504414d22834d5b972a209619925b48263856a11a14d90230f9682d49c"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:a3dfec7950b90fb8d143743503ee53fa06b32e6068bdea792fc866284da3d71d"}, - {file = "orjson-3.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b890dbbada2cbb26eb29bd43a848426f007f094bb0758df10dfe7a438e1cb4b4"}, - {file = "orjson-3.6.8-cp37-none-win_amd64.whl", hash = "sha256:9143ae2c52771525be9ad11a7a8cc8e7fd75391b107e7e644a9e0050496f6b4f"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:33a82199fd42f6436f833e210ae5129c922a5c355629356ca7a8e82964da7285"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:90159ea8b9a5a2a98fa33dc7b421cfac4d2ae91ba5e1058f5909e7f059f6b467"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:656fbe15d9ef0733e740d9def78f4fdb4153102f4836ee774a05123499005931"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7be3be6153843e0f01351b1313a5ad4723595427680dac2dfff22a37e652ce02"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:dd24f66b6697ee7424f7da575ec6cbffc8ede441114d53470949cda4d97c6e56"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:b07c780f7345ecf5901356dc21dee0669defc489c38ce7b9ab0f5e008cc0385c"}, - {file = "orjson-3.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ea32015a5d8a4ce00d348a0de5dc7040e0ad58f970a8fcbb5713a1eac129e493"}, - {file = "orjson-3.6.8-cp38-none-win_amd64.whl", hash = "sha256:c5a3e382194c838988ec128a26b08aa92044e5e055491cc4056142af0c1c54d7"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:83a8424e857ae1bf53530e88b4eb2f16ca2b489073b924e655f1575cacd7f52a"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:81e1a6a2d67f15007dadacbf9ba5d3d79237e5e33786c028557fe5a2b72f1c9a"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:137b539881c77866eba86ff6a11df910daf2eb9ab8f1acae62f879e83d7c38af"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cbd358f3b3ad539a27e36900e8e7d172d0e1b72ad9dd7d69544dcbc0f067ee7"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:6ab94701542d40b90903ecfc339333f458884979a01cb9268bc662cc67a5f6d8"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:32b6f26593a9eb606b40775826beb0dac152e3d224ea393688fced036045a821"}, - {file = "orjson-3.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:afd9e329ebd3418cac3cd747769b1d52daa25fa672bbf414ab59f0e0881b32b9"}, - {file = "orjson-3.6.8-cp39-none-win_amd64.whl", hash = "sha256:0c89b419914d3d1f65a1b0883f377abe42a6e44f6624ba1c63e8846cbfc2fa60"}, - {file = "orjson-3.6.8.tar.gz", hash = "sha256:e19d23741c5de13689bb316abfccea15a19c264e3ec8eb332a5319a583595ace"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, + {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, + {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, + {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, + {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, + {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, + {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, + {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, + {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, + {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, @@ -1674,74 +1676,74 @@ regex = [ - {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, - {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, - {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, - {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, - {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, - {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, - {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, - {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, - {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, - {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, - {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, - {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, - {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, - {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, - {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, + {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, + {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, + {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, + {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, + {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, + {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, + {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, + {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, + {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, + {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, + {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, + {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, + {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, @@ -1750,2 +1752,2 @@ requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, @@ -1770,0 +1773,2 @@ sentencepiece = [ + {file = "sentencepiece-0.1.96-cp310-cp310-win32.whl", hash = "sha256:3028699bdb2fb0230804f3b8a617fe3af22f5c5a56416419b31a7da5e7bf83bc"}, + {file = "sentencepiece-0.1.96-cp310-cp310-win_amd64.whl", hash = "sha256:203443a7bd4295b6a3695787235abe0e77d4c369d7156a6b9a397c540a38bd27"}, diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 8744f1e2..b6231873 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.6" +version = "0.1.7" @@ -9 +9 @@ appdirs = "^1.4.4" -libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } diff --git a/libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl new file mode 100644 index 00000000..72b52e4b Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.6.tar.gz b/libs/libqueue/dist/libqueue-0.1.6.tar.gz new file mode 100644 index 00000000..d97f3795 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.6.tar.gz differ diff --git a/libs/libqueue/poetry.lock b/libs/libqueue/poetry.lock index 213b5cb2..708dcecf 100644 --- a/libs/libqueue/poetry.lock +++ b/libs/libqueue/poetry.lock @@ -42 +42 @@ name = "azure-core" -version = "1.24.0" +version = "1.24.1" @@ -173 +173 @@ name = "coverage" -version = "6.4" +version = "6.4.1" @@ -273 +273 @@ name = "elasticsearch" -version = "8.2.0" +version = "8.2.2" @@ -392 +392 @@ name = "libutils" -version = "0.1.1" +version = "0.1.2" @@ -405 +405 @@ type = "file" -url = "../libutils/dist/libutils-0.1.1-py3-none-any.whl" +url = "../libutils/dist/libutils-0.1.2-py3-none-any.whl" @@ -436 +436 @@ name = "msal" -version = "1.17.0" +version = "1.18.0" @@ -443 +443 @@ python-versions = "*" -cryptography = ">=0.6,<39" +cryptography = ">=0.6,<40" @@ -464 +464 @@ name = "msrest" -version = "0.6.21" +version = "0.7.1" @@ -468 +468 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -470,0 +471 @@ python-versions = "*" +azure-core = ">=1.24.0" @@ -477 +478 @@ requests-oauthlib = ">=0.5.0" -async = ["aiohttp (>=3.0)", "aiodns"] +async = ["aiodns", "aiohttp (>=3.0)"] @@ -526 +527 @@ name = "orjson" -version = "3.6.8" +version = "3.7.2" @@ -821 +822 @@ name = "regex" -version = "2022.4.24" +version = "2022.6.2" @@ -829 +830 @@ name = "requests" -version = "2.27.1" +version = "2.28.0" @@ -833 +834 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" @@ -837,2 +838,2 @@ certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" @@ -842 +843 @@ urllib3 = ">=1.21.1,<1.27" -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -1037 +1038 @@ python-versions = "3.9.6" -content-hash = "b0a6fb4304268c8a9b74444928e062ec88a2daa8e3683e3de7e1166fbe586643" +content-hash = "56b81e2d7de8c7354959914550f736e23605aa13c21867b2bc4927357a832765" @@ -1053,2 +1054,2 @@ azure-core = [ - {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, - {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, + {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, + {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, @@ -1162,41 +1163,41 @@ coverage = [ - {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, - {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, - {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, - {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, - {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, - {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, - {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, - {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, - {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, - {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, - {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, - {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, - {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, - {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, - {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, - {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, - {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"}, + {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"}, + {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"}, + {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"}, + {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"}, + {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"}, + {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"}, + {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"}, + {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"}, + {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"}, + {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"}, + {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"}, @@ -1248,2 +1249,2 @@ elasticsearch = [ - {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, - {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, + {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, + {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, @@ -1287 +1288 @@ libutils = [ - {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, + {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, @@ -1302,2 +1303,2 @@ msal = [ - {file = "msal-1.17.0-py2.py3-none-any.whl", hash = "sha256:5a52d78e70d2c451e267c1e8c2342e4c06f495c75c859aeafd9260d3974f09fe"}, - {file = "msal-1.17.0.tar.gz", hash = "sha256:04e3cb7bb75c51f56d290381f23056207df1f3eb594ed03d38551f3b16d2a36e"}, + {file = "msal-1.18.0-py2.py3-none-any.whl", hash = "sha256:9c10e6cb32e0b6b8eaafc1c9a68bc3b2ff71505e0c5b8200799582d8b9f22947"}, + {file = "msal-1.18.0.tar.gz", hash = "sha256:576af55866038b60edbcb31d831325a1bd8241ed272186e2832968fd4717d202"}, @@ -1310,2 +1311,2 @@ msrest = [ - {file = "msrest-0.6.21-py2.py3-none-any.whl", hash = "sha256:c840511c845330e96886011a236440fafc2c9aff7b2df9c0a92041ee2dee3782"}, - {file = "msrest-0.6.21.tar.gz", hash = "sha256:72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8"}, + {file = "msrest-0.7.1-py3-none-any.whl", hash = "sha256:21120a810e1233e5e6cc7fe40b474eeb4ec6f757a15d7cf86702c369f9567c32"}, + {file = "msrest-0.7.1.zip", hash = "sha256:6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9"}, @@ -1370,32 +1371,33 @@ orjson = [ - {file = "orjson-3.6.8-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:3a287a650458de2211db03681b71c3e5cb2212b62f17a39df8ad99fc54855d0f"}, - {file = "orjson-3.6.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5204e25c12cea58e524fc82f7c27ed0586f592f777b33075a92ab7b3eb3687c2"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77e8386393add64f959c044e0fb682364fd0e611a6f477aa13f0e6a733bd6a28"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:279f2d2af393fdf8601020744cb206b91b54ad60fb8401e0761819c7bda1f4e4"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:c31c9f389be7906f978ed4192eb58a4b74a37ad60556a0b88ddc47c576697770"}, - {file = "orjson-3.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0db5c5a0c5b89f092d52f6e5a3701660a9d6ffa9e2968b3ce17c2bc4f5eb0414"}, - {file = "orjson-3.6.8-cp310-none-win_amd64.whl", hash = "sha256:eb22485847b9a0c4bbedc668df860126ac931edbed1d456cf41a59f3cb961ed8"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:1a5fe569310bc819279bd4d5f2c349910b104ed3207936246dd5d5e0b085e74a"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:ccb356a47ab1067cd3549847e9db1d279a63fe0482d315b3ffd6e7abef35ef77"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ab29c069c222248ce302a25855b4e1664f9436e8ae5a131fb0859daf31676d2b"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d2b5e4cba9e774ac011071d9d27760f97f4b8cd46003e971d122e712f971345"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:c311ec504414d22834d5b972a209619925b48263856a11a14d90230f9682d49c"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:a3dfec7950b90fb8d143743503ee53fa06b32e6068bdea792fc866284da3d71d"}, - {file = "orjson-3.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b890dbbada2cbb26eb29bd43a848426f007f094bb0758df10dfe7a438e1cb4b4"}, - {file = "orjson-3.6.8-cp37-none-win_amd64.whl", hash = "sha256:9143ae2c52771525be9ad11a7a8cc8e7fd75391b107e7e644a9e0050496f6b4f"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:33a82199fd42f6436f833e210ae5129c922a5c355629356ca7a8e82964da7285"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:90159ea8b9a5a2a98fa33dc7b421cfac4d2ae91ba5e1058f5909e7f059f6b467"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:656fbe15d9ef0733e740d9def78f4fdb4153102f4836ee774a05123499005931"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7be3be6153843e0f01351b1313a5ad4723595427680dac2dfff22a37e652ce02"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:dd24f66b6697ee7424f7da575ec6cbffc8ede441114d53470949cda4d97c6e56"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:b07c780f7345ecf5901356dc21dee0669defc489c38ce7b9ab0f5e008cc0385c"}, - {file = "orjson-3.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ea32015a5d8a4ce00d348a0de5dc7040e0ad58f970a8fcbb5713a1eac129e493"}, - {file = "orjson-3.6.8-cp38-none-win_amd64.whl", hash = "sha256:c5a3e382194c838988ec128a26b08aa92044e5e055491cc4056142af0c1c54d7"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:83a8424e857ae1bf53530e88b4eb2f16ca2b489073b924e655f1575cacd7f52a"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:81e1a6a2d67f15007dadacbf9ba5d3d79237e5e33786c028557fe5a2b72f1c9a"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:137b539881c77866eba86ff6a11df910daf2eb9ab8f1acae62f879e83d7c38af"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cbd358f3b3ad539a27e36900e8e7d172d0e1b72ad9dd7d69544dcbc0f067ee7"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:6ab94701542d40b90903ecfc339333f458884979a01cb9268bc662cc67a5f6d8"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:32b6f26593a9eb606b40775826beb0dac152e3d224ea393688fced036045a821"}, - {file = "orjson-3.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:afd9e329ebd3418cac3cd747769b1d52daa25fa672bbf414ab59f0e0881b32b9"}, - {file = "orjson-3.6.8-cp39-none-win_amd64.whl", hash = "sha256:0c89b419914d3d1f65a1b0883f377abe42a6e44f6624ba1c63e8846cbfc2fa60"}, - {file = "orjson-3.6.8.tar.gz", hash = "sha256:e19d23741c5de13689bb316abfccea15a19c264e3ec8eb332a5319a583595ace"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, + {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, + {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, + {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, + {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, + {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, + {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, + {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, + {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, + {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, @@ -1662,74 +1664,74 @@ regex = [ - {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, - {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, - {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, - {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, - {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, - {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, - {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, - {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, - {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, - {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, - {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, - {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, - {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, - {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, - {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, + {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, + {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, + {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, + {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, + {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, + {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, + {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, + {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, + {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, + {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, + {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, + {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, + {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, @@ -1738,2 +1740,2 @@ requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, @@ -1758,0 +1761,2 @@ sentencepiece = [ + {file = "sentencepiece-0.1.96-cp310-cp310-win32.whl", hash = "sha256:3028699bdb2fb0230804f3b8a617fe3af22f5c5a56416419b31a7da5e7bf83bc"}, + {file = "sentencepiece-0.1.96-cp310-cp310-win_amd64.whl", hash = "sha256:203443a7bd4295b6a3695787235abe0e77d4c369d7156a6b9a397c540a38bd27"}, diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index d503a765..de165fae 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.5" +version = "0.1.6" @@ -8 +8 @@ version = "0.1.5" -libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } diff --git a/libs/libutils/dist/libutils-0.1.2-py3-none-any.whl b/libs/libutils/dist/libutils-0.1.2-py3-none-any.whl new file mode 100644 index 00000000..f4dfb865 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.2-py3-none-any.whl differ diff --git a/libs/libutils/dist/libutils-0.1.2.tar.gz b/libs/libutils/dist/libutils-0.1.2.tar.gz new file mode 100644 index 00000000..3d6577ac Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.2.tar.gz differ diff --git a/libs/libutils/poetry.lock b/libs/libutils/poetry.lock index 583ac977..ad0c2628 100644 --- a/libs/libutils/poetry.lock +++ b/libs/libutils/poetry.lock @@ -42 +42 @@ name = "azure-core" -version = "1.24.0" +version = "1.24.1" @@ -173 +173 @@ name = "coverage" -version = "6.4" +version = "6.4.1" @@ -261 +261 @@ name = "elasticsearch" -version = "8.2.0" +version = "8.2.2" @@ -388 +388 @@ name = "msal" -version = "1.17.0" +version = "1.18.0" @@ -395 +395 @@ python-versions = "*" -cryptography = ">=0.6,<39" +cryptography = ">=0.6,<40" @@ -416 +416 @@ name = "msrest" -version = "0.6.21" +version = "0.7.1" @@ -420 +420 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -422,0 +423 @@ python-versions = "*" +azure-core = ">=1.24.0" @@ -429 +430 @@ requests-oauthlib = ">=0.5.0" -async = ["aiohttp (>=3.0)", "aiodns"] +async = ["aiodns", "aiohttp (>=3.0)"] @@ -478 +479 @@ name = "orjson" -version = "3.6.8" +version = "3.7.2" @@ -752 +753 @@ name = "regex" -version = "2022.4.24" +version = "2022.6.2" @@ -760 +761 @@ name = "requests" -version = "2.27.1" +version = "2.28.0" @@ -764 +765 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" @@ -768,2 +769,2 @@ certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" @@ -773 +774 @@ urllib3 = ">=1.21.1,<1.27" -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -984,2 +985,2 @@ azure-core = [ - {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, - {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, + {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, + {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, @@ -1093,41 +1094,41 @@ coverage = [ - {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, - {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, - {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, - {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, - {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, - {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, - {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, - {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, - {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, - {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, - {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, - {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, - {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, - {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, - {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, - {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, - {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"}, + {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"}, + {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"}, + {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"}, + {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"}, + {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"}, + {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"}, + {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"}, + {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"}, + {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"}, + {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"}, + {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"}, @@ -1175,2 +1176,2 @@ elasticsearch = [ - {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, - {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, + {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, + {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, @@ -1218,2 +1219,2 @@ msal = [ - {file = "msal-1.17.0-py2.py3-none-any.whl", hash = "sha256:5a52d78e70d2c451e267c1e8c2342e4c06f495c75c859aeafd9260d3974f09fe"}, - {file = "msal-1.17.0.tar.gz", hash = "sha256:04e3cb7bb75c51f56d290381f23056207df1f3eb594ed03d38551f3b16d2a36e"}, + {file = "msal-1.18.0-py2.py3-none-any.whl", hash = "sha256:9c10e6cb32e0b6b8eaafc1c9a68bc3b2ff71505e0c5b8200799582d8b9f22947"}, + {file = "msal-1.18.0.tar.gz", hash = "sha256:576af55866038b60edbcb31d831325a1bd8241ed272186e2832968fd4717d202"}, @@ -1226,2 +1227,2 @@ msrest = [ - {file = "msrest-0.6.21-py2.py3-none-any.whl", hash = "sha256:c840511c845330e96886011a236440fafc2c9aff7b2df9c0a92041ee2dee3782"}, - {file = "msrest-0.6.21.tar.gz", hash = "sha256:72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8"}, + {file = "msrest-0.7.1-py3-none-any.whl", hash = "sha256:21120a810e1233e5e6cc7fe40b474eeb4ec6f757a15d7cf86702c369f9567c32"}, + {file = "msrest-0.7.1.zip", hash = "sha256:6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9"}, @@ -1286,32 +1287,33 @@ orjson = [ - {file = "orjson-3.6.8-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:3a287a650458de2211db03681b71c3e5cb2212b62f17a39df8ad99fc54855d0f"}, - {file = "orjson-3.6.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5204e25c12cea58e524fc82f7c27ed0586f592f777b33075a92ab7b3eb3687c2"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77e8386393add64f959c044e0fb682364fd0e611a6f477aa13f0e6a733bd6a28"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:279f2d2af393fdf8601020744cb206b91b54ad60fb8401e0761819c7bda1f4e4"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:c31c9f389be7906f978ed4192eb58a4b74a37ad60556a0b88ddc47c576697770"}, - {file = "orjson-3.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0db5c5a0c5b89f092d52f6e5a3701660a9d6ffa9e2968b3ce17c2bc4f5eb0414"}, - {file = "orjson-3.6.8-cp310-none-win_amd64.whl", hash = "sha256:eb22485847b9a0c4bbedc668df860126ac931edbed1d456cf41a59f3cb961ed8"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:1a5fe569310bc819279bd4d5f2c349910b104ed3207936246dd5d5e0b085e74a"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:ccb356a47ab1067cd3549847e9db1d279a63fe0482d315b3ffd6e7abef35ef77"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ab29c069c222248ce302a25855b4e1664f9436e8ae5a131fb0859daf31676d2b"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d2b5e4cba9e774ac011071d9d27760f97f4b8cd46003e971d122e712f971345"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:c311ec504414d22834d5b972a209619925b48263856a11a14d90230f9682d49c"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:a3dfec7950b90fb8d143743503ee53fa06b32e6068bdea792fc866284da3d71d"}, - {file = "orjson-3.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b890dbbada2cbb26eb29bd43a848426f007f094bb0758df10dfe7a438e1cb4b4"}, - {file = "orjson-3.6.8-cp37-none-win_amd64.whl", hash = "sha256:9143ae2c52771525be9ad11a7a8cc8e7fd75391b107e7e644a9e0050496f6b4f"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:33a82199fd42f6436f833e210ae5129c922a5c355629356ca7a8e82964da7285"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:90159ea8b9a5a2a98fa33dc7b421cfac4d2ae91ba5e1058f5909e7f059f6b467"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:656fbe15d9ef0733e740d9def78f4fdb4153102f4836ee774a05123499005931"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7be3be6153843e0f01351b1313a5ad4723595427680dac2dfff22a37e652ce02"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:dd24f66b6697ee7424f7da575ec6cbffc8ede441114d53470949cda4d97c6e56"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:b07c780f7345ecf5901356dc21dee0669defc489c38ce7b9ab0f5e008cc0385c"}, - {file = "orjson-3.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ea32015a5d8a4ce00d348a0de5dc7040e0ad58f970a8fcbb5713a1eac129e493"}, - {file = "orjson-3.6.8-cp38-none-win_amd64.whl", hash = "sha256:c5a3e382194c838988ec128a26b08aa92044e5e055491cc4056142af0c1c54d7"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:83a8424e857ae1bf53530e88b4eb2f16ca2b489073b924e655f1575cacd7f52a"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:81e1a6a2d67f15007dadacbf9ba5d3d79237e5e33786c028557fe5a2b72f1c9a"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:137b539881c77866eba86ff6a11df910daf2eb9ab8f1acae62f879e83d7c38af"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cbd358f3b3ad539a27e36900e8e7d172d0e1b72ad9dd7d69544dcbc0f067ee7"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:6ab94701542d40b90903ecfc339333f458884979a01cb9268bc662cc67a5f6d8"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:32b6f26593a9eb606b40775826beb0dac152e3d224ea393688fced036045a821"}, - {file = "orjson-3.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:afd9e329ebd3418cac3cd747769b1d52daa25fa672bbf414ab59f0e0881b32b9"}, - {file = "orjson-3.6.8-cp39-none-win_amd64.whl", hash = "sha256:0c89b419914d3d1f65a1b0883f377abe42a6e44f6624ba1c63e8846cbfc2fa60"}, - {file = "orjson-3.6.8.tar.gz", hash = "sha256:e19d23741c5de13689bb316abfccea15a19c264e3ec8eb332a5319a583595ace"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, + {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, + {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, + {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, + {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, + {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, + {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, + {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, + {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, + {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, @@ -1469,74 +1471,74 @@ regex = [ - {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, - {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, - {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, - {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, - {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, - {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, - {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, - {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, - {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, - {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, - {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, - {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, - {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, - {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, - {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, + {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, + {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, + {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, + {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, + {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, + {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, + {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, + {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, + {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, + {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, + {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, + {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, + {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, @@ -1545,2 +1547,2 @@ requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, @@ -1565,0 +1568,2 @@ sentencepiece = [ + {file = "sentencepiece-0.1.96-cp310-cp310-win32.whl", hash = "sha256:3028699bdb2fb0230804f3b8a617fe3af22f5c5a56416419b31a7da5e7bf83bc"}, + {file = "sentencepiece-0.1.96-cp310-cp310-win_amd64.whl", hash = "sha256:203443a7bd4295b6a3695787235abe0e77d4c369d7156a6b9a397c540a38bd27"}, diff --git a/libs/libutils/pyproject.toml b/libs/libutils/pyproject.toml index 018ff737..7776c17e 100644 --- a/libs/libutils/pyproject.toml +++ b/libs/libutils/pyproject.toml @@ -5 +5 @@ name = "libutils" -version = "0.1.1" +version = "0.1.2" diff --git a/libs/libutils/src/libutils/types.py b/libs/libutils/src/libutils/types.py index 1e6bcc55..c5d94dcc 100644 --- a/libs/libutils/src/libutils/types.py +++ b/libs/libutils/src/libutils/types.py @@ -1 +1,8 @@ -from typing import Any, Dict, List, Optional, TypedDict +from typing import Any, Dict, List, Literal, Optional, TypedDict, Union + +TimestampUnit = Literal["s", "ms", "us", "ns"] +CommonColumnType = Literal[ + "JSON", "BOOL", "INT", "FLOAT", "STRING", "IMAGE_URL", "RELATIVE_IMAGE_URL", "AUDIO_RELATIVE_SOURCES" +] +ClassLabelColumnType = Literal["CLASS_LABEL"] +TimestampColumnType = Literal["TIMESTAMP"] @@ -6 +12,0 @@ class _BaseColumnDict(TypedDict): - type: str @@ -9,2 +15,6 @@ class _BaseColumnDict(TypedDict): -class ColumnDict(_BaseColumnDict, total=False): - # https://www.python.org/dev/peps/pep-0655/#motivation +class CommonColumnDict(_BaseColumnDict): + type: CommonColumnType + + +class ClassLabelColumnDict(_BaseColumnDict): + type: ClassLabelColumnType @@ -13,0 +24,10 @@ class ColumnDict(_BaseColumnDict, total=False): +class TimestampColumnDict(_BaseColumnDict): + type: TimestampColumnType + unit: TimestampUnit + tz: Optional[str] + + +ColumnType = Union[CommonColumnType, ClassLabelColumnType, TimestampColumnType] +ColumnDict = Union[CommonColumnDict, ClassLabelColumnDict, TimestampColumnDict] + + diff --git a/libs/libutils/tests/test_types.py b/libs/libutils/tests/test_types.py new file mode 100644 index 00000000..86114531 --- /dev/null +++ b/libs/libutils/tests/test_types.py @@ -0,0 +1,66 @@ +from typing import get_args + +from libutils.types import ( + ClassLabelColumnType, + ColumnDict, + CommonColumnType, + TimestampColumnType, + TimestampUnit, +) + + +def test_timestamp_unit() -> None: + assert get_args(TimestampUnit) == ("s", "ms", "us", "ns") + assert set(get_args(TimestampUnit)) == {"s", "ms", "us", "ns"} + assert list(get_args(TimestampUnit)) == ["s", "ms", "us", "ns"] + assert "ms" in get_args(TimestampUnit) + + +def test_column_type() -> None: + assert set(get_args(CommonColumnType)) == { + "JSON", + "BOOL", + "INT", + "FLOAT", + "STRING", + "IMAGE_URL", + "RELATIVE_IMAGE_URL", + "AUDIO_RELATIVE_SOURCES", + } + assert set(get_args(ClassLabelColumnType)) == {"CLASS_LABEL"} + assert set(get_args(TimestampColumnType)) == {"TIMESTAMP"} + + +def test_column_dict() -> None: + # allowed + col: ColumnDict = {"name": "mycol", "type": "JSON"} + labels: ColumnDict = { + "name": "mycol", + "type": "CLASS_LABEL", + "labels": ["positive", "negative", "neutral"], + } + timestamp: ColumnDict = { + "name": "mycol", + "type": "TIMESTAMP", + "tz": None, + "unit": "ms", + } + # not allowed + missing_field: ColumnDict = { + "name": "mycol", + "type": "TIMESTAMP", + "tz": None, + } # type: ignore + wrong_type: ColumnDict = { + "name": "mycol", + "type": "JSON", # type: ignore + "tz": None, + "unit": "ms", + } + + # nothing to test, we just want to ensure that mypy doesn't break + assert col + assert labels + assert timestamp + assert missing_field + assert wrong_type diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 8d2e9d31..8bbcd34f 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.6" +version = "0.1.7" @@ -464 +464 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.1" +libutils = "0.1.2" @@ -471 +471 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" @@ -475 +475 @@ name = "libqueue" -version = "0.1.5" +version = "0.1.6" @@ -482 +482 @@ python-versions = "==3.9.6" -libutils = "0.1.1" +libutils = "0.1.2" @@ -489 +489 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl" @@ -493 +493 @@ name = "libutils" -version = "0.1.1" +version = "0.1.2" @@ -506 +506 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl" @@ -565 +565 @@ name = "msrest" -version = "0.6.21" +version = "0.7.1" @@ -569 +569 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -571,0 +572 @@ python-versions = "*" +azure-core = ">=1.24.0" @@ -578 +579 @@ requests-oauthlib = ">=0.5.0" -async = ["aiohttp (>=3.0)", "aiodns"] +async = ["aiodns", "aiohttp (>=3.0)"] @@ -627 +628 @@ name = "orjson" -version = "3.6.9" +version = "3.7.2" @@ -944 +945 @@ name = "regex" -version = "2022.4.24" +version = "2022.6.2" @@ -952 +953 @@ name = "requests" -version = "2.27.1" +version = "2.28.0" @@ -956 +957 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" @@ -960,2 +961,2 @@ certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" @@ -965 +966 @@ urllib3 = ">=1.21.1,<1.27" -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -1187 +1188 @@ name = "watchdog" -version = "2.1.8" +version = "2.1.9" @@ -1202 +1203 @@ python-versions = "3.9.6" -content-hash = "6bd64b7e0669c182d7ccac0940f69a187b5536ef684fc90f3ca0f1ae79af2ab4" +content-hash = "d692d8c053f9c2477d0cae5715326f3f39afe69ecf7959538b82a783d5fac6ce" @@ -1472 +1473 @@ libcache = [ - {file = "libcache-0.1.6-py3-none-any.whl", hash = "sha256:c2e8fed85516045c62d92096a7bc0ff2215fc33e2c824cd9d91fa11aafc9d544"}, + {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, @@ -1475 +1476 @@ libqueue = [ - {file = "libqueue-0.1.5-py3-none-any.whl", hash = "sha256:6ae2145e259d5fd7ad6112e63c30205030a0fbf972fba9028d43b6dd5766581f"}, + {file = "libqueue-0.1.6-py3-none-any.whl", hash = "sha256:23a03ce67a8d3dd8609e24b2e0f9aba9718d9b69dc642559b1a13c1421dd5537"}, @@ -1478 +1479 @@ libutils = [ - {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, + {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, @@ -1501,2 +1502,2 @@ msrest = [ - {file = "msrest-0.6.21-py2.py3-none-any.whl", hash = "sha256:c840511c845330e96886011a236440fafc2c9aff7b2df9c0a92041ee2dee3782"}, - {file = "msrest-0.6.21.tar.gz", hash = "sha256:72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8"}, + {file = "msrest-0.7.1-py3-none-any.whl", hash = "sha256:21120a810e1233e5e6cc7fe40b474eeb4ec6f757a15d7cf86702c369f9567c32"}, + {file = "msrest-0.7.1.zip", hash = "sha256:6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9"}, @@ -1561,28 +1562,33 @@ orjson = [ - {file = "orjson-3.6.9-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:cd3592726d13deb3dcda3e142cb1ffaa6ddabc287a838d9d1effbb08d19e5a68"}, - {file = "orjson-3.6.9-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:a6d8cd9066df441b06297846fc9fb69654dffe2c5b7c389f40a40f2320f1cac5"}, - {file = "orjson-3.6.9-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:028ee84182af09b68f9d4bc7d9f9b98a3e28d19472af93f4377510e11d3c431b"}, - {file = "orjson-3.6.9-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:5558f474acb68fa8f13f6c6fca4cc431f1e8496638a505961d91efe820818c8f"}, - {file = "orjson-3.6.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:eea2d722a41588e1b5a3fa6d331335d5f757eed8b82418c5185d85fbdbf402df"}, - {file = "orjson-3.6.9-cp310-none-win_amd64.whl", hash = "sha256:61b798c055ea1b3b6fe8a4f4bb452adec0a0dc04fb9be489e9881c996212bdc6"}, - {file = "orjson-3.6.9-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:3a3cbfa84a9e382a22ae462100c512404e186c62b2189d161e4f440a617ed890"}, - {file = "orjson-3.6.9-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:d0ecd233f248d4de97af790175f0a76543c130151aef0c813b9b94c5b34027b5"}, - {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0ee64c378ae2c0677999e891a8a06d4772d76ae741c436edfb7209ebab80da8b"}, - {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa71b5da3583423e450c6ded3cf13f7daaf264a734a86a5dbc6031bbe72017e7"}, - {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:c6c364f17b8b6d799cc86d60f8409500bfc1d64538ef5178deb2b744b55264a3"}, - {file = "orjson-3.6.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:48e23ebde87c3c53fe8c34f3e92f25d8827089f5bc71db1399c105d128efec8d"}, - {file = "orjson-3.6.9-cp37-none-win_amd64.whl", hash = "sha256:8d4d62558f0d8ffafa04b1303b8c94e4c84ab78f5d43e4b76a8fa0cbe6b8ba6e"}, - {file = "orjson-3.6.9-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:0c0eeaa91e7107158d50fbc949c89c04a5952d236670f56ced08edd146015b97"}, - {file = "orjson-3.6.9-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:581827f666d56e6b2e2bf2bb24f0f0f759e6eaf8ec83e7b8e42a8b9ac47c9fbc"}, - {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0d74c7dd08f189863263bbf05d6a8a452c2d0a29becf936cf05caf03429e59ad"}, - {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5051218f4ca88fab241dc198244cb20a9aa1cf18a2b5be41edead07bb7debccb"}, - {file = "orjson-3.6.9-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:c6028e0dfe3f1210e5560852a9f706360c71b3c07051f99e44e9ecb232e6414b"}, - {file = "orjson-3.6.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9888ea0e063cb79fb384f2800530d86e3b1b9e43084e7dc58fb1bb0165567a5f"}, - {file = "orjson-3.6.9-cp38-none-win_amd64.whl", hash = "sha256:1ae10f2dadbafefce59afaeba146bead5d1853cd744e2ac055796be72456aeb6"}, - {file = "orjson-3.6.9-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:77fa18c7806ced4f5e659e7ffd2404e974dea546f4baa0b9525f687ddf48bc17"}, - {file = "orjson-3.6.9-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:29e90a3af4cabf65c73e34b06550a3ee02ce1e3daccf79d68ffa930d2db02559"}, - {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc5ce183ceda177beb9559bbf0e11f88926322a13a337d0902e4f1059dcf5b36"}, - {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c2e30e483d1d4d0b4feb820ee7eff94a86e42882f5e77dc67758c2b648dd236"}, - {file = "orjson-3.6.9-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:d4fef84272ec68339d18fec68a3cfa12c7e7f1b304606f6485f3637779e48a13"}, - {file = "orjson-3.6.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9624afef062b701ae8cb3486842b9363cf0cf083fc6294a824d109546272a3c3"}, - {file = "orjson-3.6.9-cp39-none-win_amd64.whl", hash = "sha256:81e23bb5aa767dfa46eeca76ac6bbe148aa8c184a5d08b4d0e4947d42b278246"}, - {file = "orjson-3.6.9.tar.gz", hash = "sha256:37b5bbcc1d5e804be5fd52c15737e7addd08475917ab6dd3de6b791dfb2d7d85"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, + {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, + {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, + {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, + {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, + {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, + {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, + {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, + {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, + {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, @@ -1857,74 +1863,74 @@ regex = [ - {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, - {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, - {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, - {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, - {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, - {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, - {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, - {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, - {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, - {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, - {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, - {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, - {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, - {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, - {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, + {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, + {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, + {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, + {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, + {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, + {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, + {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, + {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, + {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, + {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, + {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, + {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, + {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, @@ -1933,2 +1939,2 @@ requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, @@ -1953,0 +1960,2 @@ sentencepiece = [ + {file = "sentencepiece-0.1.96-cp310-cp310-win32.whl", hash = "sha256:3028699bdb2fb0230804f3b8a617fe3af22f5c5a56416419b31a7da5e7bf83bc"}, + {file = "sentencepiece-0.1.96-cp310-cp310-win_amd64.whl", hash = "sha256:203443a7bd4295b6a3695787235abe0e77d4c369d7156a6b9a397c540a38bd27"}, @@ -2085,25 +2093,25 @@ watchdog = [ - {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:676263bee67b165f16b05abc52acc7a94feac5b5ab2449b491f1a97638a79277"}, - {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:aa68d2d9a89d686fae99d28a6edf3b18595e78f5adf4f5c18fbfda549ac0f20c"}, - {file = "watchdog-2.1.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5e2e51c53666850c3ecffe9d265fc5d7351db644de17b15e9c685dd3cdcd6f97"}, - {file = "watchdog-2.1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:7721ac736170b191c50806f43357407138c6748e4eb3e69b071397f7f7aaeedd"}, - {file = "watchdog-2.1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ce7376aed3da5fd777483fe5ebc8475a440c6d18f23998024f832134b2938e7b"}, - {file = "watchdog-2.1.8-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f9ee4c6bf3a1b2ed6be90a2d78f3f4bbd8105b6390c04a86eb48ed67bbfa0b0b"}, - {file = "watchdog-2.1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:68dbe75e0fa1ba4d73ab3f8e67b21770fbed0651d32ce515cd38919a26873266"}, - {file = "watchdog-2.1.8-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0c520009b8cce79099237d810aaa19bc920941c268578436b62013b2f0102320"}, - {file = "watchdog-2.1.8-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:efcc8cbc1b43902571b3dce7ef53003f5b97fe4f275fe0489565fc6e2ebe3314"}, - {file = "watchdog-2.1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:746e4c197ec1083581bb1f64d07d1136accf03437badb5ff8fcb862565c193b2"}, - {file = "watchdog-2.1.8-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1ae17b6be788fb8e4d8753d8d599de948f0275a232416e16436363c682c6f850"}, - {file = "watchdog-2.1.8-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ddde157dc1447d8130cb5b8df102fad845916fe4335e3d3c3f44c16565becbb7"}, - {file = "watchdog-2.1.8-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4978db33fc0934c92013ee163a9db158ec216099b69fce5aec790aba704da412"}, - {file = "watchdog-2.1.8-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b962de4d7d92ff78fb2dbc6a0cb292a679dea879a0eb5568911484d56545b153"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_aarch64.whl", hash = "sha256:1e5d0fdfaa265c29dc12621913a76ae99656cf7587d03950dfeb3595e5a26102"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_armv7l.whl", hash = "sha256:036ed15f7cd656351bf4e17244447be0a09a61aaa92014332d50719fc5973bc0"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_i686.whl", hash = "sha256:2962628a8777650703e8f6f2593065884c602df7bae95759b2df267bd89b2ef5"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_ppc64.whl", hash = "sha256:156ec3a94695ea68cfb83454b98754af6e276031ba1ae7ae724dc6bf8973b92a"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:47598fe6713fc1fee86b1ca85c9cbe77e9b72d002d6adeab9c3b608f8a5ead10"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_s390x.whl", hash = "sha256:fed4de6e45a4f16e4046ea00917b4fe1700b97244e5d114f594b4a1b9de6bed8"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_x86_64.whl", hash = "sha256:24dedcc3ce75e150f2a1d704661f6879764461a481ba15a57dc80543de46021c"}, - {file = "watchdog-2.1.8-py3-none-win32.whl", hash = "sha256:6ddf67bc9f413791072e3afb466e46cc72c6799ba73dea18439b412e8f2e3257"}, - {file = "watchdog-2.1.8-py3-none-win_amd64.whl", hash = "sha256:88ef3e8640ef0a64b7ad7394b0f23384f58ac19dd759da7eaa9bc04b2898943f"}, - {file = "watchdog-2.1.8-py3-none-win_ia64.whl", hash = "sha256:0fb60c7d31474b21acba54079ce9ff0136411183e9a591369417cddb1d7d00d7"}, - {file = "watchdog-2.1.8.tar.gz", hash = "sha256:6d03149126864abd32715d4e9267d2754cede25a69052901399356ad3bc5ecff"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a735a990a1095f75ca4f36ea2ef2752c99e6ee997c46b0de507ba40a09bf7330"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b17d302850c8d412784d9246cfe8d7e3af6bcd45f958abb2d08a6f8bedf695d"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ee3e38a6cc050a8830089f79cbec8a3878ec2fe5160cdb2dc8ccb6def8552658"}, + {file = "watchdog-2.1.9-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64a27aed691408a6abd83394b38503e8176f69031ca25d64131d8d640a307591"}, + {file = "watchdog-2.1.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:195fc70c6e41237362ba720e9aaf394f8178bfc7fa68207f112d108edef1af33"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bfc4d351e6348d6ec51df007432e6fe80adb53fd41183716017026af03427846"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8250546a98388cbc00c3ee3cc5cf96799b5a595270dfcfa855491a64b86ef8c3"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:117ffc6ec261639a0209a3252546b12800670d4bf5f84fbd355957a0595fe654"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:97f9752208f5154e9e7b76acc8c4f5a58801b338de2af14e7e181ee3b28a5d39"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:247dcf1df956daa24828bfea5a138d0e7a7c98b1a47cf1fa5b0c3c16241fcbb7"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:226b3c6c468ce72051a4c15a4cc2ef317c32590d82ba0b330403cafd98a62cfd"}, + {file = "watchdog-2.1.9-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d9820fe47c20c13e3c9dd544d3706a2a26c02b2b43c993b62fcd8011bcc0adb3"}, + {file = "watchdog-2.1.9-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:70af927aa1613ded6a68089a9262a009fbdf819f46d09c1a908d4b36e1ba2b2d"}, + {file = "watchdog-2.1.9-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ed80a1628cee19f5cfc6bb74e173f1b4189eb532e705e2a13e3250312a62e0c9"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_aarch64.whl", hash = "sha256:9f05a5f7c12452f6a27203f76779ae3f46fa30f1dd833037ea8cbc2887c60213"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_armv7l.whl", hash = "sha256:255bb5758f7e89b1a13c05a5bceccec2219f8995a3a4c4d6968fe1de6a3b2892"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_i686.whl", hash = "sha256:d3dda00aca282b26194bdd0adec21e4c21e916956d972369359ba63ade616153"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_ppc64.whl", hash = "sha256:186f6c55abc5e03872ae14c2f294a153ec7292f807af99f57611acc8caa75306"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:083171652584e1b8829581f965b9b7723ca5f9a2cd7e20271edf264cfd7c1412"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_s390x.whl", hash = "sha256:b530ae007a5f5d50b7fbba96634c7ee21abec70dc3e7f0233339c81943848dc1"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_x86_64.whl", hash = "sha256:4f4e1c4aa54fb86316a62a87b3378c025e228178d55481d30d857c6c438897d6"}, + {file = "watchdog-2.1.9-py3-none-win32.whl", hash = "sha256:5952135968519e2447a01875a6f5fc8c03190b24d14ee52b0f4b1682259520b1"}, + {file = "watchdog-2.1.9-py3-none-win_amd64.whl", hash = "sha256:7a833211f49143c3d336729b0020ffd1274078e94b0ae42e22f596999f50279c"}, + {file = "watchdog-2.1.9-py3-none-win_ia64.whl", hash = "sha256:ad576a565260d8f99d97f2e64b0f97a48228317095908568a9d5c786c829d428"}, + {file = "watchdog-2.1.9.tar.gz", hash = "sha256:43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 3e6f4cb3..4d2579e0 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9,3 +9,3 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 1431a7dd..91253fa1 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -61 +61 @@ name = "azure-core" -version = "1.24.0" +version = "1.24.1" @@ -192 +192 @@ name = "coverage" -version = "6.4" +version = "6.4.1" @@ -455 +455 @@ name = "libcache" -version = "0.1.6" +version = "0.1.7" @@ -463 +463 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.1" +libutils = "0.1.2" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" @@ -474 +474 @@ name = "libqueue" -version = "0.1.5" +version = "0.1.6" @@ -481 +481 @@ python-versions = "==3.9.6" -libutils = "0.1.1" +libutils = "0.1.2" @@ -488 +488 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl" @@ -492 +492 @@ name = "libutils" -version = "0.1.1" +version = "0.1.2" @@ -505 +505 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl" @@ -564 +564 @@ name = "msrest" -version = "0.6.21" +version = "0.7.1" @@ -568 +568 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -570,0 +571 @@ python-versions = "*" +azure-core = ">=1.24.0" @@ -577 +578 @@ requests-oauthlib = ">=0.5.0" -async = ["aiohttp (>=3.0)", "aiodns"] +async = ["aiodns", "aiohttp (>=3.0)"] @@ -626 +627 @@ name = "orjson" -version = "3.6.9" +version = "3.7.2" @@ -943 +944 @@ name = "regex" -version = "2022.4.24" +version = "2022.6.2" @@ -951 +952 @@ name = "requests" -version = "2.27.1" +version = "2.28.0" @@ -955 +956 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" @@ -959,2 +960,2 @@ certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" @@ -964 +965 @@ urllib3 = ">=1.21.1,<1.27" -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -1186 +1187 @@ name = "watchdog" -version = "2.1.8" +version = "2.1.9" @@ -1201 +1202 @@ python-versions = "3.9.6" -content-hash = "e13d45448d1dd78bf450313e428fb4589a4d0e00206919472405507ea51f19f4" +content-hash = "8bd13b68a6f58fba46b9ae50db3226f2722efc408bb5b5a037f877918ba6b79c" @@ -1225,2 +1226,2 @@ azure-core = [ - {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, - {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, + {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, + {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, @@ -1334,41 +1335,41 @@ coverage = [ - {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, - {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, - {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, - {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, - {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, - {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, - {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, - {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, - {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, - {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, - {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, - {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, - {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, - {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, - {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, - {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, - {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"}, + {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"}, + {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"}, + {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"}, + {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"}, + {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"}, + {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"}, + {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"}, + {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"}, + {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"}, + {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"}, + {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"}, @@ -1471 +1472 @@ libcache = [ - {file = "libcache-0.1.6-py3-none-any.whl", hash = "sha256:c2e8fed85516045c62d92096a7bc0ff2215fc33e2c824cd9d91fa11aafc9d544"}, + {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, @@ -1474 +1475 @@ libqueue = [ - {file = "libqueue-0.1.5-py3-none-any.whl", hash = "sha256:6ae2145e259d5fd7ad6112e63c30205030a0fbf972fba9028d43b6dd5766581f"}, + {file = "libqueue-0.1.6-py3-none-any.whl", hash = "sha256:23a03ce67a8d3dd8609e24b2e0f9aba9718d9b69dc642559b1a13c1421dd5537"}, @@ -1477 +1478 @@ libutils = [ - {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, + {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, @@ -1500,2 +1501,2 @@ msrest = [ - {file = "msrest-0.6.21-py2.py3-none-any.whl", hash = "sha256:c840511c845330e96886011a236440fafc2c9aff7b2df9c0a92041ee2dee3782"}, - {file = "msrest-0.6.21.tar.gz", hash = "sha256:72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8"}, + {file = "msrest-0.7.1-py3-none-any.whl", hash = "sha256:21120a810e1233e5e6cc7fe40b474eeb4ec6f757a15d7cf86702c369f9567c32"}, + {file = "msrest-0.7.1.zip", hash = "sha256:6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9"}, @@ -1560,28 +1561,33 @@ orjson = [ - {file = "orjson-3.6.9-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:cd3592726d13deb3dcda3e142cb1ffaa6ddabc287a838d9d1effbb08d19e5a68"}, - {file = "orjson-3.6.9-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:a6d8cd9066df441b06297846fc9fb69654dffe2c5b7c389f40a40f2320f1cac5"}, - {file = "orjson-3.6.9-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:028ee84182af09b68f9d4bc7d9f9b98a3e28d19472af93f4377510e11d3c431b"}, - {file = "orjson-3.6.9-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:5558f474acb68fa8f13f6c6fca4cc431f1e8496638a505961d91efe820818c8f"}, - {file = "orjson-3.6.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:eea2d722a41588e1b5a3fa6d331335d5f757eed8b82418c5185d85fbdbf402df"}, - {file = "orjson-3.6.9-cp310-none-win_amd64.whl", hash = "sha256:61b798c055ea1b3b6fe8a4f4bb452adec0a0dc04fb9be489e9881c996212bdc6"}, - {file = "orjson-3.6.9-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:3a3cbfa84a9e382a22ae462100c512404e186c62b2189d161e4f440a617ed890"}, - {file = "orjson-3.6.9-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:d0ecd233f248d4de97af790175f0a76543c130151aef0c813b9b94c5b34027b5"}, - {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0ee64c378ae2c0677999e891a8a06d4772d76ae741c436edfb7209ebab80da8b"}, - {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa71b5da3583423e450c6ded3cf13f7daaf264a734a86a5dbc6031bbe72017e7"}, - {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:c6c364f17b8b6d799cc86d60f8409500bfc1d64538ef5178deb2b744b55264a3"}, - {file = "orjson-3.6.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:48e23ebde87c3c53fe8c34f3e92f25d8827089f5bc71db1399c105d128efec8d"}, - {file = "orjson-3.6.9-cp37-none-win_amd64.whl", hash = "sha256:8d4d62558f0d8ffafa04b1303b8c94e4c84ab78f5d43e4b76a8fa0cbe6b8ba6e"}, - {file = "orjson-3.6.9-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:0c0eeaa91e7107158d50fbc949c89c04a5952d236670f56ced08edd146015b97"}, - {file = "orjson-3.6.9-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:581827f666d56e6b2e2bf2bb24f0f0f759e6eaf8ec83e7b8e42a8b9ac47c9fbc"}, - {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0d74c7dd08f189863263bbf05d6a8a452c2d0a29becf936cf05caf03429e59ad"}, - {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5051218f4ca88fab241dc198244cb20a9aa1cf18a2b5be41edead07bb7debccb"}, - {file = "orjson-3.6.9-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:c6028e0dfe3f1210e5560852a9f706360c71b3c07051f99e44e9ecb232e6414b"}, - {file = "orjson-3.6.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9888ea0e063cb79fb384f2800530d86e3b1b9e43084e7dc58fb1bb0165567a5f"}, - {file = "orjson-3.6.9-cp38-none-win_amd64.whl", hash = "sha256:1ae10f2dadbafefce59afaeba146bead5d1853cd744e2ac055796be72456aeb6"}, - {file = "orjson-3.6.9-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:77fa18c7806ced4f5e659e7ffd2404e974dea546f4baa0b9525f687ddf48bc17"}, - {file = "orjson-3.6.9-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:29e90a3af4cabf65c73e34b06550a3ee02ce1e3daccf79d68ffa930d2db02559"}, - {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc5ce183ceda177beb9559bbf0e11f88926322a13a337d0902e4f1059dcf5b36"}, - {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c2e30e483d1d4d0b4feb820ee7eff94a86e42882f5e77dc67758c2b648dd236"}, - {file = "orjson-3.6.9-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:d4fef84272ec68339d18fec68a3cfa12c7e7f1b304606f6485f3637779e48a13"}, - {file = "orjson-3.6.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9624afef062b701ae8cb3486842b9363cf0cf083fc6294a824d109546272a3c3"}, - {file = "orjson-3.6.9-cp39-none-win_amd64.whl", hash = "sha256:81e23bb5aa767dfa46eeca76ac6bbe148aa8c184a5d08b4d0e4947d42b278246"}, - {file = "orjson-3.6.9.tar.gz", hash = "sha256:37b5bbcc1d5e804be5fd52c15737e7addd08475917ab6dd3de6b791dfb2d7d85"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, + {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, + {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, + {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, + {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, + {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, + {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, + {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, + {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, + {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, @@ -1856,74 +1862,74 @@ regex = [ - {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, - {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, - {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, - {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, - {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, - {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, - {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, - {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, - {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, - {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, - {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, - {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, - {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, - {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, - {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, + {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, + {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, + {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, + {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, + {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, + {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, + {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, + {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, + {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, + {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, + {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, + {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, + {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, @@ -1932,2 +1938,2 @@ requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, @@ -1952,0 +1959,2 @@ sentencepiece = [ + {file = "sentencepiece-0.1.96-cp310-cp310-win32.whl", hash = "sha256:3028699bdb2fb0230804f3b8a617fe3af22f5c5a56416419b31a7da5e7bf83bc"}, + {file = "sentencepiece-0.1.96-cp310-cp310-win_amd64.whl", hash = "sha256:203443a7bd4295b6a3695787235abe0e77d4c369d7156a6b9a397c540a38bd27"}, @@ -2084,25 +2092,25 @@ watchdog = [ - {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:676263bee67b165f16b05abc52acc7a94feac5b5ab2449b491f1a97638a79277"}, - {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:aa68d2d9a89d686fae99d28a6edf3b18595e78f5adf4f5c18fbfda549ac0f20c"}, - {file = "watchdog-2.1.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5e2e51c53666850c3ecffe9d265fc5d7351db644de17b15e9c685dd3cdcd6f97"}, - {file = "watchdog-2.1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:7721ac736170b191c50806f43357407138c6748e4eb3e69b071397f7f7aaeedd"}, - {file = "watchdog-2.1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ce7376aed3da5fd777483fe5ebc8475a440c6d18f23998024f832134b2938e7b"}, - {file = "watchdog-2.1.8-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f9ee4c6bf3a1b2ed6be90a2d78f3f4bbd8105b6390c04a86eb48ed67bbfa0b0b"}, - {file = "watchdog-2.1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:68dbe75e0fa1ba4d73ab3f8e67b21770fbed0651d32ce515cd38919a26873266"}, - {file = "watchdog-2.1.8-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0c520009b8cce79099237d810aaa19bc920941c268578436b62013b2f0102320"}, - {file = "watchdog-2.1.8-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:efcc8cbc1b43902571b3dce7ef53003f5b97fe4f275fe0489565fc6e2ebe3314"}, - {file = "watchdog-2.1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:746e4c197ec1083581bb1f64d07d1136accf03437badb5ff8fcb862565c193b2"}, - {file = "watchdog-2.1.8-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1ae17b6be788fb8e4d8753d8d599de948f0275a232416e16436363c682c6f850"}, - {file = "watchdog-2.1.8-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ddde157dc1447d8130cb5b8df102fad845916fe4335e3d3c3f44c16565becbb7"}, - {file = "watchdog-2.1.8-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4978db33fc0934c92013ee163a9db158ec216099b69fce5aec790aba704da412"}, - {file = "watchdog-2.1.8-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b962de4d7d92ff78fb2dbc6a0cb292a679dea879a0eb5568911484d56545b153"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_aarch64.whl", hash = "sha256:1e5d0fdfaa265c29dc12621913a76ae99656cf7587d03950dfeb3595e5a26102"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_armv7l.whl", hash = "sha256:036ed15f7cd656351bf4e17244447be0a09a61aaa92014332d50719fc5973bc0"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_i686.whl", hash = "sha256:2962628a8777650703e8f6f2593065884c602df7bae95759b2df267bd89b2ef5"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_ppc64.whl", hash = "sha256:156ec3a94695ea68cfb83454b98754af6e276031ba1ae7ae724dc6bf8973b92a"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:47598fe6713fc1fee86b1ca85c9cbe77e9b72d002d6adeab9c3b608f8a5ead10"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_s390x.whl", hash = "sha256:fed4de6e45a4f16e4046ea00917b4fe1700b97244e5d114f594b4a1b9de6bed8"}, - {file = "watchdog-2.1.8-py3-none-manylinux2014_x86_64.whl", hash = "sha256:24dedcc3ce75e150f2a1d704661f6879764461a481ba15a57dc80543de46021c"}, - {file = "watchdog-2.1.8-py3-none-win32.whl", hash = "sha256:6ddf67bc9f413791072e3afb466e46cc72c6799ba73dea18439b412e8f2e3257"}, - {file = "watchdog-2.1.8-py3-none-win_amd64.whl", hash = "sha256:88ef3e8640ef0a64b7ad7394b0f23384f58ac19dd759da7eaa9bc04b2898943f"}, - {file = "watchdog-2.1.8-py3-none-win_ia64.whl", hash = "sha256:0fb60c7d31474b21acba54079ce9ff0136411183e9a591369417cddb1d7d00d7"}, - {file = "watchdog-2.1.8.tar.gz", hash = "sha256:6d03149126864abd32715d4e9267d2754cede25a69052901399356ad3bc5ecff"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:a735a990a1095f75ca4f36ea2ef2752c99e6ee997c46b0de507ba40a09bf7330"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6b17d302850c8d412784d9246cfe8d7e3af6bcd45f958abb2d08a6f8bedf695d"}, + {file = "watchdog-2.1.9-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ee3e38a6cc050a8830089f79cbec8a3878ec2fe5160cdb2dc8ccb6def8552658"}, + {file = "watchdog-2.1.9-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64a27aed691408a6abd83394b38503e8176f69031ca25d64131d8d640a307591"}, + {file = "watchdog-2.1.9-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:195fc70c6e41237362ba720e9aaf394f8178bfc7fa68207f112d108edef1af33"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:bfc4d351e6348d6ec51df007432e6fe80adb53fd41183716017026af03427846"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:8250546a98388cbc00c3ee3cc5cf96799b5a595270dfcfa855491a64b86ef8c3"}, + {file = "watchdog-2.1.9-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:117ffc6ec261639a0209a3252546b12800670d4bf5f84fbd355957a0595fe654"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:97f9752208f5154e9e7b76acc8c4f5a58801b338de2af14e7e181ee3b28a5d39"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:247dcf1df956daa24828bfea5a138d0e7a7c98b1a47cf1fa5b0c3c16241fcbb7"}, + {file = "watchdog-2.1.9-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:226b3c6c468ce72051a4c15a4cc2ef317c32590d82ba0b330403cafd98a62cfd"}, + {file = "watchdog-2.1.9-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d9820fe47c20c13e3c9dd544d3706a2a26c02b2b43c993b62fcd8011bcc0adb3"}, + {file = "watchdog-2.1.9-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:70af927aa1613ded6a68089a9262a009fbdf819f46d09c1a908d4b36e1ba2b2d"}, + {file = "watchdog-2.1.9-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ed80a1628cee19f5cfc6bb74e173f1b4189eb532e705e2a13e3250312a62e0c9"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_aarch64.whl", hash = "sha256:9f05a5f7c12452f6a27203f76779ae3f46fa30f1dd833037ea8cbc2887c60213"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_armv7l.whl", hash = "sha256:255bb5758f7e89b1a13c05a5bceccec2219f8995a3a4c4d6968fe1de6a3b2892"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_i686.whl", hash = "sha256:d3dda00aca282b26194bdd0adec21e4c21e916956d972369359ba63ade616153"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_ppc64.whl", hash = "sha256:186f6c55abc5e03872ae14c2f294a153ec7292f807af99f57611acc8caa75306"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:083171652584e1b8829581f965b9b7723ca5f9a2cd7e20271edf264cfd7c1412"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_s390x.whl", hash = "sha256:b530ae007a5f5d50b7fbba96634c7ee21abec70dc3e7f0233339c81943848dc1"}, + {file = "watchdog-2.1.9-py3-none-manylinux2014_x86_64.whl", hash = "sha256:4f4e1c4aa54fb86316a62a87b3378c025e228178d55481d30d857c6c438897d6"}, + {file = "watchdog-2.1.9-py3-none-win32.whl", hash = "sha256:5952135968519e2447a01875a6f5fc8c03190b24d14ee52b0f4b1682259520b1"}, + {file = "watchdog-2.1.9-py3-none-win_amd64.whl", hash = "sha256:7a833211f49143c3d336729b0020ffd1274078e94b0ae42e22f596999f50279c"}, + {file = "watchdog-2.1.9-py3-none-win_ia64.whl", hash = "sha256:ad576a565260d8f99d97f2e64b0f97a48228317095908568a9d5c786c829d428"}, + {file = "watchdog-2.1.9.tar.gz", hash = "sha256:43ce20ebb36a51f21fa376f76d1d4692452b2527ccd601950d69ed36b9e21609"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 938309af..ed248694 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9,3 +9,3 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index 5570699c..1e613d4a 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -3 +3 @@ name = "absl-py" -version = "1.0.0" +version = "1.1.0" @@ -9,3 +8,0 @@ python-versions = ">=3.6" -[package.dependencies] -six = "*" - @@ -157 +154 @@ name = "azure-core" -version = "1.24.0" +version = "1.24.1" @@ -365 +362 @@ name = "coverage" -version = "6.4" +version = "6.4.1" @@ -438 +435 @@ benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "tr -dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] +dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] @@ -444 +441 @@ tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] @@ -539 +536 @@ name = "elasticsearch" -version = "8.2.0" +version = "8.2.2" @@ -562 +559 @@ name = "fastavro" -version = "1.4.12" +version = "1.5.1" @@ -576 +573 @@ name = "filelock" -version = "3.7.0" +version = "3.7.1" @@ -725 +722 @@ name = "google-auth" -version = "2.6.6" +version = "2.7.0" @@ -738,0 +736 @@ aiohttp = ["requests (>=2.20.0,<3.0.0dev)", "aiohttp (>=3.6.2,<4.0.0dev)"] +enterprise_cert = ["cryptography (==36.0.2)", "pyopenssl (==22.0.0)"] @@ -934 +931,0 @@ url = "https://github.com/kpu/kenlm/archive/master.zip" - @@ -970 +967 @@ name = "libcache" -version = "0.1.6" +version = "0.1.7" @@ -978 +975 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.1" +libutils = "0.1.2" @@ -985 +982 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl" @@ -997 +994 @@ name = "libqueue" -version = "0.1.4" +version = "0.1.6" @@ -1004 +1001 @@ python-versions = "==3.9.6" -libutils = "0.1.1" +libutils = "0.1.2" @@ -1011 +1008 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.4-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl" @@ -1041 +1038 @@ name = "libutils" -version = "0.1.1" +version = "0.1.2" @@ -1054 +1051 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl" @@ -1079 +1076 @@ name = "lxml" -version = "4.8.0" +version = "4.9.0" @@ -1134 +1131 @@ name = "msal" -version = "1.17.0" +version = "1.18.0" @@ -1141 +1138 @@ python-versions = "*" -cryptography = ">=0.6,<39" +cryptography = ">=0.6,<40" @@ -1162 +1159 @@ name = "msrest" -version = "0.6.21" +version = "0.7.1" @@ -1166 +1163 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -1168,0 +1166 @@ python-versions = "*" +azure-core = ">=1.24.0" @@ -1175 +1173 @@ requests-oauthlib = ">=0.5.0" -async = ["aiohttp (>=3.0)", "aiodns"] +async = ["aiodns", "aiohttp (>=3.0)"] @@ -1344 +1342 @@ name = "orjson" -version = "3.6.8" +version = "3.7.2" @@ -1846 +1844 @@ name = "regex" -version = "2022.4.24" +version = "2022.6.2" @@ -1854 +1852 @@ name = "requests" -version = "2.27.1" +version = "2.28.0" @@ -1858 +1856 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" +python-versions = ">=3.7, <4" @@ -1862,2 +1860,2 @@ certifi = ">=2017.4.17" -charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} -idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +charset-normalizer = ">=2.0.0,<2.1.0" +idna = ">=2.5,<4" @@ -1868 +1866 @@ urllib3 = ">=1.21.1,<1.27" -socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +socks = ["PySocks (>=1.5.6,!=1.5.7)"] @@ -2092 +2090 @@ name = "tensorboard" -version = "2.9.0" +version = "2.9.1" @@ -2105 +2103 @@ numpy = ">=1.12.0" -protobuf = ">=3.9.2" +protobuf = ">=3.9.2,<3.20" @@ -2295 +2293 @@ name = "transformers" -version = "4.19.2" +version = "4.19.4" @@ -2313 +2311 @@ tqdm = ">=4.27" -all = ["tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "torch (>=1.0)", "jax (>=0.2.8,!=0.3.2,<=0.3.6)", "jaxlib (>=0.1.65,<=0.3.6)", "flax (>=0.3.5)", "optax (>=0.0.8)", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)"] +all = ["tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "torch (>=1.0)", "jax (>=0.2.8,!=0.3.2,<=0.3.6)", "jaxlib (>=0.1.65,<=0.3.6)", "flax (>=0.3.5)", "optax (>=0.0.8)", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf (<=3.20.1)", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)"] @@ -2317,5 +2315,5 @@ deepspeed = ["deepspeed (>=0.6.4)"] -deepspeed-testing = ["deepspeed (>=0.6.4)", "pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "optuna"] -dev = ["tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "torch (>=1.0)", "jax (>=0.2.8,!=0.3.2,<=0.3.6)", "jaxlib (>=0.1.65,<=0.3.6)", "flax (>=0.3.5)", "optax (>=0.0.8)", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)", "pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "isort (>=5.5.4)", "flake8 (>=3.8.3)", "fugashi (>=1.0)", "ipadic (>=1.0.0,<2.0)", "unidic-lite (>=1.0.7)", "unidic (>=1.0.2)", "hf-doc-builder", "scikit-learn"] -dev-tensorflow = ["pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "pillow", "isort (>=5.5.4)", "flake8 (>=3.8.3)", "hf-doc-builder", "scikit-learn", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer"] -dev-torch = ["pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "torch (>=1.0)", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)", "fugashi (>=1.0)", "ipadic (>=1.0.0,<2.0)", "unidic-lite (>=1.0.7)", "unidic (>=1.0.2)", "hf-doc-builder", "scikit-learn", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)"] -docs = ["tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "torch (>=1.0)", "jax (>=0.2.8,!=0.3.2,<=0.3.6)", "jaxlib (>=0.1.65,<=0.3.6)", "flax (>=0.3.5)", "optax (>=0.0.8)", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)", "hf-doc-builder"] +deepspeed-testing = ["deepspeed (>=0.6.4)", "pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "protobuf (<=3.20.1)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "optuna"] +dev = ["tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "torch (>=1.0)", "jax (>=0.2.8,!=0.3.2,<=0.3.6)", "jaxlib (>=0.1.65,<=0.3.6)", "flax (>=0.3.5)", "optax (>=0.0.8)", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf (<=3.20.1)", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)", "pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "isort (>=5.5.4)", "flake8 (>=3.8.3)", "fugashi (>=1.0)", "ipadic (>=1.0.0,<2.0)", "unidic-lite (>=1.0.7)", "unidic (>=1.0.2)", "hf-doc-builder", "scikit-learn"] +dev-tensorflow = ["pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "protobuf (<=3.20.1)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "sentencepiece (>=0.1.91,!=0.1.92)", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "pillow", "isort (>=5.5.4)", "flake8 (>=3.8.3)", "hf-doc-builder", "scikit-learn", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer"] +dev-torch = ["pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "protobuf (<=3.20.1)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)", "torch (>=1.0)", "sentencepiece (>=0.1.91,!=0.1.92)", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)", "fugashi (>=1.0)", "ipadic (>=1.0.0,<2.0)", "unidic-lite (>=1.0.7)", "unidic (>=1.0.2)", "hf-doc-builder", "scikit-learn", "onnxruntime (>=1.4.0)", "onnxruntime-tools (>=1.4.2)"] +docs = ["tensorflow (>=2.3)", "onnxconverter-common", "tf2onnx", "torch (>=1.0)", "jax (>=0.2.8,!=0.3.2,<=0.3.6)", "jaxlib (>=0.1.65,<=0.3.6)", "flax (>=0.3.5)", "optax (>=0.0.8)", "sentencepiece (>=0.1.91,!=0.1.92)", "protobuf (<=3.20.1)", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer", "pillow", "optuna", "ray", "sigopt", "timm", "codecarbon (==1.2.0)", "hf-doc-builder"] @@ -2337 +2335 @@ sagemaker = ["sagemaker (>=2.31.0)"] -sentencepiece = ["sentencepiece (>=0.1.91,!=0.1.92)", "protobuf"] +sentencepiece = ["sentencepiece (>=0.1.91,!=0.1.92)", "protobuf (<=3.20.1)"] @@ -2342 +2340 @@ speech = ["torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer"] -testing = ["pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)"] +testing = ["pytest", "pytest-xdist", "timeout-decorator", "parameterized", "psutil", "datasets", "pytest-timeout", "black (>=22.0,<23.0)", "sacrebleu (>=1.4.12,<2.0.0)", "rouge-score", "nltk", "GitPython (<3.1.19)", "hf-doc-builder (>=0.3.0)", "protobuf (<=3.20.1)", "sacremoses", "rjieba", "faiss-cpu", "cookiecutter (==1.7.3)"] @@ -2350 +2348 @@ torch-speech = ["torchaudio", "librosa", "pyctcdecode (>=0.3.0)", "phonemizer"] -torchhub = ["filelock", "huggingface-hub (>=0.1.0,<1.0)", "importlib-metadata", "numpy (>=1.17)", "packaging (>=20.0)", "protobuf", "regex (!=2019.12.17)", "requests", "sentencepiece (>=0.1.91,!=0.1.92)", "torch (>=1.0)", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "tqdm (>=4.27)"] +torchhub = ["filelock", "huggingface-hub (>=0.1.0,<1.0)", "importlib-metadata", "numpy (>=1.17)", "packaging (>=20.0)", "protobuf (<=3.20.1)", "regex (!=2019.12.17)", "requests", "sentencepiece (>=0.1.91,!=0.1.92)", "torch (>=1.0)", "tokenizers (>=0.11.1,!=0.11.3,<0.13)", "tqdm (>=4.27)"] @@ -2405 +2403 @@ name = "types-psutil" -version = "5.8.22" +version = "5.8.23" @@ -2413 +2411 @@ name = "types-requests" -version = "2.27.29" +version = "2.27.30" @@ -2535 +2533 @@ python-versions = "3.9.6" -content-hash = "1dd53cb040992152bb7bc76237425a591116130a45164c27ecf4746c6a9f047f" +content-hash = "3fb305c5bd498a5db5f99f351c87024e2e8bdb828924741d6653311ceb129d06" @@ -2539,2 +2537,2 @@ absl-py = [ - {file = "absl-py-1.0.0.tar.gz", hash = "sha256:ac511215c01ee9ae47b19716599e8ccfa746f2e18de72bdf641b79b22afa27ea"}, - {file = "absl_py-1.0.0-py3-none-any.whl", hash = "sha256:84e6dcdc69c947d0c13e5457d056bd43cade4c2393dce00d684aedea77ddc2a3"}, + {file = "absl-py-1.1.0.tar.gz", hash = "sha256:3aa39f898329c2156ff525dfa69ce709e42d77aab18bf4917719d6f260aa6a08"}, + {file = "absl_py-1.1.0-py3-none-any.whl", hash = "sha256:db97287655e30336938f8058d2c81ed2be6af1d9b6ebbcd8df1080a6c7fcd24e"}, @@ -2675,2 +2673,2 @@ azure-core = [ - {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, - {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, + {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, + {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, @@ -2730,0 +2729,3 @@ brotli = [ + {file = "Brotli-1.0.9-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e23281b9a08ec338469268f98f194658abfb13658ee98e2b7f85ee9dd06caa91"}, + {file = "Brotli-1.0.9-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3496fc835370da351d37cada4cf744039616a6db7d13c430035e901443a34daa"}, + {file = "Brotli-1.0.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b83bb06a0192cccf1eb8d0a28672a1b79c74c3a8a5f2619625aeb6f28b3a82bb"}, @@ -2741,0 +2743,3 @@ brotli = [ + {file = "Brotli-1.0.9-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:6d847b14f7ea89f6ad3c9e3901d1bc4835f6b390a9c71df999b0162d9bb1e20f"}, + {file = "Brotli-1.0.9-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:495ba7e49c2db22b046a53b469bbecea802efce200dffb69b93dd47397edc9b6"}, + {file = "Brotli-1.0.9-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:4688c1e42968ba52e57d8670ad2306fe92e0169c6f3af0089be75bbac0c64a3b"}, @@ -2747,0 +2752,3 @@ brotli = [ + {file = "Brotli-1.0.9-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7bbff90b63328013e1e8cb50650ae0b9bac54ffb4be6104378490193cd60f85a"}, + {file = "Brotli-1.0.9-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:ec1947eabbaf8e0531e8e899fc1d9876c179fc518989461f5d24e2223395a9e3"}, + {file = "Brotli-1.0.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:12effe280b8ebfd389022aa65114e30407540ccb89b177d3fbc9a4f177c4bd5d"}, @@ -2754,0 +2762,3 @@ brotli = [ + {file = "Brotli-1.0.9-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e2d9e1cbc1b25e22000328702b014227737756f4b5bf5c485ac1d8091ada078b"}, + {file = "Brotli-1.0.9-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:b336c5e9cf03c7be40c47b5fd694c43c9f1358a80ba384a21969e0b4e66a9b17"}, + {file = "Brotli-1.0.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:85f7912459c67eaab2fb854ed2bc1cc25772b300545fe7ed2dc03954da638649"}, @@ -2761,0 +2772,3 @@ brotli = [ + {file = "Brotli-1.0.9-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:e4c4e92c14a57c9bd4cb4be678c25369bf7a092d55fd0866f759e425b9660806"}, + {file = "Brotli-1.0.9-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:e48f4234f2469ed012a98f4b7874e7f7e173c167bed4934912a29e03167cf6b1"}, + {file = "Brotli-1.0.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9ed4c92a0665002ff8ea852353aeb60d9141eb04109e88928026d3c8a9e5433c"}, @@ -2887,41 +2900,41 @@ coverage = [ - {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, - {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, - {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, - {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, - {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, - {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, - {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, - {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, - {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, - {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, - {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, - {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, - {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, - {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, - {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, - {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, - {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"}, + {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"}, + {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"}, + {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"}, + {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"}, + {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"}, + {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"}, + {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"}, + {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"}, + {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"}, + {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"}, + {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"}, @@ -3059,2 +3072,2 @@ elasticsearch = [ - {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, - {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, + {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, + {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, @@ -3067,16 +3080,13 @@ fastavro = [ - {file = "fastavro-1.4.12-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:97c47004fb7e6a1f38d729124e9607128577a15ee5a4d10c7f680251f1a4f204"}, - {file = "fastavro-1.4.12-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a38a954a45422fffedd1f65283b3ed8f32965a8399f545189d0b75e450407ff2"}, - {file = "fastavro-1.4.12-cp310-cp310-win_amd64.whl", hash = "sha256:fee2240cff5a249458df604893abcc571efa178fa9b01f4ae0fa824295da3b54"}, - {file = "fastavro-1.4.12-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:bc41b3495a34a17e17e77c7bc82ddaa5edaec82e103e763d0fb60cbb4d0efff0"}, - {file = "fastavro-1.4.12-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6326d763939a2a9de560dd88035a9902660145745b6dda2060be5caee3d8e779"}, - {file = "fastavro-1.4.12-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9d418dbcba12e85ae1fd395d92917d592544b0dfe64db13ffebeb4959dd67f"}, - {file = "fastavro-1.4.12-cp37-cp37m-win_amd64.whl", hash = "sha256:e5888f81600c7cd62aeb9ed86b63d6e63dc9ad040b404c0ab42f4194f170d2b6"}, - {file = "fastavro-1.4.12-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:7a8f273ac00f20adebfa394aea4219caf76844134ea21b53d393a1ae9a54f828"}, - {file = "fastavro-1.4.12-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e88cc1f73421d3f60c21fa982fdb91411ac068506442d3a984a2b6ea400ae9dc"}, - {file = "fastavro-1.4.12-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e4b81c09346d6f47153b3c391e8f65bef0fc4dfd19b0e2bc7843f00e07ee1be"}, - {file = "fastavro-1.4.12-cp38-cp38-win_amd64.whl", hash = "sha256:3b04882e04192a64c06a8487a168e289f71cd31e51e1275bd34bb19d70669b48"}, - {file = "fastavro-1.4.12-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:1df7cd4248c0dbbd0c9be4643eb416f6e4f058211b6eaf4e15286813ab2a70ff"}, - {file = "fastavro-1.4.12-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772527b59c4294f44f42328a4d2defe67a6db5f203f65257e698a1ff5b476a2f"}, - {file = "fastavro-1.4.12-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4fca5343950963545c1dd9db17e0451daf19fa50ac9e44313abd20e88cef3e48"}, - {file = "fastavro-1.4.12-cp39-cp39-win_amd64.whl", hash = "sha256:b289e4ed691f0fc5919ffc1c8d4bcb626055deaf75a5a2bca9015dc2367d95af"}, - {file = "fastavro-1.4.12.tar.gz", hash = "sha256:28c0d63eb286e64e9da79e083e299c33f1df65a490a1d79444dc453950daca40"}, + {file = "fastavro-1.5.1-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:920d170560198741fa196a62a97c220173339766e6c14369c5c68bfe8cdafa25"}, + {file = "fastavro-1.5.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0b00b1711511981c4e2dd4a27ba5ae20897fe41ec7ab52eda868626d445081e5"}, + {file = "fastavro-1.5.1-cp310-cp310-win_amd64.whl", hash = "sha256:04438b592980633ccf5d1de7798480a634ca581ae7575ab7671ba16773b6b428"}, + {file = "fastavro-1.5.1-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:0ab92ab744f9172da0791bfad0495d785c7c4f5a68924e3c6c6b39b78b044b11"}, + {file = "fastavro-1.5.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84ca1a60cecd710ead076585b56b954ab3e6e001d8e7384cb4ed20019b29e7a9"}, + {file = "fastavro-1.5.1-cp37-cp37m-win_amd64.whl", hash = "sha256:b5ff657c0d48553492d8356a30b6112fcc6db69adce6bba31135272bc9d87d82"}, + {file = "fastavro-1.5.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:0f1ed38042a2a90a7a5da170006459e73134f4c14f4fda9ebba99017adb1b14c"}, + {file = "fastavro-1.5.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:df83ebdd7b67b52a37bc84c6e25f7056f756fb216c5c8e5c95ae1673fcbb6015"}, + {file = "fastavro-1.5.1-cp38-cp38-win_amd64.whl", hash = "sha256:0053347a92add6f448837ff00099b0a7200ec5dd58e173743d856d65d0574ddb"}, + {file = "fastavro-1.5.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:6b4f8551ccbe0c9b19867b8c93029e8cfe8fa3757245caae6228f35ef0656371"}, + {file = "fastavro-1.5.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff241b5ce36df7af7461d001ca98fec6eacd56c4754c8ac7718e2d4b7b690a82"}, + {file = "fastavro-1.5.1-cp39-cp39-win_amd64.whl", hash = "sha256:fb3491c88e7962a6b820548ddd12b9c0f6296ebd2385a3021296f14bfe35189a"}, + {file = "fastavro-1.5.1.tar.gz", hash = "sha256:0815da740ced2261f90b0ddbb5bbe645e9c893c8f00e5dc8d30b8ec20f3c7fa9"}, @@ -3085,2 +3095,2 @@ filelock = [ - {file = "filelock-3.7.0-py3-none-any.whl", hash = "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6"}, - {file = "filelock-3.7.0.tar.gz", hash = "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20"}, + {file = "filelock-3.7.1-py3-none-any.whl", hash = "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404"}, + {file = "filelock-3.7.1.tar.gz", hash = "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04"}, @@ -3184,2 +3194,2 @@ google-auth = [ - {file = "google-auth-2.6.6.tar.gz", hash = "sha256:1ba4938e032b73deb51e59c4656a00e0939cf0b1112575099f136babb4563312"}, - {file = "google_auth-2.6.6-py2.py3-none-any.whl", hash = "sha256:349ac49b18b01019453cc99c11c92ed772739778c92f184002b7ab3a5b7ac77d"}, + {file = "google-auth-2.7.0.tar.gz", hash = "sha256:8a954960f852d5f19e6af14dd8e75c20159609e85d8db37e4013cc8c3824a7e1"}, + {file = "google_auth-2.7.0-py2.py3-none-any.whl", hash = "sha256:df549a1433108801b11bdcc0e312eaf0d5f0500db42f0523e4d65c78722e8475"}, @@ -3326 +3336 @@ libcache = [ - {file = "libcache-0.1.6-py3-none-any.whl", hash = "sha256:c2e8fed85516045c62d92096a7bc0ff2215fc33e2c824cd9d91fa11aafc9d544"}, + {file = "libcache-0.1.7-py3-none-any.whl", hash = "sha256:ec3eda392a4c68c6af1779b1d7335520b3cd0eddf58f7cc9857535ab6d82ce64"}, @@ -3338 +3348 @@ libqueue = [ - {file = "libqueue-0.1.4-py3-none-any.whl", hash = "sha256:64d3f22ab0d667ed6a9b5aed79d481c32eca5f5d948caa824f6feedfa11a89df"}, + {file = "libqueue-0.1.6-py3-none-any.whl", hash = "sha256:23a03ce67a8d3dd8609e24b2e0f9aba9718d9b69dc642559b1a13c1421dd5537"}, @@ -3345 +3355 @@ libutils = [ - {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, + {file = "libutils-0.1.2-py3-none-any.whl", hash = "sha256:cd2fcf357dc234cb09552e32c80d40a550bef9882330ce11cc22b60cb61332ba"}, @@ -3382,61 +3392,63 @@ lxml = [ - {file = "lxml-4.8.0-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:e1ab2fac607842ac36864e358c42feb0960ae62c34aa4caaf12ada0a1fb5d99b"}, - {file = "lxml-4.8.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:28d1af847786f68bec57961f31221125c29d6f52d9187c01cd34dc14e2b29430"}, - {file = "lxml-4.8.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:b92d40121dcbd74831b690a75533da703750f7041b4bf951befc657c37e5695a"}, - {file = "lxml-4.8.0-cp27-cp27m-win32.whl", hash = "sha256:e01f9531ba5420838c801c21c1b0f45dbc9607cb22ea2cf132844453bec863a5"}, - {file = "lxml-4.8.0-cp27-cp27m-win_amd64.whl", hash = "sha256:6259b511b0f2527e6d55ad87acc1c07b3cbffc3d5e050d7e7bcfa151b8202df9"}, - {file = "lxml-4.8.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1010042bfcac2b2dc6098260a2ed022968dbdfaf285fc65a3acf8e4eb1ffd1bc"}, - {file = "lxml-4.8.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:fa56bb08b3dd8eac3a8c5b7d075c94e74f755fd9d8a04543ae8d37b1612dd170"}, - {file = "lxml-4.8.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:31ba2cbc64516dcdd6c24418daa7abff989ddf3ba6d3ea6f6ce6f2ed6e754ec9"}, - {file = "lxml-4.8.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:31499847fc5f73ee17dbe1b8e24c6dafc4e8d5b48803d17d22988976b0171f03"}, - {file = "lxml-4.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:5f7d7d9afc7b293147e2d506a4596641d60181a35279ef3aa5778d0d9d9123fe"}, - {file = "lxml-4.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:a3c5f1a719aa11866ffc530d54ad965063a8cbbecae6515acbd5f0fae8f48eaa"}, - {file = "lxml-4.8.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6268e27873a3d191849204d00d03f65c0e343b3bcb518a6eaae05677c95621d1"}, - {file = "lxml-4.8.0-cp310-cp310-win32.whl", hash = "sha256:330bff92c26d4aee79c5bc4d9967858bdbe73fdbdbacb5daf623a03a914fe05b"}, - {file = "lxml-4.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:b2582b238e1658c4061ebe1b4df53c435190d22457642377fd0cb30685cdfb76"}, - {file = "lxml-4.8.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a2bfc7e2a0601b475477c954bf167dee6d0f55cb167e3f3e7cefad906e7759f6"}, - {file = "lxml-4.8.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:a1547ff4b8a833511eeaceacbcd17b043214fcdb385148f9c1bc5556ca9623e2"}, - {file = "lxml-4.8.0-cp35-cp35m-win32.whl", hash = "sha256:a9f1c3489736ff8e1c7652e9dc39f80cff820f23624f23d9eab6e122ac99b150"}, - {file = "lxml-4.8.0-cp35-cp35m-win_amd64.whl", hash = "sha256:530f278849031b0eb12f46cca0e5db01cfe5177ab13bd6878c6e739319bae654"}, - {file = "lxml-4.8.0-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:078306d19a33920004addeb5f4630781aaeabb6a8d01398045fcde085091a169"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:86545e351e879d0b72b620db6a3b96346921fa87b3d366d6c074e5a9a0b8dadb"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:24f5c5ae618395ed871b3d8ebfcbb36e3f1091fd847bf54c4de623f9107942f3"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:bbab6faf6568484707acc052f4dfc3802bdb0cafe079383fbaa23f1cdae9ecd4"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7993232bd4044392c47779a3c7e8889fea6883be46281d45a81451acfd704d7e"}, - {file = "lxml-4.8.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6d6483b1229470e1d8835e52e0ff3c6973b9b97b24cd1c116dca90b57a2cc613"}, - {file = "lxml-4.8.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:ad4332a532e2d5acb231a2e5d33f943750091ee435daffca3fec0a53224e7e33"}, - {file = "lxml-4.8.0-cp36-cp36m-win32.whl", hash = "sha256:db3535733f59e5605a88a706824dfcb9bd06725e709ecb017e165fc1d6e7d429"}, - {file = "lxml-4.8.0-cp36-cp36m-win_amd64.whl", hash = "sha256:5f148b0c6133fb928503cfcdfdba395010f997aa44bcf6474fcdd0c5398d9b63"}, - {file = "lxml-4.8.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:8a31f24e2a0b6317f33aafbb2f0895c0bce772980ae60c2c640d82caac49628a"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:719544565c2937c21a6f76d520e6e52b726d132815adb3447ccffbe9f44203c4"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:c0b88ed1ae66777a798dc54f627e32d3b81c8009967c63993c450ee4cbcbec15"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:fa9b7c450be85bfc6cd39f6df8c5b8cbd76b5d6fc1f69efec80203f9894b885f"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e9f84ed9f4d50b74fbc77298ee5c870f67cb7e91dcdc1a6915cb1ff6a317476c"}, - {file = "lxml-4.8.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:1d650812b52d98679ed6c6b3b55cbb8fe5a5460a0aef29aeb08dc0b44577df85"}, - {file = "lxml-4.8.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:80bbaddf2baab7e6de4bc47405e34948e694a9efe0861c61cdc23aa774fcb141"}, - {file = "lxml-4.8.0-cp37-cp37m-win32.whl", hash = "sha256:6f7b82934c08e28a2d537d870293236b1000d94d0b4583825ab9649aef7ddf63"}, - {file = "lxml-4.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e1fd7d2fe11f1cb63d3336d147c852f6d07de0d0020d704c6031b46a30b02ca8"}, - {file = "lxml-4.8.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:5045ee1ccd45a89c4daec1160217d363fcd23811e26734688007c26f28c9e9e7"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:0c1978ff1fd81ed9dcbba4f91cf09faf1f8082c9d72eb122e92294716c605428"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:52cbf2ff155b19dc4d4100f7442f6a697938bf4493f8d3b0c51d45568d5666b5"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ce13d6291a5f47c1c8dbd375baa78551053bc6b5e5c0e9bb8e39c0a8359fd52f"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e11527dc23d5ef44d76fef11213215c34f36af1608074561fcc561d983aeb870"}, - {file = "lxml-4.8.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:60d2f60bd5a2a979df28ab309352cdcf8181bda0cca4529769a945f09aba06f9"}, - {file = "lxml-4.8.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:62f93eac69ec0f4be98d1b96f4d6b964855b8255c345c17ff12c20b93f247b68"}, - {file = "lxml-4.8.0-cp38-cp38-win32.whl", hash = "sha256:20b8a746a026017acf07da39fdb10aa80ad9877046c9182442bf80c84a1c4696"}, - {file = "lxml-4.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:891dc8f522d7059ff0024cd3ae79fd224752676447f9c678f2a5c14b84d9a939"}, - {file = "lxml-4.8.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b6fc2e2fb6f532cf48b5fed57567ef286addcef38c28874458a41b7837a57807"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:74eb65ec61e3c7c019d7169387d1b6ffcfea1b9ec5894d116a9a903636e4a0b1"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:627e79894770783c129cc5e89b947e52aa26e8e0557c7e205368a809da4b7939"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:545bd39c9481f2e3f2727c78c169425efbfb3fbba6e7db4f46a80ebb249819ca"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5a58d0b12f5053e270510bf12f753a76aaf3d74c453c00942ed7d2c804ca845c"}, - {file = "lxml-4.8.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:ec4b4e75fc68da9dc0ed73dcdb431c25c57775383fec325d23a770a64e7ebc87"}, - {file = "lxml-4.8.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5804e04feb4e61babf3911c2a974a5b86f66ee227cc5006230b00ac6d285b3a9"}, - {file = "lxml-4.8.0-cp39-cp39-win32.whl", hash = "sha256:aa0cf4922da7a3c905d000b35065df6184c0dc1d866dd3b86fd961905bbad2ea"}, - {file = "lxml-4.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:dd10383f1d6b7edf247d0960a3db274c07e96cf3a3fc7c41c8448f93eac3fb1c"}, - {file = "lxml-4.8.0-pp37-pypy37_pp73-macosx_10_14_x86_64.whl", hash = "sha256:2403a6d6fb61c285969b71f4a3527873fe93fd0abe0832d858a17fe68c8fa507"}, - {file = "lxml-4.8.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:986b7a96228c9b4942ec420eff37556c5777bfba6758edcb95421e4a614b57f9"}, - {file = "lxml-4.8.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:6fe4ef4402df0250b75ba876c3795510d782def5c1e63890bde02d622570d39e"}, - {file = "lxml-4.8.0-pp38-pypy38_pp73-macosx_10_14_x86_64.whl", hash = "sha256:f10ce66fcdeb3543df51d423ede7e238be98412232fca5daec3e54bcd16b8da0"}, - {file = "lxml-4.8.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:730766072fd5dcb219dd2b95c4c49752a54f00157f322bc6d71f7d2a31fecd79"}, - {file = "lxml-4.8.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:8b99ec73073b37f9ebe8caf399001848fced9c08064effdbfc4da2b5a8d07b93"}, - {file = "lxml-4.8.0.tar.gz", hash = "sha256:f63f62fc60e6228a4ca9abae28228f35e1bd3ce675013d1dfb828688d50c6e23"}, + {file = "lxml-4.9.0-cp27-cp27m-macosx_10_15_x86_64.whl", hash = "sha256:b5031d151d6147eac53366d6ec87da84cd4d8c5e80b1d9948a667a7164116e39"}, + {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5d52e1173f52020392f593f87a6af2d4055dd800574a5cb0af4ea3878801d307"}, + {file = "lxml-4.9.0-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:3af00ee88376022589ceeb8170eb67dacf5f7cd625ea59fa0977d719777d4ae8"}, + {file = "lxml-4.9.0-cp27-cp27m-win32.whl", hash = "sha256:1057356b808d149bc14eb8f37bb89129f237df488661c1e0fc0376ca90e1d2c3"}, + {file = "lxml-4.9.0-cp27-cp27m-win_amd64.whl", hash = "sha256:f6d23a01921b741774f35e924d418a43cf03eca1444f3fdfd7978d35a5aaab8b"}, + {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:56e19fb6e4b8bd07fb20028d03d3bc67bcc0621347fbde64f248e44839771756"}, + {file = "lxml-4.9.0-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4cd69bca464e892ea4ed544ba6a7850aaff6f8d792f8055a10638db60acbac18"}, + {file = "lxml-4.9.0-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:94b181dd2777890139e49a5336bf3a9a3378ce66132c665fe8db4e8b7683cde2"}, + {file = "lxml-4.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:607224ffae9a0cf0a2f6e14f5f6bce43e83a6fbdaa647891729c103bdd6a5593"}, + {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:11d62c97ceff9bab94b6b29c010ea5fb6831743459bb759c917f49ba75601cd0"}, + {file = "lxml-4.9.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:70a198030d26f5e569367f0f04509b63256faa76a22886280eea69a4f535dd40"}, + {file = "lxml-4.9.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:3cf816aed8125cfc9e6e5c6c31ff94278320d591bd7970c4a0233bee0d1c8790"}, + {file = "lxml-4.9.0-cp310-cp310-win32.whl", hash = "sha256:65b3b5f12c6fb5611e79157214f3cd533083f9b058bf2fc8a1c5cc5ee40fdc5a"}, + {file = "lxml-4.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:0aa4cce579512c33373ca4c5e23c21e40c1aa1a33533a75e51b654834fd0e4f2"}, + {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:63419db39df8dc5564f6f103102c4665f7e4d9cb64030e98cf7a74eae5d5760d"}, + {file = "lxml-4.9.0-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d8e5021e770b0a3084c30dda5901d5fce6d4474feaf0ced8f8e5a82702502fbb"}, + {file = "lxml-4.9.0-cp35-cp35m-win32.whl", hash = "sha256:f17b9df97c5ecdfb56c5e85b3c9df9831246df698f8581c6e111ac664c7c656e"}, + {file = "lxml-4.9.0-cp35-cp35m-win_amd64.whl", hash = "sha256:75da29a0752c8f2395df0115ac1681cefbdd4418676015be8178b733704cbff2"}, + {file = "lxml-4.9.0-cp36-cp36m-macosx_10_15_x86_64.whl", hash = "sha256:e4d020ecf3740b7312bacab2cb966bb720fd4d3490562d373b4ad91dd1857c0d"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:b71c52d69b91af7d18c13aef1b0cc3baee36b78607c711eb14a52bf3aa7c815e"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:28cf04a1a38e961d4a764d2940af9b941b66263ed5584392ef875ee9c1e360a3"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:915ecf7d486df17cc65aeefdb680d5ad4390cc8c857cf8db3fe241ed234f856a"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e564d5a771b4015f34166a05ea2165b7e283635c41b1347696117f780084b46d"}, + {file = "lxml-4.9.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c2a57755e366e0ac7ebdb3e9207f159c3bf1afed02392ab18453ce81f5ee92ee"}, + {file = "lxml-4.9.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:00f3a6f88fd5f4357844dd91a1abac5f466c6799f1b7f1da2df6665253845b11"}, + {file = "lxml-4.9.0-cp36-cp36m-win32.whl", hash = "sha256:9093a359a86650a3dbd6532c3e4d21a6f58ba2cb60d0e72db0848115d24c10ba"}, + {file = "lxml-4.9.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1690c4d37674a5f0cdafbc5ed7e360800afcf06928c2a024c779c046891bf09"}, + {file = "lxml-4.9.0-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:6af7f51a6010748fc1bb71917318d953c9673e4ae3f6d285aaf93ef5b2eb11c1"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:eabdbe04ee0a7e760fa6cd9e799d2b020d098c580ba99107d52e1e5e538b1ecb"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:b1e22f3ee4d75ca261b6bffbf64f6f178cb194b1be3191065a09f8d98828daa9"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:53b0410b220766321759f7f9066da67b1d0d4a7f6636a477984cbb1d98483955"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:d76da27f5e3e9bc40eba6ed7a9e985f57547e98cf20521d91215707f2fb57e0f"}, + {file = "lxml-4.9.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:686565ac77ff94a8965c11829af253d9e2ce3bf0d9225b1d2eb5c4d4666d0dca"}, + {file = "lxml-4.9.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b62d1431b4c40cda43cc986f19b8c86b1d2ae8918cfc00f4776fdf070b65c0c4"}, + {file = "lxml-4.9.0-cp37-cp37m-win32.whl", hash = "sha256:4becd16750ca5c2a1b1588269322b2cebd10c07738f336c922b658dbab96a61c"}, + {file = "lxml-4.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e35a298691b9e10e5a5631f8f0ba605b30ebe19208dc8f58b670462f53753641"}, + {file = "lxml-4.9.0-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:aa7447bf7c1a15ef24e2b86a277b585dd3f055e8890ac7f97374d170187daa97"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:612ef8f2795a89ba3a1d4c8c1af84d8453fd53ee611aa5ad460fdd2cab426fc2"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:1bfb791a8fcdbf55d1d41b8be940393687bec0e9b12733f0796668086d1a23ff"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:024684e0c5cfa121c22140d3a0898a3a9b2ea0f0fd2c229b6658af4bdf1155e5"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:81c29c8741fa07ecec8ec7417c3d8d1e2f18cf5a10a280f4e1c3f8c3590228b2"}, + {file = "lxml-4.9.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6467626fa74f96f4d80fc6ec2555799e97fff8f36e0bfc7f67769f83e59cff40"}, + {file = "lxml-4.9.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9cae837b988f44925d14d048fa6a8c54f197c8b1223fd9ee9c27084f84606143"}, + {file = "lxml-4.9.0-cp38-cp38-win32.whl", hash = "sha256:5a49ad78543925e1a4196e20c9c54492afa4f1502c2a563f73097e2044c75190"}, + {file = "lxml-4.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:bb7c1b029e54e26e01b1d1d912fc21abb65650d16ea9a191d026def4ed0859ed"}, + {file = "lxml-4.9.0-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d0d03b9636f1326772e6854459728676354d4c7731dae9902b180e2065ba3da6"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:9af19eb789d674b59a9bee5005779757aab857c40bf9cc313cb01eafac55ce55"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:dd00d28d1ab5fa7627f5abc957f29a6338a7395b724571a8cbff8fbed83aaa82"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:754a1dd04bff8a509a31146bd8f3a5dc8191a8694d582dd5fb71ff09f0722c22"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:b7679344f2270840dc5babc9ccbedbc04f7473c1f66d4676bb01680c0db85bcc"}, + {file = "lxml-4.9.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:d882c2f3345261e898b9f604be76b61c901fbfa4ac32e3f51d5dc1edc89da3cb"}, + {file = "lxml-4.9.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4e97c8fc761ad63909198acc892f34c20f37f3baa2c50a62d5ec5d7f1efc68a1"}, + {file = "lxml-4.9.0-cp39-cp39-win32.whl", hash = "sha256:cf9ec915857d260511399ab87e1e70fa13d6b2972258f8e620a3959468edfc32"}, + {file = "lxml-4.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:1254a79f8a67a3908de725caf59eae62d86738f6387b0a34b32e02abd6ae73db"}, + {file = "lxml-4.9.0-pp37-pypy37_pp73-macosx_10_15_x86_64.whl", hash = "sha256:03370ec37fe562238d385e2c53089076dee53aabf8325cab964fdb04a9130fa0"}, + {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:f386def57742aacc3d864169dfce644a8c396f95aa35b41b69df53f558d56dd0"}, + {file = "lxml-4.9.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:ea3f2e9eb41f973f73619e88bf7bd950b16b4c2ce73d15f24a11800ce1eaf276"}, + {file = "lxml-4.9.0-pp38-pypy38_pp73-macosx_10_15_x86_64.whl", hash = "sha256:2d10659e6e5c53298e6d718fd126e793285bff904bb71d7239a17218f6a197b7"}, + {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:fcdf70191f0d1761d190a436db06a46f05af60e1410e1507935f0332280c9268"}, + {file = "lxml-4.9.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:2b9c2341d96926b0d0e132e5c49ef85eb53fa92ae1c3a70f9072f3db0d32bc07"}, + {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_24_i686.whl", hash = "sha256:615886ee84b6f42f1bdf1852a9669b5fe3b96b6ff27f1a7a330b67ad9911200a"}, + {file = "lxml-4.9.0-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_24_x86_64.whl", hash = "sha256:94f2e45b054dd759bed137b6e14ae8625495f7d90ddd23cf62c7a68f72b62656"}, + {file = "lxml-4.9.0.tar.gz", hash = "sha256:520461c36727268a989790aef08884347cd41f2d8ae855489ccf40b50321d8d7"}, @@ -3461,2 +3473,2 @@ msal = [ - {file = "msal-1.17.0-py2.py3-none-any.whl", hash = "sha256:5a52d78e70d2c451e267c1e8c2342e4c06f495c75c859aeafd9260d3974f09fe"}, - {file = "msal-1.17.0.tar.gz", hash = "sha256:04e3cb7bb75c51f56d290381f23056207df1f3eb594ed03d38551f3b16d2a36e"}, + {file = "msal-1.18.0-py2.py3-none-any.whl", hash = "sha256:9c10e6cb32e0b6b8eaafc1c9a68bc3b2ff71505e0c5b8200799582d8b9f22947"}, + {file = "msal-1.18.0.tar.gz", hash = "sha256:576af55866038b60edbcb31d831325a1bd8241ed272186e2832968fd4717d202"}, @@ -3469,2 +3481,2 @@ msrest = [ - {file = "msrest-0.6.21-py2.py3-none-any.whl", hash = "sha256:c840511c845330e96886011a236440fafc2c9aff7b2df9c0a92041ee2dee3782"}, - {file = "msrest-0.6.21.tar.gz", hash = "sha256:72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8"}, + {file = "msrest-0.7.1-py3-none-any.whl", hash = "sha256:21120a810e1233e5e6cc7fe40b474eeb4ec6f757a15d7cf86702c369f9567c32"}, + {file = "msrest-0.7.1.zip", hash = "sha256:6e7661f46f3afd88b75667b7187a92829924446c7ea1d169be8c4bb7eeb788b9"}, @@ -3645,32 +3657,33 @@ orjson = [ - {file = "orjson-3.6.8-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:3a287a650458de2211db03681b71c3e5cb2212b62f17a39df8ad99fc54855d0f"}, - {file = "orjson-3.6.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5204e25c12cea58e524fc82f7c27ed0586f592f777b33075a92ab7b3eb3687c2"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77e8386393add64f959c044e0fb682364fd0e611a6f477aa13f0e6a733bd6a28"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:279f2d2af393fdf8601020744cb206b91b54ad60fb8401e0761819c7bda1f4e4"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:c31c9f389be7906f978ed4192eb58a4b74a37ad60556a0b88ddc47c576697770"}, - {file = "orjson-3.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0db5c5a0c5b89f092d52f6e5a3701660a9d6ffa9e2968b3ce17c2bc4f5eb0414"}, - {file = "orjson-3.6.8-cp310-none-win_amd64.whl", hash = "sha256:eb22485847b9a0c4bbedc668df860126ac931edbed1d456cf41a59f3cb961ed8"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:1a5fe569310bc819279bd4d5f2c349910b104ed3207936246dd5d5e0b085e74a"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:ccb356a47ab1067cd3549847e9db1d279a63fe0482d315b3ffd6e7abef35ef77"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ab29c069c222248ce302a25855b4e1664f9436e8ae5a131fb0859daf31676d2b"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d2b5e4cba9e774ac011071d9d27760f97f4b8cd46003e971d122e712f971345"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:c311ec504414d22834d5b972a209619925b48263856a11a14d90230f9682d49c"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:a3dfec7950b90fb8d143743503ee53fa06b32e6068bdea792fc866284da3d71d"}, - {file = "orjson-3.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b890dbbada2cbb26eb29bd43a848426f007f094bb0758df10dfe7a438e1cb4b4"}, - {file = "orjson-3.6.8-cp37-none-win_amd64.whl", hash = "sha256:9143ae2c52771525be9ad11a7a8cc8e7fd75391b107e7e644a9e0050496f6b4f"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:33a82199fd42f6436f833e210ae5129c922a5c355629356ca7a8e82964da7285"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:90159ea8b9a5a2a98fa33dc7b421cfac4d2ae91ba5e1058f5909e7f059f6b467"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:656fbe15d9ef0733e740d9def78f4fdb4153102f4836ee774a05123499005931"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7be3be6153843e0f01351b1313a5ad4723595427680dac2dfff22a37e652ce02"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:dd24f66b6697ee7424f7da575ec6cbffc8ede441114d53470949cda4d97c6e56"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:b07c780f7345ecf5901356dc21dee0669defc489c38ce7b9ab0f5e008cc0385c"}, - {file = "orjson-3.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ea32015a5d8a4ce00d348a0de5dc7040e0ad58f970a8fcbb5713a1eac129e493"}, - {file = "orjson-3.6.8-cp38-none-win_amd64.whl", hash = "sha256:c5a3e382194c838988ec128a26b08aa92044e5e055491cc4056142af0c1c54d7"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:83a8424e857ae1bf53530e88b4eb2f16ca2b489073b924e655f1575cacd7f52a"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:81e1a6a2d67f15007dadacbf9ba5d3d79237e5e33786c028557fe5a2b72f1c9a"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:137b539881c77866eba86ff6a11df910daf2eb9ab8f1acae62f879e83d7c38af"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cbd358f3b3ad539a27e36900e8e7d172d0e1b72ad9dd7d69544dcbc0f067ee7"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:6ab94701542d40b90903ecfc339333f458884979a01cb9268bc662cc67a5f6d8"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:32b6f26593a9eb606b40775826beb0dac152e3d224ea393688fced036045a821"}, - {file = "orjson-3.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:afd9e329ebd3418cac3cd747769b1d52daa25fa672bbf414ab59f0e0881b32b9"}, - {file = "orjson-3.6.8-cp39-none-win_amd64.whl", hash = "sha256:0c89b419914d3d1f65a1b0883f377abe42a6e44f6624ba1c63e8846cbfc2fa60"}, - {file = "orjson-3.6.8.tar.gz", hash = "sha256:e19d23741c5de13689bb316abfccea15a19c264e3ec8eb332a5319a583595ace"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:4c6bdb0a7dfe53cca965a40371c7b8e72a0441c8bc4949c9015600f1c7fae408"}, + {file = "orjson-3.7.2-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:6e6fc60775bb0a050846710c4a110e8ad17f41e443ff9d0d05145d8f3a74b577"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e4b70bb1f746a9c9afb1f861a0496920b5833ff06f9d1b25b6a7d292cb7e8a06"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:99bb2127ee174dd6e68255db26dbef0bd6c4330377a17867ecfa314d47bfac82"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_aarch64.whl", hash = "sha256:26306d988401cc34ac94dd38873b8c0384276a5ad80cdf50e266e06083284975"}, + {file = "orjson-3.7.2-cp310-cp310-manylinux_2_28_x86_64.whl", hash = "sha256:34a67d810dbcec77d00d764ab730c5bbb0bee1d75a037c8d8e981506e8fba560"}, + {file = "orjson-3.7.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:14bc727f41ce0dd93d1a6a9fc06076e2401e71b00d0bf107bf64d88d2d963b77"}, + {file = "orjson-3.7.2-cp310-none-win_amd64.whl", hash = "sha256:4c686cbb73ccce02929dd799427897f0a0b2dd597d2f5b6b434917ecc3774146"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:12eb683ddbdddd6847ca2b3b074f42574afc0fbf1aff33d8fdf3a4329167762a"}, + {file = "orjson-3.7.2-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:993550e6e451a2b71435142d4824a09f8db80d497abae23dc9f3fe62b6ca24c0"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:54cfa4d915a98209366dcf500ee5c3f66408cc9e2b4fd777c8508f69a8f519a1"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f735999d49e2fff2c9812f1ea330b368349f77726894e2a06d17371e61d771bb"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_aarch64.whl", hash = "sha256:b2b660790b0804624c569ddb8ca9d31bac6f94f880fd54b8cdff4198735a9fec"}, + {file = "orjson-3.7.2-cp37-cp37m-manylinux_2_28_x86_64.whl", hash = "sha256:590bc5f33e54eb2261de65e4026876e57d04437bab8dcade9514557e31d84537"}, + {file = "orjson-3.7.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:8ac61c5c98cbcdcf7a3d0a4b62c873bbd9a996a69eaa44f8356a9e10aa29ef49"}, + {file = "orjson-3.7.2-cp37-none-win_amd64.whl", hash = "sha256:662bda15edf4d25d520945660873e730e3a6d9975041ba9c32f0ce93b632ee0d"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:19eb800811a53efc7111ff7536079fb2f62da7098df0a42756ba91e7bdd01aff"}, + {file = "orjson-3.7.2-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:54a1e4e39c89d37d3dbc74dde36d09eebcde365ec6803431af9c86604bbbaf3a"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fbd3b46ac514cbe29ecebcee3882383022acf84aa4d3338f26d068c6fbdf56a0"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:891640d332c8c7a1478ea6d13b676d239dc86451afa46000c4e8d0990a0d72dd"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_aarch64.whl", hash = "sha256:9778a7ec4c72d6814f1e116591f351404a4df2e1dc52d282ff678781f45b509b"}, + {file = "orjson-3.7.2-cp38-cp38-manylinux_2_28_x86_64.whl", hash = "sha256:b0b2483f8ad1f93ae4aa43bcf6a985e6ec278e931d0118bae605ffd811b614a1"}, + {file = "orjson-3.7.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2d90ca4e74750c7adfb7708deb096f835f7e6c4b892bdf703fe871565bb04ad7"}, + {file = "orjson-3.7.2-cp38-none-win_amd64.whl", hash = "sha256:b0f4e92bdfe86a0da57028e669bc1f50f48d810ef6f661e63dc6593c450314bf"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:b705132b2827d33291684067cca6baa451a499b459e46761d30fcf4d6ce21a9a"}, + {file = "orjson-3.7.2-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:c589d00b4fb0777f222b35925e4fa030c4777f16d1623669f44bdc191570be66"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7e197e6779b230e74333e06db804ff876b27306470f68692ec70c27310e7366f"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a82089ec9e1f7e9b992ff5ab98b4c3c2f98e7bbfdc6fadbef046c5aaafec2b54"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_aarch64.whl", hash = "sha256:3ff49c219b30d715c8baae17c7c5839fe3f2c2db10a66c61d6b91bda80bf8789"}, + {file = "orjson-3.7.2-cp39-cp39-manylinux_2_28_x86_64.whl", hash = "sha256:299a743576aaa04f5c7994010608f96df5d4a924d584a686c6e263cee732cb00"}, + {file = "orjson-3.7.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d3ae3ed52c875ce1a6c607f852ca177057445289895483b0247f0dc57b481241"}, + {file = "orjson-3.7.2-cp39-none-win_amd64.whl", hash = "sha256:796914f7463277d371402775536fb461948c0d34a67d20a57dc4ec49a48a8613"}, + {file = "orjson-3.7.2.tar.gz", hash = "sha256:1cf9690a0b7c51a988221376741a31087bc1dc2ac327bb2dde919806dfa59444"}, @@ -4372,74 +4385,74 @@ regex = [ - {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, - {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, - {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, - {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, - {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, - {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, - {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, - {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, - {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, - {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, - {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, - {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, - {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, - {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, - {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:042d122f9fee3ceb6d7e3067d56557df697d1aad4ff5f64ecce4dc13a90a7c01"}, + {file = "regex-2022.6.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:ffef4b30785dc2d1604dfb7cf9fca5dc27cd86d65f7c2a9ec34d6d3ae4565ec2"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0afa6a601acf3c0dc6de4e8d7d8bbce4e82f8542df746226cd35d4a6c15e9456"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4a11cbe8eb5fb332ae474895b5ead99392a4ea568bd2a258ab8df883e9c2bf92"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c1f62ee2ba880e221bc950651a1a4b0176083d70a066c83a50ef0cb9b178e12"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5aba3d13c77173e9bfed2c2cea7fc319f11c89a36fcec08755e8fb169cf3b0df"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:249437f7f5b233792234aeeecb14b0aab1566280de42dfc97c26e6f718297d68"}, + {file = "regex-2022.6.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:179410c79fa86ef318d58ace233f95b87b05a1db6dc493fa29404a43f4b215e2"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5e201b1232d81ca1a7a22ab2f08e1eccad4e111579fd7f3bbf60b21ef4a16cea"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:fdecb225d0f1d50d4b26ac423e0032e76d46a788b83b4e299a520717a47d968c"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:be57f9c7b0b423c66c266a26ad143b2c5514997c05dd32ce7ca95c8b209c2288"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:ed657a07d8a47ef447224ea00478f1c7095065dfe70a89e7280e5f50a5725131"}, + {file = "regex-2022.6.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:24908aefed23dd065b4a668c0b4ca04d56b7f09d8c8e89636cf6c24e64e67a1e"}, + {file = "regex-2022.6.2-cp310-cp310-win32.whl", hash = "sha256:775694cd0bb2c4accf2f1cdd007381b33ec8b59842736fe61bdbad45f2ac7427"}, + {file = "regex-2022.6.2-cp310-cp310-win_amd64.whl", hash = "sha256:809bbbbbcf8258049b031d80932ba71627d2274029386f0452e9950bcfa2c6e8"}, + {file = "regex-2022.6.2-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2b5d983eb0adf2049d41f95205bdc3de4e6cc2350e9c80d4409d3a75229de"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2f4c101746a8dac0401abefa716b357c546e61ea2e3d4a564a9db9eac57ccbce"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:166ae7674d0a0e0f8044e7335ba86d0716c9d49465cff1b153f908e0470b8300"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:c5eac5d8a8ac9ccf00805d02a968a36f5c967db6c7d2b747ab9ed782b3b3a28b"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f57823f35b18d82b201c1b27ce4e55f88e79e81d9ca07b50ce625d33823e1439"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d42e3b7b23473729adbf76103e7df75f9167a5a80b1257ca30688352b4bb2dc"}, + {file = "regex-2022.6.2-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b2932e728bee0a634fe55ee54d598054a5a9ffe4cd2be21ba2b4b8e5f8064c2c"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:17764683ea01c2b8f103d99ae9de2473a74340df13ce306c49a721f0b1f0eb9e"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:2ac29b834100d2c171085ceba0d4a1e7046c434ddffc1434dbc7f9d59af1e945"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:f43522fb5d676c99282ca4e2d41e8e2388427c0cf703db6b4a66e49b10b699a8"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:9faa01818dad9111dbf2af26c6e3c45140ccbd1192c3a0981f196255bf7ec5e6"}, + {file = "regex-2022.6.2-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:17443f99b8f255273731f915fdbfea4d78d809bb9c3aaf67b889039825d06515"}, + {file = "regex-2022.6.2-cp36-cp36m-win32.whl", hash = "sha256:4a5449adef907919d4ce7a1eab2e27d0211d1b255bf0b8f5dd330ad8707e0fc3"}, + {file = "regex-2022.6.2-cp36-cp36m-win_amd64.whl", hash = "sha256:4d206703a96a39763b5b45cf42645776f5553768ea7f3c2c1a39a4f59cafd4ba"}, + {file = "regex-2022.6.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fcd7c432202bcb8b642c3f43d5bcafc5930d82fe5b2bf2c008162df258445c1d"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:186c5a4a4c40621f64d771038ede20fca6c61a9faa8178f9e305aaa0c2442a97"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:047b2d1323a51190c01b6604f49fe09682a5c85d3c1b2c8b67c1cd68419ce3c4"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:30637e7fa4acfed444525b1ab9683f714be617862820578c9fd4e944d4d9ad1f"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3adafe6f2c6d86dbf3313866b61180530ca4dcd0c264932dc8fa1ffb10871d58"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:67ae3601edf86e15ebe40885e5bfdd6002d34879070be15cf18fc0d80ea24fed"}, + {file = "regex-2022.6.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48dddddce0ea7e7c3e92c1e0c5a28c13ca4dc9cf7e996c706d00479652bff76c"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:68e5c641645351eb9eb12c465876e76b53717f99e9b92aea7a2dd645a87aa7aa"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:8fd5f8ae42f789538bb634bdfd69b9aa357e76fdfd7ad720f32f8994c0d84f1e"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:71988a76fcb68cc091e901fddbcac0f9ad9a475da222c47d3cf8db0876cb5344"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:4b8838f70be3ce9e706df9d72f88a0aa7d4c1fea61488e06fdf292ccb70ad2be"}, + {file = "regex-2022.6.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:663dca677bd3d2e2b5b7d0329e9f24247e6f38f3b740dd9a778a8ef41a76af41"}, + {file = "regex-2022.6.2-cp37-cp37m-win32.whl", hash = "sha256:24963f0b13cc63db336d8da2a533986419890d128c551baacd934c249d51a779"}, + {file = "regex-2022.6.2-cp37-cp37m-win_amd64.whl", hash = "sha256:ceff75127f828dfe7ceb17b94113ec2df4df274c4cd5533bb299cb099a18a8ca"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:1a6f2698cfa8340dfe4c0597782776b393ba2274fe4c079900c7c74f68752705"}, + {file = "regex-2022.6.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:a8a08ace913c4101f0dc0be605c108a3761842efd5f41a3005565ee5d169fb2b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:26dbe90b724efef7820c3cf4a0e5be7f130149f3d2762782e4e8ac2aea284a0b"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b5f759a1726b995dc896e86f17f9c0582b54eb4ead00ed5ef0b5b22260eaf2d0"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:1fc26bb3415e7aa7495c000a2c13bf08ce037775db98c1a3fac9ff04478b6930"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52684da32d9003367dc1a1c07e059b9bbaf135ad0764cd47d8ac3dba2df109bc"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1c1264eb40a71cf2bff43d6694ab7254438ca19ef330175060262b3c8dd3931a"}, + {file = "regex-2022.6.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:bc635ab319c9b515236bdf327530acda99be995f9d3b9f148ab1f60b2431e970"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:27624b490b5d8880f25dac67e1e2ea93dfef5300b98c6755f585799230d6c746"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:555f7596fd1f123f8c3a67974c01d6ef80b9769e04d660d6c1a7cc3e6cff7069"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:933e72fbe1829cbd59da2bc51ccd73d73162f087f88521a87a8ec9cb0cf10fa8"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:cff5c87e941292c97d11dc81bd20679f56a2830f0f0e32f75b8ed6e0eb40f704"}, + {file = "regex-2022.6.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:c757f3a27b6345de13ef3ca956aa805d7734ce68023e84d0fc74e1f09ce66f7a"}, + {file = "regex-2022.6.2-cp38-cp38-win32.whl", hash = "sha256:a58d21dd1a2d6b50ed091554ff85e448fce3fe33a4db8b55d0eba2ca957ed626"}, + {file = "regex-2022.6.2-cp38-cp38-win_amd64.whl", hash = "sha256:495a4165172848503303ed05c9d0409428f789acc27050fe2cf0a4549188a7d5"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1ab5cf7d09515548044e69d3a0ec77c63d7b9dfff4afc19653f638b992573126"}, + {file = "regex-2022.6.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:c1ea28f0ee6cbe4c0367c939b015d915aa9875f6e061ba1cf0796ca9a3010570"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3de1ecf26ce85521bf73897828b6d0687cc6cf271fb6ff32ac63d26b21f5e764"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7c7044aabdad2329974be2246babcc21d3ede852b3971a90fd8c2056c20360"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:53d69d77e9cfe468b000314dd656be85bb9e96de088a64f75fe128dfe1bf30dd"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5c8d61883a38b1289fba9944a19a361875b5c0170b83cdcc95ea180247c1b7d3"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5429202bef174a3760690d912e3a80060b323199a61cef6c6c29b30ce09fd17"}, + {file = "regex-2022.6.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e85b10280cf1e334a7c95629f6cbbfe30b815a4ea5f1e28d31f79eb92c2c3d93"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c400dfed4137f32127ea4063447006d7153c974c680bf0fb1b724cce9f8567fc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:7f648037c503985aed39f85088acab6f1eb6a0482d7c6c665a5712c9ad9eaefc"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:e7b2ff451f6c305b516281ec45425dd423223c8063218c5310d6f72a0a7a517c"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:be456b4313a86be41706319c397c09d9fdd2e5cdfde208292a277b867e99e3d1"}, + {file = "regex-2022.6.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c3db393b21b53d7e1d3f881b64c29d886cbfdd3df007e31de68b329edbab7d02"}, + {file = "regex-2022.6.2-cp39-cp39-win32.whl", hash = "sha256:d70596f20a03cb5f935d6e4aad9170a490d88fc4633679bf00c652e9def4619e"}, + {file = "regex-2022.6.2-cp39-cp39-win_amd64.whl", hash = "sha256:3b9b6289e03dbe6a6096880d8ac166cb23c38b4896ad235edee789d4e8697152"}, + {file = "regex-2022.6.2.tar.gz", hash = "sha256:f7b43acb2c46fb2cd506965b2d9cf4c5e64c9c612bac26c1187933c7296bf08c"}, @@ -4448,2 +4461,2 @@ requests = [ - {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, - {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, + {file = "requests-2.28.0-py3-none-any.whl", hash = "sha256:bc7861137fbce630f17b03d3ad02ad0bf978c844f3536d0edda6499dafce2b6f"}, + {file = "requests-2.28.0.tar.gz", hash = "sha256:d568723a7ebd25875d8d1eaf5dfa068cd2fc8194b2e483d7b1f7c81918dbec6b"}, @@ -4524,0 +4538,2 @@ sentencepiece = [ + {file = "sentencepiece-0.1.96-cp310-cp310-win32.whl", hash = "sha256:3028699bdb2fb0230804f3b8a617fe3af22f5c5a56416419b31a7da5e7bf83bc"}, + {file = "sentencepiece-0.1.96-cp310-cp310-win_amd64.whl", hash = "sha256:203443a7bd4295b6a3695787235abe0e77d4c369d7156a6b9a397c540a38bd27"}, @@ -4602 +4617 @@ tensorboard = [ - {file = "tensorboard-2.9.0-py3-none-any.whl", hash = "sha256:bd78211076dca5efa27260afacfaa96cd05c7db12a6c09cc76a1d6b2987ca621"}, + {file = "tensorboard-2.9.1-py3-none-any.whl", hash = "sha256:baa727f791776f9e5841d347127720ceed4bbd59c36b40604b95fb2ae6029276"}, @@ -4754,2 +4769,2 @@ transformers = [ - {file = "transformers-4.19.2-py3-none-any.whl", hash = "sha256:1416315b7c5ff1f56d3915f416b67aa254a9907fbb73ef7f7bffc9210446b5fa"}, - {file = "transformers-4.19.2.tar.gz", hash = "sha256:e19a4ff07458eda143c738e5259caf48449fcf078a63d6b1bd1aa806543440a3"}, + {file = "transformers-4.19.4-py3-none-any.whl", hash = "sha256:572d8ecbff29ec53769e0459b4334ebd1038f75ad25119a3006f8816643dccc4"}, + {file = "transformers-4.19.4.tar.gz", hash = "sha256:b8c0f9816b4c4c2f0265b24d0a0b9d4ae8b7b98fc779d63f92e3c121c4c2d483"}, @@ -4799,2 +4814,2 @@ types-psutil = [ - {file = "types-psutil-5.8.22.tar.gz", hash = "sha256:7556f37aaa2982d02b1accf45fe9d4d25e56473b58de16086101dd818ccbcf3d"}, - {file = "types_psutil-5.8.22-py3-none-any.whl", hash = "sha256:aa98bb5e1b702a70902172e69083a8e00802b6a7d7f03e2c7ba736b92919b8c6"}, + {file = "types-psutil-5.8.23.tar.gz", hash = "sha256:3e565c42846e811f1fda5d487ec5a08fe0c22ef51a232369dbfad67ceaaff6dd"}, + {file = "types_psutil-5.8.23-py3-none-any.whl", hash = "sha256:e4beaf154a59f9a750ba9716dbbdb2efec43aaf40a15b6af25443ae57a590941"}, @@ -4803,2 +4818,2 @@ types-requests = [ - {file = "types-requests-2.27.29.tar.gz", hash = "sha256:fb453b3a76a48eca66381cea8004feaaea12835e838196f5c7ac87c75c5c19ef"}, - {file = "types_requests-2.27.29-py3-none-any.whl", hash = "sha256:014f4f82db7b96c41feea9adaea30e68cd64c230eeab34b70c29bebb26ec74ac"}, + {file = "types-requests-2.27.30.tar.gz", hash = "sha256:ca8d7cc549c3d10dbcb3c69c1b53e3ffd1270089c1001a65c1e9e1017eb5e704"}, + {file = "types_requests-2.27.30-py3-none-any.whl", hash = "sha256:b9b6cd0a6e5d500e56419b79f44ec96f316e9375ff6c8ee566c39d25e9612621"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index e8afc140..39c7109e 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -18,3 +18,3 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.4-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.7-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.6-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.2-py3-none-any.whl", develop = false } diff --git a/services/worker/src/worker/models/column/__init__.py b/services/worker/src/worker/models/column/__init__.py index 9d456a37..5b95107c 100644 --- a/services/worker/src/worker/models/column/__init__.py +++ b/services/worker/src/worker/models/column/__init__.py @@ -0,0 +1 @@ +import contextlib @@ -14 +14,0 @@ from worker.models.column.default import ( - ColumnDict, @@ -16 +15,0 @@ from worker.models.column.default import ( - ColumnType, @@ -17,0 +17 @@ from worker.models.column.default import ( + CommonColumn, @@ -25,0 +26 @@ from worker.models.column.string import StringColumn +from worker.models.column.timestamp import TimestampColumn @@ -28,2 +29,5 @@ from worker.models.row import Row -column_classes = [ - AudioColumn, +timestamp_column_classes = [ + TimestampColumn, +] + +class_label_column_classes = [ @@ -30,0 +35,4 @@ column_classes = [ +] + +common_column_classes = [ + AudioColumn, @@ -54,5 +62,9 @@ def get_column(column_name: str, features: FeaturesOrNone, rows: List[Row]) -> C - for column_class in column_classes: - try: - return column_class(column_name, feature, values) - except (ColumnTypeError, CellTypeError, ColumnInferenceError): - pass + for timestamp_column_class in timestamp_column_classes: + with contextlib.suppress(ColumnTypeError, CellTypeError, ColumnInferenceError): + return timestamp_column_class(column_name, feature, values) + for class_label_column_class in class_label_column_classes: + with contextlib.suppress(ColumnTypeError, CellTypeError, ColumnInferenceError): + return class_label_column_class(column_name, feature, values) + for common_column_class in common_column_classes: + with contextlib.suppress(ColumnTypeError, CellTypeError, ColumnInferenceError): + return common_column_class(column_name, feature, values) @@ -60 +72 @@ def get_column(column_name: str, features: FeaturesOrNone, rows: List[Row]) -> C - return Column(column_name, feature, values) + return CommonColumn(column_name, feature, values) @@ -78 +90 @@ def get_columns(info: DatasetInfo, rows: List[Row]) -> List[Column]: -__all__ = ["Column", "Cell", "ColumnType", "ColumnDict", "ClassLabelColumn"] +__all__ = ["Column", "Cell"] diff --git a/services/worker/src/worker/models/column/audio.py b/services/worker/src/worker/models/column/audio.py index 71b81c2b..33a940fc 100644 --- a/services/worker/src/worker/models/column/audio.py +++ b/services/worker/src/worker/models/column/audio.py @@ -10 +9,0 @@ from worker.models.column.default import ( - Column, @@ -12 +10,0 @@ from worker.models.column.default import ( - ColumnType, @@ -13,0 +12 @@ from worker.models.column.default import ( + CommonColumn, @@ -41 +40 @@ def infer_from_values(values: List[Any]) -> None: -class AudioColumn(Column): +class AudioColumn(CommonColumn): @@ -49 +48 @@ class AudioColumn(Column): - self.type = ColumnType.AUDIO_RELATIVE_SOURCES + self.type = "AUDIO_RELATIVE_SOURCES" diff --git a/services/worker/src/worker/models/column/bool.py b/services/worker/src/worker/models/column/bool.py index 23b99d90..c4891453 100644 --- a/services/worker/src/worker/models/column/bool.py +++ b/services/worker/src/worker/models/column/bool.py @@ -6 +5,0 @@ from worker.models.column.default import ( - Column, @@ -8 +6,0 @@ from worker.models.column.default import ( - ColumnType, @@ -9,0 +8 @@ from worker.models.column.default import ( + CommonColumn, @@ -26 +25 @@ def infer_from_values(values: List[Any]) -> None: -class BoolColumn(Column): +class BoolColumn(CommonColumn): @@ -34 +33 @@ class BoolColumn(Column): - self.type = ColumnType.BOOL + self.type = "BOOL" diff --git a/services/worker/src/worker/models/column/class_label.py b/services/worker/src/worker/models/column/class_label.py index 4d035f14..ebfb2402 100644 --- a/services/worker/src/worker/models/column/class_label.py +++ b/services/worker/src/worker/models/column/class_label.py @@ -3,0 +4 @@ from datasets import ClassLabel +from libutils.types import ClassLabelColumnType, ColumnDict @@ -5,8 +6 @@ from datasets import ClassLabel -from worker.models.column.default import ( - Cell, - CellTypeError, - Column, - ColumnDict, - ColumnType, - ColumnTypeError, -) +from worker.models.column.default import Cell, CellTypeError, Column, ColumnTypeError @@ -20,0 +15 @@ class ClassLabelColumn(Column): + type: ClassLabelColumnType @@ -31 +26 @@ class ClassLabelColumn(Column): - self.type = ColumnType.CLASS_LABEL + self.type = "CLASS_LABEL" @@ -38 +33 @@ class ClassLabelColumn(Column): - return {"name": self.name, "type": self.type.name, "labels": self.labels} + return {"name": self.name, "type": self.type, "labels": self.labels} diff --git a/services/worker/src/worker/models/column/default.py b/services/worker/src/worker/models/column/default.py index 3eb5c623..699ace9a 100644 --- a/services/worker/src/worker/models/column/default.py +++ b/services/worker/src/worker/models/column/default.py @@ -1 +1 @@ -from enum import Enum, auto +from abc import ABC, abstractmethod @@ -5,14 +5 @@ from datasets import Value -from libutils.types import ColumnDict - - -class ColumnType(Enum): - JSON = auto() # default - BOOL = auto() - INT = auto() - FLOAT = auto() - STRING = auto() - IMAGE_URL = auto() - RELATIVE_IMAGE_URL = auto() - AUDIO_RELATIVE_SOURCES = auto() - CLASS_LABEL = auto() - +from libutils.types import ColumnDict, ColumnType, CommonColumnType @@ -24 +11 @@ Cell = Any -class Column: +class Column(ABC): @@ -30 +17 @@ class Column: - self.type = ColumnType.JSON + self.type = "JSON" @@ -35,0 +23,8 @@ class Column: + @abstractmethod + def as_dict(self) -> ColumnDict: + pass + + +class CommonColumn(Column): + type: CommonColumnType + @@ -37 +32 @@ class Column: - return {"name": self.name, "type": self.type.name} + return {"name": self.name, "type": self.type} diff --git a/services/worker/src/worker/models/column/float.py b/services/worker/src/worker/models/column/float.py index 9de9d34c..66d2071a 100644 --- a/services/worker/src/worker/models/column/float.py +++ b/services/worker/src/worker/models/column/float.py @@ -6 +5,0 @@ from worker.models.column.default import ( - Column, @@ -8 +6,0 @@ from worker.models.column.default import ( - ColumnType, @@ -9,0 +8 @@ from worker.models.column.default import ( + CommonColumn, @@ -26 +25 @@ def infer_from_values(values: List[Any]) -> None: -class FloatColumn(Column): +class FloatColumn(CommonColumn): @@ -41 +40 @@ class FloatColumn(Column): - self.type = ColumnType.FLOAT + self.type = "FLOAT" diff --git a/services/worker/src/worker/models/column/image.py b/services/worker/src/worker/models/column/image.py index b4dfb24a..3ae9a51d 100644 --- a/services/worker/src/worker/models/column/image.py +++ b/services/worker/src/worker/models/column/image.py @@ -10 +9,0 @@ from worker.models.column.default import ( - Column, @@ -12 +10,0 @@ from worker.models.column.default import ( - ColumnType, @@ -13,0 +12 @@ from worker.models.column.default import ( + CommonColumn, @@ -31 +30 @@ def infer_from_values(values: List[Any]) -> None: -class ImageColumn(Column): +class ImageColumn(CommonColumn): @@ -39 +38 @@ class ImageColumn(Column): - self.type = ColumnType.RELATIVE_IMAGE_URL + self.type = "RELATIVE_IMAGE_URL" diff --git a/services/worker/src/worker/models/column/image_array2d.py b/services/worker/src/worker/models/column/image_array2d.py index 8bf6464f..ea069f22 100644 --- a/services/worker/src/worker/models/column/image_array2d.py +++ b/services/worker/src/worker/models/column/image_array2d.py @@ -11 +10,0 @@ from worker.models.column.default import ( - Column, @@ -13 +11,0 @@ from worker.models.column.default import ( - ColumnType, @@ -14,0 +13 @@ from worker.models.column.default import ( + CommonColumn, @@ -39 +38 @@ def infer_from_values(values: List[Any]) -> None: -class ImageArray2DColumn(Column): +class ImageArray2DColumn(CommonColumn): @@ -50 +49 @@ class ImageArray2DColumn(Column): - self.type = ColumnType.RELATIVE_IMAGE_URL + self.type = "RELATIVE_IMAGE_URL" diff --git a/services/worker/src/worker/models/column/image_array3d.py b/services/worker/src/worker/models/column/image_array3d.py index 847ef16c..dc95efae 100644 --- a/services/worker/src/worker/models/column/image_array3d.py +++ b/services/worker/src/worker/models/column/image_array3d.py @@ -11 +10,0 @@ from worker.models.column.default import ( - Column, @@ -13 +11,0 @@ from worker.models.column.default import ( - ColumnType, @@ -14,0 +13 @@ from worker.models.column.default import ( + CommonColumn, @@ -41 +40 @@ def infer_from_values(values: List[Any]) -> None: -class ImageArray3DColumn(Column): +class ImageArray3DColumn(CommonColumn): @@ -52 +51 @@ class ImageArray3DColumn(Column): - self.type = ColumnType.RELATIVE_IMAGE_URL + self.type = "RELATIVE_IMAGE_URL" diff --git a/services/worker/src/worker/models/column/image_url.py b/services/worker/src/worker/models/column/image_url.py index b3fb64cc..db0860bf 100644 --- a/services/worker/src/worker/models/column/image_url.py +++ b/services/worker/src/worker/models/column/image_url.py @@ -6 +5,0 @@ from worker.models.column.default import ( - Column, @@ -8 +6,0 @@ from worker.models.column.default import ( - ColumnType, @@ -9,0 +8 @@ from worker.models.column.default import ( + CommonColumn, @@ -28 +27 @@ def infer_from_values(values: List[Any]) -> None: -class ImageUrlColumn(Column): +class ImageUrlColumn(CommonColumn): @@ -40 +39 @@ class ImageUrlColumn(Column): - self.type = ColumnType.IMAGE_URL + self.type = "IMAGE_URL" diff --git a/services/worker/src/worker/models/column/int.py b/services/worker/src/worker/models/column/int.py index 0e65ab80..92cd4e4f 100644 --- a/services/worker/src/worker/models/column/int.py +++ b/services/worker/src/worker/models/column/int.py @@ -6 +5,0 @@ from worker.models.column.default import ( - Column, @@ -8 +6,0 @@ from worker.models.column.default import ( - ColumnType, @@ -9,0 +8 @@ from worker.models.column.default import ( + CommonColumn, @@ -26 +25 @@ def infer_from_values(values: List[Any]) -> None: -class IntColumn(Column): +class IntColumn(CommonColumn): @@ -46 +45 @@ class IntColumn(Column): - self.type = ColumnType.INT + self.type = "INT" diff --git a/services/worker/src/worker/models/column/string.py b/services/worker/src/worker/models/column/string.py index c0cb2ce2..8c50dc2f 100644 --- a/services/worker/src/worker/models/column/string.py +++ b/services/worker/src/worker/models/column/string.py @@ -6 +5,0 @@ from worker.models.column.default import ( - Column, @@ -8 +6,0 @@ from worker.models.column.default import ( - ColumnType, @@ -9,0 +8 @@ from worker.models.column.default import ( + CommonColumn, @@ -26 +25 @@ def infer_from_values(values: List[Any]) -> None: -class StringColumn(Column): +class StringColumn(CommonColumn): @@ -34 +33 @@ class StringColumn(Column): - self.type = ColumnType.STRING + self.type = "STRING" diff --git a/services/worker/src/worker/models/column/timestamp.py b/services/worker/src/worker/models/column/timestamp.py new file mode 100644 index 00000000..87682906 --- /dev/null +++ b/services/worker/src/worker/models/column/timestamp.py @@ -0,0 +1,101 @@ +import re +from typing import Any, List, Optional, get_args + +import pandas # type: ignore +from datasets import Value +from libutils.types import ColumnDict, TimestampColumnType, TimestampUnit + +from worker.models.column.default import ( + Cell, + CellTypeError, + Column, + ColumnInferenceError, + ColumnTypeError, +) + +# pandas types: see https://github.com/VirtusLab/pandas-stubs/issues/172 + + +TimestampTz = Optional[str] + + +def cast_to_timestamp_unit(value: str) -> TimestampUnit: + if value == "s": + return "s" + elif value == "ms": + return "ms" + elif value == "us": + return "us" + elif value == "ns": + return "ns" + raise ValueError("string cannot be cast to timestamp unit") + + +def get_tz(ts: pandas.Timestamp) -> TimestampTz: + return None if ts.tz is None else str(ts.tz) + + +def infer_from_values( + values: List[Any], +) -> TimestampTz: + if values and all(value is None for value in values): + raise ColumnInferenceError("all the values are None, cannot infer column type") + if any(not isinstance(value, pandas.Timestamp) for value in values): + raise ColumnInferenceError("some values are not timestamps, cannot infer column type") + timezones = {value.tz for value in values if isinstance(value, pandas.Timestamp) and value.tz is not None} + if len(timezones) > 1: + raise ColumnInferenceError("several timezones found in the values, cannot infer column type") + elif len(timezones) == 1: + return str(list(timezones)[0].tzinfo) + return None + + +class TimestampColumn(Column): + type: TimestampColumnType + unit: TimestampUnit + tz: TimestampTz + + def __init__(self, name: str, feature: Any, values: List[Any]): + if not feature: + tz = infer_from_values(values) + unit = "s" + if not isinstance(feature, Value): + raise ColumnTypeError("feature type mismatch") + # see https://github.com/huggingface/datasets/blob/master/src/datasets/features/features.py + timestamp_matches = re.search(r"^timestamp\[(.*)\]$", feature.dtype) + if not timestamp_matches: + raise ColumnTypeError("feature type mismatch") + timestamp_internals = timestamp_matches[1] + timestampUnits = get_args(TimestampUnit) + internals_matches = re.search(r"^(s|ms|us|ns),\s*tz=([a-zA-Z0-9/_+\-:]*)$", timestamp_internals) + if timestamp_internals in timestampUnits: + unit = timestamp_internals + tz = None + elif internals_matches: + unit = internals_matches[1] + tz = internals_matches[2] + else: + raise ColumnTypeError("feature type mismatch") + + self.name = name + self.unit = cast_to_timestamp_unit(unit) + self.tz = tz + self.type = "TIMESTAMP" + + def get_cell_value(self, dataset_name: str, config_name: str, split_name: str, row_idx: int, value: Any) -> Cell: + if value is None: + return None + if not isinstance(value, pandas.Timestamp): + raise CellTypeError("value must be a pandas Timestamp object") + posix_timestamp_in_seconds = value.timestamp() + if self.unit == "s": + return posix_timestamp_in_seconds + elif self.unit == "ms": + return posix_timestamp_in_seconds * 1_000 + elif self.unit == "us": + return posix_timestamp_in_seconds * 1_000_000 + elif self.unit == "ns": + return posix_timestamp_in_seconds * 1_000_000_000 + + def as_dict(self) -> ColumnDict: + return {"name": self.name, "type": self.type, "tz": self.tz, "unit": self.unit} diff --git a/services/worker/src/worker/models/split.py b/services/worker/src/worker/models/split.py index 81f37685..d6aff60f 100644 --- a/services/worker/src/worker/models/split.py +++ b/services/worker/src/worker/models/split.py @@ -4,0 +5 @@ from typing import Any, List, Optional +from libutils.exceptions import Status400Error @@ -9 +10 @@ from worker.config import MIN_CELL_BYTES -from worker.models.column import Column +from worker.models.column import CellTypeError, Column, get_columns @@ -11,2 +12 @@ from worker.models.info import get_info -from worker.models.row import Row -from worker.models.typed_row import get_typed_rows_and_columns +from worker.models.row import Row, get_rows @@ -139,0 +140,22 @@ def create_truncated_row_items( +def get_typed_row( + dataset_name: str, config_name: str, split_name: str, row: Row, row_idx: int, columns: List[Column] +) -> Row: + try: + return { + column.name: column.get_cell_value(dataset_name, config_name, split_name, row_idx, row[column.name]) + for column in columns + } + except CellTypeError as err: + raise Status400Error("Cell type error.", err) from err + + +def get_typed_rows( + dataset_name: str, + config_name: str, + split_name: str, + rows: List[Row], + columns: List[Column], +) -> List[Row]: + return [get_typed_row(dataset_name, config_name, split_name, row, idx, columns) for idx, row in enumerate(rows)] + + @@ -155,3 +177,14 @@ def get_split( - typed_rows, columns = get_typed_rows_and_columns( - dataset_name, config_name, split_name, info, hf_token, fallback, rows_max_number - ) + + try: + try: + rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number) + except Exception: + if fallback: + rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number) + else: + raise + except Exception as err: + raise Status400Error("Cannot get the first rows for the split.", err) from err + + columns = get_columns(info, rows) + typed_rows = get_typed_rows(dataset_name, config_name, split_name, rows, columns) diff --git a/services/worker/src/worker/models/typed_row.py b/services/worker/src/worker/models/typed_row.py deleted file mode 100644 index 5fe132c2..00000000 --- a/services/worker/src/worker/models/typed_row.py +++ /dev/null @@ -1,57 +0,0 @@ -import logging -from typing import List, Optional, Tuple - -from datasets import DatasetInfo -from libutils.exceptions import Status400Error - -from worker.models.column import CellTypeError, Column, get_columns -from worker.models.row import Row, get_rows - -logger = logging.getLogger(__name__) - - -def get_typed_row( - dataset_name: str, config_name: str, split_name: str, row: Row, row_idx: int, columns: List[Column] -) -> Row: - try: - return { - column.name: column.get_cell_value(dataset_name, config_name, split_name, row_idx, row[column.name]) - for column in columns - } - except CellTypeError as err: - raise Status400Error("Cell type error.", err) from err - - -def get_typed_rows( - dataset_name: str, - config_name: str, - split_name: str, - rows: List[Row], - columns: List[Column], -) -> List[Row]: - return [get_typed_row(dataset_name, config_name, split_name, row, idx, columns) for idx, row in enumerate(rows)] - - -def get_typed_rows_and_columns( - dataset_name: str, - config_name: str, - split_name: str, - info: DatasetInfo, - hf_token: Optional[str] = None, - fallback: Optional[bool] = False, - rows_max_number: Optional[int] = None, -) -> Tuple[List[Row], List[Column]]: - try: - try: - rows = get_rows(dataset_name, config_name, split_name, hf_token, True, rows_max_number) - except Exception: - if fallback: - rows = get_rows(dataset_name, config_name, split_name, hf_token, False, rows_max_number) - else: - raise - except Exception as err: - raise Status400Error("Cannot get the first rows for the split.", err) from err - - columns = get_columns(info, rows) - typed_rows = get_typed_rows(dataset_name, config_name, split_name, rows, columns) - return typed_rows, columns diff --git a/services/worker/tests/models/test_column.py b/services/worker/tests/models/test_column.py index 1a25678c..6a4d10d2 100644 --- a/services/worker/tests/models/test_column.py +++ b/services/worker/tests/models/test_column.py @@ -1 +1 @@ -from worker.models.column import ColumnType, get_columns +from worker.models.column import get_columns @@ -2,0 +3 @@ from worker.models.column.class_label import ClassLabelColumn +from worker.models.column.timestamp import TimestampColumn @@ -11 +12 @@ def test_class_label() -> None: - assert columns[1].type.name == "CLASS_LABEL" + assert columns[1].type == "CLASS_LABEL" @@ -28 +29 @@ def test_get_columns() -> None: - assert column.type == ColumnType.STRING + assert column.type == "STRING" @@ -36 +37 @@ def test_mnist() -> None: - assert columns[0].type == ColumnType.RELATIVE_IMAGE_URL + assert columns[0].type == "RELATIVE_IMAGE_URL" @@ -53 +54 @@ def test_iter_archive() -> None: - assert columns[0].type == ColumnType.RELATIVE_IMAGE_URL + assert columns[0].type == "RELATIVE_IMAGE_URL" @@ -61 +62 @@ def test_severo_wit() -> None: - assert columns[2].type == ColumnType.IMAGE_URL + assert columns[2].type == "IMAGE_URL" @@ -69 +70,12 @@ def test_audio() -> None: - assert columns[1].type == ColumnType.AUDIO_RELATIVE_SOURCES + assert columns[1].type == "AUDIO_RELATIVE_SOURCES" + + +def test_timestamp() -> None: + info = get_info("ett", "h1") + columns = get_columns(info, []) + assert columns is not None + assert columns[0].name == "start" + assert columns[0].type == "TIMESTAMP" + assert isinstance(columns[0], TimestampColumn) + assert columns[0].unit == "s" + assert columns[0].tz is None diff --git a/services/worker/tests/models/test_split.py b/services/worker/tests/models/test_split.py index eb1ba796..bb9cac4b 100644 --- a/services/worker/tests/models/test_split.py +++ b/services/worker/tests/models/test_split.py @@ -0,0 +1,2 @@ +import pandas # type: ignore + @@ -4,0 +7,3 @@ from .._utils import HF_TOKEN, ROWS_MAX_NUMBER +# pandas types: see https://github.com/VirtusLab/pandas-stubs/issues/172 + + @@ -7,0 +13,81 @@ from .._utils import HF_TOKEN, ROWS_MAX_NUMBER +# TODO: this is slow: change the tested dataset? +def test_detect_types_from_typed_rows() -> None: + split = get_split("allenai/c4", "allenai--c4", "train", rows_max_number=ROWS_MAX_NUMBER) + assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER + assert split["rows_response"]["columns"][0]["column"]["type"] == "STRING" + + +def test_class_label() -> None: + split = get_split("glue", "cola", "train", rows_max_number=ROWS_MAX_NUMBER) + assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER + assert split["rows_response"]["rows"][0]["row"]["label"] == 1 + assert split["rows_response"]["columns"][1]["column"]["type"] == "CLASS_LABEL" + assert "unacceptable" in split["rows_response"]["columns"][1]["column"]["labels"] + + +def test_mnist() -> None: + split = get_split("mnist", "mnist", "train", rows_max_number=ROWS_MAX_NUMBER) + assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER + assert split["rows_response"]["rows"][0]["row"]["image"] == "assets/mnist/--/mnist/train/0/image/image.jpg" + assert split["rows_response"]["columns"][0]["column"]["type"] == "RELATIVE_IMAGE_URL" + + +# TODO: re-enable the test +# def test_cifar() -> None: +# info = get_info("cifar10", "plain_text") +# typed_rows, columns = get_typed_rows_and_columns( +# "cifar10", "plain_text", "train", info, rows_max_number=ROWS_MAX_NUMBER +# ) +# assert len(typed_rows) == ROWS_MAX_NUMBER +# assert typed_rows[0]["img"] == "assets/cifar10/--/plain_text/train/0/img/image.jpg" +# assert columns[0].type == ColumnType.RELATIVE_IMAGE_URL + + +# TODO: re-enable the test +# def test_head_qa() -> None: +# info = get_info("head_qa", "es") +# typed_rows, columns = get_typed_rows_and_columns("head_qa", "es", "train", info, rows_max_number=ROWS_MAX_NUMBER) +# assert len(typed_rows) == ROWS_MAX_NUMBER +# assert typed_rows[0]["image"] is None +# assert columns[6].name == "image" +# assert columns[6].type == ColumnType.RELATIVE_IMAGE_URL + + +def test_iter_archive() -> None: + split = get_split("food101", "default", "train", rows_max_number=ROWS_MAX_NUMBER) + assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER + assert split["rows_response"]["columns"][0]["column"]["type"] == "RELATIVE_IMAGE_URL" + + +def test_image_url() -> None: + split = get_split("severo/wit", "default", "train", rows_max_number=ROWS_MAX_NUMBER) + assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER + assert split["rows_response"]["columns"][2]["column"]["type"] == "IMAGE_URL" + + +def test_audio_dataset() -> None: + split = get_split("abidlabs/test-audio-1", "test", "train", rows_max_number=ROWS_MAX_NUMBER) + assert len(split["rows_response"]["rows"]) == 1 + assert len(split["rows_response"]["rows"][0]["row"]["Output"]) == 2 + assert split["rows_response"]["rows"][0]["row"]["Output"][0]["type"] == "audio/mpeg" + assert split["rows_response"]["rows"][0]["row"]["Output"][1]["type"] == "audio/wav" + assert ( + split["rows_response"]["rows"][0]["row"]["Output"][0]["src"] + == "assets/abidlabs/test-audio-1/--/test/train/0/Output/audio.mp3" + ) + assert split["rows_response"]["columns"][1]["column"]["type"] == "AUDIO_RELATIVE_SOURCES" + + +def test_audio_path_none_dataset() -> None: + split = get_split("LIUM/tedlium", "release1", "test", rows_max_number=ROWS_MAX_NUMBER) + assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER + assert len(split["rows_response"]["rows"][0]["row"]["audio"]) == 2 + assert split["rows_response"]["rows"][0]["row"]["audio"][0]["type"] == "audio/mpeg" + assert split["rows_response"]["rows"][0]["row"]["audio"][1]["type"] == "audio/wav" + assert ( + split["rows_response"]["rows"][0]["row"]["audio"][0]["src"] + == "assets/LIUM/tedlium/--/release1/test/0/audio/audio.mp3" + ) + assert split["rows_response"]["columns"][0]["column"]["type"] == "AUDIO_RELATIVE_SOURCES" + + @@ -45,0 +132,27 @@ def test_fallback() -> None: +def test_timestamp() -> None: + + ROWS_MAX_NUMBER = 1 + + split = get_split( + "ett", + "h1", + "train", + HF_TOKEN, + rows_max_number=ROWS_MAX_NUMBER, + ) + assert len(split["rows_response"]["rows"]) == ROWS_MAX_NUMBER + assert split["rows_response"]["rows"][0]["row"]["start"] == 1467331200.0 + assert split["rows_response"]["columns"][0]["column"]["type"] == "TIMESTAMP" + assert split["rows_response"]["columns"][0]["column"]["unit"] == "s" + assert split["rows_response"]["columns"][0]["column"]["tz"] is None + # check + assert ( + pandas.Timestamp( + split["rows_response"]["rows"][0]["row"]["start"], + unit=split["rows_response"]["columns"][0]["column"]["unit"], + tz=split["rows_response"]["columns"][0]["column"]["tz"], + ).isoformat() + == "2016-07-01T00:00:00" + ) + + diff --git a/services/worker/tests/models/test_typed_row.py b/services/worker/tests/models/test_typed_row.py deleted file mode 100644 index 4439320b..00000000 --- a/services/worker/tests/models/test_typed_row.py +++ /dev/null @@ -1,96 +0,0 @@ -from worker.models.column import ClassLabelColumn, ColumnType -from worker.models.info import get_info -from worker.models.typed_row import get_typed_rows_and_columns - -from .._utils import ROWS_MAX_NUMBER - - -# TODO: this is slow: change the tested dataset? -def test_detect_types_from_typed_rows() -> None: - info = get_info("allenai/c4", "allenai--c4") - typed_rows, columns = get_typed_rows_and_columns( - "allenai/c4", "allenai--c4", "train", info, rows_max_number=ROWS_MAX_NUMBER - ) - assert len(typed_rows) == ROWS_MAX_NUMBER - assert columns[0].type == ColumnType.STRING - - -def test_class_label() -> None: - info = get_info("glue", "cola") - typed_rows, columns = get_typed_rows_and_columns("glue", "cola", "train", info, rows_max_number=ROWS_MAX_NUMBER) - column = columns[1] - assert isinstance(column, ClassLabelColumn) - assert column.type == ColumnType.CLASS_LABEL - assert "unacceptable" in column.labels - assert typed_rows[0]["label"] == 1 - - -def test_mnist() -> None: - info = get_info("mnist", "mnist") - typed_rows, columns = get_typed_rows_and_columns("mnist", "mnist", "train", info, rows_max_number=ROWS_MAX_NUMBER) - assert len(typed_rows) == ROWS_MAX_NUMBER - assert typed_rows[0]["image"] == "assets/mnist/--/mnist/train/0/image/image.jpg" - assert columns[0].type == ColumnType.RELATIVE_IMAGE_URL - - -# TODO: re-enable the test -# def test_cifar() -> None: -# info = get_info("cifar10", "plain_text") -# typed_rows, columns = get_typed_rows_and_columns( -# "cifar10", "plain_text", "train", info, rows_max_number=ROWS_MAX_NUMBER -# ) -# assert len(typed_rows) == ROWS_MAX_NUMBER -# assert typed_rows[0]["img"] == "assets/cifar10/--/plain_text/train/0/img/image.jpg" -# assert columns[0].type == ColumnType.RELATIVE_IMAGE_URL - - -# TODO: re-enable the test -# def test_head_qa() -> None: -# info = get_info("head_qa", "es") -# typed_rows, columns = get_typed_rows_and_columns("head_qa", "es", "train", info, rows_max_number=ROWS_MAX_NUMBER) -# assert len(typed_rows) == ROWS_MAX_NUMBER -# assert typed_rows[0]["image"] is None -# assert columns[6].name == "image" -# assert columns[6].type == ColumnType.RELATIVE_IMAGE_URL - - -def test_iter_archive() -> None: - info = get_info("food101", "default") - typed_rows, columns = get_typed_rows_and_columns( - "food101", "default", "train", info, rows_max_number=ROWS_MAX_NUMBER - ) - assert len(typed_rows) == ROWS_MAX_NUMBER - assert columns[0].type == ColumnType.RELATIVE_IMAGE_URL - - -def test_image_url() -> None: - info = get_info("severo/wit", "default") - typed_rows, columns = get_typed_rows_and_columns( - "severo/wit", "default", "train", info, rows_max_number=ROWS_MAX_NUMBER - ) - assert len(typed_rows) == ROWS_MAX_NUMBER - assert columns[2].type == ColumnType.IMAGE_URL - - -def test_audio_dataset() -> None: - info = get_info("abidlabs/test-audio-1", "test") - typed_rows, columns = get_typed_rows_and_columns( - "abidlabs/test-audio-1", "test", "train", info, rows_max_number=ROWS_MAX_NUMBER - ) - assert len(typed_rows) == 1 - assert columns[1].type == ColumnType.AUDIO_RELATIVE_SOURCES - assert len(typed_rows[0]["Output"]) == 2 - assert typed_rows[0]["Output"][0]["type"] == "audio/mpeg" - assert typed_rows[0]["Output"][1]["type"] == "audio/wav" - assert typed_rows[0]["Output"][0]["src"] == "assets/abidlabs/test-audio-1/--/test/train/0/Output/audio.mp3" - - -def test_audio_path_none_dataset() -> None: - info = get_info("LIUM/tedlium", "release1") - typed_rows, columns = get_typed_rows_and_columns("LIUM/tedlium", "release1", "test", info, rows_max_number=1) - assert len(typed_rows) == 1 - assert columns[0].type == ColumnType.AUDIO_RELATIVE_SOURCES - assert len(typed_rows[0]["audio"]) == 2 - assert typed_rows[0]["audio"][0]["type"] == "audio/mpeg" - assert typed_rows[0]["audio"][1]["type"] == "audio/wav" - assert typed_rows[0]["audio"][0]["src"] == "assets/LIUM/tedlium/--/release1/test/0/audio/audio.mp3" diff --git a/tools/Docker.mk b/tools/Docker.mk index 2d274a0c..27545dd7 100644 --- a/tools/Docker.mk +++ b/tools/Docker.mk @@ -1,6 +0,0 @@ -export SERVICE_ADMIN_DOCKER_IMAGE := $(shell jq -r '.dockerImage.admin' ${DOCKER_IMAGES}) -export SERVICE_API_DOCKER_IMAGE := $(shell jq -r '.dockerImage.api' ${DOCKER_IMAGES}) -export SERVICE_DATASETS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.datasetsWorker' ${DOCKER_IMAGES}) -export SERVICE_REVERSE_PROXY_DOCKER_IMAGE := $(shell jq -r '.dockerImage.reverseProxy' ${DOCKER_IMAGES}) -export SERVICE_SPLITS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.splitsWorker' ${DOCKER_IMAGES}) - diff --git a/tools/DockerRemoteImages.mk b/tools/DockerRemoteImages.mk new file mode 100644 index 00000000..1ba50393 --- /dev/null +++ b/tools/DockerRemoteImages.mk @@ -0,0 +1,5 @@ +export SERVICE_ADMIN_DOCKER_IMAGE := $(shell jq -r '.dockerImage.admin' ${DOCKER_IMAGES}) +export SERVICE_API_DOCKER_IMAGE := $(shell jq -r '.dockerImage.api' ${DOCKER_IMAGES}) +export SERVICE_DATASETS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.datasetsWorker' ${DOCKER_IMAGES}) +export SERVICE_REVERSE_PROXY_DOCKER_IMAGE := $(shell jq -r '.dockerImage.reverseProxy' ${DOCKER_IMAGES}) +export SERVICE_SPLITS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.splitsWorker' ${DOCKER_IMAGES})
20d95ed8debe5fcc450a0702ff7044980b898722
Sylvain Lesage
2022-06-13T16:26:15
Fix dockerfiles (#372)
diff --git a/.github/workflows/_e2e_tests.yml b/.github/workflows/_e2e_tests.yml index 4abfa3ff..3432e9d3 100644 --- a/.github/workflows/_e2e_tests.yml +++ b/.github/workflows/_e2e_tests.yml @@ -74 +74,2 @@ jobs: - run: docker-compose -f ./docker-compose.yml up -d + working-directory: tools + run: docker-compose -f ./docker-compose-datasets-server-from-remote-images.yml up -d diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 77097bd2..1625880e 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -10,0 +11,2 @@ on: + - 'tools/Python.mk' + - 'tools/docker-compose-datasets-server-from-remote-images.yml' diff --git a/.github/workflows/l-libcache.yml b/.github/workflows/l-libcache.yml index 32805bf9..10c76d27 100644 --- a/.github/workflows/l-libcache.yml +++ b/.github/workflows/l-libcache.yml @@ -9,0 +10,2 @@ on: + - 'tools/Python.mk' + - 'tools/docker-compose-mongo.yml' diff --git a/.github/workflows/l-libqueue.yml b/.github/workflows/l-libqueue.yml index fb601da0..b8ea7f92 100644 --- a/.github/workflows/l-libqueue.yml +++ b/.github/workflows/l-libqueue.yml @@ -9,0 +10,2 @@ on: + - 'tools/Python.mk' + - 'tools/docker-compose-mongo.yml' diff --git a/.github/workflows/l-libutils.yml b/.github/workflows/l-libutils.yml index a2c80683..46e6d866 100644 --- a/.github/workflows/l-libutils.yml +++ b/.github/workflows/l-libutils.yml @@ -9,0 +10,2 @@ on: + - 'tools/Python.mk' + - 'tools/docker-compose-empty.yml' diff --git a/.github/workflows/s-admin.yaml b/.github/workflows/s-admin.yaml index 6c5e45bd..ba63712c 100644 --- a/.github/workflows/s-admin.yaml +++ b/.github/workflows/s-admin.yaml @@ -10,0 +11,2 @@ on: + - 'tools/Python.mk' + - 'tools/docker-compose-mongo.yml' diff --git a/.github/workflows/s-api.yaml b/.github/workflows/s-api.yaml index 5ebedad5..8d2bd67d 100644 --- a/.github/workflows/s-api.yaml +++ b/.github/workflows/s-api.yaml @@ -10,0 +11,2 @@ on: + - 'tools/Python.mk' + - 'tools/docker-compose-mongo.yml' diff --git a/.github/workflows/s-worker.yml b/.github/workflows/s-worker.yml index 1f6df747..34718a0c 100644 --- a/.github/workflows/s-worker.yml +++ b/.github/workflows/s-worker.yml @@ -10,0 +11,2 @@ on: + - 'tools/Python.mk' + - 'tools/docker-compose-mongo.yml' diff --git a/INSTALL.md b/INSTALL.md index 50057774..3b4ce6c3 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -8 +8,8 @@ Install docker (see https://docs.docker.com/engine/install/ubuntu/#install-using -docker-compose up --build -d --scale splits-worker=5 +make install +make start-from-local-code +``` + +To use the docker images already compiled using the CI: + +``` +make start-from-remote-images @@ -32 +39 @@ We also need to have a mongo server: -Install and deploy the API server with [services/api/INSTALL.md](./services/api/INSTALL.md) and the workers with [services/worker/INSTALL.md](./services/worker/INSTALL.md). +Install and deploy the API server with [services/api/INSTALL.md](./services/api/INSTALL.md), the admin server with [services/admin/INSTALL.md](./services/admin/INSTALL.md) and the workers with [services/worker/INSTALL.md](./services/worker/INSTALL.md). @@ -40,13 +47 @@ See the instructions in [services/api/INSTALL.md](./services/api/INSTALL.md#upgr -datasets-server is installed on a t2.2xlarge [EC2 virtual machine](https://us-east-1.console.aws.amazon.com/ec2/v2/home?region=us-east-1#InstanceDetails:instanceId=i-0b19b8deb4301ad4a) (under the "JULIEN CHAUMOND" account). - -```bash -ssh [email protected] -# or using https://github.com/huggingface/conf/blob/master/ssh-config-hf-aws -ssh aws/datasets-preview-backend/1 - -/: 500 GB - -public ipv4: 54.209.89.185 -private ipv4: 172.30.4.71 -domain name: datasets-server.huggingface.co -``` +datasets-server is installed on a [kubernetes cluster](https://us-east-1.console.aws.amazon.com/eks/home?region=us-east-1#/clusters) @@ -54 +49 @@ domain name: datasets-server.huggingface.co -Grafana (TODO: no data at the moment): +Grafana: @@ -56,2 +51,2 @@ Grafana (TODO: no data at the moment): -- https://grafana.huggingface.co/d/gBtAotjMk/use-method?orgId=2&var-DS_PROMETHEUS=HF%20Prometheus&var-node=data-preview -- https://grafana.huggingface.co/d/rYdddlPWk/node-exporter-full?orgId=2&refresh=1m&var-DS_PROMETHEUS=HF%20Prometheus&var-job=node_exporter_metrics&var-node=data-preview&var-diskdevices=%5Ba-z%5D%2B%7Cnvme%5B0-9%5D%2Bn%5B0-9%5D%2B +- https://grafana.huggingface.tech/dashboards/f/j1kRCJEnk/hub?query=Datasets%20server +- https://grafana.huggingface.tech/d/a164a7f0339f99e89cea5cb47e9be617/kubernetes-compute-resources-workload?orgId=1&refresh=10s&var-datasource=Prometheus%20EKS%20Hub%20Prod&var-cluster=&var-namespace=datasets-server&var-type=deployment&var-workload=datasets-server-prod-splits-worker @@ -61,0 +57 @@ BetterUptime: +- https://betteruptime.com/team/14149/monitors/691070 diff --git a/Makefile b/Makefile index 4ccbb0a3..e1426a51 100644 --- a/Makefile +++ b/Makefile @@ -0,0 +1,18 @@ +# environment variables for the commands (docker-compose, poetry) +export LOCAL_CODE_MONGO_PORT := 27060 +export LOCAL_CODE_SERVICE_ADMIN_PORT := 8081 +export LOCAL_CODE_SERVICE_API_PORT := 8080 +export LOCAL_CODE_SERVICE_REVERSE_PROXY_PORT := 8000 +export LOCAL_CODE_COMPOSE_PROJECT_NAME := local-code + +export REMOTE_IMAGES_MONGO_PORT := 27061 +export REMOTE_IMAGES_SERVICE_ADMIN_PORT := 8181 +export REMOTE_IMAGES_SERVICE_API_PORT := 8180 +export REMOTE_IMAGES_SERVICE_REVERSE_PROXY_PORT := 8100 +export REMOTE_IMAGES_COMPOSE_PROJECT_NAME := remote-images +# makefile variables +LOCAL_CODE_DOCKER_COMPOSE := ./tools/docker-compose-datasets-server-from-local-code.yml +REMOTE_IMAGES_DOCKER_COMPOSE := ./tools/docker-compose-datasets-server-from-remote-images.yml +DOCKER_IMAGES := ./infra/charts/datasets-server/docker-images.yaml + +include tools/Docker.mk @@ -3,0 +22 @@ install: + $(MAKE) -C e2e/ install @@ -6,0 +26,17 @@ install: + $(MAKE) -C libs/libcache/ install + $(MAKE) -C libs/libqueue/ install + $(MAKE) -C libs/libutils/ install + +.PHONY: start-from-local-code +start-from-local-code: + MONGO_PORT=${LOCAL_CODE_MONGO_PORT} SERVICE_ADMIN_PORT=${LOCAL_CODE_SERVICE_ADMIN_PORT} SERVICE_API_PORT=${LOCAL_CODE_SERVICE_API_PORT} SERVICE_REVERSE_PROXY_PORT=${LOCAL_CODE_SERVICE_REVERSE_PROXY_PORT} COMPOSE_PROJECT_NAME=${LOCAL_CODE_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${LOCAL_CODE_DOCKER_COMPOSE} $(MAKE) down + MONGO_PORT=${LOCAL_CODE_MONGO_PORT} SERVICE_ADMIN_PORT=${LOCAL_CODE_SERVICE_ADMIN_PORT} SERVICE_API_PORT=${LOCAL_CODE_SERVICE_API_PORT} SERVICE_REVERSE_PROXY_PORT=${LOCAL_CODE_SERVICE_REVERSE_PROXY_PORT} COMPOSE_PROJECT_NAME=${LOCAL_CODE_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${LOCAL_CODE_DOCKER_COMPOSE} $(MAKE) up + +.PHONY: stop-from-local-code +stop-from-local-code: + MONGO_PORT=${LOCAL_CODE_MONGO_PORT} SERVICE_ADMIN_PORT=${LOCAL_CODE_SERVICE_ADMIN_PORT} SERVICE_API_PORT=${LOCAL_CODE_SERVICE_API_PORT} SERVICE_REVERSE_PROXY_PORT=${LOCAL_CODE_SERVICE_REVERSE_PROXY_PORT} COMPOSE_PROJECT_NAME=${LOCAL_CODE_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${LOCAL_CODE_DOCKER_COMPOSE} $(MAKE) down + +.PHONY: start-from-remote-images +start-from-remote-images: + MONGO_PORT=${REMOTE_IMAGES_MONGO_PORT} SERVICE_ADMIN_PORT=${REMOTE_IMAGES_SERVICE_ADMIN_PORT} SERVICE_API_PORT=${REMOTE_IMAGES_SERVICE_API_PORT} SERVICE_REVERSE_PROXY_PORT=${REMOTE_IMAGES_SERVICE_REVERSE_PROXY_PORT} COMPOSE_PROJECT_NAME=${REMOTE_IMAGES_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${REMOTE_IMAGES_DOCKER_COMPOSE} $(MAKE) down + MONGO_PORT=${REMOTE_IMAGES_MONGO_PORT} SERVICE_ADMIN_PORT=${REMOTE_IMAGES_SERVICE_ADMIN_PORT} SERVICE_API_PORT=${REMOTE_IMAGES_SERVICE_API_PORT} SERVICE_REVERSE_PROXY_PORT=${REMOTE_IMAGES_SERVICE_REVERSE_PROXY_PORT} COMPOSE_PROJECT_NAME=${REMOTE_IMAGES_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${REMOTE_IMAGES_DOCKER_COMPOSE} $(MAKE) up @@ -8,16 +44,3 @@ install: -.PHONY: lock -lock: - $(MAKE) -C libs/libutils/ lock - $(MAKE) -C libs/libqueue/ lock - $(MAKE) -C libs/libcache/ lock - $(MAKE) -C services/worker/ lock - $(MAKE) -C services/api/ lock - $(MAKE) -C services/admin/ lock - -.PHONY: api -api: - $(MAKE) -C services/api/ run - -.PHONY: worker -worker: - $(MAKE) -C services/worker/ run +.PHONY: stop-from-remote-images +stop-from-remote-images: + MONGO_PORT=${REMOTE_IMAGES_MONGO_PORT} SERVICE_ADMIN_PORT=${REMOTE_IMAGES_SERVICE_ADMIN_PORT} SERVICE_API_PORT=${REMOTE_IMAGES_SERVICE_API_PORT} SERVICE_REVERSE_PROXY_PORT=${REMOTE_IMAGES_SERVICE_REVERSE_PROXY_PORT} COMPOSE_PROJECT_NAME=${REMOTE_IMAGES_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${REMOTE_IMAGES_DOCKER_COMPOSE} $(MAKE) down diff --git a/e2e/Makefile b/e2e/Makefile index bcc3415d..c116bf82 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -1 +1,11 @@ -include ../tools/Common.mk +# environment variables for the commands (docker-compose, poetry) +export SERVICE_ADMIN_PORT := 9081 +export SERVICE_API_PORT := 9080 +export SERVICE_REVERSE_PROXY_PORT := 9000 +export TEST_MONGO_PORT := 27050 +export TEST_MONGO_CACHE_DATABASE := datasets_server_cache_test +export TEST_MONGO_QUEUE_DATABASE := datasets_server_queue_test +export TEST_COMPOSE_PROJECT_NAME := e2e +# makefile variables +TEST_DOCKER_COMPOSE := ../tools/docker-compose-datasets-server-from-remote-images.yml +DOCKER_IMAGES := ../infra/charts/datasets-server/docker-images.yaml @@ -3,5 +13,2 @@ include ../tools/Common.mk -export SERVICE_ADMIN_DOCKER_IMAGE := $(shell jq -r '.dockerImage.admin' ../infra/charts/datasets-server/docker-images.yaml) -export SERVICE_API_DOCKER_IMAGE := $(shell jq -r '.dockerImage.api' ../infra/charts/datasets-server/docker-images.yaml) -export SERVICE_DATASETS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.datasetsWorker' ../infra/charts/datasets-server/docker-images.yaml) -export SERVICE_REVERSE_PROXY_DOCKER_IMAGE := $(shell jq -r '.dockerImage.reverseProxy' ../infra/charts/datasets-server/docker-images.yaml) -export SERVICE_SPLITS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.splitsWorker' ../infra/charts/datasets-server/docker-images.yaml) +include ../tools/Python.mk +include ../tools/Docker.mk @@ -11,5 +18 @@ e2e: - docker-compose -f ./docker-compose.yml down - docker volume rm e2e_assets e2e_mongo e2e_reverse-proxy-cache - docker-compose -f ./docker-compose.yml up -d - poetry run python -m pytest -x tests - docker-compose -f ./docker-compose.yml down + make test diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index 1f1d2588..8400140e 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -1,0 +2 @@ +import os @@ -6 +7,3 @@ import requests -URL = "http://localhost:8000" +SERVICE_REVERSE_PROXY_PORT = os.environ.get("SERVICE_REVERSE_PROXY_PORT", "8000") + +URL = f"http://localhost:{SERVICE_REVERSE_PROXY_PORT}" diff --git a/libs/libcache/Makefile b/libs/libcache/Makefile index e71d7ed6..06804f6e 100644 --- a/libs/libcache/Makefile +++ b/libs/libcache/Makefile @@ -1 +1,6 @@ -include ../../tools/Common.mk +# environment variables for the commands (docker-compose, poetry) +export TEST_MONGO_PORT := 27020 +export TEST_MONGO_CACHE_DATABASE := datasets_server_cache_test +export TEST_COMPOSE_PROJECT_NAME := libcache +# makefile variables +TEST_DOCKER_COMPOSE := ../../tools/docker-compose-mongo.yml @@ -3,11 +8,2 @@ include ../../tools/Common.mk -.PHONY: test -test: - docker-compose -f tests/docker-compose.yml up -d - MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_URL="mongodb://localhost:27018" poetry run python -m pytest -x tests - docker-compose -f tests/docker-compose.yml down - -.PHONY: coverage -coverage: - docker-compose -f tests/docker-compose.yml up -d - MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_URL="mongodb://localhost:27018" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests - docker-compose -f tests/docker-compose.yml down +include ../../tools/Python.mk +include ../../tools/Docker.mk diff --git a/libs/libcache/tests/docker-compose.yml b/libs/libcache/tests/docker-compose.yml deleted file mode 100644 index 459d2d4d..00000000 --- a/libs/libcache/tests/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: "3.9" -services: - mongodb-test: - image: mongo - volumes: - - mongo-test:/data/db:rw - ports: - - 27018:27017 -volumes: - mongo-test: diff --git a/libs/libqueue/Makefile b/libs/libqueue/Makefile index 12837051..4512b343 100644 --- a/libs/libqueue/Makefile +++ b/libs/libqueue/Makefile @@ -1 +1,6 @@ -include ../../tools/Common.mk +# environment variables for the commands (docker-compose, poetry) +export TEST_MONGO_PORT := 27021 +export TEST_MONGO_QUEUE_DATABASE := datasets_server_queue_test +export TEST_COMPOSE_PROJECT_NAME := libqueue +# makefile variables +TEST_DOCKER_COMPOSE := ../../tools/docker-compose-mongo.yml @@ -3,11 +8,2 @@ include ../../tools/Common.mk -.PHONY: test -test: - docker-compose -f tests/docker-compose.yml up -d --remove-orphans - MONGO_URL="mongodb://localhost:27020" MONGO_QUEUE_DATABASE="datasets_server_queue_test" poetry run python -m pytest -x tests - docker-compose -f tests/docker-compose.yml down - -.PHONY: coverage -coverage: - docker-compose -f tests/docker-compose.yml up -d --remove-orphans - MONGO_URL="mongodb://localhost:27020" MONGO_QUEUE_DATABASE="datasets_server_queue_test" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests - docker-compose -f tests/docker-compose.yml down +include ../../tools/Python.mk +include ../../tools/Docker.mk diff --git a/libs/libqueue/tests/docker-compose.yml b/libs/libqueue/tests/docker-compose.yml deleted file mode 100644 index 272840e4..00000000 --- a/libs/libqueue/tests/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: "3.9" -services: - mongodb-test-libqueue: - image: mongo - volumes: - - mongo-test-libqueue:/data/db:rw - ports: - - 27020:27017 -volumes: - mongo-test-libqueue: diff --git a/libs/libutils/Makefile b/libs/libutils/Makefile index dae9a811..8143734e 100644 --- a/libs/libutils/Makefile +++ b/libs/libutils/Makefile @@ -1 +1,4 @@ -include ../../tools/Common.mk +# environment variables for the commands (docker-compose, poetry) +export TEST_COMPOSE_PROJECT_NAME := libutils +# makefile variables +TEST_DOCKER_COMPOSE := ../../tools/docker-compose-empty.yml @@ -3,7 +6,2 @@ include ../../tools/Common.mk -.PHONY: test -test: - poetry run python -m pytest -x tests - -.PHONY: coverage -coverage: - poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests +include ../../tools/Python.mk +include ../../tools/Docker.mk diff --git a/services/admin/Makefile b/services/admin/Makefile index ccd71ce4..03c30abf 100644 --- a/services/admin/Makefile +++ b/services/admin/Makefile @@ -1 +1,11 @@ -include ../../tools/Common.mk +# environment variables for the commands (docker-compose, poetry) +export TEST_MONGO_PORT := 27030 +export TEST_MONGO_CACHE_DATABASE := datasets_server_cache_test +export TEST_MONGO_QUEUE_DATABASE := datasets_server_queue_test +export TEST_COMPOSE_PROJECT_NAME := admin +# makefile variables +TEST_DOCKER_COMPOSE := ../../tools/docker-compose-mongo.yml + +# Ensure to specify HF_TOKEN when calling make test, ie HF_TOKEN=hf_app_xxx make test +include ../../tools/Python.mk +include ../../tools/Docker.mk @@ -23,13 +32,0 @@ warm-cache: -# Ensure to specify HF_TOKEN when calling make test, ie HF_TOKEN=hf_app_xxx make test -.PHONY: test -test: - docker-compose -f tests/docker-compose.yml up -d - MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27019" poetry run python -m pytest -x tests - docker-compose -f tests/docker-compose.yml down - -# Ensure to specify HF_TOKEN when calling make coverage, ie HF_TOKEN=hf_app_xxx make coverage -.PHONY: coverage -coverage: - docker-compose -f tests/docker-compose.yml up -d - MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27019" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests - docker-compose -f tests/docker-compose.yml down diff --git a/services/api/Makefile b/services/api/Makefile index 4f17ed0f..eeb62016 100644 --- a/services/api/Makefile +++ b/services/api/Makefile @@ -1 +1,11 @@ -include ../../tools/Common.mk +# environment variables for the commands (docker-compose, poetry) +export TEST_MONGO_PORT := 27031 +export TEST_MONGO_CACHE_DATABASE := datasets_server_cache_test +export TEST_MONGO_QUEUE_DATABASE := datasets_server_queue_test +export TEST_COMPOSE_PROJECT_NAME := api +# makefile variables +TEST_DOCKER_COMPOSE := ../../tools/docker-compose-mongo.yml + +# Ensure to specify HF_TOKEN when calling make test, ie HF_TOKEN=hf_app_xxx make test +include ../../tools/Python.mk +include ../../tools/Docker.mk @@ -10,12 +19,0 @@ watch: - -.PHONY: test -test: - docker-compose -f tests/docker-compose.yml up -d - MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27018" poetry run python -m pytest -x tests - docker-compose -f tests/docker-compose.yml down - -.PHONY: coverage -coverage: - docker-compose -f tests/docker-compose.yml up -d - MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27018" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests - docker-compose -f tests/docker-compose.yml down diff --git a/services/api/tests/docker-compose.yml b/services/api/tests/docker-compose.yml deleted file mode 100644 index 459d2d4d..00000000 --- a/services/api/tests/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: "3.9" -services: - mongodb-test: - image: mongo - volumes: - - mongo-test:/data/db:rw - ports: - - 27018:27017 -volumes: - mongo-test: diff --git a/services/worker/Makefile b/services/worker/Makefile index 734a8d4b..854706f8 100644 --- a/services/worker/Makefile +++ b/services/worker/Makefile @@ -0,0 +1,8 @@ +# environment variables for the commands (docker-compose, poetry) +export TEST_MONGO_PORT := 27032 +export TEST_MONGO_CACHE_DATABASE := datasets_server_cache_test +export TEST_MONGO_QUEUE_DATABASE := datasets_server_queue_test +export TEST_ROWS_MAX_NUMBER := 5 +export TEST_COMPOSE_PROJECT_NAME := worker +# makefile variables +TEST_DOCKER_COMPOSE := ../../tools/docker-compose-mongo.yml @@ -2 +10 @@ -PILLOW_EXCEPTIONS:= -i 44525 -i 44524 -i 44486 -i 44485 -i 45356 -i 44487 +PILLOW_EXCEPTIONS := -i 44525 -i 44524 -i 44486 -i 44485 -i 45356 -i 44487 @@ -5 +13,3 @@ SAFETY_EXCEPTIONS := $(PILLOW_EXCEPTIONS) -include ../../tools/Common.mk +# Ensure to specify HF_TOKEN when calling make test, ie HF_TOKEN=hf_app_xxx make test +include ../../tools/Python.mk +include ../../tools/Docker.mk @@ -18,14 +27,0 @@ splits-worker: - -# Ensure to specify HF_TOKEN when calling make test, ie HF_TOKEN=hf_app_xxx make test -.PHONY: test -test: - docker-compose -f tests/docker-compose.yml up -d - ROWS_MAX_NUMBER=5 MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27019" poetry run python -m pytest -x tests - docker-compose -f tests/docker-compose.yml down - -# Ensure to specify HF_TOKEN when calling make coverage, ie HF_TOKEN=hf_app_xxx make coverage -.PHONY: coverage -coverage: - docker-compose -f tests/docker-compose.yml up -d - ROWS_MAX_NUMBER=5 MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27019" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests - docker-compose -f tests/docker-compose.yml down diff --git a/tools/Common.mk b/tools/Common.mk deleted file mode 100644 index e859b8cc..00000000 --- a/tools/Common.mk +++ /dev/null @@ -1,26 +0,0 @@ -.PHONY: install -install: - poetry install - -.PHONY: lock -lock: - rm -rf .venv/ - rm -f poetry.lock - poetry lock - poetry install - -# Check that source code meets quality standards + security -.PHONY: quality -quality: - poetry run black --check tests src - poetry run isort --check-only tests src - poetry run flake8 tests src - poetry run mypy tests src - poetry run bandit -r src - poetry run safety check $(SAFETY_EXCEPTIONS) - -# Format source code automatically -.PHONY: style -style: - poetry run black tests src - poetry run isort tests src diff --git a/tools/Docker.mk b/tools/Docker.mk new file mode 100644 index 00000000..2d274a0c --- /dev/null +++ b/tools/Docker.mk @@ -0,0 +1,13 @@ +export SERVICE_ADMIN_DOCKER_IMAGE := $(shell jq -r '.dockerImage.admin' ${DOCKER_IMAGES}) +export SERVICE_API_DOCKER_IMAGE := $(shell jq -r '.dockerImage.api' ${DOCKER_IMAGES}) +export SERVICE_DATASETS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.datasetsWorker' ${DOCKER_IMAGES}) +export SERVICE_REVERSE_PROXY_DOCKER_IMAGE := $(shell jq -r '.dockerImage.reverseProxy' ${DOCKER_IMAGES}) +export SERVICE_SPLITS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.splitsWorker' ${DOCKER_IMAGES}) + +.PHONY: down +down: + docker-compose -f $(DOCKER_COMPOSE) down -v --remove-orphans + +.PHONY: up +up: + docker-compose -f $(DOCKER_COMPOSE) up -d diff --git a/tools/Python.mk b/tools/Python.mk new file mode 100644 index 00000000..43d661dc --- /dev/null +++ b/tools/Python.mk @@ -0,0 +1,47 @@ + +export TEST_MONGO_URL := mongodb://localhost:${TEST_MONGO_PORT} + +.PHONY: install +install: + poetry install + +.PHONY: lock +lock: + rm -rf .venv/ + rm -f poetry.lock + poetry lock + poetry install + +.PHONY: build +build: + poetry build + +# Check that source code meets quality standards + security +.PHONY: quality +quality: + poetry run black --check tests src + poetry run isort --check-only tests src + poetry run flake8 tests src + poetry run mypy tests src + poetry run bandit -r src + poetry run safety check $(SAFETY_EXCEPTIONS) + +# Format source code automatically +.PHONY: style +style: + poetry run black tests src + poetry run isort tests src + +.PHONY: test +test: + MONGO_PORT=${TEST_MONGO_PORT} COMPOSE_PROJECT_NAME=${TEST_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${TEST_DOCKER_COMPOSE} $(MAKE) down + MONGO_PORT=${TEST_MONGO_PORT} COMPOSE_PROJECT_NAME=${TEST_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${TEST_DOCKER_COMPOSE} $(MAKE) up + MONGO_URL=${TEST_MONGO_URL} MONGO_QUEUE_DATABASE=${TEST_MONGO_QUEUE_DATABASE} MONGO_CACHE_DATABASE=${TEST_MONGO_CACHE_DATABASE} ROWS_MAX_NUMBER=${TEST_ROWS_MAX_NUMBER} poetry run python -m pytest -x tests + MONGO_PORT=${TEST_MONGO_PORT} COMPOSE_PROJECT_NAME=${TEST_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${TEST_DOCKER_COMPOSE} $(MAKE) down + +.PHONY: coverage +coverage: + MONGO_PORT=${TEST_MONGO_PORT} COMPOSE_PROJECT_NAME=${TEST_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${TEST_DOCKER_COMPOSE} $(MAKE) down + MONGO_PORT=${TEST_MONGO_PORT} COMPOSE_PROJECT_NAME=${TEST_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${TEST_DOCKER_COMPOSE} $(MAKE) up + MONGO_URL=${TEST_MONGO_URL} MONGO_QUEUE_DATABASE=${TEST_MONGO_QUEUE_DATABASE} MONGO_CACHE_DATABASE=${TEST_MONGO_CACHE_DATABASE} ROWS_MAX_NUMBER=${TEST_ROWS_MAX_NUMBER} poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests + MONGO_PORT=${TEST_MONGO_PORT} COMPOSE_PROJECT_NAME=${TEST_COMPOSE_PROJECT_NAME} DOCKER_COMPOSE=${TEST_DOCKER_COMPOSE} $(MAKE) down diff --git a/docker-compose.yml b/tools/docker-compose-datasets-server-from-local-code.yml similarity index 83% rename from docker-compose.yml rename to tools/docker-compose-datasets-server-from-local-code.yml index bc0e6914..e22300b7 100644 --- a/docker-compose.yml +++ b/tools/docker-compose-datasets-server-from-local-code.yml @@ -6 +6 @@ services: - - ./infra/charts/datasets-server/nginx-templates/:/etc/nginx/templates:ro + - ../infra/charts/datasets-server/nginx-templates/:/etc/nginx/templates:ro @@ -10 +10 @@ services: - - "8000:80" + - "${SERVICE_REVERSE_PROXY_PORT-8000}:80" @@ -25,2 +25,2 @@ services: - context: . - dockerfile: ./services/api/Dockerfile + context: .. + dockerfile: services/api/Dockerfile @@ -36 +36,2 @@ services: - - 8080:8080 + # for debug + - ${SERVICE_API_PORT-8080}:8080 @@ -43 +44 @@ services: - context: . + context: .. @@ -57 +58 @@ services: - context: . + context: .. @@ -71 +72 @@ services: - context: . + context: .. @@ -80 +81,2 @@ services: - - 8081:8081 + # for debug + - ${SERVICE_ADMIN_PORT-8081}:8081 @@ -92 +94 @@ services: - - "27017:27017" + - "${MONGO_PORT-27017}:27017" diff --git a/e2e/docker-compose.yml b/tools/docker-compose-datasets-server-from-remote-images.yml similarity index 67% rename from e2e/docker-compose.yml rename to tools/docker-compose-datasets-server-from-remote-images.yml index 30def06b..46c2c9f0 100644 --- a/e2e/docker-compose.yml +++ b/tools/docker-compose-datasets-server-from-remote-images.yml @@ -4 +4 @@ services: - image: ${SERVICE_REVERSE_PROXY_DOCKER_IMAGE} + image: ${SERVICE_REVERSE_PROXY_DOCKER_IMAGE?SERVICE_REVERSE_PROXY_DOCKER_IMAGE env var must be provided} @@ -10 +10 @@ services: - - "8000:80" + - "${SERVICE_REVERSE_PROXY_PORT-8000}:80" @@ -23 +23 @@ services: - image: ${SERVICE_API_DOCKER_IMAGE} + image: ${SERVICE_API_DOCKER_IMAGE?SERVICE_API_DOCKER_IMAGE env var must be provided} @@ -36 +36,2 @@ services: - - 8080:8080 + # for debug + - ${SERVICE_API_PORT-8080}:8080 @@ -41 +42 @@ services: - image: ${SERVICE_DATASETS_WORKER_DOCKER_IMAGE} + image: ${SERVICE_DATASETS_WORKER_DOCKER_IMAGE?SERVICE_DATASETS_WORKER_DOCKER_IMAGE env var must be provided} @@ -53 +54 @@ services: - image: ${SERVICE_SPLITS_WORKER_DOCKER_IMAGE} + image: ${SERVICE_SPLITS_WORKER_DOCKER_IMAGE?SERVICE_SPLITS_WORKER_DOCKER_IMAGE env var must be provided} @@ -65 +66 @@ services: - image: ${SERVICE_ADMIN_DOCKER_IMAGE} + image: ${SERVICE_ADMIN_DOCKER_IMAGE?SERVICE_ADMIN_DOCKER_IMAGE env var must be provided} @@ -66,0 +68,4 @@ services: + APP_HOSTNAME: 0.0.0.0 + APP_NUM_WORKERS: 1 + APP_PORT: 8081 + ASSETS_DIRECTORY: "/assets" @@ -70,0 +76,3 @@ services: + ports: + # for debug + - ${SERVICE_ADMIN_PORT-8081}:8081 @@ -78 +86 @@ services: - - "27017:27017" + - "${MONGO_PORT-27017}:27017" diff --git a/tools/docker-compose-empty.yml b/tools/docker-compose-empty.yml new file mode 100644 index 00000000..2fe3bedc --- /dev/null +++ b/tools/docker-compose-empty.yml @@ -0,0 +1 @@ +version: "3.9" diff --git a/services/admin/tests/docker-compose.yml b/tools/docker-compose-mongo.yml similarity index 80% rename from services/admin/tests/docker-compose.yml rename to tools/docker-compose-mongo.yml index 459d2d4d..bd6634ac 100644 --- a/services/admin/tests/docker-compose.yml +++ b/tools/docker-compose-mongo.yml @@ -8 +8 @@ services: - - 27018:27017 + - ${MONGO_PORT-27017}:27017
351edeff365139a4ce835b95674b24a92cfa206d
Sylvain Lesage
2022-06-10T10:01:04
docs: ✏️ add doc about k8 (#370)
diff --git a/infra/docs/kubernetes.md b/infra/docs/kubernetes.md index 996af270..8d4a8739 100644 --- a/infra/docs/kubernetes.md +++ b/infra/docs/kubernetes.md @@ -112,0 +113,2 @@ Some useful commands: +- `kubectl rollout restart deploy/yyy`: recreate the pods of the deploy `yyy` +- `kubectl scale --replicas=5 deploy/yyy`: change (up or down, 0 is also valid) the number of replicas of the deploy `yyy`
e64150b2a8e5b21cc1c01dd04bb4e397ffb25ab3
Sylvain Lesage
2022-06-10T09:31:46
fix: 🐛 don't mark empty splits as stalled (#366)
diff --git a/.github/workflows/_e2e_tests.yml b/.github/workflows/_e2e_tests.yml index ba142179..4abfa3ff 100644 --- a/.github/workflows/_e2e_tests.yml +++ b/.github/workflows/_e2e_tests.yml @@ -74 +74 @@ jobs: - run: docker-compose -f tests/docker-compose.yml up -d + run: docker-compose -f ./docker-compose.yml up -d diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5830ddad..77097bd2 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -7 +7,2 @@ on: - - '.github/workflows/e2e.yml' + - 'infra/charts/datasets-server/docker-images.yaml' + - '.github/workflows/_e2e_tests.yml' @@ -8,0 +10 @@ on: + - '.github/workflows/e2e.yml' @@ -13,0 +16,7 @@ jobs: + e2e-tests: + uses: ./.github/workflows/_e2e_tests.yml + with: + config-file: infra/charts/datasets-server/docker-images.yaml + secrets: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml index d84c2752..2543381d 100644 --- a/.github/workflows/infra.yml +++ b/.github/workflows/infra.yml @@ -8 +7,0 @@ on: - - '.github/workflows/_e2e_tests.yml' @@ -18,7 +16,0 @@ jobs: - e2e-tests: - uses: ./.github/workflows/_e2e_tests.yml - with: - config-file: infra/charts/datasets-server/docker-images.yaml - secrets: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/l-libcache.yml b/.github/workflows/l-libcache.yml index 5cbc05c2..32805bf9 100644 --- a/.github/workflows/l-libcache.yml +++ b/.github/workflows/l-libcache.yml @@ -7 +7 @@ on: - - '.github/workflows/infra.yml' + - '.github/workflows/l-libcache.yml' diff --git a/.github/workflows/l-libqueue.yml b/.github/workflows/l-libqueue.yml index 27d869ac..fb601da0 100644 --- a/.github/workflows/l-libqueue.yml +++ b/.github/workflows/l-libqueue.yml @@ -7 +7 @@ on: - - '.github/workflows/infra.yml' + - '.github/workflows/l-libqueue.yml' diff --git a/.github/workflows/l-libutils.yml b/.github/workflows/l-libutils.yml index 512ecc62..a2c80683 100644 --- a/.github/workflows/l-libutils.yml +++ b/.github/workflows/l-libutils.yml @@ -7 +7 @@ on: - - '.github/workflows/infra.yml' + - '.github/workflows/l-libutils.yml' diff --git a/.github/workflows/s-admin.yaml b/.github/workflows/s-admin.yaml index 8b65b7e8..6c5e45bd 100644 --- a/.github/workflows/s-admin.yaml +++ b/.github/workflows/s-admin.yaml @@ -7 +7 @@ on: - - '.github/workflows/infra.yml' + - '.github/workflows/s-admin.yml' diff --git a/.github/workflows/s-api.yaml b/.github/workflows/s-api.yaml index 65f02f33..5ebedad5 100644 --- a/.github/workflows/s-api.yaml +++ b/.github/workflows/s-api.yaml @@ -7 +7 @@ on: - - '.github/workflows/infra.yml' + - '.github/workflows/s-api.yml' diff --git a/.github/workflows/s-worker.yml b/.github/workflows/s-worker.yml index 154ba3bf..1f6df747 100644 --- a/.github/workflows/s-worker.yml +++ b/.github/workflows/s-worker.yml @@ -7 +7 @@ on: - - '.github/workflows/infra.yml' + - '.github/workflows/s-worker.yml' diff --git a/.vscode/monorepo.code-workspace b/.vscode/monorepo.code-workspace index 8bf3ee71..a1e2f2a1 100644 --- a/.vscode/monorepo.code-workspace +++ b/.vscode/monorepo.code-workspace @@ -6,0 +7,4 @@ + { + "name": "e2e", + "path": "../e2e" + }, @@ -37,0 +42 @@ + "e2e": true, diff --git a/e2e/Makefile b/e2e/Makefile index 374f8a52..bcc3415d 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -2,0 +3,6 @@ include ../tools/Common.mk +export SERVICE_ADMIN_DOCKER_IMAGE := $(shell jq -r '.dockerImage.admin' ../infra/charts/datasets-server/docker-images.yaml) +export SERVICE_API_DOCKER_IMAGE := $(shell jq -r '.dockerImage.api' ../infra/charts/datasets-server/docker-images.yaml) +export SERVICE_DATASETS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.datasetsWorker' ../infra/charts/datasets-server/docker-images.yaml) +export SERVICE_REVERSE_PROXY_DOCKER_IMAGE := $(shell jq -r '.dockerImage.reverseProxy' ../infra/charts/datasets-server/docker-images.yaml) +export SERVICE_SPLITS_WORKER_DOCKER_IMAGE := $(shell jq -r '.dockerImage.splitsWorker' ../infra/charts/datasets-server/docker-images.yaml) + @@ -4,0 +11,3 @@ e2e: + docker-compose -f ./docker-compose.yml down + docker volume rm e2e_assets e2e_mongo e2e_reverse-proxy-cache + docker-compose -f ./docker-compose.yml up -d @@ -5,0 +15 @@ e2e: + docker-compose -f ./docker-compose.yml down diff --git a/e2e/README.md b/e2e/README.md index 8c7a515a..af861702 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -5 +5,10 @@ End to end tests, written in Python -Install (see [INSTALL.md](./INSTALL.md)), then: +Install (see [INSTALL.md](./INSTALL.md)) + +You must also login to AWS to be able to download the docker images: + +``` +aws ecr get-login-password --region us-east-1 --profile=hub-prod \ + | docker login --username AWS --password-stdin 707930574880.dkr.ecr.us-east-1.amazonaws.com +``` + +Then: diff --git a/e2e/tests/docker-compose.yml b/e2e/docker-compose.yml similarity index 72% rename from e2e/tests/docker-compose.yml rename to e2e/docker-compose.yml index 9277a8cc..30def06b 100644 --- a/e2e/tests/docker-compose.yml +++ b/e2e/docker-compose.yml @@ -6 +6 @@ services: - - ../../infra/charts/datasets-server/nginx-templates/:/etc/nginx/templates:ro + - ../infra/charts/datasets-server/nginx-templates/:/etc/nginx/templates:ro @@ -12,8 +12,8 @@ services: - - ASSETS_DIRECTORY=/assets - - CACHE_DIRECTORY=/nginx-cache - - CACHE_INACTIVE=24h - - CACHE_MAX_SIZE=1g - - CACHE_ZONE_SIZE=50m - - HOST=localhost - - PORT=80 - - TARGET_URL=http://api:8080 + ASSETS_DIRECTORY: /assets + CACHE_DIRECTORY: /nginx-cache + CACHE_INACTIVE: 24h + CACHE_MAX_SIZE: 1g + CACHE_ZONE_SIZE: 50m + HOST: localhost + PORT: 80 + TARGET_URL: http://api:8080 @@ -21,2 +21 @@ services: - api: - condition: service_started + - api @@ -31,0 +31,3 @@ services: + # use shorter cache durations for the e2e tests + MAX_AGE_SHORT_SECONDS: 1 + MAX_AGE_LONG_SECONDS: 2 @@ -36,2 +38 @@ services: - mongodb: - condition: service_started + - mongodb @@ -45,0 +47 @@ services: + WORKER_SLEEP_SECONDS: "1" @@ -48,2 +50 @@ services: - mongodb: - condition: service_started + - mongodb @@ -57,0 +59 @@ services: + WORKER_SLEEP_SECONDS: "1" @@ -60,2 +62 @@ services: - mongodb: - condition: service_started + - mongodb @@ -68,2 +69 @@ services: - mongodb: - condition: service_started + - mongodb diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index 8c5025a9..1f1d2588 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -1,0 +2,2 @@ +import time + @@ -6,0 +9,36 @@ URL = "http://localhost:8000" +def poll_splits_until_dataset_process_has_finished( + dataset: str, timeout: int = 15, interval: int = 1 +) -> requests.Response: + url = f"{URL}/splits?dataset={dataset}" + retries = timeout // interval + done = False + response = None + while retries > 0 and not done: + retries -= 1 + time.sleep(interval) + response = requests.get(url) + json = response.json() + done = not json or "message" not in json or json["message"] != "The dataset is being processed. Retry later." + if response is None: + raise RuntimeError("no request has been done") + return response + + +def poll_rows_until_split_process_has_finished( + dataset: str, config: str, split: str, timeout: int = 15, interval: int = 1 +) -> requests.Response: + url = f"{URL}/rows?dataset={dataset}&config={config}&split={split}" + retries = timeout // interval + done = False + response = None + while retries > 0 and not done: + retries -= 1 + time.sleep(interval) + response = requests.get(url) + json = response.json() + done = not json or "message" not in json or json["message"] != "The split is being processed. Retry later." + if response is None: + raise RuntimeError("no request has been done") + return response + + @@ -7,0 +46 @@ def test_healthcheck(): + # this tests ensures the nginx reverse proxy and the api are up @@ -9,0 +49,9 @@ def test_healthcheck(): + assert response.text == "ok" + + +def test_valid(): + # this test ensures that the mongo db can be accessed by the api + response = requests.get(f"{URL}/valid") + assert response.status_code == 200 + # at this moment no dataset has been processed + assert response.json()["valid"] == [] @@ -13,14 +61,68 @@ def test_get_dataset(): - response = requests.post(f"{URL}/webhook", json={"update": "datasets/acronym_identification"}) - assert response.status_code == 200 - - # Disabled until the metrics are fixed - # https://github.com/huggingface/datasets-server/issues/250 - # response = requests.get(f"{URL}/metrics") - # lines = response.text.split("\n") - # metrics = {line.split(" ")[0]: float(line.split(" ")[1]) for line in lines if line and line[0] != "#"} - # assert ( - # metrics['queue_jobs_total{queue="datasets",status="waiting"}'] - # + metrics['queue_jobs_total{queue="datasets",status="started"}'] - # + metrics['queue_jobs_total{queue="datasets",status="success"}'] - # >= 1 - # ) + dataset = "acronym_identification" + config = "default" + split = "train" + + # ask for the dataset to be refreshed + response = requests.post(f"{URL}/webhook", json={"update": f"datasets/{dataset}"}) + assert response.status_code == 200 + + # poll the /splits endpoint until we get something else than "The dataset is being processed. Retry later." + response = poll_splits_until_dataset_process_has_finished(dataset, 60) + assert response.status_code == 200 + + # poll the /rows endpoint until we get something else than "The split is being processed. Retry later." + response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + assert response.status_code == 200 + json = response.json() + assert "rows" in json + assert json["rows"][0]["row"]["id"] == "TR-0" + + +def test_bug_empty_split(): + # see #185 and #177 + # we get an error when: + # - the dataset has been processed and the splits have been created in the database + # - the splits have not been processed and are still in EMPTY status in the database + # - the dataset is processed again, and the splits are marked as STALLED + # - as STALLED, they are thus returned with an empty content, instead of an error message + # (waiting for being processsed) + dataset = "nielsr/CelebA-faces" + config = "nielsr--CelebA-faces" + split = "train" + + # ask for the dataset to be refreshed + response = requests.post(f"{URL}/webhook", json={"update": f"datasets/{dataset}"}) + assert response.status_code == 200 + + # poll the /splits endpoint until we get something else than "The dataset is being processed. Retry later." + response = poll_splits_until_dataset_process_has_finished(dataset, 60) + assert response.status_code == 200 + + # at this point the splits should have been created in the dataset, and still be EMPTY + url = f"{URL}/rows?dataset={dataset}&config={config}&split={split}" + response = requests.get(url) + assert response.status_code == 400 + json = response.json() + assert json["message"] == "The split is being processed. Retry later." + + # ask again for the dataset to be refreshed + response = requests.post(f"{URL}/webhook", json={"update": f"datasets/{dataset}"}) + assert response.status_code == 200 + + # at this moment, there is a concurrency race between the dataset worker and the split worker + # but the dataset worker should finish before, because it's faster on this dataset + # With the bug, if we polled again /rows until we have something else than "being processed", + # we would have gotten a valid response, but with empty rows, which is incorrect + # Now: it gives a correct list of elements + response = poll_rows_until_split_process_has_finished(dataset, config, split, 60) + assert response.status_code == 200 + json = response.json() + assert len(json["rows"]) == 100 + + +def test_valid_after_two_datasets_processed(): + # this test ensures that the two datasets processed successfully are present in /valid + response = requests.get(f"{URL}/valid") + assert response.status_code == 200 + # at this moment no dataset has been processed + assert response.json()["valid"] == ["acronym_identification", "nielsr/CelebA-faces"] diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 6633151f..bd86c663 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3,3 +3,3 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-c26970d", - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-131ef42", - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-20be42f", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-7bf1008", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-be3e543", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-7bf1008", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-20be42f", + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-7bf1008" diff --git a/infra/charts/datasets-server/nginx-templates/default.conf.template b/infra/charts/datasets-server/nginx-templates/default.conf.template index 5e7a90ef..cf6951d4 100644 --- a/infra/charts/datasets-server/nginx-templates/default.conf.template +++ b/infra/charts/datasets-server/nginx-templates/default.conf.template @@ -31,3 +31,3 @@ server { - proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; - proxy_cache_background_update on; - proxy_cache_lock on; + proxy_cache_use_stale off; + proxy_cache_background_update off; + proxy_cache_lock off; diff --git a/infra/docs/authentication.md b/infra/docs/authentication.md index 29e3f2e9..9362128b 100644 --- a/infra/docs/authentication.md +++ b/infra/docs/authentication.md @@ -15 +15 @@ CLI default output format [None]: -CLI profile name [EKS-HUB-Hub-707930574880]: hub +CLI profile name [EKS-HUB-Hub-707930574880]: hub-prod @@ -19 +19 @@ To use this profile, specify the profile name using --profile, as shown: -aws s3 ls --profile hub +aws s3 ls --profile hub-prod @@ -22 +22 @@ aws s3 ls --profile hub -In the docs, we assume the AWS CLI profile is called `hub`. +In the docs, we assume the AWS CLI profile is called `hub-prod`. @@ -24 +24 @@ In the docs, we assume the AWS CLI profile is called `hub`. -The profile `hub` is meant to: +The profile `hub-prod` is meant to: @@ -29,2 +29,2 @@ The profile `hub` is meant to: - $ aws eks describe-cluster --profile=hub --name=hub-ephemeral - $ aws eks update-kubeconfig --profile=hub --name=hub-ephemeral + $ aws eks describe-cluster --profile=hub-prod --name=hub-prod + $ aws eks update-kubeconfig --profile=hub-prod --name=hub-prod @@ -36 +36 @@ The profile `hub` is meant to: - $ aws ecr get-login-password --region us-east-1 --profile=hub \ + $ aws ecr get-login-password --region us-east-1 --profile=hub-prod \ @@ -45 +45 @@ It is not meant to operate on AWS resources directly. The following command give -$ aws eks list-clusters --profile=hub +$ aws eks list-clusters --profile=hub-prod diff --git a/libs/libcache/dist/libcache-0.1.6-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.6-py3-none-any.whl new file mode 100644 index 00000000..50513c4a Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.6-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.6.tar.gz b/libs/libcache/dist/libcache-0.1.6.tar.gz new file mode 100644 index 00000000..f0691d52 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.6.tar.gz differ diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 9c7f9d39..8744f1e2 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.5" +version = "0.1.6" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index e68e9047..4e946c8e 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -316,4 +316,7 @@ def create_or_mark_split_as_stalled(split_full_name: SplitFullName, split_idx: i - DbSplit.objects( - dataset_name=split_full_name["dataset_name"], - config_name=split_full_name["config_name"], - split_name=split_full_name["split_name"], + dataset_name = split_full_name["dataset_name"] + config_name = split_full_name["config_name"] + split_name = split_full_name["split_name"] + split = DbSplit.objects( + dataset_name=dataset_name, + config_name=config_name, + split_name=split_name, @@ -321 +324,4 @@ def create_or_mark_split_as_stalled(split_full_name: SplitFullName, split_idx: i - mark_split_as_stalled(split_full_name, split_idx) + if split.status == Status.EMPTY: + logger.debug(f"dataset '{dataset_name}': let split {split_name} in config {config_name} as empty") + else: + mark_split_as_stalled(split_full_name, split_idx) diff --git a/libs/libcache/tests/test_cache.py b/libs/libcache/tests/test_cache.py index 5cd673f3..357e4cc7 100644 --- a/libs/libcache/tests/test_cache.py +++ b/libs/libcache/tests/test_cache.py @@ -9,0 +10,2 @@ from libcache.cache import ( + DbSplit, + Status, @@ -57 +59 @@ def test_save_and_update() -> None: -def test_acronym_identification() -> None: +def test_upsert_dataset() -> None: @@ -62,0 +65,2 @@ def test_acronym_identification() -> None: + split = DbSplit.objects(dataset_name=dataset_name).get() + assert split.status == Status.EMPTY @@ -64,0 +69,2 @@ def test_acronym_identification() -> None: + split = DbSplit.objects(dataset_name=dataset_name).get() + assert split.status == Status.EMPTY diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index 37e74f46..d11a7a72 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -360,16 +359,0 @@ def get_split_dump_by_status(waiting_started: bool = False) -> DumpByStatus: - - -def is_dataset_in_queue(dataset_name: str) -> bool: - return DatasetJob.objects(status__in=[Status.WAITING, Status.STARTED], dataset_name=dataset_name).count() > 0 - - -def is_split_in_queue(dataset_name: str, config_name: str, split_name: str) -> bool: - return ( - SplitJob.objects( - status__in=[Status.WAITING, Status.STARTED], - dataset_name=dataset_name, - config_name=config_name, - split_name=split_name, - ).count() - > 0 - ) diff --git a/libs/libqueue/tests/test_queue.py b/libs/libqueue/tests/test_queue.py index 8a07e1ea..1204ce50 100644 --- a/libs/libqueue/tests/test_queue.py +++ b/libs/libqueue/tests/test_queue.py @@ -14,2 +13,0 @@ from libqueue.queue import ( - is_dataset_in_queue, - is_split_in_queue, @@ -85,20 +82,0 @@ def test_max_jobs_per_dataset() -> None: -def test_is_dataset_in_queue() -> None: - dataset_name = "test_dataset" - dataset_name_2 = "test_dataset_2" - assert is_dataset_in_queue(dataset_name) is False - add_dataset_job(dataset_name) - assert is_dataset_in_queue(dataset_name) is True - assert is_dataset_in_queue(dataset_name_2) is False - - -def test_is_split_in_queue() -> None: - dataset_name = "test_dataset" - config_name = "test_config" - split_name = "test_split" - dataset_name_2 = "test_dataset_2" - assert is_split_in_queue(dataset_name, config_name, split_name) is False - add_split_job(dataset_name, config_name, split_name) - assert is_split_in_queue(dataset_name, config_name, split_name) is True - assert is_split_in_queue(dataset_name_2, config_name, split_name) is False - - diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 017e4b75..8d2e9d31 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -456 +456 @@ name = "libcache" -version = "0.1.5" +version = "0.1.6" @@ -471 +471 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl" @@ -1202 +1202 @@ python-versions = "3.9.6" -content-hash = "c886ebe3266b4e67175546f48219e9d3a3db83266099b7cd57bce6385fe669ed" +content-hash = "6bd64b7e0669c182d7ccac0940f69a187b5536ef684fc90f3ca0f1ae79af2ab4" @@ -1472 +1472 @@ libcache = [ - {file = "libcache-0.1.5-py3-none-any.whl", hash = "sha256:85c5406a3d29504072ac2e5589fc9262ec9e6a4c15db70cd5fd5b377d765f21a"}, + {file = "libcache-0.1.6-py3-none-any.whl", hash = "sha256:c2e8fed85516045c62d92096a7bc0ff2215fc33e2c824cd9d91fa11aafc9d544"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 79036977..3e6f4cb3 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl", develop = false } diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 1366e328..1431a7dd 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.5" +version = "0.1.6" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl" @@ -1201 +1201 @@ python-versions = "3.9.6" -content-hash = "3e8d028fd11ca2b8e5b175a8de3f1d1da74a498682a668826504ad51a01deca5" +content-hash = "e13d45448d1dd78bf450313e428fb4589a4d0e00206919472405507ea51f19f4" @@ -1471 +1471 @@ libcache = [ - {file = "libcache-0.1.5-py3-none-any.whl", hash = "sha256:85c5406a3d29504072ac2e5589fc9262ec9e6a4c15db70cd5fd5b377d765f21a"}, + {file = "libcache-0.1.6-py3-none-any.whl", hash = "sha256:c2e8fed85516045c62d92096a7bc0ff2215fc33e2c824cd9d91fa11aafc9d544"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index cf942cec..938309af 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl", develop = false } diff --git a/services/api/src/api/routes/rows.py b/services/api/src/api/routes/rows.py index 21db1ffe..70360d57 100644 --- a/services/api/src/api/routes/rows.py +++ b/services/api/src/api/routes/rows.py @@ -4,2 +4 @@ from libcache.cache import get_rows_response -from libqueue.queue import is_dataset_in_queue, is_split_in_queue -from libutils.exceptions import Status400Error, Status500Error, StatusError +from libutils.exceptions import Status400Error, StatusError @@ -9 +8 @@ from starlette.responses import Response -from api.config import MAX_AGE_LONG_SECONDS +from api.config import MAX_AGE_LONG_SECONDS, MAX_AGE_SHORT_SECONDS @@ -32,5 +31 @@ async def rows_endpoint(request: Request) -> Response: - if err.message == "The split does not exist." and is_dataset_in_queue(dataset_name): - raise Status400Error("The dataset is being processed. Retry later.", err) from err - if err.message != "The split cache is empty.": - raise err - if is_split_in_queue(dataset_name, config_name, split_name): + if err.message == "The split cache is empty.": @@ -38,2 +33 @@ async def rows_endpoint(request: Request) -> Response: - else: - raise Status500Error("The split cache is empty but no job has been launched.", err) from err + raise err @@ -41 +35 @@ async def rows_endpoint(request: Request) -> Response: - return get_response(err.as_content(), err.status_code, MAX_AGE_LONG_SECONDS) + return get_response(err.as_content(), err.status_code, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/splits.py b/services/api/src/api/routes/splits.py index 3fc55a70..34a7ab8c 100644 --- a/services/api/src/api/routes/splits.py +++ b/services/api/src/api/routes/splits.py @@ -4,2 +4 @@ from libcache.cache import get_splits_response -from libqueue.queue import is_dataset_in_queue -from libutils.exceptions import Status400Error, Status500Error, StatusError +from libutils.exceptions import Status400Error, StatusError @@ -9 +8 @@ from starlette.responses import Response -from api.config import MAX_AGE_LONG_SECONDS +from api.config import MAX_AGE_LONG_SECONDS, MAX_AGE_SHORT_SECONDS @@ -26,3 +25 @@ async def splits_endpoint(request: Request) -> Response: - if err.message != "The dataset cache is empty.": - raise err - if is_dataset_in_queue(dataset_name): + if err.message == "The dataset cache is empty.": @@ -30,2 +27 @@ async def splits_endpoint(request: Request) -> Response: - else: - raise Status500Error("The dataset cache is empty but no job has been launched.", err) from err + raise err @@ -33 +29 @@ async def splits_endpoint(request: Request) -> Response: - return get_response(err.as_content(), err.status_code, MAX_AGE_LONG_SECONDS) + return get_response(err.as_content(), err.status_code, MAX_AGE_SHORT_SECONDS) diff --git a/services/api/src/api/routes/valid.py b/services/api/src/api/routes/valid.py index 5032fb05..9005bf57 100644 --- a/services/api/src/api/routes/valid.py +++ b/services/api/src/api/routes/valid.py @@ -12 +12 @@ from starlette.responses import Response -from api.config import MAX_AGE_LONG_SECONDS +from api.config import MAX_AGE_LONG_SECONDS, MAX_AGE_SHORT_SECONDS @@ -38 +38 @@ async def is_valid_endpoint(request: Request) -> Response: - return get_response(err.as_content(), err.status_code, MAX_AGE_LONG_SECONDS) + return get_response(err.as_content(), err.status_code, MAX_AGE_SHORT_SECONDS) diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index e3d28d66..5570699c 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -970 +970 @@ name = "libcache" -version = "0.1.5" +version = "0.1.6" @@ -985 +985 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl" @@ -2535 +2535 @@ python-versions = "3.9.6" -content-hash = "f19b3b1a92a1c4fe6faf65e2c279459b684da0f55aef35b187e7b88c5d0efc7e" +content-hash = "1dd53cb040992152bb7bc76237425a591116130a45164c27ecf4746c6a9f047f" @@ -3326 +3326 @@ libcache = [ - {file = "libcache-0.1.5-py3-none-any.whl", hash = "sha256:85c5406a3d29504072ac2e5589fc9262ec9e6a4c15db70cd5fd5b377d765f21a"}, + {file = "libcache-0.1.6-py3-none-any.whl", hash = "sha256:c2e8fed85516045c62d92096a7bc0ff2215fc33e2c824cd9d91fa11aafc9d544"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 6f6d65bf..e8afc140 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -18 +18 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.6-py3-none-any.whl", develop = false }
7444bd367cf391d849b529d31eed4730d2d2b405
Sylvain Lesage
2022-06-08T12:24:49
Allow none path in audio (#363)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 39cd6bd5..6633151f 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -5 +5 @@ - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-53b482d", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-20be42f", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-53b482d", + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-20be42f", diff --git a/services/worker/src/worker/models/column/audio.py b/services/worker/src/worker/models/column/audio.py index 56ec9a38..71b81c2b 100644 --- a/services/worker/src/worker/models/column/audio.py +++ b/services/worker/src/worker/models/column/audio.py @@ -18,10 +18,14 @@ def check_value(value: Any) -> None: - if value is not None: - try: - path = value["path"] - array = value["array"] - except Exception as e: - raise CellTypeError("audio cell must contain 'path' and 'array' fields") from e - if type(path) != str: - raise CellTypeError("'path' field must be a string") - if type(array) != ndarray: - raise CellTypeError("'array' field must be a numpy.ndarray") + if value is None: + return + try: + path = value["path"] + array = value["array"] + sampling_rate = value["sampling_rate"] + except Exception as e: + raise CellTypeError("audio cell must contain 'path' and 'array' fields") from e + if path is not None and type(path) != str: + raise CellTypeError("'path' field must be a string or None") + if type(array) != ndarray: + raise CellTypeError("'array' field must be a numpy.ndarray") + if type(sampling_rate) != int: + raise CellTypeError("'sampling_rate' field must be an integer") diff --git a/services/worker/src/worker/models/typed_row.py b/services/worker/src/worker/models/typed_row.py index 6f7944f0..5fe132c2 100644 --- a/services/worker/src/worker/models/typed_row.py +++ b/services/worker/src/worker/models/typed_row.py @@ -7 +7 @@ from libutils.exceptions import Status400Error -from worker.models.column import Column, get_columns +from worker.models.column import CellTypeError, Column, get_columns @@ -16,4 +16,7 @@ def get_typed_row( - return { - column.name: column.get_cell_value(dataset_name, config_name, split_name, row_idx, row[column.name]) - for column in columns - } + try: + return { + column.name: column.get_cell_value(dataset_name, config_name, split_name, row_idx, row[column.name]) + for column in columns + } + except CellTypeError as err: + raise Status400Error("Cell type error.", err) from err diff --git a/services/worker/tests/models/test_typed_row.py b/services/worker/tests/models/test_typed_row.py index 3c19c7de..4439320b 100644 --- a/services/worker/tests/models/test_typed_row.py +++ b/services/worker/tests/models/test_typed_row.py @@ -85,0 +86,11 @@ def test_audio_dataset() -> None: + + +def test_audio_path_none_dataset() -> None: + info = get_info("LIUM/tedlium", "release1") + typed_rows, columns = get_typed_rows_and_columns("LIUM/tedlium", "release1", "test", info, rows_max_number=1) + assert len(typed_rows) == 1 + assert columns[0].type == ColumnType.AUDIO_RELATIVE_SOURCES + assert len(typed_rows[0]["audio"]) == 2 + assert typed_rows[0]["audio"][0]["type"] == "audio/mpeg" + assert typed_rows[0]["audio"][1]["type"] == "audio/wav" + assert typed_rows[0]["audio"][0]["src"] == "assets/LIUM/tedlium/--/release1/test/0/audio/audio.mp3"
312547e1193427f162ab61d9828edfb7d6d00f52
Sylvain Lesage
2022-06-08T09:24:15
fix: 🐛 use a new name for the numba cache preparation (#362)
diff --git a/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl b/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl index 43560d06..6b4de3e6 100644 --- a/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl +++ b/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl @@ -2 +2 @@ -- name: prepare-cache +- name: prepare-numba-cache
ff282836242d3c550c3e0a96cdff1cfbeb9f8c52
Sylvain Lesage
2022-06-08T09:13:08
fix: 🐛 ensure the NUMBA_CACHE_DIR is set (#361)
diff --git a/infra/charts/datasets-server/templates/_helpers.tpl b/infra/charts/datasets-server/templates/_helpers.tpl index 9bd0a11d..ef13e577 100644 --- a/infra/charts/datasets-server/templates/_helpers.tpl +++ b/infra/charts/datasets-server/templates/_helpers.tpl @@ -73 +73 @@ The assets/ subpath in the NFS -- in a subdirectory named as the Release, so that Releases will not share the same assets/ dir +- in a subdirectory named as the Release, so that Releases will not share the same dir @@ -82 +82 @@ The cache/ subpath in the NFS -- in a subdirectory named as the Release, so that Releases will not share the same assets/ dir +- in a subdirectory named as the Release, so that Releases will not share the same dir @@ -89 +89,10 @@ The cache/ subpath in the NFS -The cache/ subpath in the NFS +The numba-cache/ subpath in the NFS +- in a subdirectory named as the chart (datasets-server/), and below it, +- in a subdirectory named as the Release, so that Releases will not share the same dir +*/}} +{{- define "numba.cache.subpath" -}} +{{- printf "%s/%s/%s/" .Chart.Name .Release.Name "numba-cache" }} +{{- end }} + +{{/* +The nginx-cache/ subpath in the NFS @@ -91 +100 @@ The cache/ subpath in the NFS -- in a subdirectory named as the Release, so that Releases will not share the same assets/ dir +- in a subdirectory named as the Release, so that Releases will not share the same dir diff --git a/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl b/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl new file mode 100644 index 00000000..43560d06 --- /dev/null +++ b/infra/charts/datasets-server/templates/_initContainerNumbaCache.tpl @@ -0,0 +1,18 @@ +{{- define "initContainerNumbaCache" -}} +- name: prepare-cache + image: ubuntu:focal + imagePullPolicy: IfNotPresent + command: ["/bin/sh", "-c"] + args: + - chown {{ .Values.uid }}:{{ .Values.gid }} /mounted-path; + volumeMounts: + - mountPath: /mounted-path + mountPropagation: None + name: nfs + subPath: "{{ include "numba.cache.subpath" . }}" + readOnly: false + securityContext: + runAsNonRoot: false + runAsUser: 0 + runAsGroup: 0 +{{- end -}} diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl index 13f4b05e..4224fd32 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl @@ -47,0 +48,2 @@ + - name: NUMBA_CACHE_DIR + value: {{ .Values.datasetsWorker.numbaCacheDirectory | quote }} @@ -71,0 +74,5 @@ + - mountPath: {{ .Values.datasetsWorker.numbaCacheDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "numba.cache.subpath" . }}" + readOnly: false diff --git a/infra/charts/datasets-server/templates/datasets-worker/deployment.yaml b/infra/charts/datasets-server/templates/datasets-worker/deployment.yaml index 60c016e4..9e2d02d6 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/deployment.yaml +++ b/infra/charts/datasets-server/templates/datasets-worker/deployment.yaml @@ -24,0 +25 @@ spec: + {{ include "initContainerNumbaCache" . | nindent 8 }} diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/splits-worker/_container.tpl index ac401992..d8e1b2d9 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/splits-worker/_container.tpl @@ -47,0 +48,2 @@ + - name: NUMBA_CACHE_DIR + value: {{ .Values.splitsWorker.numbaCacheDirectory | quote }} @@ -71,0 +74,5 @@ + - mountPath: {{ .Values.splitsWorker.numbaCacheDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "numba.cache.subpath" . }}" + readOnly: false diff --git a/infra/charts/datasets-server/templates/splits-worker/deployment.yaml b/infra/charts/datasets-server/templates/splits-worker/deployment.yaml index 4ba5a527..3532a69e 100644 --- a/infra/charts/datasets-server/templates/splits-worker/deployment.yaml +++ b/infra/charts/datasets-server/templates/splits-worker/deployment.yaml @@ -24,0 +25 @@ spec: + {{ include "initContainerNumbaCache" . | nindent 8 }} diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 0451a45e..1aad9851 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -133,0 +134,2 @@ datasetsWorker: + # Directory of the "numba" library cache + numbaCacheDirectory: "/numba-cache" @@ -173,0 +176,2 @@ splitsWorker: + # Directory of the "numba" library cache + numbaCacheDirectory: "/numba-cache" diff --git a/services/worker/README.md b/services/worker/README.md index 809a3540..8d3b3c86 100644 --- a/services/worker/README.md +++ b/services/worker/README.md @@ -39,0 +40 @@ Set environment variables to configure the following aspects: +- `NUMBA_CACHE_DIR`: directory where the `numba` decorators (used by `librosa`) can write cache. Required on cloud infrastructure (see https://stackoverflow.com/a/63367171/7351594).
6c7521fd5d63668df5a1ff83fbdc7e514671cd90
Sylvain Lesage
2022-06-08T08:29:30
feat: 🎸 use the new certificate (#360)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 6d21b13e..5ec9dfb2 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -43 +43 @@ reverseProxy: - alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:707930574880:certificate/bfcad79a-111b-4852-adc2-5d78f4132eb6 + alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:707930574880:certificate/777e3ae5-0c54-47ee-9b8c-d85eeb6ec4ae
c2f906480cf896df6832cd451a47c875785a85da
Sylvain Lesage
2022-06-08T08:06:44
fix: 🐛 adapt the pods resources (#359)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index d6d946d6..6d21b13e 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -3 +3 @@ -# 32 vCPUs and 128 GiB RAM are available +# 32 vCPUs and 128 GiB RAM are available (but no more than 8 cpus or 32 GiB for each pod) @@ -9,6 +9,7 @@ -# this lets 25 CPUs, and 123 GB for the workers -# But due to toleration "CriticalAddonsOnly" which does not allow to deploy, -# we have to use less... It seems that, with 3 CPUs and 20GB for every -# datasets and splits worker, we can only deploy 4 workers -# - datasets-worker: 2 workers -> 6 CPUs, 40 GiB -# - splits-worker: 2 workers -> 6 CPUs, 40 GiB +# this lets 25 CPUs, and 123 GiB for the workers +# we will over-commit the resources by a factor 4 in order to get more workers +# available in case of burst of jobs (most of the jobs don't require much resources) +# so: 100 CPUs and 492 GiB RAM +# +# - datasets-worker: 4 workers -> 6 CPUs, 30 GiB +# - splits-worker: 12 workers -> 6 CPUs, 30 GiB @@ -102,2 +103,2 @@ datasetsWorker: - cpu: 3 - memory: "20Gi" + cpu: 6 + memory: "30Gi" @@ -106 +107 @@ splitsWorker: - replicas: 6 + replicas: 10 @@ -117 +118 @@ splitsWorker: - memory: "48Gi" + memory: "30Gi" @@ -122 +123 @@ splitsWorker: - maxJobsPerDataset: 2 + maxJobsPerDataset: 5
cb3eb9bf1c2d825fcbcc07dba87d6da9c9ade8bd
Sylvain Lesage
2022-06-08T07:47:56
feat: 🎸 update the resources by trial and error (#358)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 6256cad0..d6d946d6 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -5 +5 @@ -# the max resources lmimits) per deployment are: +# the max resources (limits) per deployment are: @@ -10,6 +10,5 @@ -# Let's overcommit by a factor 4, ie 100 CPUs and 492 GB, -# and give the same amount of max resources to the datasets -# and splits workers: 6 CPUs and 32GB -# This means about 16 pods -# - datasets-worker: 4 workers -> 24 CPUs, 128 GiB -# - splits-worker: 12 workers -> 72 CPUs, 384 GiB +# But due to toleration "CriticalAddonsOnly" which does not allow to deploy, +# we have to use less... It seems that, with 3 CPUs and 20GB for every +# datasets and splits worker, we can only deploy 4 workers +# - datasets-worker: 2 workers -> 6 CPUs, 40 GiB +# - splits-worker: 2 workers -> 6 CPUs, 40 GiB @@ -100,0 +100 @@ datasetsWorker: + memory: "1Gi" @@ -102,2 +102,2 @@ datasetsWorker: - cpu: 6 - memory: "32Gi" + cpu: 3 + memory: "20Gi" @@ -106 +106 @@ splitsWorker: - replicas: 8 + replicas: 6 @@ -113,0 +114 @@ splitsWorker: + memory: "1Gi" @@ -116 +117 @@ splitsWorker: - memory: "32Gi" + memory: "48Gi"
ebb0425857cf7f446d665d3464404ca2d671840d
Sylvain Lesage
2022-06-07T18:19:48
feat: 🎸 increase resources for the workers (#357)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 4b54d4dd..6256cad0 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -0,0 +1,16 @@ +# resources for the prod namespace are defined here: https://us-east-1.console.aws.amazon.com/eks/home?region=us-east-1#/clusters/hub-prod/nodegroups/datasets-server-20220513085103612000000001 +# the nodes are 4 t3.2xlarge instances (8 vCPUs, 32 GiB), ie: +# 32 vCPUs and 128 GiB RAM are available +# +# the max resources lmimits) per deployment are: +# - reverse-proxy: 2 pods -> 2 CPUs, 512MiB +# - api: 4 pods -> 4 CPUs, 4 GiB +# - admin: 1 pod -> 1 CPU +# this lets 25 CPUs, and 123 GB for the workers +# Let's overcommit by a factor 4, ie 100 CPUs and 492 GB, +# and give the same amount of max resources to the datasets +# and splits workers: 6 CPUs and 32GB +# This means about 16 pods +# - datasets-worker: 4 workers -> 24 CPUs, 128 GiB +# - splits-worker: 12 workers -> 72 CPUs, 384 GiB + @@ -77 +93 @@ datasetsWorker: - replicas: 2 + replicas: 4 @@ -86,2 +102,2 @@ datasetsWorker: - cpu: 1 - memory: "1Gi" + cpu: 6 + memory: "32Gi" @@ -90 +106 @@ splitsWorker: - replicas: 4 + replicas: 8 @@ -99,2 +115,2 @@ splitsWorker: - cpu: 1 - memory: "4Gi" + cpu: 6 + memory: "32Gi"
1ace9b53b480577a6d7036d9d9828ad4df618a90
Sylvain Lesage
2022-06-07T17:37:19
feat: 🎸 update images (#356)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 72d02c8a..39cd6bd5 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -5 +5 @@ - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-af11d19", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-53b482d", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-af11d19", + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-53b482d",
bc8a0f906b8485b9f7debf82048f2779d0793a32
Sylvain Lesage
2022-06-07T17:31:22
Fix worker (#354)
diff --git a/services/worker/src/worker/main.py b/services/worker/src/worker/main.py index f33fbc38..5e0ff44e 100644 --- a/services/worker/src/worker/main.py +++ b/services/worker/src/worker/main.py @@ -56,0 +57 @@ def process_next_dataset_job() -> bool: + retry = False @@ -63 +64,4 @@ def process_next_dataset_job() -> bool: - split_full_name["dataset_name"], split_full_name["config_name"], split_full_name["split_name"] + split_full_name["dataset_name"], + split_full_name["config_name"], + split_full_name["split_name"], + retries=0, @@ -65,0 +70,4 @@ def process_next_dataset_job() -> bool: + if isinstance(e, Status500Error) and retries < MAX_JOB_RETRIES: + retry = True + # in any case: don't raise the StatusError, and go to finally + finally: @@ -69 +77 @@ def process_next_dataset_job() -> bool: - if isinstance(e, Status500Error) and retries < MAX_JOB_RETRIES: + if retry: @@ -92,0 +101 @@ def process_next_split_job() -> bool: + retry = False @@ -106,0 +116,4 @@ def process_next_split_job() -> bool: + if isinstance(e, Status500Error) and retries < MAX_JOB_RETRIES: + retry = True + # in any case: don't raise the StatusError, and go to finally + finally: @@ -113 +126 @@ def process_next_split_job() -> bool: - if isinstance(e, Status500Error) and retries < MAX_JOB_RETRIES: + if retry: @@ -170,11 +183,10 @@ def loop() -> None: - while True: - if has_resources(): - try: - if process_next_job(): - # loop immediately to try another job - # see https://github.com/huggingface/datasets-server/issues/265 - continue - except BaseException as e: - logger.critical(f"quit due to an uncaught error while processing the job: {e}") - raise - sleep() + try: + while True: + if has_resources() and process_next_job(): + # loop immediately to try another job + # see https://github.com/huggingface/datasets-server/issues/265 + continue + sleep() + except BaseException as e: + logger.critical(f"quit due to an uncaught error while processing the job: {e}") + raise diff --git a/services/worker/tests/_utils.py b/services/worker/tests/_utils.py index 7ff4d977..0c459acd 100644 --- a/services/worker/tests/_utils.py +++ b/services/worker/tests/_utils.py @@ -6,0 +7 @@ DEFAULT_MONGO_CACHE_DATABASE: str = "datasets_server_cache_test" +DEFAULT_MONGO_QUEUE_DATABASE: str = "datasets_server_queue_test" @@ -11,0 +13 @@ MONGO_CACHE_DATABASE = get_str_value(d=os.environ, key="MONGO_CACHE_DATABASE", d +MONGO_QUEUE_DATABASE = get_str_value(d=os.environ, key="MONGO_QUEUE_DATABASE", default=DEFAULT_MONGO_QUEUE_DATABASE) diff --git a/services/worker/tests/test_main.py b/services/worker/tests/test_main.py new file mode 100644 index 00000000..1d548ba9 --- /dev/null +++ b/services/worker/tests/test_main.py @@ -0,0 +1,40 @@ +import pytest +from libcache.cache import clean_database as clean_cache_database +from libcache.cache import connect_to_cache +from libqueue.queue import add_dataset_job, add_split_job +from libqueue.queue import clean_database as clean_queue_database +from libqueue.queue import connect_to_queue + +from worker.main import process_next_dataset_job, process_next_split_job + +from ._utils import MONGO_CACHE_DATABASE, MONGO_QUEUE_DATABASE, MONGO_URL + + [email protected](autouse=True, scope="module") +def safe_guard() -> None: + if "test" not in MONGO_CACHE_DATABASE: + raise ValueError("Test must be launched on a test mongo database") + + [email protected](autouse=True, scope="module") +def client() -> None: + connect_to_cache(database=MONGO_CACHE_DATABASE, host=MONGO_URL) + connect_to_queue(database=MONGO_QUEUE_DATABASE, host=MONGO_URL) + + [email protected](autouse=True) +def clean_mongo_database() -> None: + clean_cache_database() + clean_queue_database() + + +def test_process_next_dataset_job(): + add_dataset_job("acronym_identification") + result = process_next_dataset_job() + assert result is True + + +def test_process_next_split_job(): + add_split_job("acronym_identification", "default", "train") + result = process_next_split_job() + assert result is True
051937bf28fc546d987ece3b4ef2f28bc240e501
Sylvain Lesage
2022-06-07T16:09:39
feat: 🎸 upgrade libqueue and libcache (#353)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 383a2ad1..72d02c8a 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -4 +4 @@ - "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-7cb4f82", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-131ef42", diff --git a/services/api/poetry.lock b/services/api/poetry.lock index ba6cd4e5..1366e328 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.4" +version = "0.1.5" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.4-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl" @@ -474 +474 @@ name = "libqueue" -version = "0.1.2" +version = "0.1.5" @@ -488 +488 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.2-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl" @@ -1201 +1201 @@ python-versions = "3.9.6" -content-hash = "8b6565d38b9b7d1fbc74df408200b9d0080802f887c1acc16bfebc2474c8e7f1" +content-hash = "3e8d028fd11ca2b8e5b175a8de3f1d1da74a498682a668826504ad51a01deca5" @@ -1471 +1471 @@ libcache = [ - {file = "libcache-0.1.4-py3-none-any.whl", hash = "sha256:0a2bb15d2a26fc7dd8db1813da4899fbcc417df6b946d2f9c59fd0c4d0d75d50"}, + {file = "libcache-0.1.5-py3-none-any.whl", hash = "sha256:85c5406a3d29504072ac2e5589fc9262ec9e6a4c15db70cd5fd5b377d765f21a"}, @@ -1474 +1474 @@ libqueue = [ - {file = "libqueue-0.1.2-py3-none-any.whl", hash = "sha256:31b9f1ecc84edf6c188ee53af21cdb29ee222695145ed310175d0a35ef5fd6c4"}, + {file = "libqueue-0.1.5-py3-none-any.whl", hash = "sha256:6ae2145e259d5fd7ad6112e63c30205030a0fbf972fba9028d43b6dd5766581f"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 7ad1d4a0..cf942cec 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9,2 +9,2 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.4-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.2-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl", develop = false }
7379b096fa756647756de73a55d6cb1941fe327a
Sylvain Lesage
2022-06-07T15:41:26
Remove the datasets blocklist and re-enqueue server errors (#352)
diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml index 8fea5b13..383a2ad1 100644 --- a/infra/charts/datasets-server/docker-images.yaml +++ b/infra/charts/datasets-server/docker-images.yaml @@ -3 +3 @@ - "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-e675472", + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-c26970d", @@ -5 +5 @@ - "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-da86243", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-af11d19", @@ -7 +7 @@ - "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-da86243", + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-af11d19", diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 3018cf53..4b54d4dd 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -22,3 +21,0 @@ apiDomain: "datasets-server.huggingface.co" -# Datasets blocklist -datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech,electricity_load_diagrams,svhn,the_pile,gary109/crop14_public-test,scielo,hyperpartisan_news_detection,wiki_auto,visual_genome,ms_marco,Aniemore/resd,trashsock/hands-images" - diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl index 8dbb85d3..13f4b05e 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl @@ -6,2 +5,0 @@ - - name: DATASETS_BLOCKLIST - value: {{ .Values.datasetsBlocklist | quote }} @@ -23,0 +22,2 @@ + - name: MAX_JOB_RETRIES + value: {{ .Values.datasetsWorker.maxJobRetries | quote }} diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/splits-worker/_container.tpl index 5f62cc09..ac401992 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/splits-worker/_container.tpl @@ -6,2 +5,0 @@ - - name: DATASETS_BLOCKLIST - value: {{ .Values.datasetsBlocklist | quote }} @@ -23,0 +22,2 @@ + - name: MAX_JOB_RETRIES + value: {{ .Values.splitsWorker.maxJobRetries | quote }} diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 7f4fa81e..0451a45e 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -36,3 +35,0 @@ gid: 3000 -# Datasets blocklist -datasetsBlocklist: "" - @@ -124,0 +122,2 @@ datasetsWorker: + # Max number of job retries (for 500 errors) for the same job + maxJobRetries: 3 @@ -162,0 +162,2 @@ splitsWorker: + # Max number of job retries (for 500 errors) for the same job + maxJobRetries: 3 diff --git a/libs/libqueue/dist/libqueue-0.1.4-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.4-py3-none-any.whl new file mode 100644 index 00000000..d6508b4c Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.4-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.4.tar.gz b/libs/libqueue/dist/libqueue-0.1.4.tar.gz new file mode 100644 index 00000000..ccd655f0 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.4.tar.gz differ diff --git a/libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl new file mode 100644 index 00000000..95de0194 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.5.tar.gz b/libs/libqueue/dist/libqueue-0.1.5.tar.gz new file mode 100644 index 00000000..02c1793e Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.5.tar.gz differ diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index c4bc68fa..d503a765 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.3" +version = "0.1.5" diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index 145c3da8..37e74f46 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -8 +8 @@ from mongoengine import Document, DoesNotExist, connect -from mongoengine.fields import DateTimeField, EnumField, StringField +from mongoengine.fields import DateTimeField, EnumField, IntField, StringField @@ -45,0 +46 @@ class JobDict(TypedDict): + retries: int @@ -96,0 +98 @@ class DatasetJob(Document): + retries = IntField(required=False, default=0) @@ -104,0 +107 @@ class DatasetJob(Document): + "retries": self.retries, @@ -129,0 +133 @@ class SplitJob(Document): + retries = IntField(required=False, default=0) @@ -139,0 +144 @@ class SplitJob(Document): + "retries": self.retries, @@ -180 +185 @@ def add_job(existing_jobs: QuerySet[AnyJob], new_job: AnyJob): -def add_dataset_job(dataset_name: str) -> None: +def add_dataset_job(dataset_name: str, retries: Optional[int] = 0) -> None: @@ -183 +188 @@ def add_dataset_job(dataset_name: str) -> None: - DatasetJob(dataset_name=dataset_name, created_at=datetime.utcnow(), status=Status.WAITING), + DatasetJob(dataset_name=dataset_name, created_at=datetime.utcnow(), status=Status.WAITING, retries=retries), @@ -187 +192 @@ def add_dataset_job(dataset_name: str) -> None: -def add_split_job(dataset_name: str, config_name: str, split_name: str) -> None: +def add_split_job(dataset_name: str, config_name: str, split_name: str, retries: Optional[int] = 0) -> None: @@ -195,0 +201 @@ def add_split_job(dataset_name: str, config_name: str, split_name: str) -> None: + retries=retries, @@ -244 +250 @@ def start_job(jobs: QuerySet[AnyJob], max_jobs_per_dataset: Optional[int] = None -def get_dataset_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str]: +def get_dataset_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str, int]: @@ -249 +255 @@ def get_dataset_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, st - return str(job.pk), job.dataset_name + return str(job.pk), job.dataset_name, job.retries @@ -253 +259 @@ def get_dataset_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, st -def get_split_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str, str, str]: +def get_split_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str, str, str, int]: @@ -255 +261 @@ def get_split_job(max_jobs_per_dataset: Optional[int] = None) -> Tuple[str, str, - return str(job.pk), job.dataset_name, job.config_name, job.split_name + return str(job.pk), job.dataset_name, job.config_name, job.split_name, job.retries @@ -293 +299 @@ def cancel_started_dataset_jobs() -> None: - add_dataset_job(dataset_name=job.dataset_name) + add_dataset_job(dataset_name=job.dataset_name, retries=job.retries) @@ -299 +305,3 @@ def cancel_started_split_jobs() -> None: - add_split_job(dataset_name=job.dataset_name, config_name=job.config_name, split_name=job.split_name) + add_split_job( + dataset_name=job.dataset_name, config_name=job.config_name, split_name=job.split_name, retries=job.retries + ) diff --git a/libs/libqueue/tests/test_queue.py b/libs/libqueue/tests/test_queue.py index 01278c10..8a07e1ea 100644 --- a/libs/libqueue/tests/test_queue.py +++ b/libs/libqueue/tests/test_queue.py @@ -37,0 +38 @@ def test_add_job() -> None: + # add a job @@ -38,0 +40 @@ def test_add_job() -> None: + # a second call is ignored @@ -40 +42,2 @@ def test_add_job() -> None: - job_id, dataset_name = get_dataset_job() + # get and start the first job + job_id, dataset_name, retries = get_dataset_job() @@ -41,0 +45,2 @@ def test_add_job() -> None: + assert retries == 0 + # adding the job while the first one has not finished yet is ignored @@ -43,0 +49 @@ def test_add_job() -> None: + # thus: no new job available @@ -44,0 +51 @@ def test_add_job() -> None: + # finish the first job @@ -45,0 +53 @@ def test_add_job() -> None: + # the queue is empty @@ -48,2 +56,4 @@ def test_add_job() -> None: - add_dataset_job("test") - job_id, dataset_name = get_dataset_job() + # add a job again + add_dataset_job("test", retries=5) + # get it and start it + job_id, dataset_name, retries = get_dataset_job() @@ -50,0 +61 @@ def test_add_job() -> None: + assert retries == 5 @@ -60 +71 @@ def test_max_jobs_per_dataset() -> None: - _, dataset_name, config_name, split_name = get_split_job() + _, dataset_name, config_name, split_name, __ = get_split_job() @@ -68 +79 @@ def test_max_jobs_per_dataset() -> None: - _, dataset_name, config_name, split_name = get_split_job(2) + _, dataset_name, config_name, split_name, __ = get_split_job(2) diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 13bdfbfc..017e4b75 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -475 +475 @@ name = "libqueue" -version = "0.1.3" +version = "0.1.5" @@ -489 +489 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.3-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl" @@ -1202 +1202 @@ python-versions = "3.9.6" -content-hash = "578ccd2d098ee4f526b4e4cc7be7e70090d6f25e9e548629f2864c2bc4d7512f" +content-hash = "c886ebe3266b4e67175546f48219e9d3a3db83266099b7cd57bce6385fe669ed" @@ -1475 +1475 @@ libqueue = [ - {file = "libqueue-0.1.3-py3-none-any.whl", hash = "sha256:ba07273d7bf7c05048c2d7ffd0b1ebc47fff08e873681039ef53d2ec3bde522b"}, + {file = "libqueue-0.1.5-py3-none-any.whl", hash = "sha256:6ae2145e259d5fd7ad6112e63c30205030a0fbf972fba9028d43b6dd5766581f"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index ecb9e8ec..79036977 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -10 +10 @@ libcache = { path = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl", -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.3-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.5-py3-none-any.whl", develop = false } diff --git a/services/worker/.env.example b/services/worker/.env.example index fa96695e..950a17db 100644 --- a/services/worker/.env.example +++ b/services/worker/.env.example @@ -4,3 +3,0 @@ -# Datasets blocklist -# DATASETS_BLOCKLIST="" - @@ -15,0 +13,3 @@ +# Max number of job retries (for uncaught errors, eg RAM shortage) for the same job +# MAX_JOB_RETRIES = 3 + diff --git a/services/worker/README.md b/services/worker/README.md index 65ff8563..809a3540 100644 --- a/services/worker/README.md +++ b/services/worker/README.md @@ -26 +25,0 @@ Set environment variables to configure the following aspects: -- `DATASETS_BLOCKLIST`: comma-separated list of datasets that will never be processed. It's used to preventively block the biggest datasets, that we don't know how to manage properly in our infrastructure. An example: `DATASETS_BLOCKLIST="Alvenir/nst-da-16khz,bigscience/P3,clips/mqa"` (use [`\`](https://stackoverflow.com/a/3871336/7351594) to have one dataset per line if it makes the list more readable). Defaults to empty. @@ -31,0 +31 @@ Set environment variables to configure the following aspects: +- `MAX_JOB_RETRIES`: the maximum number of job retries (for uncaught errors, such as RAM shortage) for the same job. The job is re-enqueued if an unexpected server error occurred and if its "retries" number is under `MAX_JOB_RETRIES`. Defaults to 3. diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index f9f63c29..e3d28d66 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -933,0 +934 @@ url = "https://github.com/kpu/kenlm/archive/master.zip" + @@ -969 +970 @@ name = "libcache" -version = "0.1.1" +version = "0.1.5" @@ -984 +985 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl" @@ -996 +997 @@ name = "libqueue" -version = "0.1.1" +version = "0.1.4" @@ -1010 +1011 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.4-py3-none-any.whl" @@ -2534 +2535 @@ python-versions = "3.9.6" -content-hash = "44593aeafa3189109418ece8e79540506455aa93a665897bbe755424030937c1" +content-hash = "f19b3b1a92a1c4fe6faf65e2c279459b684da0f55aef35b187e7b88c5d0efc7e" @@ -3325 +3326 @@ libcache = [ - {file = "libcache-0.1.1-py3-none-any.whl", hash = "sha256:40e7ae95c00d2213bdc4f80091a33367cc86c34ebccc787250e68ab9d0ff291e"}, + {file = "libcache-0.1.5-py3-none-any.whl", hash = "sha256:85c5406a3d29504072ac2e5589fc9262ec9e6a4c15db70cd5fd5b377d765f21a"}, @@ -3337 +3338 @@ libqueue = [ - {file = "libqueue-0.1.1-py3-none-any.whl", hash = "sha256:50a690a0cbfc157a36ec19c1ce343a8f0b1b3a060e93c3f566c415eba8e225f9"}, + {file = "libqueue-0.1.4-py3-none-any.whl", hash = "sha256:64d3f22ab0d667ed6a9b5aed79d481c32eca5f5d948caa824f6feedfa11a89df"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index e94fd220..6f6d65bf 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -18,2 +18,2 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.4-py3-none-any.whl", develop = false } diff --git a/services/worker/src/worker/config.py b/services/worker/src/worker/config.py index 6cf7ee75..48240c13 100644 --- a/services/worker/src/worker/config.py +++ b/services/worker/src/worker/config.py @@ -5,6 +5 @@ from dotenv import load_dotenv -from libutils.utils import ( - get_int_value, - get_str_list_value, - get_str_or_none_value, - get_str_value, -) +from libutils.utils import get_int_value, get_str_or_none_value, get_str_value @@ -14 +8,0 @@ from worker.constants import ( - DEFAULT_DATASETS_BLOCKLIST, @@ -17,0 +12 @@ from worker.constants import ( + DEFAULT_MAX_JOB_RETRIES, @@ -37 +31,0 @@ ASSETS_DIRECTORY = get_str_or_none_value(d=os.environ, key="ASSETS_DIRECTORY", d -DATASETS_BLOCKLIST = get_str_list_value(d=os.environ, key="DATASETS_BLOCKLIST", default=DEFAULT_DATASETS_BLOCKLIST) @@ -40,0 +35 @@ LOG_LEVEL = get_str_value(d=os.environ, key="LOG_LEVEL", default=DEFAULT_LOG_LEV +MAX_JOB_RETRIES = get_int_value(os.environ, "MAX_JOB_RETRIES", DEFAULT_MAX_JOB_RETRIES) diff --git a/services/worker/src/worker/constants.py b/services/worker/src/worker/constants.py index d274af77..c7b702ce 100644 --- a/services/worker/src/worker/constants.py +++ b/services/worker/src/worker/constants.py @@ -1 +1 @@ -from typing import List, Optional +from typing import Optional @@ -4 +3,0 @@ DEFAULT_ASSETS_DIRECTORY: None = None -DEFAULT_DATASETS_BLOCKLIST: List[str] = [] @@ -7,0 +7 @@ DEFAULT_LOG_LEVEL: str = "INFO" +DEFAULT_MAX_JOB_RETRIES: int = 3 diff --git a/services/worker/src/worker/main.py b/services/worker/src/worker/main.py index 9be018be..f33fbc38 100644 --- a/services/worker/src/worker/main.py +++ b/services/worker/src/worker/main.py @@ -8,0 +9 @@ from libqueue.queue import ( + add_dataset_job, @@ -16 +17 @@ from libqueue.queue import ( -from libutils.exceptions import Status400Error +from libutils.exceptions import Status500Error, StatusError @@ -23,0 +25 @@ from worker.config import ( + MAX_JOB_RETRIES, @@ -45 +47 @@ def process_next_dataset_job() -> bool: - job_id, dataset_name = get_dataset_job(MAX_JOBS_PER_DATASET) + job_id, dataset_name, retries = get_dataset_job(MAX_JOBS_PER_DATASET) @@ -63,3 +65 @@ def process_next_dataset_job() -> bool: - except Status400Error: - pass - finally: + except StatusError as e: @@ -68,0 +69,3 @@ def process_next_dataset_job() -> bool: + if isinstance(e, Status500Error) and retries < MAX_JOB_RETRIES: + add_dataset_job(dataset_name, retries=retries + 1) + logger.debug(f"job re-enqueued (retries: {retries}) for dataset: {dataset_name}") @@ -77 +80 @@ def process_next_split_job() -> bool: - job_id, dataset_name, config_name, split_name = get_split_job(MAX_JOBS_PER_DATASET) + job_id, dataset_name, config_name, split_name, retries = get_split_job(MAX_JOBS_PER_DATASET) @@ -103,3 +106 @@ def process_next_split_job() -> bool: - except Status400Error: - pass - finally: + except StatusError as e: @@ -111,0 +113,6 @@ def process_next_split_job() -> bool: + if isinstance(e, Status500Error) and retries < MAX_JOB_RETRIES: + add_split_job(dataset_name, config_name, split_name, retries=retries + 1) + logger.debug( + f"job re-enqueued (retries: {retries}) for split '{split_name}' from dataset '{dataset_name}' with" + f" config '{config_name}'" + ) @@ -170,2 +177,3 @@ def loop() -> None: - except Exception: - logger.warning("error while processing the job") + except BaseException as e: + logger.critical(f"quit due to an uncaught error while processing the job: {e}") + raise diff --git a/services/worker/src/worker/models/_guard.py b/services/worker/src/worker/models/_guard.py deleted file mode 100644 index 7e614cfe..00000000 --- a/services/worker/src/worker/models/_guard.py +++ /dev/null @@ -1,8 +0,0 @@ -from libutils.exceptions import Status400Error - -from worker.config import DATASETS_BLOCKLIST - - -def guard_blocked_datasets(dataset_name: str) -> None: - if dataset_name in DATASETS_BLOCKLIST: - raise Status400Error("this dataset is not supported for now.") diff --git a/services/worker/src/worker/models/dataset.py b/services/worker/src/worker/models/dataset.py index eb2f19ec..3b8d0565 100644 --- a/services/worker/src/worker/models/dataset.py +++ b/services/worker/src/worker/models/dataset.py @@ -9,2 +8,0 @@ from libutils.types import SplitFullName -from worker.models._guard import guard_blocked_datasets - @@ -18 +15,0 @@ def get_dataset_split_full_names(dataset_name: str, hf_token: Optional[str] = No - guard_blocked_datasets(dataset_name) diff --git a/services/worker/src/worker/models/split.py b/services/worker/src/worker/models/split.py index 3d2661b9..81f37685 100644 --- a/services/worker/src/worker/models/split.py +++ b/services/worker/src/worker/models/split.py @@ -9 +8,0 @@ from worker.config import MIN_CELL_BYTES -from worker.models._guard import guard_blocked_datasets @@ -152 +150,0 @@ def get_split( - guard_blocked_datasets(dataset_name)
2a61360e588ecea3af6f577e0d53deb30756c29a
Sylvain Lesage
2022-06-07T12:39:49
feat: 🎸 remove old domain datasets-server.huggingface.tech (#351)
diff --git a/INSTALL.md b/INSTALL.md index 9bd7f38c..50057774 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -51 +51 @@ private ipv4: 172.30.4.71 -domain name: datasets-preview.huggingface.tech +domain name: datasets-server.huggingface.co diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 4ff7e290..3018cf53 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -21 +20,0 @@ apiDomain: "datasets-server.huggingface.co" -oldApiDomain: "datasets-server.huggingface.tech" diff --git a/infra/charts/datasets-server/templates/ingress.yaml b/infra/charts/datasets-server/templates/ingress.yaml index b0b907f3..e6f59a6f 100644 --- a/infra/charts/datasets-server/templates/ingress.yaml +++ b/infra/charts/datasets-server/templates/ingress.yaml @@ -31,11 +30,0 @@ spec: - {{- if .Values.oldApiDomain }} - - host: {{ .Values.oldApiDomain }} - http: - paths: - - backend: - service: - name: "{{ include "release" . }}-reverse-proxy" - port: - name: http - pathType: ImplementationSpecific - {{- end }} diff --git a/services/api/INSTALL.md b/services/api/INSTALL.md index 3112ba78..1ab3b334 100644 --- a/services/api/INSTALL.md +++ b/services/api/INSTALL.md @@ -40 +40 @@ server { - server_name datasets-preview.huggingface.tech; + server_name datasets-server.huggingface.co; @@ -118 +118 @@ pm2 start --name api make -- -C /home/hf/datasets-server/ run -Check if the api is accessible at https://datasets-preview.huggingface.tech/healthcheck. +Check if the api is accessible at https://datasets-server.huggingface.co/healthcheck. @@ -194 +194 @@ pm2 restart api -Check if the API is accessible at https://datasets-preview.huggingface.tech/healthcheck. +Check if the API is accessible at https://datasets-server.huggingface.co/healthcheck.
93849155dce2daf9d3330d798cadeeb112ad822a
Sylvain Lesage
2022-06-03T13:52:42
ci: 🎡 fix missing replace (#349)
diff --git a/.github/workflows/_unit-tests-python.yml b/.github/workflows/_unit-tests-python.yml index 2dc7f6a2..9237554f 100644 --- a/.github/workflows/_unit-tests-python.yml +++ b/.github/workflows/_unit-tests-python.yml @@ -10,0 +11,5 @@ on: + secrets: + hf-token: + required: false + codecov-token: + required: true @@ -64 +69,2 @@ jobs: - MONGO_URL: mongodb://localhost:${{ matrix.mongo-port }} + MONGO_URL: mongodb://localhost:${{ env.mongo-port }} + HF_TOKEN: ${{ secrets.hf-token}} @@ -68 +74 @@ jobs: - token: ${{ secrets.CODECOV_TOKEN }} + token: ${{ secrets.codecov-token }} diff --git a/.github/workflows/l-libcache.yml b/.github/workflows/l-libcache.yml index 47dafbfa..5cbc05c2 100644 --- a/.github/workflows/l-libcache.yml +++ b/.github/workflows/l-libcache.yml @@ -18,0 +19,2 @@ jobs: + secrets: + codecov-token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/l-libqueue.yml b/.github/workflows/l-libqueue.yml index 7eeb5546..27d869ac 100644 --- a/.github/workflows/l-libqueue.yml +++ b/.github/workflows/l-libqueue.yml @@ -18,0 +19,2 @@ jobs: + secrets: + codecov-token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/l-libutils.yml b/.github/workflows/l-libutils.yml index 2d192272..512ecc62 100644 --- a/.github/workflows/l-libutils.yml +++ b/.github/workflows/l-libutils.yml @@ -18,0 +19,2 @@ jobs: + secrets: + codecov-token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/s-admin.yaml b/.github/workflows/s-admin.yaml index 4ef3427b..8b65b7e8 100644 --- a/.github/workflows/s-admin.yaml +++ b/.github/workflows/s-admin.yaml @@ -19,0 +20,2 @@ jobs: + secrets: + codecov-token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/s-api.yaml b/.github/workflows/s-api.yaml index 8d11d928..65f02f33 100644 --- a/.github/workflows/s-api.yaml +++ b/.github/workflows/s-api.yaml @@ -19,0 +20,2 @@ jobs: + secrets: + codecov-token: ${{ secrets.CODECOV_TOKEN }} diff --git a/.github/workflows/s-worker.yml b/.github/workflows/s-worker.yml index afb3f95a..154ba3bf 100644 --- a/.github/workflows/s-worker.yml +++ b/.github/workflows/s-worker.yml @@ -23,0 +24,3 @@ jobs: + secrets: + hf-token: ${{ secrets.HF_TOKEN }} + codecov-token: ${{ secrets.CODECOV_TOKEN }}
0f6bca07d714264586c1b038f6756c278a22fb54
Sylvain Lesage
2022-06-03T13:27:24
ci: 🎡 checkout the repo before accessing a file (#348)
diff --git a/.github/workflows/_e2e_tests.yml b/.github/workflows/_e2e_tests.yml index a901da27..ba142179 100644 --- a/.github/workflows/_e2e_tests.yml +++ b/.github/workflows/_e2e_tests.yml @@ -26,11 +26,14 @@ jobs: - - name: Get docker images - id: set-var - run: | - # from https://stackoverflow.com/a/61919791/7351594 - content=`cat ${{ inputs.config-file }}` - # the following lines are only required for multi line json - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - # end of optional handling for multi line json - echo "::set-output name=dockerConfig::$content" + - uses: actions/checkout@v3 + with: + path: './' + - name: Get docker images + id: set-var + run: | + # from https://stackoverflow.com/a/61919791/7351594 + content=`cat ${{ inputs.config-file }}` + # the following lines are only required for multi line json + content="${content//'%'/'%25'}" + content="${content//$'\n'/'%0A'}" + content="${content//$'\r'/'%0D'}" + # end of optional handling for multi line json + echo "::set-output name=dockerConfig::$content" diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 60b9d5c1..5830ddad 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -6,0 +7,2 @@ on: + - '.github/workflows/e2e.yml' + - '.github/workflows/_quality-python.yml' diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml index 94ded9c7..d84c2752 100644 --- a/.github/workflows/infra.yml +++ b/.github/workflows/infra.yml @@ -6,0 +7,2 @@ on: + - '.github/workflows/infra.yml' + - '.github/workflows/_e2e_tests.yml' diff --git a/.github/workflows/l-libcache.yml b/.github/workflows/l-libcache.yml index c2ccf945..47dafbfa 100644 --- a/.github/workflows/l-libcache.yml +++ b/.github/workflows/l-libcache.yml @@ -6,0 +7,3 @@ on: + - '.github/workflows/infra.yml' + - '.github/workflows/_quality-python.yml' + - '.github/workflows/_unit-tests-python.yml' diff --git a/.github/workflows/l-libqueue.yml b/.github/workflows/l-libqueue.yml index 912ac4fb..7eeb5546 100644 --- a/.github/workflows/l-libqueue.yml +++ b/.github/workflows/l-libqueue.yml @@ -6,0 +7,3 @@ on: + - '.github/workflows/infra.yml' + - '.github/workflows/_quality-python.yml' + - '.github/workflows/_unit-tests-python.yml' diff --git a/.github/workflows/l-libutils.yml b/.github/workflows/l-libutils.yml index 5309efd1..2d192272 100644 --- a/.github/workflows/l-libutils.yml +++ b/.github/workflows/l-libutils.yml @@ -6,0 +7,3 @@ on: + - '.github/workflows/infra.yml' + - '.github/workflows/_quality-python.yml' + - '.github/workflows/_unit-tests-python.yml' diff --git a/.github/workflows/s-admin.yaml b/.github/workflows/s-admin.yaml index 673b41cb..4ef3427b 100644 --- a/.github/workflows/s-admin.yaml +++ b/.github/workflows/s-admin.yaml @@ -6,0 +7,4 @@ on: + - '.github/workflows/infra.yml' + - '.github/workflows/_quality-python.yml' + - '.github/workflows/_unit-tests-python.yml' + - '.github/workflows/_docker.yml' diff --git a/.github/workflows/s-api.yaml b/.github/workflows/s-api.yaml index 37056958..8d11d928 100644 --- a/.github/workflows/s-api.yaml +++ b/.github/workflows/s-api.yaml @@ -6,0 +7,4 @@ on: + - '.github/workflows/infra.yml' + - '.github/workflows/_quality-python.yml' + - '.github/workflows/_unit-tests-python.yml' + - '.github/workflows/_docker.yml' diff --git a/.github/workflows/s-worker.yml b/.github/workflows/s-worker.yml index d38e0395..afb3f95a 100644 --- a/.github/workflows/s-worker.yml +++ b/.github/workflows/s-worker.yml @@ -6,0 +7,4 @@ on: + - '.github/workflows/infra.yml' + - '.github/workflows/_quality-python.yml' + - '.github/workflows/_unit-tests-python.yml' + - '.github/workflows/_docker.yml' @@ -14 +18 @@ jobs: - is_worker: true + is-worker: true @@ -19 +23 @@ jobs: - is_worker: true + is-worker: true
ed22c69ad0c7e5c8dc7ded6ff12fff3686db4d73
Sylvain Lesage
2022-06-03T13:16:23
ci: 🎡 fix the file extension (#347)
diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml index d8340f41..94ded9c7 100644 --- a/.github/workflows/infra.yml +++ b/.github/workflows/infra.yml @@ -19 +19 @@ jobs: - config-file: infra/charts/datasets-server/docker-images.yml + config-file: infra/charts/datasets-server/docker-images.yaml
22ad7812b9520426093aff90e223aa2ae5e62c5e
Sylvain Lesage
2022-06-03T13:14:21
Be more explicit about the current docker images (#346)
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml index 20863ba0..3dd84a21 100644 --- a/.github/workflows/_docker.yml +++ b/.github/workflows/_docker.yml @@ -14 +13,0 @@ env: - os: "ubuntu-latest" @@ -19 +18 @@ jobs: - runs-on: ${{ env.os }} + runs-on: "ubuntu-latest" diff --git a/.github/workflows/_e2e_tests.yml b/.github/workflows/_e2e_tests.yml index 37792249..a901da27 100644 --- a/.github/workflows/_e2e_tests.yml +++ b/.github/workflows/_e2e_tests.yml @@ -14 +13,0 @@ env: - os: "ubuntu-latest" @@ -21,0 +21,16 @@ jobs: + get-config: + runs-on: ubuntu-latest + outputs: + dockerConfig: ${{ steps.set-var.outputs.dockerConfig }} + steps: + - name: Get docker images + id: set-var + run: | + # from https://stackoverflow.com/a/61919791/7351594 + content=`cat ${{ inputs.config-file }}` + # the following lines are only required for multi line json + content="${content//'%'/'%25'}" + content="${content//$'\n'/'%0A'}" + content="${content//$'\r'/'%0D'}" + # end of optional handling for multi line json + echo "::set-output name=dockerConfig::$content" @@ -22,0 +38 @@ jobs: + needs: get-config @@ -26,2 +42,2 @@ jobs: - working-directory: ${{ env.working-directory }} - runs-on: ${{ env.os }} + working-directory: e2e + runs-on: "ubuntu-latest" @@ -48,11 +63,0 @@ jobs: - - name: Get docker images - id: set_var - run: | - # from https://stackoverflow.com/a/61919791/7351594 - content=`cat ${{ inputs.config-file }}` - # the following lines are only required for multi line json - content="${content//'%'/'%25'}" - content="${content//$'\n'/'%0A'}" - content="${content//$'\r'/'%0D'}" - # end of optional handling for multi line json - echo "::set-output name=dockerConfig::$content" @@ -61,5 +66,5 @@ jobs: - SERVICE_ADMIN_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.admin}}" - SERVICE_API_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.api}}" - SERVICE_DATASETS_WORKER_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.datasetsWorker}}" - SERVICE_REVERSE_PROXY_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.reverseProxy}}" - SERVICE_SPLITS_WORKER_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.splitsWorker}}" + SERVICE_ADMIN_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.admin}}" + SERVICE_API_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.api}}" + SERVICE_DATASETS_WORKER_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.datasetsWorker}}" + SERVICE_REVERSE_PROXY_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.reverseProxy}}" + SERVICE_SPLITS_WORKER_DOCKER_IMAGE: "${{fromJson(needs.get-config.outputs.dockerConfig).dockerImage.splitsWorker}}" diff --git a/.github/workflows/_quality-python.yml b/.github/workflows/_quality-python.yml index a87efa78..f9a90c10 100644 --- a/.github/workflows/_quality-python.yml +++ b/.github/workflows/_quality-python.yml @@ -19 +18,0 @@ env: - os: "ubuntu-latest" @@ -26 +25 @@ jobs: - runs-on: ${{ env.os }} + runs-on: "ubuntu-latest" diff --git a/.github/workflows/_unit-tests-python.yml b/.github/workflows/_unit-tests-python.yml index fd04b1d2..2dc7f6a2 100644 --- a/.github/workflows/_unit-tests-python.yml +++ b/.github/workflows/_unit-tests-python.yml @@ -17 +16,0 @@ env: - os: "ubuntu-latest" @@ -24 +23 @@ jobs: - runs-on: ${{ env.os }} + runs-on: "ubuntu-latest" diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 41a9b149..60b9d5c1 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -2,0 +3 @@ on: + workflow_dispatch: @@ -6,2 +6,0 @@ on: -env: - working-directory: e2e @@ -10 +9 @@ jobs: - uses: ./.github/workflows/quality-python.yml + uses: ./.github/workflows/_quality-python.yml @@ -12 +11 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: e2e diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml index 506cf17e..d8340f41 100644 --- a/.github/workflows/infra.yml +++ b/.github/workflows/infra.yml @@ -2,0 +3 @@ on: + workflow_dispatch: diff --git a/.github/workflows/l-libcache.yml b/.github/workflows/l-libcache.yml index e5e40c0c..c2ccf945 100644 --- a/.github/workflows/l-libcache.yml +++ b/.github/workflows/l-libcache.yml @@ -2,0 +3 @@ on: + workflow_dispatch: @@ -6,2 +6,0 @@ on: -env: - working-directory: libs/libcache @@ -12 +11 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: libs/libcache @@ -16 +15 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: libs/libcache diff --git a/.github/workflows/l-libqueue.yml b/.github/workflows/l-libqueue.yml index fdab80bc..912ac4fb 100644 --- a/.github/workflows/l-libqueue.yml +++ b/.github/workflows/l-libqueue.yml @@ -2,0 +3 @@ on: + workflow_dispatch: @@ -6,2 +6,0 @@ on: -env: - working-directory: libs/libqueue @@ -12 +11 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: libs/libqueue @@ -16 +15 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: libs/libqueue diff --git a/.github/workflows/l-libutils.yml b/.github/workflows/l-libutils.yml index 92a4aa61..5309efd1 100644 --- a/.github/workflows/l-libutils.yml +++ b/.github/workflows/l-libutils.yml @@ -2,0 +3 @@ on: + workflow_dispatch: @@ -6,2 +6,0 @@ on: -env: - working-directory: libs/libutils @@ -12 +11 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: libs/libutils @@ -16 +15 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: libs/libutils diff --git a/.github/workflows/s-admin.yaml b/.github/workflows/s-admin.yaml index c8210fa3..673b41cb 100644 --- a/.github/workflows/s-admin.yaml +++ b/.github/workflows/s-admin.yaml @@ -2,0 +3 @@ on: + workflow_dispatch: @@ -6,3 +6,0 @@ on: -env: - service: admin - working-directory: services/admin @@ -13 +11 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: services/admin @@ -17 +15 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: services/admin @@ -21 +19 @@ jobs: - service: ${{ env.service }} + service: admin diff --git a/.github/workflows/s-api.yaml b/.github/workflows/s-api.yaml index 20161f9d..37056958 100644 --- a/.github/workflows/s-api.yaml +++ b/.github/workflows/s-api.yaml @@ -2,0 +3 @@ on: + workflow_dispatch: @@ -6,3 +6,0 @@ on: -env: - service: api - working-directory: services/api @@ -13 +11 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: services/api @@ -17 +15 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: services/api @@ -21 +19 @@ jobs: - service: ${{ env.service }} + service: api diff --git a/.github/workflows/s-worker.yml b/.github/workflows/s-worker.yml index 265ea75a..d38e0395 100644 --- a/.github/workflows/s-worker.yml +++ b/.github/workflows/s-worker.yml @@ -2,0 +3 @@ on: + workflow_dispatch: @@ -6,3 +6,0 @@ on: -env: - service: worker - working-directory: services/worker @@ -13 +11 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: services/worker @@ -20 +18 @@ jobs: - working-directory: ${{ env.working-directory }} + working-directory: services/worker @@ -25 +23 @@ jobs: - service: ${{ env.service }} + service: worker diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 4c70fdc8..7f4fa81e 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -12,0 +13,8 @@ mongodb: +# overriden by docker-images.yaml (which must be in JSON format!) +dockerImage: + admin: '' + api: '' + datasetsWorker: '' + reverseProxy: '' + splitsWorker: '' +
3e65bed2c6e3c43fdb92fac71ff7d19fa3730128
Sylvain Lesage
2022-06-03T09:55:54
Be more explicit about the current docker images (#345)
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml index afd7a810..20863ba0 100644 --- a/.github/workflows/_docker.yml +++ b/.github/workflows/_docker.yml @@ -15,2 +15,2 @@ env: - REGION: us-east-1 - REPOSITORY_PREFIX: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server- + region: us-east-1 + repository-prefix: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server- @@ -33 +33 @@ jobs: - aws-region: ${{ env.REGION }} + aws-region: ${{ env.region }} @@ -41 +41 @@ jobs: - images: ${{ env.REPOSITORY_PREFIX }}${{ inputs.service }} + images: ${{ env.repository-prefix }}${{ inputs.service }} diff --git a/.github/workflows/_e2e_tests.yml b/.github/workflows/_e2e_tests.yml new file mode 100644 index 00000000..37792249 --- /dev/null +++ b/.github/workflows/_e2e_tests.yml @@ -0,0 +1,73 @@ +name: Launch end-to-end tests +on: + workflow_call: + inputs: + config-file: + required: true + type: string + secrets: + aws-access-key-id: + required: true + aws-secret-access-key: + required: true +env: + os: "ubuntu-latest" + python-version: 3.9.6 + poetry-version: 1.1.13 + # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" + POETRY_VIRTUALENVS_IN_PROJECT: false + region: us-east-1 + working-directory: e2e +jobs: + e2e-tests: + defaults: + run: + shell: bash + working-directory: ${{ env.working-directory }} + runs-on: ${{ env.os }} + steps: + - uses: actions/checkout@v3 + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.aws-access-key-id }} + aws-secret-access-key: ${{ secrets.aws-secret-access-key }} + aws-region: ${{ env.region }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 + - name: Install poetry + run: pipx install poetry==${{ env.poetry-version }} + - name: Use Python + uses: actions/setup-python@v3 + with: + python-version: ${{ env.python-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ env.working-directory }}/poetry.lock + - name: Get docker images + id: set_var + run: | + # from https://stackoverflow.com/a/61919791/7351594 + content=`cat ${{ inputs.config-file }}` + # the following lines are only required for multi line json + content="${content//'%'/'%25'}" + content="${content//$'\n'/'%0A'}" + content="${content//$'\r'/'%0D'}" + # end of optional handling for multi line json + echo "::set-output name=dockerConfig::$content" + - name: Launch the services + env: + SERVICE_ADMIN_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.admin}}" + SERVICE_API_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.api}}" + SERVICE_DATASETS_WORKER_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.datasetsWorker}}" + SERVICE_REVERSE_PROXY_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.reverseProxy}}" + SERVICE_SPLITS_WORKER_DOCKER_IMAGE: "${{fromJson(steps.set_var.outputs.dockerConfig).dockerImage.splitsWorker}}" + run: docker-compose -f tests/docker-compose.yml up -d + - name: Install dependencies + run: | + poetry env use "${{ env.python-version }}" + poetry install + - name: End-to-end tests + run: | + poetry run python -m pytest -x tests diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 6a4d6995..41a9b149 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -13,66 +12,0 @@ jobs: - -# DISABLED FOR NOW -# name: e2e tests -# on: -# workflow_run: -# workflows: ["Build and push docker images"] -# types: [completed] -# # note that it is run only on main! which is somewhat useless :'( -# # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run -# workflow_dispatch: -# # ^ run manually if you need to have the e2e tests - -# env: -# REGION: us-east-1 -# # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" -# POETRY_VIRTUALENVS_IN_PROJECT: false - -# jobs: -# e2e-tests: -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.9.6] -# poetry-version: [1.1.13] -# os: [ubuntu-latest] -# working-directory: [e2e] -# defaults: -# run: -# shell: bash -# working-directory: ${{ matrix.working-directory }} -# runs-on: ${{ matrix.os }} -# if: ${{ github.event.workflow_run.conclusion == 'success' }} -# steps: -# - uses: actions/checkout@v3 -# - name: Set outputs -# id: vars -# run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" -# - name: Configure AWS credentials -# uses: aws-actions/configure-aws-credentials@v1 -# with: -# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} -# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} -# aws-region: ${{ env.REGION }} -# - name: Login to Amazon ECR -# id: login-ecr -# uses: aws-actions/amazon-ecr-login@v1 -# - name: Install poetry -# run: pipx install poetry==${{ matrix.poetry-version }} -# - name: Use Python -# uses: actions/setup-python@v3 -# with: -# python-version: ${{ matrix.python-version }} -# cache: 'poetry' -# cache-dependency-path: | -# ${{ matrix.working-directory }}/poetry.lock -# - name: Launch the services -# env: -# DOCKER_TAG: sha-${{ steps.vars.outputs.sha_short }} -# run: docker-compose -f tests/docker-compose.yml up -d -# - name: Install dependencies -# run: | -# poetry env use "${{ matrix.python-version }}" -# poetry install -# - name: End-to-end tests -# run: | -# poetry run python -m pytest -x tests diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml index fc864ce3..506cf17e 100644 --- a/.github/workflows/infra.yml +++ b/.github/workflows/infra.yml @@ -5 +5 @@ on: - - 'infra/**' + - 'infra/charts/datasets-server/**' @@ -14,0 +15,7 @@ jobs: + e2e-tests: + uses: ./.github/workflows/_e2e_tests.yml + with: + config-file: infra/charts/datasets-server/docker-images.yml + secrets: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/e2e/tests/docker-compose.yml b/e2e/tests/docker-compose.yml index b91cd1eb..9277a8cc 100644 --- a/e2e/tests/docker-compose.yml +++ b/e2e/tests/docker-compose.yml @@ -4 +4 @@ services: - image: nginx:1.20 + image: ${SERVICE_REVERSE_PROXY_DOCKER_IMAGE} @@ -24 +24 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:${DOCKER_TAG} + image: ${SERVICE_API_DOCKER_IMAGE} @@ -40 +40 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} + image: ${SERVICE_DATASETS_WORKER_DOCKER_IMAGE} @@ -52 +52 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} + image: ${SERVICE_SPLITS_WORKER_DOCKER_IMAGE} @@ -64 +64 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:${DOCKER_TAG} + image: ${SERVICE_ADMIN_DOCKER_IMAGE} diff --git a/infra/charts/datasets-server/Makefile b/infra/charts/datasets-server/Makefile index 412f884b..14c7888e 100644 --- a/infra/charts/datasets-server/Makefile +++ b/infra/charts/datasets-server/Makefile @@ -13 +13 @@ diff: - helm diff upgrade --install $(CHART_NAME)-$(ENV) . --values env/$(ENV).yaml -n $(K8S_NAMESPACE) + helm diff upgrade --install $(CHART_NAME)-$(ENV) . --values docker-images.yaml --values env/$(ENV).yaml -n $(K8S_NAMESPACE) @@ -17 +17 @@ upgrade: - helm upgrade --install $(CHART_NAME)-$(ENV) . --values env/$(ENV).yaml -n $(K8S_NAMESPACE) + helm upgrade --install $(CHART_NAME)-$(ENV) . --values docker-images.yaml --values env/$(ENV).yaml -n $(K8S_NAMESPACE) diff --git a/infra/charts/datasets-server/docker-images.yaml b/infra/charts/datasets-server/docker-images.yaml new file mode 100644 index 00000000..8fea5b13 --- /dev/null +++ b/infra/charts/datasets-server/docker-images.yaml @@ -0,0 +1,9 @@ +{ + "dockerImage": { + "admin": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:sha-e675472", + "api": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:sha-7cb4f82", + "datasetsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-da86243", + "reverseProxy": "docker.io/nginx:1.20", + "splitsWorker": "707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:sha-da86243", + } +} diff --git a/infra/charts/datasets-server/templates/admin/_container.tpl b/infra/charts/datasets-server/templates/admin/_container.tpl index fca81fd3..10a3b9f4 100644 --- a/infra/charts/datasets-server/templates/admin/_container.tpl +++ b/infra/charts/datasets-server/templates/admin/_container.tpl @@ -28,2 +28,2 @@ - image: "{{ .Values.admin.image.repository }}/{{ .Values.admin.image.name }}:{{ .Values.admin.image.tag }}" - imagePullPolicy: {{ .Values.admin.image.pullPolicy }} + image: {{ .Values.dockerImage.admin }} + imagePullPolicy: IfNotPresent diff --git a/infra/charts/datasets-server/templates/api/_container.tpl b/infra/charts/datasets-server/templates/api/_container.tpl index 4f8ff1d9..1c551afe 100644 --- a/infra/charts/datasets-server/templates/api/_container.tpl +++ b/infra/charts/datasets-server/templates/api/_container.tpl @@ -32,2 +32,2 @@ - image: "{{ .Values.api.image.repository }}/{{ .Values.api.image.name }}:{{ .Values.api.image.tag }}" - imagePullPolicy: {{ .Values.api.image.pullPolicy }} + image: {{ .Values.dockerImage.api }} + imagePullPolicy: IfNotPresent diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl index 4271c6dc..8dbb85d3 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl @@ -59,2 +59,2 @@ - image: "{{ .Values.datasetsWorker.image.repository }}/{{ .Values.datasetsWorker.image.name }}:{{ .Values.datasetsWorker.image.tag }}" - imagePullPolicy: {{ .Values.datasetsWorker.image.pullPolicy }} + image: {{ .Values.dockerImage.datasetsWorker }} + imagePullPolicy: IfNotPresent diff --git a/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl b/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl index 4c8ad4c2..3fdc928a 100644 --- a/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl +++ b/infra/charts/datasets-server/templates/reverse-proxy/_container.tpl @@ -3,2 +3,2 @@ - image: "{{ .Values.reverseProxy.image.repository }}/{{ .Values.reverseProxy.image.name }}:{{ .Values.reverseProxy.image.tag }}" - imagePullPolicy: {{ .Values.reverseProxy.image.pullPolicy }} + image: {{ .Values.dockerImage.reverseProxy }} + imagePullPolicy: IfNotPresent diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/splits-worker/_container.tpl index 6d04f187..5f62cc09 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/splits-worker/_container.tpl @@ -59,2 +59,2 @@ - image: "{{ .Values.splitsWorker.image.repository }}/{{ .Values.splitsWorker.image.name }}:{{ .Values.splitsWorker.image.tag }}" - imagePullPolicy: {{ .Values.splitsWorker.image.pullPolicy }} + image: {{ .Values.dockerImage.splitsWorker }} + imagePullPolicy: IfNotPresent diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 8ca03b15..4c70fdc8 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -32,6 +31,0 @@ reverseProxy: - image: - repository: docker.io - name: nginx - tag: "1.20" - pullPolicy: IfNotPresent - @@ -68,6 +61,0 @@ api: - image: - repository: 707930574880.dkr.ecr.us-east-1.amazonaws.com - name: hub-datasets-server-api - tag: sha-7cb4f82 - pullPolicy: IfNotPresent - @@ -109,6 +96,0 @@ datasetsWorker: - image: - repository: 707930574880.dkr.ecr.us-east-1.amazonaws.com - name: hub-datasets-server-worker - tag: sha-da86243 - pullPolicy: IfNotPresent - @@ -155,5 +136,0 @@ splitsWorker: - image: - repository: 707930574880.dkr.ecr.us-east-1.amazonaws.com - name: hub-datasets-server-worker - tag: sha-da86243 - pullPolicy: IfNotPresent @@ -199,6 +175,0 @@ admin: - image: - repository: 707930574880.dkr.ecr.us-east-1.amazonaws.com - name: hub-datasets-server-admin - tag: sha-e675472 - pullPolicy: IfNotPresent -
e1373ede9aff1130488015687ba0fb7e2c7f08bc
Sylvain Lesage
2022-06-03T08:48:46
ci: 🎡 use reusable workflows, and conditional runs on path (#344)
diff --git a/.github/workflows/docker.yml b/.github/workflows/_docker.yml similarity index 64% rename from .github/workflows/docker.yml rename to .github/workflows/_docker.yml index a3bfd130..afd7a810 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/_docker.yml @@ -1,6 +1,12 @@ -name: "Build and push docker images" - -on: - workflow_dispatch: - push: - +name: Build and push service docker image +on: + workflow_call: + inputs: + service: + required: true + type: string + secrets: + aws-access-key-id: + required: true + aws-secret-access-key: + required: true @@ -7,0 +14 @@ env: + os: "ubuntu-latest" @@ -10 +16,0 @@ env: - @@ -12,6 +18,2 @@ jobs: - build-and-push-image-api: - strategy: - fail-fast: false - matrix: - service: [admin, api, worker] - runs-on: ubuntu-latest + build-and-push-image: + runs-on: ${{ env.os }} @@ -29,2 +31,2 @@ jobs: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-access-key-id: ${{ secrets.aws-access-key-id }} + aws-secret-access-key: ${{ secrets.aws-secret-access-key }} @@ -39 +41 @@ jobs: - images: ${{ env.REPOSITORY_PREFIX }}${{ matrix.service }} + images: ${{ env.REPOSITORY_PREFIX }}${{ inputs.service }} @@ -46 +48 @@ jobs: - file: services/${{ matrix.service }}/Dockerfile + file: services/${{ inputs.service }}/Dockerfile @@ -52,2 +54,2 @@ jobs: - cache-from: type=gha,scope=buildkit-${{ matrix.service }} - cache-to: type=gha,mode=max,scope=buildkit-${{ matrix.service }} + cache-from: type=gha,scope=buildkit-${{ inputs.service }} + cache-to: type=gha,mode=max,scope=buildkit-${{ inputs.service }} diff --git a/.github/workflows/_quality-python.yml b/.github/workflows/_quality-python.yml new file mode 100644 index 00000000..a87efa78 --- /dev/null +++ b/.github/workflows/_quality-python.yml @@ -0,0 +1,57 @@ +name: Check Python code quality +on: + workflow_call: + inputs: + working-directory: + required: true + type: string + safety-exceptions: + required: false + type: string + is-worker: + required: false + type: boolean +env: + # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" + POETRY_VIRTUALENVS_IN_PROJECT: false + python-version: "3.9.6" + poetry-version: "1.1.13" + os: "ubuntu-latest" +jobs: + code-quality: + defaults: + run: + shell: bash + working-directory: ${{ inputs.working-directory }} + runs-on: ${{ env.os }} + steps: + - uses: actions/checkout@v3 + - name: Install poetry + run: pipx install poetry==${{ env.poetry-version }} + - name: Use Python + uses: actions/setup-python@v3 + with: + python-version: ${{ env.python-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ inputs.working-directory }}/poetry.lock + - name: Install packages for worker + if: ${{ inputs.is-worker }} + run: sudo apt update; sudo apt install -y libicu-dev ffmpeg libavcodec-extra libsndfile1 llvm + - name: Install dependencies + # "poetry env use" is required: https://github.com/actions/setup-python/issues/374#issuecomment-1088938718 + run: | + poetry env use "${{ env.python-version }}" + poetry install + - name: Run black + run: poetry run black --check tests src + - name: Run isort + run: poetry run isort --check-only tests src + - name: Run flake8 + run: poetry run flake8 tests src + - name: Run mypy + run: poetry run mypy tests src + - name: Run bandit + run: poetry run bandit -r src + - name: Run safety + run: poetry run safety check ${{ inputs.safety-exceptions }} diff --git a/.github/workflows/_unit-tests-python.yml b/.github/workflows/_unit-tests-python.yml new file mode 100644 index 00000000..fd04b1d2 --- /dev/null +++ b/.github/workflows/_unit-tests-python.yml @@ -0,0 +1,70 @@ +name: Launch Python unit tests +on: + workflow_call: + inputs: + working-directory: + required: true + type: string + is-worker: + required: false + type: boolean +env: + # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" + POETRY_VIRTUALENVS_IN_PROJECT: false + mongo-port: "27017" + python-version: "3.9.6" + poetry-version: "1.1.13" + os: "ubuntu-latest" +jobs: + unit-tests: + defaults: + run: + shell: bash + working-directory: ${{ inputs.working-directory }} + runs-on: ${{ env.os }} + steps: + - uses: actions/checkout@v3 + - name: Install poetry + run: pipx install poetry==${{ env.poetry-version }} + - name: Use Python + uses: actions/setup-python@v3 + with: + python-version: ${{ env.python-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ inputs.working-directory }}/poetry.lock + - name: Install packages + if: ${{ inputs.is-worker }} + run: sudo apt update; sudo apt install -y libicu-dev ffmpeg libavcodec-extra llvm + - name: Install libsndfile + if: ${{ inputs.is-worker }} + run: > + sudo apt install -y autoconf autogen automake build-essential libasound2-dev libflac-dev libogg-dev libtool libvorbis-dev libopus-dev libmp3lame-dev libmpg123-dev pkg-config; + cd /tmp; + git clone https://github.com/libsndfile/libsndfile.git; + cd libsndfile; + git checkout v1.0.30; + ./autogen.sh; + ./configure --enable-werror; + make; + sudo make install; + sudo ldconfig; + cd; + rm -rf /tmp/libsndfile; + - name: Install dependencies + # "poetry env use" is required: https://github.com/actions/setup-python/issues/374#issuecomment-1088938718 + run: | + poetry env use "${{ env.python-version }}" + poetry install + - name: Create mongoDB Docker container + run: sudo docker run -d -p ${{ env.mongo-port }}:27017 mongo:latest + - name: Run unit tests + env: + MONGO_CACHE_DATABASE: datasets_server_cache_test + MONGO_QUEUE_DATABASE: datasets_server_queue_test + MONGO_URL: mongodb://localhost:${{ matrix.mongo-port }} + run: poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests + - uses: codecov/codecov-action@v2 + with: + token: ${{ secrets.CODECOV_TOKEN }} + files: ./coverage.xml diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml deleted file mode 100644 index 9a1b65f2..00000000 --- a/.github/workflows/e2e-tests.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: e2e tests -on: - workflow_run: - workflows: ["Build and push docker images"] - types: [completed] - # note that it is run only on main! which is somewhat useless :'( - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run - workflow_dispatch: - # ^ run manually if you need to have the e2e tests - -env: - REGION: us-east-1 - # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" - POETRY_VIRTUALENVS_IN_PROJECT: false - -jobs: - e2e-tests: - strategy: - fail-fast: false - matrix: - python-version: [3.9.6] - poetry-version: [1.1.13] - os: [ubuntu-latest] - working-directory: [e2e] - defaults: - run: - shell: bash - working-directory: ${{ matrix.working-directory }} - runs-on: ${{ matrix.os }} - if: ${{ github.event.workflow_run.conclusion == 'success' }} - steps: - - uses: actions/checkout@v3 - - name: Set outputs - id: vars - run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - name: Configure AWS credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: ${{ env.REGION }} - - name: Login to Amazon ECR - id: login-ecr - uses: aws-actions/amazon-ecr-login@v1 - - name: Install poetry - run: pipx install poetry==${{ matrix.poetry-version }} - - name: Use Python - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - cache-dependency-path: | - ${{ matrix.working-directory }}/poetry.lock - - name: Launch the services - env: - DOCKER_TAG: sha-${{ steps.vars.outputs.sha_short }} - run: docker-compose -f tests/docker-compose.yml up -d - - name: Install dependencies - run: | - poetry env use "${{ matrix.python-version }}" - poetry install - - name: End-to-end tests - run: | - poetry run python -m pytest -x tests diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml new file mode 100644 index 00000000..6a4d6995 --- /dev/null +++ b/.github/workflows/e2e.yml @@ -0,0 +1,78 @@ +name: e2e +on: + push: + paths: + - 'e2e/**' +env: + working-directory: e2e +jobs: + quality: + uses: ./.github/workflows/quality-python.yml + with: + working-directory: ${{ env.working-directory }} + +# DISABLED FOR NOW +# name: e2e tests +# on: +# workflow_run: +# workflows: ["Build and push docker images"] +# types: [completed] +# # note that it is run only on main! which is somewhat useless :'( +# # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run +# workflow_dispatch: +# # ^ run manually if you need to have the e2e tests + +# env: +# REGION: us-east-1 +# # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" +# POETRY_VIRTUALENVS_IN_PROJECT: false + +# jobs: +# e2e-tests: +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.9.6] +# poetry-version: [1.1.13] +# os: [ubuntu-latest] +# working-directory: [e2e] +# defaults: +# run: +# shell: bash +# working-directory: ${{ matrix.working-directory }} +# runs-on: ${{ matrix.os }} +# if: ${{ github.event.workflow_run.conclusion == 'success' }} +# steps: +# - uses: actions/checkout@v3 +# - name: Set outputs +# id: vars +# run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" +# - name: Configure AWS credentials +# uses: aws-actions/configure-aws-credentials@v1 +# with: +# aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} +# aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} +# aws-region: ${{ env.REGION }} +# - name: Login to Amazon ECR +# id: login-ecr +# uses: aws-actions/amazon-ecr-login@v1 +# - name: Install poetry +# run: pipx install poetry==${{ matrix.poetry-version }} +# - name: Use Python +# uses: actions/setup-python@v3 +# with: +# python-version: ${{ matrix.python-version }} +# cache: 'poetry' +# cache-dependency-path: | +# ${{ matrix.working-directory }}/poetry.lock +# - name: Launch the services +# env: +# DOCKER_TAG: sha-${{ steps.vars.outputs.sha_short }} +# run: docker-compose -f tests/docker-compose.yml up -d +# - name: Install dependencies +# run: | +# poetry env use "${{ matrix.python-version }}" +# poetry install +# - name: End-to-end tests +# run: | +# poetry run python -m pytest -x tests diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml new file mode 100644 index 00000000..fc864ce3 --- /dev/null +++ b/.github/workflows/infra.yml @@ -0,0 +1,14 @@ +name: infra +on: + push: + paths: + - 'infra/**' +jobs: + code-quality-helm: + runs-on: ubuntu-20.04 + steps: + - name: Checkout sources + uses: actions/checkout@main + - name: Lint chart + run: helm lint + working-directory: infra/charts/datasets-server diff --git a/.github/workflows/l-libcache.yml b/.github/workflows/l-libcache.yml new file mode 100644 index 00000000..e5e40c0c --- /dev/null +++ b/.github/workflows/l-libcache.yml @@ -0,0 +1,16 @@ +name: libs/libcache +on: + push: + paths: + - 'libs/libcache/**' +env: + working-directory: libs/libcache +jobs: + quality: + uses: ./.github/workflows/_quality-python.yml + with: + working-directory: ${{ env.working-directory }} + unit-tests: + uses: ./.github/workflows/_unit-tests-python.yml + with: + working-directory: ${{ env.working-directory }} diff --git a/.github/workflows/l-libqueue.yml b/.github/workflows/l-libqueue.yml new file mode 100644 index 00000000..fdab80bc --- /dev/null +++ b/.github/workflows/l-libqueue.yml @@ -0,0 +1,16 @@ +name: libs/libqueue +on: + push: + paths: + - 'libs/libqueue/**' +env: + working-directory: libs/libqueue +jobs: + quality: + uses: ./.github/workflows/_quality-python.yml + with: + working-directory: ${{ env.working-directory }} + unit-tests: + uses: ./.github/workflows/_unit-tests-python.yml + with: + working-directory: ${{ env.working-directory }} diff --git a/.github/workflows/l-libutils.yml b/.github/workflows/l-libutils.yml new file mode 100644 index 00000000..92a4aa61 --- /dev/null +++ b/.github/workflows/l-libutils.yml @@ -0,0 +1,16 @@ +name: libs/libutils +on: + push: + paths: + - 'libs/libutils/**' +env: + working-directory: libs/libutils +jobs: + quality: + uses: ./.github/workflows/_quality-python.yml + with: + working-directory: ${{ env.working-directory }} + unit-tests: + uses: ./.github/workflows/_unit-tests-python.yml + with: + working-directory: ${{ env.working-directory }} diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml deleted file mode 100644 index 3935a3db..00000000 --- a/.github/workflows/quality.yml +++ /dev/null @@ -1,104 +0,0 @@ -name: Check code quality -on: [push] - -env: - # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" - POETRY_VIRTUALENVS_IN_PROJECT: false - -jobs: - code-quality: - strategy: - fail-fast: false - matrix: - python-version: [3.9.6] - poetry-version: [1.1.13] - os: [ubuntu-latest] - working-directory: - [e2e, services/admin, services/api, libs/libcache, libs/libqueue, libs/libutils] - defaults: - run: - shell: bash - working-directory: ${{ matrix.working-directory }} - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Install poetry - run: pipx install poetry==${{ matrix.poetry-version }} - - name: Use Python - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - cache-dependency-path: | - ${{ matrix.working-directory }}/poetry.lock - - name: Install dependencies - # "poetry env use" is required: https://github.com/actions/setup-python/issues/374#issuecomment-1088938718 - run: | - poetry env use "${{ matrix.python-version }}" - poetry install - - name: Run black - run: poetry run black --check tests src - - name: Run isort - run: poetry run isort --check-only tests src - - name: Run flake8 - run: poetry run flake8 tests src - - name: Run mypy - run: poetry run mypy tests src - - name: Run bandit - run: poetry run bandit -r src - - name: Run safety - run: poetry run safety check - code-quality-job-runner: - strategy: - fail-fast: false - matrix: - python-version: [3.9.6] - poetry-version: [1.1.13] - os: [ubuntu-latest] - working-directory: [services/worker] - defaults: - run: - shell: bash - working-directory: ${{ matrix.working-directory }} - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Install poetry - run: pipx install poetry==${{ matrix.poetry-version }} - - name: Use Python - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - cache-dependency-path: | - ${{ matrix.working-directory }}/poetry.lock - - name: Install packages - run: sudo apt update; sudo apt install -y libicu-dev ffmpeg libavcodec-extra libsndfile1 llvm - - name: Install dependencies - run: | - poetry env use "${{ matrix.python-version }}" - poetry install - - name: Run black - run: poetry run black --check tests src - - name: Run isort - run: poetry run isort --check-only tests src - - name: Run flake8 - run: poetry run flake8 tests src - - name: Run mypy - run: poetry run mypy tests src - - name: Run bandit - run: poetry run bandit -r src - - name: Run safety - env: - # pillow <9.0.0 - PILLOW_EXCEPTIONS: -i 44525 -i 44524 -i 44486 -i 44485 -i 45356 -i 44487 - run: poetry run safety check $PILLOW_EXCEPTIONS - code-quality-helm: - runs-on: ubuntu-20.04 - steps: - - name: Checkout sources - uses: actions/checkout@main - - - name: Lint chart - run: helm lint - working-directory: infra/charts/datasets-server diff --git a/.github/workflows/s-admin.yaml b/.github/workflows/s-admin.yaml new file mode 100644 index 00000000..c8210fa3 --- /dev/null +++ b/.github/workflows/s-admin.yaml @@ -0,0 +1,24 @@ +name: services/admin +on: + push: + paths: + - 'services/admin/**' +env: + service: admin + working-directory: services/admin +jobs: + quality: + uses: ./.github/workflows/_quality-python.yml + with: + working-directory: ${{ env.working-directory }} + unit-tests: + uses: ./.github/workflows/_unit-tests-python.yml + with: + working-directory: ${{ env.working-directory }} + docker: + uses: ./.github/workflows/_docker.yml + with: + service: ${{ env.service }} + secrets: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/s-api.yaml b/.github/workflows/s-api.yaml new file mode 100644 index 00000000..20161f9d --- /dev/null +++ b/.github/workflows/s-api.yaml @@ -0,0 +1,24 @@ +name: services/api +on: + push: + paths: + - 'services/api/**' +env: + service: api + working-directory: services/api +jobs: + quality: + uses: ./.github/workflows/_quality-python.yml + with: + working-directory: ${{ env.working-directory }} + unit-tests: + uses: ./.github/workflows/_unit-tests-python.yml + with: + working-directory: ${{ env.working-directory }} + docker: + uses: ./.github/workflows/_docker.yml + with: + service: ${{ env.service }} + secrets: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/s-worker.yml b/.github/workflows/s-worker.yml new file mode 100644 index 00000000..265ea75a --- /dev/null +++ b/.github/workflows/s-worker.yml @@ -0,0 +1,28 @@ +name: services/worker +on: + push: + paths: + - 'services/worker/**' +env: + service: worker + working-directory: services/worker +jobs: + quality: + uses: ./.github/workflows/_quality-python.yml + with: + working-directory: ${{ env.working-directory }} + # pillow <9.0.0 + safety-exceptions: "-i 44525 -i 44524 -i 44486 -i 44485 -i 45356 -i 44487" + is_worker: true + unit-tests: + uses: ./.github/workflows/_unit-tests-python.yml + with: + working-directory: ${{ env.working-directory }} + is_worker: true + docker: + uses: ./.github/workflows/_docker.yml + with: + service: ${{ env.service }} + secrets: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml deleted file mode 100644 index a01e3be8..00000000 --- a/.github/workflows/unit-tests.yml +++ /dev/null @@ -1,108 +0,0 @@ -name: Launch unit tests -on: [push] - -env: - # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" - POETRY_VIRTUALENVS_IN_PROJECT: false - -jobs: - unit-tests: - strategy: - fail-fast: false - matrix: - mongo-port: [27017] - python-version: [3.9.6] - poetry-version: [1.1.13] - os: [ubuntu-latest] - working-directory: - [services/admin, services/api, libs/libcache, libs/libqueue, libs/libutils] - defaults: - run: - shell: bash - working-directory: ${{ matrix.working-directory }} - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Install poetry - run: pipx install poetry==${{ matrix.poetry-version }} - - name: Use Python - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - cache-dependency-path: | - ${{ matrix.working-directory }}/poetry.lock - - name: Install dependencies - run: | - poetry env use "${{ matrix.python-version }}" - poetry install - - name: Create mongoDB Docker container - run: sudo docker run -d -p ${{ matrix.mongo-port }}:27017 mongo:latest - - name: Run unit tests - env: - MONGO_CACHE_DATABASE: datasets_server_cache_test - MONGO_QUEUE_DATABASE: datasets_server_queue_test - MONGO_URL: mongodb://localhost:${{ matrix.mongo-port }} - run: poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests - - uses: codecov/codecov-action@v2 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./coverage.xml - unit-tests-worker: - strategy: - fail-fast: false - matrix: - mongo-port: [27017] - python-version: [3.9.6] - poetry-version: [1.1.7] - os: [ubuntu-latest] - working-directory: [services/worker] - defaults: - run: - shell: bash - working-directory: ${{ matrix.working-directory }} - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v3 - - name: Install poetry - run: pipx install poetry==${{ matrix.poetry-version }} - - name: Use Python - uses: actions/setup-python@v3 - with: - python-version: ${{ matrix.python-version }} - cache: 'poetry' - cache-dependency-path: | - ${{ matrix.working-directory }}/poetry.lock - - name: Install packages - run: sudo apt update; sudo apt install -y libicu-dev ffmpeg libavcodec-extra llvm - - name: Install libsndfile - run: > - sudo apt install -y autoconf autogen automake build-essential libasound2-dev libflac-dev libogg-dev libtool libvorbis-dev libopus-dev libmp3lame-dev libmpg123-dev pkg-config; - cd /tmp; - git clone https://github.com/libsndfile/libsndfile.git; - cd libsndfile; - git checkout v1.0.30; - ./autogen.sh; - ./configure --enable-werror; - make; - sudo make install; - sudo ldconfig; - cd; - rm -rf /tmp/libsndfile; - - name: Install dependencies - run: | - poetry env use "${{ matrix.python-version }}" - poetry install - - name: Create mongoDB Docker container - run: sudo docker run -d -p ${{ matrix.mongo-port }}:27017 mongo:latest - - name: Run unit tests - env: - ROWS_MAX_NUMBER: 5 - MONGO_CACHE_DATABASE: datasets_server_cache_test - MONGO_URL: mongodb://localhost:${{ matrix.mongo-port }} - HF_TOKEN: ${{ secrets.HF_TOKEN }} - run: poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests - - uses: codecov/codecov-action@v2 - with: - token: ${{ secrets.CODECOV_TOKEN }} - files: ./coverage.xml
b53b1bec27cba811c48f2d1a080140415a4a8828
Sylvain Lesage
2022-06-02T13:36:37
fix: 🐛 give every servicemonitor its name (#342)
diff --git a/infra/charts/datasets-server/templates/admin/servicemonitor.yaml b/infra/charts/datasets-server/templates/admin/servicemonitor.yaml index e24bc258..234943ac 100644 --- a/infra/charts/datasets-server/templates/admin/servicemonitor.yaml +++ b/infra/charts/datasets-server/templates/admin/servicemonitor.yaml @@ -7 +7 @@ metadata: - name: {{ include "release" . }} + name: "{{ include "release" . }}-admin" diff --git a/infra/charts/datasets-server/templates/api/servicemonitor.yaml b/infra/charts/datasets-server/templates/api/servicemonitor.yaml index 76a1637a..a3d9e230 100644 --- a/infra/charts/datasets-server/templates/api/servicemonitor.yaml +++ b/infra/charts/datasets-server/templates/api/servicemonitor.yaml @@ -7 +7 @@ metadata: - name: {{ include "release" . }} + name: "{{ include "release" . }}-api"
5aacf8ef662220691b02b066ac03c399c3e773a3
Sylvain Lesage
2022-06-02T13:21:12
Expose admin metrics (#341)
diff --git a/infra/charts/datasets-server/env/dev.yaml b/infra/charts/datasets-server/env/dev.yaml index 4b578960..0cabc57b 100644 --- a/infra/charts/datasets-server/env/dev.yaml +++ b/infra/charts/datasets-server/env/dev.yaml @@ -16 +16 @@ monitoring: -domain: "datasets-server.us.dev.moon.huggingface.tech" +apiDomain: "datasets-server.us.dev.moon.huggingface.tech" diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index c7d5be8e..4ff7e290 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -19,2 +19,3 @@ monitoring: -domain: "datasets-server.huggingface.co" -oldDomain: "datasets-server.huggingface.tech" +adminDomain: "datasets-server-admin.us.dev.moon.huggingface.tech" +apiDomain: "datasets-server.huggingface.co" +oldApiDomain: "datasets-server.huggingface.tech" @@ -123,0 +125,2 @@ admin: + + appNumWorkers: "1" diff --git a/infra/charts/datasets-server/nginx-templates/default.conf.template b/infra/charts/datasets-server/nginx-templates/default.conf.template index 80bdc0ab..5e7a90ef 100644 --- a/infra/charts/datasets-server/nginx-templates/default.conf.template +++ b/infra/charts/datasets-server/nginx-templates/default.conf.template @@ -2,0 +3,5 @@ proxy_cache_path ${CACHE_DIRECTORY}/ levels=1:2 keys_zone=STATIC:${CACHE_ZONE_SI +log_format datasetsserver '$remote_addr - $remote_user [$time_local]' + ' "$request_method $scheme://$host$request_uri $server_protocol" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + @@ -32,0 +38,2 @@ server { + + access_log /var/log/nginx/access.log datasetsserver; diff --git a/infra/charts/datasets-server/templates/admin/_container.tpl b/infra/charts/datasets-server/templates/admin/_container.tpl index 86b53ba8..fca81fd3 100644 --- a/infra/charts/datasets-server/templates/admin/_container.tpl +++ b/infra/charts/datasets-server/templates/admin/_container.tpl @@ -3,0 +4,6 @@ + - name: APP_HOSTNAME + value: {{ .Values.admin.appHostname | quote }} + - name: APP_NUM_WORKERS + value: {{ .Values.admin.appNumWorkers | quote }} + - name: APP_PORT + value: {{ .Values.admin.appPort | quote }} @@ -32,7 +38,10 @@ - # TODO: provide readiness and liveness probes - # readinessProbe: - # tcpSocket: - # port: {{ .Values.admin.readinessPort }} - # livenessProbe: - # tcpSocket: - # port: {{ .Values.admin.readinessPort }} + readinessProbe: + tcpSocket: + port: {{ .Values.admin.readinessPort }} + livenessProbe: + tcpSocket: + port: {{ .Values.admin.readinessPort }} + ports: + - containerPort: {{ .Values.admin.appPort }} + name: http + protocol: TCP diff --git a/infra/charts/datasets-server/templates/admin/deployment.yaml b/infra/charts/datasets-server/templates/admin/deployment.yaml index 2ec72134..b002e92e 100644 --- a/infra/charts/datasets-server/templates/admin/deployment.yaml +++ b/infra/charts/datasets-server/templates/admin/deployment.yaml @@ -16 +16,4 @@ spec: - type: Recreate + rollingUpdate: + maxSurge: 25% + maxUnavailable: 25% + type: RollingUpdate diff --git a/infra/charts/datasets-server/templates/admin/service.yaml b/infra/charts/datasets-server/templates/admin/service.yaml new file mode 100644 index 00000000..16d785d1 --- /dev/null +++ b/infra/charts/datasets-server/templates/admin/service.yaml @@ -0,0 +1,18 @@ +apiVersion: v1 +kind: Service +metadata: + name: "{{ include "release" . }}-admin" + annotations: + {{ toYaml .Values.admin.service.annotations | nindent 4 }} + namespace: {{ .Release.Namespace }} + labels: + {{ include "labels.admin" . | nindent 4 }} +spec: + ports: + - name: http + port: 80 + protocol: TCP + targetPort: {{ .Values.admin.appPort }} + selector: + {{ include "labels.admin" . | nindent 4 }} + type: {{ .Values.admin.service.type }} diff --git a/infra/charts/datasets-server/templates/admin/servicemonitor.yaml b/infra/charts/datasets-server/templates/admin/servicemonitor.yaml new file mode 100644 index 00000000..e24bc258 --- /dev/null +++ b/infra/charts/datasets-server/templates/admin/servicemonitor.yaml @@ -0,0 +1,19 @@ +{{- if .Values.monitoring.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + labels: + {{ include "labels.admin" . | nindent 4 }} + name: {{ include "release" . }} + namespace: {{ .Release.Namespace }} +spec: + endpoints: + - path: /metrics + port: http + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: + {{ include "labels.admin" . | nindent 6 }} +{{- end }} diff --git a/infra/charts/datasets-server/templates/servicemonitor.yaml b/infra/charts/datasets-server/templates/api/servicemonitor.yaml similarity index 89% rename from infra/charts/datasets-server/templates/servicemonitor.yaml rename to infra/charts/datasets-server/templates/api/servicemonitor.yaml index 116ad292..76a1637a 100644 --- a/infra/charts/datasets-server/templates/servicemonitor.yaml +++ b/infra/charts/datasets-server/templates/api/servicemonitor.yaml @@ -6 +6 @@ metadata: - {{ include "labels" . | nindent 4 }} + {{ include "labels.api" . | nindent 4 }} diff --git a/infra/charts/datasets-server/templates/ingress.yaml b/infra/charts/datasets-server/templates/ingress.yaml index 7df56c8f..b0b907f3 100644 --- a/infra/charts/datasets-server/templates/ingress.yaml +++ b/infra/charts/datasets-server/templates/ingress.yaml @@ -13 +13,10 @@ spec: - - host: {{ .Values.domain }} + - host: {{ .Values.adminDomain }} + http: + paths: + - backend: + service: + name: "{{ include "release" . }}-admin" + port: + name: http + pathType: ImplementationSpecific + - host: {{ .Values.apiDomain }} @@ -22,2 +31,2 @@ spec: - {{- if .Values.oldDomain }} - - host: {{ .Values.oldDomain }} + {{- if .Values.oldApiDomain }} + - host: {{ .Values.oldApiDomain }} diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 1f85d568..8ca03b15 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -23 +23,2 @@ monitoring: -domain: "datasets-server.us.dev.moon.huggingface.tech" +adminDomain: "datasets-server-admin.us.dev.moon.huggingface.tech" +apiDomain: "datasets-server.us.dev.moon.huggingface.tech" @@ -201 +202 @@ admin: - tag: sha-da86243 + tag: sha-e675472 @@ -205,0 +207,7 @@ admin: + service: + type: NodePort + annotations: { } + + ingress: + annotations: { } + @@ -213,0 +222,6 @@ admin: + # Application hostname - it must not be set to localhost to work in Kube! + appHostname: "0.0.0.0" + # Number of uvicorn workers for running the application + appNumWorkers: "1" + # Application endpoint port + appPort: 80 @@ -217,0 +232,2 @@ admin: + + readinessPort: 80
e67547240836b459ca4bb5658e62f23be1e314a8
Sylvain Lesage
2022-06-02T12:06:58
Add metrics endpoint to admin (#340)
diff --git a/docker-compose.yml b/docker-compose.yml index fee6cf54..bc0e6914 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -73,0 +74,4 @@ services: + APP_HOSTNAME: 0.0.0.0 + APP_NUM_WORKERS: 1 + APP_PORT: 8081 + ASSETS_DIRECTORY: "/assets" @@ -74,0 +79,2 @@ services: + ports: + - 8081:8081 diff --git a/libs/libcache/dist/libcache-0.1.5-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.5-py3-none-any.whl new file mode 100644 index 00000000..03661d8e Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.5-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.5.tar.gz b/libs/libcache/dist/libcache-0.1.5.tar.gz new file mode 100644 index 00000000..b1008bf5 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.5.tar.gz differ diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 08cd0e72..9c7f9d39 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.4" +version = "0.1.5" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index 4180eefc..e68e9047 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -490 +489,0 @@ def get_entries_count_by_status(entries: QuerySet[AnyDb]) -> CountByStatus: - frequencies: Dict[str, int] = entries.item_frequencies("status", normalize=False) # type: ignore @@ -491,0 +491,3 @@ def get_entries_count_by_status(entries: QuerySet[AnyDb]) -> CountByStatus: + # note: we repeat the values instead of looping on Status because we don't know how to get the types right in mypy + # result: CountByStatus = {s.value: entries(status=s.value).count() for s in Status} # <- doesn't work in mypy + # see https://stackoverflow.com/a/67292548/7351594 @@ -493,4 +495,4 @@ def get_entries_count_by_status(entries: QuerySet[AnyDb]) -> CountByStatus: - "empty": frequencies.get(Status.EMPTY.value, 0), - "error": frequencies.get(Status.ERROR.value, 0), - "stalled": frequencies.get(Status.STALLED.value, 0), - "valid": frequencies.get(Status.VALID.value, 0), + "empty": entries(status=Status.EMPTY.value).count(), + "error": entries(status=Status.ERROR.value).count(), + "stalled": entries(status=Status.STALLED.value).count(), + "valid": entries(status=Status.VALID.value).count(), diff --git a/libs/libqueue/dist/libqueue-0.1.3-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.3-py3-none-any.whl new file mode 100644 index 00000000..3431ba2f Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.3-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.3.tar.gz b/libs/libqueue/dist/libqueue-0.1.3.tar.gz new file mode 100644 index 00000000..83c0549b Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.3.tar.gz differ diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index 384c7818..c4bc68fa 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.2" +version = "0.1.3" diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index c3f28cae..145c3da8 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -5 +5 @@ from datetime import datetime -from typing import Dict, Generic, List, Optional, Tuple, Type, TypedDict, TypeVar +from typing import Generic, List, Optional, Tuple, Type, TypedDict, TypeVar @@ -306 +305,0 @@ def get_jobs_count_by_status(jobs: QuerySet[AnyJob]) -> CountByStatus: - frequencies: Dict[str, int] = jobs.item_frequencies("status", normalize=False) # type: ignore @@ -307,0 +307,3 @@ def get_jobs_count_by_status(jobs: QuerySet[AnyJob]) -> CountByStatus: + # note: we repeat the values instead of looping on Status because we don't know how to get the types right in mypy + # result: CountByStatus = {s.value: jobs(status=s.value).count() for s in Status} # <- doesn't work in mypy + # see https://stackoverflow.com/a/67292548/7351594 @@ -309,5 +311,5 @@ def get_jobs_count_by_status(jobs: QuerySet[AnyJob]) -> CountByStatus: - "waiting": frequencies.get(Status.WAITING.value, 0), - "started": frequencies.get(Status.STARTED.value, 0), - "success": frequencies.get(Status.SUCCESS.value, 0), - "error": frequencies.get(Status.ERROR.value, 0), - "cancelled": frequencies.get(Status.CANCELLED.value, 0), + "waiting": jobs(status=Status.WAITING.value).count(), + "started": jobs(status=Status.STARTED.value).count(), + "success": jobs(status=Status.SUCCESS.value).count(), + "error": jobs(status=Status.ERROR.value).count(), + "cancelled": jobs(status=Status.CANCELLED.value).count(), diff --git a/services/admin/.env.example b/services/admin/.env.example index 4f462cca..551882ff 100644 --- a/services/admin/.env.example +++ b/services/admin/.env.example @@ -0,0 +1,9 @@ +# Application hostname +# APP_HOSTNAME="localhost" + +# Number of uvicorn workers to run the application +# APP_NUM_WORKERS = 2 + +# Application port +# APP_PORT=8000 + diff --git a/services/admin/Dockerfile b/services/admin/Dockerfile index 7b0bcbde..b55bddc4 100644 --- a/services/admin/Dockerfile +++ b/services/admin/Dockerfile @@ -28,3 +28,2 @@ RUN poetry install -# https://stackoverflow.com/a/55734437/7351594 -# do nothing: the user has to login to the machine to run the scripts with make -CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait" +ENTRYPOINT ["make"] +CMD ["run"] diff --git a/services/admin/Makefile b/services/admin/Makefile index d6b4f949..ccd71ce4 100644 --- a/services/admin/Makefile +++ b/services/admin/Makefile @@ -2,0 +3,8 @@ include ../../tools/Common.mk +.PHONY: run +run: + poetry run python src/admin/main.py + +.PHONY: watch +watch: + poetry run watchmedo auto-restart -d src/admin -p "*.py" -R python src/admin/main.py + diff --git a/services/admin/README.md b/services/admin/README.md index 04c24346..8e66d8fd 100644 --- a/services/admin/README.md +++ b/services/admin/README.md @@ -9 +9 @@ See [INSTALL](./INSTALL.md#Install) -## Run +## Run the scripts @@ -43,0 +44,7 @@ The scripts: + +## Run the API + +The admin service provides technical endpoints: + +- `/healthcheck` +- `/metrics`: gives info about the cache and the queue diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index c10d9477..13bdfbfc 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -25,0 +26,11 @@ python-versions = "*" +[[package]] +name = "asgiref" +version = "3.5.2" +description = "ASGI specs, helper code, and adapters" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +tests = ["pytest", "pytest-asyncio", "mypy (>=0.800)"] + @@ -50 +61 @@ name = "azure-core" -version = "1.24.0" +version = "1.24.1" @@ -164 +175 @@ description = "Composable command line interface toolkit" -category = "dev" +category = "main" @@ -181 +192 @@ name = "coverage" -version = "6.4" +version = "6.4.1" @@ -281 +292 @@ name = "elasticsearch" -version = "8.2.0" +version = "8.2.2" @@ -296 +307 @@ name = "filelock" -version = "3.7.0" +version = "3.7.1" @@ -368,0 +380,8 @@ gitdb = ">=4.0.1,<5" +[[package]] +name = "h11" +version = "0.13.0" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +category = "main" +optional = false +python-versions = ">=3.6" + @@ -437 +456 @@ name = "libcache" -version = "0.1.1" +version = "0.1.5" @@ -452 +471 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl" @@ -456 +475 @@ name = "libqueue" -version = "0.1.1" +version = "0.1.3" @@ -470 +489 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.3-py3-none-any.whl" @@ -518 +537 @@ name = "msal" -version = "1.17.0" +version = "1.18.0" @@ -525 +544 @@ python-versions = "*" -cryptography = ">=0.6,<39" +cryptography = ">=0.6,<40" @@ -608 +627 @@ name = "orjson" -version = "3.6.8" +version = "3.6.9" @@ -711,0 +731,11 @@ tests = ["pytest (>=5.4.1)", "pytest-cov (>=2.8.1)", "sphinx (>=3.0.3)", "pytest +[[package]] +name = "prometheus-client" +version = "0.12.0" +description = "Python client for the Prometheus monitoring system." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.extras] +twisted = ["twisted"] + @@ -1037,0 +1068,12 @@ full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "gra +[[package]] +name = "starlette-prometheus" +version = "0.9.0" +description = "Prometheus integration for Starlette" +category = "main" +optional = false +python-versions = ">=3.7,<4.0" + +[package.dependencies] +prometheus_client = ">=0.12,<0.13" +starlette = ">=0.12.2" + @@ -1126,0 +1169,30 @@ socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] +[[package]] +name = "uvicorn" +version = "0.14.0" +description = "The lightning-fast ASGI server." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +asgiref = ">=3.3.4" +click = ">=7" +h11 = ">=0.8" + +[package.extras] +standard = ["websockets (>=9.1)", "httptools (>=0.2.0,<0.3.0)", "watchgod (>=0.6)", "python-dotenv (>=0.13)", "PyYAML (>=5.1)", "uvloop (>=0.14.0,!=0.15.0,!=0.15.1)", "colorama (>=0.4)"] + +[[package]] +name = "watchdog" +version = "2.1.8" +description = "Filesystem events monitoring" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +PyYAML = {version = ">=3.10", optional = true, markers = "extra == \"watchmedo\""} + +[package.extras] +watchmedo = ["PyYAML (>=3.10)"] + @@ -1130 +1202 @@ python-versions = "3.9.6" -content-hash = "9aa47ad13853d4b54606af2cdbc0c4f2c24daf727d567623fc475383dd29d3df" +content-hash = "578ccd2d098ee4f526b4e4cc7be7e70090d6f25e9e548629f2864c2bc4d7512f" @@ -1140,0 +1213,4 @@ appdirs = [ +asgiref = [ + {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"}, + {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, +] @@ -1150,2 +1226,2 @@ azure-core = [ - {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, - {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, + {file = "azure-core-1.24.1.zip", hash = "sha256:39c5d59d04209bb70a1a7ee879cef05d07bc76472cd3fb5eaa2e607a90d312bb"}, + {file = "azure_core-1.24.1-py3-none-any.whl", hash = "sha256:f48a640affa59fa45ac770565b3bead4c4f834242d16983c1ae2bb173a4b8a6d"}, @@ -1259,41 +1335,41 @@ coverage = [ - {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, - {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, - {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, - {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, - {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, - {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, - {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, - {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, - {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, - {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, - {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, - {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, - {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, - {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, - {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, - {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, - {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f1d5aa2703e1dab4ae6cf416eb0095304f49d004c39e9db1d86f57924f43006b"}, + {file = "coverage-6.4.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:4ce1b258493cbf8aec43e9b50d89982346b98e9ffdfaae8ae5793bc112fb0068"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:83c4e737f60c6936460c5be330d296dd5b48b3963f48634c53b3f7deb0f34ec4"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:84e65ef149028516c6d64461b95a8dbcfce95cfd5b9eb634320596173332ea84"}, + {file = "coverage-6.4.1-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f69718750eaae75efe506406c490d6fc5a6161d047206cc63ce25527e8a3adad"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:e57816f8ffe46b1df8f12e1b348f06d164fd5219beba7d9433ba79608ef011cc"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:01c5615d13f3dd3aa8543afc069e5319cfa0c7d712f6e04b920431e5c564a749"}, + {file = "coverage-6.4.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:75ab269400706fab15981fd4bd5080c56bd5cc07c3bccb86aab5e1d5a88dc8f4"}, + {file = "coverage-6.4.1-cp310-cp310-win32.whl", hash = "sha256:a7f3049243783df2e6cc6deafc49ea123522b59f464831476d3d1448e30d72df"}, + {file = "coverage-6.4.1-cp310-cp310-win_amd64.whl", hash = "sha256:ee2ddcac99b2d2aec413e36d7a429ae9ebcadf912946b13ffa88e7d4c9b712d6"}, + {file = "coverage-6.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:fb73e0011b8793c053bfa85e53129ba5f0250fdc0392c1591fd35d915ec75c46"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:106c16dfe494de3193ec55cac9640dd039b66e196e4641fa8ac396181578b982"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:87f4f3df85aa39da00fd3ec4b5abeb7407e82b68c7c5ad181308b0e2526da5d4"}, + {file = "coverage-6.4.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:961e2fb0680b4f5ad63234e0bf55dfb90d302740ae9c7ed0120677a94a1590cb"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:cec3a0f75c8f1031825e19cd86ee787e87cf03e4fd2865c79c057092e69e3a3b"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:129cd05ba6f0d08a766d942a9ed4b29283aff7b2cccf5b7ce279d50796860bb3"}, + {file = "coverage-6.4.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:bf5601c33213d3cb19d17a796f8a14a9eaa5e87629a53979a5981e3e3ae166f6"}, + {file = "coverage-6.4.1-cp37-cp37m-win32.whl", hash = "sha256:269eaa2c20a13a5bf17558d4dc91a8d078c4fa1872f25303dddcbba3a813085e"}, + {file = "coverage-6.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:f02cbbf8119db68455b9d763f2f8737bb7db7e43720afa07d8eb1604e5c5ae28"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ffa9297c3a453fba4717d06df579af42ab9a28022444cae7fa605af4df612d54"}, + {file = "coverage-6.4.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:145f296d00441ca703a659e8f3eb48ae39fb083baba2d7ce4482fb2723e050d9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d44996140af8b84284e5e7d398e589574b376fb4de8ccd28d82ad8e3bea13"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2bd9a6fc18aab8d2e18f89b7ff91c0f34ff4d5e0ba0b33e989b3cd4194c81fd9"}, + {file = "coverage-6.4.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3384f2a3652cef289e38100f2d037956194a837221edd520a7ee5b42d00cc605"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:9b3e07152b4563722be523e8cd0b209e0d1a373022cfbde395ebb6575bf6790d"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:1480ff858b4113db2718848d7b2d1b75bc79895a9c22e76a221b9d8d62496428"}, + {file = "coverage-6.4.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:865d69ae811a392f4d06bde506d531f6a28a00af36f5c8649684a9e5e4a85c83"}, + {file = "coverage-6.4.1-cp38-cp38-win32.whl", hash = "sha256:664a47ce62fe4bef9e2d2c430306e1428ecea207ffd68649e3b942fa8ea83b0b"}, + {file = "coverage-6.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:26dff09fb0d82693ba9e6231248641d60ba606150d02ed45110f9ec26404ed1c"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d9c80df769f5ec05ad21ea34be7458d1dc51ff1fb4b2219e77fe24edf462d6df"}, + {file = "coverage-6.4.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:39ee53946bf009788108b4dd2894bf1349b4e0ca18c2016ffa7d26ce46b8f10d"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f5b66caa62922531059bc5ac04f836860412f7f88d38a476eda0a6f11d4724f4"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fd180ed867e289964404051a958f7cccabdeed423f91a899829264bb7974d3d3"}, + {file = "coverage-6.4.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:84631e81dd053e8a0d4967cedab6db94345f1c36107c71698f746cb2636c63e3"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8c08da0bd238f2970230c2a0d28ff0e99961598cb2e810245d7fc5afcf1254e8"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d42c549a8f41dc103a8004b9f0c433e2086add8a719da00e246e17cbe4056f72"}, + {file = "coverage-6.4.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:309ce4a522ed5fca432af4ebe0f32b21d6d7ccbb0f5fcc99290e71feba67c264"}, + {file = "coverage-6.4.1-cp39-cp39-win32.whl", hash = "sha256:fdb6f7bd51c2d1714cea40718f6149ad9be6a2ee7d93b19e9f00934c0f2a74d9"}, + {file = "coverage-6.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:342d4aefd1c3e7f620a13f4fe563154d808b69cccef415415aece4c786665397"}, + {file = "coverage-6.4.1-pp36.pp37.pp38-none-any.whl", hash = "sha256:4803e7ccf93230accb928f3a68f00ffa80a88213af98ed338a57ad021ef06815"}, + {file = "coverage-6.4.1.tar.gz", hash = "sha256:4321f075095a096e70aff1d002030ee612b65a205a0a0f5b815280d5dc58100c"}, @@ -1345,2 +1421,2 @@ elasticsearch = [ - {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, - {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, + {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, + {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, @@ -1349,2 +1425,2 @@ filelock = [ - {file = "filelock-3.7.0-py3-none-any.whl", hash = "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6"}, - {file = "filelock-3.7.0.tar.gz", hash = "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20"}, + {file = "filelock-3.7.1-py3-none-any.whl", hash = "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404"}, + {file = "filelock-3.7.1.tar.gz", hash = "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04"}, @@ -1370,0 +1447,4 @@ gitpython = [ +h11 = [ + {file = "h11-0.13.0-py3-none-any.whl", hash = "sha256:8ddd78563b633ca55346c8cd41ec0af27d3c79931828beffb46ce70a379e7442"}, + {file = "h11-0.13.0.tar.gz", hash = "sha256:70813c1135087a248a4d38cc0e1a0181ffab2188141a93eaf567940c3957ff06"}, +] @@ -1392 +1472 @@ libcache = [ - {file = "libcache-0.1.1-py3-none-any.whl", hash = "sha256:40e7ae95c00d2213bdc4f80091a33367cc86c34ebccc787250e68ab9d0ff291e"}, + {file = "libcache-0.1.5-py3-none-any.whl", hash = "sha256:85c5406a3d29504072ac2e5589fc9262ec9e6a4c15db70cd5fd5b377d765f21a"}, @@ -1395 +1475 @@ libqueue = [ - {file = "libqueue-0.1.1-py3-none-any.whl", hash = "sha256:50a690a0cbfc157a36ec19c1ce343a8f0b1b3a060e93c3f566c415eba8e225f9"}, + {file = "libqueue-0.1.3-py3-none-any.whl", hash = "sha256:ba07273d7bf7c05048c2d7ffd0b1ebc47fff08e873681039ef53d2ec3bde522b"}, @@ -1413,2 +1493,2 @@ msal = [ - {file = "msal-1.17.0-py2.py3-none-any.whl", hash = "sha256:5a52d78e70d2c451e267c1e8c2342e4c06f495c75c859aeafd9260d3974f09fe"}, - {file = "msal-1.17.0.tar.gz", hash = "sha256:04e3cb7bb75c51f56d290381f23056207df1f3eb594ed03d38551f3b16d2a36e"}, + {file = "msal-1.18.0-py2.py3-none-any.whl", hash = "sha256:9c10e6cb32e0b6b8eaafc1c9a68bc3b2ff71505e0c5b8200799582d8b9f22947"}, + {file = "msal-1.18.0.tar.gz", hash = "sha256:576af55866038b60edbcb31d831325a1bd8241ed272186e2832968fd4717d202"}, @@ -1481,32 +1561,28 @@ orjson = [ - {file = "orjson-3.6.8-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:3a287a650458de2211db03681b71c3e5cb2212b62f17a39df8ad99fc54855d0f"}, - {file = "orjson-3.6.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5204e25c12cea58e524fc82f7c27ed0586f592f777b33075a92ab7b3eb3687c2"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77e8386393add64f959c044e0fb682364fd0e611a6f477aa13f0e6a733bd6a28"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:279f2d2af393fdf8601020744cb206b91b54ad60fb8401e0761819c7bda1f4e4"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:c31c9f389be7906f978ed4192eb58a4b74a37ad60556a0b88ddc47c576697770"}, - {file = "orjson-3.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0db5c5a0c5b89f092d52f6e5a3701660a9d6ffa9e2968b3ce17c2bc4f5eb0414"}, - {file = "orjson-3.6.8-cp310-none-win_amd64.whl", hash = "sha256:eb22485847b9a0c4bbedc668df860126ac931edbed1d456cf41a59f3cb961ed8"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:1a5fe569310bc819279bd4d5f2c349910b104ed3207936246dd5d5e0b085e74a"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:ccb356a47ab1067cd3549847e9db1d279a63fe0482d315b3ffd6e7abef35ef77"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ab29c069c222248ce302a25855b4e1664f9436e8ae5a131fb0859daf31676d2b"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d2b5e4cba9e774ac011071d9d27760f97f4b8cd46003e971d122e712f971345"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:c311ec504414d22834d5b972a209619925b48263856a11a14d90230f9682d49c"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:a3dfec7950b90fb8d143743503ee53fa06b32e6068bdea792fc866284da3d71d"}, - {file = "orjson-3.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b890dbbada2cbb26eb29bd43a848426f007f094bb0758df10dfe7a438e1cb4b4"}, - {file = "orjson-3.6.8-cp37-none-win_amd64.whl", hash = "sha256:9143ae2c52771525be9ad11a7a8cc8e7fd75391b107e7e644a9e0050496f6b4f"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:33a82199fd42f6436f833e210ae5129c922a5c355629356ca7a8e82964da7285"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:90159ea8b9a5a2a98fa33dc7b421cfac4d2ae91ba5e1058f5909e7f059f6b467"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:656fbe15d9ef0733e740d9def78f4fdb4153102f4836ee774a05123499005931"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7be3be6153843e0f01351b1313a5ad4723595427680dac2dfff22a37e652ce02"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:dd24f66b6697ee7424f7da575ec6cbffc8ede441114d53470949cda4d97c6e56"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:b07c780f7345ecf5901356dc21dee0669defc489c38ce7b9ab0f5e008cc0385c"}, - {file = "orjson-3.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ea32015a5d8a4ce00d348a0de5dc7040e0ad58f970a8fcbb5713a1eac129e493"}, - {file = "orjson-3.6.8-cp38-none-win_amd64.whl", hash = "sha256:c5a3e382194c838988ec128a26b08aa92044e5e055491cc4056142af0c1c54d7"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:83a8424e857ae1bf53530e88b4eb2f16ca2b489073b924e655f1575cacd7f52a"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:81e1a6a2d67f15007dadacbf9ba5d3d79237e5e33786c028557fe5a2b72f1c9a"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:137b539881c77866eba86ff6a11df910daf2eb9ab8f1acae62f879e83d7c38af"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cbd358f3b3ad539a27e36900e8e7d172d0e1b72ad9dd7d69544dcbc0f067ee7"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:6ab94701542d40b90903ecfc339333f458884979a01cb9268bc662cc67a5f6d8"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:32b6f26593a9eb606b40775826beb0dac152e3d224ea393688fced036045a821"}, - {file = "orjson-3.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:afd9e329ebd3418cac3cd747769b1d52daa25fa672bbf414ab59f0e0881b32b9"}, - {file = "orjson-3.6.8-cp39-none-win_amd64.whl", hash = "sha256:0c89b419914d3d1f65a1b0883f377abe42a6e44f6624ba1c63e8846cbfc2fa60"}, - {file = "orjson-3.6.8.tar.gz", hash = "sha256:e19d23741c5de13689bb316abfccea15a19c264e3ec8eb332a5319a583595ace"}, + {file = "orjson-3.6.9-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:cd3592726d13deb3dcda3e142cb1ffaa6ddabc287a838d9d1effbb08d19e5a68"}, + {file = "orjson-3.6.9-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:a6d8cd9066df441b06297846fc9fb69654dffe2c5b7c389f40a40f2320f1cac5"}, + {file = "orjson-3.6.9-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:028ee84182af09b68f9d4bc7d9f9b98a3e28d19472af93f4377510e11d3c431b"}, + {file = "orjson-3.6.9-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:5558f474acb68fa8f13f6c6fca4cc431f1e8496638a505961d91efe820818c8f"}, + {file = "orjson-3.6.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:eea2d722a41588e1b5a3fa6d331335d5f757eed8b82418c5185d85fbdbf402df"}, + {file = "orjson-3.6.9-cp310-none-win_amd64.whl", hash = "sha256:61b798c055ea1b3b6fe8a4f4bb452adec0a0dc04fb9be489e9881c996212bdc6"}, + {file = "orjson-3.6.9-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:3a3cbfa84a9e382a22ae462100c512404e186c62b2189d161e4f440a617ed890"}, + {file = "orjson-3.6.9-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:d0ecd233f248d4de97af790175f0a76543c130151aef0c813b9b94c5b34027b5"}, + {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0ee64c378ae2c0677999e891a8a06d4772d76ae741c436edfb7209ebab80da8b"}, + {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa71b5da3583423e450c6ded3cf13f7daaf264a734a86a5dbc6031bbe72017e7"}, + {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:c6c364f17b8b6d799cc86d60f8409500bfc1d64538ef5178deb2b744b55264a3"}, + {file = "orjson-3.6.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:48e23ebde87c3c53fe8c34f3e92f25d8827089f5bc71db1399c105d128efec8d"}, + {file = "orjson-3.6.9-cp37-none-win_amd64.whl", hash = "sha256:8d4d62558f0d8ffafa04b1303b8c94e4c84ab78f5d43e4b76a8fa0cbe6b8ba6e"}, + {file = "orjson-3.6.9-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:0c0eeaa91e7107158d50fbc949c89c04a5952d236670f56ced08edd146015b97"}, + {file = "orjson-3.6.9-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:581827f666d56e6b2e2bf2bb24f0f0f759e6eaf8ec83e7b8e42a8b9ac47c9fbc"}, + {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0d74c7dd08f189863263bbf05d6a8a452c2d0a29becf936cf05caf03429e59ad"}, + {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5051218f4ca88fab241dc198244cb20a9aa1cf18a2b5be41edead07bb7debccb"}, + {file = "orjson-3.6.9-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:c6028e0dfe3f1210e5560852a9f706360c71b3c07051f99e44e9ecb232e6414b"}, + {file = "orjson-3.6.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9888ea0e063cb79fb384f2800530d86e3b1b9e43084e7dc58fb1bb0165567a5f"}, + {file = "orjson-3.6.9-cp38-none-win_amd64.whl", hash = "sha256:1ae10f2dadbafefce59afaeba146bead5d1853cd744e2ac055796be72456aeb6"}, + {file = "orjson-3.6.9-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:77fa18c7806ced4f5e659e7ffd2404e974dea546f4baa0b9525f687ddf48bc17"}, + {file = "orjson-3.6.9-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:29e90a3af4cabf65c73e34b06550a3ee02ce1e3daccf79d68ffa930d2db02559"}, + {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc5ce183ceda177beb9559bbf0e11f88926322a13a337d0902e4f1059dcf5b36"}, + {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c2e30e483d1d4d0b4feb820ee7eff94a86e42882f5e77dc67758c2b648dd236"}, + {file = "orjson-3.6.9-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:d4fef84272ec68339d18fec68a3cfa12c7e7f1b304606f6485f3637779e48a13"}, + {file = "orjson-3.6.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9624afef062b701ae8cb3486842b9363cf0cf083fc6294a824d109546272a3c3"}, + {file = "orjson-3.6.9-cp39-none-win_amd64.whl", hash = "sha256:81e23bb5aa767dfa46eeca76ac6bbe148aa8c184a5d08b4d0e4947d42b278246"}, + {file = "orjson-3.6.9.tar.gz", hash = "sha256:37b5bbcc1d5e804be5fd52c15737e7addd08475917ab6dd3de6b791dfb2d7d85"}, @@ -1564,0 +1641,4 @@ portalocker = [ +prometheus-client = [ + {file = "prometheus_client-0.12.0-py2.py3-none-any.whl", hash = "sha256:317453ebabff0a1b02df7f708efbab21e3489e7072b61cb6957230dd004a0af0"}, + {file = "prometheus_client-0.12.0.tar.gz", hash = "sha256:1b12ba48cee33b9b0b9de64a1047cbd3c5f2d0ab6ebcead7ddda613a750ec3c5"}, +] @@ -1931,0 +2012,4 @@ starlette = [ +starlette-prometheus = [ + {file = "starlette-prometheus-0.9.0.tar.gz", hash = "sha256:a52fb0f1df52b44a7a677a792759337ef0ce0d59ddf3e684a7d6459a93a90e99"}, + {file = "starlette_prometheus-0.9.0-py3-none-any.whl", hash = "sha256:b4702e4ec67dce508d28551db0e45f12f58411afdb5d1078c92ff74331915381"}, +] @@ -1995,0 +2080,31 @@ urllib3 = [ +uvicorn = [ + {file = "uvicorn-0.14.0-py3-none-any.whl", hash = "sha256:2a76bb359171a504b3d1c853409af3adbfa5cef374a4a59e5881945a97a93eae"}, + {file = "uvicorn-0.14.0.tar.gz", hash = "sha256:45ad7dfaaa7d55cab4cd1e85e03f27e9d60bc067ddc59db52a2b0aeca8870292"}, +] +watchdog = [ + {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:676263bee67b165f16b05abc52acc7a94feac5b5ab2449b491f1a97638a79277"}, + {file = "watchdog-2.1.8-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:aa68d2d9a89d686fae99d28a6edf3b18595e78f5adf4f5c18fbfda549ac0f20c"}, + {file = "watchdog-2.1.8-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5e2e51c53666850c3ecffe9d265fc5d7351db644de17b15e9c685dd3cdcd6f97"}, + {file = "watchdog-2.1.8-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:7721ac736170b191c50806f43357407138c6748e4eb3e69b071397f7f7aaeedd"}, + {file = "watchdog-2.1.8-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ce7376aed3da5fd777483fe5ebc8475a440c6d18f23998024f832134b2938e7b"}, + {file = "watchdog-2.1.8-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:f9ee4c6bf3a1b2ed6be90a2d78f3f4bbd8105b6390c04a86eb48ed67bbfa0b0b"}, + {file = "watchdog-2.1.8-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:68dbe75e0fa1ba4d73ab3f8e67b21770fbed0651d32ce515cd38919a26873266"}, + {file = "watchdog-2.1.8-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0c520009b8cce79099237d810aaa19bc920941c268578436b62013b2f0102320"}, + {file = "watchdog-2.1.8-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:efcc8cbc1b43902571b3dce7ef53003f5b97fe4f275fe0489565fc6e2ebe3314"}, + {file = "watchdog-2.1.8-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:746e4c197ec1083581bb1f64d07d1136accf03437badb5ff8fcb862565c193b2"}, + {file = "watchdog-2.1.8-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1ae17b6be788fb8e4d8753d8d599de948f0275a232416e16436363c682c6f850"}, + {file = "watchdog-2.1.8-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:ddde157dc1447d8130cb5b8df102fad845916fe4335e3d3c3f44c16565becbb7"}, + {file = "watchdog-2.1.8-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4978db33fc0934c92013ee163a9db158ec216099b69fce5aec790aba704da412"}, + {file = "watchdog-2.1.8-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b962de4d7d92ff78fb2dbc6a0cb292a679dea879a0eb5568911484d56545b153"}, + {file = "watchdog-2.1.8-py3-none-manylinux2014_aarch64.whl", hash = "sha256:1e5d0fdfaa265c29dc12621913a76ae99656cf7587d03950dfeb3595e5a26102"}, + {file = "watchdog-2.1.8-py3-none-manylinux2014_armv7l.whl", hash = "sha256:036ed15f7cd656351bf4e17244447be0a09a61aaa92014332d50719fc5973bc0"}, + {file = "watchdog-2.1.8-py3-none-manylinux2014_i686.whl", hash = "sha256:2962628a8777650703e8f6f2593065884c602df7bae95759b2df267bd89b2ef5"}, + {file = "watchdog-2.1.8-py3-none-manylinux2014_ppc64.whl", hash = "sha256:156ec3a94695ea68cfb83454b98754af6e276031ba1ae7ae724dc6bf8973b92a"}, + {file = "watchdog-2.1.8-py3-none-manylinux2014_ppc64le.whl", hash = "sha256:47598fe6713fc1fee86b1ca85c9cbe77e9b72d002d6adeab9c3b608f8a5ead10"}, + {file = "watchdog-2.1.8-py3-none-manylinux2014_s390x.whl", hash = "sha256:fed4de6e45a4f16e4046ea00917b4fe1700b97244e5d114f594b4a1b9de6bed8"}, + {file = "watchdog-2.1.8-py3-none-manylinux2014_x86_64.whl", hash = "sha256:24dedcc3ce75e150f2a1d704661f6879764461a481ba15a57dc80543de46021c"}, + {file = "watchdog-2.1.8-py3-none-win32.whl", hash = "sha256:6ddf67bc9f413791072e3afb466e46cc72c6799ba73dea18439b412e8f2e3257"}, + {file = "watchdog-2.1.8-py3-none-win_amd64.whl", hash = "sha256:88ef3e8640ef0a64b7ad7394b0f23384f58ac19dd759da7eaa9bc04b2898943f"}, + {file = "watchdog-2.1.8-py3-none-win_ia64.whl", hash = "sha256:0fb60c7d31474b21acba54079ce9ff0136411183e9a591369417cddb1d7d00d7"}, + {file = "watchdog-2.1.8.tar.gz", hash = "sha256:6d03149126864abd32715d4e9267d2754cede25a69052901399356ad3bc5ecff"}, +] diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 5b95a14c..ecb9e8ec 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -3 +3 @@ authors = ["Sylvain Lesage <[email protected]>"] -description = "Admin scripts" +description = "Admin scripts and API" @@ -5 +5 @@ name = "admin" -version = "0.1.1" +version = "0.1.2" @@ -9,2 +9,2 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.5-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.3-py3-none-any.whl", develop = false } @@ -13,0 +14,4 @@ python-dotenv = "^0.20.0" +starlette = "^0.16.0" +starlette-prometheus = "^0.9.0" +uvicorn = "^0.14.0" +watchdog = { extras = ["watchmedo"], version = "^2.1.3" } diff --git a/services/admin/src/admin/app.py b/services/admin/src/admin/app.py new file mode 100644 index 00000000..8db17216 --- /dev/null +++ b/services/admin/src/admin/app.py @@ -0,0 +1,39 @@ +import uvicorn # type: ignore +from libcache.cache import connect_to_cache +from libqueue.queue import connect_to_queue +from libutils.logger import init_logger +from starlette.applications import Starlette +from starlette.middleware import Middleware +from starlette.middleware.gzip import GZipMiddleware +from starlette.routing import Route +from starlette_prometheus import PrometheusMiddleware + +from admin.config import ( + APP_HOSTNAME, + APP_NUM_WORKERS, + APP_PORT, + LOG_LEVEL, + MONGO_CACHE_DATABASE, + MONGO_QUEUE_DATABASE, + MONGO_URL, +) +from admin.prometheus import Prometheus +from admin.routes.healthcheck import healthcheck_endpoint + + +def create_app() -> Starlette: + init_logger(log_level=LOG_LEVEL) + connect_to_cache(database=MONGO_CACHE_DATABASE, host=MONGO_URL) + connect_to_queue(database=MONGO_QUEUE_DATABASE, host=MONGO_URL) + prometheus = Prometheus() + + middleware = [Middleware(GZipMiddleware), Middleware(PrometheusMiddleware, filter_unhandled_paths=True)] + routes = [ + Route("/healthcheck", endpoint=healthcheck_endpoint), + Route("/metrics", endpoint=prometheus.endpoint), + ] + return Starlette(routes=routes, middleware=middleware) + + +def start() -> None: + uvicorn.run("app:create_app", host=APP_HOSTNAME, port=APP_PORT, factory=True, workers=APP_NUM_WORKERS) diff --git a/services/admin/src/admin/config.py b/services/admin/src/admin/config.py index b1913229..4e93f40f 100644 --- a/services/admin/src/admin/config.py +++ b/services/admin/src/admin/config.py @@ -4 +4 @@ from dotenv import load_dotenv -from libutils.utils import get_str_or_none_value, get_str_value +from libutils.utils import get_int_value, get_str_or_none_value, get_str_value @@ -6,0 +7,3 @@ from admin.constants import ( + DEFAULT_APP_HOSTNAME, + DEFAULT_APP_NUM_WORKERS, + DEFAULT_APP_PORT, @@ -16,0 +20,3 @@ load_dotenv() +APP_HOSTNAME = get_str_value(d=os.environ, key="APP_HOSTNAME", default=DEFAULT_APP_HOSTNAME) +APP_NUM_WORKERS = get_int_value(d=os.environ, key="APP_NUM_WORKERS", default=DEFAULT_APP_NUM_WORKERS) +APP_PORT = get_int_value(d=os.environ, key="APP_PORT", default=DEFAULT_APP_PORT) diff --git a/services/admin/src/admin/constants.py b/services/admin/src/admin/constants.py index 2e222f74..6d6418fc 100644 --- a/services/admin/src/admin/constants.py +++ b/services/admin/src/admin/constants.py @@ -0,0 +1,3 @@ +DEFAULT_APP_HOSTNAME: str = "localhost" +DEFAULT_APP_NUM_WORKERS: int = 2 +DEFAULT_APP_PORT: int = 8000 @@ -5 +8 @@ DEFAULT_MONGO_QUEUE_DATABASE: str = "datasets_server_queue" -DEFAULT_MONGO_URL: str = "mongodb://localhost:27018" +DEFAULT_MONGO_URL: str = "mongodb://localhost:27017" diff --git a/services/admin/src/admin/main.py b/services/admin/src/admin/main.py new file mode 100644 index 00000000..6244cb28 --- /dev/null +++ b/services/admin/src/admin/main.py @@ -0,0 +1,4 @@ +from admin.app import start + +if __name__ == "__main__": + start() diff --git a/services/admin/src/admin/prometheus.py b/services/admin/src/admin/prometheus.py new file mode 100644 index 00000000..e51f6f1f --- /dev/null +++ b/services/admin/src/admin/prometheus.py @@ -0,0 +1,60 @@ +import os +from typing import Dict + +from libcache.cache import get_datasets_count_by_status, get_splits_count_by_status +from libqueue.queue import ( + get_dataset_jobs_count_by_status, + get_split_jobs_count_by_status, +) +from prometheus_client import ( # type: ignore # https://github.com/prometheus/client_python/issues/491 + CONTENT_TYPE_LATEST, + REGISTRY, + CollectorRegistry, + Gauge, + generate_latest, +) +from prometheus_client.multiprocess import ( # type: ignore # https://github.com/prometheus/client_python/issues/491 + MultiProcessCollector, +) +from starlette.requests import Request +from starlette.responses import Response + + +class Prometheus: + metrics: Dict[str, Gauge] = {} + + def __init__(self): + self.initMetrics() + + def getRegistry(self) -> CollectorRegistry: + # taken from https://github.com/perdy/starlette-prometheus/blob/master/starlette_prometheus/view.py + if "prometheus_multiproc_dir" in os.environ: + registry = CollectorRegistry() + MultiProcessCollector(registry) + else: + registry = REGISTRY + return registry + + # add metrics from the databases + def initMetrics(self): + self.metrics["queue_jobs_total"] = Gauge( + "queue_jobs_total", "Number of jobs in the queue", ["queue", "status"] + ) + self.metrics["cache_entries_total"] = Gauge( + "cache_entries_total", "Number of entries in the cache", ["cache", "status"] + ) + + def updateMetrics(self): + for status, total in get_dataset_jobs_count_by_status().items(): + self.metrics["queue_jobs_total"].labels(queue="datasets", status=status).set(total) + for status, total in get_split_jobs_count_by_status().items(): + self.metrics["queue_jobs_total"].labels(queue="splits", status=status).set(total) + for status, total in get_datasets_count_by_status().items(): + self.metrics["cache_entries_total"].labels(cache="datasets", status=status).set(total) + for status, total in get_splits_count_by_status().items(): + self.metrics["cache_entries_total"].labels(cache="splits", status=status).set(total) + + def endpoint(self, request: Request) -> Response: + self.updateMetrics() + + return Response(generate_latest(self.getRegistry()), headers={"Content-Type": CONTENT_TYPE_LATEST}) diff --git a/services/admin/src/admin/routes/__init__.py b/services/admin/src/admin/routes/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/services/admin/src/admin/routes/healthcheck.py b/services/admin/src/admin/routes/healthcheck.py new file mode 100644 index 00000000..636207c7 --- /dev/null +++ b/services/admin/src/admin/routes/healthcheck.py @@ -0,0 +1,11 @@ +import logging + +from starlette.requests import Request +from starlette.responses import PlainTextResponse, Response + +logger = logging.getLogger(__name__) + + +async def healthcheck_endpoint(_: Request) -> Response: + logger.info("/healthcheck") + return PlainTextResponse("ok", headers={"Cache-Control": "no-store"}) diff --git a/services/admin/tests/test_app.py b/services/admin/tests/test_app.py new file mode 100644 index 00000000..d6973dcd --- /dev/null +++ b/services/admin/tests/test_app.py @@ -0,0 +1,49 @@ +import pytest + +# from libcache.cache import clean_database as clean_cache_database +from libcache.cache import clean_database as clean_cache_database +from libqueue.queue import clean_database as clean_queue_database +from starlette.testclient import TestClient + +from admin.app import create_app +from admin.config import MONGO_CACHE_DATABASE, MONGO_QUEUE_DATABASE + + [email protected](autouse=True, scope="module") +def safe_guard() -> None: + if "test" not in MONGO_CACHE_DATABASE: + raise ValueError("Tests on cache must be launched on a test mongo database") + if "test" not in MONGO_QUEUE_DATABASE: + raise ValueError("Tests on queue must be launched on a test mongo database") + + [email protected](scope="module") +def client() -> TestClient: + return TestClient(create_app()) + + [email protected](autouse=True) +def clean_mongo_databases() -> None: + clean_cache_database() + clean_queue_database() + + +def test_get_healthcheck(client: TestClient) -> None: + response = client.get("/healthcheck") + assert response.status_code == 200 + assert response.text == "ok" + + +def test_metrics(client: TestClient) -> None: + response = client.get("/metrics") + assert response.status_code == 200 + text = response.text + lines = text.split("\n") + metrics = {line.split(" ")[0]: float(line.split(" ")[1]) for line in lines if line and line[0] != "#"} + name = "process_start_time_seconds" + assert name in metrics + assert metrics[name] > 0 + name = "process_start_time_seconds" + assert 'queue_jobs_total{queue="datasets",status="waiting"}' in metrics + # assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics + assert 'starlette_requests_total{method="GET",path_template="/metrics"}' in metrics diff --git a/services/api/src/api/prometheus.py b/services/api/src/api/prometheus.py index bb7729ef..29e5a342 100644 --- a/services/api/src/api/prometheus.py +++ b/services/api/src/api/prometheus.py @@ -2 +1,0 @@ import os -from typing import Dict @@ -4,5 +2,0 @@ from typing import Dict -from libcache.cache import get_datasets_count_by_status, get_splits_count_by_status -from libqueue.queue import ( - get_dataset_jobs_count_by_status, - get_split_jobs_count_by_status, -) @@ -13 +6,0 @@ from prometheus_client import ( # type: ignore # https://github.com/prometheus/ - Gauge, @@ -24,5 +16,0 @@ class Prometheus: - metrics: Dict[str, Gauge] = {} - - def __init__(self): - self.initMetrics() - @@ -38,19 +25,0 @@ class Prometheus: - # add metrics from the databases - def initMetrics(self): - self.metrics["queue_jobs_total"] = Gauge( - "queue_jobs_total", "Number of jobs in the queue", ["queue", "status"] - ) - self.metrics["cache_entries_total"] = Gauge( - "cache_entries_total", "Number of entries in the cache", ["cache", "status"] - ) - - def updateMetrics(self): - for status, total in get_dataset_jobs_count_by_status().items(): - self.metrics["queue_jobs_total"].labels(queue="datasets", status=status).set(total) - for status, total in get_split_jobs_count_by_status().items(): - self.metrics["queue_jobs_total"].labels(queue="splits", status=status).set(total) - for status, total in get_datasets_count_by_status().items(): - self.metrics["cache_entries_total"].labels(cache="datasets", status=status).set(total) - for status, total in get_splits_count_by_status().items(): - self.metrics["cache_entries_total"].labels(cache="splits", status=status).set(total) - @@ -58,3 +26,0 @@ class Prometheus: - # Disable for now - see https://github.com/huggingface/datasets-server/issues/250#issuecomment-1135561566 - # self.updateMetrics() -
28eb9b9c3e7874ebc1df2824c8e9da622a986cd8
Sylvain Lesage
2022-06-01T16:26:05
feat: 🎸 update docker image (#339)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 78603bf4..1f85d568 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -70 +70 @@ api: - tag: sha-bd93aa9 + tag: sha-7cb4f82
7cb4f824395f40ea7561e638dc8e50f2adaebe84
Sylvain Lesage
2022-06-01T16:22:51
feat: 🎸 add an index to optimize the distinct query (#338)
diff --git a/libs/libcache/dist/libcache-0.1.4-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.4-py3-none-any.whl new file mode 100644 index 00000000..e152057f Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.4-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.4.tar.gz b/libs/libcache/dist/libcache-0.1.4.tar.gz new file mode 100644 index 00000000..4148b818 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.4.tar.gz differ diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index d5804e7c..08cd0e72 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.3" +version = "0.1.4" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index a6543b52..4180eefc 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -118 +118,6 @@ class DbSplit(Document): - "indexes": ["status", ("dataset_name", "config_name", "split_name"), ("dataset_name", "status")], + "indexes": [ + ("dataset_name", "config_name", "split_name"), + ("dataset_name", "status"), + ("status", "dataset_name"), + # ^ this index (reversed) is used for the "distinct" command to get the names of the valid datasets + ], diff --git a/services/api/poetry.lock b/services/api/poetry.lock index ba372265..ba6cd4e5 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -292 +292 @@ name = "elasticsearch" -version = "8.2.0" +version = "8.2.2" @@ -455 +455 @@ name = "libcache" -version = "0.1.3" +version = "0.1.4" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.3-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.4-py3-none-any.whl" @@ -626 +626 @@ name = "orjson" -version = "3.6.8" +version = "3.6.9" @@ -1201 +1201 @@ python-versions = "3.9.6" -content-hash = "ffb0e8cb53ebc8edfb560c6af4d24ba6badafd69065abdb0107f01a6eadd5d6b" +content-hash = "8b6565d38b9b7d1fbc74df408200b9d0080802f887c1acc16bfebc2474c8e7f1" @@ -1420,2 +1420,2 @@ elasticsearch = [ - {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, - {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, + {file = "elasticsearch-8.2.2-py3-none-any.whl", hash = "sha256:a0fac3d8aaed8efb2a0d1116e64039bcf56c1605a1ba04c7e451adcecb45d979"}, + {file = "elasticsearch-8.2.2.tar.gz", hash = "sha256:e8fbf27422f16641711011eeed1ff5592c388c67f9036ffdf60f351ece5cc1f6"}, @@ -1471 +1471 @@ libcache = [ - {file = "libcache-0.1.3-py3-none-any.whl", hash = "sha256:e6533ed06611ebd6ebfedd15ac4f65feec66428c10b9efa301a40c399b47cd0c"}, + {file = "libcache-0.1.4-py3-none-any.whl", hash = "sha256:0a2bb15d2a26fc7dd8db1813da4899fbcc417df6b946d2f9c59fd0c4d0d75d50"}, @@ -1560,32 +1560,28 @@ orjson = [ - {file = "orjson-3.6.8-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:3a287a650458de2211db03681b71c3e5cb2212b62f17a39df8ad99fc54855d0f"}, - {file = "orjson-3.6.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5204e25c12cea58e524fc82f7c27ed0586f592f777b33075a92ab7b3eb3687c2"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77e8386393add64f959c044e0fb682364fd0e611a6f477aa13f0e6a733bd6a28"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:279f2d2af393fdf8601020744cb206b91b54ad60fb8401e0761819c7bda1f4e4"}, - {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:c31c9f389be7906f978ed4192eb58a4b74a37ad60556a0b88ddc47c576697770"}, - {file = "orjson-3.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0db5c5a0c5b89f092d52f6e5a3701660a9d6ffa9e2968b3ce17c2bc4f5eb0414"}, - {file = "orjson-3.6.8-cp310-none-win_amd64.whl", hash = "sha256:eb22485847b9a0c4bbedc668df860126ac931edbed1d456cf41a59f3cb961ed8"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:1a5fe569310bc819279bd4d5f2c349910b104ed3207936246dd5d5e0b085e74a"}, - {file = "orjson-3.6.8-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:ccb356a47ab1067cd3549847e9db1d279a63fe0482d315b3ffd6e7abef35ef77"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ab29c069c222248ce302a25855b4e1664f9436e8ae5a131fb0859daf31676d2b"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d2b5e4cba9e774ac011071d9d27760f97f4b8cd46003e971d122e712f971345"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:c311ec504414d22834d5b972a209619925b48263856a11a14d90230f9682d49c"}, - {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:a3dfec7950b90fb8d143743503ee53fa06b32e6068bdea792fc866284da3d71d"}, - {file = "orjson-3.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b890dbbada2cbb26eb29bd43a848426f007f094bb0758df10dfe7a438e1cb4b4"}, - {file = "orjson-3.6.8-cp37-none-win_amd64.whl", hash = "sha256:9143ae2c52771525be9ad11a7a8cc8e7fd75391b107e7e644a9e0050496f6b4f"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:33a82199fd42f6436f833e210ae5129c922a5c355629356ca7a8e82964da7285"}, - {file = "orjson-3.6.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:90159ea8b9a5a2a98fa33dc7b421cfac4d2ae91ba5e1058f5909e7f059f6b467"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:656fbe15d9ef0733e740d9def78f4fdb4153102f4836ee774a05123499005931"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7be3be6153843e0f01351b1313a5ad4723595427680dac2dfff22a37e652ce02"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:dd24f66b6697ee7424f7da575ec6cbffc8ede441114d53470949cda4d97c6e56"}, - {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:b07c780f7345ecf5901356dc21dee0669defc489c38ce7b9ab0f5e008cc0385c"}, - {file = "orjson-3.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ea32015a5d8a4ce00d348a0de5dc7040e0ad58f970a8fcbb5713a1eac129e493"}, - {file = "orjson-3.6.8-cp38-none-win_amd64.whl", hash = "sha256:c5a3e382194c838988ec128a26b08aa92044e5e055491cc4056142af0c1c54d7"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:83a8424e857ae1bf53530e88b4eb2f16ca2b489073b924e655f1575cacd7f52a"}, - {file = "orjson-3.6.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:81e1a6a2d67f15007dadacbf9ba5d3d79237e5e33786c028557fe5a2b72f1c9a"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:137b539881c77866eba86ff6a11df910daf2eb9ab8f1acae62f879e83d7c38af"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cbd358f3b3ad539a27e36900e8e7d172d0e1b72ad9dd7d69544dcbc0f067ee7"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:6ab94701542d40b90903ecfc339333f458884979a01cb9268bc662cc67a5f6d8"}, - {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:32b6f26593a9eb606b40775826beb0dac152e3d224ea393688fced036045a821"}, - {file = "orjson-3.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:afd9e329ebd3418cac3cd747769b1d52daa25fa672bbf414ab59f0e0881b32b9"}, - {file = "orjson-3.6.8-cp39-none-win_amd64.whl", hash = "sha256:0c89b419914d3d1f65a1b0883f377abe42a6e44f6624ba1c63e8846cbfc2fa60"}, - {file = "orjson-3.6.8.tar.gz", hash = "sha256:e19d23741c5de13689bb316abfccea15a19c264e3ec8eb332a5319a583595ace"}, + {file = "orjson-3.6.9-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:cd3592726d13deb3dcda3e142cb1ffaa6ddabc287a838d9d1effbb08d19e5a68"}, + {file = "orjson-3.6.9-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:a6d8cd9066df441b06297846fc9fb69654dffe2c5b7c389f40a40f2320f1cac5"}, + {file = "orjson-3.6.9-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:028ee84182af09b68f9d4bc7d9f9b98a3e28d19472af93f4377510e11d3c431b"}, + {file = "orjson-3.6.9-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:5558f474acb68fa8f13f6c6fca4cc431f1e8496638a505961d91efe820818c8f"}, + {file = "orjson-3.6.9-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:eea2d722a41588e1b5a3fa6d331335d5f757eed8b82418c5185d85fbdbf402df"}, + {file = "orjson-3.6.9-cp310-none-win_amd64.whl", hash = "sha256:61b798c055ea1b3b6fe8a4f4bb452adec0a0dc04fb9be489e9881c996212bdc6"}, + {file = "orjson-3.6.9-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:3a3cbfa84a9e382a22ae462100c512404e186c62b2189d161e4f440a617ed890"}, + {file = "orjson-3.6.9-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:d0ecd233f248d4de97af790175f0a76543c130151aef0c813b9b94c5b34027b5"}, + {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0ee64c378ae2c0677999e891a8a06d4772d76ae741c436edfb7209ebab80da8b"}, + {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fa71b5da3583423e450c6ded3cf13f7daaf264a734a86a5dbc6031bbe72017e7"}, + {file = "orjson-3.6.9-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:c6c364f17b8b6d799cc86d60f8409500bfc1d64538ef5178deb2b744b55264a3"}, + {file = "orjson-3.6.9-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:48e23ebde87c3c53fe8c34f3e92f25d8827089f5bc71db1399c105d128efec8d"}, + {file = "orjson-3.6.9-cp37-none-win_amd64.whl", hash = "sha256:8d4d62558f0d8ffafa04b1303b8c94e4c84ab78f5d43e4b76a8fa0cbe6b8ba6e"}, + {file = "orjson-3.6.9-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:0c0eeaa91e7107158d50fbc949c89c04a5952d236670f56ced08edd146015b97"}, + {file = "orjson-3.6.9-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:581827f666d56e6b2e2bf2bb24f0f0f759e6eaf8ec83e7b8e42a8b9ac47c9fbc"}, + {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0d74c7dd08f189863263bbf05d6a8a452c2d0a29becf936cf05caf03429e59ad"}, + {file = "orjson-3.6.9-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5051218f4ca88fab241dc198244cb20a9aa1cf18a2b5be41edead07bb7debccb"}, + {file = "orjson-3.6.9-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:c6028e0dfe3f1210e5560852a9f706360c71b3c07051f99e44e9ecb232e6414b"}, + {file = "orjson-3.6.9-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:9888ea0e063cb79fb384f2800530d86e3b1b9e43084e7dc58fb1bb0165567a5f"}, + {file = "orjson-3.6.9-cp38-none-win_amd64.whl", hash = "sha256:1ae10f2dadbafefce59afaeba146bead5d1853cd744e2ac055796be72456aeb6"}, + {file = "orjson-3.6.9-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:77fa18c7806ced4f5e659e7ffd2404e974dea546f4baa0b9525f687ddf48bc17"}, + {file = "orjson-3.6.9-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:29e90a3af4cabf65c73e34b06550a3ee02ce1e3daccf79d68ffa930d2db02559"}, + {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fc5ce183ceda177beb9559bbf0e11f88926322a13a337d0902e4f1059dcf5b36"}, + {file = "orjson-3.6.9-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3c2e30e483d1d4d0b4feb820ee7eff94a86e42882f5e77dc67758c2b648dd236"}, + {file = "orjson-3.6.9-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:d4fef84272ec68339d18fec68a3cfa12c7e7f1b304606f6485f3637779e48a13"}, + {file = "orjson-3.6.9-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9624afef062b701ae8cb3486842b9363cf0cf083fc6294a824d109546272a3c3"}, + {file = "orjson-3.6.9-cp39-none-win_amd64.whl", hash = "sha256:81e23bb5aa767dfa46eeca76ac6bbe148aa8c184a5d08b4d0e4947d42b278246"}, + {file = "orjson-3.6.9.tar.gz", hash = "sha256:37b5bbcc1d5e804be5fd52c15737e7addd08475917ab6dd3de6b791dfb2d7d85"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index d606b594..7ad1d4a0 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9 +9 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.3-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.4-py3-none-any.whl", develop = false }
4101fe3b02a9a0b1fe97285bcf1c6d1da4a73e94
Sylvain Lesage
2022-06-01T15:04:35
feat: 🎸 update docker image (#337)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 64f25233..78603bf4 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -70 +70 @@ api: - tag: sha-2e3b180 + tag: sha-bd93aa9
bd93aa9702446454e39b1f25dd0f627066b7874d
Sylvain Lesage
2022-06-01T15:01:42
feat: 🎸 update dependencies to update libcache and libqueue (#336)
diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 9ce61fd4..ba372265 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -307 +307 @@ name = "filelock" -version = "3.7.0" +version = "3.7.1" @@ -455 +455 @@ name = "libcache" -version = "0.1.1" +version = "0.1.3" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.3-py3-none-any.whl" @@ -474 +474 @@ name = "libqueue" -version = "0.1.1" +version = "0.1.2" @@ -488 +488 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.2-py3-none-any.whl" @@ -536 +536 @@ name = "msal" -version = "1.17.0" +version = "1.18.0" @@ -543 +543 @@ python-versions = "*" -cryptography = ">=0.6,<39" +cryptography = ">=0.6,<40" @@ -1201 +1201 @@ python-versions = "3.9.6" -content-hash = "494ebc3a450694159b51d2ed1fb604c6d2f1b240641007bfd2149429f4f96b1d" +content-hash = "ffb0e8cb53ebc8edfb560c6af4d24ba6badafd69065abdb0107f01a6eadd5d6b" @@ -1424,2 +1424,2 @@ filelock = [ - {file = "filelock-3.7.0-py3-none-any.whl", hash = "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6"}, - {file = "filelock-3.7.0.tar.gz", hash = "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20"}, + {file = "filelock-3.7.1-py3-none-any.whl", hash = "sha256:37def7b658813cda163b56fc564cdc75e86d338246458c4c28ae84cabefa2404"}, + {file = "filelock-3.7.1.tar.gz", hash = "sha256:3a0fd85166ad9dbab54c9aec96737b744106dc5f15c0b09a6744a445299fcf04"}, @@ -1471 +1471 @@ libcache = [ - {file = "libcache-0.1.1-py3-none-any.whl", hash = "sha256:40e7ae95c00d2213bdc4f80091a33367cc86c34ebccc787250e68ab9d0ff291e"}, + {file = "libcache-0.1.3-py3-none-any.whl", hash = "sha256:e6533ed06611ebd6ebfedd15ac4f65feec66428c10b9efa301a40c399b47cd0c"}, @@ -1474 +1474 @@ libqueue = [ - {file = "libqueue-0.1.1-py3-none-any.whl", hash = "sha256:50a690a0cbfc157a36ec19c1ce343a8f0b1b3a060e93c3f566c415eba8e225f9"}, + {file = "libqueue-0.1.2-py3-none-any.whl", hash = "sha256:31b9f1ecc84edf6c188ee53af21cdb29ee222695145ed310175d0a35ef5fd6c4"}, @@ -1492,2 +1492,2 @@ msal = [ - {file = "msal-1.17.0-py2.py3-none-any.whl", hash = "sha256:5a52d78e70d2c451e267c1e8c2342e4c06f495c75c859aeafd9260d3974f09fe"}, - {file = "msal-1.17.0.tar.gz", hash = "sha256:04e3cb7bb75c51f56d290381f23056207df1f3eb594ed03d38551f3b16d2a36e"}, + {file = "msal-1.18.0-py2.py3-none-any.whl", hash = "sha256:9c10e6cb32e0b6b8eaafc1c9a68bc3b2ff71505e0c5b8200799582d8b9f22947"}, + {file = "msal-1.18.0.tar.gz", hash = "sha256:576af55866038b60edbcb31d831325a1bd8241ed272186e2832968fd4717d202"},
c226add5c972ad0f30799970288a80b1b4840b53
Sylvain Lesage
2022-06-01T14:26:13
feat: 🎸 update api docker image (#335)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 36d9ea8d..64f25233 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -70 +70 @@ api: - tag: sha-ab6473e + tag: sha-2e3b180
2e3b1809f63f1598bc469ea1877401b438e5cc9b
Sylvain Lesage
2022-06-01T14:23:42
fix: 🐛 optimize the query to get the list of valid datasets (#333)
diff --git a/libs/libcache/dist/libcache-0.1.3-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.3-py3-none-any.whl new file mode 100644 index 00000000..80af014f Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.3-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.3.tar.gz b/libs/libcache/dist/libcache-0.1.3.tar.gz new file mode 100644 index 00000000..30a3a3bf Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.3.tar.gz differ diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 7b7d126b..d5804e7c 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.2" +version = "0.1.3" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index e0204b0c..a6543b52 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -459,3 +459,3 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - candidate_dataset_names = { - d.dataset_name for d in DbDataset.objects(status__in=[Status.VALID, Status.STALLED]).only("dataset_name") - } + candidate_dataset_names = set( + DbDataset.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") + ) @@ -463,3 +463,4 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - candidate_dataset_names_in_splits = { - d.dataset_name for d in DbSplit.objects(status__in=[Status.VALID, Status.STALLED]).only("dataset_name") - } + candidate_dataset_names_in_splits = set( + DbSplit.objects(status__in=[Status.VALID, Status.STALLED]).distinct("dataset_name") + ) + diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index b30aedab..d606b594 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -5 +5 @@ name = "api" -version = "0.1.2" +version = "0.1.3" @@ -9 +9 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.2-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.3-py3-none-any.whl", develop = false }
d8e0ea083e69d7055e37fd5bab3d8c3a72daf66b
Sylvain Lesage
2022-06-01T08:51:15
feat: 🎸 use the tls certificate with two domains (#331)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 76678590..c7d5be8e 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -29,0 +30 @@ reverseProxy: + alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-east-1:707930574880:certificate/bfcad79a-111b-4852-adc2-5d78f4132eb6
b13aa1b007d3cc968e0c6a925bf688034d28bd39
Sylvain Lesage
2022-05-31T15:49:29
feat: 🎸 update the docker image for api (#330)
diff --git a/infra/charts/datasets-server/templates/admin/_container.tpl b/infra/charts/datasets-server/templates/admin/_container.tpl index 59c51c2a..86b53ba8 100644 --- a/infra/charts/datasets-server/templates/admin/_container.tpl +++ b/infra/charts/datasets-server/templates/admin/_container.tpl @@ -22 +22 @@ - image: "{{ .Values.admin.image.repository }}/{{ .Values.admin.image.name }}:{{ .Values.docker.tag }}" + image: "{{ .Values.admin.image.repository }}/{{ .Values.admin.image.name }}:{{ .Values.admin.image.tag }}" diff --git a/infra/charts/datasets-server/templates/api/_container.tpl b/infra/charts/datasets-server/templates/api/_container.tpl index 076cd4e0..4f8ff1d9 100644 --- a/infra/charts/datasets-server/templates/api/_container.tpl +++ b/infra/charts/datasets-server/templates/api/_container.tpl @@ -32 +32 @@ - image: "{{ .Values.api.image.repository }}/{{ .Values.api.image.name }}:{{ .Values.docker.tag }}" + image: "{{ .Values.api.image.repository }}/{{ .Values.api.image.name }}:{{ .Values.api.image.tag }}" diff --git a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl index 2509e6de..4271c6dc 100644 --- a/infra/charts/datasets-server/templates/datasets-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/datasets-worker/_container.tpl @@ -59 +59 @@ - image: "{{ .Values.datasetsWorker.image.repository }}/{{ .Values.datasetsWorker.image.name }}:{{ .Values.docker.tag }}" + image: "{{ .Values.datasetsWorker.image.repository }}/{{ .Values.datasetsWorker.image.name }}:{{ .Values.datasetsWorker.image.tag }}" diff --git a/infra/charts/datasets-server/templates/splits-worker/_container.tpl b/infra/charts/datasets-server/templates/splits-worker/_container.tpl index f663bc24..6d04f187 100644 --- a/infra/charts/datasets-server/templates/splits-worker/_container.tpl +++ b/infra/charts/datasets-server/templates/splits-worker/_container.tpl @@ -59 +59 @@ - image: "{{ .Values.splitsWorker.image.repository }}/{{ .Values.splitsWorker.image.name }}:{{ .Values.docker.tag }}" + image: "{{ .Values.splitsWorker.image.repository }}/{{ .Values.splitsWorker.image.name }}:{{ .Values.splitsWorker.image.tag }}" diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index d8a03ef3..36d9ea8d 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -30,3 +29,0 @@ datasetsBlocklist: "" -docker: - tag: sha-da86243 - @@ -72,0 +70 @@ api: + tag: sha-ab6473e @@ -112,0 +111 @@ datasetsWorker: + tag: sha-da86243 @@ -157,0 +157 @@ splitsWorker: + tag: sha-da86243 @@ -200,0 +201 @@ admin: + tag: sha-da86243
ab6473ee90dbb7152e7648b0ca46e7dc7c846599
Sylvain Lesage
2022-05-31T15:44:21
fix: 🐛 remove two useless indexes (#329)
diff --git a/libs/libcache/dist/libcache-0.1.2-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.2-py3-none-any.whl new file mode 100644 index 00000000..18eb75aa Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.2-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.2.tar.gz b/libs/libcache/dist/libcache-0.1.2.tar.gz new file mode 100644 index 00000000..bef0d1e1 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.2.tar.gz differ diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 7ba0974c..7b7d126b 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.1" +version = "0.1.2" diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index 49089c42..e0204b0c 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -367 +367,6 @@ def get_splits_response(dataset_name: str) -> Tuple[Union[SplitsResponse, None], - split.to_split_item() for split in DbSplit.objects(dataset_name=dataset_name).order_by("+split_idx") + split.to_split_item() + for split in DbSplit.objects(dataset_name=dataset_name).only( + "dataset_name", "config_name", "split_name", "num_bytes", "num_examples" + ) + # ^ don't fetch "rows_response" which can be very large + .order_by("+split_idx") diff --git a/libs/libqueue/dist/libqueue-0.1.2-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.2-py3-none-any.whl new file mode 100644 index 00000000..c8d411ee Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.2-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.2.tar.gz b/libs/libqueue/dist/libqueue-0.1.2.tar.gz new file mode 100644 index 00000000..ea9f0aeb Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.2.tar.gz differ diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index e12173c5..384c7818 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.1" +version = "0.1.2" diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index e3dc6832..c3f28cae 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -90 +90 @@ class DatasetJob(Document): - "indexes": ["status", "dataset_name", ("dataset_name", "status")], + "indexes": ["status", ("dataset_name", "status")], @@ -119 +118,0 @@ class SplitJob(Document): - ("dataset_name", "config_name", "split_name"), diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index ac559eb7..b30aedab 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -5 +5 @@ name = "api" -version = "0.1.1" +version = "0.1.2" @@ -9,2 +9,2 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.2-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.2-py3-none-any.whl", develop = false }
bac04dec67dddef40b6e9349bc1004950a768626
Sylvain Lesage
2022-05-31T14:42:13
Respond to datasets-server.huggingface.co (#328)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index cdabd620..76678590 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -19 +19,2 @@ monitoring: -domain: "datasets-server.huggingface.tech" +domain: "datasets-server.huggingface.co" +oldDomain: "datasets-server.huggingface.tech" diff --git a/infra/charts/datasets-server/templates/ingress.yaml b/infra/charts/datasets-server/templates/ingress.yaml index 9d7dc8a6..7df56c8f 100644 --- a/infra/charts/datasets-server/templates/ingress.yaml +++ b/infra/charts/datasets-server/templates/ingress.yaml @@ -21,0 +22,11 @@ spec: + {{- if .Values.oldDomain }} + - host: {{ .Values.oldDomain }} + http: + paths: + - backend: + service: + name: "{{ include "release" . }}-reverse-proxy" + port: + name: http + pathType: ImplementationSpecific + {{- end }} diff --git a/services/api/README.md b/services/api/README.md index 6c063bb0..1c1e0301 100644 --- a/services/api/README.md +++ b/services/api/README.md @@ -48 +48 @@ make watch -Example: https://datasets-server.huggingface.tech/healthcheck +Example: https://datasets-server.huggingface.co/healthcheck @@ -62 +62 @@ Responses: -Example: https://datasets-server.huggingface.tech/cache-reports +Example: https://datasets-server.huggingface.co/cache-reports @@ -132 +132 @@ Beware: a "dataset" is considered valid if it has fetched correctly the configs -Example: https://datasets-server.huggingface.tech/valid +Example: https://datasets-server.huggingface.co/valid @@ -153 +153 @@ Responses: -Example: https://datasets-server.huggingface.tech/is-valid?dataset=glue +Example: https://datasets-server.huggingface.co/is-valid?dataset=glue @@ -175 +175 @@ Responses: -Example: https://datasets-server.huggingface.tech/hf-datasets-count-by-cache-status +Example: https://datasets-server.huggingface.co/hf-datasets-count-by-cache-status @@ -211 +211 @@ The meaning is the following: -Example: https://datasets-server.huggingface.tech/queue-dump +Example: https://datasets-server.huggingface.co/queue-dump @@ -263 +263 @@ Responses: -Example: https://datasets-server.huggingface.tech/queue-dump-waiting-started +Example: https://datasets-server.huggingface.co/queue-dump-waiting-started @@ -291 +291 @@ Responses: -Example: https://datasets-server.huggingface.tech/webhook +Example: https://datasets-server.huggingface.co/webhook @@ -324 +324 @@ MODELS=(amazon_polarity ami arabic_billion_words) -for model in ${MODELS[@]}; do curl -X POST https://datasets-server.huggingface.tech/webhook -H 'Content-Type: application/json' -d '{"update": "datasets/'$model'"}'; done; +for model in ${MODELS[@]}; do curl -X POST https://datasets-server.huggingface.co/webhook -H 'Content-Type: application/json' -d '{"update": "datasets/'$model'"}'; done; @@ -331 +331 @@ for model in ${MODELS[@]}; do curl -X POST https://datasets-server.huggingface.t -Example: https://datasets-server.huggingface.tech/refresh-split +Example: https://datasets-server.huggingface.co/refresh-split @@ -362 +362 @@ Responses: -Example: https://datasets-server.huggingface.tech/hf_datasets +Example: https://datasets-server.huggingface.co/hf_datasets @@ -429 +429 @@ Responses: -Example: https://datasets-server.huggingface.tech/splits?dataset=glue +Example: https://datasets-server.huggingface.co/splits?dataset=glue @@ -479 +479 @@ Note that the value of `"num_bytes"` and `"num_examples"` is set to `null` if th -Example: https://datasets-server.huggingface.tech/rows?dataset=glue&config=ax&split=test +Example: https://datasets-server.huggingface.co/rows?dataset=glue&config=ax&split=test @@ -581 +581 @@ Responses: -Example: https://datasets-server.huggingface.tech/assets/food101/--/default/train/0/image/2885220.jpg +Example: https://datasets-server.huggingface.co/assets/food101/--/default/train/0/image/2885220.jpg @@ -607 +607 @@ Responses: -Example: https://datasets-server.huggingface.tech/metrics +Example: https://datasets-server.huggingface.co/metrics
13f79d5ae2abf1bc8f38ca94b351f923e74eb942
Sylvain Lesage
2022-05-31T13:38:02
feat: 🎸 upgrade dependencies (#322)
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 50af8be9..3935a3db 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -50,2 +50 @@ jobs: - run: poetry run safety check -i 44487 -i 44485 -i 44524 -i 44525 -i 44486 -i 44716 -i 44717 -i 44715 -i 45356 -i 46499 - # ^^ safety exceptions: pillow, numpy + run: poetry run safety check @@ -93,2 +92,4 @@ jobs: - run: poetry run safety check -i 44487 -i 44485 -i 44524 -i 44525 -i 44486 -i 44716 -i 44717 -i 44715 -i 45356 -i 46499 - # ^^ safety exceptions: pillow, numpy + env: + # pillow <9.0.0 + PILLOW_EXCEPTIONS: -i 44525 -i 44524 -i 44486 -i 44485 -i 45356 -i 44487 + run: poetry run safety check $PILLOW_EXCEPTIONS diff --git a/libs/libcache/dist/libcache-0.1.1-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.1-py3-none-any.whl new file mode 100644 index 00000000..87dced16 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.1-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.1.tar.gz b/libs/libcache/dist/libcache-0.1.1.tar.gz new file mode 100644 index 00000000..44929909 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.1.tar.gz differ diff --git a/libs/libcache/poetry.lock b/libs/libcache/poetry.lock index ec149c7f..0eebf46d 100644 --- a/libs/libcache/poetry.lock +++ b/libs/libcache/poetry.lock @@ -400 +400 @@ name = "libutils" -version = "0.1.0" +version = "0.1.1" @@ -413 +413 @@ type = "file" -url = "../libutils/dist/libutils-0.1.0-py3-none-any.whl" +url = "../libutils/dist/libutils-0.1.1-py3-none-any.whl" @@ -1045 +1045 @@ python-versions = "3.9.6" -content-hash = "85783b7dc8797a63458facb68d58f54f70c5d9076d9a3391a84a76fef9dff8dc" +content-hash = "0e1d424c125b2c6d58846771e420eef7a20d8aac60e0dcf92c9cdf6f4a2efaa6" @@ -1299 +1299 @@ libutils = [ - {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, + {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 9a122933..7ba0974c 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -5 +5 @@ name = "libcache" -version = "0.1.0" +version = "0.1.1" @@ -9 +9 @@ appdirs = "^1.4.4" -libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } diff --git a/libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl new file mode 100644 index 00000000..c825f310 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.1.tar.gz b/libs/libqueue/dist/libqueue-0.1.1.tar.gz new file mode 100644 index 00000000..30d8406a Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.1.tar.gz differ diff --git a/libs/libqueue/poetry.lock b/libs/libqueue/poetry.lock index 39768809..213b5cb2 100644 --- a/libs/libqueue/poetry.lock +++ b/libs/libqueue/poetry.lock @@ -392 +392 @@ name = "libutils" -version = "0.1.0" +version = "0.1.1" @@ -405 +405 @@ type = "file" -url = "../libutils/dist/libutils-0.1.0-py3-none-any.whl" +url = "../libutils/dist/libutils-0.1.1-py3-none-any.whl" @@ -1037 +1037 @@ python-versions = "3.9.6" -content-hash = "c3cf49d1e159a5ce73065842523f44f1551b4463c5912edc085b5dbe836f077a" +content-hash = "b0a6fb4304268c8a9b74444928e062ec88a2daa8e3683e3de7e1166fbe586643" @@ -1287 +1287 @@ libutils = [ - {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, + {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index a985841e..e12173c5 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -5 +5 @@ name = "libqueue" -version = "0.1.0" +version = "0.1.1" @@ -8 +8 @@ version = "0.1.0" -libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } diff --git a/libs/libutils/dist/libutils-0.1.1-py3-none-any.whl b/libs/libutils/dist/libutils-0.1.1-py3-none-any.whl new file mode 100644 index 00000000..80357c1c Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.1-py3-none-any.whl differ diff --git a/libs/libutils/dist/libutils-0.1.1.tar.gz b/libs/libutils/dist/libutils-0.1.1.tar.gz new file mode 100644 index 00000000..015488c2 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.1.tar.gz differ diff --git a/libs/libutils/poetry.lock b/libs/libutils/poetry.lock index 92b86126..583ac977 100644 --- a/libs/libutils/poetry.lock +++ b/libs/libutils/poetry.lock @@ -3 +3 @@ name = "anyio" -version = "3.5.0" +version = "3.6.1" @@ -15 +15 @@ doc = ["packaging", "sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] -test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=6.0)", "pytest-mock (>=3.6.1)", "trustme", "contextlib2", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] +test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "contextlib2", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] @@ -42 +42 @@ name = "azure-core" -version = "1.23.1" +version = "1.24.0" @@ -70 +70 @@ name = "azure-storage-blob" -version = "12.11.0" +version = "12.12.0" @@ -77 +77 @@ python-versions = ">=3.6" -azure-core = ">=1.15.0,<2.0.0" +azure-core = ">=1.23.1,<2.0.0" @@ -124 +124 @@ name = "certifi" -version = "2021.10.8" +version = "2022.5.18.1" @@ -128 +128 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -173 +173 @@ name = "coverage" -version = "6.3.2" +version = "6.4" @@ -184 +184 @@ name = "cryptography" -version = "37.0.1" +version = "37.0.2" @@ -261 +261 @@ name = "elasticsearch" -version = "8.1.3" +version = "8.2.0" @@ -457 +457 @@ name = "numpy" -version = "1.22.3" +version = "1.22.4" @@ -525 +525 @@ name = "pbr" -version = "5.8.1" +version = "5.9.0" @@ -635 +635 @@ name = "pyjwt" -version = "2.3.0" +version = "2.4.0" @@ -652 +652 @@ name = "pyparsing" -version = "3.0.8" +version = "3.0.9" @@ -700 +700 @@ name = "python-arango" -version = "7.3.3" +version = "7.3.4" @@ -972,2 +972,2 @@ anyio = [ - {file = "anyio-3.5.0-py3-none-any.whl", hash = "sha256:b5fa16c5ff93fa1046f2eeb5bbff2dad4d3514d6cda61d02816dba34fa8c3c2e"}, - {file = "anyio-3.5.0.tar.gz", hash = "sha256:a0aeffe2fb1fdf374a8e4b471444f0f3ac4fb9f5a5b542b48824475e0042a5a6"}, + {file = "anyio-3.6.1-py3-none-any.whl", hash = "sha256:cb29b9c70620506a9a8f87a309591713446953302d7d995344d0d7c6c0c9a7be"}, + {file = "anyio-3.6.1.tar.gz", hash = "sha256:413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b"}, @@ -984,2 +984,2 @@ azure-core = [ - {file = "azure-core-1.23.1.zip", hash = "sha256:28a01dfbaf0a6812c4e2a82d1642ea30956a9739f25bc77c9b23b91f4ea68f0f"}, - {file = "azure_core-1.23.1-py3-none-any.whl", hash = "sha256:c3e8a9a3ec9d89f59b5d5b2f19d19a30d76a5b5c0cee3788ecad3cb72b9bd028"}, + {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, + {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, @@ -992,2 +992,2 @@ azure-storage-blob = [ - {file = "azure-storage-blob-12.11.0.zip", hash = "sha256:49535b3190bb69d0d9ff7a383246b14da4d2b1bdff60cae5f9173920c67ca7ee"}, - {file = "azure_storage_blob-12.11.0-py3-none-any.whl", hash = "sha256:f3dfa605aefb453e7489328b76811a937a411761d7a1613a58c3975c556ec778"}, + {file = "azure-storage-blob-12.12.0.zip", hash = "sha256:f6daf07d1ca86d189ae15c9b1859dff5b7127bf24a07a4bbe41e0b81e01d62f7"}, + {file = "azure_storage_blob-12.12.0-py3-none-any.whl", hash = "sha256:1eac4c364309ccc193c80ee26c78d25dfbf10926b1309095a448a7a0388526eb"}, @@ -1025,2 +1025,2 @@ certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, @@ -1093,41 +1093,41 @@ coverage = [ - {file = "coverage-6.3.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:9b27d894748475fa858f9597c0ee1d4829f44683f3813633aaf94b19cb5453cf"}, - {file = "coverage-6.3.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:37d1141ad6b2466a7b53a22e08fe76994c2d35a5b6b469590424a9953155afac"}, - {file = "coverage-6.3.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f9987b0354b06d4df0f4d3e0ec1ae76d7ce7cbca9a2f98c25041eb79eec766f1"}, - {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:26e2deacd414fc2f97dd9f7676ee3eaecd299ca751412d89f40bc01557a6b1b4"}, - {file = "coverage-6.3.2-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4dd8bafa458b5c7d061540f1ee9f18025a68e2d8471b3e858a9dad47c8d41903"}, - {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:46191097ebc381fbf89bdce207a6c107ac4ec0890d8d20f3360345ff5976155c"}, - {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:6f89d05e028d274ce4fa1a86887b071ae1755082ef94a6740238cd7a8178804f"}, - {file = "coverage-6.3.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58303469e9a272b4abdb9e302a780072c0633cdcc0165db7eec0f9e32f901e05"}, - {file = "coverage-6.3.2-cp310-cp310-win32.whl", hash = "sha256:2fea046bfb455510e05be95e879f0e768d45c10c11509e20e06d8fcaa31d9e39"}, - {file = "coverage-6.3.2-cp310-cp310-win_amd64.whl", hash = "sha256:a2a8b8bcc399edb4347a5ca8b9b87e7524c0967b335fbb08a83c8421489ddee1"}, - {file = "coverage-6.3.2-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:f1555ea6d6da108e1999b2463ea1003fe03f29213e459145e70edbaf3e004aaa"}, - {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e5f4e1edcf57ce94e5475fe09e5afa3e3145081318e5fd1a43a6b4539a97e518"}, - {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7a15dc0a14008f1da3d1ebd44bdda3e357dbabdf5a0b5034d38fcde0b5c234b7"}, - {file = "coverage-6.3.2-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:21b7745788866028adeb1e0eca3bf1101109e2dc58456cb49d2d9b99a8c516e6"}, - {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:8ce257cac556cb03be4a248d92ed36904a59a4a5ff55a994e92214cde15c5bad"}, - {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b0be84e5a6209858a1d3e8d1806c46214e867ce1b0fd32e4ea03f4bd8b2e3359"}, - {file = "coverage-6.3.2-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:acf53bc2cf7282ab9b8ba346746afe703474004d9e566ad164c91a7a59f188a4"}, - {file = "coverage-6.3.2-cp37-cp37m-win32.whl", hash = "sha256:8bdde1177f2311ee552f47ae6e5aa7750c0e3291ca6b75f71f7ffe1f1dab3dca"}, - {file = "coverage-6.3.2-cp37-cp37m-win_amd64.whl", hash = "sha256:b31651d018b23ec463e95cf10070d0b2c548aa950a03d0b559eaa11c7e5a6fa3"}, - {file = "coverage-6.3.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:07e6db90cd9686c767dcc593dff16c8c09f9814f5e9c51034066cad3373b914d"}, - {file = "coverage-6.3.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2c6dbb42f3ad25760010c45191e9757e7dce981cbfb90e42feef301d71540059"}, - {file = "coverage-6.3.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c76aeef1b95aff3905fb2ae2d96e319caca5b76fa41d3470b19d4e4a3a313512"}, - {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8cf5cfcb1521dc3255d845d9dca3ff204b3229401994ef8d1984b32746bb45ca"}, - {file = "coverage-6.3.2-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8fbbdc8d55990eac1b0919ca69eb5a988a802b854488c34b8f37f3e2025fa90d"}, - {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ec6bc7fe73a938933d4178c9b23c4e0568e43e220aef9472c4f6044bfc6dd0f0"}, - {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:9baff2a45ae1f17c8078452e9e5962e518eab705e50a0aa8083733ea7d45f3a6"}, - {file = "coverage-6.3.2-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:fd9e830e9d8d89b20ab1e5af09b32d33e1a08ef4c4e14411e559556fd788e6b2"}, - {file = "coverage-6.3.2-cp38-cp38-win32.whl", hash = "sha256:f7331dbf301b7289013175087636bbaf5b2405e57259dd2c42fdcc9fcc47325e"}, - {file = "coverage-6.3.2-cp38-cp38-win_amd64.whl", hash = "sha256:68353fe7cdf91f109fc7d474461b46e7f1f14e533e911a2a2cbb8b0fc8613cf1"}, - {file = "coverage-6.3.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b78e5afb39941572209f71866aa0b206c12f0109835aa0d601e41552f9b3e620"}, - {file = "coverage-6.3.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4e21876082ed887baed0146fe222f861b5815455ada3b33b890f4105d806128d"}, - {file = "coverage-6.3.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:34626a7eee2a3da12af0507780bb51eb52dca0e1751fd1471d0810539cefb536"}, - {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1ebf730d2381158ecf3dfd4453fbca0613e16eaa547b4170e2450c9707665ce7"}, - {file = "coverage-6.3.2-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dd6fe30bd519694b356cbfcaca9bd5c1737cddd20778c6a581ae20dc8c04def2"}, - {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:96f8a1cb43ca1422f36492bebe63312d396491a9165ed3b9231e778d43a7fca4"}, - {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:dd035edafefee4d573140a76fdc785dc38829fe5a455c4bb12bac8c20cfc3d69"}, - {file = "coverage-6.3.2-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:5ca5aeb4344b30d0bec47481536b8ba1181d50dbe783b0e4ad03c95dc1296684"}, - {file = "coverage-6.3.2-cp39-cp39-win32.whl", hash = "sha256:f5fa5803f47e095d7ad8443d28b01d48c0359484fec1b9d8606d0e3282084bc4"}, - {file = "coverage-6.3.2-cp39-cp39-win_amd64.whl", hash = "sha256:9548f10d8be799551eb3a9c74bbf2b4934ddb330e08a73320123c07f95cc2d92"}, - {file = "coverage-6.3.2-pp36.pp37.pp38-none-any.whl", hash = "sha256:18d520c6860515a771708937d2f78f63cc47ab3b80cb78e86573b0a760161faf"}, - {file = "coverage-6.3.2.tar.gz", hash = "sha256:03e2a7826086b91ef345ff18742ee9fc47a6839ccd517061ef8fa1976e652ce9"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, @@ -1136,22 +1136,22 @@ cryptography = [ - {file = "cryptography-37.0.1-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:74b55f67f4cf026cb84da7a1b04fc2a1d260193d4ad0ea5e9897c8b74c1e76ac"}, - {file = "cryptography-37.0.1-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:0db5cf21bd7d092baacb576482b0245102cea2d3cf09f09271ce9f69624ecb6f"}, - {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:faf0f5456c059c7b1c29441bdd5e988f0ba75bdc3eea776520d8dcb1e30e1b5c"}, - {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:06bfafa6e53ccbfb7a94be4687b211a025ce0625e3f3c60bb15cd048a18f3ed8"}, - {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bf585476fcbcd37bed08072e8e2db3954ce1bfc68087a2dc9c19cfe0b90979ca"}, - {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d4daf890e674d191757d8d7d60dc3a29c58c72c7a76a05f1c0a326013f47e8b"}, - {file = "cryptography-37.0.1-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:ae1cd29fbe6b716855454e44f4bf743465152e15d2d317303fe3b58ee9e5af7a"}, - {file = "cryptography-37.0.1-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:451aaff8b8adf2dd0597cbb1fdcfc8a7d580f33f843b7cce75307a7f20112dd8"}, - {file = "cryptography-37.0.1-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:1858eff6246bb8bbc080eee78f3dd1528739e3f416cba5f9914e8631b8df9871"}, - {file = "cryptography-37.0.1-cp36-abi3-win32.whl", hash = "sha256:e69a0e36e62279120e648e787b76d79b41e0f9e86c1c636a4f38d415595c722e"}, - {file = "cryptography-37.0.1-cp36-abi3-win_amd64.whl", hash = "sha256:a18ff4bfa9d64914a84d7b06c46eb86e0cc03113470b3c111255aceb6dcaf81d"}, - {file = "cryptography-37.0.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cce90609e01e1b192fae9e13665058ab46b2ea53a3c05a3ea74a3eb8c3af8857"}, - {file = "cryptography-37.0.1-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:c4a58eeafbd7409054be41a377e726a7904a17c26f45abf18125d21b1215b08b"}, - {file = "cryptography-37.0.1-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:618391152147a1221c87b1b0b7f792cafcfd4b5a685c5c72eeea2ddd29aeceff"}, - {file = "cryptography-37.0.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7ceae26f876aabe193b13a0c36d1bb8e3e7e608d17351861b437bd882f617e9f"}, - {file = "cryptography-37.0.1-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:930b829e8a2abaf43a19f38277ae3c5e1ffcf547b936a927d2587769ae52c296"}, - {file = "cryptography-37.0.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:58021d6e9b1d88b1105269d0da5e60e778b37dfc0e824efc71343dd003726831"}, - {file = "cryptography-37.0.1-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:b1ee5c82cf03b30f6ae4e32d2bcb1e167ef74d6071cbb77c2af30f101d0b360b"}, - {file = "cryptography-37.0.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f095988548ec5095e3750cdb30e6962273d239b1998ba1aac66c0d5bee7111c1"}, - {file = "cryptography-37.0.1-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:125702572be12bcd318e3a14e9e70acd4be69a43664a75f0397e8650fe3c6cc3"}, - {file = "cryptography-37.0.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:315af6268de72bcfa0bb3401350ce7d921f216e6b60de12a363dad128d9d459f"}, - {file = "cryptography-37.0.1.tar.gz", hash = "sha256:d610d0ee14dd9109006215c7c0de15eee91230b70a9bce2263461cf7c3720b83"}, + {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181"}, + {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178"}, + {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a"}, + {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15"}, + {file = "cryptography-37.0.2-cp36-abi3-win32.whl", hash = "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0"}, + {file = "cryptography-37.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d"}, + {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9"}, + {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452"}, + {file = "cryptography-37.0.2.tar.gz", hash = "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e"}, @@ -1175,2 +1175,2 @@ elasticsearch = [ - {file = "elasticsearch-8.1.3-py3-none-any.whl", hash = "sha256:d092f4a0d3f4228753cd06d4f70438aec101e13206b31425910d807ec23f232b"}, - {file = "elasticsearch-8.1.3.tar.gz", hash = "sha256:70d4ab4a4dcfc2631aaaf58853984b3e7658b85a490f4d2d2c657e91437bb620"}, + {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, + {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, @@ -1258,20 +1258,22 @@ numpy = [ - {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"}, - {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, - {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, - {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"}, - {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"}, - {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"}, - {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"}, - {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"}, - {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"}, - {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, + {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, + {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, + {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, + {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, + {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, + {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, + {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, + {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, @@ -1349,2 +1351,2 @@ pbr = [ - {file = "pbr-5.8.1-py2.py3-none-any.whl", hash = "sha256:27108648368782d07bbf1cb468ad2e2eeef29086affd14087a6d04b7de8af4ec"}, - {file = "pbr-5.8.1.tar.gz", hash = "sha256:66bc5a34912f408bb3925bf21231cb6f59206267b7f63f3503ef865c1a292e25"}, + {file = "pbr-5.9.0-py2.py3-none-any.whl", hash = "sha256:e547125940bcc052856ded43be8e101f63828c2d94239ffbe2b327ba3d5ccf0a"}, + {file = "pbr-5.9.0.tar.gz", hash = "sha256:e8dca2f4b43560edef58813969f52a56cef023146cbb8931626db80e6c1c4308"}, @@ -1388,2 +1390,2 @@ pyjwt = [ - {file = "PyJWT-2.3.0-py3-none-any.whl", hash = "sha256:e0c4bb8d9f0af0c7f5b1ec4c5036309617d03d56932877f2f7a0beeb5318322f"}, - {file = "PyJWT-2.3.0.tar.gz", hash = "sha256:b888b4d56f06f6dcd777210c334e69c737be74755d3e5e9ee3fe67dc18a0ee41"}, + {file = "PyJWT-2.4.0-py3-none-any.whl", hash = "sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf"}, + {file = "PyJWT-2.4.0.tar.gz", hash = "sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba"}, @@ -1392,2 +1394,2 @@ pyparsing = [ - {file = "pyparsing-3.0.8-py3-none-any.whl", hash = "sha256:ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06"}, - {file = "pyparsing-3.0.8.tar.gz", hash = "sha256:7bf433498c016c4314268d95df76c81b842a4cb2b276fa3312cfb1e1d85f6954"}, + {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, + {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, @@ -1404,2 +1406,2 @@ python-arango = [ - {file = "python-arango-7.3.3.tar.gz", hash = "sha256:0a784594b3a49d894386c36df66c1e1e0d24b94f4295be15179555d6031868fa"}, - {file = "python_arango-7.3.3-py3-none-any.whl", hash = "sha256:6242107da661f5efe0304aa30bcd08d0be6f28c0c9bfca278c76443551977056"}, + {file = "python-arango-7.3.4.tar.gz", hash = "sha256:0725a453d46996396e4740e84ead32b36186e853a545044411fb7f624a1b71b3"}, + {file = "python_arango-7.3.4-py3-none-any.whl", hash = "sha256:e5e433b18bec8295e3e92a10f249de327b1a980e7ab9b1c38a5e5482b1e144e9"}, diff --git a/libs/libutils/pyproject.toml b/libs/libutils/pyproject.toml index f18195bd..018ff737 100644 --- a/libs/libutils/pyproject.toml +++ b/libs/libutils/pyproject.toml @@ -5 +5 @@ name = "libutils" -version = "0.1.0" +version = "0.1.1" diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 7cdbb93e..c10d9477 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -437 +437 @@ name = "libcache" -version = "0.1.0" +version = "0.1.1" @@ -445 +445 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.0" +libutils = "0.1.1" @@ -452 +452 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl" @@ -456 +456 @@ name = "libqueue" -version = "0.1.0" +version = "0.1.1" @@ -463 +463 @@ python-versions = "==3.9.6" -libutils = "0.1.0" +libutils = "0.1.1" @@ -470 +470 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl" @@ -474 +474 @@ name = "libutils" -version = "0.1.0" +version = "0.1.1" @@ -487 +487 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl" @@ -1130 +1130 @@ python-versions = "3.9.6" -content-hash = "3b28f7a5e31b598d5329fd799bf72133fc88a02d85ea8819fdb2cd0ceb7056f6" +content-hash = "9aa47ad13853d4b54606af2cdbc0c4f2c24daf727d567623fc475383dd29d3df" @@ -1392 +1392 @@ libcache = [ - {file = "libcache-0.1.0-py3-none-any.whl", hash = "sha256:49e180ec7a334f2e886bf8628f7ddcb222dfd705e97a85611f1519bda1bc01ed"}, + {file = "libcache-0.1.1-py3-none-any.whl", hash = "sha256:40e7ae95c00d2213bdc4f80091a33367cc86c34ebccc787250e68ab9d0ff291e"}, @@ -1395 +1395 @@ libqueue = [ - {file = "libqueue-0.1.0-py3-none-any.whl", hash = "sha256:dfdffd63426b9866933ef61924b61a984e211419f6d10b11f2da0c9d724b8e91"}, + {file = "libqueue-0.1.1-py3-none-any.whl", hash = "sha256:50a690a0cbfc157a36ec19c1ce343a8f0b1b3a060e93c3f566c415eba8e225f9"}, @@ -1398 +1398 @@ libutils = [ - {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, + {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index 971f9f84..5b95a14c 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -5 +5 @@ name = "admin" -version = "0.1.0" +version = "0.1.1" @@ -9,3 +9,3 @@ huggingface-hub = "^0.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } diff --git a/services/api/poetry.lock b/services/api/poetry.lock index b550d62b..9ce61fd4 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -455 +455 @@ name = "libcache" -version = "0.1.0" +version = "0.1.1" @@ -463 +463 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.0" +libutils = "0.1.1" @@ -470 +470 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl" @@ -474 +474 @@ name = "libqueue" -version = "0.1.0" +version = "0.1.1" @@ -481 +481 @@ python-versions = "==3.9.6" -libutils = "0.1.0" +libutils = "0.1.1" @@ -488 +488 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl" @@ -492 +492 @@ name = "libutils" -version = "0.1.0" +version = "0.1.1" @@ -505 +505 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl" @@ -1201 +1201 @@ python-versions = "3.9.6" -content-hash = "38cac9920159b874586cf14f34a3b719df7c3b4eafff1eb373f4bcf01d818024" +content-hash = "494ebc3a450694159b51d2ed1fb604c6d2f1b240641007bfd2149429f4f96b1d" @@ -1471 +1471 @@ libcache = [ - {file = "libcache-0.1.0-py3-none-any.whl", hash = "sha256:49e180ec7a334f2e886bf8628f7ddcb222dfd705e97a85611f1519bda1bc01ed"}, + {file = "libcache-0.1.1-py3-none-any.whl", hash = "sha256:40e7ae95c00d2213bdc4f80091a33367cc86c34ebccc787250e68ab9d0ff291e"}, @@ -1474 +1474 @@ libqueue = [ - {file = "libqueue-0.1.0-py3-none-any.whl", hash = "sha256:dfdffd63426b9866933ef61924b61a984e211419f6d10b11f2da0c9d724b8e91"}, + {file = "libqueue-0.1.1-py3-none-any.whl", hash = "sha256:50a690a0cbfc157a36ec19c1ce343a8f0b1b3a060e93c3f566c415eba8e225f9"}, @@ -1477 +1477 @@ libutils = [ - {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, + {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 9b004852..ac559eb7 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -5 +5 @@ name = "api" -version = "0.1.0" +version = "0.1.1" @@ -9,3 +9,3 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } diff --git a/services/worker/Makefile b/services/worker/Makefile index 445fff07..734a8d4b 100644 --- a/services/worker/Makefile +++ b/services/worker/Makefile @@ -0,0 +1,4 @@ +# pillow <9.0.0 +PILLOW_EXCEPTIONS:= -i 44525 -i 44524 -i 44486 -i 44485 -i 45356 -i 44487 +SAFETY_EXCEPTIONS := $(PILLOW_EXCEPTIONS) + diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index 62f2dae8..f9f63c29 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -284 +284 @@ name = "cachetools" -version = "5.1.0" +version = "5.2.0" @@ -376,2 +376,2 @@ name = "crc32c" -version = "2.2.post0" -description = "A python package implementing the crc32c algorithmin hardware and software" +version = "2.3" +description = "A python package implementing the crc32c algorithm in hardware and software" @@ -438 +438 @@ benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "tr -dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] +dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] @@ -444 +444 @@ tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] @@ -601 +601 @@ name = "flatbuffers" -version = "2.0" +version = "1.12" @@ -680 +680 @@ name = "gast" -version = "0.5.3" +version = "0.4.0" @@ -936 +936 @@ name = "keras" -version = "2.8.0" +version = "2.9.0" @@ -969 +969 @@ name = "libcache" -version = "0.1.0" +version = "0.1.1" @@ -977 +977 @@ appdirs = ">=1.4.4,<2.0.0" -libutils = "0.1.0" +libutils = "0.1.1" @@ -984 +984 @@ type = "file" -url = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl" +url = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl" @@ -996 +996 @@ name = "libqueue" -version = "0.1.0" +version = "0.1.1" @@ -1003 +1003 @@ python-versions = "==3.9.6" -libutils = "0.1.0" +libutils = "0.1.1" @@ -1010 +1010 @@ type = "file" -url = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl" +url = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl" @@ -1040 +1040 @@ name = "libutils" -version = "0.1.0" +version = "0.1.1" @@ -1053 +1053 @@ type = "file" -url = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl" +url = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl" @@ -1489 +1489 @@ name = "protobuf" -version = "3.20.1" +version = "3.19.4" @@ -1493 +1493 @@ optional = false -python-versions = ">=3.7" +python-versions = ">=3.5" @@ -2091 +2091 @@ name = "tensorboard" -version = "2.8.0" +version = "2.9.0" @@ -2104 +2104 @@ numpy = ">=1.12.0" -protobuf = ">=3.6.0" +protobuf = ">=3.9.2" @@ -2108 +2108 @@ tensorboard-plugin-wit = ">=1.6.0" -werkzeug = ">=0.11.15" +werkzeug = ">=1.0.1" @@ -2128 +2128 @@ name = "tensorflow" -version = "2.8.0" +version = "2.9.1" @@ -2132 +2132 @@ optional = false -python-versions = "*" +python-versions = ">=3.7" @@ -2135 +2135 @@ python-versions = "*" -absl-py = ">=0.4.0" +absl-py = ">=1.0.0" @@ -2137,2 +2137,2 @@ astunparse = ">=1.6.0" -flatbuffers = ">=1.12" -gast = ">=0.2.1" +flatbuffers = ">=1.12,<2" +gast = ">=0.2.1,<=0.4.0" @@ -2142 +2142 @@ h5py = ">=2.9.0" -keras = ">=2.8.0rc0,<2.9" +keras = ">=2.9.0rc0,<2.10.0" @@ -2144 +2144 @@ keras-preprocessing = ">=1.1.1" -libclang = ">=9.0.1" +libclang = ">=13.0.0" @@ -2147 +2147,2 @@ opt-einsum = ">=2.3.2" -protobuf = ">=3.9.2" +packaging = "*" +protobuf = ">=3.9.2,<3.20" @@ -2149 +2150,2 @@ six = ">=1.12.0" -tensorboard = ">=2.8,<2.9" +tensorboard = ">=2.9,<2.10" +tensorflow-estimator = ">=2.9.0rc0,<2.10.0" @@ -2152 +2153,0 @@ termcolor = ">=1.1.0" -tf-estimator-nightly = "2.8.0.dev2021122109" @@ -2155,0 +2157,8 @@ wrapt = ">=1.11.0" +[[package]] +name = "tensorflow-estimator" +version = "2.9.0" +description = "TensorFlow Estimator." +category = "main" +optional = false +python-versions = ">=3.7" + @@ -2187,8 +2195,0 @@ python-versions = "*" -[[package]] -name = "tf-estimator-nightly" -version = "2.8.0.dev2021122109" -description = "TensorFlow Estimator." -category = "main" -optional = false -python-versions = "*" - @@ -2533 +2534 @@ python-versions = "3.9.6" -content-hash = "ea9779538ca8dfee03bfc206583eef359f38a90f519cfb102f6b7e6d933c632c" +content-hash = "44593aeafa3189109418ece8e79540506455aa93a665897bbe755424030937c1" @@ -2802,2 +2803,2 @@ cachetools = [ - {file = "cachetools-5.1.0-py3-none-any.whl", hash = "sha256:4ebbd38701cdfd3603d1f751d851ed248ab4570929f2d8a7ce69e30c420b141c"}, - {file = "cachetools-5.1.0.tar.gz", hash = "sha256:8b3b8fa53f564762e5b221e9896798951e7f915513abf2ba072ce0f07f3f5a98"}, + {file = "cachetools-5.2.0-py3-none-any.whl", hash = "sha256:f9f17d2aec496a9aa6b76f53e3b614c965223c061982d434d160f930c698a9db"}, + {file = "cachetools-5.2.0.tar.gz", hash = "sha256:6a94c6402995a99c3970cc7e4884bb60b4a8639938157eeed436098bf9831757"}, @@ -2928,61 +2929,67 @@ crc32c = [ - {file = "crc32c-2.2.post0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:67f45df0a21d3efeea2875098466c23248bf2f9ed1eefd487a74c44f87f8f542"}, - {file = "crc32c-2.2.post0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:1a1b91448eed19d210eb47e3b2a5f25a05c0c1880ad5a4a8b73bc2d74b597869"}, - {file = "crc32c-2.2.post0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:762e0f149d722d544d097dd43e00c0040116130d49345daa9d923c899bcea2b0"}, - {file = "crc32c-2.2.post0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:364d3c7a5d3e6ad592c01d781ad74d810303892a730f2e071a0abb7953c35f68"}, - {file = "crc32c-2.2.post0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:28eb6732020e3eb498702ea350159bebf79a96f1ebde12e4489cb087b408781d"}, - {file = "crc32c-2.2.post0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:69fed9a5781c931c43613cf1e011217cb3ac53a728d41bf557f368e007cfebac"}, - {file = "crc32c-2.2.post0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:945399dca5df68db90a5a63d3b05527c9058435720f213beabd805b4447d6f4e"}, - {file = "crc32c-2.2.post0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:ad737c928f01361ff29a9ab23adce6da109093a334e47c9a507caaee0c953f65"}, - {file = "crc32c-2.2.post0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:ea98089bb706d4e070ac841abd0555dc741ac331c1c779e7d89e3061f8dc0d15"}, - {file = "crc32c-2.2.post0-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:e07c8324908c258820bd38c4b05fc3f4e58b45edd4e71b2341b4eef8cfa0a2fd"}, - {file = "crc32c-2.2.post0-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:b5d332f5825920074868407ab3b9751521fc160716f47e92b93680931f235650"}, - {file = "crc32c-2.2.post0-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:4498fb95c48b2a2ab61974b65ec67730085fd58baf379e8373a50d8cf8042f6f"}, - {file = "crc32c-2.2.post0-cp35-cp35m-manylinux2010_i686.whl", hash = "sha256:3cb208d6a1541cdfadd6ff9c719e51fb9a4800289fd901718d0dee2f6da4eb54"}, - {file = "crc32c-2.2.post0-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:3fec7da0d62d9e7461a73dbfd1064fdb42094cceba793d81d20cb568b7f33445"}, - {file = "crc32c-2.2.post0-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:5eb70b6d91b2c4cbaf5b61e4951d04967703704e247bf42b2eba6c79c6cb3eac"}, - {file = "crc32c-2.2.post0-cp35-cp35m-win32.whl", hash = "sha256:e3327496b1f671357f7d8d7637cd73c0e48770b9228694109ae844a6c67efdb9"}, - {file = "crc32c-2.2.post0-cp35-cp35m-win_amd64.whl", hash = "sha256:966e069d7d9e5d87d00e6b0a14b6e5715940002a55839e0272df10e53f9be5f2"}, - {file = "crc32c-2.2.post0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:71cf48bd0461d35465a79491058abdf5243453046375cee1fce62dc87c12da18"}, - {file = "crc32c-2.2.post0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:6bdcfefc43406afe27e2015fe1b959378eb44a7b498b12bfa0d1e41436e1fe42"}, - {file = "crc32c-2.2.post0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:a1b0c8edb20f0d2a942341cb591826360991cbcc53364d7083595386adeeba04"}, - {file = "crc32c-2.2.post0-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:4048370db1890245fa601dfa1b41f6c4a06c02b95d15e1e20ccd2c4b41c7e3e7"}, - {file = "crc32c-2.2.post0-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:b36a1cb1de66efc0211cc41bfd0e95410e333f3ca167eb0fff4db599a597dd6c"}, - {file = "crc32c-2.2.post0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:de97cc65a6765741194e5f26055dbe4976498fd0082783d1c5e80bd7ce6c5a1b"}, - {file = "crc32c-2.2.post0-cp36-cp36m-win32.whl", hash = "sha256:36786a4482c14e1f3b073e31cf50031009088c115e5bb3022eea4ef2506bbdbb"}, - {file = "crc32c-2.2.post0-cp36-cp36m-win_amd64.whl", hash = "sha256:3c430d64da293bf4cd00b8c6252f40944050c6581150e1a2e483546e95bb87d9"}, - {file = "crc32c-2.2.post0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a45e1a35d664a730f166a7e634385c3be0126aba2366c94f5960790ae21f10cb"}, - {file = "crc32c-2.2.post0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:1c409c147e0bee644ae0586540cc1332d9b3421f196f3d57361ab3dd61318724"}, - {file = "crc32c-2.2.post0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:6c14f2aa3ee5c3ec746731392781826537730c351fdd769d814cd86dd9577bda"}, - {file = "crc32c-2.2.post0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:da84bdf61a9302854c939cb7c9b3885980cf1f98a789048f55fd00aea2acb156"}, - {file = "crc32c-2.2.post0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:1e149d6c44e04bf2edb5c677cf294b12fea431df0c37e9d4d90ad9acc2358864"}, - {file = "crc32c-2.2.post0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:fbb4afa4d6c6ee5205c8a5d9a4722c27a47e1035b34562f7aefc4408c0a94088"}, - {file = "crc32c-2.2.post0-cp37-cp37m-win32.whl", hash = "sha256:04804688634dce8691e7e0b2aecead339f2be15f4c0997fdb92c2a1d79ade826"}, - {file = "crc32c-2.2.post0-cp37-cp37m-win_amd64.whl", hash = "sha256:5faa1c72c5688581ebd71946f34dd937777cdcb59c4e5500a7f61e038b9e7cdc"}, - {file = "crc32c-2.2.post0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:98e1a8907797519e187e5461bcc97b3180977439f77c5d416b51dbfa5fe7bb6b"}, - {file = "crc32c-2.2.post0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:f82b1848956796fdfbfd9296f858f109aebacaea0b344cbd5708a0a54a668759"}, - {file = "crc32c-2.2.post0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:ed5b2097257213bb34a9d9c9160e86980a0c378cd0e70febadec9841d7f93380"}, - {file = "crc32c-2.2.post0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:32cbaea35b37bc4a88f4c4d84ecc3d1c6cfa04f12d49130d36c6e3b11b13f2f7"}, - {file = "crc32c-2.2.post0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:0ecb5be3eaaa6c6f14d1f7584b6e828a68f5f633c46e2ea30ab0307922ac496a"}, - {file = "crc32c-2.2.post0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:3ea5714e6bbb3d03adec83c68f85b2ac67a01461b8131ff3065c6312c52e17b0"}, - {file = "crc32c-2.2.post0-cp38-cp38-win32.whl", hash = "sha256:213bdf9e982a287c067f5542a6024e576bfa116b136c3d26cbc10aa133fb4f9c"}, - {file = "crc32c-2.2.post0-cp38-cp38-win_amd64.whl", hash = "sha256:b6828dab82609659bf3bcef9e0cbf6aac11c5d243e7ebcff6516df965ee889cf"}, - {file = "crc32c-2.2.post0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f9cf12a0eaeb151a569670065374b318f1af355c15261c9a74f03a19306ac677"}, - {file = "crc32c-2.2.post0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:0f6e7ce03fd6104b1f9b9a427eb26fa0eb88cafd7faf5ae0d7f4d2fa35d34242"}, - {file = "crc32c-2.2.post0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:b47e710c1a35f785323a73f28a91e4da312f6f806d1e3bce62f60a35937af05a"}, - {file = "crc32c-2.2.post0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:fa812a49462e26a600877e0af4ca719a3bc4e85e986d34336d7abc1d0641b37c"}, - {file = "crc32c-2.2.post0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:9b3cf77fde6bd2e88423c248f0d35d2549115e9548b0e5a04ee53306a0a39296"}, - {file = "crc32c-2.2.post0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:fa7392a2c159805ef9d6711dd3090628d567a8fb349e81019cff48f4caeeaa36"}, - {file = "crc32c-2.2.post0-cp39-cp39-win32.whl", hash = "sha256:078cbe11f48e3ace4bb01fe9fa6ef00becb4016ff71b0de3fe794ad0511cff8a"}, - {file = "crc32c-2.2.post0-cp39-cp39-win_amd64.whl", hash = "sha256:0f5284371a0a8eb178ee8dbc157ae1e40cddce2c04719ad8bc2e162a1c37831c"}, - {file = "crc32c-2.2.post0-pp27-pypy_73-macosx_10_9_x86_64.whl", hash = "sha256:0a7bbffaebb8bd91b5039965ef0bc23383dee5078e98e5799de88c75d94f88ca"}, - {file = "crc32c-2.2.post0-pp27-pypy_73-manylinux1_x86_64.whl", hash = "sha256:7dad7f0ad3ea71e1e74be29b3312d6902774ef3e91510b0b2bdcd4b612b7797e"}, - {file = "crc32c-2.2.post0-pp27-pypy_73-manylinux2010_x86_64.whl", hash = "sha256:ad4de5af5494892ba40c73d32337eebf407760dcd25cb94d949dd9b98b662f8c"}, - {file = "crc32c-2.2.post0-pp36-pypy36_pp73-macosx_10_9_x86_64.whl", hash = "sha256:9ecf707b09c1f3cb3d4a082ad8912e14175b99b4644fd1069106b4727c179903"}, - {file = "crc32c-2.2.post0-pp36-pypy36_pp73-manylinux1_x86_64.whl", hash = "sha256:c69f1e0c6e70927395fdcbfda5f7bed9408cf453c57b609e4b40b04079d86f1f"}, - {file = "crc32c-2.2.post0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:cae9c893ec0eb67f09923a37b40c07eec3f0adfb70bc795276d9fff03b21488e"}, - {file = "crc32c-2.2.post0-pp36-pypy36_pp73-win32.whl", hash = "sha256:43b50ca2ab32267136e5b9e92cb756abb327480d0d477583d0322f10b86dd630"}, - {file = "crc32c-2.2.post0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:b3da5d99a8adf07bab4366a94830bad08cb0f4177e483d8bb9e61b157607341d"}, - {file = "crc32c-2.2.post0-pp37-pypy37_pp73-manylinux1_x86_64.whl", hash = "sha256:0a250a257292ed0eb1156a6e0898409f5fdf723314261b8d74fbe52302d232af"}, - {file = "crc32c-2.2.post0-pp37-pypy37_pp73-manylinux2010_x86_64.whl", hash = "sha256:b6e99e9a93c968b7aedca3e1486c9e6cf57e14516c8316af46e9327f003d66f2"}, - {file = "crc32c-2.2.post0-pp37-pypy37_pp73-win32.whl", hash = "sha256:262b24d51b28bb81e35d6d120d0b440d5a55fda730ced2aff5a9bdd564091397"}, - {file = "crc32c-2.2.post0.tar.gz", hash = "sha256:3d058e7a5e37e4985d1a7ad4cb702bca56b490daa658d4851377d13ead8b435e"}, + {file = "crc32c-2.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:82942ed343e5c884b5c0c9aa6bb5bb47de0247df95ce5d154cc48744d5c2ffd4"}, + {file = "crc32c-2.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f641a9bd24a309637cca6c119b8aabdfe6d41bab5ea630124ee9be7891e36ba1"}, + {file = "crc32c-2.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:374d288cc1735932276bc65670db329dd9fe2af4ec323599dc40e1212b13985e"}, + {file = "crc32c-2.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b7c71a3ae1511c42b7919e6116560c08ba89479ea249f281c5bfba2b619411d"}, + {file = "crc32c-2.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f524fd202472d041b9bddb4a51b5fff28767a9c69953dbcdeecc67ef65707c07"}, + {file = "crc32c-2.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9a070dbe10dac29c2f591a59300c37448e3c7a747b6ea18d4826b7c94a956bd"}, + {file = "crc32c-2.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:8ab9df0bd9bf10f3d5bd346321d48da8a28392b1f48f7a6fa3234acebe6ee448"}, + {file = "crc32c-2.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:8948a9262d36e2aad3be74aac3ce7a1b090ab2361f7619b3f23418fa536f1b25"}, + {file = "crc32c-2.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:865bf66d86809971d4856e38085a4a15a7251b8e780f22ad52e12b50784dac25"}, + {file = "crc32c-2.3-cp310-cp310-win32.whl", hash = "sha256:e14f4d57e004fa5a6100ea3aeb9574bee6f95965a96a382154fa40aee1fdeb5e"}, + {file = "crc32c-2.3-cp310-cp310-win_amd64.whl", hash = "sha256:ca03d8d5b35a26e0d3eb8c7121de3e37a59042735029eabcf1c4b15343f82cdd"}, + {file = "crc32c-2.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:5612be1606eec55511ade38deec40c9f1c7647ec0407a4031e0a2e6e6a635f27"}, + {file = "crc32c-2.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4ab21f02c13dc5a0411838d0709cb4d24bcb865ea28b683b7403826c08d14e27"}, + {file = "crc32c-2.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0c1f3e28b8aec8a0f7727337fafa31f0ace38e59e054c51fecb923535c6dc6e6"}, + {file = "crc32c-2.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed14214fcc1416e0dc63be4c88aad7f58e0f0cb2c22d578b861e8fc19d1b2d2f"}, + {file = "crc32c-2.3-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:1d334d51d395f78fb649e8442341da782e63d3f9552fcfbc040995d24d4b794d"}, + {file = "crc32c-2.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:5ddf91756d6275f497d0895b8875d1f1fdac6be08a5900f4123ede2c91cd1422"}, + {file = "crc32c-2.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:5aa6383c0a13a542c3f1eb82a02e29c1141e0a2bc63faedd0062d1c41649989f"}, + {file = "crc32c-2.3-cp36-cp36m-win32.whl", hash = "sha256:ef1165f7f36edaae03fcf03f1ca3bdbf196a5255d656bfb17959ba0405a2c8ee"}, + {file = "crc32c-2.3-cp36-cp36m-win_amd64.whl", hash = "sha256:f1679f7f700f2aec3dbee4e357a2fdde53e2ec151dde4e0b52a9205fac273a90"}, + {file = "crc32c-2.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c04a27ba3cbc7a9e34c77f402bd3a83442a2c7acd3897d2539b1a3321ed28a6a"}, + {file = "crc32c-2.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a51ac079c44297bbf624a598cffe6f85bd0a5faf780fd75d2d5e531d42d427ef"}, + {file = "crc32c-2.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7eb1fea3d9ec71f353a6c38648d074e722fff1f43c1998ae6088dbee324a1ca6"}, + {file = "crc32c-2.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b917b73d810bcdbcd1461978ba55038dcf2bbc3b56704b0082d2f9b0d5edc7ad"}, + {file = "crc32c-2.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0369e637d13db5c06e45a34b069ff2ba292ac881e8a44a8658ccf3edaa9c392f"}, + {file = "crc32c-2.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:47088e524a9ec2887ae0ec519d75df40f005debf9d52f10e688f27e7cc0d339c"}, + {file = "crc32c-2.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:fddf16ed92dcb8ee34a12bd0757d5719d3c750a9dc813d82972477885b114339"}, + {file = "crc32c-2.3-cp37-cp37m-win32.whl", hash = "sha256:3f372a53e9cf2464421b82b41fb66d98f654284c8fc4363f51bb0f5485fdc2b4"}, + {file = "crc32c-2.3-cp37-cp37m-win_amd64.whl", hash = "sha256:4d223e844ee61ac492f0197b62ccc2a9c23db15e4d2938e698fec6eded0daf15"}, + {file = "crc32c-2.3-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:4323f56908b7e5cea039122aad039fcf750974b09e4f993244d4dddb24cab561"}, + {file = "crc32c-2.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fac1b4248625acd65985378f6b34a00b73cfc9db5b8ccc73101744de2e3dfa66"}, + {file = "crc32c-2.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:9ce72a40c17636af97e37bad2f2c11a2e740f57d4051ef586c04d1aa83db8b38"}, + {file = "crc32c-2.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:dd9bc7e5599f5970fff1f9aa551639336a76d1bb1fb00f0b87704049df8ba035"}, + {file = "crc32c-2.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:682974e2cfb199ebc4adc5eb4d493dbcf83812a031a8ecccae5a7b5bcade5d9f"}, + {file = "crc32c-2.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:255e35719c252ce7609cb3f1c5a045783a6e0d6d7b035d507ddd82d5194c236a"}, + {file = "crc32c-2.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:df19ab6ab3884a237388c7720b1fe617dd4893305f62383d0f96fc7980dfdf7c"}, + {file = "crc32c-2.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:61479a60d5a2b3160a4ae17b37df119963a741fd61ca71d4792670cdf7d7ea41"}, + {file = "crc32c-2.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e6e16d57b8103fee9fdecb38e908d9ceb70d2196bb932dba64bf7b570f44c0b9"}, + {file = "crc32c-2.3-cp38-cp38-win32.whl", hash = "sha256:ad83e4c78379cc3e22b760e9874bc57f91a9cfb85107ccba1c6442bc1a2e2a1c"}, + {file = "crc32c-2.3-cp38-cp38-win_amd64.whl", hash = "sha256:32c573dd861933e2390932cc10e1b78d71ee7827ee4dfcec96e23cf007a1a6d3"}, + {file = "crc32c-2.3-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:ad57917650af59c989b62184fc4604d6c5066fc030ced4c6e07a596000f1ab86"}, + {file = "crc32c-2.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5e076ae46ac0e4e28eb43932c5c0b8e1b8751bb7d1b0d239f18230aed7cca3bf"}, + {file = "crc32c-2.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:896bda76db13f229c1126d5e384673f78e06685e70d76fff4c5a3f65b4068b4d"}, + {file = "crc32c-2.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:554bc2a9ccfa7c02bb8a5346fd546b65ed265965e7fea768c7f2681f2b68d6a0"}, + {file = "crc32c-2.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:6872d8728f30f2a13f95762801428cf92a7ee6f170c872be81a17b1549b69131"}, + {file = "crc32c-2.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:327e44184826cd1c72bcd4a9b2c4badfd29501333e158460c7d3ad8b7f066588"}, + {file = "crc32c-2.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:866d1cbe646bdef67fc225371da265f081809bcf238bf562d6874c97e7fcb0d6"}, + {file = "crc32c-2.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:c59c6ea67ab927b2ab958c7b01a6b17c9cad882e7a1da51b9c35fbc9874ff46a"}, + {file = "crc32c-2.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:d27116037f97a02f1a123ca82008ee993c28afe8590e047a6cd86aca33653cca"}, + {file = "crc32c-2.3-cp39-cp39-win32.whl", hash = "sha256:90c46644225dc7f71b4dd499ed71ada59d061fd60aa55233270d088ee8cfcd13"}, + {file = "crc32c-2.3-cp39-cp39-win_amd64.whl", hash = "sha256:a2427a9196c2b8b1c27d7e31cc5c9fff13af0b1411ff1565459f65554990f055"}, + {file = "crc32c-2.3-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:5a13d41a29d3feea5ba87def9d4dccc3362139345a24997de33fad00b656622b"}, + {file = "crc32c-2.3-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8363b553b33719b37fff46378a6e96106fd9232d2e043eebb6c6da46925c7663"}, + {file = "crc32c-2.3-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7ec3d9257d0624fb74335f67592b6a30de5e0cfb60322ed8682e35820decac8f"}, + {file = "crc32c-2.3-pp37-pypy37_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d82fa5bb0661a7a508e62730d4d9045f53d4ab6a9211b560a014f1d58a8337cb"}, + {file = "crc32c-2.3-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:5f347244590f294eaea2e92546100bd56db926305e0603a0d57a88e59f86b308"}, + {file = "crc32c-2.3-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:dce1deda03c6dbe0f5ae6e3e0f8671caead64075fd19a61b1700d42a88af97c8"}, + {file = "crc32c-2.3-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a7d568eb07473d9bc6fb413a4d3248265212c537b80d494ab884cc5316589110"}, + {file = "crc32c-2.3-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a5560faa3f673183eb1e2fc2c1361cc9ab86865a1d5774baf61fec9ca6c1a696"}, + {file = "crc32c-2.3-pp38-pypy38_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8067ce072908626869b583700da6b4bfc9a538975d77232ae68a31d8af5f1ff6"}, + {file = "crc32c-2.3-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:250af144edce7850a35c618b4dd1bf56436e031560228c17a7c78bf29239ceb0"}, + {file = "crc32c-2.3-pp39-pypy39_pp73-macosx_10_9_x86_64.whl", hash = "sha256:4ac8738e9cd28948e40fb3a3c89a44660e4ad266f7726964200224e101f5c8ef"}, + {file = "crc32c-2.3-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c74d81a00972cbe65e27e99838b44ed5e04bced971e5bfa01c27a4bd17138442"}, + {file = "crc32c-2.3-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a423c098ceffbd70544d1de3e00eeb45ec4b8463ab5d8005389fbbf3243314d1"}, + {file = "crc32c-2.3-pp39-pypy39_pp73-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b04c44ad7cde9c21ad426bdfa675ba7039db82a6961c99690f9d2ff2f034c892"}, + {file = "crc32c-2.3-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:cea0fe7053e36a4809e5bf95989552f52c98bbc94dca9062fb5b8c976daa0f32"}, + {file = "crc32c-2.3.tar.gz", hash = "sha256:17ce6c596ad0d53df52dcd72defb66984aeabd98fbefea7ba848a6b6bdece36a"}, @@ -3085,2 +3092,2 @@ flatbuffers = [ - {file = "flatbuffers-2.0-py2.py3-none-any.whl", hash = "sha256:3751954f0604580d3219ae49a85fafec9d85eec599c0b96226e1bc0b48e57474"}, - {file = "flatbuffers-2.0.tar.gz", hash = "sha256:12158ab0272375eab8db2d663ae97370c33f152b27801fa6024e1d6105fd4dd2"}, + {file = "flatbuffers-1.12-py2.py3-none-any.whl", hash = "sha256:9e9ef47fa92625c4721036e7c4124182668dc6021d9e7c73704edd395648deb9"}, + {file = "flatbuffers-1.12.tar.gz", hash = "sha256:63bb9a722d5e373701913e226135b28a6f6ac200d5cc7b4d919fa38d73b44610"}, @@ -3161,2 +3168,2 @@ gast = [ - {file = "gast-0.5.3-py3-none-any.whl", hash = "sha256:211aac1e58c167b25d3504998f2db694454a24bb1fb1225bce99420166f21d6a"}, - {file = "gast-0.5.3.tar.gz", hash = "sha256:cfbea25820e653af9c7d1807f659ce0a0a9c64f2439421a7bba4f0983f532dea"}, + {file = "gast-0.4.0-py3-none-any.whl", hash = "sha256:b7adcdd5adbebf1adf17378da5ba3f543684dbec47b1cda1f3997e573cd542c4"}, + {file = "gast-0.4.0.tar.gz", hash = "sha256:40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1"}, @@ -3308 +3315 @@ keras = [ - {file = "keras-2.8.0-py2.py3-none-any.whl", hash = "sha256:744d39dc6577dcd80ff4a4d41549e92b77d6a17e0edd58a431d30656e29bc94e"}, + {file = "keras-2.9.0-py2.py3-none-any.whl", hash = "sha256:55911256f89cfc9343c9fbe4b61ec45a2d33d89729cbe1ab9dcacf8b07b8b6ab"}, @@ -3318 +3325 @@ libcache = [ - {file = "libcache-0.1.0-py3-none-any.whl", hash = "sha256:49e180ec7a334f2e886bf8628f7ddcb222dfd705e97a85611f1519bda1bc01ed"}, + {file = "libcache-0.1.1-py3-none-any.whl", hash = "sha256:40e7ae95c00d2213bdc4f80091a33367cc86c34ebccc787250e68ab9d0ff291e"}, @@ -3330 +3337 @@ libqueue = [ - {file = "libqueue-0.1.0-py3-none-any.whl", hash = "sha256:dfdffd63426b9866933ef61924b61a984e211419f6d10b11f2da0c9d724b8e91"}, + {file = "libqueue-0.1.1-py3-none-any.whl", hash = "sha256:50a690a0cbfc157a36ec19c1ce343a8f0b1b3a060e93c3f566c415eba8e225f9"}, @@ -3337 +3344 @@ libutils = [ - {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, + {file = "libutils-0.1.1-py3-none-any.whl", hash = "sha256:6f119f45b98d62f5bc10b6212b6a8f31f579c0890a36d9877f5dd0f0889b0c37"}, @@ -3773,24 +3780,26 @@ protobuf = [ - {file = "protobuf-3.20.1-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:3cc797c9d15d7689ed507b165cd05913acb992d78b379f6014e013f9ecb20996"}, - {file = "protobuf-3.20.1-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:ff8d8fa42675249bb456f5db06c00de6c2f4c27a065955917b28c4f15978b9c3"}, - {file = "protobuf-3.20.1-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cd68be2559e2a3b84f517fb029ee611546f7812b1fdd0aa2ecc9bc6ec0e4fdde"}, - {file = "protobuf-3.20.1-cp310-cp310-win32.whl", hash = "sha256:9016d01c91e8e625141d24ec1b20fed584703e527d28512aa8c8707f105a683c"}, - {file = "protobuf-3.20.1-cp310-cp310-win_amd64.whl", hash = "sha256:32ca378605b41fd180dfe4e14d3226386d8d1b002ab31c969c366549e66a2bb7"}, - {file = "protobuf-3.20.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:9be73ad47579abc26c12024239d3540e6b765182a91dbc88e23658ab71767153"}, - {file = "protobuf-3.20.1-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:097c5d8a9808302fb0da7e20edf0b8d4703274d140fd25c5edabddcde43e081f"}, - {file = "protobuf-3.20.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e250a42f15bf9d5b09fe1b293bdba2801cd520a9f5ea2d7fb7536d4441811d20"}, - {file = "protobuf-3.20.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cdee09140e1cd184ba9324ec1df410e7147242b94b5f8b0c64fc89e38a8ba531"}, - {file = "protobuf-3.20.1-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:af0ebadc74e281a517141daad9d0f2c5d93ab78e9d455113719a45a49da9db4e"}, - {file = "protobuf-3.20.1-cp37-cp37m-win32.whl", hash = "sha256:755f3aee41354ae395e104d62119cb223339a8f3276a0cd009ffabfcdd46bb0c"}, - {file = "protobuf-3.20.1-cp37-cp37m-win_amd64.whl", hash = "sha256:62f1b5c4cd6c5402b4e2d63804ba49a327e0c386c99b1675c8a0fefda23b2067"}, - {file = "protobuf-3.20.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:06059eb6953ff01e56a25cd02cca1a9649a75a7e65397b5b9b4e929ed71d10cf"}, - {file = "protobuf-3.20.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:cb29edb9eab15742d791e1025dd7b6a8f6fcb53802ad2f6e3adcb102051063ab"}, - {file = "protobuf-3.20.1-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:69ccfdf3657ba59569c64295b7d51325f91af586f8d5793b734260dfe2e94e2c"}, - {file = "protobuf-3.20.1-cp38-cp38-win32.whl", hash = "sha256:dd5789b2948ca702c17027c84c2accb552fc30f4622a98ab5c51fcfe8c50d3e7"}, - {file = "protobuf-3.20.1-cp38-cp38-win_amd64.whl", hash = "sha256:77053d28427a29987ca9caf7b72ccafee011257561259faba8dd308fda9a8739"}, - {file = "protobuf-3.20.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6f50601512a3d23625d8a85b1638d914a0970f17920ff39cec63aaef80a93fb7"}, - {file = "protobuf-3.20.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:284f86a6207c897542d7e956eb243a36bb8f9564c1742b253462386e96c6b78f"}, - {file = "protobuf-3.20.1-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:7403941f6d0992d40161aa8bb23e12575637008a5a02283a930addc0508982f9"}, - {file = "protobuf-3.20.1-cp39-cp39-win32.whl", hash = "sha256:db977c4ca738dd9ce508557d4fce0f5aebd105e158c725beec86feb1f6bc20d8"}, - {file = "protobuf-3.20.1-cp39-cp39-win_amd64.whl", hash = "sha256:7e371f10abe57cee5021797126c93479f59fccc9693dafd6bd5633ab67808a91"}, - {file = "protobuf-3.20.1-py2.py3-none-any.whl", hash = "sha256:adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388"}, - {file = "protobuf-3.20.1.tar.gz", hash = "sha256:adc31566d027f45efe3f44eeb5b1f329da43891634d61c75a5944e9be6dd42c9"}, + {file = "protobuf-3.19.4-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f51d5a9f137f7a2cec2d326a74b6e3fc79d635d69ffe1b036d39fc7d75430d37"}, + {file = "protobuf-3.19.4-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:09297b7972da685ce269ec52af761743714996b4381c085205914c41fcab59fb"}, + {file = "protobuf-3.19.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:072fbc78d705d3edc7ccac58a62c4c8e0cec856987da7df8aca86e647be4e35c"}, + {file = "protobuf-3.19.4-cp310-cp310-win32.whl", hash = "sha256:7bb03bc2873a2842e5ebb4801f5c7ff1bfbdf426f85d0172f7644fcda0671ae0"}, + {file = "protobuf-3.19.4-cp310-cp310-win_amd64.whl", hash = "sha256:f358aa33e03b7a84e0d91270a4d4d8f5df6921abe99a377828839e8ed0c04e07"}, + {file = "protobuf-3.19.4-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:1c91ef4110fdd2c590effb5dca8fdbdcb3bf563eece99287019c4204f53d81a4"}, + {file = "protobuf-3.19.4-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c438268eebb8cf039552897d78f402d734a404f1360592fef55297285f7f953f"}, + {file = "protobuf-3.19.4-cp36-cp36m-win32.whl", hash = "sha256:835a9c949dc193953c319603b2961c5c8f4327957fe23d914ca80d982665e8ee"}, + {file = "protobuf-3.19.4-cp36-cp36m-win_amd64.whl", hash = "sha256:4276cdec4447bd5015453e41bdc0c0c1234eda08420b7c9a18b8d647add51e4b"}, + {file = "protobuf-3.19.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6cbc312be5e71869d9d5ea25147cdf652a6781cf4d906497ca7690b7b9b5df13"}, + {file = "protobuf-3.19.4-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:54a1473077f3b616779ce31f477351a45b4fef8c9fd7892d6d87e287a38df368"}, + {file = "protobuf-3.19.4-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:435bb78b37fc386f9275a7035fe4fb1364484e38980d0dd91bc834a02c5ec909"}, + {file = "protobuf-3.19.4-cp37-cp37m-win32.whl", hash = "sha256:16f519de1313f1b7139ad70772e7db515b1420d208cb16c6d7858ea989fc64a9"}, + {file = "protobuf-3.19.4-cp37-cp37m-win_amd64.whl", hash = "sha256:cdc076c03381f5c1d9bb1abdcc5503d9ca8b53cf0a9d31a9f6754ec9e6c8af0f"}, + {file = "protobuf-3.19.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:69da7d39e39942bd52848438462674c463e23963a1fdaa84d88df7fbd7e749b2"}, + {file = "protobuf-3.19.4-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:48ed3877fa43e22bcacc852ca76d4775741f9709dd9575881a373bd3e85e54b2"}, + {file = "protobuf-3.19.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd95d1dfb9c4f4563e6093a9aa19d9c186bf98fa54da5252531cc0d3a07977e7"}, + {file = "protobuf-3.19.4-cp38-cp38-win32.whl", hash = "sha256:b38057450a0c566cbd04890a40edf916db890f2818e8682221611d78dc32ae26"}, + {file = "protobuf-3.19.4-cp38-cp38-win_amd64.whl", hash = "sha256:7ca7da9c339ca8890d66958f5462beabd611eca6c958691a8fe6eccbd1eb0c6e"}, + {file = "protobuf-3.19.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:36cecbabbda242915529b8ff364f2263cd4de7c46bbe361418b5ed859677ba58"}, + {file = "protobuf-3.19.4-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:c1068287025f8ea025103e37d62ffd63fec8e9e636246b89c341aeda8a67c934"}, + {file = "protobuf-3.19.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:96bd766831596d6014ca88d86dc8fe0fb2e428c0b02432fd9db3943202bf8c5e"}, + {file = "protobuf-3.19.4-cp39-cp39-win32.whl", hash = "sha256:84123274d982b9e248a143dadd1b9815049f4477dc783bf84efe6250eb4b836a"}, + {file = "protobuf-3.19.4-cp39-cp39-win_amd64.whl", hash = "sha256:3112b58aac3bac9c8be2b60a9daf6b558ca3f7681c130dcdd788ade7c9ffbdca"}, + {file = "protobuf-3.19.4-py2.py3-none-any.whl", hash = "sha256:8961c3a78ebfcd000920c9060a262f082f29838682b1f7201889300c1fbe0616"}, + {file = "protobuf-3.19.4.tar.gz", hash = "sha256:9df0c10adf3e83015ced42a9a7bd64e13d06c4cf45c340d2c63020ea04499d0a"}, @@ -4592 +4601 @@ tensorboard = [ - {file = "tensorboard-2.8.0-py3-none-any.whl", hash = "sha256:65a338e4424e9079f2604923bdbe301792adce2ace1be68da6b3ddf005170def"}, + {file = "tensorboard-2.9.0-py3-none-any.whl", hash = "sha256:bd78211076dca5efa27260afacfaa96cd05c7db12a6c09cc76a1d6b2987ca621"}, @@ -4603,12 +4612,15 @@ tensorflow = [ - {file = "tensorflow-2.8.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:78c3ba2e0c952aa9eb388200f1923e40287f9357492a464188ca3043e35edc52"}, - {file = "tensorflow-2.8.0-cp310-cp310-manylinux2010_x86_64.whl", hash = "sha256:2a520538e77a52fb428acb05e300c960844fd1d2c3918ca8ca14127edba6f83b"}, - {file = "tensorflow-2.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:b7170844ae6b048d82a9d7a61b2fa627f2e16cb829267bf0ce4b3a0de0a61054"}, - {file = "tensorflow-2.8.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:fa4a723368d5f748b6f4ec305cf7c26b98e4a6a8c2ce1425f8ae10383a37bcfc"}, - {file = "tensorflow-2.8.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:05fb161c6b2a6c4b8317a703a0a6d7f7aa6b5e3c6ea31bbc4f44ef96b89c3344"}, - {file = "tensorflow-2.8.0-cp37-cp37m-win_amd64.whl", hash = "sha256:291fa84f1022914580810ad76732fb254e44a8a609128e1c58873a12b2f81559"}, - {file = "tensorflow-2.8.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:dd0f9f113ebc21b73fcd349db1629e187b8686395b8146d100eb1706a943bbc0"}, - {file = "tensorflow-2.8.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:8489b4f1771e146f752b0eaeb57acf183bd07357e4550464e7dff18b3b656b5d"}, - {file = "tensorflow-2.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:da38d4043185267e7316ae5dc98d18e89c8af4170859f64798e7a3607fd606e3"}, - {file = "tensorflow-2.8.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:52f225fecc688281b3ae2cba2b52d3ed6215ed4a3ffb686b9cfd09885ca65563"}, - {file = "tensorflow-2.8.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:9d91a989e5455ae713c03fd7236071ab3f232ad8ff2831f2658072933546091f"}, - {file = "tensorflow-2.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:b360c13b3e58b9a5c0780cbdb6b549eea73f620275fa203f8508fe418ae02735"}, + {file = "tensorflow-2.9.1-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:2c77edeb4a9d542032ddac93f732e3dd3d1c4d15c8795e4e43166ed46503582d"}, + {file = "tensorflow-2.9.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:add2f4e55fd7209a5cb01d815364adc9827184d74a83c2f1616c72be2e85c8b7"}, + {file = "tensorflow-2.9.1-cp310-cp310-win_amd64.whl", hash = "sha256:8be7d7f6091ac5af09c19eb178bbbd51346794684851a7bd57826d2d1cfa220e"}, + {file = "tensorflow-2.9.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:b1f7674220b19ab5d39d9313f9c60278cef56052614600cba192700c658e502c"}, + {file = "tensorflow-2.9.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:488a7a964298b92278cca593b7f687abd1c8f51982a08dc6ded5efd9457bf477"}, + {file = "tensorflow-2.9.1-cp37-cp37m-win_amd64.whl", hash = "sha256:abbdcfa7c14974f9bafa8f51214c037639a8991eef3dbcafc506e608a673c54c"}, + {file = "tensorflow-2.9.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:df048d216f90c9fcbda22bdd03420b0e0e6e7ee98b8b91f221afef46b7664635"}, + {file = "tensorflow-2.9.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:adc1b80ec32337ba1720fadbf64242aae06a7ee1c7aea6a1a0cffe1968c89b25"}, + {file = "tensorflow-2.9.1-cp38-cp38-win_amd64.whl", hash = "sha256:a27bffb91f0aef6ba2a30f6507932d9c6801af56cfee8442767f9f3f69bb37a6"}, + {file = "tensorflow-2.9.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:81ad045d39cf4360d5e6183cdda0990661302cca502917a12e54177989b340b9"}, + {file = "tensorflow-2.9.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:212a4d97fb6dedff257703d7a2ce50b0b8ec23d955938083363aa7bc526918cc"}, + {file = "tensorflow-2.9.1-cp39-cp39-win_amd64.whl", hash = "sha256:1c2c6557f6bd7e0d3f1063e27346e4f1c4353db2b7751ac7451033b335fa4b7c"}, +] +tensorflow-estimator = [ + {file = "tensorflow_estimator-2.9.0-py2.py3-none-any.whl", hash = "sha256:e9762bb302f51bc1eb2f35d19f0190a6a2d809d754d5def788c4328fe3746744"}, @@ -4641,3 +4652,0 @@ texttable = [ -tf-estimator-nightly = [ - {file = "tf_estimator_nightly-2.8.0.dev2021122109-py2.py3-none-any.whl", hash = "sha256:0065a04e396b2890bd19761fc1de7559ceafeba12839f8db2c7e7473afaaf612"}, -] diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index d488868f..e94fd220 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -5 +5 @@ name = "worker" -version = "0.1.0" +version = "0.1.1" @@ -18,3 +18,3 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl", develop = false } -libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl", develop = false } -libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.1-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.1-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.1-py3-none-any.whl", develop = false } @@ -34 +34 @@ sklearn = "^0.0" -tensorflow = "2.8.0" +tensorflow = "^2.9.0" diff --git a/tools/Common.mk b/tools/Common.mk index 0c0e5ef9..e859b8cc 100644 --- a/tools/Common.mk +++ b/tools/Common.mk @@ -20,2 +20 @@ quality: - poetry run safety check -i 44487 -i 44485 -i 44524 -i 44525 -i 44486 -i 44716 -i 44717 -i 44715 -i 45356 -i 46499 -# ^^ safety exceptions: pillow, numpy + poetry run safety check $(SAFETY_EXCEPTIONS)
58d47ea57423d9d74f49eb6ba6eafbeee029a92d
Sylvain Lesage
2022-05-31T12:24:29
feat: 🎸 adapt the value of resources based on monitoring (#321)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index a3f720bf..cdabd620 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -55 +55 @@ reverseProxy: - cpu: 1 + cpu: 0.1 @@ -62 +62 @@ api: - replicas: 6 + replicas: 4 @@ -69,2 +69,2 @@ api: - cpu: 1 - memory: "1Gi" + cpu: 0.25 + memory: "512Mi" @@ -88 +88 @@ datasetsWorker: - memory: "4Gi" + memory: "1Gi"
0d1e35592565c8f193d94217ca32ecea82e6b13e
Sylvain Lesage
2022-05-30T10:30:43
feat: 🎸 use only one uvicorn worker per api pod (#317)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 80287729..a3f720bf 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -62 +62 @@ api: - replicas: 3 + replicas: 6 @@ -69,2 +69,2 @@ api: - cpu: 4 - memory: "2Gi" + cpu: 1 + memory: "1Gi" @@ -72,2 +72,2 @@ api: - cpu: 4 - memory: "2Gi" + cpu: 1 + memory: "1Gi" @@ -75,4 +75 @@ api: - # Number of uvicorn workers for running the application - # (2 x $num_cores) + 1 - # https://docs.gunicorn.org/en/stable/design.html#how-many-workers - appNumWorkers: "9" + appNumWorkers: "1" diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index b4acdf42..d8a03ef3 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -98 +98 @@ api: - appNumWorkers: "2" + appNumWorkers: "1"
ca1789cac4df0f2c95b4eb9608d46edadfd72a48
Test User
2022-05-27T17:30:16
ci: 🎡 fix path in docker-compose
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 38109bcf..9a1b65f2 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -64 +64 @@ jobs: - make e2e + poetry run python -m pytest -x tests diff --git a/e2e/tests/docker-compose.yml b/e2e/tests/docker-compose.yml index ae16d166..b91cd1eb 100644 --- a/e2e/tests/docker-compose.yml +++ b/e2e/tests/docker-compose.yml @@ -6 +6 @@ services: - - ./infra/charts/datasets-server/nginx-templates/:/etc/nginx/templates:ro + - ../../infra/charts/datasets-server/nginx-templates/:/etc/nginx/templates:ro
2ffbfc4da7e6125c2910135be5f1c90481301e24
Test User
2022-05-27T17:13:57
ci: 🎡 fix path
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 5b85d698..38109bcf 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -57 +57 @@ jobs: - run: docker-compose -f ${{ matrix.working-directory }}/tests/docker-compose.yml up -d + run: docker-compose -f tests/docker-compose.yml up -d
a61aa5f7fefaeeecd3204c2a335475869b4a0d2a
Test User
2022-05-27T17:12:15
ci: 🎡 fix the order of arguments
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index a5d8930d..5b85d698 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -57 +57 @@ jobs: - run: docker-compose up -d -f ${{ matrix.working-directory }}/tests/docker-compose.yml + run: docker-compose -f ${{ matrix.working-directory }}/tests/docker-compose.yml up -d
04a8d1c9431151631a656e99021780ffd1f8fd6f
Test User
2022-05-27T17:09:20
ci: 🎡 use the correct docker-compose file
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index e091c45f..a5d8930d 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -57 +57 @@ jobs: - run: docker-compose up -d + run: docker-compose up -d -f ${{ matrix.working-directory }}/tests/docker-compose.yml
2bdf97c67a03b88b65b7df3fe11c942266132c24
Test User
2022-05-27T17:05:44
ci: 🎡 use a proper docker-compose file for e2e
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 0878cfd3..e091c45f 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -24,0 +25,4 @@ jobs: + defaults: + run: + shell: bash + working-directory: ${{ matrix.working-directory }} @@ -56 +59,0 @@ jobs: - cd ${{ matrix.working-directory }} @@ -61 +63,0 @@ jobs: - cd ${{ matrix.working-directory }} diff --git a/docker-compose.yml b/docker-compose.yml index abfab358..fee6cf54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27 +26,0 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:${DOCKER_TAG} @@ -46 +44,0 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} @@ -61 +58,0 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} @@ -76 +72,0 @@ services: - image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:${DOCKER_TAG} diff --git a/e2e/tests/docker-compose.yml b/e2e/tests/docker-compose.yml new file mode 100644 index 00000000..ae16d166 --- /dev/null +++ b/e2e/tests/docker-compose.yml @@ -0,0 +1,82 @@ +version: "3.9" +services: + reverse-proxy: + image: nginx:1.20 + volumes: + - ./infra/charts/datasets-server/nginx-templates/:/etc/nginx/templates:ro + - reverse-proxy-cache:/nginx-cache + - assets:/assets:ro + ports: + - "8000:80" + environment: + - ASSETS_DIRECTORY=/assets + - CACHE_DIRECTORY=/nginx-cache + - CACHE_INACTIVE=24h + - CACHE_MAX_SIZE=1g + - CACHE_ZONE_SIZE=50m + - HOST=localhost + - PORT=80 + - TARGET_URL=http://api:8080 + depends_on: + api: + condition: service_started + api: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:${DOCKER_TAG} + volumes: + - assets:/assets:ro + environment: + APP_HOSTNAME: 0.0.0.0 + APP_NUM_WORKERS: 1 + APP_PORT: 8080 + ASSETS_DIRECTORY: "/assets" + MONGO_URL: "mongodb://mongodb" + ports: + - 8080:8080 + depends_on: + mongodb: + condition: service_started + restart: unless-stopped + datasets-worker: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} + volumes: + - assets:/assets:rw + environment: + ASSETS_DIRECTORY: "/assets" + MONGO_URL: "mongodb://mongodb" + WORKER_QUEUE: "datasets" + depends_on: + mongodb: + condition: service_started + restart: always + splits-worker: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} + volumes: + - assets:/assets:rw + environment: + ASSETS_DIRECTORY: "/assets" + MONGO_URL: "mongodb://mongodb" + WORKER_QUEUE: "splits" + depends_on: + mongodb: + condition: service_started + restart: always + admin: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:${DOCKER_TAG} + environment: + MONGO_URL: "mongodb://mongodb" + depends_on: + mongodb: + condition: service_started + restart: always + mongodb: + image: mongo + volumes: + - mongo:/data/db:rw + # TODO: authentication, healthcheck, expose?, migrations? + ports: + # for debug + - "27017:27017" +volumes: + assets: + mongo: + reverse-proxy-cache:
72a964025a7e4ca02d0f8f3a58597d708ac8446b
Test User
2022-05-27T16:54:01
ci: 🎡 fix e2e workflow
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 1a114e3b..0878cfd3 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -11,0 +12 @@ env: + REGION: us-east-1
0caba0403afabe268277cbca105d611283064803
Sylvain Lesage
2022-05-27T16:50:19
ci: 🎡 launch e2e after docker build, and use the images (#316)
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 88bf6297..1a114e3b 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -1,2 +1,9 @@ -name: Launch e2e tests -on: [push] +name: e2e tests +on: + workflow_run: + workflows: ["Build and push docker images"] + types: [completed] + # note that it is run only on main! which is somewhat useless :'( + # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_run + workflow_dispatch: + # ^ run manually if you need to have the e2e tests @@ -17,0 +25 @@ jobs: + if: ${{ github.event.workflow_run.conclusion == 'success' }} @@ -19,0 +28,12 @@ jobs: + - name: Set outputs + id: vars + run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" + - name: Configure AWS credentials + uses: aws-actions/configure-aws-credentials@v1 + with: + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: ${{ env.REGION }} + - name: Login to Amazon ECR + id: login-ecr + uses: aws-actions/amazon-ecr-login@v1 @@ -29,2 +48,0 @@ jobs: - - name: Build the docker images - run: docker-compose build @@ -31,0 +50,2 @@ jobs: + env: + DOCKER_TAG: sha-${{ steps.vars.outputs.sha_short }} diff --git a/docker-compose.yml b/docker-compose.yml index fee6cf54..abfab358 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,0 +27 @@ services: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-api:${DOCKER_TAG} @@ -44,0 +46 @@ services: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} @@ -58,0 +61 @@ services: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-worker:${DOCKER_TAG} @@ -72,0 +76 @@ services: + image: 707930574880.dkr.ecr.us-east-1.amazonaws.com/hub-datasets-server-admin:${DOCKER_TAG}
be3217a45f0a9f6eb45736c65dcd28362f58a375
Sylvain Lesage
2022-05-27T16:03:54
ci: 🎡 use cache with poetry (#314)
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 770fce2f..88bf6297 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -3,0 +4,4 @@ on: [push] +env: + # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" + POETRY_VIRTUALENVS_IN_PROJECT: false + @@ -10 +14 @@ jobs: - poetry-version: [1.1.7] + poetry-version: [1.1.13] @@ -15 +19,3 @@ jobs: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Install poetry + run: pipx install poetry==${{ matrix.poetry-version }} @@ -17 +23 @@ jobs: - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 @@ -20,4 +26,3 @@ jobs: - - name: Use Poetry - uses: abatilo/[email protected] - with: - poetry-version: ${{ matrix.poetry-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ matrix.working-directory }}/poetry.lock @@ -30,0 +36 @@ jobs: + poetry env use "${{ matrix.python-version }}" diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index e1a92916..50af8be9 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -3,0 +4,4 @@ on: [push] +env: + # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" + POETRY_VIRTUALENVS_IN_PROJECT: false + @@ -10 +14 @@ jobs: - poetry-version: [1.1.7] + poetry-version: [1.1.13] @@ -20 +24,3 @@ jobs: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Install poetry + run: pipx install poetry==${{ matrix.poetry-version }} @@ -22 +28 @@ jobs: - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 @@ -25,4 +31,3 @@ jobs: - - name: Use Poetry - uses: abatilo/[email protected] - with: - poetry-version: ${{ matrix.poetry-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ matrix.working-directory }}/poetry.lock @@ -30 +35,4 @@ jobs: - run: poetry install + # "poetry env use" is required: https://github.com/actions/setup-python/issues/374#issuecomment-1088938718 + run: | + poetry env use "${{ matrix.python-version }}" + poetry install @@ -49 +57 @@ jobs: - poetry-version: [1.1.7] + poetry-version: [1.1.13] @@ -58 +66,3 @@ jobs: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Install poetry + run: pipx install poetry==${{ matrix.poetry-version }} @@ -60 +70 @@ jobs: - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 @@ -63,4 +73,3 @@ jobs: - - name: Use Poetry - uses: abatilo/[email protected] - with: - poetry-version: ${{ matrix.poetry-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ matrix.working-directory }}/poetry.lock @@ -70 +79,3 @@ jobs: - run: poetry install + run: | + poetry env use "${{ matrix.python-version }}" + poetry install diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 884f0321..a01e3be8 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -3,0 +4,4 @@ on: [push] +env: + # required to get access to use a cached poetry venv in "/home/runner/.cache/pypoetry/virtualenvs" + POETRY_VIRTUALENVS_IN_PROJECT: false + @@ -11 +15 @@ jobs: - poetry-version: [1.1.7] + poetry-version: [1.1.13] @@ -21 +25,3 @@ jobs: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Install poetry + run: pipx install poetry==${{ matrix.poetry-version }} @@ -23 +29 @@ jobs: - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 @@ -26,4 +32,3 @@ jobs: - - name: Use Poetry - uses: abatilo/[email protected] - with: - poetry-version: ${{ matrix.poetry-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ matrix.working-directory }}/poetry.lock @@ -31 +36,3 @@ jobs: - run: poetry install + run: | + poetry env use "${{ matrix.python-version }}" + poetry install @@ -59 +66,3 @@ jobs: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 + - name: Install poetry + run: pipx install poetry==${{ matrix.poetry-version }} @@ -61 +70 @@ jobs: - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 @@ -64,4 +73,3 @@ jobs: - - name: Use Poetry - uses: abatilo/[email protected] - with: - poetry-version: ${{ matrix.poetry-version }} + cache: 'poetry' + cache-dependency-path: | + ${{ matrix.working-directory }}/poetry.lock @@ -85 +93,3 @@ jobs: - run: poetry install + run: | + poetry env use "${{ matrix.python-version }}" + poetry install diff --git a/libs/libcache/dist/libcache-0.1.0-py3-none-any.whl b/libs/libcache/dist/libcache-0.1.0-py3-none-any.whl new file mode 100644 index 00000000..70e6d86a Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.0-py3-none-any.whl differ diff --git a/libs/libcache/dist/libcache-0.1.0.tar.gz b/libs/libcache/dist/libcache-0.1.0.tar.gz new file mode 100644 index 00000000..1037ba43 Binary files /dev/null and b/libs/libcache/dist/libcache-0.1.0.tar.gz differ diff --git a/libs/libcache/poetry.lock b/libs/libcache/poetry.lock index 74b9b592..ec149c7f 100644 --- a/libs/libcache/poetry.lock +++ b/libs/libcache/poetry.lock @@ -132 +132 @@ name = "certifi" -version = "2021.10.8" +version = "2022.5.18.1" @@ -136 +136 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -181 +181 @@ name = "coverage" -version = "6.3.3" +version = "6.4" @@ -404,2 +404 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -408,3 +407,3 @@ develop = true -function-parser = "^0.0.3" -orjson = "^3.6.4" -starlette = "^0.16.0" +function-parser = ">=0.0.3,<0.0.4" +orjson = ">=3.6.4,<4.0.0" +starlette = ">=0.16.0,<0.17.0" @@ -413,2 +412,2 @@ starlette = "^0.16.0" -type = "directory" -url = "../libutils" +type = "file" +url = "../libutils/dist/libutils-0.1.0-py3-none-any.whl" @@ -514 +513 @@ name = "numpy" -version = "1.22.3" +version = "1.22.4" @@ -1046 +1045 @@ python-versions = "3.9.6" -content-hash = "baad823c55c4c6061c0c0281408258433cb2b9f7db22117161da636f28f6d8d4" +content-hash = "85783b7dc8797a63458facb68d58f54f70c5d9076d9a3391a84a76fef9dff8dc" @@ -1107,2 +1106,2 @@ certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, @@ -1175,41 +1174,41 @@ coverage = [ - {file = "coverage-6.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8"}, - {file = "coverage-6.3.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9"}, - {file = "coverage-6.3.3-cp310-cp310-win32.whl", hash = "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d"}, - {file = "coverage-6.3.3-cp310-cp310-win_amd64.whl", hash = "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4"}, - {file = "coverage-6.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572"}, - {file = "coverage-6.3.3-cp37-cp37m-win32.whl", hash = "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20"}, - {file = "coverage-6.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548"}, - {file = "coverage-6.3.3-cp38-cp38-win32.whl", hash = "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94"}, - {file = "coverage-6.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c"}, - {file = "coverage-6.3.3-cp39-cp39-win32.whl", hash = "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8"}, - {file = "coverage-6.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284"}, - {file = "coverage-6.3.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe"}, - {file = "coverage-6.3.3.tar.gz", hash = "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, @@ -1299 +1298,3 @@ isort = [ -libutils = [] +libutils = [ + {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, +] @@ -1353,20 +1354,22 @@ numpy = [ - {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"}, - {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, - {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, - {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"}, - {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"}, - {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"}, - {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"}, - {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"}, - {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"}, - {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, + {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, + {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, + {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, + {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, + {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, + {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, + {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, + {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, diff --git a/libs/libcache/pyproject.toml b/libs/libcache/pyproject.toml index 8046726e..9a122933 100644 --- a/libs/libcache/pyproject.toml +++ b/libs/libcache/pyproject.toml @@ -9 +9 @@ appdirs = "^1.4.4" -libutils = { path = "../../libs/libutils", develop = true } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } diff --git a/libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl b/libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl new file mode 100644 index 00000000..7d1e5540 Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl differ diff --git a/libs/libqueue/dist/libqueue-0.1.0.tar.gz b/libs/libqueue/dist/libqueue-0.1.0.tar.gz new file mode 100644 index 00000000..ec0794bf Binary files /dev/null and b/libs/libqueue/dist/libqueue-0.1.0.tar.gz differ diff --git a/libs/libqueue/poetry.lock b/libs/libqueue/poetry.lock index 752f22b1..39768809 100644 --- a/libs/libqueue/poetry.lock +++ b/libs/libqueue/poetry.lock @@ -124 +124 @@ name = "certifi" -version = "2021.10.8" +version = "2022.5.18.1" @@ -128 +128 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -173 +173 @@ name = "coverage" -version = "6.3.3" +version = "6.4" @@ -396,2 +396 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -400,3 +399,3 @@ develop = true -function-parser = "^0.0.3" -orjson = "^3.6.4" -starlette = "^0.16.0" +function-parser = ">=0.0.3,<0.0.4" +orjson = ">=3.6.4,<4.0.0" +starlette = ">=0.16.0,<0.17.0" @@ -405,2 +404,2 @@ starlette = "^0.16.0" -type = "directory" -url = "../libutils" +type = "file" +url = "../libutils/dist/libutils-0.1.0-py3-none-any.whl" @@ -506 +505 @@ name = "numpy" -version = "1.22.3" +version = "1.22.4" @@ -1038 +1037 @@ python-versions = "3.9.6" -content-hash = "4ed453cbd5ea72f40fdb1d6f10dbbab4441cb9ca8d80b7c689d766fb3680e888" +content-hash = "c3cf49d1e159a5ce73065842523f44f1551b4463c5912edc085b5dbe836f077a" @@ -1095,2 +1094,2 @@ certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, @@ -1163,41 +1162,41 @@ coverage = [ - {file = "coverage-6.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8"}, - {file = "coverage-6.3.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9"}, - {file = "coverage-6.3.3-cp310-cp310-win32.whl", hash = "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d"}, - {file = "coverage-6.3.3-cp310-cp310-win_amd64.whl", hash = "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4"}, - {file = "coverage-6.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572"}, - {file = "coverage-6.3.3-cp37-cp37m-win32.whl", hash = "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20"}, - {file = "coverage-6.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548"}, - {file = "coverage-6.3.3-cp38-cp38-win32.whl", hash = "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94"}, - {file = "coverage-6.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c"}, - {file = "coverage-6.3.3-cp39-cp39-win32.whl", hash = "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8"}, - {file = "coverage-6.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284"}, - {file = "coverage-6.3.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe"}, - {file = "coverage-6.3.3.tar.gz", hash = "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, @@ -1287 +1286,3 @@ isort = [ -libutils = [] +libutils = [ + {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, +] @@ -1341,20 +1342,22 @@ numpy = [ - {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"}, - {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, - {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, - {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"}, - {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"}, - {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"}, - {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"}, - {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"}, - {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"}, - {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, + {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, + {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, + {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, + {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, + {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, + {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, + {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, + {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, diff --git a/libs/libqueue/pyproject.toml b/libs/libqueue/pyproject.toml index 5b68456f..a985841e 100644 --- a/libs/libqueue/pyproject.toml +++ b/libs/libqueue/pyproject.toml @@ -8 +8 @@ version = "0.1.0" -libutils = { path = "../../libs/libutils", develop = true } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } diff --git a/libs/libutils/dist/libutils-0.1.0-py3-none-any.whl b/libs/libutils/dist/libutils-0.1.0-py3-none-any.whl new file mode 100644 index 00000000..adac4444 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.0-py3-none-any.whl differ diff --git a/libs/libutils/dist/libutils-0.1.0.tar.gz b/libs/libutils/dist/libutils-0.1.0.tar.gz new file mode 100644 index 00000000..f421b079 Binary files /dev/null and b/libs/libutils/dist/libutils-0.1.0.tar.gz differ diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock index 90d58da9..7cdbb93e 100644 --- a/services/admin/poetry.lock +++ b/services/admin/poetry.lock @@ -132 +132 @@ name = "certifi" -version = "2021.10.8" +version = "2022.5.18.1" @@ -136 +136 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -181 +181 @@ name = "coverage" -version = "6.3.3" +version = "6.4" @@ -441,2 +441 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -445,2 +444,2 @@ develop = true -appdirs = "^1.4.4" -libutils = {path = "../../libs/libutils", develop = true} +appdirs = ">=1.4.4,<2.0.0" +libutils = "0.1.0" @@ -448,2 +447,2 @@ mongo-types = "0.15.1" -mongoengine = "^0.24.1" -pymongo = {version = "^3.12.3", extras = ["srv"]} +mongoengine = ">=0.24.1,<0.25.0" +pymongo = {version = ">=3.12.3,<4.0.0", extras = ["srv"]} @@ -452,2 +451,2 @@ pymongo = {version = "^3.12.3", extras = ["srv"]} -type = "directory" -url = "../../libs/libcache" +type = "file" +url = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl" @@ -461,2 +460 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -465 +463 @@ develop = true -libutils = {path = "../../libs/libutils", develop = true} +libutils = "0.1.0" @@ -467,2 +465,2 @@ mongo-types = "0.15.1" -mongoengine = "^0.24.1" -pymongo = {version = "^3.12.3", extras = ["srv"]} +mongoengine = ">=0.24.1,<0.25.0" +pymongo = {version = ">=3.12.3,<4.0.0", extras = ["srv"]} @@ -471,2 +469,2 @@ pymongo = {version = "^3.12.3", extras = ["srv"]} -type = "directory" -url = "../../libs/libqueue" +type = "file" +url = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl" @@ -480,2 +478 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -484,3 +481,3 @@ develop = true -function-parser = "^0.0.3" -orjson = "^3.6.4" -starlette = "^0.16.0" +function-parser = ">=0.0.3,<0.0.4" +orjson = ">=3.6.4,<4.0.0" +starlette = ">=0.16.0,<0.17.0" @@ -489,2 +486,2 @@ starlette = "^0.16.0" -type = "directory" -url = "../../libs/libutils" +type = "file" +url = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl" @@ -590 +587 @@ name = "numpy" -version = "1.22.3" +version = "1.22.4" @@ -1133 +1130 @@ python-versions = "3.9.6" -content-hash = "81e9265af7e6dcf50bf73ca2a795cb448d179fd35b840e2c16fedc5cd2b77869" +content-hash = "3b28f7a5e31b598d5329fd799bf72133fc88a02d85ea8819fdb2cd0ceb7056f6" @@ -1194,2 +1191,2 @@ certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, @@ -1262,41 +1259,41 @@ coverage = [ - {file = "coverage-6.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8"}, - {file = "coverage-6.3.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9"}, - {file = "coverage-6.3.3-cp310-cp310-win32.whl", hash = "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d"}, - {file = "coverage-6.3.3-cp310-cp310-win_amd64.whl", hash = "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4"}, - {file = "coverage-6.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572"}, - {file = "coverage-6.3.3-cp37-cp37m-win32.whl", hash = "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20"}, - {file = "coverage-6.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548"}, - {file = "coverage-6.3.3-cp38-cp38-win32.whl", hash = "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94"}, - {file = "coverage-6.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c"}, - {file = "coverage-6.3.3-cp39-cp39-win32.whl", hash = "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8"}, - {file = "coverage-6.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284"}, - {file = "coverage-6.3.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe"}, - {file = "coverage-6.3.3.tar.gz", hash = "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, @@ -1394,3 +1391,9 @@ isort = [ -libcache = [] -libqueue = [] -libutils = [] +libcache = [ + {file = "libcache-0.1.0-py3-none-any.whl", hash = "sha256:49e180ec7a334f2e886bf8628f7ddcb222dfd705e97a85611f1519bda1bc01ed"}, +] +libqueue = [ + {file = "libqueue-0.1.0-py3-none-any.whl", hash = "sha256:dfdffd63426b9866933ef61924b61a984e211419f6d10b11f2da0c9d724b8e91"}, +] +libutils = [ + {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, +] @@ -1450,20 +1453,22 @@ numpy = [ - {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"}, - {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, - {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, - {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"}, - {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"}, - {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"}, - {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"}, - {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"}, - {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"}, - {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, + {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, + {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, + {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, + {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, + {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, + {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, + {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, + {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml index ba5be52f..971f9f84 100644 --- a/services/admin/pyproject.toml +++ b/services/admin/pyproject.toml @@ -8,3 +8,4 @@ version = "0.1.0" -libcache = { path = "../../libs/libcache", develop = true } -libqueue = { path = "../../libs/libqueue", develop = true } -libutils = { path = "../../libs/libutils", develop = true } +huggingface-hub = "^0.6.0" +libcache = { path = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } @@ -13 +13,0 @@ python-dotenv = "^0.20.0" -huggingface-hub = "^0.6.0" diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 6133a99b..b550d62b 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -28 +28 @@ name = "asgiref" -version = "3.5.1" +version = "3.5.2" @@ -143 +143 @@ name = "certifi" -version = "2021.10.8" +version = "2022.5.18.1" @@ -147 +147 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -192 +192 @@ name = "coverage" -version = "6.3.3" +version = "6.4" @@ -459,2 +459 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -463,2 +462,2 @@ develop = true -appdirs = "^1.4.4" -libutils = {path = "../../libs/libutils", develop = true} +appdirs = ">=1.4.4,<2.0.0" +libutils = "0.1.0" @@ -466,2 +465,2 @@ mongo-types = "0.15.1" -mongoengine = "^0.24.1" -pymongo = {version = "^3.12.3", extras = ["srv"]} +mongoengine = ">=0.24.1,<0.25.0" +pymongo = {version = ">=3.12.3,<4.0.0", extras = ["srv"]} @@ -470,2 +469,2 @@ pymongo = {version = "^3.12.3", extras = ["srv"]} -type = "directory" -url = "../../libs/libcache" +type = "file" +url = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl" @@ -479,2 +478 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -483 +481 @@ develop = true -libutils = {path = "../../libs/libutils", develop = true} +libutils = "0.1.0" @@ -485,2 +483,2 @@ mongo-types = "0.15.1" -mongoengine = "^0.24.1" -pymongo = {version = "^3.12.3", extras = ["srv"]} +mongoengine = ">=0.24.1,<0.25.0" +pymongo = {version = ">=3.12.3,<4.0.0", extras = ["srv"]} @@ -489,2 +487,2 @@ pymongo = {version = "^3.12.3", extras = ["srv"]} -type = "directory" -url = "../../libs/libqueue" +type = "file" +url = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl" @@ -498,2 +496 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -502,3 +499,3 @@ develop = true -function-parser = "^0.0.3" -orjson = "^3.6.4" -starlette = "^0.16.0" +function-parser = ">=0.0.3,<0.0.4" +orjson = ">=3.6.4,<4.0.0" +starlette = ">=0.16.0,<0.17.0" @@ -507,2 +504,2 @@ starlette = "^0.16.0" -type = "directory" -url = "../../libs/libutils" +type = "file" +url = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl" @@ -608 +605 @@ name = "numpy" -version = "1.22.3" +version = "1.22.4" @@ -1204 +1201 @@ python-versions = "3.9.6" -content-hash = "4e0781c9059d07cfda1a4419eee819ad7a24ef7b84f0d998077b7c0619dc18f6" +content-hash = "38cac9920159b874586cf14f34a3b719df7c3b4eafff1eb373f4bcf01d818024" @@ -1216,2 +1213,2 @@ asgiref = [ - {file = "asgiref-3.5.1-py3-none-any.whl", hash = "sha256:45a429524fba18aba9d512498b19d220c4d628e75b40cf5c627524dbaebc5cc1"}, - {file = "asgiref-3.5.1.tar.gz", hash = "sha256:fddeea3c53fa99d0cdb613c3941cc6e52d822491fc2753fba25768fb5bf4e865"}, + {file = "asgiref-3.5.2-py3-none-any.whl", hash = "sha256:1d2880b792ae8757289136f1db2b7b99100ce959b2aa57fd69dab783d05afac4"}, + {file = "asgiref-3.5.2.tar.gz", hash = "sha256:4a29362a6acebe09bf1d6640db38c1dc3d9217c68e6f9f6204d72667fc19a424"}, @@ -1269,2 +1266,2 @@ certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, @@ -1337,41 +1334,41 @@ coverage = [ - {file = "coverage-6.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8"}, - {file = "coverage-6.3.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9"}, - {file = "coverage-6.3.3-cp310-cp310-win32.whl", hash = "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d"}, - {file = "coverage-6.3.3-cp310-cp310-win_amd64.whl", hash = "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4"}, - {file = "coverage-6.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572"}, - {file = "coverage-6.3.3-cp37-cp37m-win32.whl", hash = "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20"}, - {file = "coverage-6.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548"}, - {file = "coverage-6.3.3-cp38-cp38-win32.whl", hash = "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94"}, - {file = "coverage-6.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c"}, - {file = "coverage-6.3.3-cp39-cp39-win32.whl", hash = "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8"}, - {file = "coverage-6.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284"}, - {file = "coverage-6.3.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe"}, - {file = "coverage-6.3.3.tar.gz", hash = "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, @@ -1473,3 +1470,9 @@ isort = [ -libcache = [] -libqueue = [] -libutils = [] +libcache = [ + {file = "libcache-0.1.0-py3-none-any.whl", hash = "sha256:49e180ec7a334f2e886bf8628f7ddcb222dfd705e97a85611f1519bda1bc01ed"}, +] +libqueue = [ + {file = "libqueue-0.1.0-py3-none-any.whl", hash = "sha256:dfdffd63426b9866933ef61924b61a984e211419f6d10b11f2da0c9d724b8e91"}, +] +libutils = [ + {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, +] @@ -1529,20 +1532,22 @@ numpy = [ - {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"}, - {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, - {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, - {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"}, - {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"}, - {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"}, - {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"}, - {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"}, - {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"}, - {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, + {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, + {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, + {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, + {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, + {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, + {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, + {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, + {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 943a2181..9b004852 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -9,3 +9,3 @@ huggingface-hub = "^0.5.1" -libcache = { path = "../../libs/libcache", develop = true } -libqueue = { path = "../../libs/libqueue", develop = true } -libutils = { path = "../../libs/libutils", develop = true } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false } diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index 5e0923dd..62f2dae8 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -62 +62 @@ name = "apache-beam" -version = "2.38.0" +version = "2.39.0" @@ -66 +66 @@ optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" @@ -77 +76,0 @@ numpy = ">=1.14.3,<1.23.0" -oauth2client = ">=2.0.1,<5" @@ -81 +80 @@ protobuf = ">=3.12.2,<4" -pyarrow = ">=0.15.1,<7.0.0" +pyarrow = ">=0.15.1,<8.0.0" @@ -94,4 +93,4 @@ docs = ["Sphinx (>=1.5.2,<2.0)", "docutils (==0.17.1)"] -gcp = ["cachetools (>=3.1.0,<5)", "google-apitools (>=0.5.31,<0.5.32)", "google-auth (>=1.18.0,<3)", "google-cloud-datastore (>=1.8.0,<2)", "google-cloud-pubsub (>=2.1.0,<3)", "google-cloud-pubsublite (>=1.2.0,<2)", "google-cloud-bigquery (>=1.6.0,<3)", "google-cloud-bigquery-storage (>=2.6.3)", "google-cloud-core (>=0.28.1,<2)", "google-cloud-bigtable (>=0.31.1,<2)", "google-cloud-spanner (>=1.13.0,<2)", "grpcio-gcp (>=0.2.2,<1)", "google-cloud-dlp (>=3.0.0,<4)", "google-cloud-language (>=1.3.0,<2)", "google-cloud-videointelligence (>=1.8.0,<2)", "google-cloud-vision (>=0.38.0,<2)", "google-cloud-recommendations-ai (>=0.1.0,<=0.2.0)"] -interactive = ["facets-overview (>=1.0.0,<2)", "google-cloud-dataproc (>=3.0.0,<3.2.0)", "ipython (>=7,<8)", "ipykernel (>=5.2.0,<6)", "ipywidgets (>=7.6.5,<8)", "jupyter-client (>=6.1.11,<6.1.13)", "timeloop (>=1.0.2,<2)"] -interactive_test = ["nbformat (>=5.0.5,<6)", "nbconvert (>=6.2.0,<7)", "needle (>=0.5.0,<1)", "chromedriver-binary (>=96,<97)", "pillow (>=7.1.1,<8)"] -test = ["freezegun (>=0.3.12)", "mock (>=1.0.1,<3.0.0)", "pandas (<2.0.0)", "parameterized (>=0.7.1,<0.8.0)", "pyhamcrest (>=1.9,!=1.10.0,<2.0.0)", "pyyaml (>=3.12,<7.0.0)", "requests-mock (>=1.7,<2.0)", "tenacity (>=5.0.2,<6.0)", "pytest (>=4.4.0,<5.0)", "pytest-xdist (>=1.29.0,<2)", "pytest-timeout (>=1.3.3,<2)", "sqlalchemy (>=1.3,<2.0)", "psycopg2-binary (>=2.8.5,<3.0.0)", "testcontainers[mysql] (>=3.0.3,<4.0.0)", "cryptography (>=36.0.0)"] +gcp = ["cachetools (>=3.1.0,<5)", "google-apitools (>=0.5.31,<0.5.32)", "google-auth (>=1.18.0,<3)", "google-auth-httplib2 (>=0.1.0,<0.2.0)", "google-cloud-datastore (>=1.8.0,<2)", "google-cloud-pubsub (>=2.1.0,<3)", "google-cloud-pubsublite (>=1.2.0,<2)", "google-cloud-bigquery (>=1.6.0,<3)", "google-cloud-bigquery-storage (>=2.6.3)", "google-cloud-core (>=0.28.1,<2)", "google-cloud-bigtable (>=0.31.1,<2)", "google-cloud-spanner (>=1.13.0,<2)", "grpcio-gcp (>=0.2.2,<1)", "google-cloud-dlp (>=3.0.0,<4)", "google-cloud-language (>=1.3.0,<2)", "google-cloud-videointelligence (>=1.8.0,<2)", "google-cloud-vision (>=0.38.0,<2)", "google-cloud-recommendations-ai (>=0.1.0,<=0.2.0)"] +interactive = ["facets-overview (>=1.0.0,<2)", "google-cloud-dataproc (>=3.0.0,<3.2.0)", "ipykernel (>=6,<7)", "ipywidgets (>=7.6.5,<8)", "jupyter-client (>=6.1.11,<6.1.13)", "timeloop (>=1.0.2,<2)", "ipython (>=7,<8)", "ipython (>=8,<9)"] +interactive_test = ["nbformat (>=5.0.5,<6)", "nbconvert (>=6.2.0,<7)", "needle (>=0.5.0,<1)", "chromedriver-binary (>=100,<101)", "pillow (>=7.1.1,<8)"] +test = ["freezegun (>=0.3.12)", "joblib (>=1.0.1)", "mock (>=1.0.1,<3.0.0)", "pandas (<2.0.0)", "parameterized (>=0.7.1,<0.8.0)", "pyhamcrest (>=1.9,!=1.10.0,<2.0.0)", "pyyaml (>=3.12,<7.0.0)", "requests-mock (>=1.7,<2.0)", "tenacity (>=5.0.2,<6.0)", "pytest (>=4.4.0,<5.0)", "pytest-xdist (>=1.29.0,<2)", "pytest-timeout (>=1.3.3,<2)", "scikit-learn (>=0.20.0)", "sqlalchemy (>=1.3,<2.0)", "psycopg2-binary (>=2.8.5,<3.0.0)", "testcontainers[mysql] (>=3.0.3,<4.0.0)", "cryptography (>=36.0.0)"] @@ -439 +438 @@ benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "tr -dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] +dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] @@ -445 +444 @@ tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[server,s3] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] @@ -785 +784 @@ name = "h5py" -version = "3.6.0" +version = "3.7.0" @@ -825 +824 @@ name = "huggingface-hub" -version = "0.6.0" +version = "0.7.0" @@ -834 +833 @@ packaging = ">=20.9" -pyyaml = "*" +pyyaml = ">=5.1" @@ -974,2 +973 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -978,2 +976,2 @@ develop = true -appdirs = "^1.4.4" -libutils = {path = "../../libs/libutils", develop = true} +appdirs = ">=1.4.4,<2.0.0" +libutils = "0.1.0" @@ -981,2 +979,2 @@ mongo-types = "0.15.1" -mongoengine = "^0.24.1" -pymongo = {version = "^3.12.3", extras = ["srv"]} +mongoengine = ">=0.24.1,<0.25.0" +pymongo = {version = ">=3.12.3,<4.0.0", extras = ["srv"]} @@ -985,2 +983,2 @@ pymongo = {version = "^3.12.3", extras = ["srv"]} -type = "directory" -url = "../../libs/libcache" +type = "file" +url = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl" @@ -1002,2 +1000 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -1006 +1003 @@ develop = true -libutils = {path = "../../libs/libutils", develop = true} +libutils = "0.1.0" @@ -1008,2 +1005,2 @@ mongo-types = "0.15.1" -mongoengine = "^0.24.1" -pymongo = {version = "^3.12.3", extras = ["srv"]} +mongoengine = ">=0.24.1,<0.25.0" +pymongo = {version = ">=3.12.3,<4.0.0", extras = ["srv"]} @@ -1012,2 +1009,2 @@ pymongo = {version = "^3.12.3", extras = ["srv"]} -type = "directory" -url = "../../libs/libqueue" +type = "file" +url = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl" @@ -1047,2 +1044 @@ optional = false -python-versions = "3.9.6" -develop = true +python-versions = "==3.9.6" @@ -1051,3 +1047,3 @@ develop = true -function-parser = "^0.0.3" -orjson = "^3.6.4" -starlette = "^0.16.0" +function-parser = ">=0.0.3,<0.0.4" +orjson = ">=3.6.4,<4.0.0" +starlette = ">=0.16.0,<0.17.0" @@ -1056,2 +1052,2 @@ starlette = "^0.16.0" -type = "directory" -url = "../../libs/libutils" +type = "file" +url = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl" @@ -1061 +1057 @@ name = "llvmlite" -version = "0.36.0" +version = "0.38.1" @@ -1065 +1061 @@ optional = false -python-versions = ">=3.6,<3.10" +python-versions = ">=3.7,<3.11" @@ -1288 +1284 @@ name = "numba" -version = "0.53.1" +version = "0.55.2" @@ -1292 +1288 @@ optional = false -python-versions = ">=3.6,<3.10" +python-versions = ">=3.7,<3.11" @@ -1295,2 +1291,2 @@ python-versions = ">=3.6,<3.10" -llvmlite = ">=0.36.0rc1,<0.37" -numpy = ">=1.15" +llvmlite = ">=0.38.0rc1,<0.39" +numpy = ">=1.18,<1.23" @@ -1306,15 +1301,0 @@ python-versions = ">=3.8" -[[package]] -name = "oauth2client" -version = "4.1.3" -description = "OAuth 2.0 client library" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -httplib2 = ">=0.9.1" -pyasn1 = ">=0.1.7" -pyasn1-modules = ">=0.0.5" -rsa = ">=3.1.4" -six = ">=1.6.1" - @@ -1494 +1475 @@ name = "proto-plus" -version = "1.20.4" +version = "1.20.5" @@ -1501 +1482 @@ python-versions = ">=3.6" -protobuf = ">=3.19.0" +protobuf = ">=3.19.0,<4.0.0dev" @@ -1504 +1485 @@ protobuf = ">=3.19.0" -testing = ["google-api-core[grpc] (>=1.22.2)"] +testing = ["google-api-core[grpc] (>=1.31.5)"] @@ -1560 +1541 @@ name = "pyarrow" -version = "6.0.1" +version = "7.0.0" @@ -1564 +1545 @@ optional = false -python-versions = ">=3.6" +python-versions = ">=3.7" @@ -2430 +2411 @@ name = "types-requests" -version = "2.27.27" +version = "2.27.29" @@ -2441 +2422 @@ name = "types-urllib3" -version = "1.26.14" +version = "1.26.15" @@ -2552 +2533 @@ python-versions = "3.9.6" -content-hash = "4ee1b905c724e8f3859a95940b699c363d45df16bff8fb0faf82884191e9ec7b" +content-hash = "ea9779538ca8dfee03bfc206583eef359f38a90f519cfb102f6b7e6d933c632c" @@ -2642,33 +2623,25 @@ apache-beam = [ - {file = "apache-beam-2.38.0.zip", hash = "sha256:e088065b55eeb28c8727af6d5e19d83231ce11431ed611d9682ecd827fc7f30c"}, - {file = "apache_beam-2.38.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f66f643fd0518d1e675aea2579d2408de95379dbfe378ff8ea3cefe862300f14"}, - {file = "apache_beam-2.38.0-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:a7bb4282e07a8d5bafcb31e34435a624402391e05fe79da8d93b79ce1a715a88"}, - {file = "apache_beam-2.38.0-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:c4285ae0222233161b86d7debd2ebb35ac916f504316c3406764ecc43bb2276a"}, - {file = "apache_beam-2.38.0-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f7db8fe24d479683ff978b67491799d40b04c24f2f52a9752e8caeb7b4b98be2"}, - {file = "apache_beam-2.38.0-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:43e64029f90553e33ffa0558b45ed6c019b2229e4bd42fc820b85000416cef35"}, - {file = "apache_beam-2.38.0-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:d6097f70cafcff283b1669571d290f88949a47d3959c6928afe29f6668df0d19"}, - {file = "apache_beam-2.38.0-cp36-cp36m-win32.whl", hash = "sha256:3fefcf904d3895bcc067bebf4c050af5ce463592b2066cd84d0f3012b9e07a98"}, - {file = "apache_beam-2.38.0-cp36-cp36m-win_amd64.whl", hash = "sha256:3a4c5c09947f66d9e5ea21e0f51d35d6b769e64442ba5fbca4ef5c639e33c7a4"}, - {file = "apache_beam-2.38.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3eec83712c2d76a67d90b40dc2177ac567a326bdd9b65493637f687471189684"}, - {file = "apache_beam-2.38.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:026b3844814bf2fe888ff6370e62cd1a4851179d8968f1380549b89184f875b4"}, - {file = "apache_beam-2.38.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bf7800223ab35a81a1cb09aad5745673d9cf55e48620b44c9bd4af9c24f64333"}, - {file = "apache_beam-2.38.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:326cf61b60da8b63453eb054f14697b109e35172ecca8dd954974982689e7d05"}, - {file = "apache_beam-2.38.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:05c6c50d7e8fc3a6e237495864222d4f56b34e3b1ddc5d88ab77d6947525f34f"}, - {file = "apache_beam-2.38.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:e1be453482ed1406077190c54044c56766990d43e8135e4c8af476da0675aaa1"}, - {file = "apache_beam-2.38.0-cp37-cp37m-win32.whl", hash = "sha256:40b27f31db83686d1747123ea9e4b4090b4a8ea789c6f80c53c81208513fd2db"}, - {file = "apache_beam-2.38.0-cp37-cp37m-win_amd64.whl", hash = "sha256:b921e0d1853140db1eb871c1a20c6d0c89623c2dd31502d046da31a4a1b0a94b"}, - {file = "apache_beam-2.38.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:11e109c1c58c2f40fe2ce38806a38521995fd08659102036dede3bb8c4ca177f"}, - {file = "apache_beam-2.38.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:65c1985901f138f23c1e5e0190a976689691296a905d84cbf1a0aa765b4983a2"}, - {file = "apache_beam-2.38.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:4b16ead736510e885098bd28889c17d11a94048b066ab58c633009e5e179e29b"}, - {file = "apache_beam-2.38.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:beb7094434528392eef29cbda5d7bb3356ed35ffeb032012c7e187fc5ba31cb8"}, - {file = "apache_beam-2.38.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:90889054934e6eb4f4a9d320509d32c8de562303b7c07cbef2ecd8f2dc8d4a35"}, - {file = "apache_beam-2.38.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:dd6601f49ea45d6c4ef257315dffa550d0aeeb30cee6a38954d24e24559a553d"}, - {file = "apache_beam-2.38.0-cp38-cp38-win32.whl", hash = "sha256:ca78da2b2ed099f56399c08d978106251c65473ceb3511fa0298cc79a2eaa050"}, - {file = "apache_beam-2.38.0-cp38-cp38-win_amd64.whl", hash = "sha256:13819c26520559f69b807d6f8662bff5d645f282fea2140100528981b662d50d"}, - {file = "apache_beam-2.38.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bc4adaf3f781ba9547d47a73adca26fc3e8c05d88f45e6fa3e75293190a20a38"}, - {file = "apache_beam-2.38.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:0b454b637b70852c6384472d45688a8e8b1b3239b8dce364cd03193b3a25fef5"}, - {file = "apache_beam-2.38.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:8230cad5d0fb87e0add99ee5df7ea99f6f55b10ace1854a51f48dbe0b45990ca"}, - {file = "apache_beam-2.38.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:c88d8eafdd2e2f3fa65e75615824cd783f0077a4b70958b8eea7455c73b8fd02"}, - {file = "apache_beam-2.38.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:2efe790a7fb977cfc0084f8788f39c381a7214f164e9f27d0329c133d5149d7e"}, - {file = "apache_beam-2.38.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:2090cf8ba01fd857ec9164d6dcfbcfe61a216f8a3f4222cf1b508a5bc09196eb"}, - {file = "apache_beam-2.38.0-cp39-cp39-win32.whl", hash = "sha256:5dee14658ccdc56e48a509ccc6439214321afbc85a7a83f236a7a68555314817"}, - {file = "apache_beam-2.38.0-cp39-cp39-win_amd64.whl", hash = "sha256:74130705bae1742c2e24e80ec786cff5bbd5c94fea141cb468a7022f6538e8e2"}, + {file = "apache-beam-2.39.0.zip", hash = "sha256:54b28731deed19ece8050e02e0226e38fc5e698026c6d3a3bb1fe90917c7bc0e"}, + {file = "apache_beam-2.39.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:628c59f2c21a58bd8a060bfce2cef2a310bbc6cd2e4745459bd592fa09345066"}, + {file = "apache_beam-2.39.0-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:7f4a59f1aab49f5afc91683823a2e25f1c33e91cb4a29479a2bc783d43d1af39"}, + {file = "apache_beam-2.39.0-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:13923a68295ff520e301627a122af6e2f02934b01faa019920d22481769f1937"}, + {file = "apache_beam-2.39.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:4a1573e4934a9fc99b3068cb9f2e383ce941eb002fd88878259e2adb3d654998"}, + {file = "apache_beam-2.39.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:008dfe4150b723ea938fecbccfc5bc9d6187c1be0be410e1517c1d1c4471c8b6"}, + {file = "apache_beam-2.39.0-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:fa9ce955ba7bfe82d70f135fdc9526836165c3e7bd5d2fec5335a072c58c9aa7"}, + {file = "apache_beam-2.39.0-cp37-cp37m-win32.whl", hash = "sha256:1421e9812bba0637063e81963d9abdff070bdc41b04ebbb7da6ed6d2d3e946a8"}, + {file = "apache_beam-2.39.0-cp37-cp37m-win_amd64.whl", hash = "sha256:150c0665f1ac5ca09753bd33c4a5fa499c49a1294b5894cc376e7538beb55243"}, + {file = "apache_beam-2.39.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:466d453b8d03634124fb376a7e0b248eadb85ad3e06ccdda5a39e5458c50b3ed"}, + {file = "apache_beam-2.39.0-cp38-cp38-manylinux1_i686.whl", hash = "sha256:171ea30378cc1be1ec5b2fa4f8f19a95599fc926e7fd1325aa27ed505d1cf55f"}, + {file = "apache_beam-2.39.0-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:4ccf109db77540ed13752aef83c3796f4a06d0c9ddafe6cef33d6c42af280100"}, + {file = "apache_beam-2.39.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:241aa41ea8281451a5e41e8e4faee75dbe23cd165735f8d60bd35d580a953732"}, + {file = "apache_beam-2.39.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:def5cf9aa8b7a25cab38ea61034928604c5a52cbc218e11f91fb56654d1e6e6a"}, + {file = "apache_beam-2.39.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:0f08673603d56720431fc33de42f85895610f5d6a2239f8e39ead48c7e34981b"}, + {file = "apache_beam-2.39.0-cp38-cp38-win32.whl", hash = "sha256:85f18c8493560258bb0cb80bb9820b1fbed53c15929c26bec7e19f4a3f0adb9d"}, + {file = "apache_beam-2.39.0-cp38-cp38-win_amd64.whl", hash = "sha256:c40a513599b065f0a1017d15bec739d65e4a9c20ab44aade5b3e2e49c1c8a014"}, + {file = "apache_beam-2.39.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:56a7b05c43ce9681560ef7a8dd5157fd033e6d88cd7f797421a40b0adb1d9381"}, + {file = "apache_beam-2.39.0-cp39-cp39-manylinux1_i686.whl", hash = "sha256:4eb8eac6f5fe6ca40df14b240dbac45f123977efaee54ffb17a6d60e1e00a5b5"}, + {file = "apache_beam-2.39.0-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:e14e9b3f10bc3c0965370b040a13dcd7c9c35d65de6601c18a94f73bb5166f06"}, + {file = "apache_beam-2.39.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:6683a7983eedc9663ec70342efe4da2e98a01bd4f34b98b5c3851bd53468df67"}, + {file = "apache_beam-2.39.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:b3dd773d84c91e0abde7315ba485f62788cfcfd53edb93795bc5528b92a3ef0a"}, + {file = "apache_beam-2.39.0-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:73774acec081d248dd7dd1968f610fa0dcbd7b9e3520d6586aca95a3276f7249"}, + {file = "apache_beam-2.39.0-cp39-cp39-win32.whl", hash = "sha256:4541e88ce86ec22c07484600ab6972c8185fdb8a31e41468fc9cb034bcf854f5"}, + {file = "apache_beam-2.39.0-cp39-cp39-win_amd64.whl", hash = "sha256:7ae91ae6d5093aa9f2fea770a1c6509cee35c065752f27a37c9ac3c9d6c153b5"}, @@ -3272,16 +3245,20 @@ h5py = [ - {file = "h5py-3.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a5320837c60870911645e9a935099bdb2be6a786fcf0dac5c860f3b679e2de55"}, - {file = "h5py-3.6.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98646e659bf8591a2177e12a4461dced2cad72da0ba4247643fd118db88880d2"}, - {file = "h5py-3.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:5996ff5adefd2d68c330a4265b6ef92e51b2fc674834a5990add5033bf109e20"}, - {file = "h5py-3.6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:c9a5529343a619fea777b7caa27d493595b28b5af8b005e8d1817559fcccf493"}, - {file = "h5py-3.6.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:e2b49c48df05e19bb20b400b7ff7dc6f1ee36b84dc717c3771c468b33697b466"}, - {file = "h5py-3.6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cd9447633b0bafaf82190d9a8d56f3cb2e8d30169483aee67d800816e028190a"}, - {file = "h5py-3.6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1c5acc660c458421e88c4c5fe092ce15923adfac4c732af1ac4fced683a5ea97"}, - {file = "h5py-3.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:35ab552c6f0a93365b3cb5664a5305f3920daa0a43deb5b2c547c52815ec46b9"}, - {file = "h5py-3.6.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:542781d50e1182b8fb619b1265dfe1c765e18215f818b0ab28b2983c28471325"}, - {file = "h5py-3.6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9f39242960b8d7f86f3056cc2546aa3047ff4835985f6483229af8f029e9c8db"}, - {file = "h5py-3.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:8ecedf16c613973622a334701f67edcc0249469f9daa0576e994fb20ac0405db"}, - {file = "h5py-3.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d8cacad89aa7daf3626fce106f7f2662ac35b14849df22d252d0d8fab9dc1c0b"}, - {file = "h5py-3.6.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:dbaa1ed9768bf9ff04af0919acc55746e62b28333644f0251f38768313f31745"}, - {file = "h5py-3.6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:954c5c39a09b5302f69f752c3bbf165d368a65c8d200f7d5655e0fa6368a75e6"}, - {file = "h5py-3.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:9fd8a14236fdd092a20c0bdf25c3aba3777718d266fabb0fdded4fcf252d1630"}, - {file = "h5py-3.6.0.tar.gz", hash = "sha256:8752d2814a92aba4e2b2a5922d2782d0029102d99caaf3c201a566bc0b40db29"}, + {file = "h5py-3.7.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d77af42cb751ad6cc44f11bae73075a07429a5cf2094dfde2b1e716e059b3911"}, + {file = "h5py-3.7.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:63beb8b7b47d0896c50de6efb9a1eaa81dbe211f3767e7dd7db159cea51ba37a"}, + {file = "h5py-3.7.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:04e2e1e2fc51b8873e972a08d2f89625ef999b1f2d276199011af57bb9fc7851"}, + {file = "h5py-3.7.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f73307c876af49aa869ec5df1818e9bb0bdcfcf8a5ba773cc45a4fba5a286a5c"}, + {file = "h5py-3.7.0-cp310-cp310-win_amd64.whl", hash = "sha256:f514b24cacdd983e61f8d371edac8c1b780c279d0acb8485639e97339c866073"}, + {file = "h5py-3.7.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:43fed4d13743cf02798a9a03a360a88e589d81285e72b83f47d37bb64ed44881"}, + {file = "h5py-3.7.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c038399ce09a58ff8d89ec3e62f00aa7cb82d14f34e24735b920e2a811a3a426"}, + {file = "h5py-3.7.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:03d64fb86bb86b978928bad923b64419a23e836499ec6363e305ad28afd9d287"}, + {file = "h5py-3.7.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e5b7820b75f9519499d76cc708e27242ccfdd9dfb511d6deb98701961d0445aa"}, + {file = "h5py-3.7.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a9351d729ea754db36d175098361b920573fdad334125f86ac1dd3a083355e20"}, + {file = "h5py-3.7.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:6776d896fb90c5938de8acb925e057e2f9f28755f67ec3edcbc8344832616c38"}, + {file = "h5py-3.7.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0a047fddbe6951bce40e9cde63373c838a978c5e05a011a682db9ba6334b8e85"}, + {file = "h5py-3.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0798a9c0ff45f17d0192e4d7114d734cac9f8b2b2c76dd1d923c4d0923f27bb6"}, + {file = "h5py-3.7.0-cp38-cp38-win_amd64.whl", hash = "sha256:0d8de8cb619fc597da7cf8cdcbf3b7ff8c5f6db836568afc7dc16d21f59b2b49"}, + {file = "h5py-3.7.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f084bbe816907dfe59006756f8f2d16d352faff2d107f4ffeb1d8de126fc5dc7"}, + {file = "h5py-3.7.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:1fcb11a2dc8eb7ddcae08afd8fae02ba10467753a857fa07a404d700a93f3d53"}, + {file = "h5py-3.7.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed43e2cc4f511756fd664fb45d6b66c3cbed4e3bd0f70e29c37809b2ae013c44"}, + {file = "h5py-3.7.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9e7535df5ee3dc3e5d1f408fdfc0b33b46bc9b34db82743c82cd674d8239b9ad"}, + {file = "h5py-3.7.0-cp39-cp39-win_amd64.whl", hash = "sha256:9e2ad2aa000f5b1e73b5dfe22f358ca46bf1a2b6ca394d9659874d7fc251731a"}, + {file = "h5py-3.7.0.tar.gz", hash = "sha256:3fcf37884383c5da64846ab510190720027dca0768def34dd8dcb659dbe5cbf3"}, @@ -3298,2 +3275,2 @@ huggingface-hub = [ - {file = "huggingface_hub-0.6.0-py3-none-any.whl", hash = "sha256:585d72adade562a1f7038acf39eb7677b7649bdc0ce082b70f99e01164d9d8b5"}, - {file = "huggingface_hub-0.6.0.tar.gz", hash = "sha256:f5109065222185d129933d44159e483a9e3378c577127d0281e4c921dfadbd23"}, + {file = "huggingface_hub-0.7.0-py3-none-any.whl", hash = "sha256:fd448fd0b738d803411c79bdf9f12f0ba171fecd24a59edf88c1391b473bc2c0"}, + {file = "huggingface_hub-0.7.0.tar.gz", hash = "sha256:8154dc2fad84b32a4bca18372a647d9381ed8550a80b11050758357b8fcea639"}, @@ -3340 +3317,3 @@ kss = [ -libcache = [] +libcache = [ + {file = "libcache-0.1.0-py3-none-any.whl", hash = "sha256:49e180ec7a334f2e886bf8628f7ddcb222dfd705e97a85611f1519bda1bc01ed"}, +] @@ -3350 +3329,3 @@ libclang = [ -libqueue = [] +libqueue = [ + {file = "libqueue-0.1.0-py3-none-any.whl", hash = "sha256:dfdffd63426b9866933ef61924b61a984e211419f6d10b11f2da0c9d724b8e91"}, +] @@ -3355 +3336,3 @@ librosa = [ -libutils = [] +libutils = [ + {file = "libutils-0.1.0-py3-none-any.whl", hash = "sha256:111594bc3775f86faaf0b2ff011e397698c6392e67b90dbcc4ac09f087fb3268"}, +] @@ -3357,21 +3340,28 @@ llvmlite = [ - {file = "llvmlite-0.36.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc0f9b9644b4ab0e4a5edb17f1531d791630c88858220d3cc688d6edf10da100"}, - {file = "llvmlite-0.36.0-cp36-cp36m-manylinux2010_i686.whl", hash = "sha256:f7918dbac02b1ebbfd7302ad8e8307d7877ab57d782d5f04b70ff9696b53c21b"}, - {file = "llvmlite-0.36.0-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:7768658646c418b9b3beccb7044277a608bc8c62b82a85e73c7e5c065e4157c2"}, - {file = "llvmlite-0.36.0-cp36-cp36m-win32.whl", hash = "sha256:05f807209a360d39526d98141b6f281b9c7c771c77a4d1fc22002440642c8de2"}, - {file = "llvmlite-0.36.0-cp36-cp36m-win_amd64.whl", hash = "sha256:d1fdd63c371626c25ad834e1c6297eb76cf2f093a40dbb401a87b6476ab4e34e"}, - {file = "llvmlite-0.36.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7c4e7066447305d5095d0b0a9cae7b835d2f0fde143456b3124110eab0856426"}, - {file = "llvmlite-0.36.0-cp37-cp37m-manylinux2010_i686.whl", hash = "sha256:9dad7e4bb042492914292aea3f4172eca84db731f9478250240955aedba95e08"}, - {file = "llvmlite-0.36.0-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:1ce5bc0a638d874a08d4222be0a7e48e5df305d094c2ff8dec525ef32b581551"}, - {file = "llvmlite-0.36.0-cp37-cp37m-win32.whl", hash = "sha256:dbedff0f6d417b374253a6bab39aa4b5364f1caab30c06ba8726904776fcf1cb"}, - {file = "llvmlite-0.36.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3b17fc4b0dd17bd29d7297d054e2915fad535889907c3f65232ee21f483447c5"}, - {file = "llvmlite-0.36.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b3a77e46e6053e2a86e607e87b97651dda81e619febb914824a927bff4e88737"}, - {file = "llvmlite-0.36.0-cp38-cp38-manylinux2010_i686.whl", hash = "sha256:048a7c117641c9be87b90005684e64a6f33ea0897ebab1df8a01214a10d6e79a"}, - {file = "llvmlite-0.36.0-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:7db4b0eef93125af1c4092c64a3c73c7dc904101117ef53f8d78a1a499b8d5f4"}, - {file = "llvmlite-0.36.0-cp38-cp38-win32.whl", hash = "sha256:50b1828bde514b31431b2bba1aa20b387f5625b81ad6e12fede430a04645e47a"}, - {file = "llvmlite-0.36.0-cp38-cp38-win_amd64.whl", hash = "sha256:f608bae781b2d343e15e080c546468c5a6f35f57f0446923ea198dd21f23757e"}, - {file = "llvmlite-0.36.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6a3abc8a8889aeb06bf9c4a7e5df5bc7bb1aa0aedd91a599813809abeec80b5a"}, - {file = "llvmlite-0.36.0-cp39-cp39-manylinux2010_i686.whl", hash = "sha256:705f0323d931684428bb3451549603299bb5e17dd60fb979d67c3807de0debc1"}, - {file = "llvmlite-0.36.0-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:5a6548b4899facb182145147185e9166c69826fb424895f227e6b7cf924a8da1"}, - {file = "llvmlite-0.36.0-cp39-cp39-win32.whl", hash = "sha256:ff52fb9c2be66b95b0e67d56fce11038397e5be1ea410ee53f5f1175fdbb107a"}, - {file = "llvmlite-0.36.0-cp39-cp39-win_amd64.whl", hash = "sha256:1dee416ea49fd338c74ec15c0c013e5273b0961528169af06ff90772614f7f6c"}, - {file = "llvmlite-0.36.0.tar.gz", hash = "sha256:765128fdf5f149ed0b889ffbe2b05eb1717f8e20a5c87fa2b4018fbcce0fcfc9"}, + {file = "llvmlite-0.38.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a7dd2bd1d6406e7789273e3f8a304ed5d9adcfaa5768052fca7dc233a857be98"}, + {file = "llvmlite-0.38.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7a5e0ed215a576f0f872f47a70b8cb49864e0aefc8586aff5ce83e3bff47bc23"}, + {file = "llvmlite-0.38.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:633c9026eb43b9903cc4ffbc1c7d5293b2e3ad95d06fa9eab0f6ce6ff6ea15b3"}, + {file = "llvmlite-0.38.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b98da8436dbc29013ea301f1fdb0d596ab53bf0ab65c976d96d00bb6faa0b479"}, + {file = "llvmlite-0.38.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0c0adce1793d66d009c554809f27baeb6258bf13f6fbaa12eff7443500caec25"}, + {file = "llvmlite-0.38.1-cp310-cp310-win32.whl", hash = "sha256:8c64c90a8b0b7b7e1ed1912ba82c1a3f43cf25affbe06aa3c56c84050edee8ac"}, + {file = "llvmlite-0.38.1-cp310-cp310-win_amd64.whl", hash = "sha256:ab070266f0f51304789a6c20d4be91a9e69683ad9bd4861eb89980e8eb613b3a"}, + {file = "llvmlite-0.38.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:ed7528b8b85de930b76407e44b080e4f376b7a007c2879749599ff8e2fe32753"}, + {file = "llvmlite-0.38.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7db018da2863034ad9c73c946625637f3a89635bc70576068bab4bd085eea90d"}, + {file = "llvmlite-0.38.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4c1e5805c92e049b4956ed01204c6647de6160ab9aefb0d67ea83ca02a1d889a"}, + {file = "llvmlite-0.38.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5559e46c79b4017c3c25edc3b9512d11adc3689b9046120c685b0905c08d48a5"}, + {file = "llvmlite-0.38.1-cp37-cp37m-win32.whl", hash = "sha256:ef9aa574eff2e15f8c47b255da0db5dab326dc7f76384c307ae35490e2d2489a"}, + {file = "llvmlite-0.38.1-cp37-cp37m-win_amd64.whl", hash = "sha256:84d5a0163c172db2b2ae561d2fc0866fbd9f716cf13f92c0d41ca4338e682672"}, + {file = "llvmlite-0.38.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a263252a68d85450110ec1f2b406c0414e49b04a4d216d31c0515ea1d59c3882"}, + {file = "llvmlite-0.38.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:de8bd61480173930f2a029673e7cd0738fbbb5171dfe490340839ad7301d4cf0"}, + {file = "llvmlite-0.38.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fbfbe546394c39db39a6898a51972aa131c8d6b0628517728b350552f58bdc19"}, + {file = "llvmlite-0.38.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8c4f26c6c370e134a909ac555a671fa1376e74c69af0208f25c0979472577a9d"}, + {file = "llvmlite-0.38.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f95f455697c44d7c04ef95fdfce04629f48df08a832d0a0d9eb2363186dbb969"}, + {file = "llvmlite-0.38.1-cp38-cp38-win32.whl", hash = "sha256:41e638a71c85a9a4a33f279c4cd812bc2f84122505b1f6ab8984ec7debb8548b"}, + {file = "llvmlite-0.38.1-cp38-cp38-win_amd64.whl", hash = "sha256:5c07d63df4578f31b39b764d3b4291f70157af7f42e171a8884ae7aaf989d1f7"}, + {file = "llvmlite-0.38.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:4e11bd9929dcbd55d5eb5cd7b08bf71b0097ea48cc192b69d102a90dd6e9816f"}, + {file = "llvmlite-0.38.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:edfa2c761cfa56cf76e783290d82e117f829bb691d8d90aa375505204888abac"}, + {file = "llvmlite-0.38.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0e609f7312a439b53b6f622d99180c3ff6a3e1e4ceca4d18aca1c5b46f4e3664"}, + {file = "llvmlite-0.38.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:9f53c3448410cc84d0e1af84dbc0d60ad32779853d40bcc8b1ee3c67ebbe94b1"}, + {file = "llvmlite-0.38.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9c8fac4edbadefa4dddf5dc6cca76bc2ae81df211dcd16a6638d60cc41249e56"}, + {file = "llvmlite-0.38.1-cp39-cp39-win32.whl", hash = "sha256:3d76c0fa42390bef56979ed213fbf0150c3fef36f5ea68d3d780d5d725da8c01"}, + {file = "llvmlite-0.38.1-cp39-cp39-win_amd64.whl", hash = "sha256:66462d768c30d5f648ca3361d657b434efa8b09f6cf04d6b6eae66e62e993644"}, + {file = "llvmlite-0.38.1.tar.gz", hash = "sha256:0622a86301fcf81cc50d7ed5b4bebe992c030580d413a8443b328ed4f4d82561"}, @@ -3581,21 +3571,28 @@ numba = [ - {file = "numba-0.53.1-cp36-cp36m-macosx_10_14_x86_64.whl", hash = "sha256:b23de6b6837c132087d06b8b92d343edb54b885873b824a037967fbd5272ebb7"}, - {file = "numba-0.53.1-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:6545b9e9b0c112b81de7f88a3c787469a357eeff8211e90b8f45ee243d521cc2"}, - {file = "numba-0.53.1-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:8fa5c963a43855050a868106a87cd614f3c3f459951c8fc468aec263ef80d063"}, - {file = "numba-0.53.1-cp36-cp36m-win32.whl", hash = "sha256:aaa6ebf56afb0b6752607b9f3bf39e99b0efe3c1fa6849698373925ee6838fd7"}, - {file = "numba-0.53.1-cp36-cp36m-win_amd64.whl", hash = "sha256:b08b3df38aab769df79ed948d70f0a54a3cdda49d58af65369235c204ec5d0f3"}, - {file = "numba-0.53.1-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:bf5c463b62d013e3f709cc8277adf2f4f4d8cc6757293e29c6db121b77e6b760"}, - {file = "numba-0.53.1-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:74df02e73155f669e60dcff07c4eef4a03dbf5b388594db74142ab40914fe4f5"}, - {file = "numba-0.53.1-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:5165709bf62f28667e10b9afe6df0ce1037722adab92d620f59cb8bbb8104641"}, - {file = "numba-0.53.1-cp37-cp37m-win32.whl", hash = "sha256:2e96958ed2ca7e6d967b2ce29c8da0ca47117e1de28e7c30b2c8c57386506fa5"}, - {file = "numba-0.53.1-cp37-cp37m-win_amd64.whl", hash = "sha256:276f9d1674fe08d95872d81b97267c6b39dd830f05eb992608cbede50fcf48a9"}, - {file = "numba-0.53.1-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:4c4c8d102512ae472af52c76ad9522da718c392cb59f4cd6785d711fa5051a2a"}, - {file = "numba-0.53.1-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:691adbeac17dbdf6ed7c759e9e33a522351f07d2065fe926b264b6b2c15fd89b"}, - {file = "numba-0.53.1-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:94aab3e0e9e8754116325ce026e1b29ae72443c706a3104cf7f3368dc3012912"}, - {file = "numba-0.53.1-cp38-cp38-win32.whl", hash = "sha256:aabeec89bb3e3162136eea492cea7ee8882ddcda2201f05caecdece192c40896"}, - {file = "numba-0.53.1-cp38-cp38-win_amd64.whl", hash = "sha256:1895ebd256819ff22256cd6fe24aa8f7470b18acc73e7917e8e93c9ac7f565dc"}, - {file = "numba-0.53.1-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:224d197a46a9e602a16780d87636e199e2cdef528caef084a4d8fd8909c2455c"}, - {file = "numba-0.53.1-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:aba7acb247a09d7f12bd17a8e28bbb04e8adef9fc20ca29835d03b7894e1b49f"}, - {file = "numba-0.53.1-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:bd126f1f49da6fc4b3169cf1d96f1c3b3f84a7badd11fe22da344b923a00e744"}, - {file = "numba-0.53.1-cp39-cp39-win32.whl", hash = "sha256:0ef9d1f347b251282ae46e5a5033600aa2d0dfa1ee8c16cb8137b8cd6f79e221"}, - {file = "numba-0.53.1-cp39-cp39-win_amd64.whl", hash = "sha256:17146885cbe4e89c9d4abd4fcb8886dee06d4591943dc4343500c36ce2fcfa69"}, - {file = "numba-0.53.1.tar.gz", hash = "sha256:9cd4e5216acdc66c4e9dab2dfd22ddb5bef151185c070d4a3cd8e78638aff5b0"}, + {file = "numba-0.55.2-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:dd05f7c0ce64b6977596aa4e5a44747c6ef414d7989da1c7672337c54381a5ef"}, + {file = "numba-0.55.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e36232eccd172c583b1f021c5c48744c087ae6fc9dc5c5f0dd2cb2286e517bf8"}, + {file = "numba-0.55.2-cp310-cp310-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:25410557d0deb1d97397b71e142a36772133986a7dd4fe2935786e2dd149245f"}, + {file = "numba-0.55.2-cp310-cp310-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:676c081162cc9403706071c1d1d42e479c0741551ab28096ba13859a2e3e9b80"}, + {file = "numba-0.55.2-cp310-cp310-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:2665ef28e900b3a55bf370daa81c12ebc64cd434116accd60c38a95a159a3182"}, + {file = "numba-0.55.2-cp310-cp310-win32.whl", hash = "sha256:d7ac9ea5feef9536ab8bfbbb3ded1a0617ea8794d7547800d535b7857800f996"}, + {file = "numba-0.55.2-cp310-cp310-win_amd64.whl", hash = "sha256:29b89a68af162acf87adeb8fbf01f6bb1effae4711b28146f95108d82e905624"}, + {file = "numba-0.55.2-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:6e0f9b5d1c8ea1bdef39b0ad921a9bbf0cc4a88e76d722d756c68f1653787c35"}, + {file = "numba-0.55.2-cp37-cp37m-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:135fb7694928f9f57b4ff5b1be58f20f4771fedd1680636a9affdead96051959"}, + {file = "numba-0.55.2-cp37-cp37m-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:de1f93bd7e2d431451aec20a52ac651a020e98a4ba46797fad860bba338a7e64"}, + {file = "numba-0.55.2-cp37-cp37m-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:3eaf53e73e700370163e58257257299ac0d46fea4f244bf5476e4635bc31d808"}, + {file = "numba-0.55.2-cp37-cp37m-win32.whl", hash = "sha256:da4485e0f0b9562f39c78887149b33d13d787aa696553c9257b95575122905ed"}, + {file = "numba-0.55.2-cp37-cp37m-win_amd64.whl", hash = "sha256:5559c6684bf6cce7a22c656d8fef3e7c38ff5fec5153abef5955f6f7cae9f102"}, + {file = "numba-0.55.2-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:a85779adc5234f7857615d1bd2c7b514314521f9f0163c33017707ed9816e6e6"}, + {file = "numba-0.55.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:16a52a0641c342b09b39f6762dcbe3846e44aa9baaaf4703b2ca42a3aee7346f"}, + {file = "numba-0.55.2-cp38-cp38-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:46715180f87d5a1f3e4077d207ade66c96fc01159f5b7d49cee2d6ffb9e6539f"}, + {file = "numba-0.55.2-cp38-cp38-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:d1c3cef3289fefb5673ceae32024ab5a8a08d4f4380bcb8348d01f1ba570ccff"}, + {file = "numba-0.55.2-cp38-cp38-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:68bb33eaef1d6155fc1ae4fa6c915b8a42e5052c89a58742254eaad072eab118"}, + {file = "numba-0.55.2-cp38-cp38-win32.whl", hash = "sha256:dfddd633141608a09cbce275fb9fe7aa514918625ace20b0e587898a2d93c030"}, + {file = "numba-0.55.2-cp38-cp38-win_amd64.whl", hash = "sha256:a669212aa66ffee4ad778016ac3819add33f9bcb96b4c384d3099531dd175085"}, + {file = "numba-0.55.2-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:dcde1a1a3a430fb5f83c7e095b0b6ac7adb5595f50a3ee05babb2964f31613c4"}, + {file = "numba-0.55.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:69b2e823efa40d32b259f5c094476dde2226b92032f17015d8cd7c10472654ce"}, + {file = "numba-0.55.2-cp39-cp39-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:20de0139d2267c8f0e2470d4f88540446cd1bf40de0f29f31b7ab9bf25d49b45"}, + {file = "numba-0.55.2-cp39-cp39-manylinux2014_i686.manylinux_2_17_i686.whl", hash = "sha256:09ff4d690abb05ffbb8a29a96d1cf35b46887a26796d3670de104beeec73d639"}, + {file = "numba-0.55.2-cp39-cp39-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:1105449247f338e49d63eb04a4aaa5c440bb5435df00f718c8e6e7afad841bb0"}, + {file = "numba-0.55.2-cp39-cp39-win32.whl", hash = "sha256:32649584144c35ced239937ab2c416ab22bbc1490ef8d90609c30fff9f6aa1b8"}, + {file = "numba-0.55.2-cp39-cp39-win_amd64.whl", hash = "sha256:8d5760a1e6a48d98d6b9cf774e4d2a64813d981cca60d7b7356af61195a6ca17"}, + {file = "numba-0.55.2.tar.gz", hash = "sha256:e428d9e11d9ba592849ccc9f7a009003eb7d30612007e365afe743ce7118c6f4"}, @@ -3627,4 +3623,0 @@ numpy = [ -oauth2client = [ - {file = "oauth2client-4.1.3-py2.py3-none-any.whl", hash = "sha256:b8a81cc5d60e2d364f0b1b98f958dbd472887acaf1a5b05e21c28c31a2d6d3ac"}, - {file = "oauth2client-4.1.3.tar.gz", hash = "sha256:d486741e451287f69568a4d26d70d9acd73a2bbfa275746c535b4209891cccc6"}, -] @@ -3776,2 +3769,2 @@ proto-plus = [ - {file = "proto-plus-1.20.4.tar.gz", hash = "sha256:6653541c2f1209e4d5268d3e6302791f72a95cc5f8bdcf3e60d943edc657e70a"}, - {file = "proto_plus-1.20.4-py3-none-any.whl", hash = "sha256:3cfaac30676793d5ee764a0982bc30481beb5059f315e2a2422d7c73ded5b601"}, + {file = "proto-plus-1.20.5.tar.gz", hash = "sha256:81794eb1be333c67986333948df70ebb8cdf538e039f8cfa92fd2a9d7176d405"}, + {file = "proto_plus-1.20.5-py3-none-any.whl", hash = "sha256:fa29fec8a91cf178bc1d8bf9263769421d2dba7787eae42b67235676e211c158"}, @@ -3848,36 +3841,30 @@ pyarrow = [ - {file = "pyarrow-6.0.1-cp310-cp310-macosx_10_13_universal2.whl", hash = "sha256:c80d2436294a07f9cc54852aa1cef034b6f9c97d29235c4bd53bbf52e24f1ebf"}, - {file = "pyarrow-6.0.1-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:f150b4f222d0ba397388908725692232345adaa8e58ad543ca00f03c7234ae7b"}, - {file = "pyarrow-6.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c3a727642c1283dcb44728f0d0a00f8864b171e31c835f4b8def07e3fa8f5c73"}, - {file = "pyarrow-6.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d29605727865177918e806d855fd8404b6242bf1e56ade0a0023cd4fe5f7f841"}, - {file = "pyarrow-6.0.1-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:b63b54dd0bada05fff76c15b233f9322de0e6947071b7871ec45024e16045aeb"}, - {file = "pyarrow-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9e90e75cb11e61ffeffb374f1db7c4788f1df0cb269596bf86c473155294958d"}, - {file = "pyarrow-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f4f3db1da51db4cfbafab3066a01b01578884206dced9f505da950d9ed4402d"}, - {file = "pyarrow-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:2523f87bd36877123fc8c4813f60d298722143ead73e907690a87e8557114693"}, - {file = "pyarrow-6.0.1-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:8f7d34efb9d667f9204b40ce91a77613c46691c24cd098e3b6986bd7401b8f06"}, - {file = "pyarrow-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:e3c9184335da8faf08c0df95668ce9d778df3795ce4eec959f44908742900e10"}, - {file = "pyarrow-6.0.1-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:02baee816456a6e64486e587caaae2bf9f084fa3a891354ff18c3e945a1cb72f"}, - {file = "pyarrow-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:604782b1c744b24a55df80125991a7154fbdef60991eb3d02bfaed06d22f055e"}, - {file = "pyarrow-6.0.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fab8132193ae095c43b1e8d6d7f393451ac198de5aaf011c6b576b1442966fec"}, - {file = "pyarrow-6.0.1-cp36-cp36m-win_amd64.whl", hash = "sha256:31038366484e538608f43920a5e2957b8862a43aa49438814619b527f50ec127"}, - {file = "pyarrow-6.0.1-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:632bea00c2fbe2da5d29ff1698fec312ed3aabfb548f06100144e1907e22093a"}, - {file = "pyarrow-6.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:dc03c875e5d68b0d0143f94c438add3ab3c2411ade2748423a9c24608fea571e"}, - {file = "pyarrow-6.0.1-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1cd4de317df01679e538004123d6d7bc325d73bad5c6bbc3d5f8aa2280408869"}, - {file = "pyarrow-6.0.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e77b1f7c6c08ec319b7882c1a7c7304731530923532b3243060e6e64c456cf34"}, - {file = "pyarrow-6.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a424fd9a3253d0322d53be7bbb20b5b01511706a61efadcf37f416da325e3d48"}, - {file = "pyarrow-6.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:c958cf3a4a9eee09e1063c02b89e882d19c61b3a2ce6cbd55191a6f45ed5004b"}, - {file = "pyarrow-6.0.1-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:0e0ef24b316c544f4bb56f5c376129097df3739e665feca0eb567f716d45c55a"}, - {file = "pyarrow-6.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2c13ec3b26b3b069d673c5fa3a0c70c38f0d5c94686ac5dbc9d7e7d24040f812"}, - {file = "pyarrow-6.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:71891049dc58039a9523e1cb0d921be001dacb2b327fa7b62a35b96a3aad9f0d"}, - {file = "pyarrow-6.0.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:943141dd8cca6c5722552a0b11a3c2e791cdf85f1768dea8170b0a8a7e824ff9"}, - {file = "pyarrow-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fd077c06061b8fa8fdf91591a4270e368f63cf73c6ab56924d3b64efa96a873"}, - {file = "pyarrow-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5308f4bb770b48e07c8cff36cf6a4452862e8ce9492428ad5581d846420b3884"}, - {file = "pyarrow-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:cde4f711cd9476d4da18128c3a40cb529b6b7d2679aee6e0576212547530fef1"}, - {file = "pyarrow-6.0.1-cp39-cp39-macosx_10_13_universal2.whl", hash = "sha256:b8628269bd9289cae0ea668f5900451043252fe3666667f614e140084dd31aac"}, - {file = "pyarrow-6.0.1-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:981ccdf4f2696550733e18da882469893d2f33f55f3cbeb6a90f81741cbf67aa"}, - {file = "pyarrow-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:954326b426eec6e31ff55209f8840b54d788420e96c4005aaa7beed1fe60b42d"}, - {file = "pyarrow-6.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:6b6483bf6b61fe9a046235e4ad4d9286b707607878d7dbdc2eb85a6ec4090baf"}, - {file = "pyarrow-6.0.1-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7ecad40a1d4e0104cd87757a403f36850261e7a989cf9e4cb3e30420bbbd1092"}, - {file = "pyarrow-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:04c752fb41921d0064568a15a87dbb0222cfbe9040d4b2c1b306fe6e0a453530"}, - {file = "pyarrow-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:725d3fe49dfe392ff14a8ae6a75b230a60e8985f2b621b18cfa912fe02b65f1a"}, - {file = "pyarrow-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:2403c8af207262ce8e2bc1a9d19313941fd2e424f1cb3c4b749c17efe1fd699a"}, - {file = "pyarrow-6.0.1.tar.gz", hash = "sha256:423990d56cd8f12283b67367d48e142739b789085185018eb03d05087c3c8d43"}, + {file = "pyarrow-7.0.0-cp310-cp310-macosx_10_13_universal2.whl", hash = "sha256:0f15213f380539c9640cb2413dc677b55e70f04c9e98cfc2e1d8b36c770e1036"}, + {file = "pyarrow-7.0.0-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:29c4e3b3be0b94d07ff4921a5e410fc690a3a066a850a302fc504de5fc638495"}, + {file = "pyarrow-7.0.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:8a9bfc8a016bcb8f9a8536d2fa14a890b340bc7a236275cd60fd4fb8b93ff405"}, + {file = "pyarrow-7.0.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:49d431ed644a3e8f53ae2bbf4b514743570b495b5829548db51610534b6eeee7"}, + {file = "pyarrow-7.0.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6442a321c1e49480b3d436f7d631c895048a16df572cf71c23c6b53c45ed66"}, + {file = "pyarrow-7.0.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f6b01a23cb401750092c6f7c4dcae67cd8fd6b99ae710e26f654f23508f25f25"}, + {file = "pyarrow-7.0.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0f10928745c6ff66e121552731409803bed86c66ac79c64c90438b053b5242c5"}, + {file = "pyarrow-7.0.0-cp310-cp310-win_amd64.whl", hash = "sha256:759090caa1474cafb5e68c93a9bd6cb45d8bb8e4f2cad2f1a0cc9439bae8ae88"}, + {file = "pyarrow-7.0.0-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:e3fe34bcfc28d9c4a747adc3926d2307a04c5c50b89155946739515ccfe5eab0"}, + {file = "pyarrow-7.0.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:040dce5345603e4e621bcf4f3b21f18d557852e7b15307e559bb14c8951c8714"}, + {file = "pyarrow-7.0.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed4b647c3345ae3463d341a9d28d0260cd302fb92ecf4e2e3e0f1656d6e0e55c"}, + {file = "pyarrow-7.0.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e7fecd5d5604f47e003f50887a42aee06cb8b7bf8e8bf7dc543a22331d9ba832"}, + {file = "pyarrow-7.0.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1f2d00b892fe865e43346acb78761ba268f8bb1cbdba588816590abcb780ee3d"}, + {file = "pyarrow-7.0.0-cp37-cp37m-win_amd64.whl", hash = "sha256:f439f7d77201681fd31391d189aa6b1322d27c9311a8f2fce7d23972471b02b6"}, + {file = "pyarrow-7.0.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:3e06b0e29ce1e32f219c670c6b31c33d25a5b8e29c7828f873373aab78bf30a5"}, + {file = "pyarrow-7.0.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:13dc05bcf79dbc1bd2de1b05d26eb64824b85883d019d81ca3c2eca9b68b5a44"}, + {file = "pyarrow-7.0.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:06183a7ff2b0c030ec0413fc4dc98abad8cf336c78c280a0b7f4bcbebb78d125"}, + {file = "pyarrow-7.0.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:702c5a9f960b56d03569eaaca2c1a05e8728f05ea1a2138ef64234aa53cd5884"}, + {file = "pyarrow-7.0.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c7313038203df77ec4092d6363dbc0945071caa72635f365f2b1ae0dd7469865"}, + {file = "pyarrow-7.0.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e87d1f7dc7a0b2ecaeb0c7a883a85710f5b5626d4134454f905571c04bc73d5a"}, + {file = "pyarrow-7.0.0-cp38-cp38-win_amd64.whl", hash = "sha256:ba69488ae25c7fde1a2ae9ea29daf04d676de8960ffd6f82e1e13ca945bb5861"}, + {file = "pyarrow-7.0.0-cp39-cp39-macosx_10_13_universal2.whl", hash = "sha256:11a591f11d2697c751261c9d57e6e5b0d38fdc7f0cc57f4fd6edc657da7737df"}, + {file = "pyarrow-7.0.0-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:6183c700877852dc0f8a76d4c0c2ffd803ba459e2b4a452e355c2d58d48cf39f"}, + {file = "pyarrow-7.0.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d1748154714b543e6ae8452a68d4af85caf5298296a7e5d4d00f1b3021838ac6"}, + {file = "pyarrow-7.0.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fcc8f934c7847a88f13ec35feecffb61fe63bb7a3078bd98dd353762e969ce60"}, + {file = "pyarrow-7.0.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:759f59ac77b84878dbd54d06cf6df74ff781b8e7cf9313eeffbb5ec97b94385c"}, + {file = "pyarrow-7.0.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3d3e3f93ac2993df9c5e1922eab7bdea047b9da918a74e52145399bc1f0099a3"}, + {file = "pyarrow-7.0.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:306120af554e7e137895254a3b4741fad682875a5f6403509cd276de3fe5b844"}, + {file = "pyarrow-7.0.0-cp39-cp39-win_amd64.whl", hash = "sha256:087769dac6e567d58d59b94c4f866b3356c00d3db5b261387ece47e7324c2150"}, + {file = "pyarrow-7.0.0.tar.gz", hash = "sha256:da656cad3c23a2ebb6a307ab01d35fce22f7850059cffafcb90d12590f8f4f38"}, @@ -4806,2 +4793,2 @@ types-requests = [ - {file = "types-requests-2.27.27.tar.gz", hash = "sha256:d618d9809fa32f514cf17cea8460814da671c56366fb1c908accca8bf183112b"}, - {file = "types_requests-2.27.27-py3-none-any.whl", hash = "sha256:6d8463ffe1f6edcf2e5361740a6140e7a16d427c267d83c7c1d3d1298f4e67c5"}, + {file = "types-requests-2.27.29.tar.gz", hash = "sha256:fb453b3a76a48eca66381cea8004feaaea12835e838196f5c7ac87c75c5c19ef"}, + {file = "types_requests-2.27.29-py3-none-any.whl", hash = "sha256:014f4f82db7b96c41feea9adaea30e68cd64c230eeab34b70c29bebb26ec74ac"}, @@ -4810,2 +4797,2 @@ types-urllib3 = [ - {file = "types-urllib3-1.26.14.tar.gz", hash = "sha256:2a2578e4b36341ccd240b00fccda9826988ff0589a44ba4a664bbd69ef348d27"}, - {file = "types_urllib3-1.26.14-py3-none-any.whl", hash = "sha256:5d2388aa76395b1e3999ff789ea5b3283677dad8e9bcf3d9117ba19271fd35d9"}, + {file = "types-urllib3-1.26.15.tar.gz", hash = "sha256:c89283541ef92e344b7f59f83ea9b5a295b16366ceee3f25ecfc5593c79f794e"}, + {file = "types_urllib3-1.26.15-py3-none-any.whl", hash = "sha256:6011befa13f901fc934f59bb1fd6973be6f3acf4ebfce427593a27e7f492918f"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 83bec3dc..d488868f 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -18,3 +18,3 @@ kss = "^2.6.0" -libcache = { path = "../../libs/libcache", develop = true } -libqueue = { path = "../../libs/libqueue", develop = true } -libutils = { path = "../../libs/libutils", develop = true } +libcache = { path = "../../libs/libcache/dist/libcache-0.1.0-py3-none-any.whl", develop = false } +libqueue = { path = "../../libs/libqueue/dist/libqueue-0.1.0-py3-none-any.whl", develop = false } +libutils = { path = "../../libs/libutils/dist/libutils-0.1.0-py3-none-any.whl", develop = false }
7c7a0768ac01dc52a3bce8064c2f6d2270548813
Sylvain Lesage
2022-05-25T16:41:32
ci: 🎡 use cache (gha) when building the docker images (#313)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ead86f58..a3bfd130 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,0 +21,2 @@ jobs: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 @@ -35 +37 @@ jobs: - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + uses: docker/metadata-action@v4 @@ -41 +43 @@ jobs: - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + uses: docker/build-push-action@v3 @@ -48,0 +51,3 @@ jobs: + # see https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#cache-backend-api + cache-from: type=gha,scope=buildkit-${{ matrix.service }} + cache-to: type=gha,mode=max,scope=buildkit-${{ matrix.service }}
40b2a75c56dc30112670e493f0bf8861d1ee817b
Sylvain Lesage
2022-05-24T18:57:56
feat: 🎸 block two datasets (#305)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 103ff384..80287729 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -22 +22 @@ domain: "datasets-server.huggingface.tech" -datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech,electricity_load_diagrams,svhn,the_pile,gary109/crop14_public-test,scielo,hyperpartisan_news_detection,wiki_auto,visual_genome,ms_marco" +datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech,electricity_load_diagrams,svhn,the_pile,gary109/crop14_public-test,scielo,hyperpartisan_news_detection,wiki_auto,visual_genome,ms_marco,Aniemore/resd,trashsock/hands-images"
4ccaad73b6db17429022bf0062b19e521f115fab
Sylvain Lesage
2022-05-24T18:53:35
perf: ⚡️ increase the number of replicas for the API (#304)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 71c718da..103ff384 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -62 +62 @@ api: - replicas: 1 + replicas: 3 @@ -76 +76,3 @@ api: - appNumWorkers: "8" + # (2 x $num_cores) + 1 + # https://docs.gunicorn.org/en/stable/design.html#how-many-workers + appNumWorkers: "9"
c208aa043d7c9cfae33846bc1cc8d05f174a31c0
Sylvain Lesage
2022-05-24T18:49:03
feat: 🎸 update the docker images (#303)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 89e9fd3f..b4acdf42 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-040a1f3 + tag: sha-da86243
da862438846842572e489bc3e534483c948d56df
Sylvain Lesage
2022-05-24T09:11:43
fix: 🐛 disable cache and queue metrics for now (#300)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 8363e6a5..89e9fd3f 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-f68c206 + tag: sha-040a1f3 diff --git a/services/api/src/api/prometheus.py b/services/api/src/api/prometheus.py index e51f6f1f..bb7729ef 100644 --- a/services/api/src/api/prometheus.py +++ b/services/api/src/api/prometheus.py @@ -58 +58,2 @@ class Prometheus: - self.updateMetrics() + # Disable for now - see https://github.com/huggingface/datasets-server/issues/250#issuecomment-1135561566 + # self.updateMetrics() diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index 11149e4d..fc2b3c88 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -346,2 +346,3 @@ def test_metrics(client: TestClient) -> None: - assert 'queue_jobs_total{queue="datasets",status="waiting"}' in metrics - assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics + # Disable for now - see https://github.com/huggingface/datasets-server/issues/250#issuecomment-1135561566 + # assert 'queue_jobs_total{queue="datasets",status="waiting"}' in metrics + # assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics
9129f30783ee87bc6db2db472a1b6508028a8176
Sylvain Lesage
2022-05-23T16:06:31
feat: 🎸 update docker images (#299)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 89e9fd3f..8363e6a5 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-040a1f3 + tag: sha-f68c206
f68c2064610342fbb478890bf433ee20374e4d60
Sylvain Lesage
2022-05-23T15:52:27
Reenable metrics (#298)
diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index f2905ca4..49089c42 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -122,0 +123,3 @@ class DbSplit(Document): +AnyDb = TypeVar("AnyDb", DbDataset, DbSplit) # Must be DbDataset or DbSplit + + @@ -468,10 +470,0 @@ def get_dataset_names_with_status(status: str) -> List[str]: -def get_datasets_count_with_status(status: Status) -> int: - # TODO: take the splits statuses into account? - return DbDataset.objects(status=status).count() - - -def get_splits_count_with_status(status: Status) -> int: - # TODO: take the splits statuses into account? - return DbSplit.objects(status=status).count() - - @@ -485 +478,3 @@ class CountByStatus(TypedDict): -def get_datasets_count_by_status() -> CountByStatus: +def get_entries_count_by_status(entries: QuerySet[AnyDb]) -> CountByStatus: + frequencies: Dict[str, int] = entries.item_frequencies("status", normalize=False) # type: ignore + # ensure that all the statuses are present, even if equal to zero @@ -487,4 +482,4 @@ def get_datasets_count_by_status() -> CountByStatus: - "empty": get_datasets_count_with_status(Status.EMPTY), - "error": get_datasets_count_with_status(Status.ERROR), - "stalled": get_datasets_count_with_status(Status.STALLED), - "valid": get_datasets_count_with_status(Status.VALID), + "empty": frequencies.get(Status.EMPTY.value, 0), + "error": frequencies.get(Status.ERROR.value, 0), + "stalled": frequencies.get(Status.STALLED.value, 0), + "valid": frequencies.get(Status.VALID.value, 0), @@ -493,0 +489,5 @@ def get_datasets_count_by_status() -> CountByStatus: +def get_datasets_count_by_status() -> CountByStatus: + # TODO: take the splits statuses into account? + return get_entries_count_by_status(DbDataset.objects) + + @@ -495,6 +495 @@ def get_splits_count_by_status() -> CountByStatus: - return { - "empty": get_splits_count_with_status(Status.EMPTY), - "error": get_splits_count_with_status(Status.ERROR), - "stalled": get_splits_count_with_status(Status.STALLED), - "valid": get_splits_count_with_status(Status.VALID), - } + return get_entries_count_by_status(DbSplit.objects) diff --git a/libs/libcache/tests/test_cache.py b/libs/libcache/tests/test_cache.py index 2fc0fbb6..5cd673f3 100644 --- a/libs/libcache/tests/test_cache.py +++ b/libs/libcache/tests/test_cache.py @@ -12,0 +13 @@ from libcache.cache import ( + get_datasets_count_by_status, @@ -13,0 +15 @@ from libcache.cache import ( + get_splits_count_by_status, @@ -148,0 +151,25 @@ def test_valid() -> None: + + +def test_count_by_status() -> None: + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 0} + + upsert_dataset( + "test_dataset", [{"dataset_name": "test_dataset", "config_name": "test_config", "split_name": "test_split"}] + ) + + assert get_datasets_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} + assert get_splits_count_by_status() == {"empty": 1, "error": 0, "stalled": 0, "valid": 0} + + upsert_split( + "test_dataset", + "test_config", + "test_split", + { + "split_name": "test_split", + "rows_response": {"rows": [], "columns": []}, + "num_bytes": None, + "num_examples": None, + }, + ) + + assert get_splits_count_by_status() == {"empty": 0, "error": 0, "stalled": 0, "valid": 1} diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index 67e1edb7..e3dc6832 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -5 +5 @@ from datetime import datetime -from typing import Generic, List, Optional, Tuple, Type, TypedDict, TypeVar +from typing import Dict, Generic, List, Optional, Tuple, Type, TypedDict, TypeVar @@ -306,0 +307,2 @@ def get_jobs_count_by_status(jobs: QuerySet[AnyJob]) -> CountByStatus: + frequencies: Dict[str, int] = jobs.item_frequencies("status", normalize=False) # type: ignore + # ensure that all the statuses are present, even if equal to zero @@ -308,5 +310,5 @@ def get_jobs_count_by_status(jobs: QuerySet[AnyJob]) -> CountByStatus: - "waiting": get_jobs_with_status(jobs, Status.WAITING).count(), - "started": get_jobs_with_status(jobs, Status.STARTED).count(), - "success": get_jobs_with_status(jobs, Status.SUCCESS).count(), - "error": get_jobs_with_status(jobs, Status.ERROR).count(), - "cancelled": get_jobs_with_status(jobs, Status.CANCELLED).count(), + "waiting": frequencies.get(Status.WAITING.value, 0), + "started": frequencies.get(Status.STARTED.value, 0), + "success": frequencies.get(Status.SUCCESS.value, 0), + "error": frequencies.get(Status.ERROR.value, 0), + "cancelled": frequencies.get(Status.CANCELLED.value, 0), diff --git a/libs/libqueue/tests/test_queue.py b/libs/libqueue/tests/test_queue.py index 83707640..01278c10 100644 --- a/libs/libqueue/tests/test_queue.py +++ b/libs/libqueue/tests/test_queue.py @@ -10,0 +11 @@ from libqueue.queue import ( + get_dataset_jobs_count_by_status, @@ -11,0 +13 @@ from libqueue.queue import ( + get_split_jobs_count_by_status, @@ -89,0 +92,26 @@ def test_is_split_in_queue() -> None: + + +def test_count_by_status() -> None: + assert get_dataset_jobs_count_by_status() == { + "waiting": 0, + "started": 0, + "success": 0, + "error": 0, + "cancelled": 0, + } + + add_dataset_job("test_dataset") + + assert get_dataset_jobs_count_by_status() == {"waiting": 1, "started": 0, "success": 0, "error": 0, "cancelled": 0} + + assert get_split_jobs_count_by_status() == { + "waiting": 0, + "started": 0, + "success": 0, + "error": 0, + "cancelled": 0, + } + + add_split_job("test_dataset", "test_config", "test_split") + + assert get_split_jobs_count_by_status() == {"waiting": 1, "started": 0, "success": 0, "error": 0, "cancelled": 0} diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 5e20e5ca..6133a99b 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -735 +735 @@ name = "prometheus-client" -version = "0.14.1" +version = "0.12.0" @@ -739 +739 @@ optional = false -python-versions = ">=3.6" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" @@ -1069,0 +1070,12 @@ full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "gra +[[package]] +name = "starlette-prometheus" +version = "0.9.0" +description = "Prometheus integration for Starlette" +category = "main" +optional = false +python-versions = ">=3.7,<4.0" + +[package.dependencies] +prometheus_client = ">=0.12,<0.13" +starlette = ">=0.12.2" + @@ -1192 +1204 @@ python-versions = "3.9.6" -content-hash = "220f504588ab6b978e29e6e613926e8f5b67d01df5109248827987b4e5f21510" +content-hash = "4e0781c9059d07cfda1a4419eee819ad7a24ef7b84f0d998077b7c0619dc18f6" @@ -1628,2 +1640,2 @@ prometheus-client = [ - {file = "prometheus_client-0.14.1-py3-none-any.whl", hash = "sha256:522fded625282822a89e2773452f42df14b5a8e84a86433e3f8a189c1d54dc01"}, - {file = "prometheus_client-0.14.1.tar.gz", hash = "sha256:5459c427624961076277fdc6dc50540e2bacb98eebde99886e59ec55ed92093a"}, + {file = "prometheus_client-0.12.0-py2.py3-none-any.whl", hash = "sha256:317453ebabff0a1b02df7f708efbab21e3489e7072b61cb6957230dd004a0af0"}, + {file = "prometheus_client-0.12.0.tar.gz", hash = "sha256:1b12ba48cee33b9b0b9de64a1047cbd3c5f2d0ab6ebcead7ddda613a750ec3c5"}, @@ -1997,0 +2010,4 @@ starlette = [ +starlette-prometheus = [ + {file = "starlette-prometheus-0.9.0.tar.gz", hash = "sha256:a52fb0f1df52b44a7a677a792759337ef0ce0d59ddf3e684a7d6459a93a90e99"}, + {file = "starlette_prometheus-0.9.0-py3-none-any.whl", hash = "sha256:b4702e4ec67dce508d28551db0e45f12f58411afdb5d1078c92ff74331915381"}, +] diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index f24d6b1a..943a2181 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -12 +11,0 @@ libutils = { path = "../../libs/libutils", develop = true } -prometheus-client = "^0.14.1" @@ -15,0 +15 @@ starlette = "^0.16.0" +starlette-prometheus = "^0.9.0" diff --git a/services/api/src/api/app.py b/services/api/src/api/app.py index e21523d4..c8d330d3 100644 --- a/services/api/src/api/app.py +++ b/services/api/src/api/app.py @@ -10,0 +11 @@ from starlette.staticfiles import StaticFiles +from starlette_prometheus import PrometheusMiddleware @@ -47 +48 @@ def create_app() -> Starlette: - middleware = [Middleware(GZipMiddleware)] + middleware = [Middleware(GZipMiddleware), Middleware(PrometheusMiddleware, filter_unhandled_paths=True)] diff --git a/services/api/src/api/prometheus.py b/services/api/src/api/prometheus.py index a890c751..e51f6f1f 100644 --- a/services/api/src/api/prometheus.py +++ b/services/api/src/api/prometheus.py @@ -58,2 +58 @@ class Prometheus: - # disabled for now to fix https://github.com/huggingface/datasets-server/issues/279 - # self.updateMetrics() + self.updateMetrics() diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index 73ad64ac..11149e4d 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -346,3 +346,3 @@ def test_metrics(client: TestClient) -> None: - # Disabled for now - # assert 'queue_jobs_total{queue="datasets",status="waiting"}' in metrics - # assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics + assert 'queue_jobs_total{queue="datasets",status="waiting"}' in metrics + assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics + assert 'starlette_requests_total{method="GET",path_template="/metrics"}' in metrics
1fc3fa7eeb61fb71ae2737ed341b01b4f0524a7f
Sylvain Lesage
2022-05-23T11:27:20
feat: 🎸 update docker images (#296)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index c9a832de..89e9fd3f 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-9b0e088 + tag: sha-040a1f3
040a1f395a4ad3c28f6c2797789fa999cba3dbd7
Sylvain Lesage
2022-05-23T11:25:42
feat: 🎸 add indexes in mongo (#295)
diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index b72cf1b4..f2905ca4 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -72 +72 @@ class DbDataset(Document): - meta = {"collection": "datasets", "db_alias": "cache"} + meta = {"collection": "datasets", "db_alias": "cache", "indexes": ["dataset_name", "status"]} @@ -115 +115,5 @@ class DbSplit(Document): - meta = {"collection": "splits", "db_alias": "cache"} + meta = { + "collection": "splits", + "db_alias": "cache", + "indexes": ["status", ("dataset_name", "config_name", "split_name"), ("dataset_name", "status")], + } @@ -174 +178,5 @@ class DbSplitError(Document): - meta = {"collection": "split_errors", "db_alias": "cache"} + meta = { + "collection": "split_errors", + "db_alias": "cache", + "indexes": [("dataset_name", "config_name", "split_name")], + } diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index e5209b1a..67e1edb7 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -87 +87,5 @@ class DatasetJob(Document): - meta = {"collection": "dataset_jobs", "db_alias": "queue"} + meta = { + "collection": "dataset_jobs", + "db_alias": "queue", + "indexes": ["status", "dataset_name", ("dataset_name", "status")], + } @@ -110 +114,10 @@ class SplitJob(Document): - meta = {"collection": "split_jobs", "db_alias": "queue"} + meta = { + "collection": "split_jobs", + "db_alias": "queue", + "indexes": [ + "status", + ("dataset_name", "config_name", "split_name"), + ("dataset_name", "status"), + ("dataset_name", "config_name", "split_name", "status"), + ], + }
cea986c343089e4871c0935c74817bf0e4171580
Sylvain Lesage
2022-05-23T09:42:34
Update docker images (#294)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 653d668f..c9a832de 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-7982145 + tag: sha-9b0e088 diff --git a/libs/libcache/tests/test_cache.py b/libs/libcache/tests/test_cache.py index 004dbbb9..2fc0fbb6 100644 --- a/libs/libcache/tests/test_cache.py +++ b/libs/libcache/tests/test_cache.py @@ -3,0 +4 @@ import pytest +from libutils.exceptions import Status400Error @@ -18 +18,0 @@ from libcache.cache import ( -from libutils.exceptions import Status400Error
9b0e0883f9fc0185a097dae96662af5b9d9689c0
Sylvain Lesage
2022-05-23T09:29:42
Fix valid endpoint query (#292)
diff --git a/libs/libcache/Makefile b/libs/libcache/Makefile index ae98c11c..e71d7ed6 100644 --- a/libs/libcache/Makefile +++ b/libs/libcache/Makefile @@ -5 +5,3 @@ test: - MONGO_CACHE_DATABASE="datasets_server_cache_test" poetry run python -m pytest -x tests + docker-compose -f tests/docker-compose.yml up -d + MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_URL="mongodb://localhost:27018" poetry run python -m pytest -x tests + docker-compose -f tests/docker-compose.yml down @@ -9 +11,3 @@ coverage: - MONGO_CACHE_DATABASE="datasets_server_cache_test" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests + docker-compose -f tests/docker-compose.yml up -d + MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_URL="mongodb://localhost:27018" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests + docker-compose -f tests/docker-compose.yml down diff --git a/libs/libcache/src/libcache/cache.py b/libs/libcache/src/libcache/cache.py index 7132e4db..b72cf1b4 100644 --- a/libs/libcache/src/libcache/cache.py +++ b/libs/libcache/src/libcache/cache.py @@ -441 +441,12 @@ def get_valid_or_stalled_dataset_names() -> List[str]: - return [d.dataset_name for d in DbDataset.objects() if is_dataset_valid_or_stalled(d)] + # a dataset is considered valid if: + # - the dataset is valid or stalled + candidate_dataset_names = { + d.dataset_name for d in DbDataset.objects(status__in=[Status.VALID, Status.STALLED]).only("dataset_name") + } + # - at least one of its splits is valid or stalled + candidate_dataset_names_in_splits = { + d.dataset_name for d in DbSplit.objects(status__in=[Status.VALID, Status.STALLED]).only("dataset_name") + } + candidate_dataset_names.intersection_update(candidate_dataset_names_in_splits) + # note that the list is sorted alphabetically for consistency + return sorted(candidate_dataset_names) diff --git a/libs/libcache/tests/docker-compose.yml b/libs/libcache/tests/docker-compose.yml new file mode 100644 index 00000000..459d2d4d --- /dev/null +++ b/libs/libcache/tests/docker-compose.yml @@ -0,0 +1,10 @@ +version: "3.9" +services: + mongodb-test: + image: mongo + volumes: + - mongo-test:/data/db:rw + ports: + - 27018:27017 +volumes: + mongo-test: diff --git a/libs/libcache/tests/test_cache.py b/libs/libcache/tests/test_cache.py index b43e78c3..004dbbb9 100644 --- a/libs/libcache/tests/test_cache.py +++ b/libs/libcache/tests/test_cache.py @@ -12,0 +13 @@ from libcache.cache import ( + get_valid_or_stalled_dataset_names, @@ -14,0 +16 @@ from libcache.cache import ( + upsert_split_error, @@ -15,0 +18 @@ from libcache.cache import ( +from libutils.exceptions import Status400Error @@ -93,0 +97,52 @@ def test_big_row() -> None: + + +def test_valid() -> None: + assert get_valid_or_stalled_dataset_names() == [] + + upsert_dataset( + "test_dataset", [{"dataset_name": "test_dataset", "config_name": "test_config", "split_name": "test_split"}] + ) + + assert get_valid_or_stalled_dataset_names() == [] + + upsert_split( + "test_dataset", + "test_config", + "test_split", + { + "split_name": "test_split", + "rows_response": {"rows": [], "columns": []}, + "num_bytes": None, + "num_examples": None, + }, + ) + + assert get_valid_or_stalled_dataset_names() == ["test_dataset"] + + upsert_dataset( + "test_dataset2", + [ + {"dataset_name": "test_dataset2", "config_name": "test_config2", "split_name": "test_split2"}, + {"dataset_name": "test_dataset2", "config_name": "test_config2", "split_name": "test_split3"}, + ], + ) + + assert get_valid_or_stalled_dataset_names() == ["test_dataset"] + + upsert_split_error("test_dataset2", "test_config2", "test_split2", Status400Error("error")) + + assert get_valid_or_stalled_dataset_names() == ["test_dataset"] + + upsert_split( + "test_dataset2", + "test_config2", + "test_split3", + { + "split_name": "test_split3", + "rows_response": {"rows": [], "columns": []}, + "num_bytes": None, + "num_examples": None, + }, + ) + + assert get_valid_or_stalled_dataset_names() == ["test_dataset", "test_dataset2"]
6d0bb084a649a854bd4e7a0db2e3396563f39acf
Sylvain Lesage
2022-05-23T08:40:17
feat: 🎸 update docker images (#291)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 8341b84f..71c718da 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -22 +22 @@ domain: "datasets-server.huggingface.tech" -datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech,electricity_load_diagrams,svhn,the_pile,gary109/crop14_public-test,scielo,hyperpartisan_news_detection,wiki_auto,visual_genome" +datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech,electricity_load_diagrams,svhn,the_pile,gary109/crop14_public-test,scielo,hyperpartisan_news_detection,wiki_auto,visual_genome,ms_marco" diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 6d371838..653d668f 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-cc59942 + tag: sha-7982145
7982145225de551c9b9c61a162b0839a61625f63
Sylvain Lesage
2022-05-23T08:23:15
feat: 🎸 upgrade datasets to 2.2.2 (and minor upgrades) (#290)
diff --git a/services/worker/poetry.lock b/services/worker/poetry.lock index dfee5b75..5e0923dd 100644 --- a/services/worker/poetry.lock +++ b/services/worker/poetry.lock @@ -301 +301 @@ name = "certifi" -version = "2021.10.8" +version = "2022.5.18.1" @@ -305 +305 @@ optional = false -python-versions = "*" +python-versions = ">=3.6" @@ -342 +342 @@ name = "cloudpickle" -version = "2.0.0" +version = "2.1.0" @@ -366 +366 @@ name = "coverage" -version = "6.3.3" +version = "6.4" @@ -412 +412 @@ name = "datasets" -version = "2.2.1" +version = "2.2.2" @@ -420 +420 @@ aiohttp = "*" -dill = "*" +dill = "<0.3.5" @@ -439 +439 @@ benchmarks = ["numpy (==1.18.5)", "tensorflow (==2.3.0)", "torch (==1.6.0)", "tr -dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "rouge-score", "sacrebleu", "scipy", "seqeval", "scikit-learn", "jiwer", "sentencepiece", "mauve-text", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] +dev = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "black (>=22.0,<23.0)", "flake8 (>=3.8.3)", "isort (>=5.0.0)", "pyyaml (>=5.3.1)", "importlib-resources"] @@ -445 +445 @@ tensorflow_gpu = ["tensorflow-gpu (>=2.2.0,!=2.6.0,!=2.6.1)"] -tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "rouge-score", "sacrebleu", "scipy", "seqeval", "scikit-learn", "jiwer", "sentencepiece", "mauve-text", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] +tests = ["absl-py", "pytest", "pytest-datadir", "pytest-xdist", "apache-beam (>=2.26.0)", "elasticsearch (<8.0.0)", "aiobotocore", "boto3", "botocore", "faiss-cpu (>=1.6.4)", "fsspec", "moto[s3,server] (==2.0.4)", "rarfile (>=4.0)", "s3fs (==2021.08.1)", "tensorflow (>=2.3,!=2.6.0,!=2.6.1)", "torch", "torchaudio", "soundfile", "transformers", "bs4", "conllu", "h5py", "langdetect", "lxml", "lz4", "mwparserfromhell", "nltk", "openpyxl", "py7zr", "tldextract", "zstandard", "bert-score (>=0.3.6)", "jiwer", "mauve-text", "rouge-score", "sacrebleu", "sacremoses", "scikit-learn", "scipy", "sentencepiece", "seqeval", "toml (>=0.10.1)", "requests-file (>=1.5.1)", "tldextract (>=3.1.0)", "texttable (>=1.6.3)", "Werkzeug (>=1.0.1)", "six (>=1.15.0,<1.16.0)", "Pillow (>=6.2.1)", "librosa", "importlib-resources"] @@ -563 +563 @@ name = "fastavro" -version = "1.4.11" +version = "1.4.12" @@ -618 +618 @@ name = "fsspec" -version = "2022.3.0" +version = "2022.5.0" @@ -771 +771 @@ name = "grpcio" -version = "1.46.1" +version = "1.46.3" @@ -781 +781 @@ six = ">=1.5.2" -protobuf = ["grpcio-tools (>=1.46.1)"] +protobuf = ["grpcio-tools (>=1.46.3)"] @@ -858 +858 @@ name = "importlib-metadata" -version = "4.11.3" +version = "4.11.4" @@ -1300 +1300 @@ name = "numpy" -version = "1.22.3" +version = "1.22.4" @@ -1336 +1336 @@ name = "openpyxl" -version = "3.0.9" +version = "3.0.10" @@ -1494 +1494 @@ name = "proto-plus" -version = "1.20.3" +version = "1.20.4" @@ -1516 +1516 @@ name = "psutil" -version = "5.9.0" +version = "5.9.1" @@ -1520 +1520 @@ optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" @@ -1523 +1523 @@ python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" -test = ["ipaddress", "mock", "unittest2", "enum34", "pywin32", "wmi"] +test = ["ipaddress", "mock", "enum34", "pywin32", "wmi"] @@ -1590 +1590 @@ name = "pybcj" -version = "0.5.3" +version = "0.6.0" @@ -1975 +1975 @@ name = "scikit-learn" -version = "1.1.0" +version = "1.1.1" @@ -1995 +1995 @@ name = "scipy" -version = "1.8.0" +version = "1.8.1" @@ -2177 +2177 @@ name = "tensorflow-io-gcs-filesystem" -version = "0.25.0" +version = "0.26.0" @@ -2184,5 +2184,5 @@ python-versions = ">=3.7, <3.11" -tensorflow = ["tensorflow (>=2.8.0,<2.9.0)"] -tensorflow-aarch64 = ["tensorflow-aarch64 (>=2.8.0,<2.9.0)"] -tensorflow-cpu = ["tensorflow-cpu (>=2.8.0,<2.9.0)"] -tensorflow-gpu = ["tensorflow-gpu (>=2.8.0,<2.9.0)"] -tensorflow-rocm = ["tensorflow-rocm (>=2.8.0,<2.9.0)"] +tensorflow = ["tensorflow (>=2.9.0,<2.10.0)"] +tensorflow-aarch64 = ["tensorflow-aarch64 (>=2.9.0,<2.10.0)"] +tensorflow-cpu = ["tensorflow-cpu (>=2.9.0,<2.10.0)"] +tensorflow-gpu = ["tensorflow-gpu (>=2.9.0,<2.10.0)"] +tensorflow-rocm = ["tensorflow-rocm (>=2.9.0,<2.10.0)"] @@ -2312 +2312 @@ name = "transformers" -version = "4.19.1" +version = "4.19.2" @@ -2430 +2430 @@ name = "types-requests" -version = "2.27.25" +version = "2.27.27" @@ -2457 +2457 @@ name = "ujson" -version = "5.2.0" +version = "5.3.0" @@ -2552 +2552 @@ python-versions = "3.9.6" -content-hash = "2207ecf3008691ef7ce62c163626e0d74052352e5b59167fafc1a6cbcc517f56" +content-hash = "4ee1b905c724e8f3859a95940b699c363d45df16bff8fb0faf82884191e9ec7b" @@ -2836,2 +2836,2 @@ certifi = [ - {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, - {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, + {file = "certifi-2022.5.18.1-py3-none-any.whl", hash = "sha256:f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a"}, + {file = "certifi-2022.5.18.1.tar.gz", hash = "sha256:9c5705e395cd70084351dd8ad5c41e65655e08ce46f2ec9cf6c2c08390f71eb7"}, @@ -2900,2 +2900,2 @@ cloudpickle = [ - {file = "cloudpickle-2.0.0-py3-none-any.whl", hash = "sha256:6b2df9741d06f43839a3275c4e6632f7df6487a1f181f5f46a052d3c917c3d11"}, - {file = "cloudpickle-2.0.0.tar.gz", hash = "sha256:5cd02f3b417a783ba84a4ec3e290ff7929009fe51f6405423cfccfadd43ba4a4"}, + {file = "cloudpickle-2.1.0-py3-none-any.whl", hash = "sha256:b5c434f75c34624eedad3a14f2be5ac3b5384774d5b0e3caf905c21479e6c4b1"}, + {file = "cloudpickle-2.1.0.tar.gz", hash = "sha256:bb233e876a58491d9590a676f93c7a5473a08f747d5ab9df7f9ce564b3e7938e"}, @@ -2912,41 +2912,41 @@ coverage = [ - {file = "coverage-6.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8"}, - {file = "coverage-6.3.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69"}, - {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63"}, - {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9"}, - {file = "coverage-6.3.3-cp310-cp310-win32.whl", hash = "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d"}, - {file = "coverage-6.3.3-cp310-cp310-win_amd64.whl", hash = "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4"}, - {file = "coverage-6.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73"}, - {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"}, - {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572"}, - {file = "coverage-6.3.3-cp37-cp37m-win32.whl", hash = "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20"}, - {file = "coverage-6.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e"}, - {file = "coverage-6.3.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9"}, - {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2"}, - {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548"}, - {file = "coverage-6.3.3-cp38-cp38-win32.whl", hash = "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94"}, - {file = "coverage-6.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a"}, - {file = "coverage-6.3.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8"}, - {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f"}, - {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c"}, - {file = "coverage-6.3.3-cp39-cp39-win32.whl", hash = "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8"}, - {file = "coverage-6.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284"}, - {file = "coverage-6.3.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe"}, - {file = "coverage-6.3.3.tar.gz", hash = "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, @@ -3048,2 +3048,2 @@ datasets = [ - {file = "datasets-2.2.1-py3-none-any.whl", hash = "sha256:1938f3e99599422de50b9b54fe802aca854ed130382dab0b3820c821f7ae6d5e"}, - {file = "datasets-2.2.1.tar.gz", hash = "sha256:d362717c4394589b516c8f397ff20a6fe720454aed877ab61d06f3bc05df9544"}, + {file = "datasets-2.2.2-py3-none-any.whl", hash = "sha256:77caa6a0dfa534ed2f65043e357fcf13d7728ef8f0c352d6db072a7aaa2f3cdf"}, + {file = "datasets-2.2.2.tar.gz", hash = "sha256:995664a20d976681593ccd56a58bfb9eb2f91fc1014bd22ef046d953999c3009"}, @@ -3086,16 +3086,16 @@ fastavro = [ - {file = "fastavro-1.4.11-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:44f01008f95d685edacc4b10366c755d25612df00924349f7d34a29f08522ce3"}, - {file = "fastavro-1.4.11-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:18f5e736d12e67348f253da8a332d7c3b483ca04f2b6e772befa79d1a46bac9d"}, - {file = "fastavro-1.4.11-cp310-cp310-win_amd64.whl", hash = "sha256:8dca11bc3191cd7de0a3c4b76a70dac493356a219e96ebcde0def1f06faddef7"}, - {file = "fastavro-1.4.11-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:7a2a0bf03686f9d860e8f8476be000f5b3e6cc9af6853dbabab2ef9cfa5dc3a0"}, - {file = "fastavro-1.4.11-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0c17e3decfac260e1be4d02d1903d2483eec2f3ce7f92c9b808a0f6a81572c4b"}, - {file = "fastavro-1.4.11-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:19ba25c6529f50722a7618cc4ca24c7d265def57fd9f94e4e554e1df8cce38d2"}, - {file = "fastavro-1.4.11-cp37-cp37m-win_amd64.whl", hash = "sha256:ceaba04da9419f40899a670eb62eb373a127b511bb8e3ae4f6f1f23ec49bd0e4"}, - {file = "fastavro-1.4.11-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:732eab3a1ae5d2c3f4b52e747c55bcc41c4df0eb7e8a395038080741a3c0a934"}, - {file = "fastavro-1.4.11-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c03d3c802b71f44e7b3442abae961bba996258244bd222b242ad1e5cb7754e57"}, - {file = "fastavro-1.4.11-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e7cb7475a9b25b9f8aebe7eb756dafedd0369434571062f3883d894281befd7c"}, - {file = "fastavro-1.4.11-cp38-cp38-win_amd64.whl", hash = "sha256:ce0776f54591aef90bcd02bd919964abe4c2ad2a10a4336c3a1b66cef289b41c"}, - {file = "fastavro-1.4.11-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:621e72cc365c9539d7590e7b43e48a62e6bfb4c2de7c16837fed54d113d7312c"}, - {file = "fastavro-1.4.11-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:842b25782f911ee8c626f9d9fedc2ef01aeac272536fe90ee6d45b2ae7cdb024"}, - {file = "fastavro-1.4.11-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f8491bfcba25c9d661289f884688e5a4f56f2ee389a240d0ad02692495a9a087"}, - {file = "fastavro-1.4.11-cp39-cp39-win_amd64.whl", hash = "sha256:c94130a8c8d80073eb0276844915aa5e928ae322024e76dc57943542ccda211c"}, - {file = "fastavro-1.4.11.tar.gz", hash = "sha256:7c64332ad52de0134be9a933ca986514c3ff85c63d54bc5398c31f0498ac1820"}, + {file = "fastavro-1.4.12-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:97c47004fb7e6a1f38d729124e9607128577a15ee5a4d10c7f680251f1a4f204"}, + {file = "fastavro-1.4.12-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a38a954a45422fffedd1f65283b3ed8f32965a8399f545189d0b75e450407ff2"}, + {file = "fastavro-1.4.12-cp310-cp310-win_amd64.whl", hash = "sha256:fee2240cff5a249458df604893abcc571efa178fa9b01f4ae0fa824295da3b54"}, + {file = "fastavro-1.4.12-cp37-cp37m-macosx_10_15_x86_64.whl", hash = "sha256:bc41b3495a34a17e17e77c7bc82ddaa5edaec82e103e763d0fb60cbb4d0efff0"}, + {file = "fastavro-1.4.12-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6326d763939a2a9de560dd88035a9902660145745b6dda2060be5caee3d8e779"}, + {file = "fastavro-1.4.12-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a9d418dbcba12e85ae1fd395d92917d592544b0dfe64db13ffebeb4959dd67f"}, + {file = "fastavro-1.4.12-cp37-cp37m-win_amd64.whl", hash = "sha256:e5888f81600c7cd62aeb9ed86b63d6e63dc9ad040b404c0ab42f4194f170d2b6"}, + {file = "fastavro-1.4.12-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:7a8f273ac00f20adebfa394aea4219caf76844134ea21b53d393a1ae9a54f828"}, + {file = "fastavro-1.4.12-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e88cc1f73421d3f60c21fa982fdb91411ac068506442d3a984a2b6ea400ae9dc"}, + {file = "fastavro-1.4.12-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4e4b81c09346d6f47153b3c391e8f65bef0fc4dfd19b0e2bc7843f00e07ee1be"}, + {file = "fastavro-1.4.12-cp38-cp38-win_amd64.whl", hash = "sha256:3b04882e04192a64c06a8487a168e289f71cd31e51e1275bd34bb19d70669b48"}, + {file = "fastavro-1.4.12-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:1df7cd4248c0dbbd0c9be4643eb416f6e4f058211b6eaf4e15286813ab2a70ff"}, + {file = "fastavro-1.4.12-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:772527b59c4294f44f42328a4d2defe67a6db5f203f65257e698a1ff5b476a2f"}, + {file = "fastavro-1.4.12-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4fca5343950963545c1dd9db17e0451daf19fa50ac9e44313abd20e88cef3e48"}, + {file = "fastavro-1.4.12-cp39-cp39-win_amd64.whl", hash = "sha256:b289e4ed691f0fc5919ffc1c8d4bcb626055deaf75a5a2bca9015dc2367d95af"}, + {file = "fastavro-1.4.12.tar.gz", hash = "sha256:28c0d63eb286e64e9da79e083e299c33f1df65a490a1d79444dc453950daca40"}, @@ -3177,2 +3177,2 @@ fsspec = [ - {file = "fsspec-2022.3.0-py3-none-any.whl", hash = "sha256:a53491b003210fce6911dd8f2d37e20c41a27ce52a655eef11b885d1578ed4cf"}, - {file = "fsspec-2022.3.0.tar.gz", hash = "sha256:fd582cc4aa0db5968bad9317cae513450eddd08b2193c4428d9349265a995523"}, + {file = "fsspec-2022.5.0-py3-none-any.whl", hash = "sha256:2c198c50eb541a80bbd03540b07602c4a957366f3fb416a1f270d34bd4ff0926"}, + {file = "fsspec-2022.5.0.tar.gz", hash = "sha256:7a5459c75c44e760fbe6a3ccb1f37e81e023cde7da8ba20401258d877ec483b4"}, @@ -3216,54 +3216,54 @@ grpcio = [ - {file = "grpcio-1.46.1-cp310-cp310-linux_armv7l.whl", hash = "sha256:aeb1e07fab60736583fc17f0bad9ba45b82d4c2099576a936853742e6ff50bd8"}, - {file = "grpcio-1.46.1-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:09f84962dacfee7137b76818476bcd7fcf11626e3e9c20adae2b0fa9c7fe81c3"}, - {file = "grpcio-1.46.1-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:48260059c3204a1fa948233711045b066f09deaa24fb6213e8fb0fc7264832f7"}, - {file = "grpcio-1.46.1-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c3b3898087090a03429d14e053af5531075e6db6bdd608fd44fa4eb1021b50f2"}, - {file = "grpcio-1.46.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fe355dd01d2310ddbcdcf903bde451ca4b22cdcc2ea3c36de34997578ee3b1e0"}, - {file = "grpcio-1.46.1-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:58777d1abd8291c9dd98dc236ece82696cd54039daa0b478bb2ad6cb0c8d4b9a"}, - {file = "grpcio-1.46.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f4d9e8c8da9ea4bd3d72122e2491bfee798ba1f498abf680a508f78eb49d742b"}, - {file = "grpcio-1.46.1-cp310-cp310-win32.whl", hash = "sha256:46eefbb36a062fad859bf56087f1a6782aae2a7e0c6234fb82971290db29a3e2"}, - {file = "grpcio-1.46.1-cp310-cp310-win_amd64.whl", hash = "sha256:7c12b79c625eb6a73d808c234254bfbd23fae08a7f64bb78236c61f77f30454a"}, - {file = "grpcio-1.46.1-cp36-cp36m-linux_armv7l.whl", hash = "sha256:424ef6c3f7631b21a7884e5756f23d2fc5c4d89f05b0c87e4b0cd4495b39748e"}, - {file = "grpcio-1.46.1-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:a73ccbc4f7a57183ec6c3f78e225585ba85f990e93b523359bad83baee349540"}, - {file = "grpcio-1.46.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:3abc211a2ebdf002b0a430079238b4861ea74fa3f6751f4e584702333ec5b886"}, - {file = "grpcio-1.46.1-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:71a2163e14ad95210d7353fd4ea5f02d474afec897e653e54adce45cf0ee1536"}, - {file = "grpcio-1.46.1-cp36-cp36m-manylinux_2_17_aarch64.whl", hash = "sha256:48f81a903467dd6665af7b2c3089b2dbe16563a945d7dc88c40c585dcd010f8a"}, - {file = "grpcio-1.46.1-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5bae8fd51d16a2712e5ecfc40146f6b3bcb6e3837f345be7f20ecc4a86c61903"}, - {file = "grpcio-1.46.1-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:22dc046fece523ca3a86aac75ac9980016c0ba93d35a586bc8b350a62430f4fc"}, - {file = "grpcio-1.46.1-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:4083a70e3f90f6e48de37611484f489381f21a2615575c9a5a6ea5d9bf46db71"}, - {file = "grpcio-1.46.1-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:4a7431905f3b7177c0a03f4ed7471d3d500e0d109c739b724e4ab4d2f852c961"}, - {file = "grpcio-1.46.1-cp36-cp36m-win32.whl", hash = "sha256:0c5d817a0738d87868ffaeef1ec2aa312cd99b24ba451f4dc993457468d48216"}, - {file = "grpcio-1.46.1-cp36-cp36m-win_amd64.whl", hash = "sha256:0c50a5d81a4b5583b7fef4ec084fab919a06ad2e7e01eefd778f2a9bfd3f6b19"}, - {file = "grpcio-1.46.1-cp37-cp37m-linux_armv7l.whl", hash = "sha256:0e6800f64c61cfa914c25560eb885a61623e356c7885775b80eead94f80c178c"}, - {file = "grpcio-1.46.1-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:c9e2be2b9cd3c15980b94371ad71f6c7a415d7b2b88b9ea35a993b4f2a947f11"}, - {file = "grpcio-1.46.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:cc032618b4c16b342c98ccfdfd85c5659ba33a9eb1c6e3ca0b2062dc08650f91"}, - {file = "grpcio-1.46.1-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d1845dd5c3a21496a5e7c8d0dbc02ee1f5491a90ae391f0d8ea502e9a2ad9e28"}, - {file = "grpcio-1.46.1-cp37-cp37m-manylinux_2_17_aarch64.whl", hash = "sha256:385b55cdf6176961d22390e3d2e7c26ab412f2b7e35d150d0a2964afae0d6662"}, - {file = "grpcio-1.46.1-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b476a680c08504c5520d043ee26e8614f71e2fc9abf98fc6de3ad61074684fb6"}, - {file = "grpcio-1.46.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:52217d64ca280cec095ca9643b7f028edf5c9866af9125ded452699be04d4440"}, - {file = "grpcio-1.46.1-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:3aa094661e8b4229177eb373b5c7b3aca34699711efa004daebd24bf60fd213b"}, - {file = "grpcio-1.46.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d8e0778b2e9a92beef973b050102e7698753c57ef59572b59794580a8990ad95"}, - {file = "grpcio-1.46.1-cp37-cp37m-win32.whl", hash = "sha256:f868103adeb61dd42330c2e85e1c0cccbc9a0b3f53fd84299981c9af99f95da7"}, - {file = "grpcio-1.46.1-cp37-cp37m-win_amd64.whl", hash = "sha256:9e27d4937763c1b4f360bea7f976ea73ccd444f89279a0de2147c8d65fdbf6b0"}, - {file = "grpcio-1.46.1-cp38-cp38-linux_armv7l.whl", hash = "sha256:b7f058ba6818cb20dca26ac43c610a2c9846302a34a7f0ac81b0dda0bde15bbf"}, - {file = "grpcio-1.46.1-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:e44313f90365780631597dd59f9a50830a02f038b7e191a44d09a9094683123b"}, - {file = "grpcio-1.46.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:09c5b5812fdb50ee5ccd3cb2820bd72706e04f42e58245a3f640370aaef17938"}, - {file = "grpcio-1.46.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c758fcba514fded6fc0dc0cd8416f2697af0e1a2e7e13a8be49728820dc51371"}, - {file = "grpcio-1.46.1-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:5a67abcf8c646970a48896e23256403397927a4ea0bcf0a0e4bd7c2023f675dd"}, - {file = "grpcio-1.46.1-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3e20ad60564e71b7a29894d6d1eebe23c43974d82d2529b37d8f766b3ec3ef1e"}, - {file = "grpcio-1.46.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:83c0eee24264e715cadef3a4b4cc58b69ec57faa98bf8a49079ceb7345adb767"}, - {file = "grpcio-1.46.1-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:ae8c79aa3d699b7e48f56e4ee6aececf29a7b01e61db408a6d0e3f3d27f93ee4"}, - {file = "grpcio-1.46.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8e2d6c4308a143533a8c9b01616d628de22bc2f9da73ff9dd75f92104597c90f"}, - {file = "grpcio-1.46.1-cp38-cp38-win32.whl", hash = "sha256:a481ec9bc02c1be56b9d2eff14b00629f679269a10a952134ad6624ff335daa7"}, - {file = "grpcio-1.46.1-cp38-cp38-win_amd64.whl", hash = "sha256:c88bfb74d343c3214a5482530a112a623704549271006cfb3284daf2dcdda620"}, - {file = "grpcio-1.46.1-cp39-cp39-linux_armv7l.whl", hash = "sha256:a968c5572a55ca0acc068c69ffde252bcb0ce79acf857b55a76733eb8e71b2da"}, - {file = "grpcio-1.46.1-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:ec9afc7641a43d37e7f4c8a6464ec14748aa939443f06754331a30e430a73cf5"}, - {file = "grpcio-1.46.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:4b963b5594e1e1eaa657bc1007aa2f4d78e3be0b38a0c8524da68b981c82854f"}, - {file = "grpcio-1.46.1-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4f51f7534c6fb47edbe3524357c05680af96d93d38f6c98a2560f56bfcc171ec"}, - {file = "grpcio-1.46.1-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:47958e3a8ec64768ef9ab7448bcb1c571d3a8138a90674710af811ef082ae428"}, - {file = "grpcio-1.46.1-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ce35d280b022766121d09901827973c66b31987047e54062f72ea0a8df8cd267"}, - {file = "grpcio-1.46.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:72b0cf7240cd26efb589afbcff21ed4f430e8237e6c9ab02f7d7118d9677f278"}, - {file = "grpcio-1.46.1-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:51c917e8eea1995d540524674406b9658591ae29beab012f79f817757ce218b5"}, - {file = "grpcio-1.46.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8373f35f562a3235a3213a2899da72e7ab2f94e127f88d17e5a9702aa7a7a61d"}, - {file = "grpcio-1.46.1-cp39-cp39-win32.whl", hash = "sha256:9009bceefe013cbb57663fe3e33b38e695832216b23aa3efb2c81c86b271f0da"}, - {file = "grpcio-1.46.1-cp39-cp39-win_amd64.whl", hash = "sha256:0815fb60b23d992a732bd32a7cb9cbcdbbb8faef9f4219fc7570537b2ad72428"}, - {file = "grpcio-1.46.1.tar.gz", hash = "sha256:4835b0f5fedbee3a3d6eea48f4e65dffd30b52c078690fa97ddc9fcea1e3b35d"}, + {file = "grpcio-1.46.3-cp310-cp310-linux_armv7l.whl", hash = "sha256:4c05dbc164c2d3015109292ffeed68292807a6cb1225f9a36699bf2166634908"}, + {file = "grpcio-1.46.3-cp310-cp310-macosx_10_10_universal2.whl", hash = "sha256:c6a460b6aaf43428d48fececad864cc562458b944df80568e490d985d8576292"}, + {file = "grpcio-1.46.3-cp310-cp310-manylinux_2_17_aarch64.whl", hash = "sha256:707b85fa0cf606a9ab02246bd3142c76e154f1c30f00f7346b2afa3d0b315d5a"}, + {file = "grpcio-1.46.3-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8c63e7c61c0b06f838e8f45ffd3a7c68a520c4c026b2e0e8b1ad29c456d0f859"}, + {file = "grpcio-1.46.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c6fe85e5873d9784ab82cf261d9fc07ed67a4459ba69fbe1187ef8b8e3d9e30e"}, + {file = "grpcio-1.46.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:df980c4901a92ca649e18036ff67c7c8cad239b2759c2472694f7ab0f0b4ffb9"}, + {file = "grpcio-1.46.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:7b59982e405159385d5796aa1e0817ec83affb3eb4c2a5b7ca39413d17d7e332"}, + {file = "grpcio-1.46.3-cp310-cp310-win32.whl", hash = "sha256:6d51fa98bd40d4593f819a3fec8a078a192958d24f84c3daf15b5ad7705d4c48"}, + {file = "grpcio-1.46.3-cp310-cp310-win_amd64.whl", hash = "sha256:e9bba429eb743471715e6dadf006a70a77cb6afb065aa4a6eaa9efd76b09e336"}, + {file = "grpcio-1.46.3-cp36-cp36m-linux_armv7l.whl", hash = "sha256:a898b0f13bda2dfe786952cc1ea705762fa6c3ae799b4bb0525d7821605ae968"}, + {file = "grpcio-1.46.3-cp36-cp36m-macosx_10_10_x86_64.whl", hash = "sha256:9014aee70e29911008d2f388011cabf2c7fe4fe29918ce5f71513a660494069a"}, + {file = "grpcio-1.46.3-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:9c97106134de70f8323b12738ac0adf0615688b69253002910d0c5d42d202a77"}, + {file = "grpcio-1.46.3-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d41ea8efb87b1ae4e576b13d94f2b470297a1495ae6b2c9d1047952731bf168f"}, + {file = "grpcio-1.46.3-cp36-cp36m-manylinux_2_17_aarch64.whl", hash = "sha256:ab18e85082003d7883a4d069065436e61cb27c2c2150e7965ce93658f17bc8da"}, + {file = "grpcio-1.46.3-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:307ff1d6237d5c383196660a12db021c20280227f9f4423d88d6b2ab20c8b1d0"}, + {file = "grpcio-1.46.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8c9106ef35239767b3aa9dc1a79856ad499655f853fca9f92f9dd3182d646627"}, + {file = "grpcio-1.46.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:e0ae8e8523308bf7ab0b7d6aa686011de59b19fb06abb253f302d0b5da2a5905"}, + {file = "grpcio-1.46.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:4fd0aa30a938893060defd5f222604461db55f9a81a028b154479b91deac7074"}, + {file = "grpcio-1.46.3-cp36-cp36m-win32.whl", hash = "sha256:f7637b55662e56a64c07846bc0d2da6232a6e893b22c39790f2e41d03ac1a826"}, + {file = "grpcio-1.46.3-cp36-cp36m-win_amd64.whl", hash = "sha256:97801afa96a819f911d030b490dbea95b246de02433bac69c5acf150081686e4"}, + {file = "grpcio-1.46.3-cp37-cp37m-linux_armv7l.whl", hash = "sha256:3585a6fa3d97fc8f030bbf0e88185b5eb345a340f6732e165d5c22df54de5bc6"}, + {file = "grpcio-1.46.3-cp37-cp37m-macosx_10_10_x86_64.whl", hash = "sha256:dc6d15cbcceaebaacf2994280ed1c01d42b5772059b30afd8a76152e9d23daa4"}, + {file = "grpcio-1.46.3-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:e0486485d59d5865149010966ef3df99c5df97ab8b01f10e26f8759d6e10fafc"}, + {file = "grpcio-1.46.3-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5210ec7a1638daa61da16487fbfafb3dbb7b8cd44382d9262316bbb58a5b1cf7"}, + {file = "grpcio-1.46.3-cp37-cp37m-manylinux_2_17_aarch64.whl", hash = "sha256:e278fa30d2b5652f7e43970c86ad34c639146443553678b746909aae204924dc"}, + {file = "grpcio-1.46.3-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7d4148f1f76516b01cccf2273b45bc706847f1560ccb55aa6e29df851e9ca8cc"}, + {file = "grpcio-1.46.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:01f3f7a6cdb111cf276ffff9c892fa32624e03999bac809d3f3d8321d98b6855"}, + {file = "grpcio-1.46.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:91aaccbe1c035ad2bcd1b8a25cebd11839070eb70fb6573e9d0197ddbca5d96b"}, + {file = "grpcio-1.46.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:26136c19d96e2138f04412101f3730d66f5f1515dc912ac0d415587c8208d826"}, + {file = "grpcio-1.46.3-cp37-cp37m-win32.whl", hash = "sha256:a8f40dafcdc3e0e378387953528eaf4e35758161f3b10d96199f12b11afbe2c2"}, + {file = "grpcio-1.46.3-cp37-cp37m-win_amd64.whl", hash = "sha256:a6bb52df85a4bd6d3bad16b4e7cc43efe95469b74a856c87a2c5bef496c9147f"}, + {file = "grpcio-1.46.3-cp38-cp38-linux_armv7l.whl", hash = "sha256:2334ceeab4084e80433693451452cba26afc1607a7974133af3b3635fc8aa935"}, + {file = "grpcio-1.46.3-cp38-cp38-macosx_10_10_x86_64.whl", hash = "sha256:2c96a6103caec84985bb2cffac2b261f8cac2641e7a70d4b43b7d08754a6cfe7"}, + {file = "grpcio-1.46.3-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:7a39d39da8855b03be2d7348387986bab6a322031fcc8b04fa5e72355e7b13a1"}, + {file = "grpcio-1.46.3-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:4caf87a06de88e3611a4610c57ef55b78801843d1f5a9e5fd6b75e887dad3340"}, + {file = "grpcio-1.46.3-cp38-cp38-manylinux_2_17_aarch64.whl", hash = "sha256:ffbbb228e6fc6f85b34aac428eb76b4fc6591d771e487ce46eb16b4b7e18b91d"}, + {file = "grpcio-1.46.3-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0c89ae010c57333dd3c692e0892199a59df1ddfd467cdfea31f98331d0e8cf87"}, + {file = "grpcio-1.46.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:34b206cdf78dd1c14d93e10e7308750c36b4e6754d579895cba74341875e2fb5"}, + {file = "grpcio-1.46.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:a19b3ecdb8ddf60e4b034def27636065e49ac1ee3c85854a16353cf52c2afd83"}, + {file = "grpcio-1.46.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:aac6e66acae82be5c99a0a40ab8f5733d7df76a04f242cf42ecc34cfb1e947bd"}, + {file = "grpcio-1.46.3-cp38-cp38-win32.whl", hash = "sha256:aff6d961d6bc5e34e12e148383671f8da5d17e47ed606ec15f483def3053b206"}, + {file = "grpcio-1.46.3-cp38-cp38-win_amd64.whl", hash = "sha256:71d46c2f3c0512bac3d658af3193e3d645c96123af56bd07a8416474c69df2cf"}, + {file = "grpcio-1.46.3-cp39-cp39-linux_armv7l.whl", hash = "sha256:5969f63f3cf92538f83f26949d393d9fc59de670f47cf7c2a0e1e0d30b770294"}, + {file = "grpcio-1.46.3-cp39-cp39-macosx_10_10_x86_64.whl", hash = "sha256:5f8134d4a7e76c8c6644bd3ce728b9894933575155d02c09922986d5d8d6e48c"}, + {file = "grpcio-1.46.3-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:53fff69fd4d315adddda226e7b71804d1f12adf3a4162126dc520725624a483a"}, + {file = "grpcio-1.46.3-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3af2cc4e41f87d3b57f624b1b14321c1d0f030b191da60f9eeeda5448d83240c"}, + {file = "grpcio-1.46.3-cp39-cp39-manylinux_2_17_aarch64.whl", hash = "sha256:5fb7779ae01c20c4fad5831e98003b3f036acfe6b77697d6a9baa0f9a7f14daf"}, + {file = "grpcio-1.46.3-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:56636ebf8db63ba50d272dfd73c92538950525120311676246f8f6a81b0aa144"}, + {file = "grpcio-1.46.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0a5012ba00cf8b7ce9e6ac2312ace0b0e16fe9502c18340c8c3ecb734a759831"}, + {file = "grpcio-1.46.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:be1679d814a292a701f45df324e25b060435dd13159e9b08a16e2a2396c4391c"}, + {file = "grpcio-1.46.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4faaba7db078a0001a8c1a4370d56dc454c03b4613b6acec01f14b90c8dd03cf"}, + {file = "grpcio-1.46.3-cp39-cp39-win32.whl", hash = "sha256:f5c6393fa645183ae858ebfbf72ab94e7ebafb5cd849dcf4ae8c53a83cce4e24"}, + {file = "grpcio-1.46.3-cp39-cp39-win_amd64.whl", hash = "sha256:158b90d4f1354f40e435f4c866057acc29a4364b214c31049c8b8c903646fbab"}, + {file = "grpcio-1.46.3.tar.gz", hash = "sha256:4b8fd8b1cd553635274b83cd984f0755e6779886eca53c1c71d48215962eb689"}, @@ -3306,2 +3306,2 @@ importlib-metadata = [ - {file = "importlib_metadata-4.11.3-py3-none-any.whl", hash = "sha256:1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6"}, - {file = "importlib_metadata-4.11.3.tar.gz", hash = "sha256:ea4c597ebf37142f827b8f39299579e31685c31d3a438b59f469406afd0f2539"}, + {file = "importlib_metadata-4.11.4-py3-none-any.whl", hash = "sha256:c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec"}, + {file = "importlib_metadata-4.11.4.tar.gz", hash = "sha256:5d26852efe48c0a32b0509ffbc583fda1a2266545a78d104a6f4aff3db17d700"}, @@ -3604,20 +3604,22 @@ numpy = [ - {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"}, - {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, - {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, - {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, - {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, - {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"}, - {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"}, - {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"}, - {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"}, - {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"}, - {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"}, - {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"}, - {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"}, - {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"}, - {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:ba9ead61dfb5d971d77b6c131a9dbee62294a932bf6a356e48c75ae684e635b3"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_10_15_x86_64.whl", hash = "sha256:1ce7ab2053e36c0a71e7a13a7475bd3b1f54750b4b433adc96313e127b870887"}, + {file = "numpy-1.22.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:7228ad13744f63575b3a972d7ee4fd61815b2879998e70930d4ccf9ec721dce0"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:43a8ca7391b626b4c4fe20aefe79fec683279e31e7c79716863b4b25021e0e74"}, + {file = "numpy-1.22.4-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a911e317e8c826ea632205e63ed8507e0dc877dcdc49744584dfc363df9ca08c"}, + {file = "numpy-1.22.4-cp310-cp310-win32.whl", hash = "sha256:9ce7df0abeabe7fbd8ccbf343dc0db72f68549856b863ae3dd580255d009648e"}, + {file = "numpy-1.22.4-cp310-cp310-win_amd64.whl", hash = "sha256:3e1ffa4748168e1cc8d3cde93f006fe92b5421396221a02f2274aab6ac83b077"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:59d55e634968b8f77d3fd674a3cf0b96e85147cd6556ec64ade018f27e9479e1"}, + {file = "numpy-1.22.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:c1d937820db6e43bec43e8d016b9b3165dcb42892ea9f106c70fb13d430ffe72"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d4c5d5eb2ec8da0b4f50c9a843393971f31f1d60be87e0fb0917a49133d257d6"}, + {file = "numpy-1.22.4-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64f56fc53a2d18b1924abd15745e30d82a5782b2cab3429aceecc6875bd5add0"}, + {file = "numpy-1.22.4-cp38-cp38-win32.whl", hash = "sha256:fb7a980c81dd932381f8228a426df8aeb70d59bbcda2af075b627bbc50207cba"}, + {file = "numpy-1.22.4-cp38-cp38-win_amd64.whl", hash = "sha256:e96d7f3096a36c8754207ab89d4b3282ba7b49ea140e4973591852c77d09eb76"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:4c6036521f11a731ce0648f10c18ae66d7143865f19f7299943c985cdc95afb5"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:b89bf9b94b3d624e7bb480344e91f68c1c6c75f026ed6755955117de00917a7c"}, + {file = "numpy-1.22.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:2d487e06ecbf1dc2f18e7efce82ded4f705f4bd0cd02677ffccfb39e5c284c7e"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f3eb268dbd5cfaffd9448113539e44e2dd1c5ca9ce25576f7c04a5453edc26fa"}, + {file = "numpy-1.22.4-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:37431a77ceb9307c28382c9773da9f306435135fae6b80b62a11c53cfedd8802"}, + {file = "numpy-1.22.4-cp39-cp39-win32.whl", hash = "sha256:cc7f00008eb7d3f2489fca6f334ec19ca63e31371be28fd5dad955b16ec285bd"}, + {file = "numpy-1.22.4-cp39-cp39-win_amd64.whl", hash = "sha256:f0725df166cf4785c0bc4cbfb320203182b1ecd30fee6e541c8752a92df6aa32"}, + {file = "numpy-1.22.4-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:0791fbd1e43bf74b3502133207e378901272f3c156c4df4954cad833b1380207"}, + {file = "numpy-1.22.4.zip", hash = "sha256:425b390e4619f58d8526b3dcf656dde069133ae5c240229821f01b5f44ea07af"}, @@ -3634,2 +3636,2 @@ openpyxl = [ - {file = "openpyxl-3.0.9-py2.py3-none-any.whl", hash = "sha256:8f3b11bd896a95468a4ab162fc4fcd260d46157155d1f8bfaabb99d88cfcf79f"}, - {file = "openpyxl-3.0.9.tar.gz", hash = "sha256:40f568b9829bf9e446acfffce30250ac1fa39035124d55fc024025c41481c90f"}, + {file = "openpyxl-3.0.10-py2.py3-none-any.whl", hash = "sha256:0ab6d25d01799f97a9464630abacbb34aafecdcaa0ef3cba6d6b3499867d0355"}, + {file = "openpyxl-3.0.10.tar.gz", hash = "sha256:e47805627aebcf860edb4edf7987b1309c1b3632f3750538ed962bbcc3bd7449"}, @@ -3774,2 +3776,2 @@ proto-plus = [ - {file = "proto-plus-1.20.3.tar.gz", hash = "sha256:f28b225bc9e6c14e206fb7f8e996a46fb2ccd902648e512d496abb6a716a4ae5"}, - {file = "proto_plus-1.20.3-py3-none-any.whl", hash = "sha256:b06be21c3848fbc20387d1d6891a9b97dfa1cdd0f10d3d42ef70b5700ec0f423"}, + {file = "proto-plus-1.20.4.tar.gz", hash = "sha256:6653541c2f1209e4d5268d3e6302791f72a95cc5f8bdcf3e60d943edc657e70a"}, + {file = "proto_plus-1.20.4-py3-none-any.whl", hash = "sha256:3cfaac30676793d5ee764a0982bc30481beb5059f315e2a2422d7c73ded5b601"}, @@ -3804,27 +3806,32 @@ psutil = [ - {file = "psutil-5.9.0-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:55ce319452e3d139e25d6c3f85a1acf12d1607ddedea5e35fb47a552c051161b"}, - {file = "psutil-5.9.0-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:7336292a13a80eb93c21f36bde4328aa748a04b68c13d01dfddd67fc13fd0618"}, - {file = "psutil-5.9.0-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:cb8d10461c1ceee0c25a64f2dd54872b70b89c26419e147a05a10b753ad36ec2"}, - {file = "psutil-5.9.0-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:7641300de73e4909e5d148e90cc3142fb890079e1525a840cf0dfd39195239fd"}, - {file = "psutil-5.9.0-cp27-none-win32.whl", hash = "sha256:ea42d747c5f71b5ccaa6897b216a7dadb9f52c72a0fe2b872ef7d3e1eacf3ba3"}, - {file = "psutil-5.9.0-cp27-none-win_amd64.whl", hash = "sha256:ef216cc9feb60634bda2f341a9559ac594e2eeaadd0ba187a4c2eb5b5d40b91c"}, - {file = "psutil-5.9.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:90a58b9fcae2dbfe4ba852b57bd4a1dded6b990a33d6428c7614b7d48eccb492"}, - {file = "psutil-5.9.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:ff0d41f8b3e9ebb6b6110057e40019a432e96aae2008951121ba4e56040b84f3"}, - {file = "psutil-5.9.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:742c34fff804f34f62659279ed5c5b723bb0195e9d7bd9907591de9f8f6558e2"}, - {file = "psutil-5.9.0-cp310-cp310-win32.whl", hash = "sha256:8293942e4ce0c5689821f65ce6522ce4786d02af57f13c0195b40e1edb1db61d"}, - {file = "psutil-5.9.0-cp310-cp310-win_amd64.whl", hash = "sha256:9b51917c1af3fa35a3f2dabd7ba96a2a4f19df3dec911da73875e1edaf22a40b"}, - {file = "psutil-5.9.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3d00a664e31921009a84367266b35ba0aac04a2a6cad09c550a89041034d19a0"}, - {file = "psutil-5.9.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7779be4025c540d1d65a2de3f30caeacc49ae7a2152108adeaf42c7534a115ce"}, - {file = "psutil-5.9.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:072664401ae6e7c1bfb878c65d7282d4b4391f1bc9a56d5e03b5a490403271b5"}, - {file = "psutil-5.9.0-cp37-cp37m-win32.whl", hash = "sha256:df2c8bd48fb83a8408c8390b143c6a6fa10cb1a674ca664954de193fdcab36a9"}, - {file = "psutil-5.9.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1d7b433519b9a38192dfda962dd8f44446668c009833e1429a52424624f408b4"}, - {file = "psutil-5.9.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:c3400cae15bdb449d518545cbd5b649117de54e3596ded84aacabfbb3297ead2"}, - {file = "psutil-5.9.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b2237f35c4bbae932ee98902a08050a27821f8f6dfa880a47195e5993af4702d"}, - {file = "psutil-5.9.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1070a9b287846a21a5d572d6dddd369517510b68710fca56b0e9e02fd24bed9a"}, - {file = "psutil-5.9.0-cp38-cp38-win32.whl", hash = "sha256:76cebf84aac1d6da5b63df11fe0d377b46b7b500d892284068bacccf12f20666"}, - {file = "psutil-5.9.0-cp38-cp38-win_amd64.whl", hash = "sha256:3151a58f0fbd8942ba94f7c31c7e6b310d2989f4da74fcbf28b934374e9bf841"}, - {file = "psutil-5.9.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:539e429da49c5d27d5a58e3563886057f8fc3868a5547b4f1876d9c0f007bccf"}, - {file = "psutil-5.9.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:58c7d923dc209225600aec73aa2c4ae8ea33b1ab31bc11ef8a5933b027476f07"}, - {file = "psutil-5.9.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3611e87eea393f779a35b192b46a164b1d01167c9d323dda9b1e527ea69d697d"}, - {file = "psutil-5.9.0-cp39-cp39-win32.whl", hash = "sha256:4e2fb92e3aeae3ec3b7b66c528981fd327fb93fd906a77215200404444ec1845"}, - {file = "psutil-5.9.0-cp39-cp39-win_amd64.whl", hash = "sha256:7d190ee2eaef7831163f254dc58f6d2e2a22e27382b936aab51c835fc080c3d3"}, - {file = "psutil-5.9.0.tar.gz", hash = "sha256:869842dbd66bb80c3217158e629d6fceaecc3a3166d3d1faee515b05dd26ca25"}, + {file = "psutil-5.9.1-cp27-cp27m-manylinux2010_i686.whl", hash = "sha256:799759d809c31aab5fe4579e50addf84565e71c1dc9f1c31258f159ff70d3f87"}, + {file = "psutil-5.9.1-cp27-cp27m-manylinux2010_x86_64.whl", hash = "sha256:9272167b5f5fbfe16945be3db475b3ce8d792386907e673a209da686176552af"}, + {file = "psutil-5.9.1-cp27-cp27m-win32.whl", hash = "sha256:0904727e0b0a038830b019551cf3204dd48ef5c6868adc776e06e93d615fc5fc"}, + {file = "psutil-5.9.1-cp27-cp27m-win_amd64.whl", hash = "sha256:e7e10454cb1ab62cc6ce776e1c135a64045a11ec4c6d254d3f7689c16eb3efd2"}, + {file = "psutil-5.9.1-cp27-cp27mu-manylinux2010_i686.whl", hash = "sha256:56960b9e8edcca1456f8c86a196f0c3d8e3e361320071c93378d41445ffd28b0"}, + {file = "psutil-5.9.1-cp27-cp27mu-manylinux2010_x86_64.whl", hash = "sha256:44d1826150d49ffd62035785a9e2c56afcea66e55b43b8b630d7706276e87f22"}, + {file = "psutil-5.9.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:c7be9d7f5b0d206f0bbc3794b8e16fb7dbc53ec9e40bbe8787c6f2d38efcf6c9"}, + {file = "psutil-5.9.1-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:abd9246e4cdd5b554a2ddd97c157e292ac11ef3e7af25ac56b08b455c829dca8"}, + {file = "psutil-5.9.1-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:29a442e25fab1f4d05e2655bb1b8ab6887981838d22effa2396d584b740194de"}, + {file = "psutil-5.9.1-cp310-cp310-win32.whl", hash = "sha256:20b27771b077dcaa0de1de3ad52d22538fe101f9946d6dc7869e6f694f079329"}, + {file = "psutil-5.9.1-cp310-cp310-win_amd64.whl", hash = "sha256:58678bbadae12e0db55186dc58f2888839228ac9f41cc7848853539b70490021"}, + {file = "psutil-5.9.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:3a76ad658641172d9c6e593de6fe248ddde825b5866464c3b2ee26c35da9d237"}, + {file = "psutil-5.9.1-cp36-cp36m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a6a11e48cb93a5fa606306493f439b4aa7c56cb03fc9ace7f6bfa21aaf07c453"}, + {file = "psutil-5.9.1-cp36-cp36m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:068935df39055bf27a29824b95c801c7a5130f118b806eee663cad28dca97685"}, + {file = "psutil-5.9.1-cp36-cp36m-win32.whl", hash = "sha256:0f15a19a05f39a09327345bc279c1ba4a8cfb0172cc0d3c7f7d16c813b2e7d36"}, + {file = "psutil-5.9.1-cp36-cp36m-win_amd64.whl", hash = "sha256:db417f0865f90bdc07fa30e1aadc69b6f4cad7f86324b02aa842034efe8d8c4d"}, + {file = "psutil-5.9.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:91c7ff2a40c373d0cc9121d54bc5f31c4fa09c346528e6a08d1845bce5771ffc"}, + {file = "psutil-5.9.1-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:fea896b54f3a4ae6f790ac1d017101252c93f6fe075d0e7571543510f11d2676"}, + {file = "psutil-5.9.1-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3054e923204b8e9c23a55b23b6df73a8089ae1d075cb0bf711d3e9da1724ded4"}, + {file = "psutil-5.9.1-cp37-cp37m-win32.whl", hash = "sha256:d2d006286fbcb60f0b391741f520862e9b69f4019b4d738a2a45728c7e952f1b"}, + {file = "psutil-5.9.1-cp37-cp37m-win_amd64.whl", hash = "sha256:b14ee12da9338f5e5b3a3ef7ca58b3cba30f5b66f7662159762932e6d0b8f680"}, + {file = "psutil-5.9.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:19f36c16012ba9cfc742604df189f2f28d2720e23ff7d1e81602dbe066be9fd1"}, + {file = "psutil-5.9.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:944c4b4b82dc4a1b805329c980f270f170fdc9945464223f2ec8e57563139cf4"}, + {file = "psutil-5.9.1-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4b6750a73a9c4a4e689490ccb862d53c7b976a2a35c4e1846d049dcc3f17d83b"}, + {file = "psutil-5.9.1-cp38-cp38-win32.whl", hash = "sha256:a8746bfe4e8f659528c5c7e9af5090c5a7d252f32b2e859c584ef7d8efb1e689"}, + {file = "psutil-5.9.1-cp38-cp38-win_amd64.whl", hash = "sha256:79c9108d9aa7fa6fba6e668b61b82facc067a6b81517cab34d07a84aa89f3df0"}, + {file = "psutil-5.9.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:28976df6c64ddd6320d281128817f32c29b539a52bdae5e192537bc338a9ec81"}, + {file = "psutil-5.9.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b88f75005586131276634027f4219d06e0561292be8bd6bc7f2f00bdabd63c4e"}, + {file = "psutil-5.9.1-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:645bd4f7bb5b8633803e0b6746ff1628724668681a434482546887d22c7a9537"}, + {file = "psutil-5.9.1-cp39-cp39-win32.whl", hash = "sha256:32c52611756096ae91f5d1499fe6c53b86f4a9ada147ee42db4991ba1520e574"}, + {file = "psutil-5.9.1-cp39-cp39-win_amd64.whl", hash = "sha256:f65f9a46d984b8cd9b3750c2bdb419b2996895b005aefa6cbaba9a143b1ce2c5"}, + {file = "psutil-5.9.1.tar.gz", hash = "sha256:57f1819b5d9e95cdfb0c881a8a5b7d542ed0b7c522d575706a80bedc848c8954"}, @@ -3909,49 +3916,49 @@ pybcj = [ - {file = "pybcj-0.5.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:376aba216760730938fb418908f389e46fd85212c238f2dd5c7d1ddd6f9f70b6"}, - {file = "pybcj-0.5.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:d83a73768cdfaf7f92ef4dbb8510ad82b9dbf70f4ddaa2763ca4deb7a7d53fd6"}, - {file = "pybcj-0.5.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:76e45f50b9606d00ea2e6ce767765956d2415f93eb52165a399e3c85ae60b224"}, - {file = "pybcj-0.5.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5ef6dfd79092899d28f7309844dbd1de79804567ecd8b6d7d5812c897d32657d"}, - {file = "pybcj-0.5.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:6e1bcfa82fa80198fa70a728e43667f1bf45f4b31e959c01b7f170a4c965d4f0"}, - {file = "pybcj-0.5.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:3a69aa3a7bfb2d8b535e2721917c9be93a4b2985e3735a4209b21a275bd1af15"}, - {file = "pybcj-0.5.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:d22906d17c05a6b215c30d6739e3e9039a08e0e47bf4bdfde9638b2a2a38fa04"}, - {file = "pybcj-0.5.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:b0415d851bac0a8a59b07589870d39174f70e1a1211e7b15b1254593eaf04d93"}, - {file = "pybcj-0.5.3-cp310-cp310-win32.whl", hash = "sha256:8888381e88e53ac269b595e1880820381b4e5604181978dd7fe00ccec75fe008"}, - {file = "pybcj-0.5.3-cp310-cp310-win_amd64.whl", hash = "sha256:3f691ac916ba7604895a6b80db2183c00177144ae79cb1919943c9b2433acf53"}, - {file = "pybcj-0.5.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:1439ac72de5f3f37692f5a67f25c6aa655e4f912d251563ca21405e9357e17e2"}, - {file = "pybcj-0.5.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d24861d4fc6c3c85c0537ab1181e497b5f1b0790016c8c94fb2cdeb7a9ab9542"}, - {file = "pybcj-0.5.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4ae358ace2df9b6c30c49c28f7e94ec912c33b4da9e906dc47a97b9ba6799b94"}, - {file = "pybcj-0.5.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a0955e42434fbeda2fa029d4301c2ccace203e68a7a784191d73d2d5d97f1eb7"}, - {file = "pybcj-0.5.3-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:e284ba2c0a45117fdead695d30d559422812b559a67cd45398af96506e47530d"}, - {file = "pybcj-0.5.3-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:cb92bb70466240739648c4bf8ca088a890902b515081bd9767be5f814cfaf99e"}, - {file = "pybcj-0.5.3-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:7f436db34f3e870f502b718ef4fe2bda2492f9f124bccef3d5551267687f4270"}, - {file = "pybcj-0.5.3-cp36-cp36m-win32.whl", hash = "sha256:fda6fc500de3edda6c07ca740c24bfc4aa956154161bc9665e715819d255c153"}, - {file = "pybcj-0.5.3-cp36-cp36m-win_amd64.whl", hash = "sha256:d0ab15077d9997a6551574ddc4c16e713e9ea24d0bef27278592545339f2ae79"}, - {file = "pybcj-0.5.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:3c7e6560e55de09918a57820044071b5f85bb3c64a59d449d2742aa1fbe3c173"}, - {file = "pybcj-0.5.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:11290676f0940debe2f05f851c35c72b2fb457a4d578303a4a7b75fe1195cb06"}, - {file = "pybcj-0.5.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9e5d4410e81d46de0220fcaec7d47fd5aa2c54de8bb6401783b977dfc69eab3e"}, - {file = "pybcj-0.5.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:825e4c02383eb320fdfc5780bf81c9ca89cc5612afd8253304d62a4141223c71"}, - {file = "pybcj-0.5.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b4816641cd3c1c246649daaea079457a65526d961f8458460d9ebb5b7567f2f3"}, - {file = "pybcj-0.5.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:2f0854fb87ea066fbf41a0e212bb6ef906ac8cf2e8991ca1bf8f757d14859944"}, - {file = "pybcj-0.5.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b7be3c42599d00e407377d79ad745fc994dbb6d984aee5db650cb2fd62789355"}, - {file = "pybcj-0.5.3-cp37-cp37m-win32.whl", hash = "sha256:28ba109b889f2ac9db36b4b43b8ac24e3b58ff5e70dec6368d739a78a77dbb67"}, - {file = "pybcj-0.5.3-cp37-cp37m-win_amd64.whl", hash = "sha256:92098fe0e47a5dade7e47423241e7d51a4094d9119c5d868f00e8de535a76b09"}, - {file = "pybcj-0.5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:2284a3fcbf0aa0c7e05765d8578e61a6ff148a3dc2c786494381f4c9b597d716"}, - {file = "pybcj-0.5.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f4bb5a50f9f2361ce60e1efa8059a2ea016f544db4cdcbeb7a00e5db4409910e"}, - {file = "pybcj-0.5.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a45d0043575371312b98f7788b28ad7dd8feeb763b723c7fe1081ec154149b6a"}, - {file = "pybcj-0.5.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:33f4b36ca9eab443eb66e8974c482da1fc7f43243a169c6865b64cc37e5389cb"}, - {file = "pybcj-0.5.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:19a8a1402c01382388442526a61b5bbfca167111d6292146d3beba34862cb597"}, - {file = "pybcj-0.5.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:a82490a16a350b416bfae2b3cb284ccccb4b6016f32d2df615523510515813f1"}, - {file = "pybcj-0.5.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:77cacb01c7aada4b0ca6a419663c150825bc97a77c6284bbc515830be324c34e"}, - {file = "pybcj-0.5.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:a3b50ae2a58ea7d1743f76e91d8bc6e6198d018d75a99eee7cd5e4b2c0eba269"}, - {file = "pybcj-0.5.3-cp38-cp38-win32.whl", hash = "sha256:47c1335af7de29dfbcd0673880f2e0841bf05e38131129231cb6d7e5777aefe3"}, - {file = "pybcj-0.5.3-cp38-cp38-win_amd64.whl", hash = "sha256:8687345228fcaf4677ea67d0d21e52dfab7a2c34e68f5497187d56e782f4848f"}, - {file = "pybcj-0.5.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:31463f1b7648c95d5a5533c40a8a674d98cc30a592b3d0232f689c3b1a0fc664"}, - {file = "pybcj-0.5.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:3c850ee822a999f1fb52853914bb6556035ef72f3a2b41f0b612fc89502de190"}, - {file = "pybcj-0.5.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9cae03af56037571c632d643cfc7183fc7d4cc9b8e92f6832f408c1b8ae47795"}, - {file = "pybcj-0.5.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba2bfde2d9c0c8e00b01a657eeeaac5e655ecf8781fc16db5ac6707e8a5e7f6d"}, - {file = "pybcj-0.5.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f1902785505cb65ac6b4eeb5b0aa5fc8f00aaf48fe53c9162822cc2dacc2f701"}, - {file = "pybcj-0.5.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:9c54d4daeb6bc3ecc3de8fc3520beb885a1735a62bc93b6f5feb2545e91716f7"}, - {file = "pybcj-0.5.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:0064f27e4df12cde50543ac2836c6fc319aa713739ed73ecd941d6ed059bf1ca"}, - {file = "pybcj-0.5.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:9c20954dfe8392278f52adf9e3913af45bac28ef713d4096d797b2516d66d2e0"}, - {file = "pybcj-0.5.3-cp39-cp39-win32.whl", hash = "sha256:3460b9f926ac4cb68ffbd5b10fe18698d9b5a96f0ffe8943997c86b2ef61c0e1"}, - {file = "pybcj-0.5.3-cp39-cp39-win_amd64.whl", hash = "sha256:bfccdc3c6072a95ecac21a0ff61d726bbfd54bd78601442590d9595d62d06cd4"}, - {file = "pybcj-0.5.3.tar.gz", hash = "sha256:14839501653ffea75668ab50ceea1df576d3a83f0587cdeaab56a423c8b1b097"}, + {file = "pybcj-0.6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:1289fb7e6b9a9135a49319655f39a79f055df1cdf0d380e224e344db39933ebf"}, + {file = "pybcj-0.6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:16fa96145d1384cc713deb371680af564bf73cdff326bf6f7df19be3e53d269a"}, + {file = "pybcj-0.6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f6c10bb940fd38ee3b05273ee460ccceb87bab189cb6c490ff5d8b6dc29e36c6"}, + {file = "pybcj-0.6.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:330ef236e7610a383ec0629b98340ce395f8b44d910f40ab41ec48c748183975"}, + {file = "pybcj-0.6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:08baeeae6cffc51723eb196e0c734be67f1283c2f76bd15c075c3a88efa203ff"}, + {file = "pybcj-0.6.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:2ec52bbacfab8892f2631765d110c3a13ec770a4fd326b9a68b1412a9d1cc8a5"}, + {file = "pybcj-0.6.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:32f70db65de58a2508979a0354aa31f2968c2845cb7267ae34d93b895b6bf672"}, + {file = "pybcj-0.6.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:f279313f4af4a2d15f4400d6a4c3ec34bd5cc9e598a66276f44771b154522660"}, + {file = "pybcj-0.6.0-cp310-cp310-win32.whl", hash = "sha256:6f9b5ca0bed57af76eab1b868c521ee2424a32569568ac612da66fc3231ae80c"}, + {file = "pybcj-0.6.0-cp310-cp310-win_amd64.whl", hash = "sha256:e752d9651f48a2580a5e20f2d528508766148556665b11d77794cdf6527bd3ec"}, + {file = "pybcj-0.6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:fd7d4ecc3048ba9b6a3fe401ddc8d6ff8c500b2207c186f9d6bea2851674427c"}, + {file = "pybcj-0.6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4e23c6eb55c8664077ecc431e57b65a658a27c0b55c2e40cb125bb6ccf91e717"}, + {file = "pybcj-0.6.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e0f4f3ecb9dd673414d630c6c6aa9878c70c41e331e037df0d98d518ec195916"}, + {file = "pybcj-0.6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:48c0709a5df0195d1fe1d04f125efe9cf1721c25aca272d9b98633691a009133"}, + {file = "pybcj-0.6.0-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:bb9a9dfce998948ee68541ce8f691fd62c8f1b0a3711c60aada81bc32fefc74b"}, + {file = "pybcj-0.6.0-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:bfe37868c21ea37543ab6f7f643b36945eb506b189a82a111b6dcc31519e911a"}, + {file = "pybcj-0.6.0-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:397c72a8080b6d981795dfd4b66ae93ac042194bbea3cb53eb6abf968d79bdbb"}, + {file = "pybcj-0.6.0-cp36-cp36m-win32.whl", hash = "sha256:94a23bf5647d9cd84697a83aceefdf495a872be559b6719b6c0807bab0a85451"}, + {file = "pybcj-0.6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:229f12c0408e84f87c928f87bf303f0ced411ed19cddda49adacde5e5787b7b1"}, + {file = "pybcj-0.6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:a9702c89476a5cc46aad35f1ae0918321feb58e27660eee3e767e569839a98a2"}, + {file = "pybcj-0.6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:22f31a178400fed5a1c865f55b9af1e462440cfe6255a0a79a19290ddb8ceaba"}, + {file = "pybcj-0.6.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bd43e68b2a6226af64a002334d13dbfe87e3d634e32aeac43eb74a6c32076e45"}, + {file = "pybcj-0.6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:0b958cb84c044859b4633c12f0a45a384a8c9bd573a7bb4b506fe2d5b017e1e9"}, + {file = "pybcj-0.6.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:0195a5c53dff47cfef7e481768e50bc0179f3669e8828d55b2cfec940877c32e"}, + {file = "pybcj-0.6.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:08d94fc67d1015656b38b2eefe1ec790055419333b2b22520fa057221b80a474"}, + {file = "pybcj-0.6.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:34201a90d1e664b3766645c1dec99f55a45ebd6ad6b293bccb58c2039bcf0d49"}, + {file = "pybcj-0.6.0-cp37-cp37m-win32.whl", hash = "sha256:ca8afa7a3ac962e1c50248c029a3283f5ceea7e9bfb1ba30f2115420791ac1ea"}, + {file = "pybcj-0.6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:7dbc48cde7332ed2a6a6b6cf71166b1a37722b11deb0df0901e0d2ad2f365a9f"}, + {file = "pybcj-0.6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:59c0c169f78da6ee38d5f14525f3647bff27cf9b01587e134036bfc8bdd54d4a"}, + {file = "pybcj-0.6.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f4dd1543bb623e5080a486d239e867950701fb5d6d39d076b544b9e4a15d4e28"}, + {file = "pybcj-0.6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e8df2d704f08b542640bb03a2f3e228eb731f6b58c7d95bc773ceb3e41316a60"}, + {file = "pybcj-0.6.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:33ef295d67c50330cad3156f5a6c1c34337b62f985516b5991dc163fffa98e57"}, + {file = "pybcj-0.6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3785409bfb2b478833bc89ee31794768bc19c092d574e68ae6f5dd1d8d1f39c6"}, + {file = "pybcj-0.6.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:f4d9381efbf32185571feb3b25098df9215575feae32177747072051ae75f8e7"}, + {file = "pybcj-0.6.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:0fb312cccd5172a53eb6322cdb29912b380df9a41aff2a0fe1e526402f3f011f"}, + {file = "pybcj-0.6.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:2e0a08878552b315efae7ced0237bfc59a4c22444bacc11be3ce26bda3dbbe9d"}, + {file = "pybcj-0.6.0-cp38-cp38-win32.whl", hash = "sha256:8e6d66341f2e8cf1deb13778141e12fb1e6b438627da0bdafc45ec8a3bd00783"}, + {file = "pybcj-0.6.0-cp38-cp38-win_amd64.whl", hash = "sha256:b96b1464fa8542a3f914c17b25ec5ca2559db99ce91c217108652b07bb967551"}, + {file = "pybcj-0.6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b660367cca1e5c8823c581b374722b06c8e0baf521542e699834484b2df68d05"}, + {file = "pybcj-0.6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:94d3b6ff44d0a49ae8f5f999baceff47a5ee4222370372ccc5dec6540bc72890"}, + {file = "pybcj-0.6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5c9a30dbcc5a76ad8d3ba1c99a7048d89c4706bdfdd6608ae385f73c4b8dd9df"}, + {file = "pybcj-0.6.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:505fd12173bb4ebd2053731c4159dadeaa7779bda9206087d3207d28d57a7601"}, + {file = "pybcj-0.6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f63a770aa60b851600f04ca9f2c118b1895372426388ef000c7f0013756ea271"}, + {file = "pybcj-0.6.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:b06dd0ec4595c3e5baf65b5e63fb5e4779e25b40cb59ff1306331c50cf8955eb"}, + {file = "pybcj-0.6.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:82041867e20fecf4229467bef8be9bb8f6e5d8e124fe890a05b6429b401a84f6"}, + {file = "pybcj-0.6.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:969ed5a7f573477608fbf9e48cca2061610e460d88294db37a3029768c1dae5e"}, + {file = "pybcj-0.6.0-cp39-cp39-win32.whl", hash = "sha256:c9bd388b73bec35c894bf520be9f02256a8a56a1deed97e2fd0c8ea4d38ecbf2"}, + {file = "pybcj-0.6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b1d7901c8c26587fb2a40b8ab4f0abcdf7b5d3027f8ce6fd067d3f29026e3a04"}, + {file = "pybcj-0.6.0.tar.gz", hash = "sha256:9013522cc4a51a966bd7f430df9bf23693a5235bb36c7916cbe13f76aca62a0f"}, @@ -4471,15 +4478,18 @@ scikit-learn = [ - {file = "scikit-learn-1.1.0.tar.gz", hash = "sha256:80f9904f5b1356adfc32406725dd94c8cc9c8d265047d98390033a6c238cbb29"}, - {file = "scikit_learn-1.1.0-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:47c31f7e9a5689c3a2cbdf72e78570b33fa9abb42a1ca10d787516de9c4e37a4"}, - {file = "scikit_learn-1.1.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:892be17fc261dff4097c061880586226d47ccd0426d9283091e2ca65da36e645"}, - {file = "scikit_learn-1.1.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:068ee35f08681079a9aece49236f40837dbffebe047b0813bf71873fa976b132"}, - {file = "scikit_learn-1.1.0-cp310-cp310-win_amd64.whl", hash = "sha256:e4d41245915d0fc6fea26029349ff187b2992ef6588863e8570fc95a24697fd0"}, - {file = "scikit_learn-1.1.0-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:502865e025d3222530e350783a59cc37538effde64767721d830ceaae8bb3d42"}, - {file = "scikit_learn-1.1.0-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:18aabbb26cbc1cf52583c1f1ecf6b5ff540d334f173e23122db43f97adbe0b2b"}, - {file = "scikit_learn-1.1.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ff60f63f1584d7daebfc93e69addd39760de49ae4325db5638c324cfde41c6c7"}, - {file = "scikit_learn-1.1.0-cp38-cp38-win32.whl", hash = "sha256:c10cd62443a9968c71fb9f1c7844f3f28189666f789d5a204dbad7463169b172"}, - {file = "scikit_learn-1.1.0-cp38-cp38-win_amd64.whl", hash = "sha256:cab8a8bef603f0fced7b245f7c4f77826602fd94f7c54ccb09b36b177dde246d"}, - {file = "scikit_learn-1.1.0-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:dc6681e2f99a4a5bc0682dc4e87192daeb0e9e64da36b35e672b56156e0cc867"}, - {file = "scikit_learn-1.1.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:05f9f004afe1b415922b2ff9453a191e3082acf1065aa0f0b238250f9e147606"}, - {file = "scikit_learn-1.1.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2318fc717c9ff7eb3834bbb2c3be63768e97bb3221bbf70c01537e34e4fb8a1c"}, - {file = "scikit_learn-1.1.0-cp39-cp39-win32.whl", hash = "sha256:25b8d471169711dee7667969e7db3d33c372c13701cd2ab6783d0e85b2aab300"}, - {file = "scikit_learn-1.1.0-cp39-cp39-win_amd64.whl", hash = "sha256:1ef67ac0d44d9ecb36bc33ccc421f683aaeb42bdd72d8a97601eaded3b43f2e4"}, + {file = "scikit-learn-1.1.1.tar.gz", hash = "sha256:3e77b71e8e644f86c8b5be7f1c285ef597de4c384961389ee3e9ca36c445b256"}, + {file = "scikit_learn-1.1.1-cp310-cp310-macosx_10_13_x86_64.whl", hash = "sha256:102f51797cd8944bf44a038d106848ddf2804f2c1edf7aea45fba81a4fdc4d80"}, + {file = "scikit_learn-1.1.1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:723cdb278b1fa57a55f68945bc4e501a2f12abe82f76e8d21e1806cbdbef6fc5"}, + {file = "scikit_learn-1.1.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:33cf061ed0b79d647a3e4c3f6c52c412172836718a7cd4d11c1318d083300133"}, + {file = "scikit_learn-1.1.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47464c110eaa9ed9d1fe108cb403510878c3d3a40f110618d2a19b2190a3e35c"}, + {file = "scikit_learn-1.1.1-cp310-cp310-win_amd64.whl", hash = "sha256:542ccd2592fe7ad31f5c85fed3a3deb3e252383960a85e4b49a629353fffaba4"}, + {file = "scikit_learn-1.1.1-cp38-cp38-macosx_10_13_x86_64.whl", hash = "sha256:3be10d8d325821ca366d4fe7083d87c40768f842f54371a9c908d97c45da16fc"}, + {file = "scikit_learn-1.1.1-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:b2db720e13e697d912a87c1a51194e6fb085dc6d8323caa5ca51369ca6948f78"}, + {file = "scikit_learn-1.1.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e851f8874398dcd50d1e174e810e9331563d189356e945b3271c0e19ee6f4d6f"}, + {file = "scikit_learn-1.1.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b928869072366dc138762fe0929e7dc88413f8a469aebc6a64adc10a9226180c"}, + {file = "scikit_learn-1.1.1-cp38-cp38-win32.whl", hash = "sha256:e9d228ced1214d67904f26fb820c8abbea12b2889cd4aa8cda20a4ca0ed781c1"}, + {file = "scikit_learn-1.1.1-cp38-cp38-win_amd64.whl", hash = "sha256:f2d5b5d6e87d482e17696a7bfa03fe9515fdfe27e462a4ad37f3d7774a5e2fd6"}, + {file = "scikit_learn-1.1.1-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:0403ad13f283e27d43b0ad875f187ec7f5d964903d92d1ed06c51439560ecea0"}, + {file = "scikit_learn-1.1.1-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:8fe80df08f5b9cee5dd008eccc672e543976198d790c07e5337f7dfb67eaac05"}, + {file = "scikit_learn-1.1.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8ff56d07b9507fbe07ca0f4e5c8f3e171f74a429f998da03e308166251316b34"}, + {file = "scikit_learn-1.1.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c2dad2bfc502344b869d4a3f4aa7271b2a5f4fe41f7328f404844c51612e2c58"}, + {file = "scikit_learn-1.1.1-cp39-cp39-win32.whl", hash = "sha256:22145b60fef02e597a8e7f061ebc7c51739215f11ce7fcd2ca9af22c31aa9f86"}, + {file = "scikit_learn-1.1.1-cp39-cp39-win_amd64.whl", hash = "sha256:45c0f6ae523353f1d99b85469d746f9c497410adff5ba8b24423705b6956a86e"}, @@ -4488,23 +4498,23 @@ scipy = [ - {file = "scipy-1.8.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:87b01c7d5761e8a266a0fbdb9d88dcba0910d63c1c671bdb4d99d29f469e9e03"}, - {file = "scipy-1.8.0-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:ae3e327da323d82e918e593460e23babdce40d7ab21490ddf9fc06dec6b91a18"}, - {file = "scipy-1.8.0-cp310-cp310-macosx_12_0_universal2.macosx_10_9_x86_64.whl", hash = "sha256:16e09ef68b352d73befa8bcaf3ebe25d3941fe1a58c82909d5589856e6bc8174"}, - {file = "scipy-1.8.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:c17a1878d00a5dd2797ccd73623ceca9d02375328f6218ee6d921e1325e61aff"}, - {file = "scipy-1.8.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:937d28722f13302febde29847bbe554b89073fbb924a30475e5ed7b028898b5f"}, - {file = "scipy-1.8.0-cp310-cp310-win_amd64.whl", hash = "sha256:8f4d059a97b29c91afad46b1737274cb282357a305a80bdd9e8adf3b0ca6a3f0"}, - {file = "scipy-1.8.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:38aa39b6724cb65271e469013aeb6f2ce66fd44f093e241c28a9c6bc64fd79ed"}, - {file = "scipy-1.8.0-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:559a8a4c03a5ba9fe3232f39ed24f86457e4f3f6c0abbeae1fb945029f092720"}, - {file = "scipy-1.8.0-cp38-cp38-macosx_12_0_universal2.macosx_10_9_x86_64.whl", hash = "sha256:f4a6d3b9f9797eb2d43938ac2c5d96d02aed17ef170c8b38f11798717523ddba"}, - {file = "scipy-1.8.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:92b2c2af4183ed09afb595709a8ef5783b2baf7f41e26ece24e1329c109691a7"}, - {file = "scipy-1.8.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a279e27c7f4566ef18bab1b1e2c37d168e365080974758d107e7d237d3f0f484"}, - {file = "scipy-1.8.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad5be4039147c808e64f99c0e8a9641eb5d2fa079ff5894dcd8240e94e347af4"}, - {file = "scipy-1.8.0-cp38-cp38-win32.whl", hash = "sha256:3d9dd6c8b93a22bf9a3a52d1327aca7e092b1299fb3afc4f89e8eba381be7b59"}, - {file = "scipy-1.8.0-cp38-cp38-win_amd64.whl", hash = "sha256:5e73343c5e0d413c1f937302b2e04fb07872f5843041bcfd50699aef6e95e399"}, - {file = "scipy-1.8.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:de2e80ee1d925984c2504812a310841c241791c5279352be4707cdcd7c255039"}, - {file = "scipy-1.8.0-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:c2bae431d127bf0b1da81fc24e4bba0a84d058e3a96b9dd6475dfcb3c5e8761e"}, - {file = "scipy-1.8.0-cp39-cp39-macosx_12_0_universal2.macosx_10_9_x86_64.whl", hash = "sha256:723b9f878095ed994756fa4ee3060c450e2db0139c5ba248ee3f9628bd64e735"}, - {file = "scipy-1.8.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:011d4386b53b933142f58a652aa0f149c9b9242abd4f900b9f4ea5fbafc86b89"}, - {file = "scipy-1.8.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:e6f0cd9c0bd374ef834ee1e0f0999678d49dcc400ea6209113d81528958f97c7"}, - {file = "scipy-1.8.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f3720d0124aced49f6f2198a6900304411dbbeed12f56951d7c66ebef05e3df6"}, - {file = "scipy-1.8.0-cp39-cp39-win32.whl", hash = "sha256:3d573228c10a3a8c32b9037be982e6440e411b443a6267b067cac72f690b8d56"}, - {file = "scipy-1.8.0-cp39-cp39-win_amd64.whl", hash = "sha256:bb7088e89cd751acf66195d2f00cf009a1ea113f3019664032d9075b1e727b6c"}, - {file = "scipy-1.8.0.tar.gz", hash = "sha256:31d4f2d6b724bc9a98e527b5849b8a7e589bf1ea630c33aa563eda912c9ff0bd"}, + {file = "scipy-1.8.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:65b77f20202599c51eb2771d11a6b899b97989159b7975e9b5259594f1d35ef4"}, + {file = "scipy-1.8.1-cp310-cp310-macosx_12_0_arm64.whl", hash = "sha256:e013aed00ed776d790be4cb32826adb72799c61e318676172495383ba4570aa4"}, + {file = "scipy-1.8.1-cp310-cp310-macosx_12_0_universal2.macosx_10_9_x86_64.whl", hash = "sha256:02b567e722d62bddd4ac253dafb01ce7ed8742cf8031aea030a41414b86c1125"}, + {file = "scipy-1.8.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1da52b45ce1a24a4a22db6c157c38b39885a990a566748fc904ec9f03ed8c6ba"}, + {file = "scipy-1.8.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a0aa8220b89b2e3748a2836fbfa116194378910f1a6e78e4675a095bcd2c762d"}, + {file = "scipy-1.8.1-cp310-cp310-win_amd64.whl", hash = "sha256:4e53a55f6a4f22de01ffe1d2f016e30adedb67a699a310cdcac312806807ca81"}, + {file = "scipy-1.8.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:28d2cab0c6ac5aa131cc5071a3a1d8e1366dad82288d9ec2ca44df78fb50e649"}, + {file = "scipy-1.8.1-cp38-cp38-macosx_12_0_arm64.whl", hash = "sha256:6311e3ae9cc75f77c33076cb2794fb0606f14c8f1b1c9ff8ce6005ba2c283621"}, + {file = "scipy-1.8.1-cp38-cp38-macosx_12_0_universal2.macosx_10_9_x86_64.whl", hash = "sha256:3b69b90c9419884efeffaac2c38376d6ef566e6e730a231e15722b0ab58f0328"}, + {file = "scipy-1.8.1-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6cc6b33139eb63f30725d5f7fa175763dc2df6a8f38ddf8df971f7c345b652dc"}, + {file = "scipy-1.8.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c4e3ae8a716c8b3151e16c05edb1daf4cb4d866caa385e861556aff41300c14"}, + {file = "scipy-1.8.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:23b22fbeef3807966ea42d8163322366dd89da9bebdc075da7034cee3a1441ca"}, + {file = "scipy-1.8.1-cp38-cp38-win32.whl", hash = "sha256:4b93ec6f4c3c4d041b26b5f179a6aab8f5045423117ae7a45ba9710301d7e462"}, + {file = "scipy-1.8.1-cp38-cp38-win_amd64.whl", hash = "sha256:70ebc84134cf0c504ce6a5f12d6db92cb2a8a53a49437a6bb4edca0bc101f11c"}, + {file = "scipy-1.8.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f3e7a8867f307e3359cc0ed2c63b61a1e33a19080f92fe377bc7d49f646f2ec1"}, + {file = "scipy-1.8.1-cp39-cp39-macosx_12_0_arm64.whl", hash = "sha256:2ef0fbc8bcf102c1998c1f16f15befe7cffba90895d6e84861cd6c6a33fb54f6"}, + {file = "scipy-1.8.1-cp39-cp39-macosx_12_0_universal2.macosx_10_9_x86_64.whl", hash = "sha256:83606129247e7610b58d0e1e93d2c5133959e9cf93555d3c27e536892f1ba1f2"}, + {file = "scipy-1.8.1-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:93d07494a8900d55492401917a119948ed330b8c3f1d700e0b904a578f10ead4"}, + {file = "scipy-1.8.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d3b3c8924252caaffc54d4a99f1360aeec001e61267595561089f8b5900821bb"}, + {file = "scipy-1.8.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:70de2f11bf64ca9921fda018864c78af7147025e467ce9f4a11bc877266900a6"}, + {file = "scipy-1.8.1-cp39-cp39-win32.whl", hash = "sha256:1166514aa3bbf04cb5941027c6e294a000bba0cf00f5cdac6c77f2dad479b434"}, + {file = "scipy-1.8.1-cp39-cp39-win_amd64.whl", hash = "sha256:9dd4012ac599a1e7eb63c114d1eee1bcfc6dc75a29b589ff0ad0bb3d9412034f"}, + {file = "scipy-1.8.1.tar.gz", hash = "sha256:9e3fb1b0e896f14a85aa9a28d5f755daaeeb54c897b746df7a55ccb02b340f33"}, @@ -4620,16 +4630,16 @@ tensorflow-io-gcs-filesystem = [ - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:b7aeae64dd4db1c8c0a4a7581af421fe16fd7704385017c6e4b89c041cef9830"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:cbcf8c973637140dceaacfe04b0e4a010f6d41d468cccfbf2e328fed7c6b3c46"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4307f25069f6afd7ecebbecd8603491b379af39b98ed74e5395282ef017ca5b2"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp310-cp310-win_amd64.whl", hash = "sha256:5ade6c5fadc067d576ff6b8b2d125ed7f60f4ecb6f9e6480b3cf28037cd74030"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:f62edcf9a44ebf178233a189cc8f8d7f07ae156a87123a29530e803159cc0a27"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:30b7489472d1f635df202b7f9910a00354dc791d3f4c8d99ae517f58e0cdbd12"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2ae065451e915dcf00c730355ecd5a954e47593d71df5865f5224cd915fd8cb3"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp37-cp37m-win_amd64.whl", hash = "sha256:1d1de2dbed94fb3763b020cc31b79dc9185aafc3855976ac5d0ad10967143d3c"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:8cab4ecb376a871bc98124dfee9be53a7387808a7f65438f8adecc1b31e4d228"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a6ce3f487b43b2e8e3e5e0cf9bdeb5cd67c68f5932ea74be0cdba099e3f13050"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7cfa39909e9e7f408ec2ed19ced70566ef10211eb18dec63e5ad6d42f88a3976"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp38-cp38-win_amd64.whl", hash = "sha256:643dd1b3e8942d381efc04013d8b4cd694ba558446eea9a9877096182bdb85e5"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:3da161baf459980960c2130a5085d8fb3391d4d69f52bc1787c45210218a8576"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:660e4e837057c0ab96661f56a401bb14e8bc58c3a0d57c54383c3dc7c1a06119"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:53611b66d7604976af2410502c05e1230fd1d856a18c5b391266d0bc9a1a14a6"}, - {file = "tensorflow_io_gcs_filesystem-0.25.0-cp39-cp39-win_amd64.whl", hash = "sha256:e7b15047cce35cd16fe4708ebe384c3a0077201cd2745e20df4204683c84e464"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:4222a9d0c0ddeca2fd2bfd70f5ed149346f5ba12ffe65d817d8e18393341d8e2"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:5457eeef1f0f5f294225808b2290a251a2e4639ec66db9d32aa4ae62e807d7e8"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:4c71cebb26ce10e6e48dc46e6fc0acef5329b01f75a5e76c7defb77175bf97f7"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp310-cp310-win_amd64.whl", hash = "sha256:1c165595c7a67668b44c7ffb9746ffb351c630940d9cca7f2b31f8adf7a36b94"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:c20e1f95b904f43ac86fdb251f222be2c3e7026e9ddbde2a3b6a456f26a83944"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1cccdc12ec304a7ab3e6f85919ba5a77c2bf751b3d0f9e62196ee7df11a8136a"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:94645cac4449dd2ccc40327c23d0256cf4e96597e5a55116a91076e9dc96023e"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ce0d7eaaebfcb5fdcff161af0e8a4b94d5dc346299111c08373d66058011a16d"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:e9569dadd79b2d4b28dbe5be47c378a884414a85c89eaeae6115bcba4f3cbb96"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:84a463e228cde296fc63672902a2eceac9fec5f8ae7605e9f18824db591e7f5c"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:531214e48ef64a96f565550b283e75cf0119abff14048a11a25453b47ec5b61c"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp38-cp38-win_amd64.whl", hash = "sha256:44b28c9c6a9e25774a53ec2e85ed4d0b5c4db3a7d3a4011ade94fa9ee636393c"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:09f9df13737e2b4d92b73653509281d77732ef9a90a1ebef824511ce5431eb0a"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:c71438e6459f52462b95f98ab17b20cd1a269a1efe837e4df426a0b79359f3b7"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:bd285595afe03740553710ccdbd1397d69a8e48d758c731c0de1f1c5a71a9fe5"}, + {file = "tensorflow_io_gcs_filesystem-0.26.0-cp39-cp39-win_amd64.whl", hash = "sha256:2940b4ab6848ef5ec34dc3c140b5ae9eba0da13453da839c30ebe3461a6eb51d"}, @@ -4747,2 +4757,2 @@ transformers = [ - {file = "transformers-4.19.1-py3-none-any.whl", hash = "sha256:16d3dd257d459c2598e2548a9e6875c10b7db5e44494d93b3c0a5c60afad667f"}, - {file = "transformers-4.19.1.tar.gz", hash = "sha256:6fb30ee534a25b6b3fc7064c280b7f44abf8c9bd1fb358860ebe4fd392bf15f5"}, + {file = "transformers-4.19.2-py3-none-any.whl", hash = "sha256:1416315b7c5ff1f56d3915f416b67aa254a9907fbb73ef7f7bffc9210446b5fa"}, + {file = "transformers-4.19.2.tar.gz", hash = "sha256:e19a4ff07458eda143c738e5259caf48449fcf078a63d6b1bd1aa806543440a3"}, @@ -4796,2 +4806,2 @@ types-requests = [ - {file = "types-requests-2.27.25.tar.gz", hash = "sha256:805ae7e38fd9d157153066dc4381cf585fd34dfa212f2fc1fece248c05aac571"}, - {file = "types_requests-2.27.25-py3-none-any.whl", hash = "sha256:2444905c89731dbcb6bbcd6d873a04252445df7623917c640e463b2b28d2a708"}, + {file = "types-requests-2.27.27.tar.gz", hash = "sha256:d618d9809fa32f514cf17cea8460814da671c56366fb1c908accca8bf183112b"}, + {file = "types_requests-2.27.27-py3-none-any.whl", hash = "sha256:6d8463ffe1f6edcf2e5361740a6140e7a16d427c267d83c7c1d3d1298f4e67c5"}, @@ -4808,50 +4818,50 @@ ujson = [ - {file = "ujson-5.2.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:754e9da96a24535ae5ab2a52e1d1dfc65a6a717c14063855b83f327fdf2173ea"}, - {file = "ujson-5.2.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6227597d0201ceadc902d1a8edaffaeb244050b197368ed25e6f6be0df170a6f"}, - {file = "ujson-5.2.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:be909514a47b6272e34cd1213feee324ca35a354e07f1ae3aba12d3694a5279f"}, - {file = "ujson-5.2.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:489d495431c80dc0048c4551a0d6cdbf1209e2d274f47c3f72415c91842eeb68"}, - {file = "ujson-5.2.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4d1ed3897e45477b2a4a1371186df299b13938d4d44d850953a4bb0ea4cb38f3"}, - {file = "ujson-5.2.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:102b8eb5e15e6c5537426414d180c28dbf0489e51f7c22b706511ac84aae4458"}, - {file = "ujson-5.2.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:2c04456de1fc92cc7062904c176c74e6ea220469b949508be42e819646a28457"}, - {file = "ujson-5.2.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:a3c6798035b574ceba747de83f3223a622622b7ab77a24f8b4fbea2cb92f14b0"}, - {file = "ujson-5.2.0-cp310-cp310-win32.whl", hash = "sha256:27a254a150e46980608b16ef3b609e703173492cfa738f4644c81d7e7d77494c"}, - {file = "ujson-5.2.0-cp310-cp310-win_amd64.whl", hash = "sha256:8c3f7578a62d9255650ef32e78d3345e98262e064c9ba3f205311b4c9eb507a6"}, - {file = "ujson-5.2.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:584c558c23ddc21f5b07d2c54ee527731bd9716101c27829023ab7f3ffbaa8fc"}, - {file = "ujson-5.2.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d57a87bbc77d66b8a2b74bab66357c3bb6194f5d248f1053fb8044787abde73f"}, - {file = "ujson-5.2.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:fb4555df1fe018806ba14cc38786269c8e213930103c6d0ac81e506d09d1de7e"}, - {file = "ujson-5.2.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d38c2a58c892c680080b22b59eebd77b7c6f4ae24361111fba115f9ed3651dcf"}, - {file = "ujson-5.2.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:a6f3ad3b11578bc4e25d5bd256c938fe2c7c015d8f504bc7835f127ed26a0818"}, - {file = "ujson-5.2.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:b5fcbaabf3d115cb816eb165f3fa5de5c5bc795473a554ae55620d134ddf2d36"}, - {file = "ujson-5.2.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:a1a55b3310632661a03ce68ccfb92264031aea21626d6fa5c8f6c32e769be7b6"}, - {file = "ujson-5.2.0-cp37-cp37m-win32.whl", hash = "sha256:04a8c388b2d16316df3365c81f368955662581f6a4ff033e9aba2dd1ffc9e05e"}, - {file = "ujson-5.2.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d2357ce7d93eadd29b6efbe72228809948cc59ec6682c20fa6de08aeef1703f8"}, - {file = "ujson-5.2.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e53388fb092197cb8f956673792aca994872917d897ca42a0abf7a35e293575a"}, - {file = "ujson-5.2.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:dc71ead5706e81fdf1054c8c11e4aaab43527da450a2701213c20717852d1a51"}, - {file = "ujson-5.2.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:350a3010db0045e1306bbdf889d1bdaee9bb095856c317716f0a74108cf4afe9"}, - {file = "ujson-5.2.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9acc874128baddeff908736db251597e4cbd007a384730377a59a61b08886599"}, - {file = "ujson-5.2.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c549d5a7652c3a0dd00ef6ff910fb01878bc116c66c94ac455a55cffa32cc229"}, - {file = "ujson-5.2.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ed78a5b169ece75a1e1368935ce6ab051dcbcd5c158b9796b2f1fa6cc467a651"}, - {file = "ujson-5.2.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:468d7d8dcbafc3fd40cc73e4a533a7a1d4f935f605c15ae6cac32c6d53c4c6aa"}, - {file = "ujson-5.2.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:dc5fd1d5b48edd3cc64e89ea94abe231509fdc938bdeafafe9aef3a05810159f"}, - {file = "ujson-5.2.0-cp38-cp38-win32.whl", hash = "sha256:49ce8521b0cdf210481bd89887fd1bd0a975f66088b1256dafc77c67c8ccb89d"}, - {file = "ujson-5.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:c519743a53bbe8aac6b743bcf50eb83057d1e0341e1ca8f8491f729a885af640"}, - {file = "ujson-5.2.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:b3671e1dfc49a4b4453d89fd7438aa9d7cca28afe329c70eba84e2a5778dbf3f"}, - {file = "ujson-5.2.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:11f735870f189bff1841c720115226894415ab6a7796dee8ab46bc767ea2e743"}, - {file = "ujson-5.2.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:90de04391916c5adc7bbcc69bd778e263ed45cc83c070099cb07ed25068d6a12"}, - {file = "ujson-5.2.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2c7712da662b92f80442a8efc0df09cea3a5efb42b0dd6a642e36b1b40a260d4"}, - {file = "ujson-5.2.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d9b1c3d2b22c040a81ff4e5927ce307919f7ac8bf888afded714d925edc8d0a4"}, - {file = "ujson-5.2.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6c5bbe6de6c9a5fe8dca56e36fb5c4a42e1a01d4aae1ac20cd8d7d82ccff9430"}, - {file = "ujson-5.2.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:940f35e9a0969440621445dbb6adffaa2cea77d0262abc74fce78704120c4534"}, - {file = "ujson-5.2.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6677bee8690c71f5e6cf519a6d8400f04fbd3ff9f6c50f35f1b664bc94546f84"}, - {file = "ujson-5.2.0-cp39-cp39-win32.whl", hash = "sha256:0b47a138203bb06bdac03b2a89ac9b2993fd32cb7daded06c966dd84300a5786"}, - {file = "ujson-5.2.0-cp39-cp39-win_amd64.whl", hash = "sha256:e991b7b3a08ac9e9d3a51589ef1c359c8d44ece730351cfac055684bf3787372"}, - {file = "ujson-5.2.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d1e5c635b7c3465ab8d2e3dc97c341ef1801c53a378f1d1d4cb934f6c90ec66c"}, - {file = "ujson-5.2.0-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef868bf01851869a26c0ca5f88036903836c3a6b463c74d96b37f294f6bdeea4"}, - {file = "ujson-5.2.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a5e374e793b0a3c7df20ee4c8234e89859ddb2b2821cc3300ae94ab5b08fa6d0"}, - {file = "ujson-5.2.0-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:080da13f81740c076e5f16c254a10d0e32f45d225a5e6b0687a86493cfcfbafb"}, - {file = "ujson-5.2.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:75a886bd89d8e5a004a39a6c5dc8a43bb7fcf05129d2dccd16a59602a612823a"}, - {file = "ujson-5.2.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:54ee7c46615b42f7ae9dca90f54d204a4d2041a4c926b08fffa953aa3a246e54"}, - {file = "ujson-5.2.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:6b455a62bd20e890b2124a65df45313b4292dbea851ef38574e5e2de94691ad5"}, - {file = "ujson-5.2.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1a619bad9894dad144184b735c98179c7d92d7b40fbda28eb8b0857bdfdf52"}, - {file = "ujson-5.2.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:729af63e4de30c54b527b54b4100266f79833c1e8ba35e784f01b44c2aca88d8"}, - {file = "ujson-5.2.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:25522c674b35c33f375586ac98d92ce731e79059424507ecbccbfcbce832d597"}, - {file = "ujson-5.2.0.tar.gz", hash = "sha256:163191b88842d874e081707d35de2e205e0e396e70fd068d1038879bca8b17ad"}, + {file = "ujson-5.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:a933b3a238a48162c382e0ac338b97663d044b0485021b6670565a81e7b7ec98"}, + {file = "ujson-5.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:612015c6e5a9bf041b89f1eaa8ab8682469b3a745a00c7c95bbbee8080f6b346"}, + {file = "ujson-5.3.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a720b6eff73415249a3dd02e2b1b337de31bb9fa8220bd572dffba23066e538c"}, + {file = "ujson-5.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c1408ea1704017289c3023928065233b90953aae3e1d7d06d6d6db667e9fe159"}, + {file = "ujson-5.3.0-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5192505798a5734a85c763eff11e6f6072d3595c337b52f72922b4e22fe66e2e"}, + {file = "ujson-5.3.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:bad1471ccfa8d100a0bc513c6db587c38de99384f2aa54eec1016a131d63d3d9"}, + {file = "ujson-5.3.0-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:b926f2f7a266db8f2c46498f0c2c9fcc7e53c8e0fa8bff7f08ad9c044723a2ec"}, + {file = "ujson-5.3.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:ed9809bc36292e0d3632d50aae497b5827c1a2e07158f7d4d5c53e8e8662bf66"}, + {file = "ujson-5.3.0-cp310-cp310-win32.whl", hash = "sha256:522b1d60872bb6368c14ac538adb55ca9d6c39a7a962832819ef1aafb3446ff5"}, + {file = "ujson-5.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:a609bb1cdda9748e6a8363039926dee5ea2bcc073412279615560b967f92a524"}, + {file = "ujson-5.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:7455fc3d69315149b95fd011c01496a5e9442c9e7c4d202bed87c5c2e449ed05"}, + {file = "ujson-5.3.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:865225a85e4ce48754d0036fdc0eb796b4aaf4f1e928f0efb9b4e1c081647a4c"}, + {file = "ujson-5.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d553f31bceda492c2bda37f48873820d28f07608ae14409c5e9d6c3aa6694840"}, + {file = "ujson-5.3.0-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a014531468b78c031aa04e5ca8b64385a6edb48a2e66ebf11093213c678fc383"}, + {file = "ujson-5.3.0-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:b3e6431812d8008dce7b2546b1276f649f6c9aa44617762ebd3529a25092816c"}, + {file = "ujson-5.3.0-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:089965f964d17905c48cdca88b982d525165e549b438ac86f194c6a9d852fd69"}, + {file = "ujson-5.3.0-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:ca5eced4ae4ba1e2c9539fca6451694d31e0243de2acfcd6965e2b6e159ba29b"}, + {file = "ujson-5.3.0-cp37-cp37m-win32.whl", hash = "sha256:a4fe193050b519ace09f7d053def30b99deadf650c18a8a874ea0f6c9a2992bc"}, + {file = "ujson-5.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:e7961c493a982c03cffc9ce4dc2b23bed1375352296f946cc36ddeb5145fa62c"}, + {file = "ujson-5.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:34592a3c9370745b093ebca60aee6d32f8e7abe3d5c12d54c7dba0b2f81cd863"}, + {file = "ujson-5.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:510c3705b29bc3753ec9e6073b99000160320c1cf6e035884295401acb474dfa"}, + {file = "ujson-5.3.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:034c07399dff35385ecc53caf9b1f12b3e203834de27b723daeb2cbb3e02ee7f"}, + {file = "ujson-5.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5a87e1c05f1efc23c67bfa26be79f12c1f59f71a586b396068d5cf7eb78a2635"}, + {file = "ujson-5.3.0-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:972c1850cc52e57ccdea70e3c069e2da5c6090e3ee18d167dff2618a8d7dd127"}, + {file = "ujson-5.3.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:d45e86101a5cddd295d5870b02244fc87ecd9b8936f440acbd2bb30b4c1fe23c"}, + {file = "ujson-5.3.0-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:decd32e8d7f934dde484e43431f60b069e87bb30a3a7e186cb6bd69caa0418f3"}, + {file = "ujson-5.3.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8c734982d6560356c173817576a1f3fa074a2d2b993e63bffa69105ae9ec144b"}, + {file = "ujson-5.3.0-cp38-cp38-win32.whl", hash = "sha256:563b7ed1e789f763410c49e6fab51d61982eb94088b25338e65b89ad20b6b107"}, + {file = "ujson-5.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:8a2cbb044bc6e6764b9a089a2079432b8bd576dbff5faa808b562a8f3c97452b"}, + {file = "ujson-5.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:6c5d19fbdd29d5080926c863ba89591a2d3dbf592ea35b456cb2996004433d11"}, + {file = "ujson-5.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:4dc79db757b0dfa23a111a4573827a6ef57de65dbe8cdb202e45cf9ddf06aad5"}, + {file = "ujson-5.3.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5700a179abacbdc8609737e595a598b7f107cd68615ded3f922f4c0d4b6009d6"}, + {file = "ujson-5.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:287dea79473ce4941598c45dc34f9f692d48d7863b451541c5ce960ab54465fb"}, + {file = "ujson-5.3.0-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:151faa9085c10351a04aea959a2bc25dfa2e21af26d9b614a221d045b7923ea4"}, + {file = "ujson-5.3.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:285082924747958aa69e1dc2146c01db6b0921a0bb04b595beefe7fcffaffaf9"}, + {file = "ujson-5.3.0-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:8dd74570fe59c738d4dc12d44eb89538b0b01fae9dda6cfe3ff3f6934877cf35"}, + {file = "ujson-5.3.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6aba1e39ffdd83ec14832ea25bbb18266fea46bc69b8c0acbd996495826c0e6f"}, + {file = "ujson-5.3.0-cp39-cp39-win32.whl", hash = "sha256:1358621686ddfda55171fc98c171bf5b1a80ce4d444134b70e1e449925fa014f"}, + {file = "ujson-5.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:d1fab398734634f4b412512ed230d45522fc9f3dd9ca169f579474a491f662aa"}, + {file = "ujson-5.3.0-pp37-pypy37_pp73-macosx_10_9_x86_64.whl", hash = "sha256:d4830c8df958c45c16dfc43c8353403efd7f1a8e39b91a7e0e848d55b7fa8b48"}, + {file = "ujson-5.3.0-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48bed7c1f95484644a2cc658efff4d1e75b8c806f6ef2b5c815f59e1cbe0d039"}, + {file = "ujson-5.3.0-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2db7cbe415d7329b9bff029a83851d1077836ec728fe1c32be34c9c3a5017ab2"}, + {file = "ujson-5.3.0-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:73636001055667bbcc6a73b232da1d272f68a49a1f192efbe99e99ddf8ef1d21"}, + {file = "ujson-5.3.0-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:47bf966e1041ae8e568d7e8eb421d72d0521c30c28306b76c256832553e316c6"}, + {file = "ujson-5.3.0-pp38-pypy38_pp73-macosx_10_9_x86_64.whl", hash = "sha256:66f857d8b8d7ea44e3fd5f2b7e471334f24b735423729771f5a7a7f69ab645ed"}, + {file = "ujson-5.3.0-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7d2cb50aa526032b8812975c3832058763ee50e1dc3a1302431ed9d0922c3a1b"}, + {file = "ujson-5.3.0-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f615ee181b813c8f50a57d55354d0c0304a0be066962efdbef6f44517b26e3b2"}, + {file = "ujson-5.3.0-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:c5696c99a7dd567566c18490e8e346b2657967feb1e3c2004e91dbb253db0894"}, + {file = "ujson-5.3.0-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:a68d5a8a46712ffe86db8ae1b4311714db534725521c71fd4c9e1cd062dae9a4"}, + {file = "ujson-5.3.0.tar.gz", hash = "sha256:ab938777b3ac0372231ee654a7f6a13787e587b1ca268d8aa7e6fb6846e477d0"}, diff --git a/services/worker/pyproject.toml b/services/worker/pyproject.toml index 5e847619..83bec3dc 100644 --- a/services/worker/pyproject.toml +++ b/services/worker/pyproject.toml @@ -14 +14 @@ conllu = "^4.4.1" -datasets = { extras = ["audio", "vision"], version = "^2.2.1" } +datasets = { extras = ["audio", "vision"], version = "^2.2.2" }
605898f2993302c87d64d06f7bdfe2f3bb4c6716
Sylvain Lesage
2022-05-23T08:15:16
fix: 🐛 increase resources for api, and block big datasets (#289)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 15aaba5a..8341b84f 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -22 +22 @@ domain: "datasets-server.huggingface.tech" -datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech" +datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech,electricity_load_diagrams,svhn,the_pile,gary109/crop14_public-test,scielo,hyperpartisan_news_detection,wiki_auto,visual_genome" @@ -30 +30 @@ reverseProxy: - alb.ingress.kubernetes.io/listen-ports: "[{\"HTTP\": 80, \"HTTPS\": 443}]" + alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80, "HTTPS": 443}]' @@ -47 +47 @@ reverseProxy: - role-datasets-server: 'true' + role-datasets-server: "true" @@ -65 +65 @@ api: - role-datasets-server: 'true' + role-datasets-server: "true" @@ -69,2 +69,2 @@ api: - cpu: 2 - memory: "1Gi" + cpu: 4 + memory: "2Gi" @@ -72,2 +72,5 @@ api: - cpu: 2 - memory: "1Gi" + cpu: 4 + memory: "2Gi" + + # Number of uvicorn workers for running the application + appNumWorkers: "8" @@ -79 +82 @@ datasetsWorker: - role-datasets-server: 'true' + role-datasets-server: "true" @@ -88 +90,0 @@ datasetsWorker: - @@ -93 +95 @@ splitsWorker: - role-datasets-server: 'true' + role-datasets-server: "true" @@ -111 +113 @@ admin: - role-datasets-server: 'true' + role-datasets-server: "true"
5e92c98949bf67605a1177191f0e93f2ce573b50
Sylvain Lesage
2022-05-20T08:44:08
perf: ⚡️ reduce the number of workers (#287)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index a389b85c..15aaba5a 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -22 +22 @@ domain: "datasets-server.huggingface.tech" -datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev" +datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev,MLCommons/peoples_speech" @@ -62 +62 @@ api: - replicas: 2 + replicas: 1 @@ -90 +90 @@ splitsWorker: - replicas: 10 + replicas: 4 @@ -103,0 +104,2 @@ splitsWorker: + # Maximum number of jobs running at the same time for the same dataset + maxJobsPerDataset: 2
08eda673953879c44e6b04ce7db4d302635949c3
Sylvain Lesage
2022-05-18T16:28:40
feat: 🎸 update prod values (#285)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 8075729a..a389b85c 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -22 +22 @@ domain: "datasets-server.huggingface.tech" -datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert" +datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert,Graphcore/vqa-lxmert,echarlaix/vqa-lxmert,LIUM/tedlium,Shitao/MSMARCOForLibVQ,imthanhlv/binhvq_news21_raw,abdusahmbzuai/masc_dev" @@ -69,2 +69,2 @@ api: - cpu: 1 - memory: "256Mi" + cpu: 2 + memory: "1Gi" @@ -72,2 +72,2 @@ api: - cpu: 1 - memory: "256Mi" + cpu: 2 + memory: "1Gi" @@ -76 +76 @@ datasetsWorker: - replicas: 3 + replicas: 2 @@ -85,0 +86,2 @@ datasetsWorker: + memory: "4Gi" + @@ -88 +90 @@ splitsWorker: - replicas: 12 + replicas: 10 @@ -97,0 +100 @@ splitsWorker: + memory: "4Gi"
a800f0ecdf048c8712360cc4262794b083bed38c
Sylvain Lesage
2022-05-17T14:25:25
test: 💍 fix test (#284)
diff --git a/e2e/tests/test_api.py b/e2e/tests/test_api.py index d574ddf4..8c5025a9 100644 --- a/e2e/tests/test_api.py +++ b/e2e/tests/test_api.py @@ -16,9 +16,11 @@ def test_get_dataset(): - response = requests.get(f"{URL}/metrics") - lines = response.text.split("\n") - metrics = {line.split(" ")[0]: float(line.split(" ")[1]) for line in lines if line and line[0] != "#"} - assert ( - metrics['queue_jobs_total{queue="datasets",status="waiting"}'] - + metrics['queue_jobs_total{queue="datasets",status="started"}'] - + metrics['queue_jobs_total{queue="datasets",status="success"}'] - >= 1 - ) + # Disabled until the metrics are fixed + # https://github.com/huggingface/datasets-server/issues/250 + # response = requests.get(f"{URL}/metrics") + # lines = response.text.split("\n") + # metrics = {line.split(" ")[0]: float(line.split(" ")[1]) for line in lines if line and line[0] != "#"} + # assert ( + # metrics['queue_jobs_total{queue="datasets",status="waiting"}'] + # + metrics['queue_jobs_total{queue="datasets",status="started"}'] + # + metrics['queue_jobs_total{queue="datasets",status="success"}'] + # >= 1 + # )
de4436cf0e1c9005e398186ed9c11d9365b3842f
Sylvain Lesage
2022-05-17T14:09:37
feat: 🎸 upgrade images (#283)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 5b684e92..6d371838 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-443f00f + tag: sha-cc59942
cc59942097fc73205ba938f9a4fae3e10e7e8193
Sylvain Lesage
2022-05-17T14:08:24
fix: 🐛 disable the metrics about cache and queue (#282)
diff --git a/services/api/src/api/prometheus.py b/services/api/src/api/prometheus.py index e51f6f1f..a890c751 100644 --- a/services/api/src/api/prometheus.py +++ b/services/api/src/api/prometheus.py @@ -58 +58,2 @@ class Prometheus: - self.updateMetrics() + # disabled for now to fix https://github.com/huggingface/datasets-server/issues/279 + # self.updateMetrics() diff --git a/services/api/tests/test_app.py b/services/api/tests/test_app.py index ab3e5aeb..73ad64ac 100644 --- a/services/api/tests/test_app.py +++ b/services/api/tests/test_app.py @@ -346,2 +346,3 @@ def test_metrics(client: TestClient) -> None: - assert 'queue_jobs_total{queue="datasets",status="waiting"}' in metrics - assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics + # Disabled for now + # assert 'queue_jobs_total{queue="datasets",status="waiting"}' in metrics + # assert 'cache_entries_total{cache="datasets",status="empty"}' in metrics
75aca56e504d6e88f84b13b7fd8ec44ea08b85b9
Sylvain Lesage
2022-05-17T13:56:05
feat: 🎸 upgrade images (#281)
diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index 33adf1ac..5b684e92 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-b1ed584 + tag: sha-443f00f
443f00f9eac8165ac53541873c8331091f91821e
Sylvain Lesage
2022-05-17T13:42:49
Fix ram in prod (#280)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index bce993e3..8075729a 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -55,0 +56 @@ reverseProxy: + memory: "256Mi" @@ -57,0 +59 @@ reverseProxy: + memory: "256Mi" @@ -67,0 +70 @@ api: + memory: "256Mi" @@ -69,0 +73 @@ api: + memory: "256Mi" diff --git a/services/api/poetry.lock b/services/api/poetry.lock index 6133a99b..5e20e5ca 100644 --- a/services/api/poetry.lock +++ b/services/api/poetry.lock @@ -735 +735 @@ name = "prometheus-client" -version = "0.12.0" +version = "0.14.1" @@ -739 +739 @@ optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6" @@ -1070,12 +1069,0 @@ full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "gra -[[package]] -name = "starlette-prometheus" -version = "0.9.0" -description = "Prometheus integration for Starlette" -category = "main" -optional = false -python-versions = ">=3.7,<4.0" - -[package.dependencies] -prometheus_client = ">=0.12,<0.13" -starlette = ">=0.12.2" - @@ -1204 +1192 @@ python-versions = "3.9.6" -content-hash = "4e0781c9059d07cfda1a4419eee819ad7a24ef7b84f0d998077b7c0619dc18f6" +content-hash = "220f504588ab6b978e29e6e613926e8f5b67d01df5109248827987b4e5f21510" @@ -1640,2 +1628,2 @@ prometheus-client = [ - {file = "prometheus_client-0.12.0-py2.py3-none-any.whl", hash = "sha256:317453ebabff0a1b02df7f708efbab21e3489e7072b61cb6957230dd004a0af0"}, - {file = "prometheus_client-0.12.0.tar.gz", hash = "sha256:1b12ba48cee33b9b0b9de64a1047cbd3c5f2d0ab6ebcead7ddda613a750ec3c5"}, + {file = "prometheus_client-0.14.1-py3-none-any.whl", hash = "sha256:522fded625282822a89e2773452f42df14b5a8e84a86433e3f8a189c1d54dc01"}, + {file = "prometheus_client-0.14.1.tar.gz", hash = "sha256:5459c427624961076277fdc6dc50540e2bacb98eebde99886e59ec55ed92093a"}, @@ -2010,4 +1997,0 @@ starlette = [ -starlette-prometheus = [ - {file = "starlette-prometheus-0.9.0.tar.gz", hash = "sha256:a52fb0f1df52b44a7a677a792759337ef0ce0d59ddf3e684a7d6459a93a90e99"}, - {file = "starlette_prometheus-0.9.0-py3-none-any.whl", hash = "sha256:b4702e4ec67dce508d28551db0e45f12f58411afdb5d1078c92ff74331915381"}, -] diff --git a/services/api/pyproject.toml b/services/api/pyproject.toml index 943a2181..f24d6b1a 100644 --- a/services/api/pyproject.toml +++ b/services/api/pyproject.toml @@ -11,0 +12 @@ libutils = { path = "../../libs/libutils", develop = true } +prometheus-client = "^0.14.1" @@ -15 +15,0 @@ starlette = "^0.16.0" -starlette-prometheus = "^0.9.0" diff --git a/services/api/src/api/app.py b/services/api/src/api/app.py index c8d330d3..e21523d4 100644 --- a/services/api/src/api/app.py +++ b/services/api/src/api/app.py @@ -11 +10,0 @@ from starlette.staticfiles import StaticFiles -from starlette_prometheus import PrometheusMiddleware @@ -48 +47 @@ def create_app() -> Starlette: - middleware = [Middleware(GZipMiddleware), Middleware(PrometheusMiddleware, filter_unhandled_paths=True)] + middleware = [Middleware(GZipMiddleware)]
2254754449363298d59804f1d866055481c1bf47
Sylvain Lesage
2022-05-17T12:46:37
fix: 🐛 the block list must be a comma-separated list (#278)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 3cf41ae7..bce993e3 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -22,23 +22 @@ domain: "datasets-server.huggingface.tech" -datasetsBlocklist: >- - Alvenir/nst-da-16khz - bigscience/P3 - clips/mqa - echarlaix/gqa-lxmert - echarlaix/vqa-lxmert - fractalego/QA_to_statements - hyperpartisan_news_detection - imthanhlv/binhvq_news21_raw - Graphcore/gqa-lxmert - Graphcore/vqa-lxmert - kiyoung2/aistage-mrc - lewtun/gem-multi-dataset-predictions - lukesjordan/worldbank-project-documents - math_dataset - midas/ldke3k_medium - midas/ldke3k_small - midas/ldkp3k_small - qr/cefr_book_sentences - SaulLu/Natural_Questions_HTML_reduced_all - SaulLu/Natural_Questions_HTML_Toy - unicamp-dl/mmarco - z-uo/squad-it +datasetsBlocklist: "bigscience/P3,echarlaix/gqa-lxmert,Graphcore/gqa-lxmert"
77c0d8577a5abc3008bbc60fd510eb91c8566027
Sylvain Lesage
2022-05-17T09:34:04
feat: 🎸 enable monitoringin prod (#276)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 6d7848cf..3cf41ae7 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -15,0 +16,3 @@ secrets: +monitoring: + enabled: true +
dadad27f60921fc68d34e5e8361bc0d7c7f0ae2e
Sylvain Lesage
2022-05-17T09:09:28
feat: 🎸 add the admin service (to run admin scripts) (#275)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index de5f1ede..ead86f58 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16 +16 @@ jobs: - service: [api, worker] + service: [admin, api, worker] diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index a6f4410a..e1a92916 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -13 +13 @@ jobs: - [e2e, services/api, libs/libcache, libs/libqueue, libs/libutils] + [e2e, services/admin, services/api, libs/libcache, libs/libqueue, libs/libutils] diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 60cef47a..884f0321 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -14 +14 @@ jobs: - [services/api, libs/libcache, libs/libqueue, libs/libutils] + [services/admin, services/api, libs/libcache, libs/libqueue, libs/libutils] diff --git a/.vscode/monorepo.code-workspace b/.vscode/monorepo.code-workspace index f1d9cb32..8bf3ee71 100644 --- a/.vscode/monorepo.code-workspace +++ b/.vscode/monorepo.code-workspace @@ -18,0 +19,4 @@ + { + "name": "services/admin", + "path": "../services/admin" + }, @@ -40 +44 @@ - "python.linting.flake8Enabled": true, + "python.linting.flake8Enabled": true diff --git a/Makefile b/Makefile index b29f978e..4ccbb0a3 100644 --- a/Makefile +++ b/Makefile @@ -5,0 +6 @@ install: + $(MAKE) -C services/admin/ install @@ -13,0 +15 @@ lock: + $(MAKE) -C services/admin/ lock @@ -24,0 +27 @@ test: + $(MAKE) -C services/admin/ test @@ -32,0 +36 @@ coverage: + $(MAKE) -C services/admin/ coverage @@ -45,0 +50 @@ quality: + $(MAKE) -C services/admin/ quality @@ -55,0 +61 @@ style: + $(MAKE) -C services/admin/ style diff --git a/deprecated/Makefile b/deprecated/Makefile deleted file mode 100644 index 398f4056..00000000 --- a/deprecated/Makefile +++ /dev/null @@ -1,32 +0,0 @@ - -.PHONY: warm -warm: - poetry run python src/datasets_server/warm.py - -.PHONY: worker -worker: - poetry run python src/datasets_server/worker.py - -.PHONY: force-refresh-cache -force-refresh-cache: - poetry run python src/datasets_server/force_refresh_cache.py - -.PHONY: cancel-started-jobs -cancel-started-jobs: - poetry run python src/datasets_server/cancel_started_jobs.py - -.PHONY: cancel-waiting-jobs -cancel-waiting-jobs: - poetry run python src/datasets_server/cancel_waiting_jobs.py - -.PHONY: clean-queues -clean-queues: - poetry run python src/datasets_server/clean_queues.py - -.PHONY: clean-cache -clean-cache: - poetry run python src/datasets_server/clean_cache.py -# TODO: remove the assets too - -.PHONY: clean -clean: clean-queues clean-cache diff --git a/deprecated/README.md b/deprecated/README.md deleted file mode 100644 index e8f8c746..00000000 --- a/deprecated/README.md +++ /dev/null @@ -1,39 +0,0 @@ -TODO: add the scripts - -To warm the cache, ie. add all the missing Hugging Face datasets to the queue: - -```bash -make warm -``` - -Warm the cache with: - -```bash -pm2 start --no-autorestart --name warm make -- -C /home/hf/datasets-server/ warm -``` - -To empty the databases: - -```bash -make clean -``` - -or individually: - -```bash -make clean-cache -make clean-queues # delete all the jobs -``` - -See also: - -```bash -make cancel-started-jobs -make cancel-waiting-jobs -``` - ---- - -how to monitor the workers and the queue? - -grafana doesn't have any data (see links in INSTALL.md) diff --git a/deprecated/cancel_started_jobs.py b/deprecated/cancel_started_jobs.py deleted file mode 100644 index 435657a8..00000000 --- a/deprecated/cancel_started_jobs.py +++ /dev/null @@ -1,16 +0,0 @@ -import logging - -from libutils.logger import init_logger -from libqueue.queue import ( - cancel_started_dataset_jobs, - cancel_started_split_jobs, - connect_to_queue, -) - -if __name__ == "__main__": - init_logger("INFO", "cancel_started_jobs") - logger = logging.getLogger("cancel_started_jobs") - connect_to_queue() - cancel_started_dataset_jobs() - cancel_started_split_jobs() - logger.info("all the started jobs in the queues have been cancelled") diff --git a/docker-compose.yml b/docker-compose.yml index 259922df..fee6cf54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,0 +69,10 @@ services: + admin: + build: + context: . + dockerfile: ./services/admin/Dockerfile + environment: + MONGO_URL: "mongodb://mongodb" + depends_on: + mongodb: + condition: service_started + restart: always diff --git a/infra/charts/datasets-server/env/dev.yaml b/infra/charts/datasets-server/env/dev.yaml index eb4ed3f5..4b578960 100644 --- a/infra/charts/datasets-server/env/dev.yaml +++ b/infra/charts/datasets-server/env/dev.yaml @@ -63,0 +64,9 @@ splitsWorker: + +admin: + replicas: 1 + + resources: + requests: + cpu: 0.01 + limits: + cpu: 1 diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 072c7687..6d7848cf 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -115,0 +116,15 @@ splitsWorker: + +admin: + replicas: 1 + + nodeSelector: + role-datasets-server: 'true' + + resources: + requests: + cpu: 0.01 + limits: + cpu: 1 + + # Log level + logLevel: "DEBUG" diff --git a/infra/charts/datasets-server/templates/_helpers.tpl b/infra/charts/datasets-server/templates/_helpers.tpl index 114c4212..9bd0a11d 100644 --- a/infra/charts/datasets-server/templates/_helpers.tpl +++ b/infra/charts/datasets-server/templates/_helpers.tpl @@ -64,0 +65,5 @@ app: "{{ include "release" . }}-splits-worker" +{{- define "labels.admin" -}} +{{ include "labels" . }} +app: "{{ include "release" . }}-admin" +{{- end -}} + diff --git a/infra/charts/datasets-server/templates/admin/_container.tpl b/infra/charts/datasets-server/templates/admin/_container.tpl new file mode 100644 index 00000000..59c51c2a --- /dev/null +++ b/infra/charts/datasets-server/templates/admin/_container.tpl @@ -0,0 +1,41 @@ +{{- define "containerAdmin" -}} +- name: "{{ include "name" . }}-admin" + env: + - name: ASSETS_DIRECTORY + value: {{ .Values.splitsWorker.assetsDirectory | quote }} + - name: LOG_LEVEL + value: {{ .Values.splitsWorker.logLevel | quote }} + - name: MONGO_CACHE_DATABASE + value: {{ .Values.mongodb.cacheDatabase | quote }} + - name: MONGO_QUEUE_DATABASE + value: {{ .Values.mongodb.queueDatabase | quote }} + - name: MONGO_URL + {{- if .Values.mongodb.enabled }} + value: mongodb://{{.Release.Name}}-mongodb + {{- else }} + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.mongoUrl | quote }} + key: MONGO_URL + optional: false + {{- end }} + image: "{{ .Values.admin.image.repository }}/{{ .Values.admin.image.name }}:{{ .Values.docker.tag }}" + imagePullPolicy: {{ .Values.admin.image.pullPolicy }} + volumeMounts: + - mountPath: {{ .Values.admin.assetsDirectory | quote }} + mountPropagation: None + name: nfs + subPath: "{{ include "assets.subpath" . }}" + readOnly: false + securityContext: + allowPrivilegeEscalation: false + # TODO: provide readiness and liveness probes + # readinessProbe: + # tcpSocket: + # port: {{ .Values.admin.readinessPort }} + # livenessProbe: + # tcpSocket: + # port: {{ .Values.admin.readinessPort }} + resources: + {{ toYaml .Values.admin.resources | nindent 4 }} +{{- end -}} diff --git a/infra/charts/datasets-server/templates/admin/deployment.yaml b/infra/charts/datasets-server/templates/admin/deployment.yaml new file mode 100644 index 00000000..2ec72134 --- /dev/null +++ b/infra/charts/datasets-server/templates/admin/deployment.yaml @@ -0,0 +1,38 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + {{ include "labels.admin" . | nindent 4 }} + name: "{{ include "release" . }}-admin" + namespace: {{ .Release.Namespace }} +spec: + progressDeadlineSeconds: 600 + replicas: {{ .Values.admin.replicas }} + revisionHistoryLimit: 10 + selector: + matchLabels: + {{ include "labels.admin" . | nindent 6 }} + strategy: + type: Recreate + template: + metadata: + labels: + {{ include "labels.admin" . | nindent 8 }} + spec: + initContainers: + {{ include "initContainerAssets" . | nindent 8 }} + containers: + {{ include "containerAdmin" . | nindent 8 }} + nodeSelector: + {{ toYaml .Values.admin.nodeSelector | nindent 8 }} + tolerations: + {{ toYaml .Values.admin.tolerations | nindent 8 }} + volumes: + - name: nfs + nfs: + server: {{ .Values.storage.nfs.server }} + path: {{ .Values.storage.nfs.path }} + securityContext: + runAsUser: {{ .Values.uid }} + runAsGroup: {{ .Values.gid }} + runAsNonRoot: true diff --git a/infra/charts/datasets-server/values.yaml b/infra/charts/datasets-server/values.yaml index a7813e19..33adf1ac 100644 --- a/infra/charts/datasets-server/values.yaml +++ b/infra/charts/datasets-server/values.yaml @@ -31 +31 @@ docker: - tag: sha-8a7c036 + tag: sha-b1ed584 @@ -194,0 +195,22 @@ splitsWorker: + + +admin: + image: + repository: 707930574880.dkr.ecr.us-east-1.amazonaws.com + name: hub-datasets-server-admin + pullPolicy: IfNotPresent + + replicas: 1 + + resources: + requests: + cpu: 1 + limits: + cpu: 1 + nodeSelector: {} + tolerations: [] + + # Directory of assets (audio files and images that will be served for the web) + assetsDirectory: "/assets" + # Log level + logLevel: "INFO" diff --git a/libs/libqueue/src/libqueue/queue.py b/libs/libqueue/src/libqueue/queue.py index 60defd29..e5209b1a 100644 --- a/libs/libqueue/src/libqueue/queue.py +++ b/libs/libqueue/src/libqueue/queue.py @@ -265,8 +264,0 @@ def finish_started_job(jobs: QuerySet[AnyJob], job_id: str, success: bool) -> No -def cancel_started_jobs(jobs: QuerySet[AnyJob]) -> None: - get_started(jobs).update(finished_at=datetime.utcnow(), status=Status.CANCELLED) - - -def cancel_waiting_jobs(jobs: QuerySet[AnyJob]) -> None: - get_waiting(jobs).update(finished_at=datetime.utcnow(), status=Status.CANCELLED) - - @@ -287 +279,3 @@ def cancel_started_dataset_jobs() -> None: - cancel_started_jobs(DatasetJob.objects) + for job in get_started(DatasetJob.objects): + job.update(finished_at=datetime.utcnow(), status=Status.CANCELLED) + add_dataset_job(dataset_name=job.dataset_name) @@ -291,9 +285,3 @@ def cancel_started_split_jobs() -> None: - cancel_started_jobs(SplitJob.objects) - - -def cancel_waiting_dataset_jobs() -> None: - cancel_waiting_jobs(DatasetJob.objects) - - -def cancel_waiting_split_jobs() -> None: - cancel_waiting_jobs(SplitJob.objects) + for job in get_started(SplitJob.objects): + job.update(finished_at=datetime.utcnow(), status=Status.CANCELLED) + add_split_job(dataset_name=job.dataset_name, config_name=job.config_name, split_name=job.split_name) diff --git a/services/admin/.env.example b/services/admin/.env.example new file mode 100644 index 00000000..4f462cca --- /dev/null +++ b/services/admin/.env.example @@ -0,0 +1,14 @@ +# Assets directory +# ASSETS_DIRECTORY= + +# Log level +# LOG_LEVEL = "INFO" + +# Name of the mongo db database used to cache the datasets +# MONGO_CACHE_DATABASE="datasets_server_cache" + +# Name of the mongo db database used to store the jobs queue +# MONGO_QUEUE_DATABASE="datasets_server_queue" + +# URL to connect to mongo db +# MONGO_URL="mongodb://localhost:27017" diff --git a/services/admin/.flake8 b/services/admin/.flake8 new file mode 100644 index 00000000..f7d6157c --- /dev/null +++ b/services/admin/.flake8 @@ -0,0 +1,5 @@ +[flake8] +# Recommend matching the black line length (119), +# rather than using the flake8 default of 79: +max-line-length = 119 +extend-ignore = "E203" diff --git a/services/admin/.python-version b/services/admin/.python-version new file mode 100644 index 00000000..1635d0f5 --- /dev/null +++ b/services/admin/.python-version @@ -0,0 +1 @@ +3.9.6 diff --git a/services/admin/Dockerfile b/services/admin/Dockerfile new file mode 100644 index 00000000..7b0bcbde --- /dev/null +++ b/services/admin/Dockerfile @@ -0,0 +1,30 @@ +FROM python:3.9.6-slim + +ENV PYTHONFAULTHANDLER=1 \ + PYTHONUNBUFFERED=1 \ + PYTHONHASHSEED=random \ + PIP_NO_CACHE_DIR=off \ + PIP_DISABLE_PIP_VERSION_CHECK=on \ + PIP_DEFAULT_TIMEOUT=100 \ + POETRY_NO_INTERACTION=1 \ + # Versions: + POETRY_VERSION=1.1.12 \ + POETRY_VIRTUALENVS_IN_PROJECT=true + +# System deps: +RUN apt-get update \ + && apt-get install -y build-essential python3-dev make \ + && rm -rf /var/lib/apt/lists/* +RUN pip install -U --no-cache-dir pip +RUN pip install "poetry==$POETRY_VERSION" + +WORKDIR /src +COPY libs ./libs/ +COPY services ./services/ +COPY tools ./tools/ +WORKDIR /src/services/admin/ +RUN poetry install + +# https://stackoverflow.com/a/55734437/7351594 +# do nothing: the user has to login to the machine to run the scripts with make +CMD exec /bin/bash -c "trap : TERM INT; sleep infinity & wait" diff --git a/services/admin/INSTALL.md b/services/admin/INSTALL.md new file mode 100644 index 00000000..c658572a --- /dev/null +++ b/services/admin/INSTALL.md @@ -0,0 +1,47 @@ +# Install guide + +Follow the [general INSTALL](../INSTALL.md) to be sure to setup the assets directory and the databases. + +## Requirements + +The requirements are: + +- Python 3.9.6+ (consider [pyenv](https://github.com/pyenv/pyenv)) +- Poetry 1.1.7+ +- make + +We assume a machine running Ubuntu. Install packages: + +```bash +sudo apt install python-is-python3 make +``` + +Also install node and npm (with [nvm](https://github.com/nvm-sh/nvm)), then: + +```bash +npm i -g pm2@latest +``` + +Also [install poetry](https://python-poetry.org/docs/master/#installation). Don't forget to add `poetry` to the `PATH` environment variable. + +## Install and configure + +Install the API service: + +```bash +cd +# See https://github.blog/2013-09-03-two-factor-authentication/#how-does-it-work-for-command-line-git for authentication +git clone https://github.com/huggingface/datasets-server.git +cd datasets-server/services/admin +make install +``` + +Copy and edit the environment variables file: + +```bash +cd datasets-server/services/admin +cp .env.example .env +vi .env +``` + +Note that we assume `ASSETS_DIRECTORY=/data` in the nginx configuration. If you set the assets directory to another place, or let the default, ensure the nginx configuration is setup accordingly. Beware: the default directory inside `/home/hf/.cache` is surely not readable by the nginx user. diff --git a/services/admin/Makefile b/services/admin/Makefile new file mode 100644 index 00000000..d6b4f949 --- /dev/null +++ b/services/admin/Makefile @@ -0,0 +1,27 @@ +include ../../tools/Common.mk + +.PHONY: cancel-started-split-jobs +cancel-started-split-jobs: + poetry run python src/admin/scripts/cancel_started_split_jobs.py + +.PHONY: cancel-started-dataset-jobs +cancel-started-dataset-jobs: + poetry run python src/admin/scripts/cancel_started_dataset_jobs.py + +.PHONY: warm-cache +warm-cache: + poetry run python src/admin/scripts/warm_cache.py + +# Ensure to specify HF_TOKEN when calling make test, ie HF_TOKEN=hf_app_xxx make test +.PHONY: test +test: + docker-compose -f tests/docker-compose.yml up -d + MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27019" poetry run python -m pytest -x tests + docker-compose -f tests/docker-compose.yml down + +# Ensure to specify HF_TOKEN when calling make coverage, ie HF_TOKEN=hf_app_xxx make coverage +.PHONY: coverage +coverage: + docker-compose -f tests/docker-compose.yml up -d + MONGO_CACHE_DATABASE="datasets_server_cache_test" MONGO_QUEUE_DATABASE="datasets_server_queue_test" MONGO_URL="mongodb://localhost:27019" poetry run python -m pytest -s --cov --cov-report xml:coverage.xml --cov-report=term tests + docker-compose -f tests/docker-compose.yml down diff --git a/services/admin/README.md b/services/admin/README.md new file mode 100644 index 00000000..04c24346 --- /dev/null +++ b/services/admin/README.md @@ -0,0 +1,43 @@ +# Datasets server admin machine + +> Admin scripts + +## Install + +See [INSTALL](./INSTALL.md#Install) + +## Run + +Launch the scripts with: + +```shell +make <SCRIPT> +``` + +Set environment variables to configure the following aspects: + +- `ASSETS_DIRECTORY`: directory where the asset files are stored. Defaults to empty, in which case the assets are located in the `datasets_server_assets` subdirectory inside the OS default cache directory. +- `LOG_LEVEL`: log level, among `DEBUG`, `INFO`, `WARNING`, `ERROR` and `CRITICAL`. Defaults to `INFO`. +- `MONGO_CACHE_DATABASE`: the name of the database used for storing the cache. Defaults to `"datasets_server_cache"`. +- `MONGO_QUEUE_DATABASE`: the name of the database used for storing the queue. Defaults to `"datasets_server_queue"`. +- `MONGO_URL`: the URL used to connect to the mongo db server. Defaults to `"mongodb://localhost:27017"`. + +To launch the scripts: + +- if the image runs in a docker container: + + ```shell + docker exec -it datasets-server_admin_1 make <SCRIPT> + ``` + +- if the image runs in a kube pod: + + ```shell + kubectl exec datasets-server-prod-admin-5cc8f8fcd7-k7jfc -- make <SCRIPT> + ``` + +The scripts: + +- `cancel-started-split-jobs`: cancel all the started split jobs (stop the workers before!) +- `cancel-started-dataset-jobs`: cancel all the started dataset jobs (stop the workers before!) +- `warm-cache`: create jobs for all the missing datasets and/or splits diff --git a/services/admin/poetry.lock b/services/admin/poetry.lock new file mode 100644 index 00000000..90d58da9 --- /dev/null +++ b/services/admin/poetry.lock @@ -0,0 +1,1990 @@ +[[package]] +name = "anyio" +version = "3.6.1" +description = "High level compatibility layer for multiple asynchronous event loop implementations" +category = "main" +optional = false +python-versions = ">=3.6.2" + +[package.dependencies] +idna = ">=2.8" +sniffio = ">=1.1" + +[package.extras] +doc = ["packaging", "sphinx-rtd-theme", "sphinx-autodoc-typehints (>=1.2.0)"] +test = ["coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "contextlib2", "uvloop (<0.15)", "mock (>=4)", "uvloop (>=0.15)"] +trio = ["trio (>=0.16)"] + +[[package]] +name = "appdirs" +version = "1.4.4" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "atomicwrites" +version = "1.4.0" +description = "Atomic file writes." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "attrs" +version = "21.4.0" +description = "Classes Without Boilerplate" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.extras] +dev = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "furo", "sphinx", "sphinx-notfound-page", "pre-commit", "cloudpickle"] +docs = ["furo", "sphinx", "zope.interface", "sphinx-notfound-page"] +tests = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "zope.interface", "cloudpickle"] +tests_no_zope = ["coverage[toml] (>=5.0.2)", "hypothesis", "pympler", "pytest (>=4.3.0)", "six", "mypy", "pytest-mypy-plugins", "cloudpickle"] + +[[package]] +name = "azure-core" +version = "1.24.0" +description = "Microsoft Azure Core Library for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +requests = ">=2.18.4" +six = ">=1.11.0" +typing-extensions = ">=4.0.1" + +[[package]] +name = "azure-identity" +version = "1.10.0" +description = "Microsoft Azure Identity Library for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +azure-core = ">=1.11.0,<2.0.0" +cryptography = ">=2.5" +msal = ">=1.12.0,<2.0.0" +msal-extensions = ">=0.3.0,<2.0.0" +six = ">=1.12.0" + +[[package]] +name = "azure-storage-blob" +version = "12.12.0" +description = "Microsoft Azure Blob Storage Client Library for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +azure-core = ">=1.23.1,<2.0.0" +cryptography = ">=2.1.4" +msrest = ">=0.6.21" + +[[package]] +name = "bandit" +version = "1.7.4" +description = "Security oriented static analyser for python code." +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +colorama = {version = ">=0.3.9", markers = "platform_system == \"Windows\""} +GitPython = ">=1.0.1" +PyYAML = ">=5.3.1" +stevedore = ">=1.20.0" + +[package.extras] +test = ["coverage (>=4.5.4)", "fixtures (>=3.0.0)", "flake8 (>=4.0.0)", "stestr (>=2.5.0)", "testscenarios (>=0.5.0)", "testtools (>=2.3.0)", "toml", "beautifulsoup4 (>=4.8.0)", "pylint (==1.9.4)"] +toml = ["toml"] +yaml = ["pyyaml"] + +[[package]] +name = "black" +version = "22.3.0" +description = "The uncompromising code formatter." +category = "dev" +optional = false +python-versions = ">=3.6.2" + +[package.dependencies] +click = ">=8.0.0" +mypy-extensions = ">=0.4.3" +pathspec = ">=0.9.0" +platformdirs = ">=2" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing-extensions = {version = ">=3.10.0.0", markers = "python_version < \"3.10\""} + +[package.extras] +colorama = ["colorama (>=0.4.3)"] +d = ["aiohttp (>=3.7.4)"] +jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] +uvloop = ["uvloop (>=0.15.2)"] + +[[package]] +name = "certifi" +version = "2021.10.8" +description = "Python package for providing Mozilla's CA Bundle." +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "cffi" +version = "1.15.0" +description = "Foreign Function Interface for Python calling C code." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +pycparser = "*" + +[[package]] +name = "charset-normalizer" +version = "2.0.12" +description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." +category = "main" +optional = false +python-versions = ">=3.5.0" + +[package.extras] +unicode_backport = ["unicodedata2"] + +[[package]] +name = "click" +version = "8.1.3" +description = "Composable command line interface toolkit" +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + +[[package]] +name = "colorama" +version = "0.4.4" +description = "Cross-platform colored terminal text." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "coverage" +version = "6.3.3" +description = "Code coverage measurement for Python" +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.extras] +toml = ["tomli"] + +[[package]] +name = "cryptography" +version = "37.0.2" +description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers." +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +cffi = ">=1.12" + +[package.extras] +docs = ["sphinx (>=1.6.5,!=1.8.0,!=3.1.0,!=3.1.1)", "sphinx-rtd-theme"] +docstest = ["pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"] +pep8test = ["black", "flake8", "flake8-import-order", "pep8-naming"] +sdist = ["setuptools_rust (>=0.11.4)"] +ssh = ["bcrypt (>=3.1.5)"] +test = ["pytest (>=6.2.0)", "pytest-benchmark", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601", "pytz", "hypothesis (>=1.11.4,!=3.79.2)"] + +[[package]] +name = "dnspython" +version = "1.16.0" +description = "DNS toolkit" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.extras] +DNSSEC = ["pycryptodome", "ecdsa (>=0.13)"] +IDNA = ["idna (>=2.1)"] + +[[package]] +name = "docopt" +version = "0.6.2" +description = "Pythonic argument parser, that will make you smile" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "dparse" +version = "0.5.1" +description = "A parser for Python dependency files" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +packaging = "*" +pyyaml = "*" +toml = "*" + +[package.extras] +pipenv = ["pipenv"] + +[[package]] +name = "dpu-utils" +version = "0.6.1" +description = "Python utilities used by Deep Procedural Intelligence" +category = "main" +optional = false +python-versions = ">=3.6.1" + +[package.dependencies] +azure-identity = "*" +azure-storage-blob = "*" +cffi = "*" +docopt = "*" +numpy = "*" +regex = "*" +sentencepiece = "*" +SetSimilaritySearch = "*" +tqdm = "*" + +[[package]] +name = "elastic-transport" +version = "8.1.2" +description = "Transport classes and utilities shared among Python Elastic client libraries" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +certifi = "*" +urllib3 = ">=1.26.2,<2" + +[package.extras] +develop = ["pytest", "pytest-cov", "pytest-mock", "pytest-asyncio", "pytest-httpserver", "trustme", "mock", "requests", "aiohttp"] + +[[package]] +name = "elasticsearch" +version = "8.2.0" +description = "Python client for Elasticsearch" +category = "main" +optional = false +python-versions = ">=3.6, <4" + +[package.dependencies] +elastic-transport = ">=8,<9" + +[package.extras] +async = ["aiohttp (>=3,<4)"] +requests = ["requests (>=2.4.0,<3.0.0)"] + +[[package]] +name = "filelock" +version = "3.7.0" +description = "A platform independent file lock." +category = "main" +optional = false +python-versions = ">=3.7" + +[package.extras] +docs = ["furo (>=2021.8.17b43)", "sphinx (>=4.1)", "sphinx-autodoc-typehints (>=1.12)"] +testing = ["covdefaults (>=1.2.0)", "coverage (>=4)", "pytest (>=4)", "pytest-cov", "pytest-timeout (>=1.4.2)"] + +[[package]] +name = "flake8" +version = "3.9.2" +description = "the modular source code checker: pep8 pyflakes and co" +category = "dev" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" + +[package.dependencies] +mccabe = ">=0.6.0,<0.7.0" +pycodestyle = ">=2.7.0,<2.8.0" +pyflakes = ">=2.3.0,<2.4.0" + +[[package]] +name = "function-parser" +version = "0.0.3" +description = "This library contains various utils to parse GitHub repositories into function definition and docstring pairs. It is based on tree-sitter to parse code into ASTs and apply heuristics to parse metadata in more details. Currently, it supports 6 languages: Python, Java, Go, Php, Ruby, and Javascript. It also parses function calls and links them with their definitions for Python." +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +docopt = "*" +dpu-utils = "*" +elasticsearch = "*" +gitpython = "*" +pandas = "*" +pyhive = "*" +python-arango = "*" +requests = "*" +tqdm = "*" +tree-sitter = "0.0.5" + +[[package]] +name = "future" +version = "0.18.2" +description = "Clean single-source support for Python 3 and 2" +category = "main" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "gitdb" +version = "4.0.9" +description = "Git Object Database" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +smmap = ">=3.0.1,<6" + +[[package]] +name = "gitpython" +version = "3.1.27" +description = "GitPython is a python library used to interact with Git repositories" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +gitdb = ">=4.0.1,<5" + +[[package]] +name = "huggingface-hub" +version = "0.6.0" +description = "Client library to download and publish models on the huggingface.co hub" +category = "main" +optional = false +python-versions = ">=3.7.0" + +[package.dependencies] +filelock = "*" +packaging = ">=20.9" +pyyaml = "*" +requests = "*" +tqdm = "*" +typing-extensions = ">=3.7.4.3" + +[package.extras] +all = ["pytest", "datasets", "soundfile", "black (>=22.0,<23.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)"] +dev = ["pytest", "datasets", "soundfile", "black (>=22.0,<23.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)"] +fastai = ["toml", "fastai (>=2.4)", "fastcore (>=1.3.27)"] +quality = ["black (>=22.0,<23.0)", "isort (>=5.5.4)", "flake8 (>=3.8.3)"] +tensorflow = ["tensorflow", "pydot", "graphviz"] +testing = ["pytest", "datasets", "soundfile"] +torch = ["torch"] + +[[package]] +name = "idna" +version = "3.3" +description = "Internationalized Domain Names in Applications (IDNA)" +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "iniconfig" +version = "1.1.1" +description = "iniconfig: brain-dead simple config-ini parsing" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "isodate" +version = "0.6.1" +description = "An ISO 8601 date/time/duration parser and formatter" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +six = "*" + +[[package]] +name = "isort" +version = "5.10.1" +description = "A Python utility / library to sort Python imports." +category = "dev" +optional = false +python-versions = ">=3.6.1,<4.0" + +[package.extras] +pipfile_deprecated_finder = ["pipreqs", "requirementslib"] +requirements_deprecated_finder = ["pipreqs", "pip-api"] +colors = ["colorama (>=0.4.3,<0.5.0)"] +plugins = ["setuptools"] + +[[package]] +name = "libcache" +version = "0.1.0" +description = "Library for the cache in mongodb" +category = "main" +optional = false +python-versions = "3.9.6" +develop = true + +[package.dependencies] +appdirs = "^1.4.4" +libutils = {path = "../../libs/libutils", develop = true} +mongo-types = "0.15.1" +mongoengine = "^0.24.1" +pymongo = {version = "^3.12.3", extras = ["srv"]} + +[package.source] +type = "directory" +url = "../../libs/libcache" + +[[package]] +name = "libqueue" +version = "0.1.0" +description = "Library for the jobs queue in mongodb" +category = "main" +optional = false +python-versions = "3.9.6" +develop = true + +[package.dependencies] +libutils = {path = "../../libs/libutils", develop = true} +mongo-types = "0.15.1" +mongoengine = "^0.24.1" +pymongo = {version = "^3.12.3", extras = ["srv"]} + +[package.source] +type = "directory" +url = "../../libs/libqueue" + +[[package]] +name = "libutils" +version = "0.1.0" +description = "Library for utils" +category = "main" +optional = false +python-versions = "3.9.6" +develop = true + +[package.dependencies] +function-parser = "^0.0.3" +orjson = "^3.6.4" +starlette = "^0.16.0" + +[package.source] +type = "directory" +url = "../../libs/libutils" + +[[package]] +name = "mccabe" +version = "0.6.1" +description = "McCabe checker, plugin for flake8" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "mongo-types" +version = "0.15.1" +description = "Type stubs for mongoengine w/ basic support for bson and pymongo" +category = "main" +optional = false +python-versions = ">=3.7,<4.0" + +[[package]] +name = "mongoengine" +version = "0.24.1" +description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB." +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +pymongo = ">=3.4,<5.0" + +[[package]] +name = "msal" +version = "1.17.0" +description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +cryptography = ">=0.6,<39" +PyJWT = {version = ">=1.0.0,<3", extras = ["crypto"]} +requests = ">=2.0.0,<3" + +[[package]] +name = "msal-extensions" +version = "1.0.0" +description = "Microsoft Authentication Library extensions (MSAL EX) provides a persistence API that can save your data on disk, encrypted on Windows, macOS and Linux. Concurrent data access will be coordinated by a file lock mechanism." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +msal = ">=0.4.1,<2.0.0" +portalocker = [ + {version = ">=1.0,<3", markers = "python_version >= \"3.5\" and platform_system != \"Windows\""}, + {version = ">=1.6,<3", markers = "python_version >= \"3.5\" and platform_system == \"Windows\""}, +] + +[[package]] +name = "msrest" +version = "0.6.21" +description = "AutoRest swagger generator Python client runtime." +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +certifi = ">=2017.4.17" +isodate = ">=0.6.0" +requests = ">=2.16,<3.0" +requests-oauthlib = ">=0.5.0" + +[package.extras] +async = ["aiohttp (>=3.0)", "aiodns"] + +[[package]] +name = "mypy" +version = "0.812" +description = "Optional static typing for Python" +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +mypy-extensions = ">=0.4.3,<0.5.0" +typed-ast = ">=1.4.0,<1.5.0" +typing-extensions = ">=3.7.4" + +[package.extras] +dmypy = ["psutil (>=4.0)"] + +[[package]] +name = "mypy-extensions" +version = "0.4.3" +description = "Experimental type system extensions for programs checked with the mypy typechecker." +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "numpy" +version = "1.22.3" +description = "NumPy is the fundamental package for array computing with Python." +category = "main" +optional = false +python-versions = ">=3.8" + +[[package]] +name = "oauthlib" +version = "3.2.0" +description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.extras] +rsa = ["cryptography (>=3.0.0)"] +signals = ["blinker (>=1.4.0)"] +signedtoken = ["cryptography (>=3.0.0)", "pyjwt (>=2.0.0,<3)"] + +[[package]] +name = "orjson" +version = "3.6.8" +description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "packaging" +version = "21.3" +description = "Core utilities for Python packages" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" + +[[package]] +name = "pandas" +version = "1.4.2" +description = "Powerful data structures for data analysis, time series, and statistics" +category = "main" +optional = false +python-versions = ">=3.8" + +[package.dependencies] +numpy = [ + {version = ">=1.18.5", markers = "platform_machine != \"aarch64\" and platform_machine != \"arm64\" and python_version < \"3.10\""}, + {version = ">=1.19.2", markers = "platform_machine == \"aarch64\" and python_version < \"3.10\""}, + {version = ">=1.20.0", markers = "platform_machine == \"arm64\" and python_version < \"3.10\""}, +] +python-dateutil = ">=2.8.1" +pytz = ">=2020.1" + +[package.extras] +test = ["hypothesis (>=5.5.3)", "pytest (>=6.0)", "pytest-xdist (>=1.31)"] + +[[package]] +name = "pathspec" +version = "0.9.0" +description = "Utility library for gitignore style pattern matching of file paths." +category = "dev" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,>=2.7" + +[[package]] +name = "pbr" +version = "5.9.0" +description = "Python Build Reasonableness" +category = "dev" +optional = false +python-versions = ">=2.6" + +[[package]] +name = "platformdirs" +version = "2.5.2" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." +category = "dev" +optional = false +python-versions = ">=3.7" + +[package.extras] +docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"] +test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"] + +[[package]] +name = "pluggy" +version = "1.0.0" +description = "plugin and hook calling mechanisms for python" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + +[[package]] +name = "poetryup" +version = "0.3.15" +description = "Update dependencies and bump their version in the pyproject.toml file" +category = "dev" +optional = false +python-versions = ">=3.6,<4.0" + +[package.dependencies] +tomlkit = ">=0.7.2,<0.8.0" + +[[package]] +name = "portalocker" +version = "2.4.0" +description = "Wraps the portalocker recipe for easy usage" +category = "main" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +pywin32 = {version = ">=226", markers = "platform_system == \"Windows\""} + +[package.extras] +docs = ["sphinx (>=1.7.1)"] +redis = ["redis"] +tests = ["pytest (>=5.4.1)", "pytest-cov (>=2.8.1)", "sphinx (>=3.0.3)", "pytest-mypy (>=0.8.0)", "redis"] + +[[package]] +name = "py" +version = "1.11.0" +description = "library with cross-python path, ini-parsing, io, code, log facilities" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "pycodestyle" +version = "2.7.0" +description = "Python style guide checker" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pycparser" +version = "2.21" +description = "C parser in Python" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pyflakes" +version = "2.3.1" +description = "passive checker of Python programs" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[[package]] +name = "pyhive" +version = "0.6.5" +description = "Python interface to Hive" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +future = "*" +python-dateutil = "*" + +[package.extras] +hive = ["sasl (>=0.2.1)", "thrift (>=0.10.0)", "thrift_sasl (>=0.1.0)"] +kerberos = ["requests_kerberos (>=0.12.0)"] +presto = ["requests (>=1.0.0)"] +sqlalchemy = ["sqlalchemy (>=1.3.0)"] +trino = ["requests (>=1.0.0)"] + +[[package]] +name = "pyjwt" +version = "2.4.0" +description = "JSON Web Token implementation in Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +cryptography = {version = ">=3.3.1", optional = true, markers = "extra == \"crypto\""} + +[package.extras] +crypto = ["cryptography (>=3.3.1)"] +dev = ["sphinx", "sphinx-rtd-theme", "zope.interface", "cryptography (>=3.3.1)", "pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)", "mypy", "pre-commit"] +docs = ["sphinx", "sphinx-rtd-theme", "zope.interface"] +tests = ["pytest (>=6.0.0,<7.0.0)", "coverage[toml] (==5.0.4)"] + +[[package]] +name = "pymongo" +version = "3.12.3" +description = "Python driver for MongoDB <http://www.mongodb.org>" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +dnspython = {version = ">=1.16.0,<1.17.0", optional = true, markers = "extra == \"srv\""} + +[package.extras] +aws = ["pymongo-auth-aws (<2.0.0)"] +encryption = ["pymongocrypt (>=1.1.0,<2.0.0)"] +gssapi = ["pykerberos"] +ocsp = ["pyopenssl (>=17.2.0)", "requests (<3.0.0)", "service-identity (>=18.1.0)", "certifi"] +snappy = ["python-snappy"] +srv = ["dnspython (>=1.16.0,<1.17.0)"] +tls = ["ipaddress"] +zstd = ["zstandard"] + +[[package]] +name = "pyparsing" +version = "3.0.9" +description = "pyparsing module - Classes and methods to define and execute parsing grammars" +category = "main" +optional = false +python-versions = ">=3.6.8" + +[package.extras] +diagrams = ["railroad-diagrams", "jinja2"] + +[[package]] +name = "pytest" +version = "6.2.5" +description = "pytest: simple powerful testing with Python" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +atomicwrites = {version = ">=1.0", markers = "sys_platform == \"win32\""} +attrs = ">=19.2.0" +colorama = {version = "*", markers = "sys_platform == \"win32\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=0.12,<2.0" +py = ">=1.8.2" +toml = "*" + +[package.extras] +testing = ["argcomplete", "hypothesis (>=3.56)", "mock", "nose", "requests", "xmlschema"] + +[[package]] +name = "pytest-cov" +version = "2.12.1" +description = "Pytest plugin for measuring coverage." +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[package.dependencies] +coverage = ">=5.2.1" +pytest = ">=4.6" +toml = "*" + +[package.extras] +testing = ["fields", "hunter", "process-tests", "six", "pytest-xdist", "virtualenv"] + +[[package]] +name = "python-arango" +version = "7.3.4" +description = "Python Driver for ArangoDB" +category = "main" +optional = false +python-versions = ">=3.7" + +[package.dependencies] +PyJWT = "*" +requests = "*" +requests-toolbelt = "*" +urllib3 = ">=1.26.0" + +[package.extras] +dev = ["black (>=22.3.0)", "flake8 (>=4.0.1)", "isort (>=5.10.1)", "mypy (>=0.942)", "mock", "pre-commit (>=2.17.0)", "pytest (>=7.1.1)", "pytest-cov (>=3.0.0)", "sphinx", "sphinx-rtd-theme", "types-pkg-resources", "types-requests"] + +[[package]] +name = "python-dateutil" +version = "2.8.2" +description = "Extensions to the standard Python datetime module" +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,>=2.7" + +[package.dependencies] +six = ">=1.5" + +[[package]] +name = "python-dotenv" +version = "0.20.0" +description = "Read key-value pairs from a .env file and set them as environment variables" +category = "main" +optional = false +python-versions = ">=3.5" + +[package.extras] +cli = ["click (>=5.0)"] + +[[package]] +name = "pytz" +version = "2022.1" +description = "World timezone definitions, modern and historical" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "pywin32" +version = "304" +description = "Python for Window Extensions" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "pyyaml" +version = "6.0" +description = "YAML parser and emitter for Python" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "regex" +version = "2022.4.24" +description = "Alternative regular expression module, to replace re." +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "requests" +version = "2.27.1" +description = "Python HTTP for Humans." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*" + +[package.dependencies] +certifi = ">=2017.4.17" +charset-normalizer = {version = ">=2.0.0,<2.1.0", markers = "python_version >= \"3\""} +idna = {version = ">=2.5,<4", markers = "python_version >= \"3\""} +urllib3 = ">=1.21.1,<1.27" + +[package.extras] +socks = ["PySocks (>=1.5.6,!=1.5.7)", "win-inet-pton"] +use_chardet_on_py3 = ["chardet (>=3.0.2,<5)"] + +[[package]] +name = "requests-oauthlib" +version = "1.3.1" +description = "OAuthlib authentication support for Requests." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" + +[package.dependencies] +oauthlib = ">=3.0.0" +requests = ">=2.0.0" + +[package.extras] +rsa = ["oauthlib[signedtoken] (>=3.0.0)"] + +[[package]] +name = "requests-toolbelt" +version = "0.9.1" +description = "A utility belt for advanced users of python-requests" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +requests = ">=2.0.1,<3.0.0" + +[[package]] +name = "safety" +version = "1.10.3" +description = "Checks installed dependencies for known vulnerabilities." +category = "dev" +optional = false +python-versions = ">=3.5" + +[package.dependencies] +Click = ">=6.0" +dparse = ">=0.5.1" +packaging = "*" +requests = "*" + +[[package]] +name = "sentencepiece" +version = "0.1.96" +description = "SentencePiece python wrapper" +category = "main" +optional = false +python-versions = "*" + +[[package]] +name = "setsimilaritysearch" +version = "0.1.7" +description = "A Python library of set similarity search algorithms" +category = "main" +optional = false +python-versions = "*" + +[package.dependencies] +numpy = "*" + +[package.extras] +test = ["coverage", "nose"] + +[[package]] +name = "six" +version = "1.16.0" +description = "Python 2 and 3 compatibility utilities" +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "smmap" +version = "5.0.0" +description = "A pure Python implementation of a sliding window memory map manager" +category = "main" +optional = false +python-versions = ">=3.6" + +[[package]] +name = "sniffio" +version = "1.2.0" +description = "Sniff out which async library your code is running under" +category = "main" +optional = false +python-versions = ">=3.5" + +[[package]] +name = "starlette" +version = "0.16.0" +description = "The little ASGI library that shines." +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +anyio = ">=3.0.0,<4" + +[package.extras] +full = ["itsdangerous", "jinja2", "python-multipart", "pyyaml", "requests", "graphene"] + +[[package]] +name = "stevedore" +version = "3.5.0" +description = "Manage dynamic plugins for Python applications" +category = "dev" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +pbr = ">=2.0.0,<2.1.0 || >2.1.0" + +[[package]] +name = "toml" +version = "0.10.2" +description = "Python Library for Tom's Obvious, Minimal Language" +category = "dev" +optional = false +python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" + +[[package]] +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" +category = "dev" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "tomlkit" +version = "0.7.2" +description = "Style preserving TOML library" +category = "dev" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" + +[[package]] +name = "tqdm" +version = "4.64.0" +description = "Fast, Extensible Progress Meter" +category = "main" +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7" + +[package.dependencies] +colorama = {version = "*", markers = "platform_system == \"Windows\""} + +[package.extras] +dev = ["py-make (>=0.1.0)", "twine", "wheel"] +notebook = ["ipywidgets (>=6)"] +slack = ["slack-sdk"] +telegram = ["requests"] + +[[package]] +name = "tree-sitter" +version = "0.0.5" +description = "Python bindings to the Tree-sitter parsing library" +category = "main" +optional = false +python-versions = ">=3.3" + +[[package]] +name = "typed-ast" +version = "1.4.3" +description = "a fork of Python 2 and 3 ast modules with type comment support" +category = "dev" +optional = false +python-versions = "*" + +[[package]] +name = "typing-extensions" +version = "4.2.0" +description = "Backported and Experimental Type Hints for Python 3.7+" +category = "main" +optional = false +python-versions = ">=3.7" + +[[package]] +name = "urllib3" +version = "1.26.9" +description = "HTTP library with thread-safe connection pooling, file post, and more." +category = "main" +optional = false +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" + +[package.extras] +brotli = ["brotlicffi (>=0.8.0)", "brotli (>=1.0.9)", "brotlipy (>=0.6.0)"] +secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"] +socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"] + +[metadata] +lock-version = "1.1" +python-versions = "3.9.6" +content-hash = "81e9265af7e6dcf50bf73ca2a795cb448d179fd35b840e2c16fedc5cd2b77869" + +[metadata.files] +anyio = [ + {file = "anyio-3.6.1-py3-none-any.whl", hash = "sha256:cb29b9c70620506a9a8f87a309591713446953302d7d995344d0d7c6c0c9a7be"}, + {file = "anyio-3.6.1.tar.gz", hash = "sha256:413adf95f93886e442aea925f3ee43baa5a765a64a0f52c6081894f9992fdd0b"}, +] +appdirs = [ + {file = "appdirs-1.4.4-py2.py3-none-any.whl", hash = "sha256:a841dacd6b99318a741b166adb07e19ee71a274450e68237b4650ca1055ab128"}, + {file = "appdirs-1.4.4.tar.gz", hash = "sha256:7d5d0167b2b1ba821647616af46a749d1c653740dd0d2415100fe26e27afdf41"}, +] +atomicwrites = [ + {file = "atomicwrites-1.4.0-py2.py3-none-any.whl", hash = "sha256:6d1784dea7c0c8d4a5172b6c620f40b6e4cbfdf96d783691f2e1302a7b88e197"}, + {file = "atomicwrites-1.4.0.tar.gz", hash = "sha256:ae70396ad1a434f9c7046fd2dd196fc04b12f9e91ffb859164193be8b6168a7a"}, +] +attrs = [ + {file = "attrs-21.4.0-py2.py3-none-any.whl", hash = "sha256:2d27e3784d7a565d36ab851fe94887c5eccd6a463168875832a1be79c82828b4"}, + {file = "attrs-21.4.0.tar.gz", hash = "sha256:626ba8234211db98e869df76230a137c4c40a12d72445c45d5f5b716f076e2fd"}, +] +azure-core = [ + {file = "azure-core-1.24.0.zip", hash = "sha256:345b1b041faad7d0205b20d5697f1d0df344302e7aaa8501905580ff87bd0be5"}, + {file = "azure_core-1.24.0-py3-none-any.whl", hash = "sha256:923e492e72d103c768a643dfad331ce6b8ec1669575c7d0832fed19bffd119f7"}, +] +azure-identity = [ + {file = "azure-identity-1.10.0.zip", hash = "sha256:656e5034d9cef297cf9b35376ed620085273c18cfa52cea4a625bf0d5d2d6409"}, + {file = "azure_identity-1.10.0-py3-none-any.whl", hash = "sha256:b386f1ccbea6a48b9ab7e7f162adc456793c345193a7c1a713959562b08dcbbd"}, +] +azure-storage-blob = [ + {file = "azure-storage-blob-12.12.0.zip", hash = "sha256:f6daf07d1ca86d189ae15c9b1859dff5b7127bf24a07a4bbe41e0b81e01d62f7"}, + {file = "azure_storage_blob-12.12.0-py3-none-any.whl", hash = "sha256:1eac4c364309ccc193c80ee26c78d25dfbf10926b1309095a448a7a0388526eb"}, +] +bandit = [ + {file = "bandit-1.7.4-py3-none-any.whl", hash = "sha256:412d3f259dab4077d0e7f0c11f50f650cc7d10db905d98f6520a95a18049658a"}, + {file = "bandit-1.7.4.tar.gz", hash = "sha256:2d63a8c573417bae338962d4b9b06fbc6080f74ecd955a092849e1e65c717bd2"}, +] +black = [ + {file = "black-22.3.0-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:2497f9c2386572e28921fa8bec7be3e51de6801f7459dffd6e62492531c47e09"}, + {file = "black-22.3.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5795a0375eb87bfe902e80e0c8cfaedf8af4d49694d69161e5bd3206c18618bb"}, + {file = "black-22.3.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e3556168e2e5c49629f7b0f377070240bd5511e45e25a4497bb0073d9dda776a"}, + {file = "black-22.3.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:67c8301ec94e3bcc8906740fe071391bce40a862b7be0b86fb5382beefecd968"}, + {file = "black-22.3.0-cp310-cp310-win_amd64.whl", hash = "sha256:fd57160949179ec517d32ac2ac898b5f20d68ed1a9c977346efbac9c2f1e779d"}, + {file = "black-22.3.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:cc1e1de68c8e5444e8f94c3670bb48a2beef0e91dddfd4fcc29595ebd90bb9ce"}, + {file = "black-22.3.0-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6d2fc92002d44746d3e7db7cf9313cf4452f43e9ea77a2c939defce3b10b5c82"}, + {file = "black-22.3.0-cp36-cp36m-win_amd64.whl", hash = "sha256:a6342964b43a99dbc72f72812bf88cad8f0217ae9acb47c0d4f141a6416d2d7b"}, + {file = "black-22.3.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:328efc0cc70ccb23429d6be184a15ce613f676bdfc85e5fe8ea2a9354b4e9015"}, + {file = "black-22.3.0-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:06f9d8846f2340dfac80ceb20200ea5d1b3f181dd0556b47af4e8e0b24fa0a6b"}, + {file = "black-22.3.0-cp37-cp37m-win_amd64.whl", hash = "sha256:ad4efa5fad66b903b4a5f96d91461d90b9507a812b3c5de657d544215bb7877a"}, + {file = "black-22.3.0-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:e8477ec6bbfe0312c128e74644ac8a02ca06bcdb8982d4ee06f209be28cdf163"}, + {file = "black-22.3.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:637a4014c63fbf42a692d22b55d8ad6968a946b4a6ebc385c5505d9625b6a464"}, + {file = "black-22.3.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:863714200ada56cbc366dc9ae5291ceb936573155f8bf8e9de92aef51f3ad0f0"}, + {file = "black-22.3.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:10dbe6e6d2988049b4655b2b739f98785a884d4d6b85bc35133a8fb9a2233176"}, + {file = "black-22.3.0-cp38-cp38-win_amd64.whl", hash = "sha256:cee3e11161dde1b2a33a904b850b0899e0424cc331b7295f2a9698e79f9a69a0"}, + {file = "black-22.3.0-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:5891ef8abc06576985de8fa88e95ab70641de6c1fca97e2a15820a9b69e51b20"}, + {file = "black-22.3.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:30d78ba6bf080eeaf0b7b875d924b15cd46fec5fd044ddfbad38c8ea9171043a"}, + {file = "black-22.3.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ee8f1f7228cce7dffc2b464f07ce769f478968bfb3dd1254a4c2eeed84928aad"}, + {file = "black-22.3.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6ee227b696ca60dd1c507be80a6bc849a5a6ab57ac7352aad1ffec9e8b805f21"}, + {file = "black-22.3.0-cp39-cp39-win_amd64.whl", hash = "sha256:9b542ced1ec0ceeff5b37d69838106a6348e60db7b8fdd245294dc1d26136265"}, + {file = "black-22.3.0-py3-none-any.whl", hash = "sha256:bc58025940a896d7e5356952228b68f793cf5fcb342be703c3a2669a1488cb72"}, + {file = "black-22.3.0.tar.gz", hash = "sha256:35020b8886c022ced9282b51b5a875b6d1ab0c387b31a065b84db7c33085ca79"}, +] +certifi = [ + {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, + {file = "certifi-2021.10.8.tar.gz", hash = "sha256:78884e7c1d4b00ce3cea67b44566851c4343c120abd683433ce934a68ea58872"}, +] +cffi = [ + {file = "cffi-1.15.0-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:c2502a1a03b6312837279c8c1bd3ebedf6c12c4228ddbad40912d671ccc8a962"}, + {file = "cffi-1.15.0-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:23cfe892bd5dd8941608f93348c0737e369e51c100d03718f108bf1add7bd6d0"}, + {file = "cffi-1.15.0-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:41d45de54cd277a7878919867c0f08b0cf817605e4eb94093e7516505d3c8d14"}, + {file = "cffi-1.15.0-cp27-cp27m-win32.whl", hash = "sha256:4a306fa632e8f0928956a41fa8e1d6243c71e7eb59ffbd165fc0b41e316b2474"}, + {file = "cffi-1.15.0-cp27-cp27m-win_amd64.whl", hash = "sha256:e7022a66d9b55e93e1a845d8c9eba2a1bebd4966cd8bfc25d9cd07d515b33fa6"}, + {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:14cd121ea63ecdae71efa69c15c5543a4b5fbcd0bbe2aad864baca0063cecf27"}, + {file = "cffi-1.15.0-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:d4d692a89c5cf08a8557fdeb329b82e7bf609aadfaed6c0d79f5a449a3c7c023"}, + {file = "cffi-1.15.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2"}, + {file = "cffi-1.15.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:91ec59c33514b7c7559a6acda53bbfe1b283949c34fe7440bcf917f96ac0723e"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:f5c7150ad32ba43a07c4479f40241756145a1f03b43480e058cfd862bf5041c7"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abb9a20a72ac4e0fdb50dae135ba5e77880518e742077ced47eb1499e29a443c"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a5263e363c27b653a90078143adb3d076c1a748ec9ecc78ea2fb916f9b861962"}, + {file = "cffi-1.15.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:f54a64f8b0c8ff0b64d18aa76675262e1700f3995182267998c31ae974fbc382"}, + {file = "cffi-1.15.0-cp310-cp310-win32.whl", hash = "sha256:c21c9e3896c23007803a875460fb786118f0cdd4434359577ea25eb556e34c55"}, + {file = "cffi-1.15.0-cp310-cp310-win_amd64.whl", hash = "sha256:5e069f72d497312b24fcc02073d70cb989045d1c91cbd53979366077959933e0"}, + {file = "cffi-1.15.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:64d4ec9f448dfe041705426000cc13e34e6e5bb13736e9fd62e34a0b0c41566e"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2756c88cbb94231c7a147402476be2c4df2f6078099a6f4a480d239a8817ae39"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3b96a311ac60a3f6be21d2572e46ce67f09abcf4d09344c49274eb9e0bf345fc"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:75e4024375654472cc27e91cbe9eaa08567f7fbdf822638be2814ce059f58032"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:59888172256cac5629e60e72e86598027aca6bf01fa2465bdb676d37636573e8"}, + {file = "cffi-1.15.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:27c219baf94952ae9d50ec19651a687b826792055353d07648a5695413e0c605"}, + {file = "cffi-1.15.0-cp36-cp36m-win32.whl", hash = "sha256:4958391dbd6249d7ad855b9ca88fae690783a6be9e86df65865058ed81fc860e"}, + {file = "cffi-1.15.0-cp36-cp36m-win_amd64.whl", hash = "sha256:f6f824dc3bce0edab5f427efcfb1d63ee75b6fcb7282900ccaf925be84efb0fc"}, + {file = "cffi-1.15.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:06c48159c1abed75c2e721b1715c379fa3200c7784271b3c46df01383b593636"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:c2051981a968d7de9dd2d7b87bcb9c939c74a34626a6e2f8181455dd49ed69e4"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:fd8a250edc26254fe5b33be00402e6d287f562b6a5b2152dec302fa15bb3e997"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:91d77d2a782be4274da750752bb1650a97bfd8f291022b379bb8e01c66b4e96b"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:45db3a33139e9c8f7c09234b5784a5e33d31fd6907800b316decad50af323ff2"}, + {file = "cffi-1.15.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:263cc3d821c4ab2213cbe8cd8b355a7f72a8324577dc865ef98487c1aeee2bc7"}, + {file = "cffi-1.15.0-cp37-cp37m-win32.whl", hash = "sha256:17771976e82e9f94976180f76468546834d22a7cc404b17c22df2a2c81db0c66"}, + {file = "cffi-1.15.0-cp37-cp37m-win_amd64.whl", hash = "sha256:3415c89f9204ee60cd09b235810be700e993e343a408693e80ce7f6a40108029"}, + {file = "cffi-1.15.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:4238e6dab5d6a8ba812de994bbb0a79bddbdf80994e4ce802b6f6f3142fcc880"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:0808014eb713677ec1292301ea4c81ad277b6cdf2fdd90fd540af98c0b101d20"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:57e9ac9ccc3101fac9d6014fba037473e4358ef4e89f8e181f8951a2c0162024"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8b6c2ea03845c9f501ed1313e78de148cd3f6cad741a75d43a29b43da27f2e1e"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:10dffb601ccfb65262a27233ac273d552ddc4d8ae1bf93b21c94b8511bffe728"}, + {file = "cffi-1.15.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:786902fb9ba7433aae840e0ed609f45c7bcd4e225ebb9c753aa39725bb3e6ad6"}, + {file = "cffi-1.15.0-cp38-cp38-win32.whl", hash = "sha256:da5db4e883f1ce37f55c667e5c0de439df76ac4cb55964655906306918e7363c"}, + {file = "cffi-1.15.0-cp38-cp38-win_amd64.whl", hash = "sha256:181dee03b1170ff1969489acf1c26533710231c58f95534e3edac87fff06c443"}, + {file = "cffi-1.15.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:45e8636704eacc432a206ac7345a5d3d2c62d95a507ec70d62f23cd91770482a"}, + {file = "cffi-1.15.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:31fb708d9d7c3f49a60f04cf5b119aeefe5644daba1cd2a0fe389b674fd1de37"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_i686.manylinux2010_i686.whl", hash = "sha256:6dc2737a3674b3e344847c8686cf29e500584ccad76204efea14f451d4cc669a"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:74fdfdbfdc48d3f47148976f49fab3251e550a8720bebc99bf1483f5bfb5db3e"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffaa5c925128e29efbde7301d8ecaf35c8c60ffbcd6a1ffd3a552177c8e5e796"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:3f7d084648d77af029acb79a0ff49a0ad7e9d09057a9bf46596dac9514dc07df"}, + {file = "cffi-1.15.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:ef1f279350da2c586a69d32fc8733092fd32cc8ac95139a00377841f59a3f8d8"}, + {file = "cffi-1.15.0-cp39-cp39-win32.whl", hash = "sha256:2a23af14f408d53d5e6cd4e3d9a24ff9e05906ad574822a10563efcef137979a"}, + {file = "cffi-1.15.0-cp39-cp39-win_amd64.whl", hash = "sha256:3773c4d81e6e818df2efbc7dd77325ca0dcb688116050fb2b3011218eda36139"}, + {file = "cffi-1.15.0.tar.gz", hash = "sha256:920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954"}, +] +charset-normalizer = [ + {file = "charset-normalizer-2.0.12.tar.gz", hash = "sha256:2857e29ff0d34db842cd7ca3230549d1a697f96ee6d3fb071cfa6c7393832597"}, + {file = "charset_normalizer-2.0.12-py3-none-any.whl", hash = "sha256:6881edbebdb17b39b4eaaa821b438bf6eddffb4468cf344f09f89def34a8b1df"}, +] +click = [ + {file = "click-8.1.3-py3-none-any.whl", hash = "sha256:bb4d8133cb15a609f44e8213d9b391b0809795062913b383c62be0ee95b1db48"}, + {file = "click-8.1.3.tar.gz", hash = "sha256:7682dc8afb30297001674575ea00d1814d808d6a36af415a82bd481d37ba7b8e"}, +] +colorama = [ + {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, + {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, +] +coverage = [ + {file = "coverage-6.3.3-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:df32ee0f4935a101e4b9a5f07b617d884a531ed5666671ff6ac66d2e8e8246d8"}, + {file = "coverage-6.3.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:75b5dbffc334e0beb4f6c503fb95e6d422770fd2d1b40a64898ea26d6c02742d"}, + {file = "coverage-6.3.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:114944e6061b68a801c5da5427b9173a0dd9d32cd5fcc18a13de90352843737d"}, + {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:2ab88a01cd180b5640ccc9c47232e31924d5f9967ab7edd7e5c91c68eee47a69"}, + {file = "coverage-6.3.3-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ad8f9068f5972a46d50fe5f32c09d6ee11da69c560fcb1b4c3baea246ca4109b"}, + {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:4cd696aa712e6cd16898d63cf66139dc70d998f8121ab558f0e1936396dbc579"}, + {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:c1a9942e282cc9d3ed522cd3e3cab081149b27ea3bda72d6f61f84eaf88c1a63"}, + {file = "coverage-6.3.3-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:c06455121a089252b5943ea682187a4e0a5cf0a3fb980eb8e7ce394b144430a9"}, + {file = "coverage-6.3.3-cp310-cp310-win32.whl", hash = "sha256:cb5311d6ccbd22578c80028c5e292a7ab9adb91bd62c1982087fad75abe2e63d"}, + {file = "coverage-6.3.3-cp310-cp310-win_amd64.whl", hash = "sha256:6d4a6f30f611e657495cc81a07ff7aa8cd949144e7667c5d3e680d73ba7a70e4"}, + {file = "coverage-6.3.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:79bf405432428e989cad7b8bc60581963238f7645ae8a404f5dce90236cc0293"}, + {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:338c417613f15596af9eb7a39353b60abec9d8ce1080aedba5ecee6a5d85f8d3"}, + {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:db094a6a4ae6329ed322a8973f83630b12715654c197dd392410400a5bfa1a73"}, + {file = "coverage-6.3.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1414e8b124611bf4df8d77215bd32cba6e3425da8ce9c1f1046149615e3a9a31"}, + {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:93b16b08f94c92cab88073ffd185070cdcb29f1b98df8b28e6649145b7f2c90d"}, + {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:fbc86ae8cc129c801e7baaafe3addf3c8d49c9c1597c44bdf2d78139707c3c62"}, + {file = "coverage-6.3.3-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b5ba058610e8289a07db2a57bce45a1793ec0d3d11db28c047aae2aa1a832572"}, + {file = "coverage-6.3.3-cp37-cp37m-win32.whl", hash = "sha256:8329635c0781927a2c6ae068461e19674c564e05b86736ab8eb29c420ee7dc20"}, + {file = "coverage-6.3.3-cp37-cp37m-win_amd64.whl", hash = "sha256:e5af1feee71099ae2e3b086ec04f57f9950e1be9ecf6c420696fea7977b84738"}, + {file = "coverage-6.3.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:e814a4a5a1d95223b08cdb0f4f57029e8eab22ffdbae2f97107aeef28554517e"}, + {file = "coverage-6.3.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:61f4fbf3633cb0713437291b8848634ea97f89c7e849c2be17a665611e433f53"}, + {file = "coverage-6.3.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3401b0d2ed9f726fadbfa35102e00d1b3547b73772a1de5508ef3bdbcb36afe7"}, + {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:8586b177b4407f988731eb7f41967415b2197f35e2a6ee1a9b9b561f6323c8e9"}, + {file = "coverage-6.3.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:892e7fe32191960da559a14536768a62e83e87bbb867e1b9c643e7e0fbce2579"}, + {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:afb03f981fadb5aed1ac6e3dd34f0488e1a0875623d557b6fad09b97a942b38a"}, + {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:cbe91bc84be4e5ef0b1480d15c7b18e29c73bdfa33e07d3725da7d18e1b0aff2"}, + {file = "coverage-6.3.3-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:91502bf27cbd5c83c95cfea291ef387469f2387508645602e1ca0fd8a4ba7548"}, + {file = "coverage-6.3.3-cp38-cp38-win32.whl", hash = "sha256:c488db059848702aff30aa1d90ef87928d4e72e4f00717343800546fdbff0a94"}, + {file = "coverage-6.3.3-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6534fcdfb5c503affb6b1130db7b5bfc8a0f77fa34880146f7a5c117987d0"}, + {file = "coverage-6.3.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:cc692c9ee18f0dd3214843779ba6b275ee4bb9b9a5745ba64265bce911aefd1a"}, + {file = "coverage-6.3.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:462105283de203df8de58a68c1bb4ba2a8a164097c2379f664fa81d6baf94b81"}, + {file = "coverage-6.3.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc972d829ad5ef4d4c5fcabd2bbe2add84ce8236f64ba1c0c72185da3a273130"}, + {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:06f54765cdbce99901871d50fe9f41d58213f18e98b170a30ca34f47de7dd5e8"}, + {file = "coverage-6.3.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7835f76a081787f0ca62a53504361b3869840a1620049b56d803a8cb3a9eeea3"}, + {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6f5fee77ec3384b934797f1873758f796dfb4f167e1296dc00f8b2e023ce6ee9"}, + {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:baa8be8aba3dd1e976e68677be68a960a633a6d44c325757aefaa4d66175050f"}, + {file = "coverage-6.3.3-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:4d06380e777dd6b35ee936f333d55b53dc4a8271036ff884c909cf6e94be8b6c"}, + {file = "coverage-6.3.3-cp39-cp39-win32.whl", hash = "sha256:f8cabc5fd0091976ab7b020f5708335033e422de25e20ddf9416bdce2b7e07d8"}, + {file = "coverage-6.3.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c9441d57b0963cf8340268ad62fc83de61f1613034b79c2b1053046af0c5284"}, + {file = "coverage-6.3.3-pp36.pp37.pp38-none-any.whl", hash = "sha256:d522f1dc49127eab0bfbba4e90fa068ecff0899bbf61bf4065c790ddd6c177fe"}, + {file = "coverage-6.3.3.tar.gz", hash = "sha256:2781c43bffbbec2b8867376d4d61916f5e9c4cc168232528562a61d1b4b01879"}, +] +cryptography = [ + {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_universal2.whl", hash = "sha256:ef15c2df7656763b4ff20a9bc4381d8352e6640cfeb95c2972c38ef508e75181"}, + {file = "cryptography-37.0.2-cp36-abi3-macosx_10_10_x86_64.whl", hash = "sha256:3c81599befb4d4f3d7648ed3217e00d21a9341a9a688ecdd615ff72ffbed7336"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:2bd1096476aaac820426239ab534b636c77d71af66c547b9ddcd76eb9c79e004"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.manylinux_2_24_aarch64.whl", hash = "sha256:31fe38d14d2e5f787e0aecef831457da6cec68e0bb09a35835b0b44ae8b988fe"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:093cb351031656d3ee2f4fa1be579a8c69c754cf874206be1d4cf3b542042804"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:59b281eab51e1b6b6afa525af2bd93c16d49358404f814fe2c2410058623928c"}, + {file = "cryptography-37.0.2-cp36-abi3-manylinux_2_24_x86_64.whl", hash = "sha256:0cc20f655157d4cfc7bada909dc5cc228211b075ba8407c46467f63597c78178"}, + {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:f8ec91983e638a9bcd75b39f1396e5c0dc2330cbd9ce4accefe68717e6779e0a"}, + {file = "cryptography-37.0.2-cp36-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:46f4c544f6557a2fefa7ac8ac7d1b17bf9b647bd20b16decc8fbcab7117fbc15"}, + {file = "cryptography-37.0.2-cp36-abi3-win32.whl", hash = "sha256:731c8abd27693323b348518ed0e0705713a36d79fdbd969ad968fbef0979a7e0"}, + {file = "cryptography-37.0.2-cp36-abi3-win_amd64.whl", hash = "sha256:471e0d70201c069f74c837983189949aa0d24bb2d751b57e26e3761f2f782b8d"}, + {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a68254dd88021f24a68b613d8c51d5c5e74d735878b9e32cc0adf19d1f10aaf9"}, + {file = "cryptography-37.0.2-pp37-pypy37_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:a7d5137e556cc0ea418dca6186deabe9129cee318618eb1ffecbd35bee55ddc1"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-macosx_10_10_x86_64.whl", hash = "sha256:aeaba7b5e756ea52c8861c133c596afe93dd716cbcacae23b80bc238202dc023"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:95e590dd70642eb2079d280420a888190aa040ad20f19ec8c6e097e38aa29e06"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:1b9362d34363f2c71b7853f6251219298124aa4cc2075ae2932e64c91a3e2717"}, + {file = "cryptography-37.0.2-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:e53258e69874a306fcecb88b7534d61820db8a98655662a3dd2ec7f1afd9132f"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-macosx_10_10_x86_64.whl", hash = "sha256:1f3bfbd611db5cb58ca82f3deb35e83af34bb8cf06043fa61500157d50a70982"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:419c57d7b63f5ec38b1199a9521d77d7d1754eb97827bbb773162073ccd8c8d4"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-manylinux_2_24_x86_64.whl", hash = "sha256:dc26bb134452081859aa21d4990474ddb7e863aa39e60d1592800a8865a702de"}, + {file = "cryptography-37.0.2-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:3b8398b3d0efc420e777c40c16764d6870bcef2eb383df9c6dbb9ffe12c64452"}, + {file = "cryptography-37.0.2.tar.gz", hash = "sha256:f224ad253cc9cea7568f49077007d2263efa57396a2f2f78114066fd54b5c68e"}, +] +dnspython = [ + {file = "dnspython-1.16.0-py2.py3-none-any.whl", hash = "sha256:f69c21288a962f4da86e56c4905b49d11aba7938d3d740e80d9e366ee4f1632d"}, + {file = "dnspython-1.16.0.zip", hash = "sha256:36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"}, +] +docopt = [ + {file = "docopt-0.6.2.tar.gz", hash = "sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491"}, +] +dparse = [ + {file = "dparse-0.5.1-py3-none-any.whl", hash = "sha256:e953a25e44ebb60a5c6efc2add4420c177f1d8404509da88da9729202f306994"}, + {file = "dparse-0.5.1.tar.gz", hash = "sha256:a1b5f169102e1c894f9a7d5ccf6f9402a836a5d24be80a986c7ce9eaed78f367"}, +] +dpu-utils = [ + {file = "dpu_utils-0.6.1-py2.py3-none-any.whl", hash = "sha256:65c592a53b3d2aa2b92210b757bb3e5a18c308bb6e93063166cc6a39558a3643"}, + {file = "dpu_utils-0.6.1.tar.gz", hash = "sha256:31b1a4e82f3f0b5c6df00f2968667e8846f1bac74d0947cfd3afdb5bcd0ab73c"}, +] +elastic-transport = [ + {file = "elastic-transport-8.1.2.tar.gz", hash = "sha256:869f7d668fb7738776639053fc87499caacbd1bdc7819f0de8025ac0e6cb29ce"}, + {file = "elastic_transport-8.1.2-py3-none-any.whl", hash = "sha256:10914d0c5c268d9dcfee02cfbef861382d098309ba4eedab820062841bd214b3"}, +] +elasticsearch = [ + {file = "elasticsearch-8.2.0-py3-none-any.whl", hash = "sha256:b7d119911e5bf4286cd3155aa93ad0e6b001f637e05f8ec4bf18ee585c1cacfb"}, + {file = "elasticsearch-8.2.0.tar.gz", hash = "sha256:1ca41710ed460acfe3d1724a5a2aefbda24564abb10c03e38e71575183d390fb"}, +] +filelock = [ + {file = "filelock-3.7.0-py3-none-any.whl", hash = "sha256:c7b5fdb219b398a5b28c8e4c1893ef5f98ece6a38c6ab2c22e26ec161556fed6"}, + {file = "filelock-3.7.0.tar.gz", hash = "sha256:b795f1b42a61bbf8ec7113c341dad679d772567b936fbd1bf43c9a238e673e20"}, +] +flake8 = [ + {file = "flake8-3.9.2-py2.py3-none-any.whl", hash = "sha256:bf8fd333346d844f616e8d47905ef3a3384edae6b4e9beb0c5101e25e3110907"}, + {file = "flake8-3.9.2.tar.gz", hash = "sha256:07528381786f2a6237b061f6e96610a4167b226cb926e2aa2b6b1d78057c576b"}, +] +function-parser = [ + {file = "function_parser-0.0.3-py3-none-any.whl", hash = "sha256:c09e4ddb1d9c7783cf5ec7aac72d858f16565552135854844948a67861a15571"}, + {file = "function_parser-0.0.3.tar.gz", hash = "sha256:cdbd9ffa2d02edc9273fec543d9f95d382036ab270e57660c6310020c3211346"}, +] +future = [ + {file = "future-0.18.2.tar.gz", hash = "sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d"}, +] +gitdb = [ + {file = "gitdb-4.0.9-py3-none-any.whl", hash = "sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd"}, + {file = "gitdb-4.0.9.tar.gz", hash = "sha256:bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"}, +] +gitpython = [ + {file = "GitPython-3.1.27-py3-none-any.whl", hash = "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d"}, + {file = "GitPython-3.1.27.tar.gz", hash = "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704"}, +] +huggingface-hub = [ + {file = "huggingface_hub-0.6.0-py3-none-any.whl", hash = "sha256:585d72adade562a1f7038acf39eb7677b7649bdc0ce082b70f99e01164d9d8b5"}, + {file = "huggingface_hub-0.6.0.tar.gz", hash = "sha256:f5109065222185d129933d44159e483a9e3378c577127d0281e4c921dfadbd23"}, +] +idna = [ + {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"}, + {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"}, +] +iniconfig = [ + {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"}, + {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"}, +] +isodate = [ + {file = "isodate-0.6.1-py2.py3-none-any.whl", hash = "sha256:0751eece944162659049d35f4f549ed815792b38793f07cf73381c1c87cbed96"}, + {file = "isodate-0.6.1.tar.gz", hash = "sha256:48c5881de7e8b0a0d648cb024c8062dc84e7b840ed81e864c7614fd3c127bde9"}, +] +isort = [ + {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"}, + {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"}, +] +libcache = [] +libqueue = [] +libutils = [] +mccabe = [ + {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, + {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, +] +mongo-types = [ + {file = "mongo-types-0.15.1.tar.gz", hash = "sha256:0a9deeb7733ea7da5db3711d92e22d93556b522f860bbff82e5df44c53bd06a9"}, + {file = "mongo_types-0.15.1-py3-none-any.whl", hash = "sha256:9417ae5b9a759c09630b5ec7d66904cc333c2d2fcfe75e2760a332ed5e267309"}, +] +mongoengine = [ + {file = "mongoengine-0.24.1-py3-none-any.whl", hash = "sha256:68878b65bcb3751debcba4342180a180161cdb5f46525027e622ad081dd44fac"}, + {file = "mongoengine-0.24.1.tar.gz", hash = "sha256:01baac85f408f5eefb6195c0afeae631e7fc6fab5cb221a7b46646f94227d6da"}, +] +msal = [ + {file = "msal-1.17.0-py2.py3-none-any.whl", hash = "sha256:5a52d78e70d2c451e267c1e8c2342e4c06f495c75c859aeafd9260d3974f09fe"}, + {file = "msal-1.17.0.tar.gz", hash = "sha256:04e3cb7bb75c51f56d290381f23056207df1f3eb594ed03d38551f3b16d2a36e"}, +] +msal-extensions = [ + {file = "msal-extensions-1.0.0.tar.gz", hash = "sha256:c676aba56b0cce3783de1b5c5ecfe828db998167875126ca4b47dc6436451354"}, + {file = "msal_extensions-1.0.0-py2.py3-none-any.whl", hash = "sha256:91e3db9620b822d0ed2b4d1850056a0f133cba04455e62f11612e40f5502f2ee"}, +] +msrest = [ + {file = "msrest-0.6.21-py2.py3-none-any.whl", hash = "sha256:c840511c845330e96886011a236440fafc2c9aff7b2df9c0a92041ee2dee3782"}, + {file = "msrest-0.6.21.tar.gz", hash = "sha256:72661bc7bedc2dc2040e8f170b6e9ef226ee6d3892e01affd4d26b06474d68d8"}, +] +mypy = [ + {file = "mypy-0.812-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:a26f8ec704e5a7423c8824d425086705e381b4f1dfdef6e3a1edab7ba174ec49"}, + {file = "mypy-0.812-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:28fb5479c494b1bab244620685e2eb3c3f988d71fd5d64cc753195e8ed53df7c"}, + {file = "mypy-0.812-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:9743c91088d396c1a5a3c9978354b61b0382b4e3c440ce83cf77994a43e8c521"}, + {file = "mypy-0.812-cp35-cp35m-win_amd64.whl", hash = "sha256:d7da2e1d5f558c37d6e8c1246f1aec1e7349e4913d8fb3cb289a35de573fe2eb"}, + {file = "mypy-0.812-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:4eec37370483331d13514c3f55f446fc5248d6373e7029a29ecb7b7494851e7a"}, + {file = "mypy-0.812-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d65cc1df038ef55a99e617431f0553cd77763869eebdf9042403e16089fe746c"}, + {file = "mypy-0.812-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:61a3d5b97955422964be6b3baf05ff2ce7f26f52c85dd88db11d5e03e146a3a6"}, + {file = "mypy-0.812-cp36-cp36m-win_amd64.whl", hash = "sha256:25adde9b862f8f9aac9d2d11971f226bd4c8fbaa89fb76bdadb267ef22d10064"}, + {file = "mypy-0.812-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:552a815579aa1e995f39fd05dde6cd378e191b063f031f2acfe73ce9fb7f9e56"}, + {file = "mypy-0.812-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:499c798053cdebcaa916eef8cd733e5584b5909f789de856b482cd7d069bdad8"}, + {file = "mypy-0.812-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:5873888fff1c7cf5b71efbe80e0e73153fe9212fafdf8e44adfe4c20ec9f82d7"}, + {file = "mypy-0.812-cp37-cp37m-win_amd64.whl", hash = "sha256:9f94aac67a2045ec719ffe6111df543bac7874cee01f41928f6969756e030564"}, + {file = "mypy-0.812-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d23e0ea196702d918b60c8288561e722bf437d82cb7ef2edcd98cfa38905d506"}, + {file = "mypy-0.812-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:674e822aa665b9fd75130c6c5f5ed9564a38c6cea6a6432ce47eafb68ee578c5"}, + {file = "mypy-0.812-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:abf7e0c3cf117c44d9285cc6128856106183938c68fd4944763003decdcfeb66"}, + {file = "mypy-0.812-cp38-cp38-win_amd64.whl", hash = "sha256:0d0a87c0e7e3a9becdfbe936c981d32e5ee0ccda3e0f07e1ef2c3d1a817cf73e"}, + {file = "mypy-0.812-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:7ce3175801d0ae5fdfa79b4f0cfed08807af4d075b402b7e294e6aa72af9aa2a"}, + {file = "mypy-0.812-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:b09669bcda124e83708f34a94606e01b614fa71931d356c1f1a5297ba11f110a"}, + {file = "mypy-0.812-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:33f159443db0829d16f0a8d83d94df3109bb6dd801975fe86bacb9bf71628e97"}, + {file = "mypy-0.812-cp39-cp39-win_amd64.whl", hash = "sha256:3f2aca7f68580dc2508289c729bd49ee929a436208d2b2b6aab15745a70a57df"}, + {file = "mypy-0.812-py3-none-any.whl", hash = "sha256:2f9b3407c58347a452fc0736861593e105139b905cca7d097e413453a1d650b4"}, + {file = "mypy-0.812.tar.gz", hash = "sha256:cd07039aa5df222037005b08fbbfd69b3ab0b0bd7a07d7906de75ae52c4e3119"}, +] +mypy-extensions = [ + {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, + {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, +] +numpy = [ + {file = "numpy-1.22.3-cp310-cp310-macosx_10_14_x86_64.whl", hash = "sha256:92bfa69cfbdf7dfc3040978ad09a48091143cffb778ec3b03fa170c494118d75"}, + {file = "numpy-1.22.3-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8251ed96f38b47b4295b1ae51631de7ffa8260b5b087808ef09a39a9d66c97ab"}, + {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:48a3aecd3b997bf452a2dedb11f4e79bc5bfd21a1d4cc760e703c31d57c84b3e"}, + {file = "numpy-1.22.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a3bae1a2ed00e90b3ba5f7bd0a7c7999b55d609e0c54ceb2b076a25e345fa9f4"}, + {file = "numpy-1.22.3-cp310-cp310-win32.whl", hash = "sha256:f950f8845b480cffe522913d35567e29dd381b0dc7e4ce6a4a9f9156417d2430"}, + {file = "numpy-1.22.3-cp310-cp310-win_amd64.whl", hash = "sha256:08d9b008d0156c70dc392bb3ab3abb6e7a711383c3247b410b39962263576cd4"}, + {file = "numpy-1.22.3-cp38-cp38-macosx_10_14_x86_64.whl", hash = "sha256:201b4d0552831f7250a08d3b38de0d989d6f6e4658b709a02a73c524ccc6ffce"}, + {file = "numpy-1.22.3-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:f8c1f39caad2c896bc0018f699882b345b2a63708008be29b1f355ebf6f933fe"}, + {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:568dfd16224abddafb1cbcce2ff14f522abe037268514dd7e42c6776a1c3f8e5"}, + {file = "numpy-1.22.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3ca688e1b9b95d80250bca34b11a05e389b1420d00e87a0d12dc45f131f704a1"}, + {file = "numpy-1.22.3-cp38-cp38-win32.whl", hash = "sha256:e7927a589df200c5e23c57970bafbd0cd322459aa7b1ff73b7c2e84d6e3eae62"}, + {file = "numpy-1.22.3-cp38-cp38-win_amd64.whl", hash = "sha256:07a8c89a04997625236c5ecb7afe35a02af3896c8aa01890a849913a2309c676"}, + {file = "numpy-1.22.3-cp39-cp39-macosx_10_14_x86_64.whl", hash = "sha256:2c10a93606e0b4b95c9b04b77dc349b398fdfbda382d2a39ba5a822f669a0123"}, + {file = "numpy-1.22.3-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:fade0d4f4d292b6f39951b6836d7a3c7ef5b2347f3c420cd9820a1d90d794802"}, + {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5bfb1bb598e8229c2d5d48db1860bcf4311337864ea3efdbe1171fb0c5da515d"}, + {file = "numpy-1.22.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:97098b95aa4e418529099c26558eeb8486e66bd1e53a6b606d684d0c3616b168"}, + {file = "numpy-1.22.3-cp39-cp39-win32.whl", hash = "sha256:fdf3c08bce27132395d3c3ba1503cac12e17282358cb4bddc25cc46b0aca07aa"}, + {file = "numpy-1.22.3-cp39-cp39-win_amd64.whl", hash = "sha256:639b54cdf6aa4f82fe37ebf70401bbb74b8508fddcf4797f9fe59615b8c5813a"}, + {file = "numpy-1.22.3-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c34ea7e9d13a70bf2ab64a2532fe149a9aced424cd05a2c4ba662fd989e3e45f"}, + {file = "numpy-1.22.3.zip", hash = "sha256:dbc7601a3b7472d559dc7b933b18b4b66f9aa7452c120e87dfb33d02008c8a18"}, +] +oauthlib = [ + {file = "oauthlib-3.2.0-py3-none-any.whl", hash = "sha256:6db33440354787f9b7f3a6dbd4febf5d0f93758354060e802f6c06cb493022fe"}, + {file = "oauthlib-3.2.0.tar.gz", hash = "sha256:23a8208d75b902797ea29fd31fa80a15ed9dc2c6c16fe73f5d346f83f6fa27a2"}, +] +orjson = [ + {file = "orjson-3.6.8-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:3a287a650458de2211db03681b71c3e5cb2212b62f17a39df8ad99fc54855d0f"}, + {file = "orjson-3.6.8-cp310-cp310-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:5204e25c12cea58e524fc82f7c27ed0586f592f777b33075a92ab7b3eb3687c2"}, + {file = "orjson-3.6.8-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:77e8386393add64f959c044e0fb682364fd0e611a6f477aa13f0e6a733bd6a28"}, + {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_aarch64.whl", hash = "sha256:279f2d2af393fdf8601020744cb206b91b54ad60fb8401e0761819c7bda1f4e4"}, + {file = "orjson-3.6.8-cp310-cp310-manylinux_2_24_x86_64.whl", hash = "sha256:c31c9f389be7906f978ed4192eb58a4b74a37ad60556a0b88ddc47c576697770"}, + {file = "orjson-3.6.8-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0db5c5a0c5b89f092d52f6e5a3701660a9d6ffa9e2968b3ce17c2bc4f5eb0414"}, + {file = "orjson-3.6.8-cp310-none-win_amd64.whl", hash = "sha256:eb22485847b9a0c4bbedc668df860126ac931edbed1d456cf41a59f3cb961ed8"}, + {file = "orjson-3.6.8-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:1a5fe569310bc819279bd4d5f2c349910b104ed3207936246dd5d5e0b085e74a"}, + {file = "orjson-3.6.8-cp37-cp37m-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:ccb356a47ab1067cd3549847e9db1d279a63fe0482d315b3ffd6e7abef35ef77"}, + {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ab29c069c222248ce302a25855b4e1664f9436e8ae5a131fb0859daf31676d2b"}, + {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9d2b5e4cba9e774ac011071d9d27760f97f4b8cd46003e971d122e712f971345"}, + {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_aarch64.whl", hash = "sha256:c311ec504414d22834d5b972a209619925b48263856a11a14d90230f9682d49c"}, + {file = "orjson-3.6.8-cp37-cp37m-manylinux_2_24_x86_64.whl", hash = "sha256:a3dfec7950b90fb8d143743503ee53fa06b32e6068bdea792fc866284da3d71d"}, + {file = "orjson-3.6.8-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:b890dbbada2cbb26eb29bd43a848426f007f094bb0758df10dfe7a438e1cb4b4"}, + {file = "orjson-3.6.8-cp37-none-win_amd64.whl", hash = "sha256:9143ae2c52771525be9ad11a7a8cc8e7fd75391b107e7e644a9e0050496f6b4f"}, + {file = "orjson-3.6.8-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:33a82199fd42f6436f833e210ae5129c922a5c355629356ca7a8e82964da7285"}, + {file = "orjson-3.6.8-cp38-cp38-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:90159ea8b9a5a2a98fa33dc7b421cfac4d2ae91ba5e1058f5909e7f059f6b467"}, + {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:656fbe15d9ef0733e740d9def78f4fdb4153102f4836ee774a05123499005931"}, + {file = "orjson-3.6.8-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7be3be6153843e0f01351b1313a5ad4723595427680dac2dfff22a37e652ce02"}, + {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_aarch64.whl", hash = "sha256:dd24f66b6697ee7424f7da575ec6cbffc8ede441114d53470949cda4d97c6e56"}, + {file = "orjson-3.6.8-cp38-cp38-manylinux_2_24_x86_64.whl", hash = "sha256:b07c780f7345ecf5901356dc21dee0669defc489c38ce7b9ab0f5e008cc0385c"}, + {file = "orjson-3.6.8-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ea32015a5d8a4ce00d348a0de5dc7040e0ad58f970a8fcbb5713a1eac129e493"}, + {file = "orjson-3.6.8-cp38-none-win_amd64.whl", hash = "sha256:c5a3e382194c838988ec128a26b08aa92044e5e055491cc4056142af0c1c54d7"}, + {file = "orjson-3.6.8-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:83a8424e857ae1bf53530e88b4eb2f16ca2b489073b924e655f1575cacd7f52a"}, + {file = "orjson-3.6.8-cp39-cp39-macosx_10_9_x86_64.macosx_11_0_arm64.macosx_10_9_universal2.whl", hash = "sha256:81e1a6a2d67f15007dadacbf9ba5d3d79237e5e33786c028557fe5a2b72f1c9a"}, + {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:137b539881c77866eba86ff6a11df910daf2eb9ab8f1acae62f879e83d7c38af"}, + {file = "orjson-3.6.8-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cbd358f3b3ad539a27e36900e8e7d172d0e1b72ad9dd7d69544dcbc0f067ee7"}, + {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_aarch64.whl", hash = "sha256:6ab94701542d40b90903ecfc339333f458884979a01cb9268bc662cc67a5f6d8"}, + {file = "orjson-3.6.8-cp39-cp39-manylinux_2_24_x86_64.whl", hash = "sha256:32b6f26593a9eb606b40775826beb0dac152e3d224ea393688fced036045a821"}, + {file = "orjson-3.6.8-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:afd9e329ebd3418cac3cd747769b1d52daa25fa672bbf414ab59f0e0881b32b9"}, + {file = "orjson-3.6.8-cp39-none-win_amd64.whl", hash = "sha256:0c89b419914d3d1f65a1b0883f377abe42a6e44f6624ba1c63e8846cbfc2fa60"}, + {file = "orjson-3.6.8.tar.gz", hash = "sha256:e19d23741c5de13689bb316abfccea15a19c264e3ec8eb332a5319a583595ace"}, +] +packaging = [ + {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, + {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, +] +pandas = [ + {file = "pandas-1.4.2-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:be67c782c4f1b1f24c2f16a157e12c2693fd510f8df18e3287c77f33d124ed07"}, + {file = "pandas-1.4.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:5a206afa84ed20e07603f50d22b5f0db3fb556486d8c2462d8bc364831a4b417"}, + {file = "pandas-1.4.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:0010771bd9223f7afe5f051eb47c4a49534345dfa144f2f5470b27189a4dd3b5"}, + {file = "pandas-1.4.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3228198333dd13c90b6434ddf61aa6d57deaca98cf7b654f4ad68a2db84f8cfe"}, + {file = "pandas-1.4.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5b79af3a69e5175c6fa7b4e046b21a646c8b74e92c6581a9d825687d92071b51"}, + {file = "pandas-1.4.2-cp310-cp310-win_amd64.whl", hash = "sha256:5586cc95692564b441f4747c47c8a9746792e87b40a4680a2feb7794defb1ce3"}, + {file = "pandas-1.4.2-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:061609334a8182ab500a90fe66d46f6f387de62d3a9cb9aa7e62e3146c712167"}, + {file = "pandas-1.4.2-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b8134651258bce418cb79c71adeff0a44090c98d955f6953168ba16cc285d9f7"}, + {file = "pandas-1.4.2-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:df82739e00bb6daf4bba4479a40f38c718b598a84654cbd8bb498fd6b0aa8c16"}, + {file = "pandas-1.4.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:385c52e85aaa8ea6a4c600a9b2821181a51f8be0aee3af6f2dcb41dafc4fc1d0"}, + {file = "pandas-1.4.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:295872bf1a09758aba199992c3ecde455f01caf32266d50abc1a073e828a7b9d"}, + {file = "pandas-1.4.2-cp38-cp38-win32.whl", hash = "sha256:95c1e422ced0199cf4a34385ff124b69412c4bc912011ce895582bee620dfcaa"}, + {file = "pandas-1.4.2-cp38-cp38-win_amd64.whl", hash = "sha256:5c54ea4ef3823108cd4ec7fb27ccba4c3a775e0f83e39c5e17f5094cb17748bc"}, + {file = "pandas-1.4.2-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:c072c7f06b9242c855ed8021ff970c0e8f8b10b35e2640c657d2a541c5950f59"}, + {file = "pandas-1.4.2-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f549097993744ff8c41b5e8f2f0d3cbfaabe89b4ae32c8c08ead6cc535b80139"}, + {file = "pandas-1.4.2-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ff08a14ef21d94cdf18eef7c569d66f2e24e0bc89350bcd7d243dd804e3b5eb2"}, + {file = "pandas-1.4.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8c5bf555b6b0075294b73965adaafb39cf71c312e38c5935c93d78f41c19828a"}, + {file = "pandas-1.4.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:51649ef604a945f781105a6d2ecf88db7da0f4868ac5d45c51cb66081c4d9c73"}, + {file = "pandas-1.4.2-cp39-cp39-win32.whl", hash = "sha256:d0d4f13e4be7ce89d7057a786023c461dd9370040bdb5efa0a7fe76b556867a0"}, + {file = "pandas-1.4.2-cp39-cp39-win_amd64.whl", hash = "sha256:09d8be7dd9e1c4c98224c4dfe8abd60d145d934e9fc1f5f411266308ae683e6a"}, + {file = "pandas-1.4.2.tar.gz", hash = "sha256:92bc1fc585f1463ca827b45535957815b7deb218c549b7c18402c322c7549a12"}, +] +pathspec = [ + {file = "pathspec-0.9.0-py2.py3-none-any.whl", hash = "sha256:7d15c4ddb0b5c802d161efc417ec1a2558ea2653c2e8ad9c19098201dc1c993a"}, + {file = "pathspec-0.9.0.tar.gz", hash = "sha256:e564499435a2673d586f6b2130bb5b95f04a3ba06f81b8f895b651a3c76aabb1"}, +] +pbr = [ + {file = "pbr-5.9.0-py2.py3-none-any.whl", hash = "sha256:e547125940bcc052856ded43be8e101f63828c2d94239ffbe2b327ba3d5ccf0a"}, + {file = "pbr-5.9.0.tar.gz", hash = "sha256:e8dca2f4b43560edef58813969f52a56cef023146cbb8931626db80e6c1c4308"}, +] +platformdirs = [ + {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"}, + {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"}, +] +pluggy = [ + {file = "pluggy-1.0.0-py2.py3-none-any.whl", hash = "sha256:74134bbf457f031a36d68416e1509f34bd5ccc019f0bcc952c7b909d06b37bd3"}, + {file = "pluggy-1.0.0.tar.gz", hash = "sha256:4224373bacce55f955a878bf9cfa763c1e360858e330072059e10bad68531159"}, +] +poetryup = [ + {file = "poetryup-0.3.15-py3-none-any.whl", hash = "sha256:db068f55d10c0f89c76ea2b62c6bb81c0b0512454f7a83bdc0a13c146e5fb13e"}, + {file = "poetryup-0.3.15.tar.gz", hash = "sha256:efa4e7bb0cd005db4aff3cc678c8bfba9474ef42d5759c0168f2a55fc0f17bc3"}, +] +portalocker = [ + {file = "portalocker-2.4.0-py2.py3-none-any.whl", hash = "sha256:b092f48e1e30a234ab3dd1cfd44f2f235e8a41f4e310e463fc8d6798d1c3c235"}, + {file = "portalocker-2.4.0.tar.gz", hash = "sha256:a648ad761b8ea27370cb5915350122cd807b820d2193ed5c9cc28f163df637f4"}, +] +py = [ + {file = "py-1.11.0-py2.py3-none-any.whl", hash = "sha256:607c53218732647dff4acdfcd50cb62615cedf612e72d1724fb1a0cc6405b378"}, + {file = "py-1.11.0.tar.gz", hash = "sha256:51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719"}, +] +pycodestyle = [ + {file = "pycodestyle-2.7.0-py2.py3-none-any.whl", hash = "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068"}, + {file = "pycodestyle-2.7.0.tar.gz", hash = "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef"}, +] +pycparser = [ + {file = "pycparser-2.21-py2.py3-none-any.whl", hash = "sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9"}, + {file = "pycparser-2.21.tar.gz", hash = "sha256:e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206"}, +] +pyflakes = [ + {file = "pyflakes-2.3.1-py2.py3-none-any.whl", hash = "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3"}, + {file = "pyflakes-2.3.1.tar.gz", hash = "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db"}, +] +pyhive = [ + {file = "PyHive-0.6.5.tar.gz", hash = "sha256:cae07bd177527d04f6a5c7f96cb1849ba8bd9121750b75bbf5e3d4a3be566909"}, +] +pyjwt = [ + {file = "PyJWT-2.4.0-py3-none-any.whl", hash = "sha256:72d1d253f32dbd4f5c88eaf1fdc62f3a19f676ccbadb9dbc5d07e951b2b26daf"}, + {file = "PyJWT-2.4.0.tar.gz", hash = "sha256:d42908208c699b3b973cbeb01a969ba6a96c821eefb1c5bfe4c390c01d67abba"}, +] +pymongo = [ + {file = "pymongo-3.12.3-cp27-cp27m-macosx_10_14_intel.whl", hash = "sha256:c164eda0be9048f83c24b9b2656900041e069ddf72de81c17d874d0c32f6079f"}, + {file = "pymongo-3.12.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:a055d29f1302892a9389a382bed10a3f77708bcf3e49bfb76f7712fa5f391cc6"}, + {file = "pymongo-3.12.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:8c7ad5cab282f53b9d78d51504330d1c88c83fbe187e472c07e6908a0293142e"}, + {file = "pymongo-3.12.3-cp27-cp27m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:a766157b195a897c64945d4ff87b050bb0e763bb78f3964e996378621c703b00"}, + {file = "pymongo-3.12.3-cp27-cp27m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:c8d6bf6fcd42cde2f02efb8126812a010c297eacefcd090a609639d2aeda6185"}, + {file = "pymongo-3.12.3-cp27-cp27m-win32.whl", hash = "sha256:5fdffb0cfeb4dc8646a5381d32ec981ae8472f29c695bf09e8f7a8edb2db12ca"}, + {file = "pymongo-3.12.3-cp27-cp27m-win_amd64.whl", hash = "sha256:648fcfd8e019b122b7be0e26830a3a2224d57c3e934f19c1e53a77b8380e6675"}, + {file = "pymongo-3.12.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:3f0ac6e0203bd88863649e6ed9c7cfe53afab304bc8225f2597c4c0a74e4d1f0"}, + {file = "pymongo-3.12.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:71c0db2c313ea8a80825fb61b7826b8015874aec29ee6364ade5cb774fe4511b"}, + {file = "pymongo-3.12.3-cp27-cp27mu-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5b779e87300635b8075e8d5cfd4fdf7f46078cd7610c381d956bca5556bb8f97"}, + {file = "pymongo-3.12.3-cp27-cp27mu-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:351a2efe1c9566c348ad0076f4bf541f4905a0ebe2d271f112f60852575f3c16"}, + {file = "pymongo-3.12.3-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:0a02313e71b7c370c43056f6b16c45effbb2d29a44d24403a3d5ba6ed322fa3f"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux1_i686.whl", hash = "sha256:d3082e5c4d7b388792124f5e805b469109e58f1ab1eb1fbd8b998e8ab766ffb7"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux2014_aarch64.whl", hash = "sha256:514e78d20d8382d5b97f32b20c83d1d0452c302c9a135f0a9022236eb9940fda"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux2014_i686.whl", hash = "sha256:b1b5be40ebf52c3c67ee547e2c4435ed5bc6352f38d23e394520b686641a6be4"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux2014_ppc64le.whl", hash = "sha256:58db209da08a502ce6948841d522dcec80921d714024354153d00b054571993c"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux2014_s390x.whl", hash = "sha256:5296e5e69243ffd76bd919854c4da6630ae52e46175c804bc4c0e050d937b705"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux2014_x86_64.whl", hash = "sha256:51d1d061df3995c2332ae78f036492cc188cb3da8ef122caeab3631a67bb477e"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:463b974b7f49d65a16ca1435bc1c25a681bb7d630509dd23b2e819ed36da0b7f"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e099b79ccf7c40f18b149a64d3d10639980035f9ceb223169dd806ff1bb0d9cc"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:27e5ea64332385385b75414888ce9d1a9806be8616d7cef4ef409f4f256c6d06"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ed7d11330e443aeecab23866055e08a5a536c95d2c25333aeb441af2dbac38d2"}, + {file = "pymongo-3.12.3-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:93111fd4e08fa889c126aa8baf5c009a941880a539c87672e04583286517450a"}, + {file = "pymongo-3.12.3-cp310-cp310-win32.whl", hash = "sha256:2301051701b27aff2cbdf83fae22b7ca883c9563dfd088033267291b46196643"}, + {file = "pymongo-3.12.3-cp310-cp310-win_amd64.whl", hash = "sha256:c7e8221278e5f9e2b6d3893cfc3a3e46c017161a57bb0e6f244826e4cee97916"}, + {file = "pymongo-3.12.3-cp34-cp34m-macosx_10_6_intel.whl", hash = "sha256:7b4a9fcd95e978cd3c96cdc2096aa54705266551422cf0883c12a4044def31c6"}, + {file = "pymongo-3.12.3-cp34-cp34m-manylinux1_i686.whl", hash = "sha256:06b64cdf5121f86b78a84e61b8f899b6988732a8d304b503ea1f94a676221c06"}, + {file = "pymongo-3.12.3-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:c8f7dd025cb0bf19e2f60a64dfc24b513c8330e0cfe4a34ccf941eafd6194d9e"}, + {file = "pymongo-3.12.3-cp34-cp34m-win32.whl", hash = "sha256:ab23b0545ec71ea346bf50a5d376d674f56205b729980eaa62cdb7871805014b"}, + {file = "pymongo-3.12.3-cp34-cp34m-win_amd64.whl", hash = "sha256:1b5cb75d2642ff7db823f509641f143f752c0d1ab03166cafea1e42e50469834"}, + {file = "pymongo-3.12.3-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:fc2048d13ff427605fea328cbe5369dce549b8c7657b0e22051a5b8831170af6"}, + {file = "pymongo-3.12.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:c5f83bb59d0ff60c6fdb1f8a7b0288fbc4640b1f0fd56f5ae2387749c35d34e3"}, + {file = "pymongo-3.12.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:6632b1c63d58cddc72f43ab9f17267354ddce563dd5e11eadabd222dcc808808"}, + {file = "pymongo-3.12.3-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:3fedad05147b40ff8a93fcd016c421e6c159f149a2a481cfa0b94bfa3e473bab"}, + {file = "pymongo-3.12.3-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:208a61db8b8b647fb5b1ff3b52b4ed6dbced01eac3b61009958adb203596ee99"}, + {file = "pymongo-3.12.3-cp35-cp35m-win32.whl", hash = "sha256:3100a2352bdded6232b385ceda0c0a4624598c517d52c2d8cf014b7abbebd84d"}, + {file = "pymongo-3.12.3-cp35-cp35m-win_amd64.whl", hash = "sha256:3492ae1f97209c66af70e863e6420e6301cecb0a51a5efa701058aa73a8ca29e"}, + {file = "pymongo-3.12.3-cp36-cp36m-macosx_10_6_intel.whl", hash = "sha256:87e18f29bac4a6be76a30e74de9c9005475e27100acf0830679420ce1fd9a6fd"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:b3e08aef4ea05afbc0a70cd23c13684e7f5e074f02450964ec5cfa1c759d33d2"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:e66b3c9f8b89d4fd58a59c04fdbf10602a17c914fbaaa5e6ea593f1d54b06362"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:5d67dbc8da2dac1644d71c1839d12d12aa333e266a9964d5b1a49feed036bc94"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux2014_i686.whl", hash = "sha256:a351986d6c9006308f163c359ced40f80b6cffb42069f3e569b979829951038d"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux2014_ppc64le.whl", hash = "sha256:5296669bff390135528001b4e48d33a7acaffcd361d98659628ece7f282f11aa"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:9d5b66d457d2c5739c184a777455c8fde7ab3600a56d8bbebecf64f7c55169e1"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux2014_x86_64.whl", hash = "sha256:1c771f1a8b3cd2d697baaf57e9cfa4ae42371cacfbea42ea01d9577c06d92f96"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:81a3ebc33b1367f301d1c8eda57eec4868e951504986d5d3fe437479dcdac5b2"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5cf113a46d81cff0559d57aa66ffa473d57d1a9496f97426318b6b5b14fdec1c"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:64b9122be1c404ce4eb367ad609b590394587a676d84bfed8e03c3ce76d70560"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c6c71e198b36f0f0dfe354f06d3655ecfa30d69493a1da125a9a54668aad652"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:33ab8c031f788609924e329003088831045f683931932a52a361d4a955b7dce2"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e2b4c95c47fb81b19ea77dc1c50d23af3eba87c9628fcc2e03d44124a3d336ea"}, + {file = "pymongo-3.12.3-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:4e0a3ea7fd01cf0a36509f320226bd8491e0f448f00b8cb89f601c109f6874e1"}, + {file = "pymongo-3.12.3-cp36-cp36m-win32.whl", hash = "sha256:dfec57f15f53d677b8e4535695ff3f37df7f8fe431f2efa8c3c8c4025b53d1eb"}, + {file = "pymongo-3.12.3-cp36-cp36m-win_amd64.whl", hash = "sha256:c22591cff80188dd8543be0b559d0c807f7288bd353dc0bcfe539b4588b3a5cd"}, + {file = "pymongo-3.12.3-cp37-cp37m-macosx_10_6_intel.whl", hash = "sha256:7738147cd9dbd6d18d5593b3491b4620e13b61de975fd737283e4ad6c255c273"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:be1f10145f7ea76e3e836fdc5c8429c605675bdcddb0bca9725ee6e26874c00c"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:295a5beaecb7bf054c1c6a28749ed72b19f4d4b61edcd8a0815d892424baf780"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:320f8734553c50cffe8a8e1ae36dfc7d7be1941c047489db20a814d2a170d7b5"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux2014_i686.whl", hash = "sha256:5d20072d81cbfdd8e15e6a0c91fc7e3a4948c71e0adebfc67d3b4bcbe8602711"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux2014_ppc64le.whl", hash = "sha256:2c46a0afef69d61938a6fe32c3afd75b91dec3ab3056085dc72abbeedcc94166"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:5f530f35e1a57d4360eddcbed6945aecdaee2a491cd3f17025e7b5f2eea88ee7"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux2014_x86_64.whl", hash = "sha256:6526933760ee1e6090db808f1690a111ec409699c1990efc96f134d26925c37f"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:95d15cf81cd2fb926f2a6151a9f94c7aacc102b415e72bc0e040e29332b6731c"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0d52a70350ec3dfc39b513df12b03b7f4c8f8ec6873bbf958299999db7b05eb1"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9252c991e8176b5a2fa574c5ab9a841679e315f6e576eb7cf0bd958f3e39b0ad"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:145d78c345a38011497e55aff22c0f8edd40ee676a6810f7e69563d68a125e83"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a8e0a086dbbee406cc6f603931dfe54d1cb2fba585758e06a2de01037784b737"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f6d5443104f89a840250087863c91484a72f254574848e951d1bdd7d8b2ce7c9"}, + {file = "pymongo-3.12.3-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:6f93dbfa5a461107bc3f5026e0d5180499e13379e9404f07a9f79eb5e9e1303d"}, + {file = "pymongo-3.12.3-cp37-cp37m-win32.whl", hash = "sha256:c9d212e2af72d5c8d082775a43eb726520e95bf1c84826440f74225843975136"}, + {file = "pymongo-3.12.3-cp37-cp37m-win_amd64.whl", hash = "sha256:320a1fe403dd83a35709fcf01083d14bc1462e9789b711201349a9158db3a87e"}, + {file = "pymongo-3.12.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:a1ba93be779a9b8e5e44f5c133dc1db4313661cead8a2fd27661e6cb8d942ee9"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:4294f2c1cd069b793e31c2e6d7ac44b121cf7cedccd03ebcc30f3fc3417b314a"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:845b178bd127bb074835d2eac635b980c58ec5e700ebadc8355062df708d5a71"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:176fdca18391e1206c32fb1d8265628a84d28333c20ad19468d91e3e98312cd1"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux2014_i686.whl", hash = "sha256:28bfd5244d32faf3e49b5a8d1fab0631e922c26e8add089312e4be19fb05af50"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux2014_ppc64le.whl", hash = "sha256:f38b35ecd2628bf0267761ed659e48af7e620a7fcccfccf5774e7308fb18325c"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:cebb3d8bcac4a6b48be65ebbc5c9881ed4a738e27bb96c86d9d7580a1fb09e05"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux2014_x86_64.whl", hash = "sha256:80710d7591d579442c67a3bc7ae9dcba9ff95ea8414ac98001198d894fc4ff46"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:89d7baa847383b9814de640c6f1a8553d125ec65e2761ad146ea2e75a7ad197c"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:602284e652bb56ca8760f8e88a5280636c5b63d7946fca1c2fe0f83c37dffc64"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:bfc2d763d05ec7211313a06e8571236017d3e61d5fef97fcf34ec4b36c0b6556"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a6e4dccae8ef5dd76052647d78f02d5d0ffaff1856277d951666c54aeba3ad2"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e1fc4d3985868860b6585376e511bb32403c5ffb58b0ed913496c27fd791deea"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e4e5d163e6644c2bc84dd9f67bfa89288c23af26983d08fefcc2cbc22f6e57e6"}, + {file = "pymongo-3.12.3-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:8d92c6bb9174d47c2257528f64645a00bbc6324a9ff45a626192797aff01dc14"}, + {file = "pymongo-3.12.3-cp38-cp38-win32.whl", hash = "sha256:b0db9a4691074c347f5d7ee830ab3529bc5ad860939de21c1f9c403daf1eda9a"}, + {file = "pymongo-3.12.3-cp38-cp38-win_amd64.whl", hash = "sha256:d81047341ab56061aa4b6823c54d4632579c3b16e675089e8f520e9b918a133b"}, + {file = "pymongo-3.12.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:07398d8a03545b98282f459f2603a6bb271f4448d484ed7f411121a519a7ea48"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:b7df0d99e189b7027d417d4bfd9b8c53c9c7ed5a0a1495d26a6f547d820eca88"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:a283425e6a474facd73072d8968812d1d9058490a5781e022ccf8895500b83ce"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:2577b8161eeae4dd376d13100b2137d883c10bb457dd08935f60c9f9d4b5c5f6"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux2014_i686.whl", hash = "sha256:517b09b1dd842390a965a896d1327c55dfe78199c9f5840595d40facbcd81854"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux2014_ppc64le.whl", hash = "sha256:2567885ff0c8c7c0887ba6cefe4ae4af96364a66a7069f924ce0cd12eb971d04"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:71c5c200fd37a5322706080b09c3ec8907cf01c377a7187f354fc9e9e13abc73"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux2014_x86_64.whl", hash = "sha256:14dee106a10b77224bba5efeeb6aee025aabe88eb87a2b850c46d3ee55bdab4a"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f340a2a908644ea6cccd399be0fb308c66e05d2800107345f9f0f0d59e1731c4"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:1b4c535f524c9d8c86c3afd71d199025daa070859a2bdaf94a298120b0de16db"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:8455176fd1b86de97d859fed4ae0ef867bf998581f584c7a1a591246dfec330f"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bf254a1a95e95fdf4eaa25faa1ea450a6533ed7a997f9f8e49ab971b61ea514d"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a8a3540e21213cb8ce232e68a7d0ee49cdd35194856c50b8bd87eeb572fadd42"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:0e7a5d0b9077e8c3e57727f797ee8adf12e1d5e7534642230d98980d160d1320"}, + {file = "pymongo-3.12.3-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:0be605bfb8461384a4cb81e80f51eb5ca1b89851f2d0e69a75458c788a7263a4"}, + {file = "pymongo-3.12.3-cp39-cp39-win32.whl", hash = "sha256:2157d68f85c28688e8b723bbe70c8013e0aba5570e08c48b3562f74d33fc05c4"}, + {file = "pymongo-3.12.3-cp39-cp39-win_amd64.whl", hash = "sha256:dfa217bf8cf3ff6b30c8e6a89014e0c0e7b50941af787b970060ae5ba04a4ce5"}, + {file = "pymongo-3.12.3-py2.7-macosx-10.14-intel.egg", hash = "sha256:d81299f63dc33cc172c26faf59cc54dd795fc6dd5821a7676cca112a5ee8bbd6"}, + {file = "pymongo-3.12.3.tar.gz", hash = "sha256:0a89cadc0062a5e53664dde043f6c097172b8c1c5f0094490095282ff9995a5f"}, +] +pyparsing = [ + {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, + {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, +] +pytest = [ + {file = "pytest-6.2.5-py3-none-any.whl", hash = "sha256:7310f8d27bc79ced999e760ca304d69f6ba6c6649c0b60fb0e04a4a77cacc134"}, + {file = "pytest-6.2.5.tar.gz", hash = "sha256:131b36680866a76e6781d13f101efb86cf674ebb9762eb70d3082b6f29889e89"}, +] +pytest-cov = [ + {file = "pytest-cov-2.12.1.tar.gz", hash = "sha256:261ceeb8c227b726249b376b8526b600f38667ee314f910353fa318caa01f4d7"}, + {file = "pytest_cov-2.12.1-py2.py3-none-any.whl", hash = "sha256:261bb9e47e65bd099c89c3edf92972865210c36813f80ede5277dceb77a4a62a"}, +] +python-arango = [ + {file = "python-arango-7.3.4.tar.gz", hash = "sha256:0725a453d46996396e4740e84ead32b36186e853a545044411fb7f624a1b71b3"}, + {file = "python_arango-7.3.4-py3-none-any.whl", hash = "sha256:e5e433b18bec8295e3e92a10f249de327b1a980e7ab9b1c38a5e5482b1e144e9"}, +] +python-dateutil = [ + {file = "python-dateutil-2.8.2.tar.gz", hash = "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86"}, + {file = "python_dateutil-2.8.2-py2.py3-none-any.whl", hash = "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9"}, +] +python-dotenv = [ + {file = "python-dotenv-0.20.0.tar.gz", hash = "sha256:b7e3b04a59693c42c36f9ab1cc2acc46fa5df8c78e178fc33a8d4cd05c8d498f"}, + {file = "python_dotenv-0.20.0-py3-none-any.whl", hash = "sha256:d92a187be61fe482e4fd675b6d52200e7be63a12b724abbf931a40ce4fa92938"}, +] +pytz = [ + {file = "pytz-2022.1-py2.py3-none-any.whl", hash = "sha256:e68985985296d9a66a881eb3193b0906246245294a881e7c8afe623866ac6a5c"}, + {file = "pytz-2022.1.tar.gz", hash = "sha256:1e760e2fe6a8163bc0b3d9a19c4f84342afa0a2affebfaa84b01b978a02ecaa7"}, +] +pywin32 = [ + {file = "pywin32-304-cp310-cp310-win32.whl", hash = "sha256:3c7bacf5e24298c86314f03fa20e16558a4e4138fc34615d7de4070c23e65af3"}, + {file = "pywin32-304-cp310-cp310-win_amd64.whl", hash = "sha256:4f32145913a2447736dad62495199a8e280a77a0ca662daa2332acf849f0be48"}, + {file = "pywin32-304-cp310-cp310-win_arm64.whl", hash = "sha256:d3ee45adff48e0551d1aa60d2ec066fec006083b791f5c3527c40cd8aefac71f"}, + {file = "pywin32-304-cp311-cp311-win32.whl", hash = "sha256:30c53d6ce44c12a316a06c153ea74152d3b1342610f1b99d40ba2795e5af0269"}, + {file = "pywin32-304-cp311-cp311-win_amd64.whl", hash = "sha256:7ffa0c0fa4ae4077e8b8aa73800540ef8c24530057768c3ac57c609f99a14fd4"}, + {file = "pywin32-304-cp311-cp311-win_arm64.whl", hash = "sha256:cbbe34dad39bdbaa2889a424d28752f1b4971939b14b1bb48cbf0182a3bcfc43"}, + {file = "pywin32-304-cp36-cp36m-win32.whl", hash = "sha256:be253e7b14bc601718f014d2832e4c18a5b023cbe72db826da63df76b77507a1"}, + {file = "pywin32-304-cp36-cp36m-win_amd64.whl", hash = "sha256:de9827c23321dcf43d2f288f09f3b6d772fee11e809015bdae9e69fe13213988"}, + {file = "pywin32-304-cp37-cp37m-win32.whl", hash = "sha256:f64c0377cf01b61bd5e76c25e1480ca8ab3b73f0c4add50538d332afdf8f69c5"}, + {file = "pywin32-304-cp37-cp37m-win_amd64.whl", hash = "sha256:bb2ea2aa81e96eee6a6b79d87e1d1648d3f8b87f9a64499e0b92b30d141e76df"}, + {file = "pywin32-304-cp38-cp38-win32.whl", hash = "sha256:94037b5259701988954931333aafd39cf897e990852115656b014ce72e052e96"}, + {file = "pywin32-304-cp38-cp38-win_amd64.whl", hash = "sha256:ead865a2e179b30fb717831f73cf4373401fc62fbc3455a0889a7ddac848f83e"}, + {file = "pywin32-304-cp39-cp39-win32.whl", hash = "sha256:25746d841201fd9f96b648a248f731c1dec851c9a08b8e33da8b56148e4c65cc"}, + {file = "pywin32-304-cp39-cp39-win_amd64.whl", hash = "sha256:d24a3382f013b21aa24a5cfbfad5a2cd9926610c0affde3e8ab5b3d7dbcf4ac9"}, +] +pyyaml = [ + {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"}, + {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"}, + {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"}, + {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"}, + {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"}, + {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"}, + {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"}, + {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"}, + {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"}, + {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"}, + {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"}, + {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"}, + {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"}, + {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"}, + {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"}, + {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"}, + {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"}, + {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"}, + {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"}, + {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"}, + {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"}, + {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"}, +] +regex = [ + {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, + {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, + {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, + {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, + {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, + {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, + {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, + {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, + {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, + {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, + {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, + {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, + {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, + {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, + {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, + {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, + {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, + {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, + {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, +] +requests = [ + {file = "requests-2.27.1-py2.py3-none-any.whl", hash = "sha256:f22fa1e554c9ddfd16e6e41ac79759e17be9e492b3587efa038054674760e72d"}, + {file = "requests-2.27.1.tar.gz", hash = "sha256:68d7c56fd5a8999887728ef304a6d12edc7be74f1cfa47714fc8b414525c9a61"}, +] +requests-oauthlib = [ + {file = "requests-oauthlib-1.3.1.tar.gz", hash = "sha256:75beac4a47881eeb94d5ea5d6ad31ef88856affe2332b9aafb52c6452ccf0d7a"}, + {file = "requests_oauthlib-1.3.1-py2.py3-none-any.whl", hash = "sha256:2577c501a2fb8d05a304c09d090d6e47c306fef15809d102b327cf8364bddab5"}, +] +requests-toolbelt = [ + {file = "requests-toolbelt-0.9.1.tar.gz", hash = "sha256:968089d4584ad4ad7c171454f0a5c6dac23971e9472521ea3b6d49d610aa6fc0"}, + {file = "requests_toolbelt-0.9.1-py2.py3-none-any.whl", hash = "sha256:380606e1d10dc85c3bd47bf5a6095f815ec007be7a8b69c878507068df059e6f"}, +] +safety = [ + {file = "safety-1.10.3-py2.py3-none-any.whl", hash = "sha256:5f802ad5df5614f9622d8d71fedec2757099705c2356f862847c58c6dfe13e84"}, + {file = "safety-1.10.3.tar.gz", hash = "sha256:30e394d02a20ac49b7f65292d19d38fa927a8f9582cdfd3ad1adbbc66c641ad5"}, +] +sentencepiece = [ + {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc969e6694fb27fba7cee2953f350804faf03913f25ae1ee713a7b8a1bc08018"}, + {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:36e9ff61e7b67c5b7ee96733613622620b4802fc8cf188a4dbc1f355b03dde02"}, + {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e9e9fe8094ca57549d801e9a2017ac5c24108bbf485ea4f8994a72e8e96ee135"}, + {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b77d27f59d515c43b61745b8173fbe7c7b3014b14b3702a75bf1793471e7def6"}, + {file = "sentencepiece-0.1.96-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1dac8c2ad02b5ebc1179c0a14cbc7d7c6f4fd73d4dd51820626402d0aefc974e"}, + {file = "sentencepiece-0.1.96-cp35-cp35m-macosx_10_6_x86_64.whl", hash = "sha256:e8ec5bb6777e2060e1499750c50e1b69dca5a0f80f90f2c66656c5f3e5244593"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-macosx_10_6_x86_64.whl", hash = "sha256:99ea2d9db19e63a2d17d5dc64f9ace83fb9308a735be05a1aaf98eb4b496fba7"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:aeb090ad462833df03af1debce4ae607a2766ef861f992003ad0c56d074ab805"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:f8c90df663cd9759b2cf8dd29998b63140ac39e51ada2e739dc13bdac0b4f001"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:26d20d713b3ba1b7a19205336afb1e93a4327c372b2f795e907b8dc2315ac92e"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:5388882bb24d083f6cc8cffc5c435f3694a7772b018e06ea6fd84d1044009efb"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a92e1932ee8fd500680ccbe1bf53eb33228f4c9d6524ed6f300bcc80ac359f27"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-win32.whl", hash = "sha256:bedf0355117fb4e9b1fc9fc92b4d5ee743a7d468be9f6196e3b94447710ea589"}, + {file = "sentencepiece-0.1.96-cp36-cp36m-win_amd64.whl", hash = "sha256:4997c7ccf2ae462320250314aa5709a88d8a09fa271d073458a07bebf33f8e7c"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-macosx_10_6_x86_64.whl", hash = "sha256:a697257a2cd7581732d7741a8d32a06927f0311c3d277dbc47fa1043350c9d17"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ff7d752a7f82d87711ec1a95c2262cb74f98be5b457f0300d81a1aefe5be2a95"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:3e61e0757e49c306fff78ea75d6b75773418fe22214b4a460959203be934e834"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ef59ba19340dc1d002ce5713b911c0ef23c577b08f8ed57998ee3c8e62c5bf6e"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:89c038da7f827a6e2ca4c73aeb4e4b25b99d981ce47dd61b04d446c8200cba1e"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d954d25a8705f972e8bfc1dea5464d7e697dd6f4ade092f1a487387e6d6c829a"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-win32.whl", hash = "sha256:fd907a8f744e5337de7fc532dd800c4416b571ea47f8c3c66be10cd1bc67c925"}, + {file = "sentencepiece-0.1.96-cp37-cp37m-win_amd64.whl", hash = "sha256:335bf84d72112cc91f3c3b691d61802fc963503b7772fd8280d20368048b8f3e"}, + {file = "sentencepiece-0.1.96-cp38-cp38-macosx_10_6_x86_64.whl", hash = "sha256:e811984b0908c14c56de7d8226fdd494d87a7ccb75af8ac3a07423037aaafc35"}, + {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8179785883b556cd517416cdbda6244745414b00ec83132cfe1d26000971f3ae"}, + {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:466e381f0a812da8fda97a9707498cef3210ea8385a3421bcbadcb5384063969"}, + {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f8cb24d8d0b2f8b7463815a59183eb81ec1d7a06e3217bed456063f3303eddfb"}, + {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e88354b61f59dfdeb41023f7be8ae31dc627c2dc2dacbc2de8b2d82a0997135c"}, + {file = "sentencepiece-0.1.96-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a336575463d75d3aac1f7e32470b8998643ccd9a73786bd726f6b0470520b6b4"}, + {file = "sentencepiece-0.1.96-cp38-cp38-win32.whl", hash = "sha256:81bb77ba3651114943b2f8f77829cf764137dff06e38f4bf7fa43efea12c7f84"}, + {file = "sentencepiece-0.1.96-cp38-cp38-win_amd64.whl", hash = "sha256:eba0471ab0bb2e07ed06d91ecf5185d402c83d194155a41d8e2aa547d187712e"}, + {file = "sentencepiece-0.1.96-cp39-cp39-macosx_10_6_x86_64.whl", hash = "sha256:78e18d9106c36dcca929e18fd2c412378deac661d47fa3ee25defc55eef8a215"}, + {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b1c24c1d9405b2148184ff27c062493d5e3be5c144575f95b5a0d7c660a515af"}, + {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:940a6999c7d3f55e9d7b194fd5e1f41a7dbed26d3519fb95333216292a39599e"}, + {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:384148cead5cdab34a4d74fe1fb6a5a8abaafed25eaa4a7698b49dd9482e4c4e"}, + {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3c703e68ea192e45b65c5d5836f6980849d828a18da4189899d7150fad82dc9e"}, + {file = "sentencepiece-0.1.96-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d501713a8396193883aa526f48dc609f5f031a5df1afbafa561cf9ab492ffc76"}, + {file = "sentencepiece-0.1.96-cp39-cp39-win32.whl", hash = "sha256:b8b1dd2712f8a7de5b4c8ec912e6c041d25750bf03e1ce325cdba43bae0944ae"}, + {file = "sentencepiece-0.1.96-cp39-cp39-win_amd64.whl", hash = "sha256:d45e3f78e746aa161bc9f5a31c6a2839c512101113a4065f4d2e7a3ab8198d8c"}, + {file = "sentencepiece-0.1.96-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5513298d62fe63dd0862d08a6eb52a9aa3537006f597f2386184e3f95bb88889"}, + {file = "sentencepiece-0.1.96-pp37-pypy37_pp73-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:dadccb2e49244b6e64b4527d13ec14d5e094a90b41cf9b963e457e64182f1941"}, + {file = "sentencepiece-0.1.96-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48c6d13b3bfff08060c138248e85df60f6fad11135ad7a8fc2ef6005aacca839"}, + {file = "sentencepiece-0.1.96.tar.gz", hash = "sha256:9bdf097d5bd1d8ce42dfee51f6ff05f5578b96e48c6f6006aa4eff69edfa3639"}, +] +setsimilaritysearch = [ + {file = "SetSimilaritySearch-0.1.7-py2.py3-none-any.whl", hash = "sha256:4d61b5ee5635276054e651070483fe2342786c3e6424cfb6734634afd893d5cf"}, + {file = "SetSimilaritySearch-0.1.7.tar.gz", hash = "sha256:5d95812e6237b877adbd991c14583e9191925f2809ed58aa1e9f34e9c8420722"}, +] +six = [ + {file = "six-1.16.0-py2.py3-none-any.whl", hash = "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254"}, + {file = "six-1.16.0.tar.gz", hash = "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926"}, +] +smmap = [ + {file = "smmap-5.0.0-py3-none-any.whl", hash = "sha256:2aba19d6a040e78d8b09de5c57e96207b09ed71d8e55ce0959eeee6c8e190d94"}, + {file = "smmap-5.0.0.tar.gz", hash = "sha256:c840e62059cd3be204b0c9c9f74be2c09d5648eddd4580d9314c3ecde0b30936"}, +] +sniffio = [ + {file = "sniffio-1.2.0-py3-none-any.whl", hash = "sha256:471b71698eac1c2112a40ce2752bb2f4a4814c22a54a3eed3676bc0f5ca9f663"}, + {file = "sniffio-1.2.0.tar.gz", hash = "sha256:c4666eecec1d3f50960c6bdf61ab7bc350648da6c126e3cf6898d8cd4ddcd3de"}, +] +starlette = [ + {file = "starlette-0.16.0-py3-none-any.whl", hash = "sha256:38eb24bf705a2c317e15868e384c1b8a12ca396e5a3c3a003db7e667c43f939f"}, + {file = "starlette-0.16.0.tar.gz", hash = "sha256:e1904b5d0007aee24bdd3c43994be9b3b729f4f58e740200de1d623f8c3a8870"}, +] +stevedore = [ + {file = "stevedore-3.5.0-py3-none-any.whl", hash = "sha256:a547de73308fd7e90075bb4d301405bebf705292fa90a90fc3bcf9133f58616c"}, + {file = "stevedore-3.5.0.tar.gz", hash = "sha256:f40253887d8712eaa2bb0ea3830374416736dc8ec0e22f5a65092c1174c44335"}, +] +toml = [ + {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, + {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, +] +tomli = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] +tomlkit = [ + {file = "tomlkit-0.7.2-py2.py3-none-any.whl", hash = "sha256:173ad840fa5d2aac140528ca1933c29791b79a374a0861a80347f42ec9328117"}, + {file = "tomlkit-0.7.2.tar.gz", hash = "sha256:d7a454f319a7e9bd2e249f239168729327e4dd2d27b17dc68be264ad1ce36754"}, +] +tqdm = [ + {file = "tqdm-4.64.0-py2.py3-none-any.whl", hash = "sha256:74a2cdefe14d11442cedf3ba4e21a3b84ff9a2dbdc6cfae2c34addb2a14a5ea6"}, + {file = "tqdm-4.64.0.tar.gz", hash = "sha256:40be55d30e200777a307a7585aee69e4eabb46b4ec6a4b4a5f2d9f11e7d5408d"}, +] +tree-sitter = [ + {file = "tree_sitter-0.0.5-cp37-cp37m-macosx_10_14_x86_64.whl", hash = "sha256:43eb73e33c6fe8257b0b519c2a26cfe1656ab6631f13a9be1e4aefa9fa780f26"}, + {file = "tree_sitter-0.0.5.tar.gz", hash = "sha256:505489324e84038f53a522c61833b8d426dcd62685879b13344c4c60ec94bb2b"}, +] +typed-ast = [ + {file = "typed_ast-1.4.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:2068531575a125b87a41802130fa7e29f26c09a2833fea68d9a40cf33902eba6"}, + {file = "typed_ast-1.4.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:c907f561b1e83e93fad565bac5ba9c22d96a54e7ea0267c708bffe863cbe4075"}, + {file = "typed_ast-1.4.3-cp35-cp35m-manylinux2014_aarch64.whl", hash = "sha256:1b3ead4a96c9101bef08f9f7d1217c096f31667617b58de957f690c92378b528"}, + {file = "typed_ast-1.4.3-cp35-cp35m-win32.whl", hash = "sha256:dde816ca9dac1d9c01dd504ea5967821606f02e510438120091b84e852367428"}, + {file = "typed_ast-1.4.3-cp35-cp35m-win_amd64.whl", hash = "sha256:777a26c84bea6cd934422ac2e3b78863a37017618b6e5c08f92ef69853e765d3"}, + {file = "typed_ast-1.4.3-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:f8afcf15cc511ada719a88e013cec87c11aff7b91f019295eb4530f96fe5ef2f"}, + {file = "typed_ast-1.4.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:52b1eb8c83f178ab787f3a4283f68258525f8d70f778a2f6dd54d3b5e5fb4341"}, + {file = "typed_ast-1.4.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:01ae5f73431d21eead5015997ab41afa53aa1fbe252f9da060be5dad2c730ace"}, + {file = "typed_ast-1.4.3-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:c190f0899e9f9f8b6b7863debfb739abcb21a5c054f911ca3596d12b8a4c4c7f"}, + {file = "typed_ast-1.4.3-cp36-cp36m-win32.whl", hash = "sha256:398e44cd480f4d2b7ee8d98385ca104e35c81525dd98c519acff1b79bdaac363"}, + {file = "typed_ast-1.4.3-cp36-cp36m-win_amd64.whl", hash = "sha256:bff6ad71c81b3bba8fa35f0f1921fb24ff4476235a6e94a26ada2e54370e6da7"}, + {file = "typed_ast-1.4.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:0fb71b8c643187d7492c1f8352f2c15b4c4af3f6338f21681d3681b3dc31a266"}, + {file = "typed_ast-1.4.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:760ad187b1041a154f0e4d0f6aae3e40fdb51d6de16e5c99aedadd9246450e9e"}, + {file = "typed_ast-1.4.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:5feca99c17af94057417d744607b82dd0a664fd5e4ca98061480fd8b14b18d04"}, + {file = "typed_ast-1.4.3-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:95431a26309a21874005845c21118c83991c63ea800dd44843e42a916aec5899"}, + {file = "typed_ast-1.4.3-cp37-cp37m-win32.whl", hash = "sha256:aee0c1256be6c07bd3e1263ff920c325b59849dc95392a05f258bb9b259cf39c"}, + {file = "typed_ast-1.4.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9ad2c92ec681e02baf81fdfa056fe0d818645efa9af1f1cd5fd6f1bd2bdfd805"}, + {file = "typed_ast-1.4.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:b36b4f3920103a25e1d5d024d155c504080959582b928e91cb608a65c3a49e1a"}, + {file = "typed_ast-1.4.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:067a74454df670dcaa4e59349a2e5c81e567d8d65458d480a5b3dfecec08c5ff"}, + {file = "typed_ast-1.4.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:7538e495704e2ccda9b234b82423a4038f324f3a10c43bc088a1636180f11a41"}, + {file = "typed_ast-1.4.3-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:af3d4a73793725138d6b334d9d247ce7e5f084d96284ed23f22ee626a7b88e39"}, + {file = "typed_ast-1.4.3-cp38-cp38-win32.whl", hash = "sha256:f2362f3cb0f3172c42938946dbc5b7843c2a28aec307c49100c8b38764eb6927"}, + {file = "typed_ast-1.4.3-cp38-cp38-win_amd64.whl", hash = "sha256:dd4a21253f42b8d2b48410cb31fe501d32f8b9fbeb1f55063ad102fe9c425e40"}, + {file = "typed_ast-1.4.3-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:f328adcfebed9f11301eaedfa48e15bdece9b519fb27e6a8c01aa52a17ec31b3"}, + {file = "typed_ast-1.4.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:2c726c276d09fc5c414693a2de063f521052d9ea7c240ce553316f70656c84d4"}, + {file = "typed_ast-1.4.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:cae53c389825d3b46fb37538441f75d6aecc4174f615d048321b716df2757fb0"}, + {file = "typed_ast-1.4.3-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:b9574c6f03f685070d859e75c7f9eeca02d6933273b5e69572e5ff9d5e3931c3"}, + {file = "typed_ast-1.4.3-cp39-cp39-win32.whl", hash = "sha256:209596a4ec71d990d71d5e0d312ac935d86930e6eecff6ccc7007fe54d703808"}, + {file = "typed_ast-1.4.3-cp39-cp39-win_amd64.whl", hash = "sha256:9c6d1a54552b5330bc657b7ef0eae25d00ba7ffe85d9ea8ae6540d2197a3788c"}, + {file = "typed_ast-1.4.3.tar.gz", hash = "sha256:fb1bbeac803adea29cedd70781399c99138358c26d05fcbd23c13016b7f5ec65"}, +] +typing-extensions = [ + {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, + {file = "typing_extensions-4.2.0.tar.gz", hash = "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"}, +] +urllib3 = [ + {file = "urllib3-1.26.9-py2.py3-none-any.whl", hash = "sha256:44ece4d53fb1706f667c9bd1c648f5469a2ec925fcf3a776667042d645472c14"}, + {file = "urllib3-1.26.9.tar.gz", hash = "sha256:aabaf16477806a5e1dd19aa41f8c2b7950dd3c746362d7e3223dbe6de6ac448e"}, +] diff --git a/services/admin/poetry.toml b/services/admin/poetry.toml new file mode 100644 index 00000000..ab1033bd --- /dev/null +++ b/services/admin/poetry.toml @@ -0,0 +1,2 @@ +[virtualenvs] +in-project = true diff --git a/services/admin/pyproject.toml b/services/admin/pyproject.toml new file mode 100644 index 00000000..ba5be52f --- /dev/null +++ b/services/admin/pyproject.toml @@ -0,0 +1,44 @@ +[tool.poetry] +authors = ["Sylvain Lesage <[email protected]>"] +description = "Admin scripts" +name = "admin" +version = "0.1.0" + +[tool.poetry.dependencies] +libcache = { path = "../../libs/libcache", develop = true } +libqueue = { path = "../../libs/libqueue", develop = true } +libutils = { path = "../../libs/libutils", develop = true } +python = "3.9.6" +python-dotenv = "^0.20.0" +huggingface-hub = "^0.6.0" + +[tool.poetry.dev-dependencies] +bandit = "^1.7.0" +black = "^22.1.0" +flake8 = "^3.9.2" +isort = "^5.9.3" +mypy = "0.812" +poetryup = "^0.3.8" +pytest = "^6.2.5" +pytest-cov = "^2.12.1" +safety = "^1.10.3" + +[build-system] +build-backend = "poetry.core.masonry.api" +requires = ["poetry-core>=1.0.0"] + +[tool.pytest.ini_options] +filterwarnings = ["ignore::DeprecationWarning"] + +[tool.coverage.run] +source = ["admin"] + +[tool.isort] +profile = "black" + +[tool.black] +line-length = 119 +preview = true + +[tool.mypy] +strict = true diff --git a/services/admin/src/admin/__init__.py b/services/admin/src/admin/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/services/admin/src/admin/config.py b/services/admin/src/admin/config.py new file mode 100644 index 00000000..b1913229 --- /dev/null +++ b/services/admin/src/admin/config.py @@ -0,0 +1,21 @@ +import os + +from dotenv import load_dotenv +from libutils.utils import get_str_or_none_value, get_str_value + +from admin.constants import ( + DEFAULT_ASSETS_DIRECTORY, + DEFAULT_LOG_LEVEL, + DEFAULT_MONGO_CACHE_DATABASE, + DEFAULT_MONGO_QUEUE_DATABASE, + DEFAULT_MONGO_URL, +) + +# Load environment variables defined in .env, if any +load_dotenv() + +ASSETS_DIRECTORY = get_str_or_none_value(d=os.environ, key="ASSETS_DIRECTORY", default=DEFAULT_ASSETS_DIRECTORY) +LOG_LEVEL = get_str_value(d=os.environ, key="LOG_LEVEL", default=DEFAULT_LOG_LEVEL) +MONGO_CACHE_DATABASE = get_str_value(d=os.environ, key="MONGO_CACHE_DATABASE", default=DEFAULT_MONGO_CACHE_DATABASE) +MONGO_QUEUE_DATABASE = get_str_value(d=os.environ, key="MONGO_QUEUE_DATABASE", default=DEFAULT_MONGO_QUEUE_DATABASE) +MONGO_URL = get_str_value(d=os.environ, key="MONGO_URL", default=DEFAULT_MONGO_URL) diff --git a/services/admin/src/admin/constants.py b/services/admin/src/admin/constants.py new file mode 100644 index 00000000..2e222f74 --- /dev/null +++ b/services/admin/src/admin/constants.py @@ -0,0 +1,5 @@ +DEFAULT_ASSETS_DIRECTORY: None = None +DEFAULT_LOG_LEVEL: str = "INFO" +DEFAULT_MONGO_CACHE_DATABASE: str = "datasets_server_cache" +DEFAULT_MONGO_QUEUE_DATABASE: str = "datasets_server_queue" +DEFAULT_MONGO_URL: str = "mongodb://localhost:27018" diff --git a/services/admin/src/admin/py.typed b/services/admin/src/admin/py.typed new file mode 100644 index 00000000..e69de29b diff --git a/services/admin/src/admin/scripts/__init__.py b/services/admin/src/admin/scripts/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/services/admin/src/admin/scripts/cancel_started_dataset_jobs.py b/services/admin/src/admin/scripts/cancel_started_dataset_jobs.py new file mode 100644 index 00000000..72341444 --- /dev/null +++ b/services/admin/src/admin/scripts/cancel_started_dataset_jobs.py @@ -0,0 +1,13 @@ +import logging + +from libqueue.queue import cancel_started_dataset_jobs, connect_to_queue +from libutils.logger import init_logger + +from admin.config import LOG_LEVEL, MONGO_QUEUE_DATABASE, MONGO_URL + +if __name__ == "__main__": + init_logger(LOG_LEVEL, "cancel_started_dataset_jobs") + logger = logging.getLogger("cancel_started_dataset_jobs") + connect_to_queue(MONGO_QUEUE_DATABASE, MONGO_URL) + cancel_started_dataset_jobs() + logger.info("all the started jobs in the datasets queue have been cancelled and re-enqueued") diff --git a/services/admin/src/admin/scripts/cancel_started_split_jobs.py b/services/admin/src/admin/scripts/cancel_started_split_jobs.py new file mode 100644 index 00000000..8da2150a --- /dev/null +++ b/services/admin/src/admin/scripts/cancel_started_split_jobs.py @@ -0,0 +1,13 @@ +import logging + +from libqueue.queue import cancel_started_split_jobs, connect_to_queue +from libutils.logger import init_logger + +from admin.config import LOG_LEVEL, MONGO_QUEUE_DATABASE, MONGO_URL + +if __name__ == "__main__": + init_logger(LOG_LEVEL, "cancel_started_split_jobs") + logger = logging.getLogger("cancel_started_split_jobs") + connect_to_queue(MONGO_QUEUE_DATABASE, MONGO_URL) + cancel_started_split_jobs() + logger.info("all the started jobs in the splits queue have been cancelled and re-enqueued") diff --git a/deprecated/warm.py b/services/admin/src/admin/scripts/warm_cache.py similarity index 56% rename from deprecated/warm.py rename to services/admin/src/admin/scripts/warm_cache.py index a8935a7d..24892d11 100644 --- a/deprecated/warm.py +++ b/services/admin/src/admin/scripts/warm_cache.py @@ -1,0 +2 @@ import logging +from typing import List @@ -4 +5 @@ from dotenv import load_dotenv - +from huggingface_hub import list_datasets # type: ignore @@ -9,0 +11 @@ from libcache.cache import ( +from libqueue.queue import add_dataset_job, add_split_job, connect_to_queue @@ -11,4 +13,6 @@ from libutils.logger import init_logger -from libqueue.queue import ( - add_dataset_job, - add_split_job, - connect_to_queue, + +from admin.config import ( + LOG_LEVEL, + MONGO_CACHE_DATABASE, + MONGO_QUEUE_DATABASE, + MONGO_URL, @@ -16 +19,0 @@ from libqueue.queue import ( -from libmodels.hf_dataset import get_hf_dataset_names @@ -22,3 +25,6 @@ load_dotenv() -def warm() -> None: - logger = logging.getLogger("warm") - dataset_names = get_hf_dataset_names() +def get_hf_dataset_names(): + return [str(dataset.id) for dataset in list_datasets(full=True)] + + +def warm_cache(dataset_names: List[str]) -> None: + logger = logging.getLogger("warm_cache") @@ -26 +31,0 @@ def warm() -> None: - split_full_names = list_split_full_names_to_refresh(dataset_name) @@ -30 +35 @@ def warm() -> None: - elif split_full_names: + elif split_full_names := list_split_full_names_to_refresh(dataset_name): @@ -45,4 +50,6 @@ if __name__ == "__main__": - init_logger("INFO", "warm") - connect_to_cache() - connect_to_queue() - warm() + init_logger(LOG_LEVEL, "warm_cache") + logger = logging.getLogger("warm_cache") + connect_to_cache(MONGO_CACHE_DATABASE, MONGO_URL) + connect_to_queue(MONGO_QUEUE_DATABASE, MONGO_URL) + warm_cache(get_hf_dataset_names()) + logger.info("all the missing datasets have been added to the queue") diff --git a/services/admin/tests/__init__.py b/services/admin/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/services/admin/tests/docker-compose.yml b/services/admin/tests/docker-compose.yml new file mode 100644 index 00000000..459d2d4d --- /dev/null +++ b/services/admin/tests/docker-compose.yml @@ -0,0 +1,10 @@ +version: "3.9" +services: + mongodb-test: + image: mongo + volumes: + - mongo-test:/data/db:rw + ports: + - 27018:27017 +volumes: + mongo-test: diff --git a/services/admin/tests/scripts/test_warm_cache.py b/services/admin/tests/scripts/test_warm_cache.py new file mode 100644 index 00000000..62d129f9 --- /dev/null +++ b/services/admin/tests/scripts/test_warm_cache.py @@ -0,0 +1,8 @@ +from admin.scripts.warm_cache import get_hf_dataset_names + + +# get_dataset_names +def test_get_hf_dataset_names() -> None: + dataset_names = get_hf_dataset_names() + assert len(dataset_names) > 1000 + assert "glue" in dataset_names
7d882064803ba39935205f01bbe53c1b84bd2aa8
Sylvain Lesage
2022-05-17T07:50:25
fix: 🐛 fix nfs mount (#274)
diff --git a/infra/charts/datasets-server/env/prod.yaml b/infra/charts/datasets-server/env/prod.yaml index 047e1db6..072c7687 100644 --- a/infra/charts/datasets-server/env/prod.yaml +++ b/infra/charts/datasets-server/env/prod.yaml @@ -80,0 +81,3 @@ api: + nodeSelector: + role-datasets-server: 'true' + @@ -89,0 +93,3 @@ datasetsWorker: + nodeSelector: + role-datasets-server: 'true' + @@ -98,0 +105,3 @@ splitsWorker: + nodeSelector: + role-datasets-server: 'true' +