From c66e6cc66b25dfe27fbf17603d6c91396ff46961 Mon Sep 17 00:00:00 2001 From: Vithor Jaeger Date: Thu, 22 Sep 2022 14:56:02 -0400 Subject: [PATCH] annotations fix --- pocketbase/client.py | 20 -------------------- pocketbase/models/admin.py | 3 +-- pocketbase/models/collection.py | 12 +++++------- pocketbase/models/user.py | 6 +++--- pocketbase/services/users.py | 1 + pocketbase/stores/base_auth_store.py | 11 +++++------ pocketbase/stores/local_auth_store.py | 8 ++++---- 7 files changed, 19 insertions(+), 42 deletions(-) diff --git a/pocketbase/client.py b/pocketbase/client.py index 441e09a..5e3b1d3 100644 --- a/pocketbase/client.py +++ b/pocketbase/client.py @@ -1,7 +1,6 @@ from __future__ import annotations from typing import Any -from urllib.parse import urlencode import httpx @@ -125,22 +124,3 @@ class Client: if path.startswith("/"): path = path[1:] return url + path - - -if __name__ == "__main__": - from pocketbase.stores.local_auth_store import LocalAuthStore - - pb = Client(base_url="http://ares.olimpo:8090/", auth_store=LocalAuthStore()) - # pb.admins.auth_via_email("vaphes@gmail.com", "vaphes2007") - print(pb.auth_store.token) - books = pb.collections.get_one("books") - print("ok") - # sacd = "nwvgaw6iiibv4fp" - # book = { - # "author": sacd, - # "name": "A study in red", - # "rating": 4.5, - # "summary": "The worst Sherlock Homes book", - # } - # data = pb.records.create("books", book) - # print(data) diff --git a/pocketbase/models/admin.py b/pocketbase/models/admin.py index be154f5..f6b988f 100644 --- a/pocketbase/models/admin.py +++ b/pocketbase/models/admin.py @@ -1,6 +1,5 @@ from __future__ import annotations -from typing import Union import datetime from pocketbase.utils import to_datetime @@ -10,7 +9,7 @@ from pocketbase.models.utils.base_model import BaseModel class Admin(BaseModel): avatar: int email: str - last_reset_sent_at: Union[str, datetime.datetime] + last_reset_sent_at: str | datetime.datetime def load(self, data: dict) -> None: super().load(data) diff --git a/pocketbase/models/collection.py b/pocketbase/models/collection.py index d248549..d9b5584 100644 --- a/pocketbase/models/collection.py +++ b/pocketbase/models/collection.py @@ -1,7 +1,5 @@ from __future__ import annotations -from typing import Optional - from pocketbase.models.utils.base_model import BaseModel from pocketbase.models.utils.schema_field import SchemaField @@ -10,11 +8,11 @@ class Collection(BaseModel): name: str schema: list[SchemaField] system: bool - list_rule: Optional[str] - view_rule: Optional[str] - create_rule: Optional[str] - update_rule: Optional[str] - delete_rule: Optional[str] + list_rule: str | None + view_rule: str | None + create_rule: str | None + update_rule: str | None + delete_rule: str | None def load(self, data: dict) -> None: super().load(data) diff --git a/pocketbase/models/user.py b/pocketbase/models/user.py index b5d023e..0a231dc 100644 --- a/pocketbase/models/user.py +++ b/pocketbase/models/user.py @@ -11,9 +11,9 @@ from pocketbase.models.utils.base_model import BaseModel class User(BaseModel): email: str verified: bool - last_reset_sent_at: Union[str, datetime.datetime] - last_verification_sent_at: Union[str, datetime.datetime] - profile: Optional[Record] + last_reset_sent_at: str | datetime.datetime + last_verification_sent_at: str | datetime.datetime + profile: Record | None def load(self, data: dict) -> None: super().load(data) diff --git a/pocketbase/services/users.py b/pocketbase/services/users.py index e6da63d..ab40c3d 100644 --- a/pocketbase/services/users.py +++ b/pocketbase/services/users.py @@ -3,6 +3,7 @@ from __future__ import annotations from dataclasses import dataclass from typing import Any from urllib.parse import quote + from pocketbase.services.utils.crud_service import CrudService from pocketbase.models.utils.base_model import BaseModel from pocketbase.models.user import User diff --git a/pocketbase/stores/base_auth_store.py b/pocketbase/stores/base_auth_store.py index ec5a96b..fc6a9d9 100644 --- a/pocketbase/stores/base_auth_store.py +++ b/pocketbase/stores/base_auth_store.py @@ -1,7 +1,6 @@ from __future__ import annotations from abc import ABC -from typing import Union, Optional from pocketbase.models.admin import Admin from pocketbase.models.user import User @@ -14,26 +13,26 @@ class BaseAuthStore(ABC): """ base_token: str - base_model: Union[User, Admin, None] + base_model: User | Admin | None def __init__( - self, base_token: str = "", base_model: Optional[Union[User, Admin]] = None + self, base_token: str = "", base_model: User | Admin | None = None ) -> None: super().__init__() self.base_token = base_token self.base_model = base_model @property - def token(self) -> Union[str, None]: + def token(self) -> str | None: """Retrieves the stored token (if any).""" return self.base_token @property - def model(self) -> Union[User, Admin, None]: + def model(self) -> User | Admin | None: """Retrieves the stored model data (if any).""" return self.base_model - def save(self, token: str = "", model: Optional[Union[User, Admin]] = None) -> None: + def save(self, token: str = "", model: User | Admin | None = None) -> None: """Saves the provided new token and model data in the auth store.""" self.base_token = token self.base_model = model diff --git a/pocketbase/stores/local_auth_store.py b/pocketbase/stores/local_auth_store.py index a2abc17..5e74e9f 100644 --- a/pocketbase/stores/local_auth_store.py +++ b/pocketbase/stores/local_auth_store.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import Any, Optional, Union +from typing import Any import pickle import os @@ -18,7 +18,7 @@ class LocalAuthStore(BaseAuthStore): filename: str = "pocketbase_auth.data", filepath: str = "", base_token: str = "", - base_model: Optional[Union[User, Admin]] = None, + base_model: User | Admin | None = None, ) -> None: super().__init__(base_token, base_model) self.filename = filename @@ -33,13 +33,13 @@ class LocalAuthStore(BaseAuthStore): return data["token"] @property - def model(self) -> Union[User, Admin, None]: + def model(self) -> User | Admin | None: data = self._storage_get(self.complete_filepath) if not data or not "model" in data: return None return data["model"] - def save(self, token: str = "", model: Optional[Union[User, Admin]] = None) -> None: + def save(self, token: str = "", model: User | Admin | None = None) -> None: self._storage_set(self.complete_filepath, {"token": token, "model": model}) super().save(token, model)