stackit-core 0.2.0__tar.gz → 0.3.1__tar.gz

stackit_core-0.3.1/.gitignore

@@ -0,0 +1,267 @@
+### VisualStudioCode template
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+!.vscode/*.code-snippets
+
+# Local History for Visual Studio Code
+.history/
+
+# Built Visual Studio Code Extensions
+*.vsix
+
+### JetBrains template
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# AWS User-specific
+.idea/**/aws.xml
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+# *.iml
+# *.ipr
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# SonarLint plugin
+.idea/sonarlint/
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### VirtualEnv template
+# Virtualenv
+# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
+.Python
+[Bb]in
+[Ii]nclude
+[Ll]ib
+[Ll]ib64
+[Ll]ocal
+[Ss]cripts
+pyvenv.cfg
+.venv
+pip-selfcheck.json
+
+### Python template
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+.idea/
+

{stackit_core-0.2.0 → stackit_core-0.3.1}/PKG-INFO

@@ -1,24 +1,26 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.5
 Name: stackit-core
-Version: 0.2.0
+Version: v0.3.1
 Summary: Core functionality for the STACKIT SDK for Python
-Author: STACKIT Developer Tools
-Author-email: developer-tools@stackit.cloud
-Requires-Python: >=3.8,<4.0
+Project-URL: Homepage, https://github.com/stackitcloud/stackit-sdk-python
+Project-URL: Issues, https://github.com/stackitcloud/stackit-sdk-python/issues
+Author-email: STACKIT Developer Tools <developer-tools@stackit.cloud>
+License-File: LICENSE.md
+License-File: NOTICE.txt
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: cryptography (>=43.0.1)
-Requires-Dist: pydantic (>=2.9.2)
-Requires-Dist: pyjwt (>=2.9.0)
-Requires-Dist: requests (>=2.32.3)
-Requires-Dist: urllib3 (>=2.2.3)
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <4.0,>=3.10
+Requires-Dist: cryptography>=46.0.5
+Requires-Dist: pydantic>=2.9.2
+Requires-Dist: pyjwt>=2.13.0
+Requires-Dist: requests>=2.33.0
+Requires-Dist: urllib3>=2.7.0
 Description-Content-Type: text/markdown
 
 > ⓘ INFO: The STACKIT Python SDK is in beta and in active development.
@@ -34,4 +36,3 @@ to use the [STACKIT Python SDK](https://github.com/stackitcloud/stackit-sdk-pyth
 ## Usage
 
 The core package does nothing on its own and must be used in conjunction with the services of the [STACKIT Python SDK](https://github.com/stackitcloud/stackit-sdk-python).
-

stackit_core-0.3.1/pyproject.toml

@@ -0,0 +1,121 @@
+[project]
+name = "stackit-core"
+version = "v0.3.1"
+description = "Core functionality for the STACKIT SDK for Python"
+authors = [{ name = "STACKIT Developer Tools", email = "developer-tools@stackit.cloud" }]
+requires-python = ">=3.10,<4.0"
+readme = "README.md"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: OS Independent",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
+dependencies = [
+    "pyjwt>=2.13.0",
+    "pydantic>=2.9.2",
+    "urllib3>=2.7.0",
+    "cryptography>=46.0.5",
+    "requests>=2.33.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/stackitcloud/stackit-sdk-python"
+Issues = "https://github.com/stackitcloud/stackit-sdk-python/issues"
+
+[dependency-groups]
+dev = [
+    "black>=26.3.1",
+    "pytest>=9.1.1",
+    "flake8>=5.0.3 ; python_full_version < '3.12'",
+    "flake8>=6.0.1 ; python_full_version >= '3.12'",
+    "flake8-black>=0.3.6",
+    "flake8-pyproject>=1.2.3",
+    "flake8-quotes>=3.4.0",
+    "flake8-bandit>=4.1.1",
+    "flake8-bugbear>=23.1.14",
+    "flake8-eradicate>=1.5.0",
+    "flake8-eol>=0.0.8",
+    "autoimport>=1.6.1",
+    "isort>=5.13.2",
+]
+
+[tool.uv]
+default-groups = "all"
+
+[tool.hatch.build.targets.sdist]
+include = ["src/stackit"]
+
+[tool.hatch.build.targets.wheel]
+include = ["src/stackit"]
+
+[tool.hatch.build.targets.wheel.sources]
+"src/stackit" = "stackit"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.pytest.ini_options]
+pythonpath = ["src"]
+testpaths = ["tests"]
+
+[tool.black]
+line-length = 120
+exclude = """
+/(
+     .eggs
+    | .git
+    | .hg
+    | .mypy_cache
+    | .nox
+    | .pants.d
+    | .tox
+    | .venv
+    | _build
+    | buck-out
+    | build
+    | dist
+    | node_modules
+    | venv
+)/
+"""
+
+[tool.isort]
+profile = 'black'
+
+[tool.flake8]
+exclude = [
+  ".eggs",
+  ".git",
+  ".hg",
+  ".mypy_cache",
+  ".tox",
+  ".venv",
+  ".devcontainer",
+  "venv",
+  "_build",
+  "buck-out",
+  "build",
+  "dist",
+]
+statistics = true
+show-source = false
+max-line-length = 120
+# E203,W503 and E704 are incompatible with the formatter black
+# fixing B042 in upstream exceptions.mustache would be a breaking change
+ignore = ["E203", "W503", "E704", "B042"]
+inline-quotes = '"'
+docstring-quotes = '"""'
+multiline-quotes = '"""'
+ban-relative-imports = true
+per-file-ignores = """
+    # S101: asserts are fine in tests, tests shouldn't be build optimized
+    # S105: hardcoded passwords in tests are fine
+    # S106: hardcoded passwords in tests are fine
+  ./tests/*: S101,S105,S106,
+"""

{stackit_core-0.2.0 → stackit_core-0.3.1}/src/stackit/core/auth_methods/key_auth.py

@@ -42,6 +42,7 @@ class KeyAuth(AuthBase):
     DEFAULT_TOKEN_ENDPOINT = "https://service-account.api.stackit.cloud/token"  # noqa S105 false positive
     TOKEN_EXPIRY_CHECK_INTERVAL = timedelta(seconds=60)
     EXPIRATION_LEEWAY = timedelta(minutes=5)
+    MAX_REFRESH_RETRIES = 3
 
     timeout: Optional[int] = 30
     initial_token: Optional[str]
@@ -73,9 +74,21 @@ class KeyAuth(AuthBase):
 
     def __call__(self, r: Request) -> Request:
         with self.lock:
+            if self.refresh_future is not None and self.refresh_future.done():
+                self.refresh_future.result()
             if self.__is_token_expired(self.access_token):
                 if self.refresh_future is None or self.refresh_future.done():
                     self.refresh_future = self.executor.submit(self.__refresh_token)
+                refresh_future = self.refresh_future
+            else:
+                refresh_future = None
+
+        # Do not hold the lock while waiting. The refresh worker acquires it when
+        # updating the access token.
+        if refresh_future is not None:
+            refresh_future.result()
+
+        with self.lock:
             r.headers["Authorization"] = f"Bearer {self.access_token}"
         return r
 
@@ -105,16 +118,19 @@ class KeyAuth(AuthBase):
             response = requests.post(self.token_endpoint, data=body, timeout=self.timeout)
             response.raise_for_status()
             response_json = response.json()
-            self.access_token = response_json["access_token"]
-            self.refresh_token = response_json["refresh_token"]
+            with self.lock:
+                self.access_token = response_json["access_token"]
+                self.refresh_token = response_json["refresh_token"]
         except requests.RequestException as e:
-            print(f"Initial token fetch failed: {e}")
+            raise requests.RequestException("Initial token fetch failed") from e
 
     def __start_token_refresh_task(self):
         def token_refresh_task():
             while True:
                 time.sleep(self.TOKEN_EXPIRY_CHECK_INTERVAL.total_seconds())
                 with self.lock:
+                    if self.refresh_future is not None and self.refresh_future.done():
+                        self.refresh_future.result()
                     if self.__is_token_expired(self.access_token) and (
                         self.refresh_future is None or self.refresh_future.done()
                     ):
@@ -125,38 +141,43 @@ class KeyAuth(AuthBase):
         thread.start()
 
     def __refresh_token(self):
-        if self.__is_token_expired(self.refresh_token):
+        with self.lock:
+            refresh_token = self.refresh_token
+
+        if self.__is_token_expired(refresh_token):
             self.__create_initial_token()
             self.__fetch_token_from_endpoint()
             return
 
         body = {
             "grant_type": "refresh_token",
-            "refresh_token": self.refresh_token,
+            "refresh_token": refresh_token,
         }
 
-        try:
-            response = requests.post(self.token_endpoint, data=body, timeout=self.timeout)
-            response.raise_for_status()
-            response_data = response.json()
-            new_token = response_data.get("access_token")
-            # with self.lock:
-            self.access_token = new_token
-            print("Token successfully refreshed!")
-        except requests.RequestException as e:
-            print(f"Token refresh failed: {e}")
+        last_exception = None
+        for _ in range(self.MAX_REFRESH_RETRIES):
+            try:
+                response = requests.post(self.token_endpoint, data=body, timeout=self.timeout)
+                response.raise_for_status()
+                response_data = response.json()
+                new_token = response_data.get("access_token")
+                with self.lock:
+                    self.access_token = new_token
+                return
+            except requests.RequestException as e:
+                last_exception = e
+
+        raise requests.RequestException("Token refresh failed after retries") from last_exception
 
-    def __is_token_expired(self, token: str) -> bool:
+    def __is_token_expired(self, token: Optional[str]) -> bool:
         try:
             decoded_token = jwt.decode(token, options={"verify_signature": False})
             exp = decoded_token.get("exp")
-            if exp:
-                return time.time() > (exp + self.EXPIRATION_LEEWAY.total_seconds())
-        except jwt.ExpiredSignatureError:
-            return True
-        except jwt.DecodeError:
+            if exp is None:
+                return True
+            return time.time() > (float(exp) - self.EXPIRATION_LEEWAY.total_seconds())
+        except (jwt.InvalidTokenError, TypeError, ValueError):
             return True
-        return False
 
     def __shutdown(self):
         self.executor.shutdown(wait=False)

stackit_core-0.2.0/pyproject.toml

@@ -1,109 +0,0 @@
-[project]
-name = "stackit-core"
-
-[tool.poetry]
-name = "stackit-core"
-version = "v0.2.0"
-authors = ["STACKIT Developer Tools <developer-tools@stackit.cloud>"]
-description = "Core functionality for the STACKIT SDK for Python"
-readme = "README.md"
-classifiers = [
-  "Programming Language :: Python :: 3",
-  "License :: OSI Approved :: Apache Software License",
-  "Operating System :: OS Independent",
-]
-packages = [{ include = "stackit", from = "src" }]
-
-
-[tool.poetry.dependencies]
-python = ">=3.8,<4.0"
-pyjwt = ">=2.9.0"
-pydantic = ">=2.9.2"
-urllib3 = ">=2.2.3"
-cryptography = ">=43.0.1"
-requests = ">=2.32.3"
-
-
-[tool.poetry.group.dev.dependencies]
-black = ">=24.8.0"
-pytest = ">=8.3.3"
-flake8 = [
-  { version = ">=5.0.3", python = "<3.12" },
-  { version = ">=6.0.1", python = ">=3.12" },
-]
-flake8-black = ">=0.3.6"
-flake8-pyproject = ">=1.2.3"
-flake8-quotes = ">=3.4.0"
-flake8-bandit = ">=4.1.1"
-flake8-bugbear = ">=23.1.14"
-flake8-eradicate = ">=1.5.0"
-flake8-eol = ">=0.0.8"
-autoimport = ">=1.6.1"
-isort = ">=5.13.2"
-
-[project.urls]
-Homepage = "https://github.com/stackitcloud/stackit-sdk-python"
-Issues = "https://github.com/stackitcloud/stackit-sdk-python/issues"
-
-[build-system]
-requires = ["setuptools", "poetry-core"]
-build-backend = "poetry.core.masonry.api"
-
-[tool.pytest.ini_options]
-pythonpath = ["src"]
-testpaths = ["tests"]
-
-[tool.black]
-line-length = 120
-exclude = """
-/(
-     .eggs
-    | .git
-    | .hg
-    | .mypy_cache
-    | .nox
-    | .pants.d
-    | .tox
-    | .venv
-    | _build
-    | buck-out
-    | build
-    | dist
-    | node_modules
-    | venv
-)/
-"""
-
-[tool.isort]
-profile = 'black'
-
-[tool.flake8]
-exclude = [
-  ".eggs",
-  ".git",
-  ".hg",
-  ".mypy_cache",
-  ".tox",
-  ".venv",
-  ".devcontainer",
-  "venv",
-  "_build",
-  "buck-out",
-  "build",
-  "dist",
-]
-statistics = true
-show-source = false
-max-line-length = 120
-# E203,W503 and E704 are incompatible with the formatter black
-ignore = ["E203", "W503", "E704"]
-inline-quotes = '"'
-docstring-quotes = '"""'
-multiline-quotes = '"""'
-ban-relative-imports = true
-per-file-ignores = """
-    # S101: asserts are fine in tests, tests shouldn't be build optimized
-    # S105: hardcoded passwords in tests are fine
-    # S106: hardcoded passwords in tests are fine
-  ./tests/*: S101,S105,S106,
-"""