From a523f4d2b16212985bd81c3ccb360fa292138dcd Mon Sep 17 00:00:00 2001 From: oliver Date: Thu, 10 Oct 2024 14:13:40 +0200 Subject: [PATCH] 0.0.73 --- .github/workflows/gh_release.yml | 4 ++-- .../requirements-lucit_ubdcc_dcn.txt | 2 +- .../requirements-lucit_ubdcc_mgmt.txt | 2 +- .../requirements-lucit_ubdcc_restapi.txt | 2 +- dev/docker/lucit-ubdcc-dcn-latest.sh | 2 +- dev/docker/lucit-ubdcc-dcn.sh | 2 +- dev/docker/lucit-ubdcc-mgmt-latest.sh | 2 +- dev/docker/lucit-ubdcc-mgmt.sh | 2 +- dev/docker/lucit-ubdcc-restapi-latest.sh | 2 +- dev/docker/lucit-ubdcc-restapi.sh | 2 +- dev/set_version_config.yml | 2 +- packages/lucit-ubdcc-dcn/pyproject.toml | 4 ++-- packages/lucit-ubdcc-dcn/requirements.txt | 2 +- packages/lucit-ubdcc-dcn/setup.py | 4 ++-- packages/lucit-ubdcc-mgmt/pyproject.toml | 4 ++-- packages/lucit-ubdcc-mgmt/requirements.txt | 2 +- packages/lucit-ubdcc-mgmt/setup.py | 4 ++-- packages/lucit-ubdcc-restapi/pyproject.toml | 4 ++-- packages/lucit-ubdcc-restapi/requirements.txt | 2 +- packages/lucit-ubdcc-restapi/setup.py | 4 ++-- .../lucit_ubdcc_shared_modules/App.py | 24 ++++--------------- .../lucit-ubdcc-shared-modules/pyproject.toml | 2 +- packages/lucit-ubdcc-shared-modules/setup.py | 2 +- 23 files changed, 33 insertions(+), 49 deletions(-) diff --git a/.github/workflows/gh_release.yml b/.github/workflows/gh_release.yml index b74f2eb..a882093 100644 --- a/.github/workflows/gh_release.yml +++ b/.github/workflows/gh_release.yml @@ -16,8 +16,8 @@ jobs: - name: Create GitHub Release uses: softprops/action-gh-release@v1 with: - tag_name: 0.0.72 - name: Release 0.0.72 + tag_name: 0.0.73 + name: Release 0.0.73 body: | Please read the [CHANGELOG](https://unicorn-binance-depthcache-cluster.docs.lucit.tech/changelog.html) for further information. draft: false diff --git a/container/generic_loader/requirements-lucit_ubdcc_dcn.txt b/container/generic_loader/requirements-lucit_ubdcc_dcn.txt index 736436d..cf953a3 100644 --- a/container/generic_loader/requirements-lucit_ubdcc_dcn.txt +++ b/container/generic_loader/requirements-lucit_ubdcc_dcn.txt @@ -1,2 +1,2 @@ -lucit-ubdcc-dcn==0.0.72 +lucit-ubdcc-dcn==0.0.73 unicorn_binance_local_depth_cache>=2.1.1 \ No newline at end of file diff --git a/container/generic_loader/requirements-lucit_ubdcc_mgmt.txt b/container/generic_loader/requirements-lucit_ubdcc_mgmt.txt index 9dc6ea9..d29e90b 100644 --- a/container/generic_loader/requirements-lucit_ubdcc_mgmt.txt +++ b/container/generic_loader/requirements-lucit_ubdcc_mgmt.txt @@ -1 +1 @@ -lucit-ubdcc-mgmt==0.0.72 \ No newline at end of file +lucit-ubdcc-mgmt==0.0.73 \ No newline at end of file diff --git a/container/generic_loader/requirements-lucit_ubdcc_restapi.txt b/container/generic_loader/requirements-lucit_ubdcc_restapi.txt index b036fc9..18980d8 100644 --- a/container/generic_loader/requirements-lucit_ubdcc_restapi.txt +++ b/container/generic_loader/requirements-lucit_ubdcc_restapi.txt @@ -1 +1 @@ -lucit-ubdcc-restapi==0.0.72 \ No newline at end of file +lucit-ubdcc-restapi==0.0.73 \ No newline at end of file diff --git a/dev/docker/lucit-ubdcc-dcn-latest.sh b/dev/docker/lucit-ubdcc-dcn-latest.sh index 79ef1e1..58d957a 100755 --- a/dev/docker/lucit-ubdcc-dcn-latest.sh +++ b/dev/docker/lucit-ubdcc-dcn-latest.sh @@ -2,7 +2,7 @@ set -e -VERSION="0.0.72-latest" +VERSION="0.0.73-latest" echo Deploying UBDCC DepthCacheCluster $VERSION to https://i018oau9.c1.de1.container-registry.ovh.net/harbor/projects/3/repositories diff --git a/dev/docker/lucit-ubdcc-dcn.sh b/dev/docker/lucit-ubdcc-dcn.sh index 4e181c0..24b7cff 100755 --- a/dev/docker/lucit-ubdcc-dcn.sh +++ b/dev/docker/lucit-ubdcc-dcn.sh @@ -2,7 +2,7 @@ set -e -VERSION="0.0.72" +VERSION="0.0.73" echo Deploying UBDCC DepthCacheCluster $VERSION to https://i018oau9.c1.de1.container-registry.ovh.net/harbor/projects/3/repositories diff --git a/dev/docker/lucit-ubdcc-mgmt-latest.sh b/dev/docker/lucit-ubdcc-mgmt-latest.sh index 7500a78..9cea2ef 100755 --- a/dev/docker/lucit-ubdcc-mgmt-latest.sh +++ b/dev/docker/lucit-ubdcc-mgmt-latest.sh @@ -2,7 +2,7 @@ set -e -VERSION="0.0.72-latest" +VERSION="0.0.73-latest" echo Deploying UBDCC Mgmt $VERSION to https://i018oau9.c1.de1.container-registry.ovh.net/harbor/projects/3/repositories diff --git a/dev/docker/lucit-ubdcc-mgmt.sh b/dev/docker/lucit-ubdcc-mgmt.sh index 5de3cf3..32a2c45 100755 --- a/dev/docker/lucit-ubdcc-mgmt.sh +++ b/dev/docker/lucit-ubdcc-mgmt.sh @@ -2,7 +2,7 @@ set -e -VERSION="0.0.72" +VERSION="0.0.73" echo Deploying UBDCC Mgmt $VERSION to https://i018oau9.c1.de1.container-registry.ovh.net/harbor/projects/3/repositories diff --git a/dev/docker/lucit-ubdcc-restapi-latest.sh b/dev/docker/lucit-ubdcc-restapi-latest.sh index c4efca4..7b071fb 100755 --- a/dev/docker/lucit-ubdcc-restapi-latest.sh +++ b/dev/docker/lucit-ubdcc-restapi-latest.sh @@ -2,7 +2,7 @@ set -e -VERSION="0.0.72-latest" +VERSION="0.0.73-latest" echo Deploying UBDCC RESTAPI $VERSION to https://i018oau9.c1.de1.container-registry.ovh.net/harbor/projects/3/repositories diff --git a/dev/docker/lucit-ubdcc-restapi.sh b/dev/docker/lucit-ubdcc-restapi.sh index b7f04c0..a2db365 100755 --- a/dev/docker/lucit-ubdcc-restapi.sh +++ b/dev/docker/lucit-ubdcc-restapi.sh @@ -2,7 +2,7 @@ set -e -VERSION="0.0.72" +VERSION="0.0.73" echo Deploying UBDCC RESTAPI $VERSION to https://i018oau9.c1.de1.container-registry.ovh.net/harbor/projects/3/repositories diff --git a/dev/set_version_config.yml b/dev/set_version_config.yml index 1c8ab8b..0800050 100644 --- a/dev/set_version_config.yml +++ b/dev/set_version_config.yml @@ -23,4 +23,4 @@ files: - packages/lucit-ubdcc-shared-modules/lucit_ubdcc_shared_modules/App.py - packages/lucit-ubdcc-shared-modules/pyproject.toml - packages/lucit-ubdcc-shared-modules/setup.py -version: 0.0.72 +version: 0.0.73 diff --git a/packages/lucit-ubdcc-dcn/pyproject.toml b/packages/lucit-ubdcc-dcn/pyproject.toml index 414599e..b574dfa 100644 --- a/packages/lucit-ubdcc-dcn/pyproject.toml +++ b/packages/lucit-ubdcc-dcn/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "lucit-ubdcc-dcn" -version = "0.0.72" +version = "0.0.73" description = "LUCIT UBDCC DepthCacheNode" authors = ["LUCIT Systems and Development "] license = "LSOSL - LUCIT Synergetic Open Source License" @@ -25,7 +25,7 @@ repository = "https://github.com/LUCIT-Systems-and-Development/unicorn-binance-d [tool.poetry.dependencies] python = ">=3.12.0" lucit-licensing-python = ">=1.8.2" -lucit-ubdcc-shared-modules = "==0.0.72" +lucit-ubdcc-shared-modules = "==0.0.73" [tool.poetry.dev-dependencies] diff --git a/packages/lucit-ubdcc-dcn/requirements.txt b/packages/lucit-ubdcc-dcn/requirements.txt index c12cc19..30e77bb 100644 --- a/packages/lucit-ubdcc-dcn/requirements.txt +++ b/packages/lucit-ubdcc-dcn/requirements.txt @@ -1,2 +1,2 @@ -lucit-ubdcc-shared-modules==0.0.72 +lucit-ubdcc-shared-modules==0.0.73 unicorn_binance_local_depth_cache>=2.1.1 diff --git a/packages/lucit-ubdcc-dcn/setup.py b/packages/lucit-ubdcc-dcn/setup.py index 2278dd1..e3795e8 100644 --- a/packages/lucit-ubdcc-dcn/setup.py +++ b/packages/lucit-ubdcc-dcn/setup.py @@ -31,7 +31,7 @@ setup( name=name, - version="0.0.72", + version="0.0.73", author="LUCIT Systems and Development", author_email='info@lucit.tech', url="https://github.com/LUCIT-Systems-and-Development/unicorn-binance-depthcache-cluster", @@ -39,7 +39,7 @@ long_description=long_description, long_description_content_type="text/markdown", license='LSOSL - LUCIT Synergetic Open Source License', - install_requires=['lucit-licensing-python>=1.8.2', 'lucit-ubdcc-shared-modules==0.0.72'], + install_requires=['lucit-licensing-python>=1.8.2', 'lucit-ubdcc-shared-modules==0.0.73'], keywords='', project_urls={ 'Howto': 'https://www.lucit.tech/unicorn-binance-depthcache-cluster.html#howto', diff --git a/packages/lucit-ubdcc-mgmt/pyproject.toml b/packages/lucit-ubdcc-mgmt/pyproject.toml index 489bea9..ab543e3 100644 --- a/packages/lucit-ubdcc-mgmt/pyproject.toml +++ b/packages/lucit-ubdcc-mgmt/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "lucit-ubdcc-mgmt" -version = "0.0.72" +version = "0.0.73" description = "LUCIT UBDCC Mgmt Service" authors = ["LUCIT Systems and Development "] license = "LSOSL - LUCIT Synergetic Open Source License" @@ -25,7 +25,7 @@ repository = "https://github.com/LUCIT-Systems-and-Development/unicorn-binance-d [tool.poetry.dependencies] python = ">=3.12.0" lucit-licensing-python = ">=1.8.2" -lucit-ubdcc-shared-modules = "==0.0.72" +lucit-ubdcc-shared-modules = "==0.0.73" [tool.poetry.dev-dependencies] diff --git a/packages/lucit-ubdcc-mgmt/requirements.txt b/packages/lucit-ubdcc-mgmt/requirements.txt index 034073d..ab71e4c 100644 --- a/packages/lucit-ubdcc-mgmt/requirements.txt +++ b/packages/lucit-ubdcc-mgmt/requirements.txt @@ -1 +1 @@ -lucit-ubdcc-shared-modules==0.0.72 \ No newline at end of file +lucit-ubdcc-shared-modules==0.0.73 \ No newline at end of file diff --git a/packages/lucit-ubdcc-mgmt/setup.py b/packages/lucit-ubdcc-mgmt/setup.py index 0abc343..922ca19 100644 --- a/packages/lucit-ubdcc-mgmt/setup.py +++ b/packages/lucit-ubdcc-mgmt/setup.py @@ -31,7 +31,7 @@ setup( name=name, - version="0.0.72", + version="0.0.73", author="LUCIT Systems and Development", author_email='info@lucit.tech', url="https://github.com/LUCIT-Systems-and-Development/unicorn-binance-depthcache-cluster", @@ -39,7 +39,7 @@ long_description=long_description, long_description_content_type="text/markdown", license='LSOSL - LUCIT Synergetic Open Source License', - install_requires=['lucit-licensing-python>=1.8.2', 'lucit-ubdcc-shared-modules==0.0.72'], + install_requires=['lucit-licensing-python>=1.8.2', 'lucit-ubdcc-shared-modules==0.0.73'], keywords='', project_urls={ 'Howto': 'https://www.lucit.tech/unicorn-binance-depthcache-cluster.html#howto', diff --git a/packages/lucit-ubdcc-restapi/pyproject.toml b/packages/lucit-ubdcc-restapi/pyproject.toml index e410eec..94e9143 100644 --- a/packages/lucit-ubdcc-restapi/pyproject.toml +++ b/packages/lucit-ubdcc-restapi/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "lucit-ubdcc-restapi" -version = "0.0.72" +version = "0.0.73" description = "LUCIT UBDCC REST API" authors = ["LUCIT Systems and Development "] license = "LSOSL - LUCIT Synergetic Open Source License" @@ -25,7 +25,7 @@ repository = "https://github.com/LUCIT-Systems-and-Development/unicorn-binance-d [tool.poetry.dependencies] python = ">=3.12.0" lucit-licensing-python = ">=1.8.2" -lucit-ubdcc-shared-modules = "==0.0.72" +lucit-ubdcc-shared-modules = "==0.0.73" [tool.poetry.dev-dependencies] diff --git a/packages/lucit-ubdcc-restapi/requirements.txt b/packages/lucit-ubdcc-restapi/requirements.txt index 034073d..ab71e4c 100644 --- a/packages/lucit-ubdcc-restapi/requirements.txt +++ b/packages/lucit-ubdcc-restapi/requirements.txt @@ -1 +1 @@ -lucit-ubdcc-shared-modules==0.0.72 \ No newline at end of file +lucit-ubdcc-shared-modules==0.0.73 \ No newline at end of file diff --git a/packages/lucit-ubdcc-restapi/setup.py b/packages/lucit-ubdcc-restapi/setup.py index 42ff0fa..7650e16 100644 --- a/packages/lucit-ubdcc-restapi/setup.py +++ b/packages/lucit-ubdcc-restapi/setup.py @@ -31,7 +31,7 @@ setup( name=name, - version="0.0.72", + version="0.0.73", author="LUCIT Systems and Development", author_email='info@lucit.tech', url="https://github.com/LUCIT-Systems-and-Development/unicorn-binance-depthcache-cluster", @@ -39,7 +39,7 @@ long_description=long_description, long_description_content_type="text/markdown", license='LSOSL - LUCIT Synergetic Open Source License', - install_requires=['lucit-licensing-python>=1.8.2', 'lucit-ubdcc-shared-modules==0.0.72'], + install_requires=['lucit-licensing-python>=1.8.2', 'lucit-ubdcc-shared-modules==0.0.73'], keywords='', project_urls={ 'Howto': 'https://www.lucit.tech/unicorn-binance-depthcache-cluster.html#howto', diff --git a/packages/lucit-ubdcc-shared-modules/lucit_ubdcc_shared_modules/App.py b/packages/lucit-ubdcc-shared-modules/lucit_ubdcc_shared_modules/App.py index b20f2f3..778f9a6 100644 --- a/packages/lucit-ubdcc-shared-modules/lucit_ubdcc_shared_modules/App.py +++ b/packages/lucit-ubdcc-shared-modules/lucit_ubdcc_shared_modules/App.py @@ -43,7 +43,7 @@ REST_SERVER_PORT_DEV_DCN: int = 42082 REST_SERVER_PORT_DEV_MGMT: int = 42080 REST_SERVER_PORT_DEV_RESTAPI: int = 42081 -VERSION: str = "0.0.72" +VERSION: str = "0.0.73" class App: @@ -282,22 +282,6 @@ async def request(url, method, params=None, headers=None, timeout=10) -> dict: print(f"An error occurred: {error_msg}") return {"error": str(error_msg)} - @staticmethod - def request_synchronous(url, method, params=None, headers=None, timeout=10) -> dict: - try: - if method == "get": - response = requests.get(url, params=params, headers=headers, timeout=timeout) - elif method == "post": - response = requests.post(url, json=json.dumps(params), - headers={"Content-Type": "application/json"}) - else: - raise ValueError("Allowed 'method' values: get, post") - response.raise_for_status() - return response.json() - except requests.exceptions.RequestException as error_msg: - print(f"An error occurred: {error_msg}") - return {"error": error_msg} - async def send_backup_to_node(self, host, port) -> dict: return await self.request(f"http://{host}:{port}/ubdcc_mgmt_backup", method="post", params=self.data['db'].get_backup_dict()) @@ -396,7 +380,7 @@ def start(self) -> None: if self.llm is not None: self.llm.close() else: - self.ubdcc_node_cancellation() + asyncio.run(self.ubdcc_node_cancellation()) if exception_shutdown is True: if exception_shutdown_error: self.stdout_msg(f"ERROR: {exception_shutdown_error}", log="critical") @@ -467,13 +451,13 @@ async def ubdcc_get_responsible_dcn_addresses(self, self.stdout_msg(f"Can not catch responsible DCN addresses: {result}", log="error") return None - def ubdcc_node_cancellation(self): + async def ubdcc_node_cancellation(self): self.stdout_msg(f"Cancel node registration ...", log="info") endpoint = "/ubdcc_node_cancellation" host = self.get_cluster_mgmt_address() query = f"?uid={self.id['uid']}" url = host + endpoint + query - result = self.request_synchronous(url=url, method="get") + result = await self.request(url=url, method="get") if result.get('error_id') is None and result.get('error') is None: self.stdout_msg(f"Node cancellation successful!", log="info") return True diff --git a/packages/lucit-ubdcc-shared-modules/pyproject.toml b/packages/lucit-ubdcc-shared-modules/pyproject.toml index 441bc2b..690f96c 100644 --- a/packages/lucit-ubdcc-shared-modules/pyproject.toml +++ b/packages/lucit-ubdcc-shared-modules/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "lucit-ubdcc-shared-modules" -version = "0.0.72" +version = "0.0.73" description = "LUCIT UBDCC Shared Modules" authors = ["LUCIT Systems and Development "] license = "LSOSL - LUCIT Synergetic Open Source License" diff --git a/packages/lucit-ubdcc-shared-modules/setup.py b/packages/lucit-ubdcc-shared-modules/setup.py index 6954039..ca4ec35 100644 --- a/packages/lucit-ubdcc-shared-modules/setup.py +++ b/packages/lucit-ubdcc-shared-modules/setup.py @@ -31,7 +31,7 @@ setup( name=name, - version="0.0.72", + version="0.0.73", author="LUCIT Systems and Development", author_email='info@lucit.tech', url="https://github.com/LUCIT-Systems-and-Development/unicorn-binance-depthcache-cluster",