os-normalizer 0.3.2__tar.gz

os_normalizer-0.3.2/.gitignore

@@ -0,0 +1,10 @@
+# Python-generated files
+__pycache__/
+*.py[oc]
+build/
+dist/
+wheels/
+*.egg-info
+
+# Virtual environments
+.venv

os_normalizer-0.3.2/.python-version

@@ -0,0 +1 @@
+3.13

os_normalizer-0.3.2/CHANGELOG.md

@@ -0,0 +1,35 @@
+# Changelog
+
+All notable changes to this project are documented here.
+This file adheres to Keep a Changelog and Semantic Versioning.
+
+## [Unreleased]
+
+## [0.3.1] - 2025-09-09
+
+- Added: Table printing of all OS values.
+
+## [0.3.0] - 2025-09-09
+
+- Added: Support merging in new data to combine observations.
+- Added: Tests covering merge behavior.
+
+## [0.2.0] - 2025-09-09
+
+- Added: Additional `os_key` data for broader OS coverage.
+- Changed: Improve Linux and macOS parsing; update BSD product extraction; better Windows version identification; fix Darwin kernel parsing.
+- Changed: Break up network parsing into vendor-specific modules; general code cleanup; repo structure tidy-up.
+- Changed: Rename `OSParse` to `OSData`; project renamed to `os_normalizer`.
+- Changed: Adopt Ruff and reformat codebase; fix linter errors; improve test harness.
+- Fixed: Failing tests (including `tests/test_full.py`).
+- Removed: Old `Observation` class; now parse text and data directly.
+
+## [0.1.0] - 2025-09-06
+
+- Initial release.
+
+[Unreleased]: https://github.com/johnscillieri/os-normalizer/compare/v0.3.1...HEAD
+[0.3.1]: https://github.com/johnscillieri/os-normalizer/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/johnscillieri/os-normalizer/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/johnscillieri/os-normalizer/compare/v0.1.0...v0.2.0
+[0.1.0]: https://github.com/johnscillieri/os-normalizer/releases/tag/v0.1.0

os_normalizer-0.3.2/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 OS Normalizer contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

os_normalizer-0.3.2/PKG-INFO

@@ -0,0 +1,172 @@
+Metadata-Version: 2.4
+Name: os-normalizer
+Version: 0.3.2
+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
+Project-URL: Issues, https://github.com/johnscillieri/os-normalizer/issues
+Project-URL: Changelog, https://github.com/johnscillieri/os-normalizer/releases
+License: MIT License
+        
+        Copyright (c) 2025 OS Normalizer contributors
+        
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the "Software"), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
+        furnished to do so, subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
+License-File: LICENSE
+Keywords: cpe,fingerprint,normalize,os,parsing
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+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: Topic :: Software Development :: Libraries
+Classifier: Topic :: System :: Operating System
+Requires-Python: >=3.11
+Description-Content-Type: text/markdown
+
+# OS Normalizer
+
+A Python library for identifying and parsing operating system information from various sources.
+
+## Overview
+
+The OS Normalizer library parses raw operating system strings and JSON data to identify the OS family, version, architecture, and other details. It supports parsing of:
+
+- Windows (NT builds, versions)
+- macOS (Darwin versions, codenames)
+- Linux distributions (Ubuntu, Debian, Red Hat, etc.)
+- iOS and Android mobile OS
+- BSD variants (FreeBSD, OpenBSD, NetBSD)
+- Network operating systems (Cisco IOS, Junos, FortiOS, etc.)
+
+## Installation
+
+```bash
+pip install os-normalizer
+```
+
+## Usage
+
+The main entry point is the `normalize_os` function, which takes a string and an optional data dictionary and returns a structured `OSData` result.
+
+### Basic Usage
+
+```python
+from os_normalizer import normalize_os
+
+# Parse the OS information
+result = normalize_os("Windows NT 10.0 build 22631 Enterprise x64")
+print(result.family)  # windows
+print(result.product)  # Windows 11
+print(result.version_major)  # 11
+```
+
+### Using Raw OS JSON Data
+
+```python
+from os_normalizer import normalize_os
+
+# Fingerprint with both raw string and JSON data
+raw_os_string="Linux host 5.15.0-122-generic x86_64"
+raw_os_json={
+    "os_release": 'NAME="Ubuntu"\nID=ubuntu\nVERSION_ID="22.04.4"\nVERSION_CODENAME=jammy\nPRETTY_NAME="Ubuntu 22.04.4 LTS"'}
+
+result = normalize_os(raw_os_string, raw_os_json)
+print(result.family)  # linux
+print(result.product)  # Ubuntu
+print(result.codename)  # Jammy
+print(result.arch)  # x86_64
+```
+
+### Parsing Network Operating Systems
+
+```python
+from os_normalizer import normalize_os
+
+# Parse Cisco IOS XE
+raw_os_string="Cisco IOS XE Software, Version 17.9.4a (Amsterdam) C9300-24T, universalk9, c9300-universalk9.17.09.04a.SPA.bin"
+
+result = normalize_os(raw_os_string)
+print(result.family)  # network-os
+print(result.vendor)  # Cisco
+print(result.product)  # IOS XE
+```
+
+## Models
+
+### OSData
+
+Represents structured operating system information:
+
+- `family`: OS family (windows, linux, macos, ios, android, bsd, network-os)
+- `vendor`: Vendor name (Microsoft, Apple, Cisco, etc.)
+- `product`: Product name (Windows 11, Ubuntu, macOS, etc.)
+- `edition`: Edition information (Pro, Enterprise, etc.)
+- `codename`: Release codename (Sequoia, Ventura, etc.)
+- `channel`: Release channel (GA, LTS, etc.)
+- `version_major`, `version_minor`, `version_patch`, `version_build`: Version components
+- `kernel_name`, `kernel_version`: Kernel details
+- `arch`: Architecture (x86_64, arm64, etc.)
+- `distro`: Distribution name
+- `like_distros`: List of similar distributions
+- `pretty_name`: Pretty formatted name
+- `hw_model`, `build_id`: Network device details
+- `precision`: Precision level (family, product, major, minor, patch, build)
+- `confidence`: Confidence score (0.0 to 1.0)
+- `evidence`: Evidence used for parsing decisions
+- `os_key`: Canonical key for deduplication
+
+## Architecture
+
+The library follows a modular architecture:
+
+- **os_normalizer.py**: Main orchestration logic that delegates to appropriate parsers
+- **parsers/**: OS-specific parsers (macOS, Linux, Windows, Network, Mobile, BSD)
+- **models.py**: Data models for parsed results
+- **constants.py**: Static lookup tables (aliases, build maps, codenames)
+- **helpers.py**: Utility functions (architecture extraction, confidence calculation)
+
+## Testing
+
+You can run tests with uv in a few ways:
+
+- Ephemeral runner (downloads pytest if needed):
+  - `uvx pytest`
+- Use the project environment and dev dependencies declared in `pyproject.toml`:
+  - `uv run --group dev pytest`
+- Optional editable install for import paths:
+  - `uv pip install -e .`
+  - `uv run pytest`
+
+### Using Nox (with nox-uv)
+
+If you prefer repeatable sessions, this project includes Nox configured with the `nox-uv` plugin so virtualenvs are created via `uv`:
+
+- Run tests: `uv run nox`
+
+## Contributing
+
+Contributions are welcome! Please ensure that any new parsers or improvements follow the existing code patterns and include appropriate tests.
+
+## License
+
+MIT

os_normalizer-0.3.2/README.md

@@ -0,0 +1,127 @@
+# OS Normalizer
+
+A Python library for identifying and parsing operating system information from various sources.
+
+## Overview
+
+The OS Normalizer library parses raw operating system strings and JSON data to identify the OS family, version, architecture, and other details. It supports parsing of:
+
+- Windows (NT builds, versions)
+- macOS (Darwin versions, codenames)
+- Linux distributions (Ubuntu, Debian, Red Hat, etc.)
+- iOS and Android mobile OS
+- BSD variants (FreeBSD, OpenBSD, NetBSD)
+- Network operating systems (Cisco IOS, Junos, FortiOS, etc.)
+
+## Installation
+
+```bash
+pip install os-normalizer
+```
+
+## Usage
+
+The main entry point is the `normalize_os` function, which takes a string and an optional data dictionary and returns a structured `OSData` result.
+
+### Basic Usage
+
+```python
+from os_normalizer import normalize_os
+
+# Parse the OS information
+result = normalize_os("Windows NT 10.0 build 22631 Enterprise x64")
+print(result.family)  # windows
+print(result.product)  # Windows 11
+print(result.version_major)  # 11
+```
+
+### Using Raw OS JSON Data
+
+```python
+from os_normalizer import normalize_os
+
+# Fingerprint with both raw string and JSON data
+raw_os_string="Linux host 5.15.0-122-generic x86_64"
+raw_os_json={
+    "os_release": 'NAME="Ubuntu"\nID=ubuntu\nVERSION_ID="22.04.4"\nVERSION_CODENAME=jammy\nPRETTY_NAME="Ubuntu 22.04.4 LTS"'}
+
+result = normalize_os(raw_os_string, raw_os_json)
+print(result.family)  # linux
+print(result.product)  # Ubuntu
+print(result.codename)  # Jammy
+print(result.arch)  # x86_64
+```
+
+### Parsing Network Operating Systems
+
+```python
+from os_normalizer import normalize_os
+
+# Parse Cisco IOS XE
+raw_os_string="Cisco IOS XE Software, Version 17.9.4a (Amsterdam) C9300-24T, universalk9, c9300-universalk9.17.09.04a.SPA.bin"
+
+result = normalize_os(raw_os_string)
+print(result.family)  # network-os
+print(result.vendor)  # Cisco
+print(result.product)  # IOS XE
+```
+
+## Models
+
+### OSData
+
+Represents structured operating system information:
+
+- `family`: OS family (windows, linux, macos, ios, android, bsd, network-os)
+- `vendor`: Vendor name (Microsoft, Apple, Cisco, etc.)
+- `product`: Product name (Windows 11, Ubuntu, macOS, etc.)
+- `edition`: Edition information (Pro, Enterprise, etc.)
+- `codename`: Release codename (Sequoia, Ventura, etc.)
+- `channel`: Release channel (GA, LTS, etc.)
+- `version_major`, `version_minor`, `version_patch`, `version_build`: Version components
+- `kernel_name`, `kernel_version`: Kernel details
+- `arch`: Architecture (x86_64, arm64, etc.)
+- `distro`: Distribution name
+- `like_distros`: List of similar distributions
+- `pretty_name`: Pretty formatted name
+- `hw_model`, `build_id`: Network device details
+- `precision`: Precision level (family, product, major, minor, patch, build)
+- `confidence`: Confidence score (0.0 to 1.0)
+- `evidence`: Evidence used for parsing decisions
+- `os_key`: Canonical key for deduplication
+
+## Architecture
+
+The library follows a modular architecture:
+
+- **os_normalizer.py**: Main orchestration logic that delegates to appropriate parsers
+- **parsers/**: OS-specific parsers (macOS, Linux, Windows, Network, Mobile, BSD)
+- **models.py**: Data models for parsed results
+- **constants.py**: Static lookup tables (aliases, build maps, codenames)
+- **helpers.py**: Utility functions (architecture extraction, confidence calculation)
+
+## Testing
+
+You can run tests with uv in a few ways:
+
+- Ephemeral runner (downloads pytest if needed):
+  - `uvx pytest`
+- Use the project environment and dev dependencies declared in `pyproject.toml`:
+  - `uv run --group dev pytest`
+- Optional editable install for import paths:
+  - `uv pip install -e .`
+  - `uv run pytest`
+
+### Using Nox (with nox-uv)
+
+If you prefer repeatable sessions, this project includes Nox configured with the `nox-uv` plugin so virtualenvs are created via `uv`:
+
+- Run tests: `uv run nox`
+
+## Contributing
+
+Contributions are welcome! Please ensure that any new parsers or improvements follow the existing code patterns and include appropriate tests.
+
+## License
+
+MIT

os_normalizer-0.3.2/RELEASING.md

@@ -0,0 +1,71 @@
+# Releasing to PyPI
+
+This project uses a modern PEP 621 `pyproject.toml` with the Hatchling build backend. Below are the steps to build and publish to TestPyPI and PyPI using uv (recommended) or Twine.
+
+## Prereqs
+
+- Python 3.11+
+- `uv` installed (https://github.com/astral-sh/uv)
+- PyPI accounts and API tokens for TestPyPI and/or PyPI
+
+## Project metadata checklist
+
+- Verify `pyproject.toml` fields:
+  - `name`, `version`, `description`, `readme`, `requires-python`
+  - `classifiers`, `keywords`, `license`
+  - `project.urls` (Homepage/Repository/Issues/Changelog)
+- Ensure `LICENSE` exists and matches the license in `pyproject.toml`.
+- Ensure `README.md` renders nicely on PyPI (use Markdown; referenced images should be absolute URLs).
+- Update `CHANGELOG.md` with the release version and date.
+- Optionally add `__version__` if you want a runtime version attribute.
+
+## Run tests and lint
+
+- `uv run --group dev pytest -q`
+- Optionally: `uv run --group dev ruff check .`
+
+## Build distributions
+
+Using uv’s build:
+
+- `uv build`  # builds both sdist and wheel into `dist/`
+
+Alternatively using `build`:
+
+- `uvx build`  # ephemeral install of the build frontend
+
+## Verify distributions locally
+
+- `uvx twine check dist/*`
+
+## Publish to TestPyPI first (recommended)
+
+1) Create a TestPyPI API token (https://test.pypi.org/manage/account/token/).
+2) Upload:
+   - `uvx twine upload --repository testpypi dist/*`
+3) Install and smoke test from TestPyPI in a clean env:
+   - `uv venv -p 3.11 .release-test`
+   - `uv run --python .release-test/bin/python -m pip install -U pip`
+   - `uv run --python .release-test/bin/python -m pip install -i https://test.pypi.org/simple/ os-normalizer`
+   - `uv run --python .release-test/bin/python -c "import os_normalizer as m; print(m.__all__)"`
+
+## Publish to PyPI
+
+1) Create a PyPI API token (https://pypi.org/manage/account/token/).
+2) Upload:
+   - `uvx twine upload dist/*`
+
+## Versioning and tagging
+
+- Update `version` in `pyproject.toml` following SemVer (e.g., 0.3.2) by running
+  - `uv version --bump <major|minor|patch> --dry-run`  <- confirm that's what you want
+  - `uv version --bump <major|minor|patch>`
+
+- Tag the release in git once published:
+  - `git tag -a v0.3.2 -m "Release 0.3.2"`
+  - `git push origin v0.3.2`
+
+## Post-release
+
+- Bump to the next dev version if desired (e.g. `0.3.3.dev0`).
+- Open an issue for any follow-ups or hotfixes discovered after release.

os_normalizer-0.3.2/os_normalizer/__init__.py

@@ -0,0 +1,10 @@
+from .models import OSData
+from .os_normalizer import choose_best_fact, normalize_os, merge_os, update_os
+
+__all__ = [
+    "OSData",
+    "choose_best_fact",
+    "normalize_os",
+    "merge_os",
+    "update_os",
+]

os_normalizer-0.3.2/os_normalizer/constants.py

@@ -0,0 +1,87 @@
+"""Constants and static lookup tables for the OS fingerprinting package."""
+
+# Architecture synonyms
+ARCH_SYNONYMS = {
+    "x64": "x86_64",
+    "x86_64": "x86_64",
+    "amd64": "x86_64",
+    "x86": "x86",
+    "i386": "x86",
+    "i686": "x86",
+    "aarch64": "arm64",
+    "arm64": "arm64",
+    "armv8": "arm64",
+    "armv7": "arm",
+    "armv7l": "arm",
+    "ppc64le": "ppc64le",
+}
+
+# Windows build map (build number range -> product name, marketing channel)
+WINDOWS_BUILD_MAP = [
+    # Windows 10
+    (10240, 10240, "Windows 10", "1507"),
+    (10586, 10586, "Windows 10", "1511"),
+    (14393, 14393, "Windows 10", "1607"),
+    (15063, 15063, "Windows 10", "1703"),
+    (16299, 16299, "Windows 10", "1709"),
+    (17134, 17134, "Windows 10", "1803"),
+    (17763, 17763, "Windows 10", "1809"),
+    (18362, 18363, "Windows 10", "1903/1909"),
+    (19041, 19045, "Windows 10", "2004/20H2/21H1/21H2/22H2"),
+    # Windows 11
+    (22000, 22000, "Windows 11", "21H2"),
+    (22621, 22630, "Windows 11", "22H2"),
+    (22631, 25999, "Windows 11", "23H2"),
+    (26100, 26199, "Windows 11", "24H2"),
+]
+
+# Windows NT version tuple -> client product (ambiguous NT 6.x split out)
+WINDOWS_NT_CLIENT_MAP = {
+    (4, 0): "Windows NT 4.0",
+    (5, 0): "Windows 2000",
+    (5, 1): "Windows XP",
+    (5, 2): "Windows XP x64/Server 2003",  # NT 5.2 often maps to XP x64 on client
+    (6, 0): "Windows Vista",
+    (6, 1): "Windows 7",
+    (6, 2): "Windows 8",
+    (6, 3): "Windows 8.1",
+    (10, 0): "Windows 10/11",
+}
+
+# Windows NT version tuple -> server product
+WINDOWS_NT_SERVER_MAP = {
+    (4, 0): "Windows NT 4.0 Server",
+    (5, 0): "Windows 2000 Server",
+    (5, 1): "Windows XP/Server 2003",  # rarely used for server detection
+    (5, 2): "Windows Server 2003",
+    (6, 0): "Windows Server 2008",
+    (6, 1): "Windows Server 2008 R2",
+    (6, 2): "Windows Server 2012",
+    (6, 3): "Windows Server 2012 R2",
+    # NT 10.0: Server 2016/2019/2022 detected via explicit names, not NT mapping
+}
+
+# Human readable aliases (macOS codenames)
+MACOS_ALIASES = {
+    "sonoma": "macOS 14",
+    "sequoia": "macOS 15",
+    "ventura": "macOS 13",
+    "monterey": "macOS 12",
+    "big sur": "macOS 11",
+    "bigsur": "macOS 11",
+    "catalina": "macOS 10.15",
+}
+
+# macOS Darwin major version -> (product name, product version, codename)
+MACOS_DARWIN_MAP = {
+    19: ("macOS", "10.15", "Catalina"),
+    20: ("macOS", "11", "Big Sur"),
+    21: ("macOS", "12", "Monterey"),
+    22: ("macOS", "13", "Ventura"),
+    23: ("macOS", "14", "Sonoma"),
+    24: ("macOS", "15", "Sequoia"),
+}
+
+# Cisco train names (used for codename detection)
+CISCO_TRAIN_NAMES = {"Everest", "Fuji", "Gibraltar", "Amsterdam", "Denali"}
+