From 19480f8b46fa91217081cdb0b87bebc383e777de Mon Sep 17 00:00:00 2001 From: Matthieu Leboeuf Date: Tue, 16 Sep 2025 09:58:31 +0200 Subject: [PATCH 1/6] Upgrade python versions --- .github/workflows/ci.yml | 2 +- .github/workflows/python-package.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52ae5769..63b1fb9c 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.10', '3.11', '3.12'] steps: - name: Check out repo diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 541fd5cb..11d52dfc 100755 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8] + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 From ea762ca68e4cd26d4d14033ce347df7a3f64c7d0 Mon Sep 17 00:00:00 2001 From: Matthieu Leboeuf Date: Tue, 16 Sep 2025 10:05:19 +0200 Subject: [PATCH 2/6] fix flake8 errors --- netbox_proxbox/views/proxbox_backend.py | 1 + netbox_proxbox/views/sync.py | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/netbox_proxbox/views/proxbox_backend.py b/netbox_proxbox/views/proxbox_backend.py index f94f4247..7282bc69 100644 --- a/netbox_proxbox/views/proxbox_backend.py +++ b/netbox_proxbox/views/proxbox_backend.py @@ -1,5 +1,6 @@ from django.views import View from django.shortcuts import render, redirect +import subprocess try: from netbox import configuration diff --git a/netbox_proxbox/views/sync.py b/netbox_proxbox/views/sync.py index a0a672c8..e68b087e 100644 --- a/netbox_proxbox/views/sync.py +++ b/netbox_proxbox/views/sync.py @@ -19,8 +19,6 @@ class HtmxHttpRequest(HttpRequest): htmx: HtmxDetails -CONNECTED_URL_SUCCESSFUL = None - fastapi_service_obj = None # Get the first FastAPI Endpoint object try: @@ -35,7 +33,6 @@ class HtmxHttpRequest(HttpRequest): fastapi_verify_ssl: bool = fastapi_detail.get('verify_ssl', True) def sync_resource(request: HtmxHttpRequest, path: str, template_name: str, query_params: dict = None) -> HttpResponse: - global CONNECTED_URL_SUCCESSFUL fastapi_path: str = f'{fastapi_url}/{path}' if fastapi_url else None @@ -47,7 +44,6 @@ def make_request(): response = requests.get(fastapi_path, params=query_params, verify=fastapi_verify_ssl) if response.ok: print(f'FastAPI response: {response.json()}') - CONNECTED_URL_SUCCESSFUL = fastapi_url else: response.raise_for_status() except Exception as errr: @@ -58,7 +54,6 @@ def make_request(): print(f'Trying to connect to FastAPI using the IP address and port: {fastapi_detail.get("ip_address_url")}') response = requests.get(fastapi_detail.get('ip_address_url') + f'/{path}', params=query_params, verify=False) print(f'FastAPI response: {response.json()}') - CONNECTED_URL_SUCCESSFUL = fastapi_detail.get('ip_address_url') except Exception as errr: print(f'Error occurred: {errr}') raise From 9024783ee975982c4c61800826a255f0d75d079a Mon Sep 17 00:00:00 2001 From: Matthieu Leboeuf Date: Tue, 16 Sep 2025 10:09:42 +0200 Subject: [PATCH 3/6] fix flake8 errors --- netbox_proxbox/views/sync.py | 6 +++++- netbox_proxbox/websocket_client.py | 2 -- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/netbox_proxbox/views/sync.py b/netbox_proxbox/views/sync.py index e68b087e..e4d64563 100644 --- a/netbox_proxbox/views/sync.py +++ b/netbox_proxbox/views/sync.py @@ -19,6 +19,8 @@ class HtmxHttpRequest(HttpRequest): htmx: HtmxDetails +CONNECTED_URL_SUCCESSFUL = None + fastapi_service_obj = None # Get the first FastAPI Endpoint object try: @@ -33,17 +35,18 @@ class HtmxHttpRequest(HttpRequest): fastapi_verify_ssl: bool = fastapi_detail.get('verify_ssl', True) def sync_resource(request: HtmxHttpRequest, path: str, template_name: str, query_params: dict = None) -> HttpResponse: - fastapi_path: str = f'{fastapi_url}/{path}' if fastapi_url else None if not fastapi_url: return HttpResponse(status=404, content='No FastAPI URL found') def make_request(): + global CONNECTED_URL_SUCCESSFUL try: response = requests.get(fastapi_path, params=query_params, verify=fastapi_verify_ssl) if response.ok: print(f'FastAPI response: {response.json()}') + CONNECTED_URL_SUCCESSFUL = fastapi_url else: response.raise_for_status() except Exception as errr: @@ -54,6 +57,7 @@ def make_request(): print(f'Trying to connect to FastAPI using the IP address and port: {fastapi_detail.get("ip_address_url")}') response = requests.get(fastapi_detail.get('ip_address_url') + f'/{path}', params=query_params, verify=False) print(f'FastAPI response: {response.json()}') + CONNECTED_URL_SUCCESSFUL = fastapi_detail.get('ip_address_url') except Exception as errr: print(f'Error occurred: {errr}') raise diff --git a/netbox_proxbox/websocket_client.py b/netbox_proxbox/websocket_client.py index 2cf9a89c..27190c7a 100644 --- a/netbox_proxbox/websocket_client.py +++ b/netbox_proxbox/websocket_client.py @@ -75,7 +75,6 @@ def start_websocket(uri): print('WebSocket task started.') def stop_websocket(): - global websocket_task if websocket_task: websocket_task.cancel() print('WebSocket task stopped.') @@ -100,7 +99,6 @@ def get(self, request, message): bulk_messages_count = 20 # Declare the global variable to store the messages global GLOBAL_WEBSOCKET_MESSAGES - global websocket_task # Ensure thread safety for message access with websocket_lock: From e9bbed992d6e6ecebfac1b4e2e4f49e9c5c35ffb Mon Sep 17 00:00:00 2001 From: Matthieu Leboeuf Date: Tue, 16 Sep 2025 10:12:43 +0200 Subject: [PATCH 4/6] fix docs ci with actions/cache --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e72d1d62..deca508b 100755 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.x - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: key: ${{ github.ref }} path: .cache From 1d3e1167d053bed29a64738c919eb13d67c04a4f Mon Sep 17 00:00:00 2001 From: Matthieu Leboeuf Date: Tue, 16 Sep 2025 10:17:39 +0200 Subject: [PATCH 5/6] add missing mkdocstrings dep --- .github/workflows/docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index deca508b..ce436acd 100755 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -29,6 +29,7 @@ jobs: sudo pip3 install mkdocs-minify-plugin sudo pip3 install mkdocs-redirects sudo pip3 install pillow cairosvg + sudo pip3 install mkdocstrings-python - name: Deploy MkDocs Page run: sudo mkdocs gh-deploy --force - name: Git Commit staged From 70378cadf7f61017ff85287cbed006cd12ba7493 Mon Sep 17 00:00:00 2001 From: Matthieu Leboeuf Date: Tue, 16 Sep 2025 10:27:42 +0200 Subject: [PATCH 6/6] Disable docs ci part not required --- .github/workflows/docs.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index ce436acd..ce33a2b2 100755 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -32,19 +32,19 @@ jobs: sudo pip3 install mkdocstrings-python - name: Deploy MkDocs Page run: sudo mkdocs gh-deploy --force - - name: Git Commit staged - run: | - sudo git config --global --add user.name emersonfelipesp - sudo git config --global --add user.email emersonfelipe.2003@gmail.com - sudo git add . - sudo git commit -m "Saves 'site' html pages" - - name: Git checkout to 'gh-pages' branch - run: | - sudo git checkout gh-pages - sudo git push --set-upstream origin gh-pages - - name: Change custom domain - run: | - sudo echo 'proxbox.netbox.dev.br' > CNAME - sudo git add CNAME - sudo git commit -m "Change custom domain to 'proxbox.netbox.dev.br'" - sudo git push + # - name: Git Commit staged + # run: | + # sudo git config --global --add user.name emersonfelipesp + # sudo git config --global --add user.email emersonfelipe.2003@gmail.com + # sudo git add . + # sudo git commit -m "Saves 'site' html pages" + # - name: Git checkout to 'gh-pages' branch + # run: | + # sudo git checkout gh-pages + # sudo git push --set-upstream origin gh-pages + # - name: Change custom domain + # run: | + # sudo echo 'proxbox.netbox.dev.br' > CNAME + # sudo git add CNAME + # sudo git commit -m "Change custom domain to 'proxbox.netbox.dev.br'" + # sudo git push