maxminddb-rust 0.1.0__tar.gz → 0.2.0__tar.gz

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/.github/workflows/codeql.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 2
           persist-credentials: false
@@ -36,12 +36,12 @@ jobs:
           python-version: "3.x"
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # master
+        uses: dtolnay/rust-toolchain@0b1efabc08b657293548b77fb76cc02d26091c7e # master
         with:
           toolchain: stable
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: python, rust
 
@@ -52,4 +52,4 @@ jobs:
         run: maturin build --release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/.github/workflows/lint.yml

@@ -13,12 +13,12 @@ jobs:
     name: Clippy
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # master
+        uses: dtolnay/rust-toolchain@0b1efabc08b657293548b77fb76cc02d26091c7e # master
         with:
           toolchain: stable
           components: clippy
@@ -30,12 +30,12 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # master
+        uses: dtolnay/rust-toolchain@0b1efabc08b657293548b77fb76cc02d26091c7e # master
         with:
           toolchain: stable
           components: rustfmt
@@ -47,7 +47,7 @@ jobs:
     name: Ruff
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
@@ -64,7 +64,7 @@ jobs:
     name: Prettier
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/.github/workflows/release.yml

@@ -37,7 +37,7 @@ jobs:
             python_versions: "3.11 3.12 3.13 3.14"
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
@@ -77,7 +77,7 @@ jobs:
     name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
           submodules: recursive
@@ -32,7 +32,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@6d653acede28d24f02e3cd41383119e8b1b35921 # master
+        uses: dtolnay/rust-toolchain@0b1efabc08b657293548b77fb76cc02d26091c7e # master
         with:
           toolchain: stable
 

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/.github/workflows/zizmor.yml

@@ -17,9 +17,9 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 
       - name: Run zizmor
-        uses: zizmorcore/zizmor-action@e673c3917a1aef3c65c972347ed84ccd013ecda4 # v0.2.0
+        uses: zizmorcore/zizmor-action@e639db99335bc9038abc0e066dfcd72e23d26fb4 # v0.3.0

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.2.0] - 2025-11-28
+
+### Changed
+
+- Upgraded maxminddb crate from 0.26.0 to 0.27.0. This brings internal
+  improvements from the upstream Rust library with no breaking changes
+  to the Python API.
+
 ## [0.1.1] - 2025-11-08
 
 - Attempt at republishing with tweaked workflow.

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/Cargo.lock

@@ -59,9 +59,9 @@ checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "maxminddb"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a197e44322788858682406c74b0b59bf8d9b4954fe1f224d9a25147f1880bba"
+checksum = "7ef0551fc3e7345a6c854c1026b0ddada1e443e51f4fb4cdcf86cc1a71d4b337"
 dependencies = [
  "ipnetwork",
  "log",
@@ -72,7 +72,7 @@ dependencies = [
 
 [[package]]
 name = "maxminddb-rust"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "ipnetwork",
  "maxminddb",

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "maxminddb-rust"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["Gregory Oschwald <oschwald@gmail.com>"]
 description = "Rust-based Python binding for MaxMind DB - high-performance alternative to maxminddb"
@@ -14,7 +14,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 ipnetwork = "0.21"
-maxminddb = "0.26.0"
+maxminddb = "0.27.0"
 memmap2 = "0.9"
 pyo3 = { version = "0.27.1", features = ["extension-module", "generate-import-lib"] }
 serde = "1.0"

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxminddb-rust
-Version: 0.1.0
+Version: 0.2.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: ISC License (ISCL)
@@ -29,6 +29,9 @@ Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Homepage, https://github.com/oschwald/maxminddb-rust-python
 Project-URL: Repository, https://github.com/oschwald/maxminddb-rust-python
 Project-URL: Bug Tracker, https://github.com/oschwald/maxminddb-rust-python/issues
+Project-URL: Changelog, https://github.com/oschwald/maxminddb-rust-python/blob/main/CHANGELOG.md
+Project-URL: Migration Guide, https://github.com/oschwald/maxminddb-rust-python/blob/main/MIGRATION.md
+Project-URL: Contributing, https://github.com/oschwald/maxminddb-rust-python/blob/main/CONTRIBUTING.md
 
 # maxminddb-rust
 
@@ -175,10 +178,10 @@ reader = maxminddb_rust.open_database("/var/lib/GeoIP/GeoIP2-City.mmdb", mode=ma
 
 The `examples/` directory contains complete working examples demonstrating various use cases:
 
-- **[basic_usage.py](examples/basic_usage.py)** - Simple IP lookups, metadata access, and database lifecycle
-- **[context_manager.py](examples/context_manager.py)** - Using `with` statement for automatic resource cleanup
-- **[iterator_demo.py](examples/iterator_demo.py)** - Iterating over all networks in the database
-- **[batch_processing.py](examples/batch_processing.py)** - High-performance batch lookups with `get_many()`
+- **[basic_usage.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/basic_usage.py)** - Simple IP lookups, metadata access, and database lifecycle
+- **[context_manager.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/context_manager.py)** - Using `with` statement for automatic resource cleanup
+- **[iterator_demo.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/iterator_demo.py)** - Iterating over all networks in the database
+- **[batch_processing.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/batch_processing.py)** - High-performance batch lookups with `get_many()`
 
 Run any example:
 
@@ -196,8 +199,8 @@ uv run python examples/batch_processing.py
   help(maxminddb_rust.Reader.get)
   ```
 - **Type Hints**: Full type stub file (`maxminddb_rust.pyi`) included for IDE autocomplete and type checking
-- **Changelog**: See [CHANGELOG.md](CHANGELOG.md) for version history and release notes
-- **Migration Guide**: See [MIGRATION.md](MIGRATION.md) for migrating from the official `maxminddb` package
+- **Changelog**: See [CHANGELOG.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/CHANGELOG.md) for version history and release notes
+- **Migration Guide**: See [MIGRATION.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/MIGRATION.md) for migrating from the official `maxminddb` package
 
 ## Benchmarking
 
@@ -229,9 +232,9 @@ uv run pytest
 uv run pytest -v
 ```
 
-For contributor information including development setup, code quality tools, and test syncing, see [CONTRIBUTING.md](CONTRIBUTING.md).
+For contributor information including development setup, code quality tools, and test syncing, see [CONTRIBUTING.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/CONTRIBUTING.md).
 
-For upstream test compatibility and syncing instructions, see [tests/maxmind/README.md](tests/maxmind/README.md).
+For upstream test compatibility and syncing instructions, see [tests/maxmind/README.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/tests/maxmind/README.md).
 
 ## License
 
@@ -239,5 +242,5 @@ ISC License - see LICENSE file for details.
 
 ## Contributing
 
-Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for development setup, code quality guidelines, and pull request procedures.
+Contributions are welcome! Please see [CONTRIBUTING.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/CONTRIBUTING.md) for development setup, code quality guidelines, and pull request procedures.
 

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/README.md

@@ -143,10 +143,10 @@ reader = maxminddb_rust.open_database("/var/lib/GeoIP/GeoIP2-City.mmdb", mode=ma
 
 The `examples/` directory contains complete working examples demonstrating various use cases:
 
-- **[basic_usage.py](examples/basic_usage.py)** - Simple IP lookups, metadata access, and database lifecycle
-- **[context_manager.py](examples/context_manager.py)** - Using `with` statement for automatic resource cleanup
-- **[iterator_demo.py](examples/iterator_demo.py)** - Iterating over all networks in the database
-- **[batch_processing.py](examples/batch_processing.py)** - High-performance batch lookups with `get_many()`
+- **[basic_usage.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/basic_usage.py)** - Simple IP lookups, metadata access, and database lifecycle
+- **[context_manager.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/context_manager.py)** - Using `with` statement for automatic resource cleanup
+- **[iterator_demo.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/iterator_demo.py)** - Iterating over all networks in the database
+- **[batch_processing.py](https://github.com/oschwald/maxminddb-rust-python/blob/main/examples/batch_processing.py)** - High-performance batch lookups with `get_many()`
 
 Run any example:
 
@@ -164,8 +164,8 @@ uv run python examples/batch_processing.py
   help(maxminddb_rust.Reader.get)
   ```
 - **Type Hints**: Full type stub file (`maxminddb_rust.pyi`) included for IDE autocomplete and type checking
-- **Changelog**: See [CHANGELOG.md](CHANGELOG.md) for version history and release notes
-- **Migration Guide**: See [MIGRATION.md](MIGRATION.md) for migrating from the official `maxminddb` package
+- **Changelog**: See [CHANGELOG.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/CHANGELOG.md) for version history and release notes
+- **Migration Guide**: See [MIGRATION.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/MIGRATION.md) for migrating from the official `maxminddb` package
 
 ## Benchmarking
 
@@ -197,9 +197,9 @@ uv run pytest
 uv run pytest -v
 ```
 
-For contributor information including development setup, code quality tools, and test syncing, see [CONTRIBUTING.md](CONTRIBUTING.md).
+For contributor information including development setup, code quality tools, and test syncing, see [CONTRIBUTING.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/CONTRIBUTING.md).
 
-For upstream test compatibility and syncing instructions, see [tests/maxmind/README.md](tests/maxmind/README.md).
+For upstream test compatibility and syncing instructions, see [tests/maxmind/README.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/tests/maxmind/README.md).
 
 ## License
 
@@ -207,4 +207,4 @@ ISC License - see LICENSE file for details.
 
 ## Contributing
 
-Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for development setup, code quality guidelines, and pull request procedures.
+Contributions are welcome! Please see [CONTRIBUTING.md](https://github.com/oschwald/maxminddb-rust-python/blob/main/CONTRIBUTING.md) for development setup, code quality guidelines, and pull request procedures.

maxminddb_rust-0.2.0/dev-bin/release.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+set -eu -o pipefail
+
+changelog=$(cat CHANGELOG.md)
+
+regex='## \[([0-9]+\.[0-9]+\.[0-9]+)\] - ([0-9]{4}-[0-9]{2}-[0-9]{2})
+
+((.|
+)*)'
+
+if [[ ! $changelog =~ $regex ]]; then
+      echo "Could not find version and date line in change log!"
+      exit 1
+fi
+
+version="${BASH_REMATCH[1]}"
+date="${BASH_REMATCH[2]}"
+notes_raw="${BASH_REMATCH[3]}"
+
+# Extract notes until the next version heading or [Unreleased] or end
+notes="$(echo "$notes_raw" | sed -n -e '/^## \[/q;p')"
+
+if [[ "$date" !=  $(date +"%Y-%m-%d") ]]; then
+    echo "$date is not today!"
+    exit 1
+fi
+
+tag="v$version"
+
+if [ -n "$(git status --porcelain)" ]; then
+    echo ". is not clean." >&2
+    exit 1
+fi
+
+# Update version in pyproject.toml
+perl -pi -e "s/(?<=^version = \").+?(?=\")/$version/gsm" pyproject.toml
+
+# Update version in Cargo.toml
+perl -pi -e "s/(?<=^version = \").+?(?=\")/$version/gsm" Cargo.toml
+
+echo $"Test results:"
+# Run Rust tests
+cargo test
+
+# Build the package
+maturin develop
+
+# Run Python tests
+uv run pytest
+
+echo $'\nDiff:'
+git diff
+
+echo $'\nRelease notes:'
+echo "$notes"
+
+read -e -p "Commit changes and push to origin? " should_push
+
+if [ "$should_push" != "y" ]; then
+    echo "Aborting"
+    exit 1
+fi
+
+if [ -n "$(git status --porcelain)" ]; then
+    git commit -m "Update for $tag" -a
+fi
+
+git push
+
+gh release create --target "$(git branch --show-current)" -t "$version" -n "$notes" "$tag"
+
+git push --tags

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "maxminddb-rust"
-version = "0.1.0"
+version = "0.2.0"
 description = "Rust-based Python binding for MaxMind DB - high-performance alternative to maxminddb"
 readme = "README.md"
 authors = [
@@ -36,6 +36,9 @@ keywords = ["maxmind", "geoip", "geolocation", "ip-address", "mmdb"]
 Homepage = "https://github.com/oschwald/maxminddb-rust-python"
 Repository = "https://github.com/oschwald/maxminddb-rust-python"
 "Bug Tracker" = "https://github.com/oschwald/maxminddb-rust-python/issues"
+Changelog = "https://github.com/oschwald/maxminddb-rust-python/blob/main/CHANGELOG.md"
+"Migration Guide" = "https://github.com/oschwald/maxminddb-rust-python/blob/main/MIGRATION.md"
+Contributing = "https://github.com/oschwald/maxminddb-rust-python/blob/main/CONTRIBUTING.md"
 
 [project.optional-dependencies]
 test = ["pytest>=8.3.5"]

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/src/lib.rs

@@ -1,5 +1,5 @@
 use ::maxminddb as maxminddb_crate;
-use maxminddb_crate::{MaxMindDbError, Reader as MaxMindReader, Within, WithinItem};
+use maxminddb_crate::{MaxMindDbError, Reader as MaxMindReader, Within, WithinOptions};
 use memmap2::Mmap;
 use pyo3::{
     conversion::IntoPyObjectExt,
@@ -253,8 +253,14 @@ impl ReaderSource {
         ip: IpAddr,
     ) -> Result<Option<PyDecodedValue>, maxminddb_crate::MaxMindDbError> {
         match self {
-            ReaderSource::Mmap(reader) => reader.lookup(ip),
-            ReaderSource::Memory(reader) => reader.lookup(ip),
+            ReaderSource::Mmap(reader) => {
+                let result = reader.lookup(ip)?;
+                result.decode()
+            }
+            ReaderSource::Memory(reader) => {
+                let result = reader.lookup(ip)?;
+                result.decode()
+            }
         }
     }
 
@@ -264,8 +270,20 @@ impl ReaderSource {
         ip: IpAddr,
     ) -> Result<(Option<PyDecodedValue>, usize), maxminddb_crate::MaxMindDbError> {
         match self {
-            ReaderSource::Mmap(reader) => reader.lookup_prefix(ip),
-            ReaderSource::Memory(reader) => reader.lookup_prefix(ip),
+            ReaderSource::Mmap(reader) => {
+                let result = reader.lookup(ip)?;
+                let network = result.network()?;
+                let prefix_len = convert_prefix_len(ip, network);
+                let data = result.decode()?;
+                Ok((data, prefix_len))
+            }
+            ReaderSource::Memory(reader) => {
+                let result = reader.lookup(ip)?;
+                let network = result.network()?;
+                let prefix_len = convert_prefix_len(ip, network);
+                let data = result.decode()?;
+                Ok((data, prefix_len))
+            }
         }
     }
 
@@ -278,6 +296,22 @@ impl ReaderSource {
     }
 }
 
+/// Convert prefix length from database network to the perspective of the queried IP.
+/// When an IPv4 address is looked up in an IPv6 database, the network is returned
+/// in IPv6 terms. We need to convert it back to IPv4 terms for the user.
+#[inline]
+fn convert_prefix_len(queried_ip: IpAddr, network: ipnetwork::IpNetwork) -> usize {
+    let prefix = network.prefix() as usize;
+    match (queried_ip, network) {
+        // IPv4 query, IPv6 result: convert from IPv6 prefix to IPv4 prefix
+        // IPv4-mapped IPv6 addresses have a 96-bit prefix (::ffff:0:0/96)
+        // So the IPv4-relevant part starts at bit 96
+        (IpAddr::V4(_), ipnetwork::IpNetwork::V6(_)) => prefix.saturating_sub(96),
+        // Same address family: use prefix as-is
+        _ => prefix,
+    }
+}
+
 /// Metadata about the MaxMind DB database
 #[pyclass(module = "maxminddb_rust.extension")]
 struct Metadata {
@@ -449,7 +483,7 @@ impl Reader {
         match lookup_result {
             Ok(Some(data)) => Ok(data.into_py()),
             Ok(None) => Ok(py.None()),
-            Err(MaxMindDbError::InvalidDatabase(_) | MaxMindDbError::Decoding(_)) => {
+            Err(MaxMindDbError::InvalidDatabase { .. } | MaxMindDbError::Decoding { .. }) => {
                 Err(InvalidDatabaseError::new_err(ERR_BAD_DATA))
             }
             Err(err) => Err(PyValueError::new_err(format!("Database error: {err}"))),
@@ -504,7 +538,7 @@ impl Reader {
                 Ok((py_obj, prefix_len))
             }
             Ok((None, prefix_len)) => Ok((py.None(), prefix_len)),
-            Err(MaxMindDbError::InvalidDatabase(_) | MaxMindDbError::Decoding(_)) => {
+            Err(MaxMindDbError::InvalidDatabase { .. } | MaxMindDbError::Decoding { .. }) => {
                 Err(InvalidDatabaseError::new_err(ERR_BAD_DATA))
             }
             Err(err) => Err(PyValueError::new_err(format!("Database error: {err}"))),
@@ -565,7 +599,7 @@ impl Reader {
             match result {
                 Ok(Some(data)) => objects.push(data.into_py()),
                 Ok(None) => objects.push(py.None()),
-                Err(MaxMindDbError::InvalidDatabase(_) | MaxMindDbError::Decoding(_)) => {
+                Err(MaxMindDbError::InvalidDatabase { .. } | MaxMindDbError::Decoding { .. }) => {
                     return Err(InvalidDatabaseError::new_err(ERR_BAD_DATA));
                 }
                 Err(err) => {
@@ -786,15 +820,21 @@ impl ReaderIterator {
         let network_obj = class.call1((network_str,))?;
 
         // Record is already materialized as a Python object
-        let data_obj = next_item.info.into_py();
+        let data_obj = next_item.data.into_py();
 
         Ok(Some((network_obj.unbind(), data_obj)))
     }
 }
 
 enum ReaderWithin {
-    Mmap(Within<'static, PyDecodedValue, Mmap>),
-    Memory(Within<'static, PyDecodedValue, Vec<u8>>),
+    Mmap(Within<'static, Mmap>),
+    Memory(Within<'static, Vec<u8>>),
+}
+
+/// Result from the within iterator, containing network and decoded data
+struct WithinResult {
+    ip_net: ipnetwork::IpNetwork,
+    data: PyDecodedValue,
 }
 
 impl ReaderWithin {
@@ -802,36 +842,55 @@ impl ReaderWithin {
         reader: &Arc<ReaderSource>,
         network: ipnetwork::IpNetwork,
     ) -> Result<Self, maxminddb_crate::MaxMindDbError> {
+        let options = WithinOptions::default();
         match reader.as_ref() {
             ReaderSource::Mmap(inner) => {
-                let iter = inner.within::<PyDecodedValue>(network)?;
+                let iter = inner.within(network, options)?;
                 // SAFETY: the iterator holds a reference into `inner`. We store an Arc guard
                 // alongside it so the reader outlives the transmuted iterator.
                 Ok(Self::Mmap(unsafe {
-                    transmute::<Within<'_, PyDecodedValue, Mmap>, Within<'_, PyDecodedValue, Mmap>>(
-                        iter,
-                    )
+                    transmute::<Within<'_, Mmap>, Within<'_, Mmap>>(iter)
                 }))
             }
             ReaderSource::Memory(inner) => {
-                let iter = inner.within::<PyDecodedValue>(network)?;
+                let iter = inner.within(network, options)?;
                 // SAFETY: same as above, the Arc guard in `ReaderIterator` keeps the reader alive.
                 Ok(Self::Memory(unsafe {
-                    transmute::<
-                        Within<'_, PyDecodedValue, Vec<u8>>,
-                        Within<'_, PyDecodedValue, Vec<u8>>,
-                    >(iter)
+                    transmute::<Within<'_, Vec<u8>>, Within<'_, Vec<u8>>>(iter)
                 }))
             }
         }
     }
 
-    fn next(
-        &mut self,
-    ) -> Option<Result<WithinItem<PyDecodedValue>, maxminddb_crate::MaxMindDbError>> {
+    fn next(&mut self) -> Option<Result<WithinResult, maxminddb_crate::MaxMindDbError>> {
+        fn process_lookup<S: AsRef<[u8]>>(
+            lookup_result: maxminddb_crate::LookupResult<'_, S>,
+        ) -> Result<WithinResult, MaxMindDbError> {
+            let network = lookup_result.network()?;
+            let ip_net =
+                ipnetwork::IpNetwork::new(network.network(), network.prefix()).map_err(|e| {
+                    MaxMindDbError::InvalidDatabase {
+                        message: format!("Invalid network from database: {}", e),
+                        offset: None,
+                    }
+                })?;
+            let data: Option<PyDecodedValue> = lookup_result.decode()?;
+            let data = data.ok_or_else(|| MaxMindDbError::InvalidDatabase {
+                message: "No data in database record".to_string(),
+                offset: None,
+            })?;
+            Ok(WithinResult { ip_net, data })
+        }
+
         match self {
-            ReaderWithin::Mmap(iter) => iter.next(),
-            ReaderWithin::Memory(iter) => iter.next(),
+            ReaderWithin::Mmap(iter) => {
+                let result = iter.next()?;
+                Some(result.and_then(process_lookup))
+            }
+            ReaderWithin::Memory(iter) => {
+                let result = iter.next()?;
+                Some(result.and_then(process_lookup))
+            }
         }
     }
 }

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/tests/maxmind/reader_test.py

@@ -380,10 +380,10 @@ class BaseTestReader(unittest.TestCase):
     def test_nondatabase(self) -> None:
         with self.assertRaisesRegex(
             InvalidDatabaseError,
-            r"Error opening database file \(README.rst\). "
+            r"Error opening database file \(README.md\). "
             r"Is this a valid MaxMind DB file\?",
         ):
-            open_database("README.rst", self.mode)
+            open_database("README.md", self.mode)
 
     # This is from https://github.com/maxmind/MaxMind-DB-Reader-python/issues/58
     def test_database_with_invalid_utf8_key(self) -> None:

{maxminddb_rust-0.1.0 → maxminddb_rust-0.2.0}/uv.lock

@@ -55,7 +55,7 @@ wheels = [
 
 [[package]]
 name = "maxminddb-rust"
-version = "0.1.0"
+version = "0.2.0"
 source = { editable = "." }
 
 [package.optional-dependencies]