internetdata 1.2.2__tar.gz → 2.1.0__tar.gz

{internetdata-1.2.2 → internetdata-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: internetdata
-Version: 1.2.2
+Version: 2.1.0
 Summary: Official Python client library for the InternetData API. Download and verify licensed IP datasets.
 Project-URL: Homepage, https://internetdata.io
 Project-URL: Documentation, https://docs.internetdata.io
@@ -165,6 +165,14 @@ except InternetDataError as err:
 
 `kind` is one of `bad_request`, `unauthorized`, `forbidden`, `rate_limited`, `quota_exceeded`, `server_error` or `network`. `message` is the API's own result code, passed through as it was sent, so you can switch on `NOT_LICENSED` against `LICENSE_EXPIRED` without reading the status.
 
+A request that runs past its `timeout` fails with `network`, and is retried like any other network failure. The default is 30 seconds per attempt, body included, so a retried call can take longer in total. A database transfer is exempt, so `download` and `download_bytes` are never cut off part way through a large file. Set it on the client, in seconds, or pass `None` for no bound:
+
+```python
+client = InternetData(api_key, timeout=10)
+```
+
+**Changed in 2.1.0:** the default was 10 seconds, and it bounded each read of a response rather than the whole attempt, so a response trickling in slowly could run past it for as long as the server kept sending.
+
 Note that `rate_limited` and `quota_exceeded` both arrive as HTTP 429 and are not the same thing. A rate limit is the API facing a traffic burst, and retrying later works; a spent quota needs your allowance raised or the window to roll over. The library retries rate limits for you, and server and network failures, but never a spent quota or anything else you sent.
 
 ## Other Libraries

{internetdata-1.2.2 → internetdata-2.1.0}/README.md

@@ -131,6 +131,14 @@ except InternetDataError as err:
 
 `kind` is one of `bad_request`, `unauthorized`, `forbidden`, `rate_limited`, `quota_exceeded`, `server_error` or `network`. `message` is the API's own result code, passed through as it was sent, so you can switch on `NOT_LICENSED` against `LICENSE_EXPIRED` without reading the status.
 
+A request that runs past its `timeout` fails with `network`, and is retried like any other network failure. The default is 30 seconds per attempt, body included, so a retried call can take longer in total. A database transfer is exempt, so `download` and `download_bytes` are never cut off part way through a large file. Set it on the client, in seconds, or pass `None` for no bound:
+
+```python
+client = InternetData(api_key, timeout=10)
+```
+
+**Changed in 2.1.0:** the default was 10 seconds, and it bounded each read of a response rather than the whole attempt, so a response trickling in slowly could run past it for as long as the server kept sending.
+
 Note that `rate_limited` and `quota_exceeded` both arrive as HTTP 429 and are not the same thing. A rate limit is the API facing a traffic burst, and retrying later works; a spent quota needs your allowance raised or the window to roll over. The library retries rate limits for you, and server and network failures, but never a spent quota or anything else you sent.
 
 ## Other Libraries

{internetdata-1.2.2 → internetdata-2.1.0}/spec/openapi.yaml

@@ -8,7 +8,7 @@ info:
     email: dev@internetdata.io
     url: https://internetdata.io
   termsOfService: https://internetdata.io/terms-of-service/
-  version: 2026.09.09
+  version: 2026.09.13
 servers:
   - url: https://internetdata.io
 security:
@@ -162,10 +162,7 @@ paths:
                   id:
                     type: string
                   format:
-                    type: string
-                    enum:
-                      - csvgz
-                      - mmdb
+                    $ref: '#/components/schemas/DatabaseFormat'
                   checksums:
                     $ref: '#/components/schemas/DbChecksums'
         '400':
@@ -362,11 +359,7 @@ components:
       required: true
       description: Database file format.
       schema:
-        type: string
-        enum:
-          - csvgz
-          - mmdb
-        example: mmdb
+        $ref: '#/components/schemas/DatabaseFormat'
   schemas:
     Error:
       type: object
@@ -378,6 +371,23 @@ components:
           description: |
             A machine-readable result code. Deliberately not an enum: a code
             added later must stay parseable by a client generated today.
+    DatabaseFormat:
+      type: string
+      description: A file format a database version is published in.
+      enum:
+        - csvgz
+        - mmdb
+      example: mmdb
+    Standing:
+      type: string
+      description: |
+        Where your licence for a database family stands today. `licensed` is a
+        live grant, `expired` one whose term has ended, and `unlicensed` a
+        database published but never bought.
+      enum:
+        - licensed
+        - expired
+        - unlicensed
     Database:
       type: object
       description: |
@@ -407,14 +417,7 @@ components:
           type: string
           description: One line on what the newest version contains.
         standing:
-          type: string
-          enum:
-            - licensed
-            - expired
-            - unlicensed
-          description: |
-            `licensed` is a live grant, `expired` one whose term has ended, and
-            `unlicensed` a database published but never bought.
+          $ref: '#/components/schemas/Standing'
         license_type:
           type: string
           nullable: true
@@ -425,7 +428,7 @@ components:
             - null
           description: |
             What your licence permits you to do with the data. Null when there
-            is no licence.
+            is no licence, which is every family with standing `unlicensed`.
         starts:
           type: string
           format: date-time
@@ -483,10 +486,7 @@ components:
             not a gap - the `_provider` catalogs are keyed by provider id, so no
             MMDB exists for them.
           items:
-            type: string
-            enum:
-              - csvgz
-              - mmdb
+            $ref: '#/components/schemas/DatabaseFormat'
     Download:
       type: object
       description: One download ATTEMPT, refusals included.

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/__init__.py

@@ -26,7 +26,7 @@ from .models import (
     Standing,
 )
 
-__version__ = "1.2.2"
+__version__ = "2.1.0"
 
 __all__ = [
     "DEFAULT_BASE_URL",

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/_core.py

@@ -1,13 +1,17 @@
-"""Plumbing the sync and the async client both need: transport wiring, response
-unwrapping, and the retry policy."""
+"""Plumbing the sync and the async client both need: transport wiring, the deadline on
+each attempt, response unwrapping, and the retry policy."""
 
 from __future__ import annotations
 
+import asyncio
 import contextlib
+import contextvars
 import json
 import os
+import threading
 from collections.abc import Awaitable, Callable, Iterator
 from pathlib import Path
+from types import ModuleType
 from typing import IO, Any, TypeVar, cast
 
 import httpx
@@ -19,7 +23,7 @@ from .models import Database, Download, to_database, to_download
 
 DEFAULT_BASE_URL = "https://internetdata.io"
 DEFAULT_RETRIES = 2
-DEFAULT_TIMEOUT = 10.0
+DEFAULT_TIMEOUT = 30.0
 DEFAULT_DOWNLOADS_LIMIT = 50
 
 # One chunk of a transfer, and therefore the ceiling on what a download of any size
@@ -172,8 +176,10 @@ def send(call: Callable[[], Response[Any]]) -> Response[Any]:
     something this client cannot read, which is a failed request rather than a bug in the
     caller's code, so all three become the one error type here.
 
-    The lambda does nothing but call the generated function, which is what keeps this
-    catch from swallowing a fault of our own.
+    The call does nothing but build one generated request, send it and hand the answer to
+    the generated decoder, which is what keeps this catch from swallowing a fault of our own.
+    An argument is converted before it, so a format this client does not publish is the
+    caller's `ValueError` rather than the server's failure.
     """
     try:
         return call()
@@ -189,6 +195,91 @@ async def send_async(call: Callable[[], Awaitable[Response[Any]]]) -> Response[A
         raise malformed(exc) from exc
 
 
+def request(
+    endpoint: ModuleType, client: AuthenticatedClient, bound: float | None, **params: Any
+) -> Response[Any]:
+    """`send` for one generated endpoint, one attempt of it finished within `bound` seconds,
+    or unbounded when that is None.
+
+    Assembled from the endpoint module's `_get_kwargs` and `_build_response` because its
+    `sync_detailed` sends through httpx alone, and httpx has no bound on the attempt.
+    """
+
+    def call() -> Response[Any]:
+        http = client.get_httpx_client()
+        req = http.build_request(**endpoint._get_kwargs(**params), timeout=httpx.Timeout(bound))
+        res = exchange(http, req, bound)
+        return cast(Response[Any], endpoint._build_response(client=client, response=res))
+
+    return send(call)
+
+
+async def request_async(
+    endpoint: ModuleType, client: AuthenticatedClient, bound: float | None, **params: Any
+) -> Response[Any]:
+    """`request`, awaited."""
+
+    async def call() -> Response[Any]:
+        http = client.get_async_httpx_client()
+        req = http.build_request(**endpoint._get_kwargs(**params), timeout=httpx.Timeout(bound))
+        res = await exchange_async(http, req, bound)
+        return cast(Response[Any], endpoint._build_response(client=client, response=res))
+
+    return await send_async(call)
+
+
+def exchange(http: httpx.Client, req: httpx.Request, bound: float | None) -> httpx.Response:
+    """One attempt at `req`, its whole body read, finished within `bound` seconds or failed
+    as a `network` error.
+
+    httpx bounds each PHASE of a request (connect, write, every read), not the attempt, so a
+    body trickling in a byte at a time outlasts any timeout it is given. The attempt runs on
+    a thread of its own and the caller waits at most `bound` for it; one abandoned stops at
+    its next chunk, or at the per-phase bound `req` also carries.
+    """
+    if bound is None:
+        return http.send(req)
+    finished = threading.Event()
+    abandoned = threading.Event()
+    outcome: list[httpx.Response | BaseException] = []
+    context = contextvars.copy_context()
+
+    def attempt() -> None:
+        try:
+            outcome.append(context.run(_read_whole, http, req, abandoned))
+        except BaseException as exc:  # noqa: BLE001 - raised again on the caller's thread
+            outcome.append(exc)
+        finally:
+            finished.set()
+
+    threading.Thread(target=attempt, name="internetdata-attempt", daemon=True).start()
+    try:
+        if not finished.wait(bound):
+            raise _deadline_passed(bound)
+    finally:
+        abandoned.set()
+    if isinstance(outcome[0], BaseException):
+        raise outcome[0]
+    return outcome[0]
+
+
+async def exchange_async(
+    http: httpx.AsyncClient, req: httpx.Request, bound: float | None
+) -> httpx.Response:
+    """`exchange`, awaited. Cancelling the attempt closes its connection, so no thread is
+    needed to leave it behind."""
+    if bound is None:
+        return await http.send(req)
+    deadline = asyncio.timeout(bound)
+    try:
+        async with deadline:
+            return await http.send(req)
+    except TimeoutError:
+        if not deadline.expired():
+            raise
+        raise _deadline_passed(bound) from None
+
+
 def malformed(exc: Exception) -> InternetDataError:
     return InternetDataError("server_error", f"malformed response from the API: {exc}")
 
@@ -273,6 +364,41 @@ def retry_delay(err: InternetDataError, attempt: int, retries: int) -> float | N
     return _BACKOFF_BASE * (2.0**attempt)
 
 
+def _read_whole(
+    http: httpx.Client, req: httpx.Request, abandoned: threading.Event
+) -> httpx.Response:
+    res = http.send(req, stream=True)
+    try:
+        if isinstance(res.stream, httpx.SyncByteStream):
+            res.stream = _Abandonable(res.stream, abandoned, req)
+        res.read()
+    finally:
+        res.close()
+    return res
+
+
+class _Abandonable(httpx.SyncByteStream):
+    def __init__(
+        self, inner: httpx.SyncByteStream, abandoned: threading.Event, req: httpx.Request
+    ) -> None:
+        self._inner = inner
+        self._abandoned = abandoned
+        self._req = req
+
+    def __iter__(self) -> Iterator[bytes]:
+        for chunk in self._inner:
+            if self._abandoned.is_set():
+                raise httpx.ReadError("abandoned once its deadline passed", request=self._req)
+            yield chunk
+
+    def close(self) -> None:
+        self._inner.close()
+
+
+def _deadline_passed(bound: float) -> InternetDataError:
+    return InternetDataError("network", f"the request did not complete within {bound:g} seconds")
+
+
 # The generated Response declares a plain MutableMapping, but always carries httpx's
 # case-insensitive Headers. Rebuilding one keeps a header lookup case-blind whichever it
 # turns out to be, which matters for `Retry-After`.

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/_generated/api/database_v_2/database_checksum_v2.py

@@ -5,8 +5,8 @@ import httpx
 
 from ... import errors
 from ...client import AuthenticatedClient, Client
-from ...models.database_checksum_v2_format import DatabaseChecksumV2Format
 from ...models.database_checksum_v2_response_200 import DatabaseChecksumV2Response200
+from ...models.database_format import DatabaseFormat
 from ...models.error import Error
 from ...types import UNSET, Response
 
@@ -14,7 +14,7 @@ from ...types import UNSET, Response
 def _get_kwargs(
     *,
     id: str,
-    format_: DatabaseChecksumV2Format,
+    format_: DatabaseFormat,
 ) -> dict[str, Any]:
 
     params: dict[str, Any] = {}
@@ -89,7 +89,7 @@ def sync_detailed(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DatabaseChecksumV2Format,
+    format_: DatabaseFormat,
 ) -> Response[DatabaseChecksumV2Response200 | Error]:
     """Checksums
 
@@ -97,7 +97,7 @@ def sync_detailed(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DatabaseChecksumV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -123,7 +123,7 @@ def sync(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DatabaseChecksumV2Format,
+    format_: DatabaseFormat,
 ) -> DatabaseChecksumV2Response200 | Error | None:
     """Checksums
 
@@ -131,7 +131,7 @@ def sync(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DatabaseChecksumV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -152,7 +152,7 @@ async def asyncio_detailed(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DatabaseChecksumV2Format,
+    format_: DatabaseFormat,
 ) -> Response[DatabaseChecksumV2Response200 | Error]:
     """Checksums
 
@@ -160,7 +160,7 @@ async def asyncio_detailed(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DatabaseChecksumV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -184,7 +184,7 @@ async def asyncio(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DatabaseChecksumV2Format,
+    format_: DatabaseFormat,
 ) -> DatabaseChecksumV2Response200 | Error | None:
     """Checksums
 
@@ -192,7 +192,7 @@ async def asyncio(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DatabaseChecksumV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/_generated/api/database_v_2/download_database_v2.py

@@ -5,7 +5,7 @@ import httpx
 
 from ... import errors
 from ...client import AuthenticatedClient, Client
-from ...models.download_database_v2_format import DownloadDatabaseV2Format
+from ...models.database_format import DatabaseFormat
 from ...models.error import Error
 from ...types import UNSET, Response
 
@@ -13,7 +13,7 @@ from ...types import UNSET, Response
 def _get_kwargs(
     *,
     id: str,
-    format_: DownloadDatabaseV2Format,
+    format_: DatabaseFormat,
 ) -> dict[str, Any]:
 
     params: dict[str, Any] = {}
@@ -87,7 +87,7 @@ def sync_detailed(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DownloadDatabaseV2Format,
+    format_: DatabaseFormat,
 ) -> Response[Any | Error]:
     """Download
 
@@ -96,7 +96,7 @@ def sync_detailed(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DownloadDatabaseV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -122,7 +122,7 @@ def sync(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DownloadDatabaseV2Format,
+    format_: DatabaseFormat,
 ) -> Any | Error | None:
     """Download
 
@@ -131,7 +131,7 @@ def sync(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DownloadDatabaseV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -152,7 +152,7 @@ async def asyncio_detailed(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DownloadDatabaseV2Format,
+    format_: DatabaseFormat,
 ) -> Response[Any | Error]:
     """Download
 
@@ -161,7 +161,7 @@ async def asyncio_detailed(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DownloadDatabaseV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.
@@ -185,7 +185,7 @@ async def asyncio(
     *,
     client: AuthenticatedClient,
     id: str,
-    format_: DownloadDatabaseV2Format,
+    format_: DatabaseFormat,
 ) -> Any | Error | None:
     """Download
 
@@ -194,7 +194,7 @@ async def asyncio(
 
     Args:
         id (str):  Example: vpn_ip_v1.
-        format_ (DownloadDatabaseV2Format):  Example: mmdb.
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
 
     Raises:
         errors.UnexpectedStatus: If the server returns an undocumented status code and Client.raise_on_unexpected_status is True.

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/_generated/models/__init__.py

@@ -1,9 +1,8 @@
 """Contains all the data models used in inputs/outputs"""
 
 from .database import Database
-from .database_checksum_v2_format import DatabaseChecksumV2Format
 from .database_checksum_v2_response_200 import DatabaseChecksumV2Response200
-from .database_checksum_v2_response_200_format import DatabaseChecksumV2Response200Format
+from .database_format import DatabaseFormat
 from .database_license_type_type_1 import DatabaseLicenseTypeType1
 from .database_license_type_type_2_type_1 import DatabaseLicenseTypeType2Type1
 from .database_license_type_type_3_type_1 import DatabaseLicenseTypeType3Type1
@@ -15,22 +14,19 @@ from .database_metadata_sample_additional_property_item import (
 )
 from .database_metadata_schema import DatabaseMetadataSchema
 from .database_metadata_size import DatabaseMetadataSize
-from .database_standing import DatabaseStanding
 from .database_version import DatabaseVersion
-from .database_version_formats_item import DatabaseVersionFormatsItem
 from .db_checksums import DbChecksums
 from .download import Download
-from .download_database_v2_format import DownloadDatabaseV2Format
 from .download_outcome import DownloadOutcome
 from .error import Error
 from .list_databases_response_200 import ListDatabasesResponse200
 from .list_downloads_response_200 import ListDownloadsResponse200
+from .standing import Standing
 
 __all__ = (
     "Database",
-    "DatabaseChecksumV2Format",
     "DatabaseChecksumV2Response200",
-    "DatabaseChecksumV2Response200Format",
+    "DatabaseFormat",
     "DatabaseLicenseTypeType1",
     "DatabaseLicenseTypeType2Type1",
     "DatabaseLicenseTypeType3Type1",
@@ -40,14 +36,12 @@ __all__ = (
     "DatabaseMetadataSampleAdditionalPropertyItem",
     "DatabaseMetadataSchema",
     "DatabaseMetadataSize",
-    "DatabaseStanding",
     "DatabaseVersion",
-    "DatabaseVersionFormatsItem",
     "DbChecksums",
     "Download",
-    "DownloadDatabaseV2Format",
     "DownloadOutcome",
     "Error",
     "ListDatabasesResponse200",
     "ListDownloadsResponse200",
+    "Standing",
 )

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/_generated/models/database.py

@@ -10,7 +10,7 @@ from attrs import field as _attrs_field
 from ..models.database_license_type_type_1 import DatabaseLicenseTypeType1
 from ..models.database_license_type_type_2_type_1 import DatabaseLicenseTypeType2Type1
 from ..models.database_license_type_type_3_type_1 import DatabaseLicenseTypeType3Type1
-from ..models.database_standing import DatabaseStanding
+from ..models.standing import Standing
 
 if TYPE_CHECKING:
     from ..models.database_version import DatabaseVersion
@@ -29,11 +29,12 @@ class Database:
             base (str): The family, e.g. `vpn_ip`. What a licence is held against. Example: vpn_ip.
             name (str):  Example: VPN IP.
             summary (str): One line on what the newest version contains.
-            standing (DatabaseStanding): `licensed` is a live grant, `expired` one whose term has ended, and
-                `unlicensed` a database published but never bought.
+            standing (Standing): Where your licence for a database family stands today. `licensed` is a
+                live grant, `expired` one whose term has ended, and `unlicensed` a
+                database published but never bought.
             license_type (DatabaseLicenseTypeType1 | DatabaseLicenseTypeType2Type1 | DatabaseLicenseTypeType3Type1 | None):
                 What your licence permits you to do with the data. Null when there
-                is no licence.
+                is no licence, which is every family with standing `unlicensed`.
             starts (datetime.datetime | None):
             expires (datetime.datetime | None): A hard stop. Null when the licence has no end date, which is the normal case
                 for a rolling agreement, and when there is no licence. A rolling licence reports its turnover date in renews_at
@@ -49,7 +50,7 @@ class Database:
     base: str
     name: str
     summary: str
-    standing: DatabaseStanding
+    standing: Standing
     license_type: (
         DatabaseLicenseTypeType1
         | DatabaseLicenseTypeType2Type1
@@ -141,7 +142,7 @@ class Database:
 
         summary = d.pop("summary")
 
-        standing = DatabaseStanding(d.pop("standing"))
+        standing = Standing(d.pop("standing"))
 
         def _parse_license_type(
             data: object,

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/_generated/models/database_checksum_v2_response_200.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Any, Self, TypeVar
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-from ..models.database_checksum_v2_response_200_format import DatabaseChecksumV2Response200Format
+from ..models.database_format import DatabaseFormat
 
 if TYPE_CHECKING:
     from ..models.db_checksums import DbChecksums
@@ -20,12 +20,12 @@ class DatabaseChecksumV2Response200:
     """
     Attributes:
         id (str):
-        format_ (DatabaseChecksumV2Response200Format):
+        format_ (DatabaseFormat): A file format a database version is published in. Example: mmdb.
         checksums (DbChecksums):
     """
 
     id: str
-    format_: DatabaseChecksumV2Response200Format
+    format_: DatabaseFormat
     checksums: DbChecksums
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
@@ -55,7 +55,7 @@ class DatabaseChecksumV2Response200:
         d = dict(src_dict)
         id = d.pop("id")
 
-        format_ = DatabaseChecksumV2Response200Format(d.pop("format"))
+        format_ = DatabaseFormat(d.pop("format"))
 
         checksums = DbChecksums.from_dict(d.pop("checksums"))
 

internetdata-1.2.2/src/internetdata/_generated/models/download_database_v2_format.py → internetdata-2.1.0/src/internetdata/_generated/models/database_format.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 
 
-class DownloadDatabaseV2Format(StrEnum):
+class DatabaseFormat(StrEnum):
     CSVGZ = "csvgz"
     MMDB = "mmdb"
 

{internetdata-1.2.2 → internetdata-2.1.0}/src/internetdata/_generated/models/database_version.py

@@ -6,7 +6,7 @@ from typing import Any, Self, TypeVar
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-from ..models.database_version_formats_item import DatabaseVersionFormatsItem
+from ..models.database_format import DatabaseFormat
 
 T = TypeVar("T", bound="DatabaseVersion")
 
@@ -18,7 +18,7 @@ class DatabaseVersion:
         id (str): The versioned id. Pass this to `download`, `checksum` and `metadata`. Example: vpn_ip_v1.
         version (int):  Example: 1.
         summary (str):
-        formats (list[DatabaseVersionFormatsItem]): The formats this version is BUILT in. Asking for another is a 400,
+        formats (list[DatabaseFormat]): The formats this version is BUILT in. Asking for another is a 400,
             not a gap - the `_provider` catalogs are keyed by provider id, so no
             MMDB exists for them.
     """
@@ -26,7 +26,7 @@ class DatabaseVersion:
     id: str
     version: int
     summary: str
-    formats: list[DatabaseVersionFormatsItem]
+    formats: list[DatabaseFormat]
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -66,7 +66,7 @@ class DatabaseVersion:
         formats = []
         _formats = d.pop("formats")
         for formats_item_data in _formats:
-            formats_item = DatabaseVersionFormatsItem(formats_item_data)
+            formats_item = DatabaseFormat(formats_item_data)
 
             formats.append(formats_item)
 

internetdata-1.2.2/src/internetdata/_generated/models/database_standing.py → internetdata-2.1.0/src/internetdata/_generated/models/standing.py

@@ -1,7 +1,7 @@
 from enum import StrEnum
 
 
-class DatabaseStanding(StrEnum):
+class Standing(StrEnum):
     EXPIRED = "expired"
     LICENSED = "licensed"
     UNLICENSED = "unlicensed"