os-normalizer 0.4.2__py3-none-any.whl → 0.5.0__py3-none-any.whl

os_normalizer/parsers/windows.py

@@ -12,6 +12,7 @@ from os_normalizer.constants import (
     WINDOWS_NT_SERVER_MAP,
     WINDOWS_PRODUCT_PATTERNS,
     WINDOWS_SERVER_BUILD_MAP,
+    PrecisionLevel,
 )
 from os_normalizer.helpers import extract_arch_from_text, update_confidence
 
@@ -20,7 +21,8 @@ if TYPE_CHECKING:
 
 VERSION_PATTERN = re.compile(r"\b(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?\b")
 NT_PATTERN = re.compile(r"\bnt\s*(\d+)(?:\.(\d+))?", re.IGNORECASE)
-BUILD_PATTERN = re.compile(r"\bbuild\s*(?:number\s*)?(\d{3,5})\b", re.IGNORECASE)
+BUILD_PATTERN = re.compile(r"\bbuild\s*(?:number\s*)?[:=\s-]*?(\d{3,5})\b", re.IGNORECASE)
+KERNEL_PATTERN = re.compile(r"\bkernel\s*[:=\s-]*?(\d+)(?:\.(\d+))?", re.IGNORECASE)
 SP_PATTERN = re.compile(r"\bsp(\d)\b", re.IGNORECASE)
 
 EDITION_KEYWORDS: list[tuple[str, str]] = [
@@ -141,6 +143,13 @@ def _extract_version_state(text: str) -> VersionState:
             state.nt_minor = state.nt_minor if state.nt_minor is not None else minr
         state.explicit = True
 
+    if state.nt_major is None:
+        kernel_match = KERNEL_PATTERN.search(text)
+        if kernel_match:
+            state.nt_major = int(kernel_match.group(1))
+            state.nt_minor = int(kernel_match.group(2)) if kernel_match.group(2) else 0
+            state.explicit = True
+
     if state.build is None:
         build_match = BUILD_PATTERN.search(text)
         if build_match:
@@ -157,11 +166,8 @@ def _apply_build_context(state: VersionState, product: str | None, server_hint:
         return product, server_hint
 
     product_from_build, channel, is_server_build = _lookup_build(build_num, server_hint)
-    if product_from_build:
-        if not product:
-            product = product_from_build
-        elif product != product_from_build and _build_inference_is_more_precise(product, product_from_build):
-            product = product_from_build
+    if product_from_build and (not product or _build_inference_should_replace(product, product_from_build)):
+        product = product_from_build
     if is_server_build:
         server_hint = True
     state.channel = channel
@@ -192,11 +198,18 @@ def _apply_version_numbers(p: OSData, defaults: ProductDefaults, state: VersionS
 def _set_kernel_version(p: OSData, defaults: ProductDefaults | None, state: VersionState) -> None:
     """Populate kernel_version using explicit tokens, build channel, or defaults."""
     kernel_version: str | None = None
-    if state.explicit and state.nt_major is not None:
-        if state.nt_major >= 10 and state.channel:
-            kernel_version = state.channel
-        elif state.nt_minor is not None:
+    if (
+        state.explicit
+        and state.channel
+        and (state.nt_major is None or state.nt_major >= 10)
+        and (defaults is None or defaults.kernel_version is None)
+    ):
+        kernel_version = state.channel
+    elif state.explicit and state.nt_major is not None:
+        if state.nt_minor is not None:
             kernel_version = f"{state.nt_major}.{state.nt_minor}"
+        elif state.nt_major >= 10 and state.channel:
+            kernel_version = state.channel
     if kernel_version is None and defaults and defaults.kernel_version:
         kernel_version = defaults.kernel_version
     if kernel_version:
@@ -253,13 +266,16 @@ def _lookup_build(build_num: int, server_hint: bool) -> tuple[str | None, str |
     return candidate
 
 
-def _build_inference_is_more_precise(existing: str, inferred: str) -> bool:
-    """Return True when the build map provides a more specific client SKU."""
-    if existing in {"Windows 10", "Windows 10/11"} and inferred.startswith("Windows 11"):
-        return True
-    if existing == "Windows 10/11" and inferred == "Windows 10":
-        return True
-    return False
+def _build_inference_should_replace(existing: str, inferred: str) -> bool:
+    """Return True when build metadata should override a detected product label."""
+    existing_lower = existing.lower()
+    inferred_lower = inferred.lower()
+
+    if existing_lower == inferred_lower:
+        return False
+    if inferred_lower.startswith(existing_lower):
+        return False
+    return True
 
 
 def _product_from_nt(major: int, minor: int, server_hint: bool) -> str | None:
@@ -274,13 +290,13 @@ def _derive_precision(
     minor: int | None,
     patch: int | None,
     build: str | None,
-) -> str:
+) -> PrecisionLevel:
     if build:
-        return "build"
+        return PrecisionLevel.BUILD
     if patch is not None and patch != 0:
-        return "patch"
+        return PrecisionLevel.PATCH
     if minor is not None:
-        return "minor"
+        return PrecisionLevel.MINOR
     if major is not None:
-        return "major"
-    return "product"
+        return PrecisionLevel.MAJOR
+    return PrecisionLevel.PRODUCT

{os_normalizer-0.4.2.dist-info → os_normalizer-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: os-normalizer
-Version: 0.4.2
+Version: 0.5.0
 Summary: Normalize raw OS strings/metadata into structured data (family, product, version, arch).
 Project-URL: Homepage, https://github.com/johnscillieri/os-normalizer
 Project-URL: Repository, https://github.com/johnscillieri/os-normalizer
@@ -38,6 +38,7 @@ Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: System :: Operating System
 Requires-Python: >=3.11

os_normalizer-0.5.0.dist-info/RECORD

@@ -0,0 +1,24 @@
+os_normalizer/__init__.py,sha256=ZA2JnO3juuAn8xQBqUoUXxca10B-rE1MIuwtzDofpKs,212
+os_normalizer/constants.py,sha256=5qGUmZp7wYLjoyPng60ILEG14vDNq6DxywE2zsdHi6c,8550
+os_normalizer/cpe.py,sha256=sf_fa7dCNUuGCKY_v2lEEUcKsZkh6NLavIGz0QjVD_o,11126
+os_normalizer/helpers.py,sha256=sNKSiD0AhmEXwNsQtgTfT3L8TIwmv_KgLSP5h6p7NxI,3820
+os_normalizer/models.py,sha256=c2uR9E5CVQUjdlXb0VIjwezEAY9fLuFyxA2oaOQ1YTw,6720
+os_normalizer/os_normalizer.py,sha256=pTbNSQIfxI26vg73yOE8znG71ksd78RYzcGMvSi0z1s,11541
+os_normalizer/parsers/__init__.py,sha256=UfknAu-0M7uQ8wMHBlhUcVVOtylBHCgyEenMiwatnRo,427
+os_normalizer/parsers/bsd.py,sha256=krhrslh1nRAjeo_lg8_DhxygHUaUGV0srXUsNoWJVOg,2082
+os_normalizer/parsers/esxi.py,sha256=tmDUk7Y45EQP9oqMaLsptMyq_G0z1Ki_Rgh_59W-4os,2694
+os_normalizer/parsers/linux.py,sha256=jeRQcOAv-m7UuY6qiFKqbdPqLT8ywRCVBKq_TSFZCxs,3983
+os_normalizer/parsers/macos.py,sha256=LeVS8OK9LgN8Y05KgfGOJdqOSgvfeFYNPc4MG3-gc-I,3728
+os_normalizer/parsers/mobile.py,sha256=3D7rErCBMYiJtdZv-VPKhrc6Du236ch4yrnfuR1zWbs,1824
+os_normalizer/parsers/solaris.py,sha256=mJjzk5chFKSy2NEHzq5xUPtk_123JJKQZhP9oKa8N7I,3233
+os_normalizer/parsers/windows.py,sha256=g8aPsKMmg2M7olNf-SDWw8OGHu0dAwPYw9CwhRdBzkg,11561
+os_normalizer/parsers/network/__init__.py,sha256=-zKHQAj2DRj4N5R5bNmZpO7LeWGsvI_0OQInrs2ZWn4,1848
+os_normalizer/parsers/network/cisco.py,sha256=oRnuN9aVevgwx4g9o-XOqYMc19I-jOPsAQvVVQ_GI-s,3521
+os_normalizer/parsers/network/fortinet.py,sha256=ex004jd4V6jXZKNxIXiU5Hlnt60aeD98aZNAC5dKETo,2157
+os_normalizer/parsers/network/huawei.py,sha256=U1xjiMWnx8gyUMPZ6f-upLbJy8ATAk4-fXSVFymH5tE,1432
+os_normalizer/parsers/network/juniper.py,sha256=XXSzPkJy2JraBI5eS8A9vV5w4othWGXVOsNw1hQfUfc,1562
+os_normalizer/parsers/network/netgear.py,sha256=4_J7E50hqAgLK9yH3wZk3CSFFAcx1gRMdcs7CgNn2Cc,1502
+os_normalizer-0.5.0.dist-info/METADATA,sha256=gR7vyVnbPCLJXPvFPAjbQYANrfbTjIvpitolDbWQD4w,6506
+os_normalizer-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+os_normalizer-0.5.0.dist-info/licenses/LICENSE,sha256=DN0enoiHxVkJ-hxmIchPaCQWrDsZwva5LY8XvG3UK8w,1083
+os_normalizer-0.5.0.dist-info/RECORD,,

os_normalizer-0.4.2.dist-info/RECORD

@@ -1,22 +0,0 @@
-os_normalizer/__init__.py,sha256=ZA2JnO3juuAn8xQBqUoUXxca10B-rE1MIuwtzDofpKs,212
-os_normalizer/constants.py,sha256=fYva32rcHqEYKe7tKzu3_poaPWvnKJrC-tkTWbLS3sk,6049
-os_normalizer/cpe.py,sha256=yzokJ3Iv4fNLcrCySe58IaESXBeinORVOcJGUov3Mzo,9731
-os_normalizer/helpers.py,sha256=IymYS2NAJ6J8ngI_HL5PH2_6zN6zzIpWMx1-05D2O3c,3347
-os_normalizer/models.py,sha256=ONEEdsjH6OsOLVNFjnHz5wME--cIuvZiLwt_oK1tXzA,6246
-os_normalizer/os_normalizer.py,sha256=IsWxE_Yes7FQxxNhA8twNrzmeRcl8QXTxjTfn0zCTTI,10143
-os_normalizer/parsers/__init__.py,sha256=l9kx_P7FUHy--AxygZ8Q8nlyxyoSRRTREmp40M73Gxg,324
-os_normalizer/parsers/bsd.py,sha256=Umm7RSXjQfv6pfziJ8BYlmOc80VlLRueTrYw1iR-UjY,2018
-os_normalizer/parsers/linux.py,sha256=kSIYZ_hRJxJieV21u8TRcWfAjYOIXlCLBSwyINkuyA4,3867
-os_normalizer/parsers/macos.py,sha256=fU1YyiijzBdDAxUBSL2EQLhUu3JbOSx-N_KYvOg0XsI,3627
-os_normalizer/parsers/mobile.py,sha256=Ca864JhrO9zW5fs0zbs2VcMypKIkFHqZtxpJDbi12q0,1033
-os_normalizer/parsers/windows.py,sha256=-dWS2KJltDXThsQL78ulyn6S4Q7QW5QMRklKosvQF30,10930
-os_normalizer/parsers/network/__init__.py,sha256=TvRz08lNDZbr6yG8O3M7cLNu0hWAbtE1y7_9SwhP4g4,1596
-os_normalizer/parsers/network/cisco.py,sha256=ivhw85IHnHVT4sW-65F-ZGCR7yvu0mMMBfXRT4EzUfc,3203
-os_normalizer/parsers/network/fortinet.py,sha256=i6PVRxzO_onaCvo3_eI4csXFwGp4ZpQY0d1y2-Wodn0,1783
-os_normalizer/parsers/network/huawei.py,sha256=Su3eCRlmOCmpOPA_TGeH8gHY3-ZdXKFW4O3_W0SOPmk,1158
-os_normalizer/parsers/network/juniper.py,sha256=gskbaY4-LYWauM9yrvGMuCxPrNBKmUfIRPd1zsUUY7w,1275
-os_normalizer/parsers/network/netgear.py,sha256=idVD7VTxb07LdhFPwb-sT3586ARoBrd1OmWpADAZUVc,1190
-os_normalizer-0.4.2.dist-info/METADATA,sha256=ipNU2HGD2BpwGh9jj0v5a6hYgvjR5qJN1M8apT0FwKk,6455
-os_normalizer-0.4.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-os_normalizer-0.4.2.dist-info/licenses/LICENSE,sha256=DN0enoiHxVkJ-hxmIchPaCQWrDsZwva5LY8XvG3UK8w,1083
-os_normalizer-0.4.2.dist-info/RECORD,,