From 9f768405385afd6de4cfd4a8571d8e7a71d97c37 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Thu, 21 Dec 2023 11:54:33 +0000 Subject: [PATCH 1/7] feat: add src/netius/adapters/base.pyi --- src/netius/adapters/base.pyi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/netius/adapters/base.pyi diff --git a/src/netius/adapters/base.pyi b/src/netius/adapters/base.pyi new file mode 100644 index 00000000..1c92570d --- /dev/null +++ b/src/netius/adapters/base.pyi @@ -0,0 +1,18 @@ +import netius as netius + +import typing + +class BaseAdapter: + def set(self, value: typing.Any, owner: str = ...) -> None: ... + def get(self, key: str) -> str | netius.legacy.StringIO: ... + def get_file(self, key: str, mode: str = ...) -> netius.legacy.StringIO: ... + def delete(self, key: str, owner: str = ...) -> None: ... + def append(self, key:str , value: typing.Any) -> None: ... + def truncate(self, key:str , count: int) -> None: ... + def size(self, key:str ) -> int: ... + def sizes(self, owner: str | None = ...) -> list[int]: ... + def total(self, owner: str | None = ...) -> int: ... + def reserve(self, owner: str = ...) -> None: ... + def count(self, owner: str | None = ...) -> int: ... + def list(self, owner: str | None = ...) -> tuple[()]: ... + def generate(self) -> str: ... From c9c1ed505b147b9c5b1233b87999a3c825800f16 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Thu, 21 Dec 2023 11:58:36 +0000 Subject: [PATCH 2/7] feat: add src/netius/adapters/fs.pyi --- src/netius/adapters/fs.pyi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/netius/adapters/fs.pyi diff --git a/src/netius/adapters/fs.pyi b/src/netius/adapters/fs.pyi new file mode 100644 index 00000000..e1ed779c --- /dev/null +++ b/src/netius/adapters/fs.pyi @@ -0,0 +1,17 @@ +import netius as netius +import netius.adapters.base +import netius.adapters.base as base + +import typing + +class FsAdapter(netius.adapters.base.BaseAdapter): + def __init__(self, base_path: str | None = ...) -> None: ... + def set(self, value: typing.Any, owner: str = ...) -> str: ... + def get_file(self, key: str, mode: str = ...) -> netius.legacy.StringIO: ... + def delete(self, key: str, owner: str = ...) -> None: ... + def size(self, key:str ) -> int: ... + def count(self, owner: str | None = ...) -> int: ... + def list(self, owner: str | None = ...) -> list[str]: ... + def _path(self, owner: str | None = ...) -> str: ... + def _ensure(self, owner: str) -> str: ... + def _symlink(self, source: typing.StrOrBytesPath, target: typing.StrOrBytesPath) -> None: ... From fb887c39fea6a95045c1fe17d71b27ce9edb760e Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Thu, 21 Dec 2023 11:59:20 +0000 Subject: [PATCH 3/7] feat: add src/netius/adapters/memory.pyi --- src/netius/adapters/memory.pyi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 src/netius/adapters/memory.pyi diff --git a/src/netius/adapters/memory.pyi b/src/netius/adapters/memory.pyi new file mode 100644 index 00000000..ab7fec8a --- /dev/null +++ b/src/netius/adapters/memory.pyi @@ -0,0 +1,18 @@ +import netius as netius +import netius.adapters.base +import netius.adapters.base as base + +import typing + +class MemoryAdapter(netius.adapters.base.BaseAdapter): + def __init__(self) -> None: ... + def set(self, value, owner: str = ...) -> str: ... + def get_file(self, key: str, mode: str = ...) -> netius.legacy.StringIO: ... + def delete(self, key: str, owner: str = ...) -> None: ... + def append(self, key: str, value: typing.Any) -> None: ... + def truncate(self, key: str, count: int) -> None: ... + def size(self, key: str) -> int: ... + def count(self, owner: str | None = ...) -> int: ... + def list(self, owner: str | None = ...) -> tuple[()]: ... + def _ensure(self, owner: str) -> dict: ... + def _build_close(self, file: netius.legacy.StringIO, key: str) -> function: ... From 290c44bf82b477c946b1fc7f6abe45e11d98c2b5 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Thu, 21 Dec 2023 11:59:54 +0000 Subject: [PATCH 4/7] feat: add src/netius/adapters/mongo.pyi --- src/netius/adapters/mongo.pyi | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 src/netius/adapters/mongo.pyi diff --git a/src/netius/adapters/mongo.pyi b/src/netius/adapters/mongo.pyi new file mode 100644 index 00000000..05471eee --- /dev/null +++ b/src/netius/adapters/mongo.pyi @@ -0,0 +1,6 @@ +import netius.adapters.base +import netius.adapters.base as base + +class MongoAdapter(netius.adapters.base.BaseAdapter): + def set(self, value: str, owner: str = ...): ... + def get(self, key: str): ... From d6663c9b022945cdc5a97e06de1938cecd73ef07 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Thu, 21 Dec 2023 12:00:12 +0000 Subject: [PATCH 5/7] feat: add src/netius/adapters/null.pyi --- src/netius/adapters/null.pyi | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 src/netius/adapters/null.pyi diff --git a/src/netius/adapters/null.pyi b/src/netius/adapters/null.pyi new file mode 100644 index 00000000..694650d5 --- /dev/null +++ b/src/netius/adapters/null.pyi @@ -0,0 +1,4 @@ +import netius.adapters.base +import netius.adapters.base as base + +class NullAdapter(netius.adapters.base.BaseAdapter): ... From 4a86b2741d5944cc62cb3196628e0db90c9764a8 Mon Sep 17 00:00:00 2001 From: Hugo Gomes Date: Thu, 21 Dec 2023 12:47:03 +0000 Subject: [PATCH 6/7] review --- src/netius/adapters/base.pyi | 11 ++++++----- src/netius/adapters/fs.pyi | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/netius/adapters/base.pyi b/src/netius/adapters/base.pyi index 1c92570d..1382b2f7 100644 --- a/src/netius/adapters/base.pyi +++ b/src/netius/adapters/base.pyi @@ -1,13 +1,14 @@ import netius as netius -import typing +from typing import Any +from netius.base.legacy import StringIO class BaseAdapter: - def set(self, value: typing.Any, owner: str = ...) -> None: ... - def get(self, key: str) -> str | netius.legacy.StringIO: ... - def get_file(self, key: str, mode: str = ...) -> netius.legacy.StringIO: ... + def set(self, value: Any, owner: str = ...) -> None: ... + def get(self, key: str) -> str | StringIO: ... + def get_file(self, key: str, mode: str = ...) -> StringIO: ... def delete(self, key: str, owner: str = ...) -> None: ... - def append(self, key:str , value: typing.Any) -> None: ... + def append(self, key:str , value: Any) -> None: ... def truncate(self, key:str , count: int) -> None: ... def size(self, key:str ) -> int: ... def sizes(self, owner: str | None = ...) -> list[int]: ... diff --git a/src/netius/adapters/fs.pyi b/src/netius/adapters/fs.pyi index e1ed779c..972f02e0 100644 --- a/src/netius/adapters/fs.pyi +++ b/src/netius/adapters/fs.pyi @@ -2,16 +2,17 @@ import netius as netius import netius.adapters.base import netius.adapters.base as base -import typing +from typing import Any, StrOrBytesPath +from netius.base.legacy import StringIO class FsAdapter(netius.adapters.base.BaseAdapter): def __init__(self, base_path: str | None = ...) -> None: ... - def set(self, value: typing.Any, owner: str = ...) -> str: ... - def get_file(self, key: str, mode: str = ...) -> netius.legacy.StringIO: ... + def set(self, value: Any, owner: str = ...) -> str: ... + def get_file(self, key: str, mode: str = ...) -> StringIO: ... def delete(self, key: str, owner: str = ...) -> None: ... def size(self, key:str ) -> int: ... def count(self, owner: str | None = ...) -> int: ... def list(self, owner: str | None = ...) -> list[str]: ... def _path(self, owner: str | None = ...) -> str: ... def _ensure(self, owner: str) -> str: ... - def _symlink(self, source: typing.StrOrBytesPath, target: typing.StrOrBytesPath) -> None: ... + def _symlink(self, source: StrOrBytesPath, target: StrOrBytesPath) -> None: ... From bdd3ecdcec531fcc4ef15033df317d1a5d9b3584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Magalh=C3=A3es?= Date: Wed, 27 Dec 2023 16:01:33 +0000 Subject: [PATCH 7/7] chore: changed type files for adapters --- src/netius/adapters/base.pyi | 23 ++++++++++------------- src/netius/adapters/fs.pyi | 19 ++++++------------- src/netius/adapters/memory.pyi | 22 ++++++---------------- src/netius/adapters/mongo.pyi | 8 +++----- src/netius/adapters/null.pyi | 6 +++--- src/netius/auth/base.pyi | 10 +++++----- 6 files changed, 33 insertions(+), 55 deletions(-) diff --git a/src/netius/adapters/base.pyi b/src/netius/adapters/base.pyi index 1382b2f7..74b0f25d 100644 --- a/src/netius/adapters/base.pyi +++ b/src/netius/adapters/base.pyi @@ -1,19 +1,16 @@ -import netius as netius - -from typing import Any -from netius.base.legacy import StringIO +from typing import Any, BinaryIO, Sequence class BaseAdapter: - def set(self, value: Any, owner: str = ...) -> None: ... - def get(self, key: str) -> str | StringIO: ... - def get_file(self, key: str, mode: str = ...) -> StringIO: ... - def delete(self, key: str, owner: str = ...) -> None: ... - def append(self, key:str , value: Any) -> None: ... - def truncate(self, key:str , count: int) -> None: ... - def size(self, key:str ) -> int: ... + def set(self, value: Any, owner: str = ...): ... + def get(self, key: str) -> bytes | None: ... + def get_file(self, key: str, mode: str = ...) -> BinaryIO: ... + def delete(self, key: str, owner: str = ...): ... + def append(self, key: str, value: Any): ... + def truncate(self, key: str, count: int): ... + def size(self, key: str) -> int: ... def sizes(self, owner: str | None = ...) -> list[int]: ... def total(self, owner: str | None = ...) -> int: ... - def reserve(self, owner: str = ...) -> None: ... + def reserve(self, owner: str = ...): ... def count(self, owner: str | None = ...) -> int: ... - def list(self, owner: str | None = ...) -> tuple[()]: ... + def list(self, owner: str | None = ...) -> Sequence[str]: ... def generate(self) -> str: ... diff --git a/src/netius/adapters/fs.pyi b/src/netius/adapters/fs.pyi index 972f02e0..d900ceb4 100644 --- a/src/netius/adapters/fs.pyi +++ b/src/netius/adapters/fs.pyi @@ -1,18 +1,11 @@ -import netius as netius -import netius.adapters.base -import netius.adapters.base as base +from os import PathLike -from typing import Any, StrOrBytesPath -from netius.base.legacy import StringIO +from netius import BaseAdapter + +class FsAdapter(BaseAdapter): + base_path: str -class FsAdapter(netius.adapters.base.BaseAdapter): def __init__(self, base_path: str | None = ...) -> None: ... - def set(self, value: Any, owner: str = ...) -> str: ... - def get_file(self, key: str, mode: str = ...) -> StringIO: ... - def delete(self, key: str, owner: str = ...) -> None: ... - def size(self, key:str ) -> int: ... - def count(self, owner: str | None = ...) -> int: ... - def list(self, owner: str | None = ...) -> list[str]: ... def _path(self, owner: str | None = ...) -> str: ... def _ensure(self, owner: str) -> str: ... - def _symlink(self, source: StrOrBytesPath, target: StrOrBytesPath) -> None: ... + def _symlink(self, source: PathLike[str], target: PathLike[str]) -> None: ... diff --git a/src/netius/adapters/memory.pyi b/src/netius/adapters/memory.pyi index ab7fec8a..184f59b2 100644 --- a/src/netius/adapters/memory.pyi +++ b/src/netius/adapters/memory.pyi @@ -1,18 +1,8 @@ -import netius as netius -import netius.adapters.base -import netius.adapters.base as base +from typing import Any, BinaryIO, Callable -import typing +from netius import BaseAdapter -class MemoryAdapter(netius.adapters.base.BaseAdapter): - def __init__(self) -> None: ... - def set(self, value, owner: str = ...) -> str: ... - def get_file(self, key: str, mode: str = ...) -> netius.legacy.StringIO: ... - def delete(self, key: str, owner: str = ...) -> None: ... - def append(self, key: str, value: typing.Any) -> None: ... - def truncate(self, key: str, count: int) -> None: ... - def size(self, key: str) -> int: ... - def count(self, owner: str | None = ...) -> int: ... - def list(self, owner: str | None = ...) -> tuple[()]: ... - def _ensure(self, owner: str) -> dict: ... - def _build_close(self, file: netius.legacy.StringIO, key: str) -> function: ... +class MemoryAdapter(BaseAdapter): + def __init__(self): ... + def _ensure(self, owner: str) -> dict[str, Any]: ... + def _build_close(self, file: BinaryIO, key: str) -> Callable[[], None]: ... diff --git a/src/netius/adapters/mongo.pyi b/src/netius/adapters/mongo.pyi index 05471eee..545e27b9 100644 --- a/src/netius/adapters/mongo.pyi +++ b/src/netius/adapters/mongo.pyi @@ -1,6 +1,4 @@ -import netius.adapters.base -import netius.adapters.base as base +from netius import BaseAdapter -class MongoAdapter(netius.adapters.base.BaseAdapter): - def set(self, value: str, owner: str = ...): ... - def get(self, key: str): ... +class MongoAdapter(BaseAdapter): + pass diff --git a/src/netius/adapters/null.pyi b/src/netius/adapters/null.pyi index 694650d5..af22525b 100644 --- a/src/netius/adapters/null.pyi +++ b/src/netius/adapters/null.pyi @@ -1,4 +1,4 @@ -import netius.adapters.base -import netius.adapters.base as base +from netius import BaseAdapter -class NullAdapter(netius.adapters.base.BaseAdapter): ... +class NullAdapter(BaseAdapter): + pass diff --git a/src/netius/auth/base.pyi b/src/netius/auth/base.pyi index 2581cdc7..0c4d750f 100644 --- a/src/netius/auth/base.pyi +++ b/src/netius/auth/base.pyi @@ -1,13 +1,13 @@ from typing import Literal -HashType = Literal["plain", "md5", "sha1", "sha256", "sha512"] +HashType = Literal["plain", "md5", "sha1", "sha256", "sha512"] -class Auth(object): +class Auth(object): @classmethod def verify(cls, encoded: str, decoded: str) -> bool: ... - @classmethod - def generate(cls, password: str, type: HashType = "sha256", salt: str = "netius") -> str: ... - + def generate( + cls, password: str, type: HashType = "sha256", salt: str = "netius" + ) -> str: ... @classmethod def unpack(cls, password: str) -> tuple[HashType, str, str, str]: ...