From fb4bfc8674fd62284fb4200a1c19991a1a60f22c Mon Sep 17 00:00:00 2001 From: Sebastian Rittau Date: Wed, 26 Jun 2024 01:48:30 +0200 Subject: [PATCH] [influxdb] Update to 1.44 (#12209) --- stubs/influxdb-client/METADATA.toml | 2 +- .../influxdb_client/client/_pages.pyi | 37 +++++++++++++++++++ .../influxdb_client/client/bucket_api.pyi | 6 ++- .../influxdb_client/client/tasks_api.pyi | 7 ++-- .../influxdb_client/domain/bucket.pyi | 12 +++--- .../influxdb_client/domain/task.pyi | 12 +++--- 6 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 stubs/influxdb-client/influxdb_client/client/_pages.pyi diff --git a/stubs/influxdb-client/METADATA.toml b/stubs/influxdb-client/METADATA.toml index e8b3b5471..74f497ce4 100644 --- a/stubs/influxdb-client/METADATA.toml +++ b/stubs/influxdb-client/METADATA.toml @@ -1,4 +1,4 @@ -version = "1.43.*" +version = "1.44.*" upstream_repository = "https://github.com/influxdata/influxdb-client-python" # requires a version of urllib3 with a py.typed file requires = ["urllib3>=2"] diff --git a/stubs/influxdb-client/influxdb_client/client/_pages.pyi b/stubs/influxdb-client/influxdb_client/client/_pages.pyi new file mode 100644 index 000000000..1ecf38d5f --- /dev/null +++ b/stubs/influxdb-client/influxdb_client/client/_pages.pyi @@ -0,0 +1,37 @@ +from collections.abc import Callable +from typing import Any, Generic, Protocol, TypeVar +from typing_extensions import Self + +class _HasId(Protocol): + @property + def id(self) -> str | None: ... + +_R = TypeVar("_R", default=Any) +_T = TypeVar("_T", bound=_HasId) + +class _Page(Generic[_T]): + has_next: bool + values: list[_T] + next_after: str | None + + def __init__(self, values: list[_T], has_next: bool, next_after: str | None) -> None: ... + @staticmethod + def empty() -> _Page[_T]: ... + @staticmethod + def initial(after: str | None) -> _Page[_T]: ... + +class _PageIterator(Generic[_T]): + page: _Page[_T] + get_next_page: Callable[[_Page[_T]], _Page[_T]] + + def __init__(self, page: _Page[_T], get_next_page: Callable[[_Page[_T]], _Page[_T]]) -> None: ... + def __iter__(self) -> Self: ... + def __next__(self) -> _T: ... + +class _Paginated(Generic[_T, _R]): + paginated_getter: Callable[..., _R] # Gets passed additional kwargs to find_iter(). + pluck_page_resources_from_response: Callable[[_R], list[_T]] + def __init__( + self, paginated_getter: Callable[..., _R], pluck_page_resources_from_response: Callable[[_R], list[_T]] + ) -> None: ... + def find_iter(self, *, after: str | None = None, **kwargs: Any) -> _PageIterator[_T]: ... diff --git a/stubs/influxdb-client/influxdb_client/client/bucket_api.pyi b/stubs/influxdb-client/influxdb_client/client/bucket_api.pyi index b50467a24..d1cd792d3 100644 --- a/stubs/influxdb-client/influxdb_client/client/bucket_api.pyi +++ b/stubs/influxdb-client/influxdb_client/client/bucket_api.pyi @@ -1,6 +1,7 @@ from _typeshed import Incomplete -from influxdb_client import Bucket +from ..domain.bucket import Bucket +from ._pages import _PageIterator class BucketsApi: def __init__(self, influxdb_client) -> None: ... @@ -18,3 +19,6 @@ class BucketsApi: def find_bucket_by_id(self, id): ... def find_bucket_by_name(self, bucket_name): ... def find_buckets(self, **kwargs): ... + def find_buckets_iter( + self, *, name: str = ..., org: str = ..., org_id: str = ..., after: str | None = None, limit: int = ... + ) -> _PageIterator[Bucket]: ... diff --git a/stubs/influxdb-client/influxdb_client/client/tasks_api.pyi b/stubs/influxdb-client/influxdb_client/client/tasks_api.pyi index 36f2d63ea..15a5110df 100644 --- a/stubs/influxdb-client/influxdb_client/client/tasks_api.pyi +++ b/stubs/influxdb-client/influxdb_client/client/tasks_api.pyi @@ -1,9 +1,10 @@ -from collections.abc import Iterator from datetime import datetime from influxdb_client import LabelResponse, LogEvent, Run, TaskCreateRequest, TaskUpdateRequest from influxdb_client.domain.task import Task +from ._pages import _PageIterator + class TasksApi: def __init__(self, influxdb_client) -> None: ... def find_task_by_id(self, task_id) -> Task: ... @@ -11,8 +12,8 @@ class TasksApi: self, *, name: str = ..., after: str = ..., user: str = ..., org: str = ..., org_id: str = ..., limit: int = ..., **kwargs ) -> list[Task]: ... def find_tasks_iter( - self, *, name: str = ..., after: str = ..., user: str = ..., org: str = ..., org_id: str = ..., limit: int = ..., **kwargs - ) -> Iterator[Task]: ... + self, *, name: str = ..., after: str | None = None, user: str = ..., org: str = ..., org_id: str = ..., limit: int = ... + ) -> _PageIterator[Task]: ... def create_task(self, task: Task | None = None, task_create_request: TaskCreateRequest | None = None) -> Task: ... def create_task_every(self, name, flux, every, organization) -> Task: ... def create_task_cron(self, name: str, flux: str, cron: str, org_id: str) -> Task: ... diff --git a/stubs/influxdb-client/influxdb_client/domain/bucket.pyi b/stubs/influxdb-client/influxdb_client/domain/bucket.pyi index c0110c298..fe7a86461 100644 --- a/stubs/influxdb-client/influxdb_client/domain/bucket.pyi +++ b/stubs/influxdb-client/influxdb_client/domain/bucket.pyi @@ -7,11 +7,11 @@ class Bucket: def __init__( self, links: Incomplete | None = None, - id: Incomplete | None = None, + id: str | None = None, type: str = "user", name: Incomplete | None = None, description: Incomplete | None = None, - org_id: Incomplete | None = None, + org_id: str | None = None, rp: Incomplete | None = None, schema_type: Incomplete | None = None, created_at: Incomplete | None = None, @@ -24,9 +24,9 @@ class Bucket: @links.setter def links(self, links) -> None: ... @property - def id(self): ... + def id(self) -> str | None: ... @id.setter - def id(self, id) -> None: ... + def id(self, id: str) -> None: ... @property def type(self): ... @type.setter @@ -40,9 +40,9 @@ class Bucket: @description.setter def description(self, description) -> None: ... @property - def org_id(self): ... + def org_id(self) -> str | None: ... @org_id.setter - def org_id(self, org_id) -> None: ... + def org_id(self, org_id: str) -> None: ... @property def rp(self): ... @rp.setter diff --git a/stubs/influxdb-client/influxdb_client/domain/task.pyi b/stubs/influxdb-client/influxdb_client/domain/task.pyi index 84140e219..1d0d63102 100644 --- a/stubs/influxdb-client/influxdb_client/domain/task.pyi +++ b/stubs/influxdb-client/influxdb_client/domain/task.pyi @@ -6,8 +6,8 @@ class Task: discriminator: Incomplete def __init__( self, - id: Incomplete | None = None, - org_id: Incomplete | None = None, + id: str | None = None, + org_id: str | None = None, org: Incomplete | None = None, name: Incomplete | None = None, owner_id: Incomplete | None = None, @@ -27,13 +27,13 @@ class Task: links: Incomplete | None = None, ) -> None: ... @property - def id(self): ... + def id(self) -> str | None: ... @id.setter - def id(self, id) -> None: ... + def id(self, id: str) -> None: ... @property - def org_id(self): ... + def org_id(self) -> str | None: ... @org_id.setter - def org_id(self, org_id) -> None: ... + def org_id(self, org_id: str) -> None: ... @property def org(self): ... @org.setter