@planqk/planqk-service-sdk 2.5.0 → 2.6.2

package/.fossa.yml

@@ -0,0 +1,9 @@
+version: 3
+project:
+  id: "git@gitlab.com:planqk-foss/planqk-service-sdk.git"
+  name: "Platform-Service-SDK"
+  labels:
+    - "Platform"
+    - "Open Source"
+    - "SDK"
+    - "PLANQK"

package/.gitlab-ci.yml

@@ -1,6 +1,6 @@
 variables:
   TWINE_USERNAME: __token__
-  UV_VERSION: 0.6
+  UV_VERSION: 0.8
   PYTHON_VERSION: 3.11
   BASE_LAYER: bookworm-slim
   # GitLab CI creates a separate mountpoint for the build directory,
@@ -11,6 +11,8 @@ variables:
 stages:
   - commit-test
   - commit-release-check
+  - install
+  - compliance
   - release-package
 
 semantic-release:
@@ -21,19 +23,53 @@ semantic-release:
     - if: '$CI_PIPELINE_SOURCE == "web"'
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   variables:
+    BASE_LAYER: bookworm
     ## Use the gitlab user to create the release commit
     ## https://github.com/semantic-release/semantic-release/blob/master/docs/usage/configuration.md#git-environment-variables
     GIT_AUTHOR_NAME: "$GITLAB_USER_NAME"
     GIT_AUTHOR_EMAIL: "$GITLAB_USER_EMAIL"
     GIT_COMMITTER_NAME: "$GITLAB_USER_NAME"
     GIT_COMMITTER_EMAIL: "$GITLAB_USER_EMAIL"
-  image: node:lts
+  image: ghcr.io/astral-sh/uv:$UV_VERSION-python$PYTHON_VERSION-$BASE_LAYER
   before_script:
-    - apt-get update && apt-get install -y --no-install-recommends git-core ca-certificates
+    - curl -o- https://fnm.vercel.app/install | bash
+    - source ~/.bashrc
+    - fnm install 22
     - npm install -g semantic-release @semantic-release/gitlab @semantic-release/git @semantic-release/exec
   script:
     - semantic-release
 
+install:
+  stage: install
+  rules:
+    - if: '$CI_COMMIT_TAG'
+  image: ghcr.io/astral-sh/uv:$UV_VERSION-python$PYTHON_VERSION-$BASE_LAYER
+  script:
+    - uv sync --frozen --no-dev
+    - uv export --format requirements-txt --no-dev --no-emit-project > requirements.txt
+    - uv export --format requirements-txt --dev --no-emit-project > requirements-dev.txt
+  artifacts:
+    expire_in: 1 hour
+    paths:
+      - .venv
+      - requirements.txt
+      - requirements-dev.txt
+
+oss-compliance-check:
+  stage: compliance
+  rules:
+    - if: "$CI_COMMIT_TAG"
+  image: ubuntu:latest
+  before_script:
+    - apt-get update && apt-get install -y --no-install-recommends ca-certificates curl
+    - curl https://raw.githubusercontent.com/fossas/fossa-cli/master/install-latest.sh | bash
+    - source .venv/bin/activate
+  script:
+    - FOSSA_REVISION=$([ -z $CI_COMMIT_TAG ] && echo $CI_COMMIT_SHA || echo $CI_COMMIT_TAG)
+    - FOSSA_BRANCH=$([ -z $CI_COMMIT_BRANCH ] && echo 'main' || echo $CI_COMMIT_BRANCH)
+    - fossa analyze -b $FOSSA_BRANCH -r $FOSSA_REVISION .
+    - fossa test -r $FOSSA_REVISION
+
 publish-python-sdk:
   stage: release-package
   rules:

package/notebooks/python-sdk.ipynb

@@ -55,9 +55,15 @@
     "# Create a new PlanqkServiceClient instance\n",
     "client = PlanqkServiceClient(\n",
     "    service_endpoint, consumer_key, consumer_secret, token_endpoint\n",
-    ")\n",
-    "\n",
-    "# List all service executions\n",
+    ")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
     "service_executions = client.get_service_executions()\n",
     "print(f\"Found {len(service_executions)} service executions\")"
    ]
@@ -214,7 +220,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.9"
+   "version": "3.11.11"
   }
  },
  "nbformat": 4,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@planqk/planqk-service-sdk",
-  "version": "2.5.0",
+  "version": "2.6.2",
   "description": "SDK to interact with PLANQK Managed Services.",
   "author": "Kipu Quantum GmbH",
   "contributors": [

package/planqk/service/_version.py

@@ -1 +1 @@
-__version__ = "2.5.0"
+__version__ = "2.6.2"

package/planqk/service/auth.py

@@ -1,3 +1,4 @@
+import logging
 import time
 
 from authlib.integrations.httpx_client import OAuth2Client
@@ -6,6 +7,8 @@ DEFAULT_TOKEN_ENDPOINT = "https://gateway.platform.planqk.de/token"
 
 
 class PlanqkServiceAuth:
+    _logger = logging.getLogger(__name__)
+
     def __init__(self, consumer_key: str, consumer_secret: str, token_endpoint: str = DEFAULT_TOKEN_ENDPOINT):
         self._consumer_key = consumer_key
         self._consumer_secret = consumer_secret
@@ -17,12 +20,14 @@ class PlanqkServiceAuth:
         if self._token is None or self._last_token_fetch is None:
             self._refresh_token()
 
-        if time.time() - self._last_token_fetch > self._token["expires_in"]:
+        # Refresh token 120 seconds before expiration to prevent race conditions
+        if time.time() - self._last_token_fetch >= (self._token["expires_in"] - 120):
             self._refresh_token()
 
         return self._token["access_token"]
 
     def _refresh_token(self):
+        self._logger.debug("Creating new token using client credentials flow")
         with OAuth2Client(self._consumer_key, self._consumer_secret) as client:
             token = client.fetch_token(self._token_endpoint, grant_type='client_credentials')
 

package/planqk/service/client.py

@@ -130,9 +130,7 @@ class PlanqkServiceClient:
             )
             self._api = PlanqkServiceApi(base_url=self._service_endpoint, token=self._auth.get_token)
         else:
-            random_token = "".join(
-                random.choices(string.ascii_letters + string.digits, k=21)
-            )
+            random_token = "".join(random.choices(string.ascii_letters + string.digits, k=21))
             self._api = PlanqkServiceApi(base_url=self._service_endpoint, token=random_token)
 
     @property

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "planqk-service-sdk"
-version = "2.5.0"
+version = "2.6.2"
 description = "SDK to interact with PLANQK Managed Services."
 authors = [
     { name = "Kipu Quantum GmbH", email = "info@kipu-quantum.com" },