Compare commits
No commits in common. "ffcf0d084e54a362f7979f428032fd683af08501" and "68645b95cc0de9985edeefccc50a759e8c6b8bed" have entirely different histories.
ffcf0d084e
...
68645b95cc
@ -1,11 +0,0 @@
|
|||||||
# https://packages.debian.org/hu/
|
|
||||||
fastapi==0.92.0
|
|
||||||
uvicorn[standard]==0.17.6
|
|
||||||
python-jose[pycryptodome]==3.3.0
|
|
||||||
pycryptodome==3.11.0
|
|
||||||
python-dateutil==2.8.2
|
|
||||||
sqlalchemy==1.4.46
|
|
||||||
markdown==3.4.1
|
|
||||||
python-dotenv==0.21.0
|
|
||||||
jinja2==3.1.2
|
|
||||||
httpx==0.23.3
|
|
@ -1,10 +0,0 @@
|
|||||||
# https://packages.ubuntu.com
|
|
||||||
fastapi==0.91.0
|
|
||||||
uvicorn[standard]==0.15.0
|
|
||||||
python-jose[pycryptodome]==3.3.0
|
|
||||||
pycryptodome==3.11.0
|
|
||||||
python-dateutil==2.8.2
|
|
||||||
sqlalchemy==1.4.46
|
|
||||||
markdown==3.4.3
|
|
||||||
python-dotenv==0.21.0
|
|
||||||
jinja2==3.1.2
|
|
@ -1,10 +0,0 @@
|
|||||||
# https://packages.ubuntu.com
|
|
||||||
fastapi==0.101.0
|
|
||||||
uvicorn[standard]==0.23.2
|
|
||||||
python-jose[pycryptodome]==3.3.0
|
|
||||||
pycryptodome==3.11.0
|
|
||||||
python-dateutil==2.8.2
|
|
||||||
sqlalchemy==1.4.47
|
|
||||||
markdown==3.4.4
|
|
||||||
python-dotenv==1.0.0
|
|
||||||
jinja2==3.1.2
|
|
@ -12,7 +12,7 @@ depends=('python' 'python-jose' 'python-starlette' 'python-httpx' 'python-fastap
|
|||||||
provider=("$pkgname")
|
provider=("$pkgname")
|
||||||
install="$pkgname.install"
|
install="$pkgname.install"
|
||||||
backup=('etc/default/fastapi-dls')
|
backup=('etc/default/fastapi-dls')
|
||||||
source=("git+file://${CI_PROJECT_DIR}"
|
source=('git+file:///builds/oscar.krause/fastapi-dls' # https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
|
||||||
"$pkgname.default"
|
"$pkgname.default"
|
||||||
"$pkgname.service"
|
"$pkgname.service"
|
||||||
"$pkgname.tmpfiles")
|
"$pkgname.tmpfiles")
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
version: "2"
|
|
||||||
plugins:
|
plugins:
|
||||||
bandit:
|
bandit:
|
||||||
enabled: true
|
enabled: true
|
||||||
sonar-python:
|
sonar-python:
|
||||||
enabled: true
|
enabled: true
|
||||||
config:
|
pylint:
|
||||||
tests_patterns:
|
enabled: true
|
||||||
- test/**
|
|
||||||
|
@ -8,9 +8,6 @@ include:
|
|||||||
cache:
|
cache:
|
||||||
key: one-key-to-rule-them-all
|
key: one-key-to-rule-them-all
|
||||||
|
|
||||||
variables:
|
|
||||||
DOCKER_BUILDX_PLATFORM: "linux/amd64,linux/arm64"
|
|
||||||
|
|
||||||
build:docker:
|
build:docker:
|
||||||
image: docker:dind
|
image: docker:dind
|
||||||
interruptible: true
|
interruptible: true
|
||||||
@ -29,7 +26,7 @@ build:docker:
|
|||||||
script:
|
script:
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
- IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
|
- IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
|
||||||
- docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE --push .
|
- docker buildx build --progress=plain --platform linux/amd64,linux/arm64 --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE --push .
|
||||||
- docker buildx imagetools inspect $IMAGE
|
- docker buildx imagetools inspect $IMAGE
|
||||||
- echo "CS_IMAGE=$IMAGE" > container_scanning.env
|
- echo "CS_IMAGE=$IMAGE" > container_scanning.env
|
||||||
artifacts:
|
artifacts:
|
||||||
@ -127,28 +124,16 @@ build:pacman:
|
|||||||
- "*.pkg.tar.zst"
|
- "*.pkg.tar.zst"
|
||||||
|
|
||||||
test:
|
test:
|
||||||
image: python:3.11-slim-bookworm
|
image: python:3.11-slim-bullseye
|
||||||
stage: test
|
stage: test
|
||||||
interruptible: true
|
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
- if: $CI_COMMIT_BRANCH
|
||||||
- if: $CI_COMMIT_TAG
|
- if: $CI_COMMIT_TAG
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
- if: $CI_COMMIT_BRANCH && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
|
|
||||||
changes:
|
|
||||||
- app/**/*
|
|
||||||
- test/**/*
|
|
||||||
variables:
|
variables:
|
||||||
DATABASE: sqlite:///../app/db.sqlite
|
DATABASE: sqlite:///../app/db.sqlite
|
||||||
parallel:
|
|
||||||
matrix:
|
|
||||||
- REQUIREMENTS:
|
|
||||||
- requirements.txt
|
|
||||||
- .DEBIAN/requirements-bookworm-12.txt
|
|
||||||
- .DEBIAN/requirements-ubuntu-23.10.txt
|
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update && apt-get install -y python3-dev gcc
|
- pip install -r requirements.txt
|
||||||
- pip install -r $REQUIREMENTS
|
|
||||||
- pip install pytest httpx
|
- pip install pytest httpx
|
||||||
- mkdir -p app/cert
|
- mkdir -p app/cert
|
||||||
- openssl genrsa -out app/cert/instance.private.pem 2048
|
- openssl genrsa -out app/cert/instance.private.pem 2048
|
||||||
@ -206,7 +191,7 @@ test:debian:
|
|||||||
|
|
||||||
test:ubuntu:
|
test:ubuntu:
|
||||||
extends: .test:linux
|
extends: .test:linux
|
||||||
image: ubuntu:23.10
|
image: ubuntu:22.10
|
||||||
|
|
||||||
test:archlinux:
|
test:archlinux:
|
||||||
image: archlinux:base
|
image: archlinux:base
|
||||||
@ -224,13 +209,10 @@ test:archlinux:
|
|||||||
- pacman -U --noconfirm *.pkg.tar.zst
|
- pacman -U --noconfirm *.pkg.tar.zst
|
||||||
|
|
||||||
code_quality:
|
code_quality:
|
||||||
variables:
|
|
||||||
SOURCE_CODE: app
|
|
||||||
rules:
|
rules:
|
||||||
- if: $CODE_QUALITY_DISABLED
|
- if: $CODE_QUALITY_DISABLED
|
||||||
when: never
|
when: never
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
|
|
||||||
secret_detection:
|
secret_detection:
|
||||||
rules:
|
rules:
|
||||||
@ -245,25 +227,12 @@ semgrep-sast:
|
|||||||
- if: $SAST_DISABLED
|
- if: $SAST_DISABLED
|
||||||
when: never
|
when: never
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
|
|
||||||
test_coverage:
|
test_coverage:
|
||||||
# extends: test
|
extends: test
|
||||||
image: python:3.11-slim-bookworm
|
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
stage: test
|
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
variables:
|
|
||||||
DATABASE: sqlite:///../app/db.sqlite
|
|
||||||
before_script:
|
|
||||||
- apt-get update && apt-get install -y python3-dev gcc
|
|
||||||
- pip install -r requirements.txt
|
|
||||||
- pip install pytest httpx
|
|
||||||
- mkdir -p app/cert
|
|
||||||
- openssl genrsa -out app/cert/instance.private.pem 2048
|
|
||||||
- openssl rsa -in app/cert/instance.private.pem -outform PEM -pubout -out app/cert/instance.public.pem
|
|
||||||
- cd test
|
|
||||||
script:
|
script:
|
||||||
- pip install pytest pytest-cov
|
- pip install pytest pytest-cov
|
||||||
- coverage run -m pytest main.py
|
- coverage run -m pytest main.py
|
||||||
@ -288,7 +257,6 @@ gemnasium-python-dependency_scanning:
|
|||||||
- if: $DEPENDENCY_SCANNING_DISABLED
|
- if: $DEPENDENCY_SCANNING_DISABLED
|
||||||
when: never
|
when: never
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
|
|
||||||
.deploy:
|
.deploy:
|
||||||
rules:
|
rules:
|
||||||
@ -296,24 +264,24 @@ gemnasium-python-dependency_scanning:
|
|||||||
|
|
||||||
deploy:docker:
|
deploy:docker:
|
||||||
extends: .deploy
|
extends: .deploy
|
||||||
image: docker:dind
|
|
||||||
stage: deploy
|
stage: deploy
|
||||||
tags: [ docker ]
|
|
||||||
before_script:
|
before_script:
|
||||||
- echo "Building docker image for commit $CI_COMMIT_SHA with version $CI_COMMIT_REF_NAME"
|
- echo "Building docker image for commit $CI_COMMIT_SHA with version $CI_COMMIT_REF_NAME"
|
||||||
- docker buildx inspect
|
|
||||||
- docker buildx create --use
|
|
||||||
script:
|
script:
|
||||||
- echo "========== GitLab-Registry =========="
|
- echo "========== GitLab-Registry =========="
|
||||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||||
- IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH
|
- IMAGE=$CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME
|
||||||
- docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME --push .
|
- docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME
|
||||||
- docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest --push .
|
- docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest
|
||||||
|
- docker push $IMAGE:$CI_COMMIT_REF_NAME
|
||||||
|
- docker push $IMAGE:latest
|
||||||
- echo "========== Docker-Hub =========="
|
- echo "========== Docker-Hub =========="
|
||||||
- docker login -u $PUBLIC_REGISTRY_USER -p $PUBLIC_REGISTRY_TOKEN
|
- docker login -u $PUBLIC_REGISTRY_USER -p $PUBLIC_REGISTRY_TOKEN
|
||||||
- IMAGE=$PUBLIC_REGISTRY_USER/$CI_PROJECT_NAME
|
- IMAGE=$PUBLIC_REGISTRY_USER/$CI_PROJECT_NAME
|
||||||
- docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME --push .
|
- docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:$CI_COMMIT_REF_NAME
|
||||||
- docker buildx build --progress=plain --platform $DOCKER_BUILDX_PLATFORM --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest --push .
|
- docker build . --build-arg VERSION=$CI_COMMIT_REF_NAME --build-arg COMMIT=$CI_COMMIT_SHA --tag $IMAGE:latest
|
||||||
|
- docker push $IMAGE:$CI_COMMIT_REF_NAME
|
||||||
|
- docker push $IMAGE:latest
|
||||||
|
|
||||||
deploy:apt:
|
deploy:apt:
|
||||||
# doc: https://git.collinwebdesigns.de/help/user/packages/debian_repository/index.md#install-a-package
|
# doc: https://git.collinwebdesigns.de/help/user/packages/debian_repository/index.md#install-a-package
|
||||||
|
30
README.md
30
README.md
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Minimal Delegated License Service (DLS).
|
Minimal Delegated License Service (DLS).
|
||||||
|
|
||||||
Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0. For Driver compatibility see [here](#setup-client).
|
Compatibility tested with official NLS 2.0.1, 2.1.0, 3.1.0.
|
||||||
|
|
||||||
This service can be used without internet connection.
|
This service can be used without internet connection.
|
||||||
Only the clients need a connection to this service on configured port.
|
Only the clients need a connection to this service on configured port.
|
||||||
@ -27,7 +27,7 @@ Only the clients need a connection to this service on configured port.
|
|||||||
- 4gb hdd
|
- 4gb hdd
|
||||||
- *maybe IPv6 must be disabled*
|
- *maybe IPv6 must be disabled*
|
||||||
|
|
||||||
Tested with Ubuntu 22.10 (EOL!) (from Proxmox templates), actually its consuming 100mb ram and 750mb hdd.
|
Tested with Ubuntu 22.10 (from Proxmox templates), actually its consuming 100mb ram and 750mb hdd.
|
||||||
|
|
||||||
**Prepare your system**
|
**Prepare your system**
|
||||||
|
|
||||||
@ -35,10 +35,10 @@ Tested with Ubuntu 22.10 (EOL!) (from Proxmox templates), actually its consuming
|
|||||||
|
|
||||||
## Docker
|
## Docker
|
||||||
|
|
||||||
Docker-Images are available here for Intel (x86), AMD (amd64) and ARM (arm64):
|
Docker-Images are available here:
|
||||||
|
|
||||||
- [Docker-Hub](https://hub.docker.com/repository/docker/collinwebdesigns/fastapi-dls): `collinwebdesigns/fastapi-dls:latest`
|
- [Docker-Hub](https://hub.docker.com/repository/docker/collinwebdesigns/fastapi-dls): `collinwebdesigns/fastapi-dls:latest`
|
||||||
- [GitLab-Registry](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/container_registry): `registry.git.collinwebdesigns.de/oscar.krause/fastapi-dls:latest`
|
- [GitLab-Registry](https://git.collinwebdesigns.de/oscar.krause/fastapi-dls/container_registry): `registry.git.collinwebdesigns.de/oscar.krause/fastapi-dls/main:latest`
|
||||||
|
|
||||||
The images include database drivers for `postgres`, `mariadb` and `sqlite`.
|
The images include database drivers for `postgres`, `mariadb` and `sqlite`.
|
||||||
|
|
||||||
@ -102,10 +102,9 @@ volumes:
|
|||||||
dls-db:
|
dls-db:
|
||||||
```
|
```
|
||||||
|
|
||||||
## Debian/Ubuntu/macOS (manual method using `git clone` and python virtual environment)
|
## Debian/Ubuntu (manual method using `git clone` and python virtual environment)
|
||||||
|
|
||||||
Tested on `Debian 11 (bullseye)`, `Debian 12 (bookworm)` and `macOS Ventura (13.6)`, Ubuntu may also work.
|
Tested on `Debian 11 (bullseye)`, Ubuntu may also work.
|
||||||
**Please note that setup on macOS differs from Debian based systems.**
|
|
||||||
|
|
||||||
**Make sure you are logged in as root.**
|
**Make sure you are logged in as root.**
|
||||||
|
|
||||||
@ -318,9 +317,7 @@ Packages are available here:
|
|||||||
Successful tested with:
|
Successful tested with:
|
||||||
|
|
||||||
- Debian 12 (Bookworm)
|
- Debian 12 (Bookworm)
|
||||||
- Ubuntu 22.10 (Kinetic Kudu) (EOL: July 20, 2023)
|
- Ubuntu 22.10 (Kinetic Kudu)
|
||||||
- Ubuntu 23.04 (Lunar Lobster) (EOL: January 2024)
|
|
||||||
- Ubuntu 23.10 (Mantic Minotaur) (EOL: July 2024)
|
|
||||||
|
|
||||||
Not working with:
|
Not working with:
|
||||||
|
|
||||||
@ -426,12 +423,8 @@ client has 19.2 hours in which to re-establish connectivity before its license e
|
|||||||
|
|
||||||
Successfully tested with this package versions:
|
Successfully tested with this package versions:
|
||||||
|
|
||||||
| vGPU Suftware | Linux vGPU Manager | Linux Driver | Windows Driver | Release Date |
|
| vGPU Suftware | vGPU Manager | Linux Driver | Windows Driver | Release Date |
|
||||||
|---------------|--------------------|--------------|----------------|---------------|
|
|---------------|--------------|--------------|----------------|---------------|
|
||||||
| `16.3` | `535.154.02` | `535.154.05` | `538.15` | January 2024 |
|
|
||||||
| `16.2` | `535.129.03` | `535.129.03` | `537.70` | October 2023 |
|
|
||||||
| `16.1` | `535.104.06` | `535.104.05` | `537.13` | August 2023 |
|
|
||||||
| `16.0` | `535.54.06` | `535.54.03` | `536.22` | July 2023 |
|
|
||||||
| `15.3` | `525.125.03` | `525.125.06` | `529.11` | June 2023 |
|
| `15.3` | `525.125.03` | `525.125.06` | `529.11` | June 2023 |
|
||||||
| `15.2` | `525.105.14` | `525.105.17` | `528.89` | March 2023 |
|
| `15.2` | `525.105.14` | `525.105.17` | `528.89` | March 2023 |
|
||||||
| `15.1` | `525.85.07` | `525.85.05` | `528.24` | January 2023 |
|
| `15.1` | `525.85.07` | `525.85.05` | `528.24` | January 2023 |
|
||||||
@ -441,11 +434,6 @@ Successfully tested with this package versions:
|
|||||||
|
|
||||||
- https://docs.nvidia.com/grid/index.html
|
- https://docs.nvidia.com/grid/index.html
|
||||||
|
|
||||||
*To get the latest drivers, visit Nvidia or search in Discord-Channel `GPU Unlocking` (Server-ID: `829786927829745685`) on channel `licensing` `biggerthanshit`
|
|
||||||
|
|
||||||
|
|
||||||
https://archive.biggerthanshit.com/NVIDIA/ (nvidia / b1gg3rth4nsh1t)
|
|
||||||
|
|
||||||
## Linux
|
## Linux
|
||||||
|
|
||||||
Download *client-token* and place it into `/etc/nvidia/ClientConfigToken`:
|
Download *client-token* and place it into `/etc/nvidia/ClientConfigToken`:
|
||||||
|
12
app/main.py
12
app/main.py
@ -159,13 +159,7 @@ async def _origins_delete(request: Request):
|
|||||||
return Response(status_code=201)
|
return Response(status_code=201)
|
||||||
|
|
||||||
|
|
||||||
@app.delete('/-/origins/expired', summary='* Delete all Origins without active Lease')
|
@app.delete('/-/origins/{origin_ref}', summary='* Origins')
|
||||||
async def _origins_delete_expired(request: Request):
|
|
||||||
Origin.delete_expired(db)
|
|
||||||
return Response(status_code=201)
|
|
||||||
|
|
||||||
|
|
||||||
@app.delete('/-/origins/{origin_ref}', summary='* Delete specific Origin')
|
|
||||||
async def _origins_delete_origin_ref(request: Request, origin_ref: str):
|
async def _origins_delete_origin_ref(request: Request, origin_ref: str):
|
||||||
if Origin.delete(db, [origin_ref]) == 1:
|
if Origin.delete(db, [origin_ref]) == 1:
|
||||||
return Response(status_code=201)
|
return Response(status_code=201)
|
||||||
@ -188,13 +182,13 @@ async def _leases(request: Request, origin: bool = False):
|
|||||||
return JSONr(response)
|
return JSONr(response)
|
||||||
|
|
||||||
|
|
||||||
@app.delete('/-/leases/expired', summary='* Delete all expired Leases')
|
@app.delete('/-/leases/expired', summary='* Leases')
|
||||||
async def _lease_delete_expired(request: Request):
|
async def _lease_delete_expired(request: Request):
|
||||||
Lease.delete_expired(db)
|
Lease.delete_expired(db)
|
||||||
return Response(status_code=201)
|
return Response(status_code=201)
|
||||||
|
|
||||||
|
|
||||||
@app.delete('/-/lease/{lease_ref}', summary='* Delete specific Lease')
|
@app.delete('/-/lease/{lease_ref}', summary='* Lease')
|
||||||
async def _lease_delete(request: Request, lease_ref: str):
|
async def _lease_delete(request: Request, lease_ref: str):
|
||||||
if Lease.delete(db, lease_ref) == 1:
|
if Lease.delete(db, lease_ref) == 1:
|
||||||
return Response(status_code=201)
|
return Response(status_code=201)
|
||||||
|
10
app/orm.py
10
app/orm.py
@ -66,16 +66,6 @@ class Origin(Base):
|
|||||||
session.close()
|
session.close()
|
||||||
return deletions
|
return deletions
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def delete_expired(engine: Engine) -> int:
|
|
||||||
session = sessionmaker(bind=engine)()
|
|
||||||
origins = session.query(Origin).join(Lease, Origin.origin_ref == Lease.origin_ref, isouter=True).filter(Lease.lease_ref.is_(None)).all()
|
|
||||||
origin_refs = [origin.origin_ref for origin in origins]
|
|
||||||
deletions = session.query(Origin).filter(Origin.origin_ref.in_(origin_refs)).delete()
|
|
||||||
session.commit()
|
|
||||||
session.close()
|
|
||||||
return deletions
|
|
||||||
|
|
||||||
|
|
||||||
class Lease(Base):
|
class Lease(Base):
|
||||||
__tablename__ = "lease"
|
__tablename__ = "lease"
|
||||||
|
@ -116,12 +116,6 @@ async function deleteOrigin(origin_ref) {
|
|||||||
xhr.send();
|
xhr.send();
|
||||||
}
|
}
|
||||||
|
|
||||||
async function deleteExpiredOrigins() {
|
|
||||||
let xhr = new XMLHttpRequest();
|
|
||||||
xhr.open("DELETE", `/-/origins/expired`, true);
|
|
||||||
xhr.send();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deleteLease(lease_ref) {
|
async function deleteLease(lease_ref) {
|
||||||
if (lease_ref === undefined)
|
if (lease_ref === undefined)
|
||||||
lease_ref = window.prompt("Please enter 'lease_ref' which should be deleted");
|
lease_ref = window.prompt("Please enter 'lease_ref' which should be deleted");
|
||||||
|
@ -13,9 +13,6 @@
|
|||||||
<button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigin().finally(() => load())">
|
<button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOrigin().finally(() => load())">
|
||||||
delete origin
|
delete origin
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteExpiredOrigins().finally(() => load())">
|
|
||||||
delete all expired origins
|
|
||||||
</button>
|
|
||||||
<button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOriginsWrapper()">
|
<button type="button" class="btn btn-sm btn-outline-danger" onclick="deleteOriginsWrapper()">
|
||||||
delete all
|
delete all
|
||||||
</button>
|
</button>
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
fastapi==0.110.0
|
fastapi==0.99.1
|
||||||
uvicorn[standard]==0.27.1
|
uvicorn[standard]==0.22.0
|
||||||
python-jose==3.3.0
|
python-jose==3.3.0
|
||||||
pycryptodome==3.20.0
|
pycryptodome==3.18.0
|
||||||
python-dateutil==2.8.2
|
python-dateutil==2.8.2
|
||||||
sqlalchemy==2.0.27
|
sqlalchemy==2.0.17
|
||||||
markdown==3.5.2
|
markdown==3.4.3
|
||||||
python-dotenv==1.0.1
|
python-dotenv==1.0.0
|
||||||
jinja2==3.1.3
|
jinja2==3.1.2
|
||||||
|
Loading…
Reference in New Issue
Block a user