dt-extensions-sdk 1.7.3__py3-none-any.whl → 1.8.0__py3-none-any.whl

{dt_extensions_sdk-1.7.3.dist-info → dt_extensions_sdk-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dt-extensions-sdk
-Version: 1.7.3
+Version: 1.8.0
 Project-URL: Documentation, https://github.com/dynatrace-extensions/dt-extensions-python-sdk#readme
 Project-URL: Issues, https://github.com/dynatrace-extensions/dt-extensions-python-sdk/issues
 Project-URL: Source, https://github.com/dynatrace-extensions/dt-extensions-python-sdk
@@ -10,20 +10,21 @@ License-File: LICENSE.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: <3.11,>=3.10
+Requires-Python: <3.15,>=3.10
 Provides-Extra: cli
 Requires-Dist: dt-cli>=1.6.13; extra == 'cli'
 Requires-Dist: pyyaml; extra == 'cli'
 Requires-Dist: ruff; extra == 'cli'
-Requires-Dist: typer[all]; extra == 'cli'
+Requires-Dist: typer; extra == 'cli'
 Description-Content-Type: text/markdown
 
 # Dynatrace Extensions Python SDK
 
 [![PyPI - Version](https://img.shields.io/pypi/v/dt-extensions-sdk.svg)](https://pypi.org/project/dt-extensions-sdk)
-[![PyPI - Python Version](https://img.shields.io/badge/python-3.10-blue)](https://img.shields.io/badge/python-3.10-blue)
+[![PyPI - Python Version](https://img.shields.io/badge/python-3.10%20%7C%203.14-blue)](https://img.shields.io/badge/python-3.10%20%7C%203.14-blue)
 
 -----
 
@@ -41,7 +42,7 @@ The documentation can be found on [github pages](https://dynatrace-extensions.gi
 
 ### Requirements:
 
-* Python 3.10
+* Python 3.10 or 3.14
 
 ### Install the SDK
 

{dt_extensions_sdk-1.7.3.dist-info → dt_extensions_sdk-1.8.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-dynatrace_extension/__about__.py,sha256=-BvmT9sstUN3n3QmUgym0fwfILxaCrccJsuxxXpn5H0,110
+dynatrace_extension/__about__.py,sha256=feKH4_h_P2KAMzfeJfsy34a-VQCLlkBU5KBdHgyBGc4,110
 dynatrace_extension/__init__.py,sha256=MJNJYCFWLEwPmBLoETWFZddyUCMDgZfKkRycmmGM_w4,806
 dynatrace_extension/cli/__init__.py,sha256=HCboY_eJPoqjFmoPDsBL8Jk6aNvank8K7JpkVrgwzUM,123
-dynatrace_extension/cli/main.py,sha256=OTjJ4XHJvvYXj10a7WFFHVNnkyECPg1ClW6Os8piN8k,20168
+dynatrace_extension/cli/main.py,sha256=vQrYd-k_82Dklo2ult-10nkM8IhFO4xRACyBCVWOnSE,22646
 dynatrace_extension/cli/schema.py,sha256=d8wKUodRiaU3hfSZDWVNpD15lBfhmif2oQ-k07IxcaA,3230
 dynatrace_extension/cli/create/__init__.py,sha256=NfyOJCVlxs8dYtfDAMHS1Q5SJTuZcFzOg5rtaI-ZPRE,72
 dynatrace_extension/cli/create/create.py,sha256=IcgyVcjud1QTUE99KNHVNTH7G0qQsQyldVchp6CG3v8,2695
@@ -17,10 +17,10 @@ dynatrace_extension/cli/create/extension_template/extension_name/__init__.py.tem
 dynatrace_extension/cli/create/extension_template/extension_name/__main__.py.template,sha256=cS79GVxJB-V-gocu4ZOjmZ54HXJNg89eXdLf89zDHJQ,1249
 dynatrace_extension/sdk/__init__.py,sha256=RsqQ1heGyCmSK3fhuEKAcxQIRCg4gEK0-eSkIehL5Nc,86
 dynatrace_extension/sdk/activation.py,sha256=KIoPWMZs3tKiMG8XhCfeNgRlz2vxDKcAASgSACcEfIQ,1456
-dynatrace_extension/sdk/callback.py,sha256=NW63fQBh-BeN-zfAeDY94wpSBoBHRsR3VLJCvxJPiaw,6703
+dynatrace_extension/sdk/callback.py,sha256=S_ELy2D9Y2YhUsL2lBry3UZfmy3BrZgZM2hvKgQIQss,6949
 dynatrace_extension/sdk/communication.py,sha256=uTSURmgSHit2N1hHUc3-yKmEBVMHi6hDBrdb1EaCAsE,18419
 dynatrace_extension/sdk/event.py,sha256=J261imbFKpxfuAQ6Nfu3RRcsIQKKivy6fme1nww2g-8,388
-dynatrace_extension/sdk/extension.py,sha256=KZYVn5VDW19pfnqe6UnpzRVPYUasW8n8AYSvUYvvOUw,49723
+dynatrace_extension/sdk/extension.py,sha256=ZbuoHQ-sbj4jUSz0w1Iz6IePrnC9a0BEwoXIdLKJsU8,49957
 dynatrace_extension/sdk/helper.py,sha256=m4gGHtIKYkfANC2MOGdxKUZlmH5tnZO6WTNqll27lyY,6476
 dynatrace_extension/sdk/metric.py,sha256=-kq7JWpk7UGvcjqafTt-o6k4urwhsGVXmnuQg7Sf9PQ,3622
 dynatrace_extension/sdk/runtime.py,sha256=7bC4gUJsVSHuL_E7r2EWrne95nm1BjZiMGkyNqA7ZCU,2796
@@ -31,8 +31,8 @@ dynatrace_extension/sdk/vendor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 dynatrace_extension/sdk/vendor/mureq/LICENSE,sha256=8AVcgZgiT_mvK1fOofXtRRr2f1dRXS_K21NuxQgP4VM,671
 dynatrace_extension/sdk/vendor/mureq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dynatrace_extension/sdk/vendor/mureq/mureq.py,sha256=znF4mvzk5L03CLNozRz8UpK-fMijmSkObDFwlbhwLUg,14656
-dt_extensions_sdk-1.7.3.dist-info/METADATA,sha256=irv3Te4njH0dWl4Yl-KyNN--ErS4PP7-xrghjwbtoqo,2721
-dt_extensions_sdk-1.7.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dt_extensions_sdk-1.7.3.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
-dt_extensions_sdk-1.7.3.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
-dt_extensions_sdk-1.7.3.dist-info/RECORD,,
+dt_extensions_sdk-1.8.0.dist-info/METADATA,sha256=gg6h4u5Vd29Z7GHQ6wTaSDCh5cuky1NLsvGTyeP8rg0,2801
+dt_extensions_sdk-1.8.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+dt_extensions_sdk-1.8.0.dist-info/entry_points.txt,sha256=pweyOCgENGHjOlT6_kXYaBPOrE3p18K0UettqnNlnoE,55
+dt_extensions_sdk-1.8.0.dist-info/licenses/LICENSE.txt,sha256=3Zihv0lOVYHNfDkJC-tUAU6euP9r2NexsDW4w-zqgVk,1078
+dt_extensions_sdk-1.8.0.dist-info/RECORD,,

{dt_extensions_sdk-1.7.3.dist-info → dt_extensions_sdk-1.8.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

dynatrace_extension/__about__.py

@@ -3,4 +3,4 @@
 # SPDX-License-Identifier: MIT
 
 
-__version__ = "1.7.3"
+__version__ = "1.8.0"

dynatrace_extension/cli/main.py

@@ -17,10 +17,8 @@ from .schema import ExtensionYaml
 app = typer.Typer(pretty_exceptions_show_locals=False, pretty_exceptions_enable=False)
 console = Console()
 
-# if we are not python 3.10.X, exit with an error
-if sys.version_info < (3, 10) or sys.version_info >= (3, 11):
-    console.print(f"Python 3.10.X is required to build extensions, you are using {sys.version_info}", style="bold red")
-    sys.exit(1)
+SUPPORTED_PYTHON_VERSIONS = ["3.10", "3.14"]
+
 
 CERT_DIR_ENVIRONMENT_VAR = "DT_CERTIFICATES_FOLDER"
 CERTIFICATE_DEFAULT_PATH = Path.home() / ".dynatrace" / "certificates"
@@ -106,6 +104,12 @@ def build(
         "-o",
         help="Only build for the extra platforms, useful when building from arm64 (mac)",
     ),
+    python_versions: list[str] | None = typer.Option(
+        None,
+        "--python-version",
+        "-p",
+        help=f"Python versions to download wheels for. Supported: {', '.join(SUPPORTED_PYTHON_VERSIONS)}",
+    ),
 ):
     """
     Builds and signs an extension using the developer fused key-certificate
@@ -119,6 +123,7 @@ def build(
     :param extra_index_url: Extra index url to use when downloading dependencies
     :param find_links: Extra index url to use when downloading dependencies
     :param only_extra_platforms: If true, only build for the extra platforms, useful when building from arm64
+    :param python_versions: Python versions to download wheels for, defaults to ['3.10']
     """
     console.print(f"Building and signing extension from {extension_dir} to {target_directory}", style="cyan")
     if target_directory is None:
@@ -127,7 +132,7 @@ def build(
         target_directory.mkdir()
 
     console.print("Stage 1 - Download and build dependencies", style="bold blue")
-    wheel(extension_dir, extra_platforms, extra_index_url, find_links, only_extra_platforms)
+    wheel(extension_dir, extra_platforms, extra_index_url, find_links, only_extra_platforms, python_versions)
 
     console.print("Stage 2 - Create the extension zip file", style="bold blue")
     built_zip = assemble(extension_dir, target_directory)
@@ -184,6 +189,11 @@ def assemble(
     return output
 
 
+def _version_to_pip_version(version: str) -> str:
+    """Convert a version string like '3.10' to pip format '310'."""
+    return version.replace(".", "")
+
+
 @app.command(help="Downloads the dependencies of the extension to the lib folder")
 def wheel(
     extension_dir: Path = typer.Argument(".", help="Path to the python extension"),
@@ -202,6 +212,12 @@ def wheel(
         "-o",
         help="Only build for the extra platforms, useful when building from arm64 (mac)",
     ),
+    python_versions: list[str] | None = typer.Option(
+        None,
+        "--python-version",
+        "-p",
+        help=f"Python versions to download wheels for. Supported: {', '.join(SUPPORTED_PYTHON_VERSIONS)}",
+    ),
 ):
     """
     Builds the extension and it's dependencies into wheel files
@@ -212,27 +228,43 @@ def wheel(
     :param extra_index_url: Extra index url to use when downloading dependencies
     :param find_links: Extra index url to use when downloading dependencies
     :param only_extra_platforms: If true, only build for the extra platforms, useful when building from arm64
+    :param python_versions: Python versions to download wheels for, defaults to ['3.10']
     """
+    # Handle OptionInfo objects when called directly (not via CLI)
+    if python_versions is None or isinstance(python_versions, typer.models.OptionInfo):
+        python_versions = ["3.10"]
+    if only_extra_platforms is None or isinstance(only_extra_platforms, typer.models.OptionInfo):
+        only_extra_platforms = False
+
+    # Validate python versions
+    for version in python_versions:
+        if version not in SUPPORTED_PYTHON_VERSIONS:
+            msg = (
+                f"Python version {version} is not supported. Supported versions: {', '.join(SUPPORTED_PYTHON_VERSIONS)}"
+            )
+            console.print(msg, style="bold red")
+            raise typer.Exit(1)
+
     relative_lib_folder_dir = "extension/lib"
     lib_folder: Path = extension_dir / relative_lib_folder_dir
     _clean_directory(lib_folder)
 
     console.print(f"Downloading dependencies to {lib_folder}", style="cyan")
 
-    # Downloads the dependencies and places them in the lib folder
-    command = [sys.executable, "-m", "pip", "wheel", "-w", relative_lib_folder_dir]
+    # Build the wheel for the extension itself (no deps)
+    command = [sys.executable, "-m", "pip", "wheel", "-w", relative_lib_folder_dir, "--no-deps"]
     if extra_index_url is not None:
         command.extend(["--extra-index-url", extra_index_url])
     if find_links is not None:
         command.extend(["--find-links", find_links])
-    if only_extra_platforms:
-        command.append("--no-deps")
     command.append(".")
     run_process(command, cwd=extension_dir)
 
-    if extra_platforms:
-        for extra_platform in extra_platforms:
-            console.print(f"Downloading wheels for platform {extra_platform}", style="cyan")
+    # Download dependencies for the current platform for each requested python version
+    if not only_extra_platforms:
+        for version in python_versions:
+            pip_version = _version_to_pip_version(version)
+            console.print(f"Downloading wheels for Python {version} (current platform)", style="cyan")
             command = [
                 sys.executable,
                 "-m",
@@ -241,17 +273,43 @@ def wheel(
                 "-d",
                 relative_lib_folder_dir,
                 "--only-binary=:all:",
-                "--platform",
-                extra_platform,
+                "--python-version",
+                pip_version,
             ]
             if extra_index_url:
                 command.extend(["--extra-index-url", extra_index_url])
             if find_links:
                 command.extend(["--find-links", find_links])
             command.append(".")
-
             run_process(command, cwd=extension_dir)
 
+    # Download dependencies for extra platforms for each requested python version
+    if extra_platforms:
+        for extra_platform in extra_platforms:
+            for version in python_versions:
+                pip_version = _version_to_pip_version(version)
+                console.print(f"Downloading wheels for Python {version}, platform {extra_platform}", style="cyan")
+                command = [
+                    sys.executable,
+                    "-m",
+                    "pip",
+                    "download",
+                    "-d",
+                    relative_lib_folder_dir,
+                    "--only-binary=:all:",
+                    "--python-version",
+                    pip_version,
+                    "--platform",
+                    extra_platform,
+                ]
+                if extra_index_url:
+                    command.extend(["--extra-index-url", extra_index_url])
+                if find_links:
+                    command.extend(["--find-links", find_links])
+                command.append(".")
+
+                run_process(command, cwd=extension_dir)
+
     console.print(f"Installed dependencies to {lib_folder}", style="bold green")
 
 

dynatrace_extension/sdk/callback.py

@@ -23,6 +23,7 @@ class WrappedCallback:
         kwargs: dict | None = None,
         running_in_sim=False,
         activation_type: ActivationType | None = None,
+        offset_seconds: float | None = None,
     ):
         self.callback: Callable = callback
         if args is None:
@@ -48,6 +49,7 @@ class WrappedCallback:
         self.timeouts_count = 0  # counter per interval = 1 min by default
         self.exception_count = 0  # counter per interval = 1 min by default
         self.iterations = 0  # how many times we ran the callback iterator for this callback
+        self.offset_seconds = offset_seconds or self.calculate_initial_wait_time()
 
     def get_current_time_with_cluster_diff(self):
         return datetime.now() + timedelta(milliseconds=self.cluster_time_diff)
@@ -97,24 +99,28 @@ class WrappedCallback:
     def name(self):
         return self.callback.__name__
 
+    def calculate_initial_wait_time(self) -> float:
+        """
+        Here we chose a random second between 5 and 55 to start the callback
+        This is to distribute load for extension running on this host
+        """
+
+        now = self.get_current_time_with_cluster_diff()
+        random_second = random.randint(5, 55)  # noqa: S311
+        next_execution = datetime.now().replace(second=random_second, microsecond=0)
+        if next_execution <= now:
+            # The random chosen second already passed this minute
+            next_execution += timedelta(minutes=1)
+        wait_time = (next_execution - now).total_seconds()
+        self.logger.debug(f"Randomly choosing next execution time for callback {self} to be {next_execution}")
+        return wait_time
+
     def initial_wait_time(self) -> float:
-        if not self.running_in_sim:
-            """
-            Here we chose a random second between 5 and 55 to start the callback
-            This is to distribute load for extension running on this host
-            When running from the simulator, this is not done
-            """
-
-            now = self.get_current_time_with_cluster_diff()
-            random_second = random.randint(5, 55)  # noqa: S311
-            next_execution = datetime.now().replace(second=random_second, microsecond=0)
-            if next_execution <= now:
-                # The random chosen second already passed this minute
-                next_execution += timedelta(minutes=1)
-            wait_time = (next_execution - now).total_seconds()
-            self.logger.debug(f"Randomly choosing next execution time for callback {self} to be {next_execution}")
-            return wait_time
-        return 0
+        # When running from the simulator, we don't want any offset
+        if self.running_in_sim:
+            return 0
+
+        return self.offset_seconds
 
     def get_adjusted_metric_timestamp(self) -> datetime:
         """
@@ -151,4 +157,8 @@ class WrappedCallback:
         This is done using execution total, the interval and the start timestamp
         :return: float
         """
-        return self.start_timestamp_monotonic + self.interval.total_seconds() * (self.iterations or 1)
+        return (
+            self.initial_wait_time()
+            + self.start_timestamp_monotonic
+            + self.interval.total_seconds() * (self.iterations or 1)
+        )

dynatrace_extension/sdk/extension.py

@@ -385,6 +385,7 @@ class Extension:
         interval: timedelta | int,
         args: tuple | None = None,
         activation_type: ActivationType | None = None,
+        offset_seconds: float | None = None,
     ) -> None:
         """Schedule a method to be executed periodically.
 
@@ -398,6 +399,7 @@ class Extension:
             args: Arguments to the callback, if any
             activation_type: Optional activation type when this callback should run,
                 can be 'ActivationType.LOCAL' or 'ActivationType.REMOTE'
+            offset_seconds: Optional offset of first execution represented in seconds. Offset is random if `offset_seconds` is `None`.
         """
 
         if isinstance(interval, int):
@@ -407,7 +409,10 @@ class Extension:
             msg = f"Interval must be at least 1 second, got {interval.total_seconds()} seconds"
             raise ValueError(msg)
 
-        callback = WrappedCallback(interval, callback, api_logger, args, activation_type=activation_type)
+        callback = WrappedCallback(
+            interval, callback, api_logger, args, activation_type=activation_type, offset_seconds=offset_seconds
+        )
+
         if self._is_fastcheck:
             self._scheduled_callbacks_before_run.append(callback)
         else: