splunk-soar-sdk 3.2.0__py3-none-any.whl → 3.2.2__py3-none-any.whl

soar_sdk/cli/manifests/processors.py

@@ -5,9 +5,11 @@ from datetime import datetime, UTC
 from pathlib import Path
 from pprint import pprint
 
+from packaging.specifiers import SpecifierSet
+
 from soar_sdk.app import App
 from soar_sdk.cli.path_utils import context_directory
-from soar_sdk.compat import UPDATE_TIME_FORMAT
+from soar_sdk.compat import UPDATE_TIME_FORMAT, PythonVersion
 from soar_sdk.meta.adapters import TOMLDataAdapter
 from soar_sdk.meta.app import AppMeta
 from soar_sdk.meta.dependencies import UvLock
@@ -24,6 +26,22 @@ class ManifestProcessor:
         self.manifest_path = manifest_path
         self.project_context = Path(project_context)
 
+    def get_target_python_versions(self) -> list[str]:
+        """Get the intersection of project requires-python and SDK-supported versions."""
+        sdk_versions = [str(v) for v in PythonVersion.all()]
+
+        with open(self.project_context / "pyproject.toml") as f:
+            requires_python = toml.load(f).get("project", {}).get("requires-python", "")
+
+        if not requires_python:
+            return sdk_versions
+
+        # Use packaging.specifiers to check version compatibility
+        specifier_set = SpecifierSet(requires_python)
+        compatible = [version for version in sdk_versions if version in specifier_set]
+
+        return compatible
+
     def build(self, is_sdk_locally_built: bool = False) -> AppMeta:
         """Builds full AppMeta information including actions and other extra fields."""
         app_meta: AppMeta = self.load_toml_app_meta()
@@ -41,8 +59,11 @@ class ManifestProcessor:
                 dep for dep in dependencies if dep.name != "splunk-soar-sdk"
             ]
 
+        # Get target Python versions from requires-python constraint
+        target_python_versions = self.get_target_python_versions()
+
         app_meta.pip313_dependencies, app_meta.pip314_dependencies = (
-            uv_lock.resolve_dependencies(dependencies)
+            uv_lock.resolve_dependencies(dependencies, target_python_versions)
         )
 
         if app.webhook_meta is not None:

soar_sdk/meta/dependencies.py

@@ -277,9 +277,7 @@ class UvPackage(BaseModel):
         for abi in abi_precedence:
             abi_wheels = [wheel for wheel in self.wheels if abi in wheel.abi_tags]
             for python in python_precedence:
-                python_wheels = [
-                    wheel for wheel in abi_wheels if python in wheel.python_tags
-                ]
+                python_wheels = self._filter_python_wheels(abi_wheels, python, abi)
                 for platform in platform_precedence:
                     platform_wheels = [
                         wheel
@@ -293,6 +291,54 @@ class UvPackage(BaseModel):
             f"Could not find a suitable wheel for {self.name=}, {self.version=}, {abi_precedence=}, {python_precedence=}, {platform_precedence=}"
         )
 
+    def _filter_python_wheels(
+        self, wheels: list[UvWheel], target_python: str, abi: str
+    ) -> list[UvWheel]:
+        """Filter and sort wheels by Python version compatibility.
+
+        For abi3 wheels, prefers the highest compatible minimum version
+        (e.g., cp311-abi3 over cp38-abi3 for Python 3.13).
+        """
+        compatible = [
+            wheel
+            for wheel in wheels
+            if self._is_python_compatible(wheel, target_python, abi)
+        ]
+
+        # For abi3 wheels, prefer highest minimum version (closest to target)
+        if abi == "abi3" and compatible:
+            compatible = sorted(
+                compatible,
+                key=lambda w: max(
+                    (int(tag[2:]) for tag in w.python_tags if tag.startswith("cp")),
+                    default=0,
+                ),
+                reverse=True,
+            )
+
+        return compatible
+
+    def _is_python_compatible(
+        self, wheel: UvWheel, target_python: str, abi: str
+    ) -> bool:
+        """Check if a wheel is compatible with the target Python version.
+
+        For abi3 wheels, the Python tag indicates minimum version (e.g., cp311-abi3 works with Python ≥3.11).
+        For non-abi3 wheels, exact tag matching is required.
+        """
+        if target_python in wheel.python_tags:
+            return True
+
+        # For abi3 wheels, check if target >= minimum version (e.g., cp313 >= cp311)
+        if abi == "abi3":
+            return any(
+                int(tag[2:]) <= int(target_python[2:])
+                for tag in wheel.python_tags
+                if tag.startswith("cp") and target_python.startswith("cp")
+            )
+
+        return False
+
     _manylinux_precedence: ClassVar[list[str]] = [
         "_2_28",  # glibc 2.28, latest stable version, supports Ubuntu 18.10+ and RHEL/Oracle 8+
         "_2_17",  # glibc 2.17, LTS-ish, supports Ubuntu 13.10+ and RHEL/Oracle 7+
@@ -450,23 +496,35 @@ class UvLock(BaseModel):
     @staticmethod
     def resolve_dependencies(
         packages: list[UvPackage],
+        python_versions: list[str] | None = None,
     ) -> tuple[DependencyList, DependencyList]:
-        """Resolve the dependencies for the given packages."""
-        py313_wheels: list[DependencyWheel] = []
-        py314_wheels: list[DependencyWheel] = []
+        """Resolve the dependencies for the given packages.
+
+        Args:
+            packages: List of packages to resolve dependencies for.
+            python_versions: List of Python versions to resolve for (e.g., ["3.13", "3.14"]).
+                           If None, defaults to ["3.13", "3.14"] for backwards compatibility.
+
+        Returns:
+            Tuple of (py313_dependencies, py314_dependencies).
+        """
+        python_versions = python_versions or ["3.13", "3.14"]
+        resolve_both = len(python_versions) == 2
+
+        py313_wheels, py314_wheels = [], []
 
         for package in packages:
-            wheel_313 = package.resolve_py313()
-            wheel_314 = package.resolve_py314()
-
-            if wheel_313 == wheel_314:
-                wheel_313.add_platform_prefix("shared")
-                wheel_314.add_platform_prefix("shared")
-            else:
-                wheel_313.add_platform_prefix("python313")
-                wheel_314.add_platform_prefix("python314")
-
-            py313_wheels.append(wheel_313)
-            py314_wheels.append(wheel_314)
+            wheel_313 = package.resolve_py313() if "3.13" in python_versions else None
+            wheel_314 = package.resolve_py314() if "3.14" in python_versions else None
+
+            prefix = "shared" if not resolve_both or wheel_313 == wheel_314 else None
+
+            if wheel_313:
+                wheel_313.add_platform_prefix(prefix or "python313")
+                py313_wheels.append(wheel_313)
+
+            if wheel_314:
+                wheel_314.add_platform_prefix(prefix or "python314")
+                py314_wheels.append(wheel_314)
 
         return DependencyList(wheel=py313_wheels), DependencyList(wheel=py314_wheels)

{splunk_soar_sdk-3.2.0.dist-info → splunk_soar_sdk-3.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: splunk-soar-sdk
-Version: 3.2.0
+Version: 3.2.2
 Summary: The official framework for developing and testing Splunk SOAR Apps
 Project-URL: Homepage, https://github.com/phantomcyber/splunk-soar-sdk
 Project-URL: Documentation, https://github.com/phantomcyber/splunk-soar-sdk

{splunk_soar_sdk-3.2.0.dist-info → splunk_soar_sdk-3.2.2.dist-info}/RECORD

@@ -38,7 +38,7 @@ soar_sdk/cli/init/cli.py,sha256=LWwGb_N5KPpKjnk8Kn3IppSrGsHQb65CvDn2NXPokAE,1461
 soar_sdk/cli/manifests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 soar_sdk/cli/manifests/cli.py,sha256=cly5xVdj4bBIdZVMQPIWTXRgUfd1ON3qKO-76Fwql18,524
 soar_sdk/cli/manifests/deserializers.py,sha256=TjcmPvcfr1auGkf3hBRwjVc0dSuuDNmH5jMOqXHz27s,16515
-soar_sdk/cli/manifests/processors.py,sha256=uHWEjY6tu3TZ680SbBbmupwtLhINI6lwdmEsfw4Bkw0,3912
+soar_sdk/cli/manifests/processors.py,sha256=PbzARZvMUCkQrrzjRVVOsb0dTV_u5BMXx52e3t0V9-w,4797
 soar_sdk/cli/manifests/serializers.py,sha256=hSfOcBNhv7s437A7t5BM1NXG5dfjKmh_xbHXQTuBklA,3632
 soar_sdk/cli/package/cli.py,sha256=8AWItAAXzfjJMRLwDIRbrN9cQhy7clBX7WrOmdcGClw,9499
 soar_sdk/cli/package/utils.py,sha256=zZmpWg76Vb3rtGn28aPhPHt1JUWR6eIByU6DTTRC3ng,1584
@@ -62,7 +62,7 @@ soar_sdk/meta/actions.py,sha256=YadG8Zkc0SWmcG5-Dj4NyWlYYAh4CyJksLYp_GmNZNM,1818
 soar_sdk/meta/adapters.py,sha256=KjSYIUtkCz2eesA_vhsNCjfi5C-Uz71tbSuDIjhuB8U,1112
 soar_sdk/meta/app.py,sha256=eZlM8GIY1B_o-RzJrRNCNVEQSx0sFupxZqCM7sIWGv4,2777
 soar_sdk/meta/datatypes.py,sha256=piR-oBVAATiRciXSdVE7XaqjUZTgSaOvTEqcOcNvCS0,795
-soar_sdk/meta/dependencies.py,sha256=DZr38K_1rKh7OzlIb5nLbdDH8xOHArr48H8Ra6rcB4k,18259
+soar_sdk/meta/dependencies.py,sha256=tU-73gXUCCh_vCU8RD5lBDdJV4fXlrFSmtNzw6GXeIE,20446
 soar_sdk/meta/webhooks.py,sha256=E5pdoD9j7FDeM2DBTO2h9Yw6-5flzp-NfhM_M1oPAUU,1216
 soar_sdk/models/__init__.py,sha256=ql7RRFAxmSdzU-IsoU1OFQ53E6WxZJ7YQQAhHl4Ssbk,380
 soar_sdk/models/artifact.py,sha256=OlYp150sf9sYvTz6tC7PaYV1qbBvQYrz1bXmC2xNj8Q,1086
@@ -100,8 +100,8 @@ soar_sdk/views/components/pie_chart.py,sha256=LVTeHVJN6nf2vjUs9y7PDBhS0U1fKW750l
 soar_sdk/webhooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 soar_sdk/webhooks/models.py,sha256=PG9SDs5xXqtFndm5C8AsJOTYXU5v_UTY7SpYosWT_CA,4542
 soar_sdk/webhooks/routing.py,sha256=MnzbnIDy2uG_5mJzsTeX-NsE6QYvzyqEGbHmEFj-DG8,6900
-splunk_soar_sdk-3.2.0.dist-info/METADATA,sha256=sL-PyINCXBsGJ-bPeHqiXCshp4IeLhs4HGHT171Uucs,7334
-splunk_soar_sdk-3.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-splunk_soar_sdk-3.2.0.dist-info/entry_points.txt,sha256=CgBjo2ZWpYNkt9TgvToL26h2Tg1yt8FbvYTb5NVgNuc,51
-splunk_soar_sdk-3.2.0.dist-info/licenses/LICENSE,sha256=gNCGrGhrSQb1PUzBOByVUN1tvaliwLZfna-QU2r2hQ8,11345
-splunk_soar_sdk-3.2.0.dist-info/RECORD,,
+splunk_soar_sdk-3.2.2.dist-info/METADATA,sha256=AH5_rxuydArLcHkhpueEJbpJuOgXfl4d8zVh9YCZ3mA,7334
+splunk_soar_sdk-3.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+splunk_soar_sdk-3.2.2.dist-info/entry_points.txt,sha256=CgBjo2ZWpYNkt9TgvToL26h2Tg1yt8FbvYTb5NVgNuc,51
+splunk_soar_sdk-3.2.2.dist-info/licenses/LICENSE,sha256=gNCGrGhrSQb1PUzBOByVUN1tvaliwLZfna-QU2r2hQ8,11345
+splunk_soar_sdk-3.2.2.dist-info/RECORD,,